From adbcf19958300e9b6598990184c8815b945ba0ee Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 23 Oct 2010 13:17:40 -0500 Subject: Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch. --- abs/core-testing/Kernel_rebuild_list | 8 - abs/core-testing/LinHES-config-svn/LinHES-release | 1 - abs/core-testing/LinHES-config-svn/LinHES.install | 78 - abs/core-testing/LinHES-config-svn/MythVantage.sh | 3 - abs/core-testing/LinHES-config-svn/PKGBUILD | 57 - abs/core-testing/LinHES-config-svn/README | 10 - abs/core-testing/LinHES-config-svn/add_service.sh | 15 - abs/core-testing/LinHES-config-svn/autocard.py | 307 - abs/core-testing/LinHES-config-svn/bpopup-ui.xml | 164 - .../LinHES-config-svn/build_diskless.sh | 143 - .../LinHES-config-svn/checkout_MythVantage.sh | 45 - .../LinHES-config-svn/create_master.sh | 57 - .../LinHES-config-svn/file_time_offset.py | 39 - abs/core-testing/LinHES-config-svn/install-ui.xml | 175 - .../LinHES-config-svn/install_db_chroot.sh | 117 - .../LinHES-config-svn/install_functions.sh | 621 - .../LinHES-config-svn/install_proxy.sh | 717 - abs/core-testing/LinHES-config-svn/issue | 1 - abs/core-testing/LinHES-config-svn/live-install.sh | 28 - abs/core-testing/LinHES-config-svn/myth_user_call | 172 - .../LinHES-config-svn/networkconfig.sh | 331 - .../LinHES-config-svn/remove_service.sh | 8 - .../LinHES-config-svn/restore_default_settings.sh | 362 - .../LinHES-config-svn/restore_km_db_chroot.sh | 61 - abs/core-testing/LinHES-config-svn/soundconfig.sh | 254 - abs/core-testing/LinHES-config-svn/startx | 29 - abs/core-testing/LinHES-config-svn/systemconfig.sh | 1368 - abs/core-testing/LinHES-config-svn/timezip.py | 231 - abs/core-testing/LinHES-config-svn/timezone.bin | Bin 806343 -> 0 bytes abs/core-testing/LinHES-config-svn/xconfig.sh | 305 - abs/core-testing/LinHES-config/LinHES-release | 1 - abs/core-testing/LinHES-config/LinHES.install | 79 - abs/core-testing/LinHES-config/MythVantage.sh | 3 - abs/core-testing/LinHES-config/PKGBUILD | 138 - abs/core-testing/LinHES-config/README | 9 - abs/core-testing/LinHES-config/add_service.sh | 15 - abs/core-testing/LinHES-config/autocard.py | 307 - abs/core-testing/LinHES-config/bpopup-ui.xml | 164 - abs/core-testing/LinHES-config/build_diskless.sh | 143 - .../LinHES-config/checkout_MythVantage.sh | 49 - abs/core-testing/LinHES-config/create_master.sh | 57 - abs/core-testing/LinHES-config/file_time_offset.py | 39 - abs/core-testing/LinHES-config/install-ui.xml | 175 - .../LinHES-config/install_db_chroot.sh | 63 - .../LinHES-config/install_functions.sh | 344 - abs/core-testing/LinHES-config/install_proxy.sh | 234 - abs/core-testing/LinHES-config/issue | 2 - abs/core-testing/LinHES-config/live-install.sh | 28 - abs/core-testing/LinHES-config/mv_advanced.py | 390 - abs/core-testing/LinHES-config/mv_common.py | 232 - abs/core-testing/LinHES-config/mv_config.py | 17 - abs/core-testing/LinHES-config/mv_ddns.py | 29 - abs/core-testing/LinHES-config/mv_hostype.py | 233 - abs/core-testing/LinHES-config/mv_install.py | 1432 - abs/core-testing/LinHES-config/mv_ir.py | 343 - abs/core-testing/LinHES-config/mv_misc.py | 180 - abs/core-testing/LinHES-config/mv_network.py | 510 - abs/core-testing/LinHES-config/mv_screensaver.py | 202 - abs/core-testing/LinHES-config/mv_smolt.py | 62 - abs/core-testing/LinHES-config/mv_software.py | 65 - abs/core-testing/LinHES-config/mv_webuser.py | 25 - abs/core-testing/LinHES-config/myth_user_call | 174 - abs/core-testing/LinHES-config/myth_user_call.py | 159 - abs/core-testing/LinHES-config/mythvantage.cfg | 21 - abs/core-testing/LinHES-config/networkconfig.sh | 341 - abs/core-testing/LinHES-config/remove_service.sh | 8 - .../LinHES-config/restore_default_settings.sh | 374 - .../LinHES-config/restore_km_db_chroot.sh | 61 - abs/core-testing/LinHES-config/soundconfig.sh | 254 - abs/core-testing/LinHES-config/startx | 29 - abs/core-testing/LinHES-config/systemconfig.py | 259 - abs/core-testing/LinHES-config/systemconfig.sh | 19 - abs/core-testing/LinHES-config/timezip.py | 232 - abs/core-testing/LinHES-config/xconfig.sh | 363 - abs/core-testing/LinHES-system/LinHES-profile.sh | 3 - abs/core-testing/LinHES-system/LinHES-run | 126 - abs/core-testing/LinHES-system/LinHES-session | 13 - abs/core-testing/LinHES-system/LinHES-start | 162 - abs/core-testing/LinHES-system/LinHES.install | 98 - abs/core-testing/LinHES-system/PKGBUILD | 56 - abs/core-testing/LinHES-system/alsa-base | 10 - abs/core-testing/LinHES-system/bin/backupcommon | 382 - abs/core-testing/LinHES-system/bin/checkbackup | 16 - abs/core-testing/LinHES-system/bin/checkrestore | 16 - abs/core-testing/LinHES-system/bin/library.sh | 164 - abs/core-testing/LinHES-system/bin/mythbackup | 113 - abs/core-testing/LinHES-system/bin/mythrestore | 137 - abs/core-testing/LinHES-system/bin/rollback.sh | 20 - abs/core-testing/LinHES-system/firstboot.sh | 50 - .../LinHES-system/load-modules-mythvantage.sh | 64 - abs/core-testing/LinHES-system/myth_mtc.lr | 9 - abs/core-testing/LinHES-system/myth_mtc.py | 139 - abs/core-testing/LinHES-system/myth_mtc.sh | 12 - abs/core-testing/LinHES-system/mythfrontend-start | 22 - abs/core-testing/LinHES-system/optimize_mythdb.py | 16 - abs/core-testing/LinHES-system/smolt.cron | 11 - abs/core-testing/LinHES-system/tvterm.sh | 25 - abs/core-testing/LinHES-system/unclutter-toggle.sh | 11 - abs/core-testing/LinHES-timezone/Makefile | 62 - abs/core-testing/LinHES-timezone/PKGBUILD | 29 - abs/core-testing/LinHES-timezone/Tux.csv | 1268 - abs/core-testing/LinHES-timezone/WorldTZ_102.zip | Bin 1628730 -> 0 bytes .../LinHES-timezone/create_map_include.c | 186 - .../LinHES-timezone/extract_map_data.c | 188 - abs/core-testing/LinHES-timezone/linhes_timezone.c | 1120 - abs/core-testing/a | 1 - abs/core-testing/a52dec/PKGBUILD | 26 - abs/core-testing/a52dec/a52dec-0.7.4-build.patch | 27 - abs/core-testing/aalib/PKGBUILD | 25 - abs/core-testing/aalib/aclocal-fixes.patch | 11 - abs/core-testing/acl/PKGBUILD | 35 - abs/core-testing/acpid/Makefile | 56 - abs/core-testing/acpid/PKGBUILD | 34 - abs/core-testing/acpid/__changelog | 2 - abs/core-testing/acpid/acpid | 35 - abs/core-testing/acpid/acpid-1.0.4-gcc4.patch | 20 - abs/core-testing/acpid/anything | 3 - abs/core-testing/acpid/default | 20 - abs/core-testing/acpid/handler.sh | 68 - abs/core-testing/alsa-lib/PKGBUILD | 23 - abs/core-testing/alsa-oss/PKGBUILD | 20 - abs/core-testing/alsa-utils/PKGBUILD | 31 - abs/core-testing/alsa-utils/alsa | 56 - abs/core-testing/alsa-utils/alsa.conf.d | 15 - abs/core-testing/alsa-utils/alsaconf.patch | 32 - abs/core-testing/apache/PKGBUILD | 139 - abs/core-testing/apache/apache.conf.d | 15 - abs/core-testing/apache/apachectl-confd.patch | 15 - abs/core-testing/apache/arch.layout | 22 - abs/core-testing/apache/httpd | 65 - abs/core-testing/apache/httpd.logrotate | 6 - abs/core-testing/apr-util/PKGBUILD | 25 - abs/core-testing/apr/PKGBUILD | 31 - abs/core-testing/aspell/PKGBUILD | 31 - abs/core-testing/aspell/aspell.install | 23 - abs/core-testing/atk/PKGBUILD | 21 - abs/core-testing/atl1e/PKGBUILD | 27 - abs/core-testing/atl1e/atl1e.install | 23 - abs/core-testing/attr/PKGBUILD | 37 - abs/core-testing/audiofile/PKGBUILD | 21 - abs/core-testing/audiofile/aclocal-fixes.patch | 11 - abs/core-testing/aufs2-util/PKGBUILD | 25 - abs/core-testing/aufs2-util/create-tarball.sh | 11 - abs/core-testing/aufs2/PKGBUILD | 58 - abs/core-testing/aufs2/aufs2.install | 12 - abs/core-testing/aufs2/create-tarball.sh | 14 - abs/core-testing/aumix/PKGBUILD | 24 - abs/core-testing/aumix/aumix.patch | 43 - abs/core-testing/autoconf/PKGBUILD | 25 - abs/core-testing/autoconf/autoconf.install | 20 - abs/core-testing/automake/PKGBUILD | 25 - abs/core-testing/automake/automake.install | 20 - abs/core-testing/avahi/ChangeLog | 17 - abs/core-testing/avahi/PKGBUILD | 71 - abs/core-testing/avahi/avahi-daemon-dbus.patch | 16 - abs/core-testing/avahi/avahi.install | 42 - abs/core-testing/avahi/gnome-nettool.png | Bin 4509 -> 0 bytes abs/core-testing/b43-fwcutter/PKGBUILD | 21 - abs/core-testing/base.list | 98 - abs/core-testing/bash/PKGBUILD | 69 - abs/core-testing/bash/bash.install | 21 - abs/core-testing/bash/bashrc | 6 - .../bash/enable-system-config-files.patch | 15 - abs/core-testing/bash/profile.bash | 11 - abs/core-testing/bash/system.bashrc | 31 - abs/core-testing/bc/PKGBUILD | 31 - abs/core-testing/bc/bc-1.06-info-dir-entry.patch | 11 - abs/core-testing/bc/bc.install | 20 - abs/core-testing/bc/build-fix.patch | 13 - abs/core-testing/bigreqsproto/PKGBUILD | 20 - abs/core-testing/binutils/PKGBUILD | 74 - abs/core-testing/binutils/binutils.install | 17 - abs/core-testing/bison/ChangeLog | 11 - abs/core-testing/bison/PKGBUILD | 25 - abs/core-testing/bison/bison.install | 18 - abs/core-testing/bzip2/PKGBUILD | 47 - abs/core-testing/ca-certificates/PKGBUILD | 32 - .../ca-certificates/ca-certificates.install | 7 - abs/core-testing/cairo/PKGBUILD | 25 - abs/core-testing/catalyst/PKGBUILD | 153 - abs/core-testing/catalyst/amdcccle.desktop | 11 - abs/core-testing/catalyst/atieventsd.sh | 41 - abs/core-testing/catalyst/catalyst.install | 34 - abs/core-testing/catalyst/catalyst.sh | 11 - abs/core-testing/catalyst/fglrx-2.6.33.patch | 228 - abs/core-testing/cdparanoia/ChangeLog | 18 - abs/core-testing/cdparanoia/PKGBUILD | 21 - abs/core-testing/cdparanoia/gcc.patch | 582 - abs/core-testing/cdrdao/PKGBUILD | 21 - abs/core-testing/cdrdao/cdrdao-1.2.2-gcc43.patch | 73 - abs/core-testing/cdrdao/gcc4.patch | 23 - abs/core-testing/cdrkit/ChangeLog | 10 - abs/core-testing/cdrkit/PKGBUILD | 38 - abs/core-testing/cloog-ppl/PKGBUILD | 32 - abs/core-testing/cmake/PKGBUILD | 33 - abs/core-testing/compositeproto/PKGBUILD | 20 - abs/core-testing/coreutils/PKGBUILD | 67 - .../coreutils/coreutils-8.5-2-i686.pkg.tar.gz | 1 - abs/core-testing/coreutils/coreutils-pam.patch | 428 - abs/core-testing/coreutils/coreutils-uname.patch | 173 - abs/core-testing/coreutils/coreutils.install | 21 - abs/core-testing/coreutils/su.pam | 9 - abs/core-testing/cpio/PKGBUILD | 25 - abs/core-testing/cpio/cpio-2.9-gcc43.patch | 31 - abs/core-testing/cracklib/PKGBUILD | 26 - abs/core-testing/cryptsetup/PKGBUILD | 39 - .../cryptsetup-1.0.5-run_udevsettle.patch | 29 - abs/core-testing/cryptsetup/encrypt_hook | 122 - abs/core-testing/cryptsetup/encrypt_install | 22 - abs/core-testing/cryptsetup/luksOpen-status.patch | 13 - abs/core-testing/cups/PKGBUILD | 113 - abs/core-testing/cups/cups | 38 - abs/core-testing/cups/cups-avahi.patch | 1088 - abs/core-testing/cups/cups.install | 11 - abs/core-testing/cups/cups.logrotate | 8 - abs/core-testing/cups/cups.pam | 3 - abs/core-testing/curl/ChangeLog | 69 - abs/core-testing/curl/PKGBUILD | 44 - abs/core-testing/curl/m4-typo.patch | 13 - abs/core-testing/damageproto/PKGBUILD | 23 - abs/core-testing/dash/PKGBUILD | 29 - abs/core-testing/db/PKGBUILD | 33 - abs/core-testing/db/db.install | 5 - abs/core-testing/db4.5/PKGBUILD | 41 - abs/core-testing/dbus-core/PKGBUILD | 53 - abs/core-testing/dbus-core/dbus | 57 - abs/core-testing/dbus-core/dbus.install | 24 - abs/core-testing/dbus-glib/PKGBUILD | 23 - abs/core-testing/dbus-python/PKGBUILD | 22 - abs/core-testing/dbus/30-dbus | 9 - abs/core-testing/dbus/PKGBUILD | 39 - abs/core-testing/dbus/dbus | 57 - abs/core-testing/dbus/dbus.install | 21 - abs/core-testing/dcron/PKGBUILD | 38 - abs/core-testing/dcron/crond | 37 - abs/core-testing/dcron/crond.logrotate | 5 - abs/core-testing/dcron/dcron-3.1.patch | 33 - abs/core-testing/dcron/root.crontab | 12 - abs/core-testing/dcron/run-cron | 14 - abs/core-testing/ddcxinfo-arch/PKGBUILD | 21 - abs/core-testing/ddcxinfo/PKGBUILD | 25 - .../ddcxinfo/ddcxinfo-kanotix_0.6.19.tar.gz | Bin 39882 -> 0 bytes abs/core-testing/ddcxinfo/lrmi.patch | 18 - abs/core-testing/device-mapper/ChangeLog | 103 - abs/core-testing/device-mapper/PKGBUILD | 64 - abs/core-testing/device-mapper/lvm2_hook | 25 - abs/core-testing/device-mapper/lvm2_install | 30 - abs/core-testing/dhcp/ChangeLog | 8 - abs/core-testing/dhcp/PKGBUILD | 39 - .../dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch | 50 - abs/core-testing/dhcp/dhcp.conf.d | 6 - abs/core-testing/dhcp/dhcp.install | 15 - abs/core-testing/dhcp/dhcpd | 40 - abs/core-testing/dhcpcd/PKGBUILD | 48 - abs/core-testing/dhcpcd/dhcpcd.conf.d | 6 - abs/core-testing/dialog/PKGBUILD | 21 - abs/core-testing/dialog/timeout.patch | 11 - abs/core-testing/diffutils/PKGBUILD | 20 - abs/core-testing/directfb/ChangeLog | 5 - abs/core-testing/directfb/PKGBUILD | 26 - abs/core-testing/directfb/dfb_serial.diff | 10 - abs/core-testing/diskless-legacy/PKGBUILD | 14 - .../diskless-legacy/config_diskless_frontend.bash | 704 - abs/core-testing/dmapi/PKGBUILD | 31 - abs/core-testing/dmidecode/PKGBUILD | 20 - abs/core-testing/dmxproto/PKGBUILD | 19 - abs/core-testing/dnsutils/PKGBUILD | 36 - abs/core-testing/dnsutils/bind.so_bsdcompat.diff | 11 - abs/core-testing/dnsutils/tools-only.patch | 25 - abs/core-testing/docutils/PKGBUILD | 29 - abs/core-testing/dosfstools/PKGBUILD | 20 - abs/core-testing/dosfstools/linux-2.6.patch | 64 - abs/core-testing/dri2proto/PKGBUILD | 23 - abs/core-testing/dvb-firmware/PKGBUILD | 27 - abs/core-testing/dvb-firmware/dvb-usb-af9015.fw | Bin 15913 -> 0 bytes .../dvb-firmware/dvb-usb-dib0700-1.20.fw | Bin 33768 -> 0 bytes abs/core-testing/dvb-firmware/xc3028-v27.fw | Bin 66220 -> 0 bytes abs/core-testing/dvd+rw-tools/PKGBUILD | 32 - .../buildpatch-7.0-3-20080108-karolina.patch | 22 - abs/core-testing/dvdauthor/PKGBUILD | 21 - abs/core-testing/e2fsprogs/MIT-LICENSE | 25 - .../e2fsprogs/Makefile-fsck.static.patch | 13 - abs/core-testing/e2fsprogs/PKGBUILD | 46 - abs/core-testing/e2fsprogs/e2fsprogs.install | 20 - abs/core-testing/e2fsprogs/mke2fs.conf | 26 - abs/core-testing/ed/PKGBUILD | 36 - abs/core-testing/ed/ed.install | 20 - abs/core-testing/eggdbus/PKGBUILD | 22 - abs/core-testing/eject/PKGBUILD | 20 - .../eject/eject-2.1.5-handle-spaces.patch | 57 - abs/core-testing/elfutils/PKGBUILD | 32 - abs/core-testing/esound/PKGBUILD | 34 - abs/core-testing/esound/esd | 37 - .../esound/esd-0.2.38-alsa-drain.patch | 11 - abs/core-testing/etcnet/10-defaults | 11 - abs/core-testing/etcnet/PKGBUILD | 37 - abs/core-testing/etcnet/adddhcp.patch | 51 - abs/core-testing/etcnet/etcnet.install | 53 - abs/core-testing/etcnet/functions.patch | 11 - abs/core-testing/etcnet/ipv4address | 1 - abs/core-testing/etcnet/ipv4route | 1 - abs/core-testing/etcnet/network | 6 - abs/core-testing/etcnet/options | 62 - abs/core-testing/eventlog/PKGBUILD | 20 - abs/core-testing/evieext/PKGBUILD | 19 - abs/core-testing/expat/CVE-2009-3560.patch | 13 - abs/core-testing/expat/CVE-2009-3720.patch | 12 - abs/core-testing/expat/PKGBUILD | 29 - abs/core-testing/expect/PKGBUILD | 35 - abs/core-testing/faac/PKGBUILD | 28 - abs/core-testing/faac/libmp4v2.patch | 11 - abs/core-testing/faac/pipe-output.patch | 18 - abs/core-testing/faad2/ChangeLog | 26 - abs/core-testing/faad2/LICENSE | 42 - abs/core-testing/faad2/PKGBUILD | 26 - .../faad2/faad2-2.6.1-abi_has_changed.patch | 14 - .../faad2/faad2-2.6.1-broken-pipe.patch | 22 - .../faad2/faad2-2.6.1-implicitdeclar.patch | 11 - abs/core-testing/faad2/faad2-2.6.1-libtool22.patch | 13 - abs/core-testing/fam/PKGBUILD | 49 - abs/core-testing/fam/fam | 44 - abs/core-testing/fam/fam-2.7.0-dnotify.patch | 975 - abs/core-testing/fam/fam-2.7.0-gcc43.patch | 46 - abs/core-testing/fam/fam-2.7.0-largefiles.patch | 8 - abs/core-testing/fam/fam-2.7.0-noc++.patch | 83 - abs/core-testing/fam/include_fam_h.patch | 11 - abs/core-testing/fbsplash/PKGBUILD | 71 - abs/core-testing/fbsplash/fbcondecor.conf | 6 - abs/core-testing/fbsplash/fbcondecor.daemon | 55 - abs/core-testing/fbsplash/fbsplash-basic.sh | 201 - abs/core-testing/fbsplash/fbsplash.git.patch | 166 - abs/core-testing/fbsplash/fbsplash.initcpio_hook | 102 - .../fbsplash/fbsplash.initcpio_install | 114 - abs/core-testing/fbsplash/fbsplash.install | 27 - abs/core-testing/fbsplash/splash.conf | 63 - abs/core-testing/fcgi/PKGBUILD | 27 - abs/core-testing/fcgi/fcgi-configure.patch | 53839 ----------------- abs/core-testing/feh/PKGBUILD | 17 - abs/core-testing/ffmpeg-svn/PKGBUILD | 59 - abs/core-testing/fftw2/PKGBUILD | 56 - abs/core-testing/fftw2/__changelog | 2 - abs/core-testing/file/PKGBUILD | 23 - abs/core-testing/filesystem/PKGBUILD | 114 - abs/core-testing/filesystem/__CHANGELOG | 2 - abs/core-testing/filesystem/crypttab | 33 - abs/core-testing/filesystem/filesystem.install | 74 - abs/core-testing/filesystem/fstab | 11 - abs/core-testing/filesystem/group | 30 - abs/core-testing/filesystem/gshadow | 29 - abs/core-testing/filesystem/host.conf | 8 - abs/core-testing/filesystem/hosts | 8 - abs/core-testing/filesystem/issue | 3 - abs/core-testing/filesystem/ld.so.conf | 7 - .../filesystem/modprobe.d.usb-load-ehci-first | 2 - abs/core-testing/filesystem/motd | 0 abs/core-testing/filesystem/nsswitch.conf | 19 - abs/core-testing/filesystem/passwd | 7 - abs/core-testing/filesystem/profile | 60 - abs/core-testing/filesystem/resolv.conf | 8 - abs/core-testing/filesystem/securetty | 14 - abs/core-testing/filesystem/shadow | 7 - abs/core-testing/filesystem/shells | 9 - abs/core-testing/findutils/PKGBUILD | 30 - abs/core-testing/fixesproto/PKGBUILD | 22 - abs/core-testing/flac/PKGBUILD | 32 - abs/core-testing/flac/flac-1.2.1-gcc43.patch | 10 - abs/core-testing/flac/flac-linking.diff | 12 - abs/core-testing/flac/xmms-plugin.patch | 11 - abs/core-testing/flex/PKGBUILD | 30 - abs/core-testing/flex/flex-yytext.patch | 22 - abs/core-testing/flex/lex.sh | 3 - abs/core-testing/fltk/PKGBUILD | 23 - abs/core-testing/fluxbox/ChangeLog | 10 - abs/core-testing/fluxbox/PKGBUILD | 37 - abs/core-testing/fluxbox/fluxbox-1.0.0-gcc43.patch | 10 - abs/core-testing/fluxbox/fluxbox.desktop | 6 - .../fluxbox/fluxbox_fullscreen_focus.patch | 12 - abs/core-testing/fluxbox/keys | 29 - abs/core-testing/fontcacheproto/PKGBUILD | 19 - .../fontconfig/29-replace-bitmap-fonts.conf | 37 - abs/core-testing/fontconfig/30-urw-aliases.patch | 13 - abs/core-testing/fontconfig/PKGBUILD | 35 - abs/core-testing/fontconfig/fontconfig.install | 100 - abs/core-testing/fontsproto/PKGBUILD | 21 - abs/core-testing/freeglut/PKGBUILD | 30 - .../freeglut/glut-cursor-inherit.patch | 23 - abs/core-testing/freetype2-static/PKGBUILD | 30 - abs/core-testing/freetype2-static/bytecode.patch | 29 - .../freetype-2.2.1-enable-valid.patch | 20 - .../freetype-2.2.1-memcpy-fix.patch | 14 - .../freetype-2.3.0-enable-spr.patch | 11 - abs/core-testing/freetype2/PKGBUILD | 28 - abs/core-testing/freetype2/bytecode.patch | 29 - .../freetype2/freetype-2.2.1-enable-valid.patch | 20 - .../freetype2/freetype-2.2.1-memcpy-fix.patch | 14 - .../freetype2/freetype-2.3.0-enable-spr.patch | 11 - .../freetype2/freetype-2.3.3-ftbitmap.patch | 25 - abs/core-testing/freetype2/freetype2.install | 23 - abs/core-testing/fribidi/ChangeLog | 5 - abs/core-testing/fribidi/PKGBUILD | 23 - abs/core-testing/ftgl/PKGBUILD | 25 - abs/core-testing/ftgl/ftgl-gcc411.patch | 12 - abs/core-testing/fuse/PKGBUILD | 38 - abs/core-testing/fuse/fuse.install | 14 - abs/core-testing/fuse/fuse.rc.d | 49 - abs/core-testing/fxload/PKGBUILD | 20 - abs/core-testing/gawk/PKGBUILD | 31 - .../gawk/gawk-3.1.5-segfault_fix-1.patch | 43 - abs/core-testing/gcc/PKGBUILD | 221 - abs/core-testing/gcc/gcc-ada.install | 22 - abs/core-testing/gcc/gcc-fortran.install | 18 - abs/core-testing/gcc/gcc-hash-style-both.patch | 163 - abs/core-testing/gcc/gcc-libs.install | 14 - abs/core-testing/gcc/gcc.install | 22 - abs/core-testing/gcc/gcc_pure64.patch | 26 - abs/core-testing/gdb/PKGBUILD | 27 - abs/core-testing/gdb/gdb.install | 18 - abs/core-testing/gdbm/PKGBUILD | 24 - abs/core-testing/gdk-pixbuf/PKGBUILD | 33 - .../gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch | 48 - .../gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch | 19 - .../gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch | 134 - .../gdk-pixbuf/gdk-pixbuf-0.22.0-m4.patch | 9 - abs/core-testing/gen-init-cpio/Makefile | 42 - abs/core-testing/gen-init-cpio/PKGBUILD | 21 - abs/core-testing/gen-init-cpio/gen_init_cpio.c | 514 - abs/core-testing/gettext/PKGBUILD | 22 - abs/core-testing/ghostscript/PKGBUILD | 79 - .../ghostscript/ghostscript-fPIC.patch | 31 - .../ghostscript/ghostscript-pdf2dsc.patch | 12 - .../ghostscript/ghostscript-system-jasper.patch | 26 - abs/core-testing/ghostscript/libpng14.patch | 24 - abs/core-testing/ghostscript/svn_r10890.patch | 99 - abs/core-testing/giblib/PKGBUILD | 20 - abs/core-testing/giflib/PKGBUILD | 35 - abs/core-testing/git/ChangeLog | 36 - abs/core-testing/git/PKGBUILD | 78 - abs/core-testing/git/git-daemon | 70 - abs/core-testing/git/git-daemon.conf | 4 - abs/core-testing/glib/PKGBUILD | 32 - abs/core-testing/glib/__changelog | 1 - abs/core-testing/glib/aclocal-fixes.patch | 11 - abs/core-testing/glib/gcc340.patch | 15 - abs/core-testing/glib2/PKGBUILD | 33 - abs/core-testing/glib2/gkeyfile-bool-nocase.patch | 16 - abs/core-testing/glib2/glib2.csh | 1 - abs/core-testing/glib2/glib2.sh | 1 - abs/core-testing/glibc/PKGBUILD | 138 - abs/core-testing/glibc/glibc-2.10-bz4781.patch | 42 - .../glibc/glibc-2.10-dont-build-timezone.patch | 13 - abs/core-testing/glibc/glibc-__i686.patch | 13 - abs/core-testing/glibc/glibc.install | 21 - abs/core-testing/glibc/locale-gen | 42 - abs/core-testing/glibc/locale.gen.txt | 23 - abs/core-testing/glibc/nscd | 40 - abs/core-testing/glproto/PKGBUILD | 20 - abs/core-testing/gmp/PKGBUILD | 27 - abs/core-testing/gmp/gmp.install | 20 - abs/core-testing/gnutls/PKGBUILD | 22 - abs/core-testing/gnutls/gnutls.install | 18 - abs/core-testing/gobject-introspection/PKGBUILD | 20 - abs/core-testing/gperf/PKGBUILD | 20 - abs/core-testing/gpm/ChangeLog | 39 - abs/core-testing/gpm/PKGBUILD | 36 - abs/core-testing/gpm/gpm | 41 - abs/core-testing/gpm/gpm.conf.d | 4 - abs/core-testing/gpm/gpm.install | 16 - abs/core-testing/gpm/gpm.sh | 3 - abs/core-testing/grep/01-fgrep.patch | 145 - abs/core-testing/grep/02-bracket.patch | 11 - abs/core-testing/grep/03-i18n.patch | 303 - abs/core-testing/grep/04-oi.patch | 48 - abs/core-testing/grep/05-manpage.patch | 19 - abs/core-testing/grep/06-color.patch | 10 - abs/core-testing/grep/07-icolor.patch | 36 - abs/core-testing/grep/08-skip.patch | 42 - abs/core-testing/grep/09-egf-speedup.patch | 823 - abs/core-testing/grep/10-dfa-optional.patch | 67 - abs/core-testing/grep/11-tests.patch | 138 - abs/core-testing/grep/12-w.patch | 121 - abs/core-testing/grep/13-P.patch | 14 - abs/core-testing/grep/14-mem-exhausted.patch | 15 - abs/core-testing/grep/15-empty-pattern.patch | 36 - abs/core-testing/grep/64-egf-speedup.patch | 791 - abs/core-testing/grep/PKGBUILD | 50 - abs/core-testing/groff/PKGBUILD | 34 - abs/core-testing/groff/man-utf8.tmac | 9 - abs/core-testing/grub-gfx.tar.gz | Bin 28009 -> 0 bytes .../grub-gfx/040_all_grub-0.96-nxstack.patch | 623 - .../grub-gfx/05-grub-0.97-initrdaddr.diff | 16 - abs/core-testing/grub-gfx/PKGBUILD | 106 - abs/core-testing/grub-gfx/ext4.patch | 263 - abs/core-testing/grub-gfx/grub-0.97-graphics.patch | 1293 - abs/core-testing/grub-gfx/grub-gfx.install | 46 - abs/core-testing/grub-gfx/grub-inode-size.patch | 94 - abs/core-testing/grub-gfx/i2o.patch | 45 - abs/core-testing/grub-gfx/install-grub | 187 - abs/core-testing/grub-gfx/intelmac.patch | 67 - abs/core-testing/grub-gfx/menu.lst | 47 - abs/core-testing/grub-gfx/more-raid.patch | 100 - abs/core-testing/grub-gfx/special-devices.patch | 18 - abs/core-testing/grub-gfx/splash.xpm.gz | Bin 4019 -> 0 bytes .../grub/040_all_grub-0.96-nxstack.patch | 623 - abs/core-testing/grub/05-grub-0.97-initrdaddr.diff | 16 - abs/core-testing/grub/PKGBUILD | 75 - abs/core-testing/grub/ext4.patch | 263 - abs/core-testing/grub/grub-0.97-gpt.patch | 315 - abs/core-testing/grub/grub-inode-size.patch | 94 - abs/core-testing/grub/grub.install | 22 - abs/core-testing/grub/i2o.patch | 45 - abs/core-testing/grub/install-grub | 543 - abs/core-testing/grub/install-grub.orig | 187 - abs/core-testing/grub/intelmac.patch | 67 - abs/core-testing/grub/menu.lst | 48 - abs/core-testing/grub/more-raid.patch | 100 - abs/core-testing/grub/special-devices.patch | 18 - abs/core-testing/gsfonts/PKGBUILD | 18 - abs/core-testing/gsfonts/xfonts.install | 20 - abs/core-testing/gtk/PKGBUILD | 32 - abs/core-testing/gtk/__changelog | 3 - abs/core-testing/gtk/aclocal-fixes.patch | 11 - abs/core-testing/gtk2/PKGBUILD | 39 - abs/core-testing/gtk2/__changelog | 1 - abs/core-testing/gtk2/gtk2-emit-size-change.patch | 26 - abs/core-testing/gtk2/gtk2.install | 13 - abs/core-testing/gtk2/gtkclipboard-check.patch | 11 - abs/core-testing/gtk2/revert_64bit_fix.patch | 31 - abs/core-testing/gtk2/xid-collision-debug.patch | 15 - abs/core-testing/gzip/PKGBUILD | 31 - abs/core-testing/gzip/gzip-fixpaths.patch | 37 - abs/core-testing/gzip/gzip-fixutimens.patch | 36 - abs/core-testing/gzip/gzip-security-update.patch | 186 - abs/core-testing/hal-info/PKGBUILD | 25 - abs/core-testing/hal/PKGBUILD | 83 - abs/core-testing/hal/cryptsetup_location.patch | 36 - abs/core-testing/hal/dbus-error-init.patch | 231 - abs/core-testing/hal/fix-libusb-detection.patch | 66 - abs/core-testing/hal/fix-udev-compatibility.patch | 31 - abs/core-testing/hal/hal | 54 - .../hal/hal-0.5.9-hide-diagnostic.patch | 14 - abs/core-testing/hal/hal-HDAPS-blacklist.patch | 30 - abs/core-testing/hal/hal-KVM-evdev.patch | 36 - abs/core-testing/hal/hal-policy.patch | 32 - .../hal/hal-remove-dell-killswitch.patch | 201 - abs/core-testing/hal/hal-use-at-console.patch | 45 - abs/core-testing/hal/hal-xen-unignore-axes.patch | 39 - abs/core-testing/hal/hal.install | 24 - abs/core-testing/hal/handle-input-touchpad.patch | 101 - abs/core-testing/hal/macbook-fix-ioperm.patch | 41 - abs/core-testing/hal/ntfs-mount-fix.patch | 18 - abs/core-testing/hal/ntfs3g-valid-options.patch | 11 - abs/core-testing/hal/path-max.patch | 31 - abs/core-testing/hauppauge-hvr-firmware/PKGBUILD | 24 - abs/core-testing/hd3000firmware/PKGBUILD | 15 - abs/core-testing/hdhomerun/PKGBUILD | 26 - abs/core-testing/hdparm/PKGBUILD | 33 - .../heimdal/001_all_heimdal-no_libedit.patch | 10 - abs/core-testing/heimdal/002_all_heimal-fPIC.patch | 12 - .../heimdal/002_all_heimdal-no_libedit.patch | 10 - .../heimdal/003_all_heimdal-fPIC.patch | 12 - .../heimdal/003_all_heimdal-rxapps.patch | 22 - .../heimdal/004_all_heimdal-rxapps.patch | 19 - .../heimdal/005_all_heimdal-suid_fix.patch | 20 - .../heimdal/006_all_heimdal-suid_fix.patch | 20 - .../heimdal/010_all_heimdal-system-libss.patch | 40 - .../heimdal/012_all_heimdal-berkdb.patch | 124 - .../heimdal/013_all_heimdal-pthread-lib.patch | 11 - .../heimdal/014_all_heimdal-path.patch | 50 - abs/core-testing/heimdal/PKGBUILD | 106 - abs/core-testing/heimdal/heimdal-kdc.rc | 40 - abs/core-testing/heimdal/heimdal.install | 20 - abs/core-testing/heimdal/kadmind.rc | 40 - abs/core-testing/heimdal/kpasswd.rc | 40 - abs/core-testing/hwd/PKGBUILD | 22 - abs/core-testing/hwd/hwd.install | 15 - abs/core-testing/hwdetect/PKGBUILD | 18 - abs/core-testing/hwdetect/hwdetect | 482 - abs/core-testing/iana-etc/Makefile.patch | 11 - abs/core-testing/iana-etc/PKGBUILD | 31 - abs/core-testing/iguanair/PKGBUILD | 25 - abs/core-testing/ilmbase/PKGBUILD | 22 - abs/core-testing/imagemagick/PKGBUILD | 58 - .../imagemagick/libpng_mmx_patch_x86_64.patch | 12 - .../imagemagick/perlmagick.rpath.patch | 10 - abs/core-testing/imake/PKGBUILD | 39 - abs/core-testing/imake/linuxconfig.patch | 31 - abs/core-testing/imlib2/PKGBUILD | 34 - abs/core-testing/initscripts/ChangeLog | 2194 - abs/core-testing/initscripts/PKGBUILD | 33 - abs/core-testing/initscripts/__changelog | 1 - abs/core-testing/initscripts/initscripts.install | 7 - abs/core-testing/initscripts/rc.shutdown.patch | 15 - abs/core-testing/initscripts/rc.sysinit.patch | 16 - abs/core-testing/inputproto/PKGBUILD | 22 - abs/core-testing/intltool/ChangeLog | 38 - abs/core-testing/intltool/PKGBUILD | 23 - abs/core-testing/iproute2/PKGBUILD | 44 - .../iproute2/iproute2-2.4.7-now-ss020116.patch | 9823 --- abs/core-testing/iproute2/iproute2-fhs.patch | 57 - abs/core-testing/iproute2/libdir.patch | 129 - abs/core-testing/iproute2/tc.patch | 26 - abs/core-testing/iptables/PKGBUILD | 30 - abs/core-testing/iptables/PKGBUILD.orig | 36 - abs/core-testing/iptables/empty.rules | 6 - abs/core-testing/iptables/ip6tables | 97 - abs/core-testing/iptables/iptables | 95 - abs/core-testing/iptables/iptables.conf.d | 8 - abs/core-testing/iptables/simple_firewall.rules | 11 - abs/core-testing/iputils/PKGBUILD | 72 - .../iputils/iputils-20070202-no-open-max.patch | 16 - abs/core-testing/iputils/iputils-big-patches.patch | 595 - .../iputils/iputils-ss021109-try.patch | 239 - abs/core-testing/iputils/iputils.patch | 1170 - abs/core-testing/iputils/protocols | 18 - abs/core-testing/iputils/services | 195 - abs/core-testing/ipw2100-fw/PKGBUILD | 27 - abs/core-testing/ipw2100-fw/ipw2100-fw.install | 18 - abs/core-testing/ipw2200-fw/PKGBUILD | 25 - abs/core-testing/ipw2200-fw/ipw2200-fw.install | 18 - abs/core-testing/ipw3945-ucode/PKGBUILD | 22 - .../ipw3945-ucode/ipw3945-ucode.install | 18 - abs/core-testing/ipw3945d/PKGBUILD | 28 - abs/core-testing/ipw3945d/ipw3945d.install | 35 - abs/core-testing/ipw3945d/ipw3945d.rc | 42 - abs/core-testing/ivtv-utils/PKGBUILD | 46 - abs/core-testing/ivtv-utils/ivtv-utils.install | 31 - .../jack-audio-connection-kit/PKGBUILD | 30 - .../jack-audio-connection-kit.conf.d | 42 - .../jack-audio-connection-kit.install | 34 - .../jack-audio-connection-kit.rc.d | 39 - abs/core-testing/jasper/PKGBUILD | 44 - .../jasper/jasper-1.900.1-CVE-2008-3520.patch | 928 - .../jasper/jasper-1.900.1-CVE-2008-3522.patch | 14 - abs/core-testing/jasper/jpc_dec.c.patch | 18 - .../jasper/patch-libjasper-stepsizes-overflow.diff | 14 - abs/core-testing/jfsutils/PKGBUILD | 21 - abs/core-testing/kakasi/PKGBUILD | 20 - abs/core-testing/kbd/PKGBUILD | 34 - abs/core-testing/kbd/kbd-1.12-alias.patch | 47 - abs/core-testing/kbd/kbd-1.12-find_map_fix.patch | 37 - abs/core-testing/kbd/kbd-1.12-no-user-map.patch | 19 - abs/core-testing/kbd/keymap_hook | 21 - abs/core-testing/kbd/keymap_install | 44 - abs/core-testing/kbd/rename-duplicates.patch | 830 - abs/core-testing/kbproto/PKGBUILD | 21 - abs/core-testing/kdelibs3/PKGBUILD | 57 - abs/core-testing/kdelibs3/__changelog | 1 - abs/core-testing/kdelibs3/kde3.profile | 15 - abs/core-testing/kdelibs3/kdelibs3.install | 11 - abs/core-testing/kernel26.orig/PKGBUILD | 242 - abs/core-testing/kernel26.orig/config | 4957 -- abs/core-testing/kernel26.orig/config.x86_64 | 4761 -- abs/core-testing/kernel26.orig/coretemp.patch | 86 - abs/core-testing/kernel26.orig/ext4.patch | 152 - abs/core-testing/kernel26.orig/kernel26.install | 147 - abs/core-testing/kernel26.orig/kernel26.preset | 17 - .../kernel26.orig/logo_linux_clut224.ppm | 883 - abs/core-testing/kernel26.orig/logo_linux_mono.pbm | 95 - .../kernel26.orig/logo_linux_vga16.ppm | 883 - abs/core-testing/kernel26.orig/serial.diff | 13 - abs/core-testing/kernel26/PKGBUILD | 265 - abs/core-testing/kernel26/config | 4957 -- abs/core-testing/kernel26/config.arch | 4955 -- abs/core-testing/kernel26/config.x86_64 | 4759 -- .../kernel26/fbcondecor-2.6.34-fix.patch | 19 - abs/core-testing/kernel26/kernel26.install | 147 - abs/core-testing/kernel26/kernel26.preset | 17 - abs/core-testing/lame/PKGBUILD | 23 - abs/core-testing/lame/shared-frontend.patch | 23 - abs/core-testing/lcms/PKGBUILD | 24 - abs/core-testing/less/PKGBUILD | 23 - abs/core-testing/less/zless | 9 - abs/core-testing/libao/ChangeLog | 5 - abs/core-testing/libao/PKGBUILD | 25 - abs/core-testing/libao/libao.conf | 2 - abs/core-testing/libarchive/PKGBUILD | 35 - abs/core-testing/libart-lgpl/PKGBUILD | 20 - .../libart-lgpl/art_misc.h-cplusplus.patch | 35 - abs/core-testing/libavc1394/PKGBUILD | 22 - abs/core-testing/libcaca/PKGBUILD | 20 - abs/core-testing/libcap/PKGBUILD | 22 - abs/core-testing/libcap/libcap-1.10-debian.patch | 766 - .../libcap/libcap-1.10-fixcflags.patch | 22 - abs/core-testing/libcap/libcap-1.10-shared.patch | 17 - abs/core-testing/libcdaudio/PKGBUILD | 23 - abs/core-testing/libcddb/PKGBUILD | 22 - abs/core-testing/libcroco/PKGBUILD | 21 - abs/core-testing/libdaemon/PKGBUILD | 24 - abs/core-testing/libdatrie/PKGBUILD | 22 - abs/core-testing/libdc1394/PKGBUILD | 21 - abs/core-testing/libdca/PKGBUILD | 22 - abs/core-testing/libdmx/PKGBUILD | 22 - abs/core-testing/libdrm/COPYING | 48 - abs/core-testing/libdrm/PKGBUILD | 38 - .../libdrm/libdrm-2.4.21-b803918f3f.patch | 506 - abs/core-testing/libdrm/no-pthread-stubs.patch | 65 - abs/core-testing/libdv/PKGBUILD | 23 - .../libdv/libdv-0.104-amd64reloc.patch | 262 - abs/core-testing/libdvdread/PKGBUILD | 23 - abs/core-testing/libdvdread/libdvdread.install | 11 - abs/core-testing/libevent/PKGBUILD | 22 - abs/core-testing/libexif/PKGBUILD | 22 - abs/core-testing/libfetch/Makefile | 89 - abs/core-testing/libfetch/PKGBUILD | 46 - .../libfetch/libfetch-2.33-1-i686.pkg.tar.gz | 1 - abs/core-testing/libfontenc/PKGBUILD | 27 - abs/core-testing/libgcrypt/PKGBUILD | 33 - abs/core-testing/libgcrypt/libgcrypt.install | 22 - abs/core-testing/libglade/PKGBUILD | 28 - abs/core-testing/libglade/glade.install | 25 - .../libglade/libglade-2.0.1-nowarning.patch | 39 - abs/core-testing/libgpg-error/PKGBUILD | 28 - abs/core-testing/libgsf/PKGBUILD | 27 - abs/core-testing/libice/PKGBUILD | 22 - abs/core-testing/libid3tag/PKGBUILD | 21 - abs/core-testing/libid3tag/id3tag.pc | 10 - abs/core-testing/libidn/PKGBUILD | 30 - abs/core-testing/libidn/libidn.install | 19 - abs/core-testing/libiec61883/PKGBUILD | 27 - .../libiec61883/libiec61883-1.2.0-Makefile.patch | 25 - abs/core-testing/libjpeg/PKGBUILD | 29 - abs/core-testing/libjpeg6/PKGBUILD | 28 - abs/core-testing/libjpeg6/libjpeg6.install | 25 - abs/core-testing/liblbxutil/PKGBUILD | 23 - abs/core-testing/libldap/PKGBUILD | 74 - abs/core-testing/libldap/ntlm.patch | 230 - abs/core-testing/libldap/peercred.patch | 11 - abs/core-testing/libmad/PKGBUILD | 27 - abs/core-testing/libmad/libmad.patch | 117 - abs/core-testing/libmad/libmad_gcc43.patch | 10 - abs/core-testing/libmcrypt/PKGBUILD | 22 - abs/core-testing/libmcrypt/aclocal-fixes.patch | 11 - abs/core-testing/libmng/PKGBUILD | 25 - abs/core-testing/libmp4v2/PKGBUILD | 33 - abs/core-testing/libmpc/PKGBUILD | 28 - abs/core-testing/libmpc/libmpc.install | 20 - abs/core-testing/libmpeg2/PKGBUILD | 28 - abs/core-testing/libmysqlclient/PKGBUILD | 56 - abs/core-testing/libogg/PKGBUILD | 22 - abs/core-testing/libpcap/PKGBUILD | 34 - abs/core-testing/libpcap/libpcap-shared.patch | 51 - abs/core-testing/libpciaccess/PKGBUILD | 24 - abs/core-testing/libpng/ChangeLog | 55 - abs/core-testing/libpng/PKGBUILD | 42 - abs/core-testing/libpng/libpng-1.2.29-apng.patch | 1671 - abs/core-testing/libpng/libpng-1.2.31-apng.patch | 1644 - abs/core-testing/libraw1394/PKGBUILD | 23 - abs/core-testing/librsvg/PKGBUILD | 27 - abs/core-testing/librsvg/librsvg.install | 13 - abs/core-testing/libsasl/PKGBUILD | 43 - .../libsasl/cyrus-sasl-2.1.19-checkpw.c.patch | 170 - abs/core-testing/libsasl/db-4.7.patch | 20 - abs/core-testing/libsasl/libsasl.install | 18 - abs/core-testing/libsm/PKGBUILD | 24 - abs/core-testing/libsmbios/PKGBUILD | 36 - abs/core-testing/libsndfile/PKGBUILD | 28 - abs/core-testing/libsndfile/flac-1.1.4.dpatch | 486 - .../libsndfile/lossy_comp_test-overflow.dpatch | 21 - abs/core-testing/libsndfile/overflow.dpatch | 46 - abs/core-testing/libstatgrab/PKGBUILD | 30 - abs/core-testing/libtasn1/PKGBUILD | 26 - abs/core-testing/libtasn1/libtasn1.install | 18 - abs/core-testing/libthai/PKGBUILD | 22 - abs/core-testing/libtheora/PKGBUILD | 26 - abs/core-testing/libtiff/CVE-2006-3459-3465.patch | 669 - abs/core-testing/libtiff/ChangeLog | 35 - abs/core-testing/libtiff/PKGBUILD | 32 - .../libtiff/libtiff-CVE-2009-2285.patch | 22 - .../libtiff/tiff-3.8.2-CVE-2008-2327.patch | 64 - .../libtiff/tiff2pdf-compression.patch | 44 - .../libtiff/tiff2pdf-octal-printf.patch | 11 - .../libtiff/tiffsplit-fname-overflow.patch | 19 - abs/core-testing/libtool/PKGBUILD | 31 - .../libtool/libtool-2.2.10-3-i686.pkg.tar.gz | 1 - abs/core-testing/libtool/libtool.install | 22 - abs/core-testing/libusb/PKGBUILD | 21 - abs/core-testing/libvdpau/PKGBUILD | 27 - .../libvisual-plugins/01_disable-gforce-dfsg.patch | 52 - .../libvisual-plugins/02_64-bit_JESS_fix.patch | 58 - .../03_build_against_gl_fixes.patch | 372 - .../04_lv_analyzer_build_fix.patch | 12 - abs/core-testing/libvisual-plugins/05_fix_po.patch | 127 - .../60_no-const-vispluginfo-in-nastyfft.patch | 18 - .../libvisual-plugins/90_autoreconf.patch | 60483 ------------------- abs/core-testing/libvisual-plugins/PKGBUILD | 46 - abs/core-testing/libvisual-plugins/__changelog | 3 - .../libvisual-plugins/libvisual-plugins.install | 22 - abs/core-testing/libvisual-projectm/PKGBUILD | 21 - abs/core-testing/libvisual/PKGBUILD | 21 - abs/core-testing/libvorbis/PKGBUILD | 24 - abs/core-testing/libwmf/PKGBUILD | 31 - abs/core-testing/libwmf/libwmf.install | 18 - .../libx11/012_ru_RU_UTF-8_XLC_LOCALE.diff | 237 - abs/core-testing/libx11/PKGBUILD | 32 - abs/core-testing/libx11/xorg.sh | 15 - abs/core-testing/libx86/PKGBUILD | 27 - abs/core-testing/libx86/lrmi.patch | 16 - abs/core-testing/libxau/PKGBUILD | 25 - abs/core-testing/libxaw/PKGBUILD | 25 - abs/core-testing/libxcb/PKGBUILD | 32 - .../libxcb/libxcb-1.1-no-pthread-stubs.patch | 12 - .../libxcb/libxcb-1.1-sloppy-lock.patch | 12 - .../libxcb/xcb_xlib-no-assert-on-lock.patch | 30 - abs/core-testing/libxcomposite/PKGBUILD | 22 - abs/core-testing/libxcursor/PKGBUILD | 22 - abs/core-testing/libxdamage/PKGBUILD | 24 - abs/core-testing/libxdmcp/PKGBUILD | 22 - abs/core-testing/libxext/PKGBUILD | 23 - abs/core-testing/libxfixes/PKGBUILD | 25 - .../libxfixes/xfixes_coverity576.patch | 16 - abs/core-testing/libxfont/PKGBUILD | 24 - abs/core-testing/libxfontcache/LICENSE | 100 - abs/core-testing/libxfontcache/PKGBUILD | 25 - abs/core-testing/libxft/PKGBUILD | 25 - abs/core-testing/libxi/PKGBUILD | 25 - abs/core-testing/libxinerama/PKGBUILD | 22 - abs/core-testing/libxkbfile/PKGBUILD | 25 - abs/core-testing/libxkbui/PKGBUILD | 23 - abs/core-testing/libxml2/PKGBUILD | 28 - abs/core-testing/libxml2/largefile64.patch | 12 - abs/core-testing/libxmu/PKGBUILD | 23 - abs/core-testing/libxp/PKGBUILD | 24 - abs/core-testing/libxpm/PKGBUILD | 26 - abs/core-testing/libxrandr/PKGBUILD | 24 - abs/core-testing/libxrender/PKGBUILD | 22 - abs/core-testing/libxres/PKGBUILD | 22 - abs/core-testing/libxslt/ChangeLog | 9 - abs/core-testing/libxslt/PKGBUILD | 25 - abs/core-testing/libxss/PKGBUILD | 25 - abs/core-testing/libxt/PKGBUILD | 26 - abs/core-testing/libxtrap/PKGBUILD | 24 - abs/core-testing/libxtst/PKGBUILD | 23 - abs/core-testing/libxv/PKGBUILD | 25 - abs/core-testing/libxvmc/LICENSE | 23 - abs/core-testing/libxvmc/PKGBUILD | 25 - abs/core-testing/libxxf86dga/PKGBUILD | 25 - abs/core-testing/libxxf86misc/PKGBUILD | 25 - abs/core-testing/libxxf86vm/PKGBUILD | 24 - .../licenses/LICENSE.ralink-firmware.txt | 39 - abs/core-testing/licenses/PKGBUILD | 123 - abs/core-testing/licenses/ZopePublicLicense.txt | 54 - abs/core-testing/licenses/cc-by-3.0.txt | 60 - abs/core-testing/licenses/cc-by-nc-3.0.txt | 61 - abs/core-testing/licenses/cc-by-nc-nd-3.0.txt | 58 - abs/core-testing/licenses/cc-by-nc-sa-3.0.txt | 63 - abs/core-testing/licenses/cc-by-nd-3.0.txt | 57 - abs/core-testing/licenses/cc-by-sa-3.0.txt | 63 - abs/core-testing/licenses/cc-readme.txt | 12 - abs/core-testing/licenses/cddl-1.0.txt | 377 - abs/core-testing/licenses/cpl-1.0.txt | 217 - abs/core-testing/licenses/eclipse-1.0.txt | 88 - abs/core-testing/licenses/perlartistic.txt | 151 - abs/core-testing/licenses/python-2.txt | 270 - abs/core-testing/lighttpd/PKGBUILD | 84 - abs/core-testing/lighttpd/__changelog | 14 - abs/core-testing/lighttpd/auth-inc.conf | 12 - abs/core-testing/lighttpd/lighttpd.conf | 348 - abs/core-testing/lighttpd/lighttpd.install | 7 - abs/core-testing/lighttpd/lighttpd.logrotate.d | 5 - abs/core-testing/lighttpd/lighttpd.rc.d | 38 - abs/core-testing/lighttpd/openssl-0.9.8m.patch | 11 - abs/core-testing/linhes-live/PKGBUILD | 32 - abs/core-testing/linhes-live/bin/gen_fstab | 122 - abs/core-testing/linhes-live/bin/km | 76 - abs/core-testing/linhes-live/etc/live-shutdown | 90 - abs/core-testing/linhes-live/etc/live-sysinit | 73 - abs/core-testing/linhes-live/etc/loginroot | 3 - abs/core-testing/linhes-live/etc/rc.shutdown-live | 168 - abs/core-testing/linhes-live/etc/rc.sysinit-live | 469 - abs/core-testing/linhes-live/etc/ulogin | 57 - .../linhes-live/lib/initcpio/gen_larch_init | 12 - .../linhes-live/lib/initcpio/hooks/larch1 | 125 - .../linhes-live/lib/initcpio/hooks/larch2 | 33 - .../linhes-live/lib/initcpio/hooks/larch2_aufs | 33 - .../linhes-live/lib/initcpio/hooks/larch3 | 196 - .../linhes-live/lib/initcpio/install/larch1 | 15 - .../linhes-live/lib/initcpio/install/larch2 | 15 - .../linhes-live/lib/initcpio/install/larch2_aufs | 15 - .../linhes-live/lib/initcpio/install/larch3 | 18 - abs/core-testing/linhes-live/lib/initcpio/kinit | 6 - .../linhes-live/lib/initcpio/mkinitcpio.conf | 54 - abs/core-testing/linhes-scripts/770-wrapper.sh | 37 - abs/core-testing/linhes-scripts/PKGBUILD | 91 - abs/core-testing/linhes-scripts/dct700-cc.sh | 27 - abs/core-testing/linhes-scripts/idle.sh | 102 - abs/core-testing/linhes-scripts/importfiles.sh | 18 - abs/core-testing/linhes-scripts/install_hulu.sh | 70 - .../linhes-scripts/limit-mythcommflag.sh | 91 - .../linhes-scripts/linhes-scripts.install | 7 - abs/core-testing/linhes-scripts/linhes_update.sh | 39 - abs/core-testing/linhes-scripts/linhes_update2.sh | 28 - abs/core-testing/linhes-scripts/linhes_update3.sh | 17 - .../linhes-scripts/mplayer-resumer-vdpau.pl | 204 - abs/core-testing/linhes-scripts/mplayer-resumer.pl | 188 - abs/core-testing/linhes-scripts/myth2fuze | 318 - abs/core-testing/linhes-scripts/myth2mp3 | 82 - abs/core-testing/linhes-scripts/myth2x264 | 223 - abs/core-testing/linhes-scripts/myth2xvid | 223 - .../linhes-scripts/mythwelcome-config.py | 27 - .../linhes-scripts/mythwelcome-set-alarm.sh | 23 - .../linhes-scripts/mythwelcome-test-wakeup.sh | 16 - .../linhes-scripts/pause-mythcommflag.sh | 53 - abs/core-testing/linhes-scripts/pause_mythcommflag | 8 - abs/core-testing/linhes-scripts/qip7100-cc.sh | 25 - .../linhes-scripts/remove_php_mythvideo.sh | 13 - .../linhes-scripts/removecommercials.sh | 233 - .../linhes-scripts/run-limit-mythcommflag | 2 - .../linhes-scripts/run-pause-mythcommflag | 2 - abs/core-testing/linhes-scripts/screenshooter.sh | 230 - .../linhes-scripts/shootscreens-mythtv.sh | 19 - abs/core-testing/linhes-scripts/shootscreens.sh | 44 - abs/core-testing/linhes-scripts/system-cleanup.sh | 47 - .../linhes-scripts/update_schema_021_to_022.sh | 21 - abs/core-testing/linhes-scripts/upgrade_linhes.sh | 136 - abs/core-testing/linhes-scripts/upgrade_to_0.22.sh | 94 - abs/core-testing/linhes-scripts/vdpau-detector | 103 - abs/core-testing/linhes-sounds/PKGBUILD | 29 - abs/core-testing/linhes-sounds/beg.wav | Bin 61084 -> 0 bytes abs/core-testing/linhes-sounds/complete.wav | Bin 45222 -> 0 bytes abs/core-testing/linhes-sounds/end.wav | Bin 81506 -> 0 bytes abs/core-testing/linhes-sounds/fail.wav | Bin 50050 -> 0 bytes .../linhes-sounds/half_second_of_silence.wav | Bin 352880 -> 0 bytes abs/core-testing/linhes-sounds/init.wav | Bin 46502 -> 0 bytes abs/core-testing/linhes-sounds/restore.wav | Bin 55538 -> 0 bytes abs/core-testing/linhes-sounds/restored.wav | Bin 57684 -> 0 bytes abs/core-testing/linhes-sounds/rf.wav | Bin 60972 -> 0 bytes abs/core-testing/linhes-sounds/testing.wav | Bin 42278 -> 0 bytes abs/core-testing/linhes-sounds/vr.wav | Bin 75512 -> 0 bytes abs/core-testing/linhes-splash/1024x768.cfg | 28 - abs/core-testing/linhes-splash/800x600.cfg | 28 - abs/core-testing/linhes-splash/PKGBUILD | 29 - abs/core-testing/linhes-splash/Vera.copyright | 124 - abs/core-testing/linhes-splash/Vera.ttf | Bin 65932 -> 0 bytes abs/core-testing/linhes-splash/__changelog | 1 - .../linhes-splash/background-1024x768.png | Bin 118977 -> 0 bytes .../linhes-splash/background-800x600.png | Bin 101852 -> 0 bytes .../linhes-splash/verbose-1024x768.png | Bin 414129 -> 0 bytes abs/core-testing/linhes-splash/verbose-800x600.png | Bin 215658 -> 0 bytes abs/core-testing/linhes-theme/PKGBUILD | 19 - abs/core-testing/linux-api-headers/PKGBUILD | 43 - .../linux-api-headers-2.6.34-1-i686.pkg.tar.gz | 1 - abs/core-testing/linux-api-headers/scsi.patch | 42 - abs/core-testing/linux-atm/PKGBUILD | 25 - .../linux-atm/linux-atm-2.5.0-glibc28.patch | 11 - abs/core-testing/linux-firmware/PKGBUILD | 62 - abs/core-testing/linuxtv-dvb-apps/ChangeLog | 2 - abs/core-testing/linuxtv-dvb-apps/PKGBUILD | 38 - .../linuxtv-dvb-apps/linuxtv-dvb-apps.install | 12 - abs/core-testing/lirc-utils/PKGBUILD | 79 - abs/core-testing/lirc-utils/irexec.conf | 5 - abs/core-testing/lirc-utils/irexecd | 38 - abs/core-testing/lirc-utils/kernel-2.6.33.patch | 475 - abs/core-testing/lirc-utils/lirc.logrotate | 5 - abs/core-testing/lirc-utils/lirc_patch | 270 - abs/core-testing/lirc-utils/lircd | 51 - abs/core-testing/lirc-utils/lircd.conf | 8 - abs/core-testing/lirc-utils/lircmd | 36 - abs/core-testing/lirc/PKGBUILD | 52 - abs/core-testing/lirc/kernel-2.6.33.patch | 475 - abs/core-testing/lirc/lirc.install | 50 - abs/core-testing/lirc_085-utils/PKGBUILD | 72 - abs/core-testing/lirc_085-utils/hw_commandir.c | 1926 - abs/core-testing/lirc_085-utils/hw_commandir.h | 175 - .../lirc_085-utils/kernel-2.6.26.patch | 122 - abs/core-testing/lirc_085-utils/lirc.logrotate | 8 - abs/core-testing/lirc_085-utils/lirc_atiusb.patch | 27 - abs/core-testing/lirc_085-utils/lircd | 43 - abs/core-testing/lirc_085-utils/lircd.conf.d | 8 - abs/core-testing/lirc_085-utils/lircmd | 36 - abs/core-testing/lirc_085/PKGBUILD | 86 - abs/core-testing/lirc_085/dvicoIR.rules | 15 - abs/core-testing/lirc_085/hw_commandir.c | 1926 - abs/core-testing/lirc_085/hw_commandir.h | 175 - abs/core-testing/lirc_085/kernel-2.6.26.patch | 122 - abs/core-testing/lirc_085/kernel-2.6.27.patch | 78 - abs/core-testing/lirc_085/lirc.fdi | 11 - abs/core-testing/lirc_085/lirc.install | 50 - abs/core-testing/lirc_085/lirc_atiusb.patch | 27 - abs/core-testing/lirc_085/lirc_mod_mce.patch | 187 - abs/core-testing/live-media/PKGBUILD | 32 - abs/core-testing/local-website/PKGBUILD | 21 - abs/core-testing/local-website/htdocs/404.html | 25 - .../local-website/htdocs/KnoppMyth.css | 24 - abs/core-testing/local-website/htdocs/favicon.ico | Bin 1150 -> 0 bytes abs/core-testing/local-website/htdocs/fuppes.php | 4 - abs/core-testing/local-website/htdocs/header.png | Bin 45943 -> 0 bytes abs/core-testing/local-website/htdocs/index.html | 118 - abs/core-testing/local-website/htdocs/linhes.html | 392 - .../local-website/htdocs/linhes/default/header.css | 123 - .../local-website/htdocs/linhes/default/menus.css | 221 - .../htdocs/linhes/default/programming.css | 150 - .../local-website/htdocs/linhes/default/style.css | 237 - .../htdocs/linhes/default/welcome.css | 62 - .../local-website/htdocs/linhes/js/AC_OETags.js | 269 - .../htdocs/linhes/js/flowplayer-3.1.1.min.js | 24 - .../local-website/htdocs/linhes/js/pngbehavior.htc | 97 - .../htdocs/linhes/js/prototip/classic_toolbar.gif | Bin 2850 -> 0 bytes .../htdocs/linhes/js/prototip/close.gif | Bin 367 -> 0 bytes .../htdocs/linhes/js/prototip/close_hover.gif | Bin 366 -> 0 bytes .../htdocs/linhes/js/prototip/close_hover_red.gif | Bin 371 -> 0 bytes .../htdocs/linhes/js/prototip/prototip.css | 65 - .../htdocs/linhes/js/prototip/prototip.js | 506 - .../local-website/htdocs/linhes/js/prototype.js | 4320 -- .../htdocs/linhes/js/scriptaculous/builder.js | 136 - .../htdocs/linhes/js/scriptaculous/controls.js | 965 - .../htdocs/linhes/js/scriptaculous/dragdrop.js | 975 - .../htdocs/linhes/js/scriptaculous/effects.js | 1130 - .../htdocs/linhes/js/scriptaculous/jw_effects.js | 750 - .../linhes/js/scriptaculous/scriptaculous.js | 60 - .../htdocs/linhes/js/scriptaculous/slider.js | 275 - .../htdocs/linhes/js/scriptaculous/sound.js | 55 - .../htdocs/linhes/js/scriptaculous/unittest.js | 568 - .../local-website/htdocs/linhes/js/table_sort.js | 569 - .../local-website/htdocs/linhes/js/utils.js | 173 - .../local-website/htdocs/mediaserv.php | 4 - .../BlockDiagramofavideocapturedevice.eps | 331 - .../BlockDiagramofavideocapturedevice.png | Bin 11228 -> 0 bytes .../htdocs/mythtv-doc/Card1 HDTV Card2 Cable.png | Bin 8756 -> 0 bytes .../mythtv-doc/Card1 Pri 0 Card2 Pri -1-TDS.png | Bin 8271 -> 0 bytes .../htdocs/mythtv-doc/Card1 Pri 0 Card2 Pri -1.png | Bin 7786 -> 0 bytes .../htdocs/mythtv-doc/Card1 Pri 0 Card2 Pri 0.png | Bin 8577 -> 0 bytes .../local-website/htdocs/mythtv-doc/Makefile | 42 - .../local-website/htdocs/mythtv-doc/add.eps | 27 - .../local-website/htdocs/mythtv-doc/add.png | Bin 733 -> 0 bytes .../mythtv-doc/doxygen-architecture-document.cpp | 787 - .../mythtv-doc/doxygen-create-developer-docs.cfg | 1142 - .../htdocs/mythtv-doc/doxygen.perl.patch | 141 - .../htdocs/mythtv-doc/i18n/.svn/all-wcprops | 11 - .../htdocs/mythtv-doc/i18n/.svn/entries | 40 - .../htdocs/mythtv-doc/i18n/.svn/format | 1 - .../i18n/.svn/text-base/keys_de.txt.svn-base | 298 - .../htdocs/mythtv-doc/i18n/keys_de.txt | 298 - .../local-website/htdocs/mythtv-doc/index.html | 250 - .../local-website/htdocs/mythtv-doc/keys.txt | 325 - .../htdocs/mythtv-doc/mythtv-HOWTO-1.html | 272 - .../htdocs/mythtv-doc/mythtv-HOWTO-10.html | 387 - .../htdocs/mythtv-doc/mythtv-HOWTO-11.html | 626 - .../htdocs/mythtv-doc/mythtv-HOWTO-12.html | 1112 - .../htdocs/mythtv-doc/mythtv-HOWTO-13.html | 106 - .../htdocs/mythtv-doc/mythtv-HOWTO-14.html | 112 - .../htdocs/mythtv-doc/mythtv-HOWTO-15.html | 137 - .../htdocs/mythtv-doc/mythtv-HOWTO-16.html | 241 - .../htdocs/mythtv-doc/mythtv-HOWTO-17.html | 348 - .../htdocs/mythtv-doc/mythtv-HOWTO-18.html | 71 - .../htdocs/mythtv-doc/mythtv-HOWTO-19.html | 42 - .../htdocs/mythtv-doc/mythtv-HOWTO-2.html | 27 - .../htdocs/mythtv-doc/mythtv-HOWTO-20.html | 102 - .../htdocs/mythtv-doc/mythtv-HOWTO-21.html | 37 - .../htdocs/mythtv-doc/mythtv-HOWTO-22.html | 608 - .../htdocs/mythtv-doc/mythtv-HOWTO-23.html | 1193 - .../htdocs/mythtv-doc/mythtv-HOWTO-24.html | 452 - .../htdocs/mythtv-doc/mythtv-HOWTO-3.html | 805 - .../htdocs/mythtv-doc/mythtv-HOWTO-4.html | 181 - .../htdocs/mythtv-doc/mythtv-HOWTO-5.html | 426 - .../htdocs/mythtv-doc/mythtv-HOWTO-6.html | 176 - .../htdocs/mythtv-doc/mythtv-HOWTO-7.html | 130 - .../htdocs/mythtv-doc/mythtv-HOWTO-8.html | 530 - .../htdocs/mythtv-doc/mythtv-HOWTO-9.html | 649 - .../htdocs/mythtv-doc/mythtv-HOWTO-singlehtml.html | 8532 --- .../htdocs/mythtv-doc/mythtv-HOWTO.html | 250 - .../htdocs/mythtv-doc/mythtv-HOWTO.pdf | Bin 911395 -> 0 bytes .../htdocs/mythtv-doc/mythtv-HOWTO.sgml | 7977 --- .../htdocs/mythtv-doc/mythtv-HOWTO.txt | 9235 --- .../local-website/htdocs/mythtv-doc/stop.eps | 103 - .../local-website/htdocs/mythtv-doc/stop.png | Bin 553 -> 0 bytes .../local-website/htdocs/mythtv-doc/warning.eps | 134 - .../local-website/htdocs/mythtv-doc/warning.png | Bin 1899 -> 0 bytes .../local-website/htdocs/remote/COPYING | 341 - .../local-website/htdocs/remote/CREDITS | 11 - .../local-website/htdocs/remote/Changelog | 131 - .../local-website/htdocs/remote/Issues | 18 - .../local-website/htdocs/remote/README | 43 - .../local-website/htdocs/remote/backend.php | 168 - .../local-website/htdocs/remote/csshover.htc | 120 - .../local-website/htdocs/remote/images/blank.gif | Bin 43 -> 0 bytes .../htdocs/remote/images/button_30.png | Bin 1511 -> 0 bytes .../htdocs/remote/images/button_30g.png | Bin 1535 -> 0 bytes .../htdocs/remote/images/button_30r.png | Bin 1520 -> 0 bytes .../htdocs/remote/images/button_text.png | Bin 2223 -> 0 bytes .../htdocs/remote/images/button_textg.png | Bin 3210 -> 0 bytes .../htdocs/remote/images/button_textr.png | Bin 3130 -> 0 bytes .../local-website/htdocs/remote/images/down.png | Bin 2468 -> 0 bytes .../local-website/htdocs/remote/images/down_g.png | Bin 2600 -> 0 bytes .../local-website/htdocs/remote/images/down_r.png | Bin 2575 -> 0 bytes .../htdocs/remote/images/fast_forward.png | Bin 2775 -> 0 bytes .../htdocs/remote/images/fast_forward_g.png | Bin 2838 -> 0 bytes .../htdocs/remote/images/fast_forward_r.png | Bin 2814 -> 0 bytes .../htdocs/remote/images/fast_rewind.png | Bin 2743 -> 0 bytes .../htdocs/remote/images/fast_rewind_g.png | Bin 2804 -> 0 bytes .../htdocs/remote/images/fast_rewind_r.png | Bin 2805 -> 0 bytes .../local-website/htdocs/remote/images/left.png | Bin 2503 -> 0 bytes .../local-website/htdocs/remote/images/left_g.png | Bin 2618 -> 0 bytes .../local-website/htdocs/remote/images/left_r.png | Bin 2617 -> 0 bytes .../local-website/htdocs/remote/images/ok.png | Bin 2614 -> 0 bytes .../local-website/htdocs/remote/images/ok_g.png | Bin 2662 -> 0 bytes .../local-website/htdocs/remote/images/ok_r.png | Bin 2636 -> 0 bytes .../local-website/htdocs/remote/images/pause.png | Bin 2259 -> 0 bytes .../local-website/htdocs/remote/images/pause_g.png | Bin 2236 -> 0 bytes .../local-website/htdocs/remote/images/pause_r.png | Bin 2254 -> 0 bytes .../local-website/htdocs/remote/images/rec.png | Bin 2433 -> 0 bytes .../local-website/htdocs/remote/images/rec_g.png | Bin 2406 -> 0 bytes .../local-website/htdocs/remote/images/rec_r.png | Bin 2396 -> 0 bytes .../local-website/htdocs/remote/images/right.png | Bin 2520 -> 0 bytes .../local-website/htdocs/remote/images/right_g.png | Bin 2656 -> 0 bytes .../local-website/htdocs/remote/images/right_r.png | Bin 2593 -> 0 bytes .../htdocs/remote/images/skip_back.png | Bin 2513 -> 0 bytes .../htdocs/remote/images/skip_back_g.png | Bin 2614 -> 0 bytes .../htdocs/remote/images/skip_back_r.png | Bin 2646 -> 0 bytes .../htdocs/remote/images/skip_forward.png | Bin 2560 -> 0 bytes .../htdocs/remote/images/skip_forward_g.png | Bin 2575 -> 0 bytes .../htdocs/remote/images/skip_forward_r.png | Bin 2615 -> 0 bytes .../local-website/htdocs/remote/images/stop.png | Bin 1950 -> 0 bytes .../local-website/htdocs/remote/images/stop_g.png | Bin 1977 -> 0 bytes .../local-website/htdocs/remote/images/stop_r.png | Bin 1980 -> 0 bytes .../local-website/htdocs/remote/images/up.png | Bin 2473 -> 0 bytes .../local-website/htdocs/remote/images/up_g.png | Bin 2570 -> 0 bytes .../local-website/htdocs/remote/images/up_r.png | Bin 2553 -> 0 bytes .../local-website/htdocs/remote/inc/process.php | 131 - .../local-website/htdocs/remote/index.html | 19 - .../local-website/htdocs/remote/layout-wide.html | 250 - .../local-website/htdocs/remote/layout.html | 269 - .../local-website/htdocs/remote/nav.php | 57 - .../local-website/htdocs/remote/num.php | 57 - .../local-website/htdocs/remote/pda.php | 39 - .../local-website/htdocs/remote/remote-wide.html | 275 - .../local-website/htdocs/remote/remote-wide.php | 380 - .../local-website/htdocs/remote/remote.css | 436 - .../local-website/htdocs/remote/remote.html | 307 - .../local-website/htdocs/remote/remote.php | 413 - .../local-website/htdocs/remote/svg/button.svg | 353 - .../local-website/htdocs/remote/svg/button_30.xcf | Bin 1506 -> 0 bytes .../local-website/htdocs/remote/svg/button_g.svg | 373 - .../local-website/htdocs/remote/svg/button_r.svg | 371 - .../local-website/htdocs/remote/svg/down.svg | 361 - .../htdocs/remote/svg/fast_forward.svg | 406 - .../htdocs/remote/svg/fast_rewind.svg | 406 - .../local-website/htdocs/remote/svg/left.svg | 358 - .../local-website/htdocs/remote/svg/ok.svg | 378 - .../local-website/htdocs/remote/svg/pause.svg | 410 - .../local-website/htdocs/remote/svg/rec.svg | 395 - .../local-website/htdocs/remote/svg/right.svg | 370 - .../local-website/htdocs/remote/svg/scratch.svg | 243 - .../local-website/htdocs/remote/svg/skip_back.svg | 407 - .../htdocs/remote/svg/skip_forward.svg | 413 - .../local-website/htdocs/remote/svg/stop.svg | 384 - .../local-website/htdocs/remote/svg/up.svg | 349 - abs/core-testing/local-website/htdocs/rrd/Disabled | 0 .../local-website/htdocs/rrd/index.html | 29 - abs/core-testing/local-website/htdocs/wap.html | 118 - abs/core-testing/logrotate/PKGBUILD | 37 - abs/core-testing/logrotate/logrotate.conf | 28 - abs/core-testing/logrotate/logrotate.cron.daily | 3 - abs/core-testing/lshw/PKGBUILD | 26 - abs/core-testing/lshw/abi_stdlib.diff | 10 - abs/core-testing/lshw/gcc4.3.patch | 282 - abs/core-testing/lsof/PKGBUILD | 30 - abs/core-testing/lsof/license.txt | 27 - abs/core-testing/lvm2/ChangeLog | 103 - abs/core-testing/lvm2/PKGBUILD | 64 - abs/core-testing/lvm2/lvm2_hook | 25 - abs/core-testing/lvm2/lvm2_install | 30 - abs/core-testing/lzo2/PKGBUILD | 22 - abs/core-testing/lzop/PKGBUILD | 21 - abs/core-testing/m4/PKGBUILD | 24 - abs/core-testing/m4/m4.install | 20 - abs/core-testing/madwifi-utils/PKGBUILD | 35 - abs/core-testing/madwifi/PKGBUILD | 40 - abs/core-testing/madwifi/kernel-2.6.19.patch | 383 - abs/core-testing/madwifi/kernel-2.6.20.patch | 73 - abs/core-testing/madwifi/kernel-2.6.30.patch | 14 - abs/core-testing/madwifi/madwifi-ng.install | 14 - abs/core-testing/mailx/PKGBUILD | 24 - abs/core-testing/mailx/mailx-8.1.1.patch | 32 - abs/core-testing/mailx/mailx-gcc4.patch | 12 - abs/core-testing/man-pages/PKGBUILD | 41 - abs/core-testing/man/PKGBUILD | 31 - abs/core-testing/man/man-troff.patch | 16 - abs/core-testing/man/whatis.cron.daily | 9 - abs/core-testing/mcpp/PKGBUILD | 23 - abs/core-testing/mcpp/mcpp-2.6.4-patch | 22 - abs/core-testing/mdadm/PKGBUILD | 33 - abs/core-testing/mdadm/mdadm.conf | 64 - abs/core-testing/mdadm/raid-partitions_hook | 21 - abs/core-testing/mdadm/raid-partitions_install | 32 - abs/core-testing/media_dirs/PKGBUILD | 76 - abs/core-testing/media_dirs/media_dirs.install | 42 - abs/core-testing/mesa/LICENSE | 82 - abs/core-testing/mesa/PKGBUILD | 176 - abs/core-testing/mesa/mesa-6.5-apps-noglut.patch | 17 - abs/core-testing/mesa/mesa-7.1-link-shared.patch | 102 - abs/core-testing/mesa/nouveau_class.h | 9019 --- abs/core-testing/miscsplashutils/ChangeLog | 3 - abs/core-testing/miscsplashutils/PKGBUILD | 26 - .../miscsplashutils/miscsplashutils.install | 39 - abs/core-testing/mjpegtools/1.9.patch | 147 - abs/core-testing/mjpegtools/PKGBUILD | 29 - abs/core-testing/mjpegtools/__changelog | 2 - .../mjpegtools/mjpegtools-1.8.0-gcc41.patch | 12 - .../mjpegtools/mjpegtools-1.8.0-libc.patch | 154 - .../mjpegtools/mjpegtools-1.8.0-limits.h.patch | 30 - abs/core-testing/mkinitcpio-busybox/PKGBUILD | 37 - abs/core-testing/mkinitcpio-busybox/config | 922 - ...adfont-setfont-optional-psf2-font-support.patch | 453 - abs/core-testing/mkinitcpio/PKGBUILD | 30 - abs/core-testing/mkinitcpio/mkinitcpio.conf.diff | 11 - abs/core-testing/mlocate/PKGBUILD | 47 - abs/core-testing/mlocate/mlocate.db | 0 abs/core-testing/mlocate/mlocate.install | 27 - abs/core-testing/mlocate/updatedb.conf | 5 - abs/core-testing/mlocate/updatedb.cron.daily | 10 - abs/core-testing/module-init-tools/PKGBUILD | 39 - .../fix-modprobe-ignore-path.patch | 14 - abs/core-testing/module-init-tools/makefile.patch | 22 - abs/core-testing/module-init-tools/modprobe.conf | 3 - .../module-init-tools/modutils-gcc4.patch | 280 - abs/core-testing/mpfr/PKGBUILD | 29 - abs/core-testing/mpfr/mpfr.install | 20 - abs/core-testing/mplayer-wrapper/PKGBUILD | 21 - .../mplayer-wrapper/mplayer-wrapper.install | 38 - .../mplayer-wrapper/mplayer-wrapper.pl | 261 - abs/core-testing/mplayer/PKGBUILD | 63 - abs/core-testing/mtools/PKGBUILD | 23 - abs/core-testing/mysql-python/PKGBUILD | 19 - abs/core-testing/mysql/PKGBUILD | 109 - abs/core-testing/mysql/__changelog | 2 - abs/core-testing/mysql/my.cnf | 148 - abs/core-testing/mysql/mysql.install | 20 - abs/core-testing/mysql/mysqld | 77 - abs/core-testing/mysql/skip-abi-check.patch | 13 - abs/core-testing/mythdb-initial/PKGBUILD | 27 - abs/core-testing/mythdb-initial/__changelog | 25 - abs/core-testing/mythdb-initial/custom.sql | 3 - .../mythdb-initial/dvd_transcode_r6.sql | 105 - abs/core-testing/mythdb-initial/mc.sql | 2909 - abs/core-testing/mythdb-initial/mythdb.install | 35 - abs/core-testing/mythdb-initial/permissions.sql | 11 - abs/core-testing/mythinstall/PKGBUILD | 29 - .../mythinstall/checkout_MythVantage.sh | 49 - abs/core-testing/mythinstall/install-ui.xml | 135 - abs/core-testing/mythstream/PKGBUILD | 37 - abs/core-testing/mythstream/mythstream.install | 23 - abs/core-testing/mythstream/mythstream.patch | 12 - abs/core-testing/mythstream/streams.res | 281 - .../mythtv/old/stable-0.21/glass-wide/PKGBUILD | 15 - .../mythtv/old/stable-0.21/morethemes/PKGBUILD | 32 - .../mythtv/old/stable-0.21/mytharchive/PKGBUILD | 35 - .../mythtv/old/stable-0.21/mythbrowser/PKGBUILD | 33 - .../mythtv/old/stable-0.21/mythcontrols/PKGBUILD | 32 - .../mythtv/old/stable-0.21/mythdb-initial/PKGBUILD | 21 - .../old/stable-0.21/mythdb-initial/__changelog | 25 - .../mythtv/old/stable-0.21/mythdb-initial/mc.sql | 2835 - .../old/stable-0.21/mythdb-initial/mythdb.install | 31 - .../old/stable-0.21/mythdb-initial/permissions.sql | 11 - .../mythtv/old/stable-0.21/mythflix/PKGBUILD | 41 - .../mythtv/old/stable-0.21/mythgallery/PKGBUILD | 33 - .../mythtv/old/stable-0.21/mythgame/PKGBUILD | 32 - .../mythtv/old/stable-0.21/mythmovies/PKGBUILD | 33 - .../mythtv/old/stable-0.21/mythmusic/PKGBUILD | 35 - .../old/stable-0.21/mythmusic/music_flac.patch | 293 - .../old/stable-0.21/mythmusic/mythmusic-0.21.patch | 22 - .../mythtv/old/stable-0.21/mythnews/PKGBUILD | 32 - .../mythtv/old/stable-0.21/mythphone/PKGBUILD | 32 - .../mythtv/old/stable-0.21/mythsmolt/PKGBUILD | 26 - .../mythtv/old/stable-0.21/mythstream/PKGBUILD | 35 - .../old/stable-0.21/mythstream/mythstream.diff | 79 - .../old/stable-0.21/mythstream/mythstream.install | 23 - .../mythtv/old/stable-0.21/myththemes/PKGBUILD | 33 - .../stable-0.21/mythtv/2.6.28_dvb_api_version.diff | 22 - .../mythtv/old/stable-0.21/mythtv/PKGBUILD | 98 - .../old/stable-0.21/mythtv/QUICKSTART.archlinux | 69 - .../old/stable-0.21/mythtv/gnome_screensaver.patch | 18 - .../stable-0.21/mythtv/menu-xml/HOST_SETTINGS.xml | 94 - .../mythtv/old/stable-0.21/mythtv/menu-xml/is.xml | 3 - .../stable-0.21/mythtv/menu-xml/library.xml.patch | 15 - .../old/stable-0.21/mythtv/menu-xml/linhes.xml | 60 - .../stable-0.21/mythtv/menu-xml/mainmenu.xml.patch | 39 - .../old/stable-0.21/mythtv/menu-xml/mythbackup.xml | 20 - .../stable-0.21/mythtv/menu-xml/mythrestore.xml | 20 - .../mythtv/menu-xml/optical_menu.xml.patch | 15 - .../mythtv/menu-xml/original/create_patch.sh | 5 - .../old/stable-0.21/mythtv/menu-xml/setup.xml | 111 - .../old/stable-0.21/mythtv/menu-xml/siriusmenu.xml | 419 - .../old/stable-0.21/mythtv/menu-xml/update.xml | 20 - .../old/stable-0.21/mythtv/menu-xml/update2.xml | 26 - .../mythtv/menu-xml/util_menu.xml.patch | 17 - .../old/stable-0.21/mythtv/menu-xml/xmmenu.xml | 574 - .../mythtv/old/stable-0.21/mythtv/mpegpspatch | 66 - .../mythtv/old/stable-0.21/mythtv/mythbackend | 38 - .../mythtv/old/stable-0.21/mythtv/mythbackend.lr | 9 - .../mythtv/old/stable-0.21/mythtv/mythfrontend.lr | 9 - .../stable-0.21/mythtv/myththemedmenu.cpp.patch | 125 - .../old/stable-0.21/mythtv/myththemedmenu.h.patch | 25 - .../mythtv/old/stable-0.21/mythtv/mythtv.install | 55 - .../mythtv/old/stable-0.21/mythtv/pretty | 2 - .../mythtv/old/stable-0.21/mythtv/smolt_jump.patch | 9 - .../mythtv/old/stable-0.21/mythvideo/PKGBUILD | 41 - .../mythtv/old/stable-0.21/mythvideo/mtd | 36 - .../mythvideo-6338-use_tmdb_in_fixes.patch | 151 - .../old/stable-0.21/mythvideo/mythvideo.install | 20 - .../mythtv/old/stable-0.21/mythweather/PKGBUILD | 32 - .../mythtv/old/stable-0.21/mythweb/PKGBUILD | 39 - .../mythtv/old/stable-0.21/mythweb/mythweb.install | 13 - .../2923-mythweb-gallery-English_GB_lang.diff | 102 - .../old/stable-0.21/mythweb/patch/icons.tar.gz | Bin 14759 -> 0 bytes .../old/stable-0.21/mythweb/patch/mythweb.pl.diff | 23 - .../mythweb/patch/mythweb_gallery_updated1.diff | 1657 - .../old/stable-0.21/mythweb/transcoders.patch | 23 - .../mythtv/old/stable-0.21/mythweb/wiiweb.tar.bz2 | Bin 23648 -> 0 bytes .../mythtv/old/stable-0.21/mythzoneminder/PKGBUILD | 32 - .../mythtv/old/stable-0.22/clean_all.sh | 22 - .../mythtv/old/stable-0.22/morethemes/PKGBUILD | 51 - abs/core-testing/mythtv/old/stable-0.22/mp_all.sh | 33 - .../mythtv/old/stable-0.22/mytharchive/PKGBUILD | 52 - .../mythtv/old/stable-0.22/mythbrowser/PKGBUILD | 52 - .../mythtv/old/stable-0.22/mythflix/PKGBUILD | 52 - .../mythtv/old/stable-0.22/mythgallery/PKGBUILD | 52 - .../mythtv/old/stable-0.22/mythgame/PKGBUILD | 52 - .../mythtv/old/stable-0.22/mythmovies/PKGBUILD | 52 - .../mythtv/old/stable-0.22/mythmusic/PKGBUILD | 55 - .../mythtv/old/stable-0.22/mythnews/PKGBUILD | 52 - .../mythtv/old/stable-0.22/mythsmolt/PKGBUILD | 21 - .../old/stable-0.22/mythsmolt/smolt_init_login.sh | 39 - .../mythtv/old/stable-0.22/myththemes/PKGBUILD | 54 - .../mythtv/old/stable-0.22/mythtv/PKGBUILD | 111 - .../old/stable-0.22/mythtv/changeset_r23616.patch | 38 - .../stable-0.22/mythtv/menu-xml/HOST_SETTINGS.xml | 100 - .../mythtv/old/stable-0.22/mythtv/menu-xml/is.xml | 3 - .../stable-0.22/mythtv/menu-xml/library.xml.patch | 12 - .../old/stable-0.22/mythtv/menu-xml/linhes.xml | 59 - .../stable-0.22/mythtv/menu-xml/mainmenu.tv.patch | 68 - .../stable-0.22/mythtv/menu-xml/mainmenu.xml.patch | 39 - .../old/stable-0.22/mythtv/menu-xml/mythbackup.xml | 20 - .../stable-0.22/mythtv/menu-xml/mythrestore.xml | 20 - .../mythtv/menu-xml/optical_menu.xml.patch | 16 - .../mythtv/menu-xml/original/create_patch.sh | 5 - .../old/stable-0.22/mythtv/menu-xml/setup.xml | 111 - .../old/stable-0.22/mythtv/menu-xml/siriusmenu.xml | 419 - .../stable-0.22/mythtv/menu-xml/themeinfo.xml-tv | 48 - .../old/stable-0.22/mythtv/menu-xml/update.xml | 20 - .../old/stable-0.22/mythtv/menu-xml/update2.xml | 26 - .../mythtv/menu-xml/util_menu.xml.patch | 16 - .../old/stable-0.22/mythtv/menu-xml/xmmenu.xml | 574 - .../stable-0.22/mythtv/menutheme_fallback.patch | 18 - .../mythtv/old/stable-0.22/mythtv/myth.sh | 4 - .../mythtv/old/stable-0.22/mythtv/mythbackend | 38 - .../mythtv/old/stable-0.22/mythtv/mythbackend.lr | 9 - .../mythtv/old/stable-0.22/mythtv/mythbackend.sh | 117 - .../mythtv/old/stable-0.22/mythtv/mythfrontend.lr | 9 - .../mythtv/old/stable-0.22/mythtv/mythtv.install | 35 - .../mythtv/old/stable-0.22/mythtv/pretty | 10 - .../mythtv/old/stable-0.22/mythtv/smolt_jump.patch | 30 - .../mythtv/old/stable-0.22/mythvideo/PKGBUILD | 52 - .../mythtv/old/stable-0.22/mythweather/PKGBUILD | 52 - .../mythtv/old/stable-0.22/mythweb/PKGBUILD | 50 - .../mythtv/old/stable-0.22/mythweb/mythweb.install | 10 - .../mythtv/old/stable-0.22/mythzoneminder/PKGBUILD | 52 - abs/core-testing/mythtv/stable-0.23/clean_all.sh | 22 - .../mythtv/stable-0.23/morethemes/PKGBUILD | 46 - .../retro-wide_video-ui.xml-filetypes.patch | 22 - abs/core-testing/mythtv/stable-0.23/mp_all.sh | 30 - .../mythtv/stable-0.23/mytharchive/PKGBUILD | 47 - .../mythtv/stable-0.23/mythbrowser/PKGBUILD | 47 - .../mythtv/stable-0.23/mythgallery/PKGBUILD | 45 - .../mythtv/stable-0.23/mythgame/PKGBUILD | 47 - .../mythtv/stable-0.23/mythmovies/PKGBUILD | 48 - .../mythtv/stable-0.23/mythmusic/PKGBUILD | 51 - .../mythtv/stable-0.23/mythnetvision/PKGBUILD | 47 - .../mythtv/stable-0.23/mythnews/PKGBUILD | 47 - .../mythtv/stable-0.23/mythsmolt/PKGBUILD | 23 - .../mythtv/stable-0.23/mythsmolt/mythsmolt.patch | 8 - .../stable-0.23/mythsmolt/smolt_init_login.sh | 39 - .../mythtv/stable-0.23/myththemes/PKGBUILD | 47 - .../mythtv/stable-0.23/mythtv/PKGBUILD | 102 - .../stable-0.23/mythtv/menu-xml/HOST_SETTINGS.xml | 94 - .../mythtv/stable-0.23/mythtv/menu-xml/is.xml | 3 - .../stable-0.23/mythtv/menu-xml/library.xml.patch | 12 - .../mythtv/stable-0.23/mythtv/menu-xml/linhes.xml | 59 - .../stable-0.23/mythtv/menu-xml/mainmenu.xml.patch | 95 - .../stable-0.23/mythtv/menu-xml/mythbackup.xml | 20 - .../stable-0.23/mythtv/menu-xml/mythrestore.xml | 20 - .../mythtv/menu-xml/optical_menu.xml.patch | 16 - .../mythtv/menu-xml/original/create_patch.sh | 5 - .../mythtv/stable-0.23/mythtv/menu-xml/setup.xml | 111 - .../stable-0.23/mythtv/menu-xml/siriusmenu.xml | 419 - .../mythtv/stable-0.23/mythtv/menu-xml/update.xml | 20 - .../mythtv/stable-0.23/mythtv/menu-xml/update2.xml | 26 - .../mythtv/menu-xml/util_menu.xml.patch | 16 - .../mythtv/stable-0.23/mythtv/menu-xml/xmmenu.xml | 574 - abs/core-testing/mythtv/stable-0.23/mythtv/myth.sh | 4 - .../mythtv/stable-0.23/mythtv/mythbackend | 38 - .../mythtv/stable-0.23/mythtv/mythbackend.lr | 9 - .../mythtv/stable-0.23/mythtv/mythbackend.sh | 117 - .../mythtv/stable-0.23/mythtv/mythfrontend.lr | 9 - .../mythtv/stable-0.23/mythtv/mythtv.install | 47 - abs/core-testing/mythtv/stable-0.23/mythtv/pretty | 9 - .../mythtv/stable-0.23/mythtv/smolt_jump.patch | 30 - .../mythtv/stable-0.23/mythvideo/PKGBUILD | 47 - .../mythtv/stable-0.23/mythweather/PKGBUILD | 47 - .../mythtv/stable-0.23/mythweb/PKGBUILD | 46 - .../mythtv/stable-0.23/mythweb/mythweb.install | 10 - .../mythtv/stable-0.23/mythzoneminder/PKGBUILD | 47 - abs/core-testing/mythtv/trunk/clean_all.sh | 22 - abs/core-testing/mythtv/trunk/morethemes/PKGBUILD | 54 - abs/core-testing/mythtv/trunk/mp_all.sh | 30 - abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD | 51 - abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD | 51 - abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD | 51 - abs/core-testing/mythtv/trunk/mythgame/PKGBUILD | 51 - abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD | 51 - abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD | 54 - .../mythtv/trunk/mythnetvision/PKGBUILD | 51 - abs/core-testing/mythtv/trunk/mythnews/PKGBUILD | 51 - abs/core-testing/mythtv/trunk/myththemes/PKGBUILD | 50 - abs/core-testing/mythtv/trunk/mythtv/PKGBUILD | 97 - .../mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml | 94 - .../mythtv/trunk/mythtv/menu-xml/is.xml | 3 - .../mythtv/trunk/mythtv/menu-xml/library.xml.patch | 12 - .../mythtv/trunk/mythtv/menu-xml/linhes.xml | 59 - .../trunk/mythtv/menu-xml/mainmenu.xml.patch | 38 - .../mythtv/trunk/mythtv/menu-xml/mythbackup.xml | 20 - .../mythtv/trunk/mythtv/menu-xml/mythrestore.xml | 20 - .../trunk/mythtv/menu-xml/optical_menu.xml.patch | 16 - .../trunk/mythtv/menu-xml/original/create_patch.sh | 5 - .../mythtv/trunk/mythtv/menu-xml/setup.xml | 111 - .../mythtv/trunk/mythtv/menu-xml/siriusmenu.xml | 419 - .../mythtv/trunk/mythtv/menu-xml/update.xml | 20 - .../mythtv/trunk/mythtv/menu-xml/update2.xml | 26 - .../trunk/mythtv/menu-xml/util_menu.xml.patch | 16 - .../mythtv/trunk/mythtv/menu-xml/xmmenu.xml | 574 - abs/core-testing/mythtv/trunk/mythtv/myth.sh | 4 - abs/core-testing/mythtv/trunk/mythtv/mythbackend | 38 - .../mythtv/trunk/mythtv/mythbackend.lr | 9 - .../mythtv/trunk/mythtv/mythbackend.sh | 117 - .../mythtv/trunk/mythtv/mythfrontend.lr | 9 - .../mythtv/trunk/mythtv/mythtv.install | 30 - abs/core-testing/mythtv/trunk/mythtv/pretty | 9 - .../mythtv/trunk/mythtv/smolt_jump.patch | 30 - abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD | 51 - abs/core-testing/mythtv/trunk/mythweather/PKGBUILD | 51 - abs/core-testing/mythtv/trunk/mythweb/PKGBUILD | 50 - .../mythtv/trunk/mythweb/mythweb.install | 10 - .../mythtv/trunk/mythzoneminder/PKGBUILD | 51 - abs/core-testing/nano/PKGBUILD | 25 - abs/core-testing/nano/nano.install | 20 - abs/core-testing/nasm/PKGBUILD | 19 - abs/core-testing/ncurses/ChangeLog | 9 - abs/core-testing/ncurses/PKGBUILD | 63 - abs/core-testing/ncurses/ncurses.install | 9 - abs/core-testing/ndiswrapper-utils/PKGBUILD | 27 - abs/core-testing/ndiswrapper/PKGBUILD | 31 - abs/core-testing/ndiswrapper/kernel-2.6.27.patch | 116 - .../ndiswrapper/ndiswrapper-CVE-2008-4395.patch | 86 - abs/core-testing/ndiswrapper/ndiswrapper.install | 23 - abs/core-testing/net-tools/PKGBUILD | 36 - abs/core-testing/net-tools/gcc340.patch | 46 - .../net-tools/net-tools-1.60-2.6-compilefix.patch | 23 - .../net-tools/net-tools-1.60-miiioctl.patch | 17 - .../net-tools/net-tools-1.60-nameif.patch | 58 - .../net-tools/net-tools-1.60-nameif_strncpy.patch | 13 - abs/core-testing/net-tools/net-tools.patch | 52 - abs/core-testing/net-tools/nisdomainname.conf.d | 3 - abs/core-testing/netkit-telnet/PKGBUILD | 22 - .../netkit-telnet/netkit-telnet-0.17.patch | 36 - abs/core-testing/netkit-telnet/telnet.xinetd | 10 - abs/core-testing/nfs-utils/PKGBUILD | 48 - abs/core-testing/nfs-utils/exports | 8 - abs/core-testing/nfs-utils/nfs-utils.install | 38 - abs/core-testing/nfs-utils/nfs.conf.d | 20 - abs/core-testing/nfs-utils/nfsd | 91 - abs/core-testing/nfs-utils/nfslock | 50 - abs/core-testing/nfs-utils/start-statd.patch | 21 - abs/core-testing/nfsidmap/PKGBUILD | 26 - abs/core-testing/nmbscan/PKGBUILD | 19 - .../ntfs-3g/20-ntfs-config-write-policy.fdi | 13 - .../ntfs-3g/25-ntfs-config-write-policy.fdi | 42 - abs/core-testing/ntfs-3g/PKGBUILD | 33 - abs/core-testing/ntfs-3g/ntfs-3g.install | 15 - abs/core-testing/ntfsprogs/PKGBUILD | 24 - abs/core-testing/ntfsprogs/ntfsprogs.install | 24 - abs/core-testing/ntp/PKGBUILD | 89 - abs/core-testing/ntp/fix-ipv6.patch | 10 - abs/core-testing/ntp/ntp-4.2.4-html2man.patch | 183 - abs/core-testing/ntp/ntp-4.2.4_p7-nano.patch | 20 - abs/core-testing/ntp/ntp-client.conf | 11 - abs/core-testing/ntp/ntp.conf | 47 - abs/core-testing/ntp/ntpd | 40 - abs/core-testing/ntp/ntpdate | 30 - abs/core-testing/nuvexport/MP4.pm | 316 - abs/core-testing/nuvexport/PKGBUILD | 33 - abs/core-testing/nuvexport/XviD.pm | 197 - .../nuvexport/nuvexport-ipod-disable.patch | 12 - abs/core-testing/nvidia-173xx-utils/20-nvidia.conf | 5 - abs/core-testing/nvidia-173xx-utils/PKGBUILD | 68 - abs/core-testing/nvidia-173xx-utils/nvidia.install | 6 - .../nvidia-173xx-utils/supported-cards.txt | 236 - abs/core-testing/nvidia-173xx/PKGBUILD | 38 - .../nvidia-173xx/nvidia-96.43.11-2.6.30.patch | 103 - abs/core-testing/nvidia-173xx/nvidia.install | 14 - abs/core-testing/nvidia-71xx-utils/PKGBUILD | 61 - .../nvidia-71xx-utils/nvidia-71xx.install | 29 - .../nvidia-71xx-utils/supported-cards.txt | 236 - .../NVIDIA_kernel-96.43.05-2290218.diff.txt | 1471 - abs/core-testing/nvidia-71xx/PKGBUILD | 40 - abs/core-testing/nvidia-71xx/nvidia-71xx.install | 23 - abs/core-testing/nvidia-96xx-utils/PKGBUILD | 63 - abs/core-testing/nvidia-96xx-utils/nvidia.install | 6 - .../nvidia-96xx-utils/supported-cards.txt | 236 - abs/core-testing/nvidia-96xx/PKGBUILD | 36 - .../nvidia-96xx/nvidia-96.43.11-2.6.30.patch | 103 - abs/core-testing/nvidia-96xx/nvidia.install | 14 - abs/core-testing/nvidia-utils/20-nvidia.conf | 5 - abs/core-testing/nvidia-utils/PKGBUILD | 109 - abs/core-testing/nvidia-utils/nvidia.install | 5 - abs/core-testing/nvidia-utils/supported-cards.txt | 292 - abs/core-testing/nvidia/PKGBUILD | 42 - abs/core-testing/nvidia/nvidia.install | 14 - abs/core-testing/openexr/PKGBUILD | 23 - abs/core-testing/openexr/gcc43.patch | 22 - abs/core-testing/openexr/openexr-gcc4.patch | 11 - abs/core-testing/openssh/PKGBUILD | 64 - abs/core-testing/openssh/sshd | 41 - abs/core-testing/openssh/sshd.confd | 4 - abs/core-testing/openssh/sshd.pam | 10 - abs/core-testing/openssl/PKGBUILD | 56 - abs/core-testing/openssl/ca-dir.patch | 33 - abs/core-testing/openssl/fix-manpages.patch | 1887 - abs/core-testing/openssl/no-rpath.patch | 11 - abs/core-testing/pacman-mirrorlist/PKGBUILD | 34 - abs/core-testing/pacman-mirrorlist/mirrorlist | 282 - abs/core-testing/pacman/PKGBUILD | 76 - abs/core-testing/pacman/makepkg.conf | 115 - ...lback-to-sane-defaults-for-library-stripp.patch | 32 - abs/core-testing/pacman/old/PKGBUILD | 74 - abs/core-testing/pacman/old/makepkg.conf | 115 - abs/core-testing/pacman/old/mirrorlist | 101 - abs/core-testing/pacman/old/pacman.conf | 84 - abs/core-testing/pacman/old/pacman.install | 53 - .../pacman/pacman-3.4.1-1-i686.pkg.tar.gz | 1 - abs/core-testing/pacman/pacman.conf | 79 - abs/core-testing/pacman/pacman.conf.x86_64 | 84 - abs/core-testing/pacman/pacman.install | 53 - abs/core-testing/pam/PKGBUILD | 51 - abs/core-testing/pam/other | 5 - abs/core-testing/pam/pam.install | 22 - abs/core-testing/pango/PKGBUILD | 24 - abs/core-testing/pango/bgo563356.patch | 305 - abs/core-testing/pango/pango.install | 21 - abs/core-testing/parted/PKGBUILD | 31 - abs/core-testing/parted/parted.install | 18 - abs/core-testing/patch/PKGBUILD | 21 - abs/core-testing/pciutils/PKGBUILD | 29 - abs/core-testing/pcmciautils/PKGBUILD | 34 - abs/core-testing/pcre/ChangeLog | 40 - abs/core-testing/pcre/PKGBUILD | 36 - .../pcre/libpcre-7.7-buffer-overflow.patch | 16 - abs/core-testing/perl/PKGBUILD | 102 - .../perl/archlinux-cpan-installdir.patch | 17 - abs/core-testing/perl/archlinux-inc-order.patch | 101 - .../perl-5.10.0-archlinux-cpan-installdir.patch | 11 - .../perl/perl-5.10.0-archlinux-inc-order.patch | 101 - abs/core-testing/perl/perl-5.8.6-picdl.patch0 | 13 - abs/core-testing/perl/perl-5.8.8-gcc-4.2.0.patch | 10 - abs/core-testing/perl/perl-5.8.8-utf-regexes.patch | 59 - abs/core-testing/perl/perl.install | 54 - abs/core-testing/perl/perlbin.sh | 2 - abs/core-testing/perl_modules/libxml-perl/PKGBUILD | 23 - .../perl_modules/perl-algorithm-diff/PKGBUILD | 20 - .../perl_modules/perl-archive-zip/PKGBUILD | 28 - .../perl_modules/perl-astro-suntime/PKGBUILD | 29 - .../perl-class-data-inheritable/PKGBUILD | 23 - .../perl_modules/perl-class-factory-util/PKGBUILD | 27 - .../perl_modules/perl-class-methodmaker/PKGBUILD | 23 - .../perl_modules/perl-class-singleton/PKGBUILD | 23 - .../perl_modules/perl-compress-raw-zlib/PKGBUILD | 25 - .../perl_modules/perl-compress-zlib/PKGBUILD | 25 - .../perl_modules/perl-config-simple/PKGBUILD | 25 - .../perl_modules/perl-crypt-ssleay/PKGBUILD | 23 - .../perl_modules/perl-data-dumper/PKGBUILD | 25 - .../perl_modules/perl-date-manip/PKGBUILD | 28 - .../perl-datetime-format-builder/PKGBUILD | 28 - .../perl-datetime-format-iso8601/PKGBUILD | 26 - .../perl-datetime-format-mail/PKGBUILD | 23 - .../perl-datetime-format-strptime/ChangeLog | 7 - .../perl-datetime-format-strptime/PKGBUILD | 28 - .../perl-datetime-format-w3cdtf/PKGBUILD | 23 - .../perl_modules/perl-datetime-locale/PKGBUILD | 23 - .../perl_modules/perl-datetime-timezone/ChangeLog | 5 - .../perl_modules/perl-datetime-timezone/PKGBUILD | 23 - .../perl_modules/perl-datetime/PKGBUILD | 23 - .../perl_modules/perl-dbd-mysql/PKGBUILD | 29 - abs/core-testing/perl_modules/perl-dbi/PKGBUILD | 28 - .../perl_modules/perl-devel-stacktrace/PKGBUILD | 28 - .../perl_modules/perl-device-serialport/PKGBUILD | 29 - .../perl_modules/perl-digest-sha1/PKGBUILD | 31 - abs/core-testing/perl_modules/perl-error/PKGBUILD | 27 - .../perl_modules/perl-exception-class/PKGBUILD | 22 - abs/core-testing/perl_modules/perl-fcgi/PKGBUILD | 23 - .../perl_modules/perl-file-slurp/PKGBUILD | 23 - .../perl_modules/perl-getopt-long/PKGBUILD | 25 - .../perl_modules/perl-getopt-lucid/PKGBUILD | 25 - .../perl_modules/perl-html-parser/PKGBUILD | 31 - .../perl_modules/perl-html-tagset/PKGBUILD | 31 - .../perl_modules/perl-html-tree/PKGBUILD | 23 - .../perl-http-cache-transparent/PKGBUILD | 23 - .../perl_modules/perl-image-size/PKGBUILD | 24 - .../perl_modules/perl-io-compress-zlib/PKGBUILD | 25 - .../perl_modules/perl-io-socket-ssl/PKGBUILD | 31 - .../perl_modules/perl-io-stringy/PKGBUILD | 23 - .../perl_modules/perl-javascript/PKGBUILD | 23 - abs/core-testing/perl_modules/perl-libwww/PKGBUILD | 32 - abs/core-testing/perl_modules/perl-libxml/PKGBUILD | 31 - .../perl_modules/perl-libxml/perl-libxml.install | 29 - .../perl-lingua-en-numbers-ordinate/PKGBUILD | 23 - .../perl_modules/perl-lingua-en-numbers/PKGBUILD | 23 - .../perl_modules/perl-lingua-preferred/PKGBUILD | 23 - .../perl_modules/perl-list-compare/PKGBUILD | 26 - .../perl_modules/perl-list-member/PKGBUILD | 24 - .../perl_modules/perl-list-moreutils/PKGBUILD | 22 - .../perl_modules/perl-locale-gettext/PKGBUILD | 28 - .../perl_modules/perl-log-dispatch/PKGBUILD | 23 - .../perl_modules/perl-log-log4perl/PKGBUILD | 23 - .../perl_modules/perl-mailtools/PKGBUILD | 29 - .../perl_modules/perl-math-round/PKGBUILD | 22 - .../perl_modules/perl-mime-lite/PKGBUILD | 29 - .../perl_modules/perl-mime-parser/PKGBUILD | 25 - .../perl_modules/perl-mime-tools/ChangeLog | 4 - .../perl_modules/perl-mime-tools/PKGBUILD | 23 - .../perl_modules/perl-mime-types/PKGBUILD | 29 - .../perl_modules/perl-net-ssleay/PKGBUILD | 33 - .../perl_modules/perl-net-upnp/PKGBUILD | 23 - .../perl-net-upnp/perl-config-simple/PKGBUILD | 25 - .../perl_modules/perl-params-validate/PKGBUILD | 23 - .../perl_modules/perl-parse-yapp/PKGBUILD | 25 - .../perl_modules/perl-pathtools/PKGBUILD | 22 - .../perl_modules/perl-pathtools/license.txt | 6 - .../perl_modules/perl-php-serialization/PKGBUILD | 30 - .../perl_modules/perl-proc-daemon/PKGBUILD | 23 - .../perl_modules/perl-proc-pid-file/PKGBUILD | 25 - .../perl_modules/perl-soap-lite/PKGBUILD | 24 - .../perl_modules/perl-term-progressbar/PKGBUILD | 23 - .../perl_modules/perl-term-readkey/PKGBUILD | 28 - .../perl_modules/perl-test-pod/PKGBUILD | 25 - .../perl_modules/perl-text-bidi/PKGBUILD | 23 - .../perl_modules/perl-text-iconv/PKGBUILD | 25 - .../perl_modules/perl-text-kakasi/PKGBUILD | 23 - .../perl_modules/perl-time-format/PKGBUILD | 21 - .../perl_modules/perl-time-modules/PKGBUILD | 25 - .../perl_modules/perl-timedate/PKGBUILD | 32 - .../perl_modules/perl-tk-tablematrix/PKGBUILD | 25 - abs/core-testing/perl_modules/perl-tk/PKGBUILD | 45 - .../perl_modules/perl-unicode-map/PKGBUILD | 30 - .../perl_modules/perl-unicode-string/PKGBUILD | 28 - .../perl_modules/perl-unicode-utf8simple/PKGBUILD | 23 - abs/core-testing/perl_modules/perl-uri/PKGBUILD | 31 - .../perl_modules/perl-www-mechanize/PKGBUILD | 24 - abs/core-testing/perl_modules/perl-x10/PKGBUILD | 30 - .../perl_modules/perl-xml-dom/PKGBUILD | 23 - .../perl_modules/perl-xml-libxml-common/ChangeLog | 5 - .../perl_modules/perl-xml-libxml-common/PKGBUILD | 25 - .../perl_modules/perl-xml-libxml/PKGBUILD | 26 - .../perl-xml-libxml/perl-xml-libxml.install | 19 - .../perl_modules/perl-xml-libxslt/PKGBUILD | 23 - .../perl-xml-namespacesupport/PKGBUILD | 23 - .../perl_modules/perl-xml-parser/PKGBUILD | 25 - .../perl_modules/perl-xml-regexp/PKGBUILD | 23 - .../perl_modules/perl-xml-rss/PKGBUILD | 22 - .../perl_modules/perl-xml-sax/PKGBUILD | 26 - .../perl_modules/perl-xml-sax/perl-xml-sax.install | 15 - .../perl_modules/perl-xml-sax/perl-xml-sax.patch | 45 - .../perl_modules/perl-xml-simple/PKGBUILD | 26 - .../perl_modules/perl-xml-twig/PKGBUILD | 26 - .../perl_modules/perl-xml-writer/PKGBUILD | 23 - .../perl_modules/perl-xml-xpath/PKGBUILD | 23 - .../perl_modules/perl-xml-xql/PKGBUILD | 34 - abs/core-testing/perl_modules/perlxml/PKGBUILD | 29 - abs/core-testing/php/PKGBUILD | 188 - abs/core-testing/php/__changelog | 8 - abs/core-testing/php/apache.conf | 9 - abs/core-testing/php/db-configure.patch | 51 - abs/core-testing/php/php.ini | 1304 - abs/core-testing/php/php.install | 73 - abs/core-testing/pil/PKGBUILD | 29 - abs/core-testing/pil/__changelog | 2 - abs/core-testing/pixman/PKGBUILD | 23 - abs/core-testing/pkg-config/PKGBUILD | 32 - abs/core-testing/pkg-config/autoconf-2.66.patch | 12 - .../plextor-convertX-driver/.svn/all-wcprops | 29 - .../plextor-convertX-driver/.svn/entries | 95 - .../plextor-convertX-driver/.svn/format | 1 - .../.svn/prop-base/PKGBUILD.svn-base | 5 - .../.svn/prop-base/convertX.install.svn-base | 5 - .../.svn/prop-base/download.php?id=9719.svn-base | 5 - .../prop-base/wis-go-0.9.8-2.6.17.patch.svn-base | 5 - .../.svn/text-base/PKGBUILD.svn-base | 31 - .../.svn/text-base/convertX.install.svn-base | 31 - .../.svn/text-base/download.php?id=9719.svn-base | 460 - .../text-base/wis-go-0.9.8-2.6.17.patch.svn-base | 76 - abs/core-testing/plextor-convertX-driver/PKGBUILD | 36 - .../plextor-convertX-driver/convertX.install | 34 - .../wis-go7007-2.6.26-nopage.diff | 26 - .../wis-go7007-linux-0.9.8-2-2.6.27.patch | 83 - abs/core-testing/pm-utils/11netcfg | 26 - abs/core-testing/pm-utils/PKGBUILD | 31 - abs/core-testing/pm-utils/pm-utils.install | 15 - abs/core-testing/pm-utils/service.patch | 15 - abs/core-testing/popt/PKGBUILD | 33 - abs/core-testing/portmap/PKGBUILD | 24 - abs/core-testing/portmap/gcc3-errno_h.patch | 18 - abs/core-testing/portmap/portmap | 38 - abs/core-testing/portmap/portmap_5beta.patch.bz2 | Bin 9958 -> 0 bytes abs/core-testing/ppl/PKGBUILD | 27 - abs/core-testing/ppl/ppl-0.10.2-gmp-5.0.patch | 30 - abs/core-testing/ppp/PKGBUILD | 47 - abs/core-testing/ppp/ip-down | 4 - abs/core-testing/ppp/ip-up | 4 - abs/core-testing/ppp/options | 352 - abs/core-testing/ppp/plog | 7 - abs/core-testing/ppp/poff | 103 - abs/core-testing/ppp/pon | 32 - abs/core-testing/ppp/pon.1 | 121 - abs/core-testing/ppp/ppp | 36 - abs/core-testing/printproto/PKGBUILD | 22 - abs/core-testing/procinfo-ng/PKGBUILD | 38 - abs/core-testing/procps/PKGBUILD | 24 - abs/core-testing/procps/sysctl.conf | 13 - abs/core-testing/projectm/PKGBUILD | 21 - abs/core-testing/projectm/projectm.install | 13 - abs/core-testing/psmisc/PKGBUILD | 25 - abs/core-testing/pvr150-firmware/PKGBUILD | 17 - abs/core-testing/pycairo/PKGBUILD | 24 - .../pycairo/pycairo-1.8.0-threading.diff | 67 - abs/core-testing/pygobject/PKGBUILD | 21 - abs/core-testing/pygtk/PKGBUILD | 23 - abs/core-testing/python-decorator/LICENSE.txt | 26 - abs/core-testing/python-decorator/PKGBUILD | 29 - abs/core-testing/python-iplib/PKGBUILD | 16 - abs/core-testing/python-netifaces/PKGBUILD | 17 - abs/core-testing/python-numeric/PKGBUILD | 19 - abs/core-testing/python-parted/PKGBUILD | 25 - abs/core-testing/python-pexpect/PKGBUILD | 17 - abs/core-testing/python-pycurl/PKGBUILD | 20 - abs/core-testing/python-simplejson/PKGBUILD | 24 - abs/core-testing/python/ChangeLog | 9 - abs/core-testing/python/PKGBUILD | 72 - abs/core-testing/python/Python-2.4.4-gdbm-1.patch | 17 - abs/core-testing/python/Python-2.5.2-idlelib.patch | 17 - .../python/db4.6-setup.py-detection.patch | 11 - abs/core-testing/python/modulator-launcher | 2 - abs/core-testing/python/pynche-launcher | 3 - .../python-2.5.CVE-2007-4965-int-overflow.patch | 217 - abs/core-testing/python/python-2.6-db-4.8.patch | 123 - abs/core-testing/python/python-2.6-gdbm.patch | 12 - .../python/python-2.6-internal-expat.patch | 33 - abs/core-testing/python/python.install | 13 - .../python/python2.6-set_wakeup_fd4.patch | 94 - abs/core-testing/qt/PKGBUILD | 110 - abs/core-testing/qt/__changelog | 2 - abs/core-testing/qt/assistant.desktop | 8 - abs/core-testing/qt/ca-certificates.patch | 25 - abs/core-testing/qt/designer.desktop | 9 - abs/core-testing/qt/linguist.desktop | 9 - .../qt/qt-webkit-4.6.3-flash-plugin-segfault.patch | 43 - abs/core-testing/qt/qt.install | 11 - abs/core-testing/qt/qtconfig.desktop | 8 - abs/core-testing/qt3/PKGBUILD | 101 - abs/core-testing/qt3/mysql.patch | 47 - abs/core-testing/qt3/qt-copy-kde-patches.tar.bz2 | Bin 31498 -> 0 bytes abs/core-testing/qt3/qt-font-default-subst.diff | 77 - abs/core-testing/qt3/qt-patches.tar.bz2 | Bin 3627 -> 0 bytes abs/core-testing/qt3/qt.install | 24 - abs/core-testing/qt3/qt.profile | 4 - abs/core-testing/qt3/utf8-bug-qt3.diff | 101 - abs/core-testing/randrproto/PKGBUILD | 21 - abs/core-testing/readline/PKGBUILD | 56 - abs/core-testing/readline/inputrc | 40 - abs/core-testing/readline/readline.install | 22 - abs/core-testing/recordproto/PKGBUILD | 19 - abs/core-testing/reiserfsprogs/PKGBUILD | 24 - abs/core-testing/renderproto/PKGBUILD | 18 - abs/core-testing/resourceproto/PKGBUILD | 19 - abs/core-testing/rp-pppoe/PKGBUILD | 25 - abs/core-testing/rp-pppoe/adsl | 35 - abs/core-testing/rpcbind/PKGBUILD | 26 - abs/core-testing/rpcbind/rpcbind | 39 - abs/core-testing/rsync/PKGBUILD | 27 - abs/core-testing/rsync/__changelog | 1 - abs/core-testing/rsync/rsync.xinetd | 11 - abs/core-testing/rsync/rsyncd | 37 - abs/core-testing/rsync/rsyncd.conf | 16 - abs/core-testing/run-parts/PKGBUILD | 22 - abs/core-testing/runit-scripts/PKGBUILD | 32 - abs/core-testing/runit-scripts/fbsplash-runit.sh | 30 - abs/core-testing/runit-scripts/runit.install | 56 - abs/core-testing/runit-scripts/runitscripts/1 | 27 - .../runit-scripts/runitscripts/1.local | 3 - abs/core-testing/runit-scripts/runitscripts/2 | 8 - abs/core-testing/runit-scripts/runitscripts/3 | 12 - .../runit-scripts/runitscripts/ctrlaltdel | 4 - .../runit-scripts/runitscripts/ctrlaltdel.off | 9 - .../runit-scripts/runitscripts/halt-runit | 3 - abs/core-testing/runit-scripts/runitscripts/logger | 11 - .../runit-scripts/runitscripts/reboot-runit | 3 - .../runitscripts/services/Xvfb/finish | 12 - .../runit-scripts/runitscripts/services/Xvfb/run | 11 - .../runitscripts/services/acpid/log/run | 8 - .../runit-scripts/runitscripts/services/acpid/run | 7 - .../runitscripts/services/alsa-utils/finish | 3 - .../runitscripts/services/alsa-utils/run | 3 - .../runit-scripts/runitscripts/services/apache/run | 8 - .../runit-scripts/runitscripts/services/avahi/run | 10 - .../runit-scripts/runitscripts/services/cron/run | 9 - .../runit-scripts/runitscripts/services/dbus/run | 9 - .../runitscripts/services/ddclient/run | 8 - .../runit-scripts/runitscripts/services/dhcpd/run | 8 - .../runitscripts/services/dnsmasq/run | 10 - .../runitscripts/services/evrouter/finish | 10 - .../runitscripts/services/evrouter/run | 20 - .../runitscripts/services/frontend/finish | 45 - .../runitscripts/services/frontend/log/run | 5 - .../runitscripts/services/frontend/run | 21 - .../runit-scripts/runitscripts/services/gpm/run | 10 - .../runit-scripts/runitscripts/services/hal/run | 8 - .../runitscripts/services/hobbit-client/run | 74 - .../runit-scripts/runitscripts/services/hobbit/run | 9 - .../runitscripts/services/igdaemon/run | 9 - .../runit-scripts/runitscripts/services/lcdd/run | 15 - .../runitscripts/services/lighttpd/run | 8 - .../runitscripts/services/lircd/finish | 16 - .../runit-scripts/runitscripts/services/lircd/run | 148 - .../runit-scripts/runitscripts/services/mdadm/run | 10 - .../runit-scripts/runitscripts/services/mysql/run | 34 - .../runitscripts/services/mythbackend/log/run | 8 - .../runitscripts/services/mythbackend/run | 31 - .../runitscripts/services/ncid/finish | 9 - .../runit-scripts/runitscripts/services/ncid/run | 21 - .../runitscripts/services/ncidd/finish | 9 - .../runit-scripts/runitscripts/services/ncidd/run | 13 - .../runitscripts/services/netfs/finish | 3 - .../runit-scripts/runitscripts/services/netfs/run | 6 - .../runit-scripts/runitscripts/services/nfsd/run | 29 - .../runitscripts/services/nfslock/run | 8 - .../runit-scripts/runitscripts/services/nmbd/run | 9 - .../runit-scripts/runitscripts/services/ntpd/run | 10 - .../runit-scripts/runitscripts/services/oss/finish | 4 - .../runit-scripts/runitscripts/services/oss/run | 12 - .../runitscripts/services/portmap/run | 7 - .../runitscripts/services/postfix/run | 8 - .../runitscripts/services/smartd/finish | 9 - .../runit-scripts/runitscripts/services/smartd/run | 13 - .../runit-scripts/runitscripts/services/smbd/run | 9 - .../runit-scripts/runitscripts/services/sshd/run | 13 - .../runitscripts/services/syslog-ng/run | 10 - .../runit-scripts/runitscripts/services/tatir/run | 9 - .../runit-scripts/runitscripts/services/tftpd/run | 8 - .../runit-scripts/runitscripts/services/tty2/run | 7 - .../runit-scripts/runitscripts/services/tty3/run | 6 - abs/core-testing/runit/PKGBUILD | 73 - abs/core-testing/runit/add_service.sh | 15 - abs/core-testing/runit/halt.script | 16 - abs/core-testing/runit/poweroff.script | 11 - abs/core-testing/runit/reboot.script | 11 - abs/core-testing/runit/remove_service.sh | 8 - abs/core-testing/runit/runit.install | 49 - abs/core-testing/runit/shutdown.script | 45 - abs/core-testing/samba/PKGBUILD | 139 - abs/core-testing/samba/__changelog | 1 - abs/core-testing/samba/heimdal.patch | 33 - abs/core-testing/samba/no-clients.patch | 31 - abs/core-testing/samba/samba | 51 - abs/core-testing/samba/samba-3.0.21a-ntlmssp.patch | 13 - abs/core-testing/samba/samba.conf.d | 7 - abs/core-testing/samba/samba.logrotate | 9 - abs/core-testing/samba/samba.pam | 3 - abs/core-testing/samba/swat.xinetd | 10 - abs/core-testing/scrnsaverproto/PKGBUILD | 21 - abs/core-testing/sdl/PKGBUILD | 26 - abs/core-testing/sdl/__changelog | 1 - abs/core-testing/sdl/sdl-1.2.13-dynaminc-esd.patch | 12 - abs/core-testing/sdparm/PKGBUILD | 23 - abs/core-testing/sed/PKGBUILD | 21 - abs/core-testing/setserial/PKGBUILD | 22 - abs/core-testing/setserial/setserial.patch | 28 - abs/core-testing/setuptools/PKGBUILD | 23 - abs/core-testing/sg3_utils/PKGBUILD | 18 - abs/core-testing/shadow/PKGBUILD | 86 - abs/core-testing/shadow/adduser | 399 - abs/core-testing/shadow/chage | 6 - abs/core-testing/shadow/chsh | 6 - abs/core-testing/shadow/defaults.pam | 6 - abs/core-testing/shadow/login | 18 - abs/core-testing/shadow/login.defs | 212 - abs/core-testing/shadow/passwd | 4 - abs/core-testing/shadow/shadow | 6 - .../shadow/shadow-4.0.18.2-useradd-fix-1.patch | 26 - abs/core-testing/shadow/shadow-UID_GID.patch | 34 - abs/core-testing/shadow/shadow.cron.daily | 6 - abs/core-testing/shadow/shadow.install | 11 - abs/core-testing/shadow/useradd | 6 - abs/core-testing/shadow/useradd-default.patch | 14 - abs/core-testing/shadow/useradd.defaults | 9 - abs/core-testing/shadow/xstrdup.patch | 9 - abs/core-testing/shared-mime-info/PKGBUILD | 22 - .../shared-mime-info/shared-mime-info.install | 12 - abs/core-testing/sharutils/PKGBUILD | 20 - abs/core-testing/sqlite3/PKGBUILD | 43 - .../sqlite3/build_fts_as_part_of_libsqlite.patch | 139 - abs/core-testing/sqlite3/license.txt | 33 - .../sqlite3/sqlite-3.5.8-pkgconfig-version.patch | 12 - abs/core-testing/squashfs-tools/PKGBUILD | 25 - .../squashfs-tools/mksquashfs-fix-race.patch | 23 - abs/core-testing/sudo/PKGBUILD | 29 - abs/core-testing/sudo/sudo.pam | 3 - abs/core-testing/sysfsutils/PKGBUILD | 31 - abs/core-testing/syslinux/PKGBUILD | 25 - abs/core-testing/syslog-ng/PKGBUILD | 34 - abs/core-testing/syslog-ng/syslog-ng | 39 - abs/core-testing/syslog-ng/syslog-ng.conf | 91 - abs/core-testing/syslog-ng/syslog-ng.logrotate | 7 - abs/core-testing/system-templates/PKGBUILD | 16 - .../templates/LCD/Shuttle-SG33/LCDd.conf | 869 - .../templates/LCD/Silverstone/LCDd.conf | 869 - .../templates/LCD/Silverstone/modules | 1 - .../templates/LCD/antec_fusion/LCDd.conf | 869 - .../templates/LCD/antec_fusion/lircd.conf | 38 - .../templates/LCD/antec_fusion/lircrc | 15 - .../templates/LCD/antec_fusion/modules | 1 - .../system-templates/templates/LCD/xosd/LCDd.conf | 957 - .../system-templates/templates/cc.orig.sh | 35 - abs/core-testing/system-templates/templates/cc.sh | 5 - .../system-templates/templates/cc_vol.sh | 5 - .../system-templates/templates/change_chan.sh | 19 - .../system-templates/templates/cron.template | 4 - .../templates/etcnet/eth/ipv4address | 2 - .../templates/etcnet/eth/ipv4route | 2 - .../system-templates/templates/etcnet/eth/iwconfig | 2 - .../system-templates/templates/etcnet/eth/options | 7 - .../templates/evrouter/MythVantage-4 | 0 .../templates/evrouter/MythVantage-8 | 0 .../templates/evrouter/MythVantage-Full | 0 .../templates/evrouter/MythVantage8-minipac | 3 - .../templates/evrouter/MythVantage8-uhid | 3 - .../system-templates/templates/exports.template | 8 - .../system-templates/templates/fstab.conf.template | 16 - .../system-templates/templates/gscreensavers | 200 - .../templates/modules/lirc_i2c.conf | 2 - .../system-templates/templates/mysql.service | 13 - .../system-templates/templates/mysql.txt | 29 - .../system-templates/templates/ncid.conf.template | 51 - .../system-templates/templates/ncidd.conf.template | 143 - .../system-templates/templates/real_change_chan.sh | 19 - .../templates/remotes/AOpen-EA65/lircd.conf.ea65 | 73 - .../templates/remotes/AOpen-EA65/lircrc.ea65 | 381 - .../templates/remotes/AOpen-EA65/preview.jpg | Bin 76036 -> 0 bytes .../remotes/ASUS-DiGiMatrix/lircd.conf.asus | 56 - .../remotes/ASUS-DiGiMatrix/lircd.conf.digimatrix | 152 - .../templates/remotes/ASUS-DiGiMatrix/preview.jpg | Bin 28706 -> 0 bytes .../templates/remotes/ATI_Remote_Wonder/lircd.conf | 76 - .../templates/remotes/ATI_Remote_Wonder/lircrc | 636 - .../remotes/ATI_Remote_Wonder/preview.jpg | Bin 63480 -> 0 bytes .../remotes/ATI_Remote_Wonder_Plus/lircd.conf | 198 - .../remotes/ATI_Remote_Wonder_Plus/lircrc | 258 - .../remotes/ATI_Remote_Wonder_Plus/preview.jpg | Bin 25555 -> 0 bytes .../remotes/Avermedia_77x/lircd-avermedia77x.conf | 66 - .../remotes/Avermedia_77x/lircrc-avermedia771.txt | 475 - .../templates/remotes/Avermedia_77x/preview.jpg | Bin 1587 -> 0 bytes .../remotes/Avermedia_98/lircd-avermedia98.conf | 97 - .../remotes/Avermedia_98/lircrc-avermedia98.txt | 477 - .../templates/remotes/Avermedia_98/preview.jpg | Bin 12175 -> 0 bytes .../remotes/Avertv_USB/lircd-avertvusb.conf | 65 - .../remotes/Avertv_USB/lircrc-avertvusb.txt | 482 - .../templates/remotes/Avertv_USB/preview.jpg | Bin 1587 -> 0 bytes .../remotes/Cinergy/lircd-cinergy400600.conf | 67 - .../remotes/Cinergy/lircrc-cinergy400600.txt | 474 - .../templates/remotes/Cinergy/preview.jpg | Bin 1587 -> 0 bytes .../remotes/Cinergy_1400/lircd-cinergy1400.conf | 71 - .../remotes/Cinergy_1400/lircrc-cinergy1400.txt | 474 - .../templates/remotes/Cinergy_1400/preview.jpg | Bin 14916 -> 0 bytes .../remotes/Cinergy_T2/lircd-cinergyT2.conf | 72 - .../remotes/Cinergy_T2/lircrc-cinergyT2.txt | 474 - .../templates/remotes/Cinergy_T2/preview.jpg | Bin 14916 -> 0 bytes .../templates/remotes/Compro/lircd-compro.conf | 364 - .../templates/remotes/Compro/lircrc-compro.txt | 487 - .../templates/remotes/Compro/preview.jpg | Bin 1587 -> 0 bytes .../lircd.conf.dvico-dual-digital4 | 81 - .../lircrc.dvico-dual-digital4 | 430 - .../remotes/Dvico-Dual-Digital4-rev2/preview.jpg | Bin 34354 -> 0 bytes .../remotes/Flyvideo_2000/lircd-flyvideo2000.conf | 57 - .../remotes/Flyvideo_2000/lircrc-flyvideo2000.txt | 474 - .../templates/remotes/Flyvideo_2000/preview.jpg | Bin 1587 -> 0 bytes .../remotes/Flyvideo_3000/lircd-flyvideo3000.conf | 47 - .../remotes/Flyvideo_3000/lircrc-flyvideo3000.txt | 474 - .../templates/remotes/Flyvideo_3000/preview.jpg | Bin 1587 -> 0 bytes .../templates/remotes/Hercules/lircd-hercules.conf | 61 - .../templates/remotes/Hercules/lircrc-hercules.txt | 475 - .../templates/remotes/Hercules/preview.jpg | Bin 13313 -> 0 bytes .../remotes/Kworld_110/lircd-kworld110.conf | 84 - .../remotes/Kworld_110/lircrc-kworld110.txt | 482 - .../templates/remotes/Kworld_110/preview.jpg | Bin 16642 -> 0 bytes .../remotes/Kworld_220/lircd-kworld220.conf | 80 - .../remotes/Kworld_220/lircrc-kworld220.txt | 482 - .../templates/remotes/Kworld_220/preview.jpg | Bin 1587 -> 0 bytes .../remotes/Kworld_310/lircd-kworld310.conf | 80 - .../remotes/Kworld_310/lircrc-kworld310.txt | 482 - .../templates/remotes/Kworld_310/preview.jpg | Bin 25987 -> 0 bytes .../remotes/Kworld_DVBT/lircd-kworlddvbt.conf | 71 - .../remotes/Kworld_DVBT/lircrc-kworlddvbt.txt | 474 - .../templates/remotes/Kworld_DVBT/preview.jpg | Bin 1587 -> 0 bytes .../remotes/Kworld_tv878/lircd-kworldtv878.conf | 70 - .../remotes/Kworld_tv878/lircrc-kworldv878.txt | 482 - .../templates/remotes/Kworld_tv878/preview.jpg | Bin 1587 -> 0 bytes .../Leadtek_2000XP/lircd-leadtek2000xp.conf | 77 - .../Leadtek_2000XP/lircrc-leadtek2000xp.txt | 474 - .../templates/remotes/Leadtek_2000XP/preview.jpg | Bin 16424 -> 0 bytes .../remotes/Leadtek_PVR/lircd-leadtekPVR.conf | 82 - .../remotes/Leadtek_PVR/lircrc-leadtekPVR.txt | 474 - .../templates/remotes/Leadtek_PVR/preview.jpg | Bin 1587 -> 0 bytes .../templates/remotes/Lifeview/lircd-lifeview.conf | 48 - .../templates/remotes/Lifeview/lircrc-lifeview.txt | 474 - .../templates/remotes/Lifeview/preview.jpg | Bin 1587 -> 0 bytes .../remotes/MX-500-jams/lircd.conf.MX-500-JAMS | 115 - .../templates/remotes/MX-500-jams/lircrc | 832 - .../templates/remotes/MX-500-jams/preview.jpg | Bin 10473 -> 0 bytes .../remotes/Medion_RF/lircd-medion-rf.conf | 82 - .../remotes/Medion_RF/lircrc-medion-rf.txt | 474 - .../templates/remotes/Medion_RF/preview.jpg | Bin 1587 -> 0 bytes .../Medion_X10_8080/lircd-medionx10-8080.conf | 68 - .../Medion_X10_8080/lircrc-medionx10-8080.txt | 474 - .../templates/remotes/Medion_X10_8080/preview.jpg | Bin 1587 -> 0 bytes .../Medion_X10_8802/lircd-medionx10-8802.conf | 126 - .../Medion_X10_8802/lircrc-medionx10-8802.txt | 487 - .../templates/remotes/Medion_X10_8802/preview.jpg | Bin 1587 -> 0 bytes .../templates/remotes/MythVantage-one/lircd.conf | 115 - .../templates/remotes/MythVantage-one/lircrc | 857 - .../templates/remotes/MythVantage-one/preview.jpg | Bin 88727 -> 0 bytes .../templates/remotes/Nebula/lircd-nebula.conf | 88 - .../templates/remotes/Nebula/lircrc-nebula.txt | 402 - .../templates/remotes/Nebula/preview.jpg | Bin 10625 -> 0 bytes .../templates/remotes/Nexus/lircd-nexus.conf | 73 - .../templates/remotes/Nexus/lircrc-nexus.txt | 459 - .../templates/remotes/Nexus/preview.jpg | Bin 1587 -> 0 bytes .../templates/remotes/Nova_500/lircd-nova500.conf | 69 - .../templates/remotes/Nova_500/lircrc-nova500.txt | 559 - .../templates/remotes/Nova_500/preview.jpg | Bin 1587 -> 0 bytes .../templates/remotes/Nova_T/lircd-novat.conf | 60 - .../templates/remotes/Nova_T/lircrc-novat.txt | 474 - .../templates/remotes/Nova_T/preview.jpg | Bin 1587 -> 0 bytes .../remotes/Nova_T_USB2/lircd-novatusb2.conf | 77 - .../remotes/Nova_T_USB2/lircrc-novatusb2.txt | 474 - .../templates/remotes/Nova_T_USB2/preview.jpg | Bin 1587 -> 0 bytes .../templates/remotes/Nvidia/lircd-nvidia.conf | 62 - .../templates/remotes/Nvidia/lircrc-nvidia.txt | 474 - .../templates/remotes/Nvidia/preview.jpg | Bin 1587 -> 0 bytes .../remotes/Nvidia_X10/lircd-nvidiax10.conf | 71 - .../remotes/Nvidia_X10/lircrc-nvidiax10.txt | 474 - .../templates/remotes/Nvidia_X10/preview.jpg | Bin 1587 -> 0 bytes .../templates/remotes/One4All/lircd-one4all.conf | 111 - .../templates/remotes/One4All/lircrc-one4all.txt | 730 - .../templates/remotes/One4All/preview.jpg | Bin 7432 -> 0 bytes .../remotes/One4All_6131/lircd-one4all6131.conf | 31 - .../remotes/One4All_6131/lircrc-one4all6131.txt | 474 - .../templates/remotes/One4All_6131/preview.jpg | Bin 10324 -> 0 bytes .../remotes/One4All_7544/lircd-one4all7544.conf | 49 - .../remotes/One4All_7544/lircrc-one4all7544.txt | 474 - .../templates/remotes/One4All_7544/preview.jpg | Bin 14880 -> 0 bytes .../remotes/One4All_9910/lircd-one4all9910.conf | 53 - .../remotes/One4All_9910/lircrc-one4all9910.txt | 474 - .../templates/remotes/One4All_9910/preview.jpg | Bin 18720 -> 0 bytes .../remotes/Packard_bell/lircd-packard.conf | 92 - .../remotes/Packard_bell/lircrc-packard.txt | 474 - .../templates/remotes/Packard_bell/preview.jpg | Bin 21260 -> 0 bytes .../templates/remotes/Pinnacle/lircd-pinnacle.conf | 97 - .../templates/remotes/Pinnacle/lircrc-pinnacle.txt | 474 - .../templates/remotes/Pinnacle/preview.jpg | Bin 11124 -> 0 bytes .../templates/remotes/Provideo/lircd-provideo.conf | 52 - .../templates/remotes/Provideo/lircrc-provideo.txt | 474 - .../templates/remotes/Provideo/preview.jpg | Bin 1587 -> 0 bytes .../RadioShack_15-2116-Jarod_Wilson/lircd-rs.conf | 87 - .../RadioShack_15-2116-Jarod_Wilson/lircrc-rs | 539 - .../RadioShack_15-2116-Jarod_Wilson/preview.jpg | Bin 7504 -> 0 bytes .../templates/remotes/Sasem/lircd-sasem.conf | 81 - .../templates/remotes/Sasem/lircrc-sasem.txt | 474 - .../templates/remotes/Sasem/preview.jpg | Bin 15114 -> 0 bytes .../remotes/Technisat/lircd-technisat.conf | 68 - .../remotes/Technisat/lircrc-technisat.txt | 347 - .../templates/remotes/Technisat/preview.jpg | Bin 11111 -> 0 bytes .../templates/remotes/Tekram/lircd-tekram.conf | 48 - .../templates/remotes/Tekram/lircrc-tekram.txt | 474 - .../templates/remotes/Tekram/preview.jpg | Bin 1587 -> 0 bytes .../templates/remotes/Twinham/lircd-twinhan.conf | 44 - .../templates/remotes/Twinham/lircrc-twinhan.txt | 474 - .../templates/remotes/Twinham/preview.jpg | Bin 1587 -> 0 bytes .../templates/remotes/X10_Lola/lircd-x10lola.conf | 78 - .../templates/remotes/X10_Lola/lircrc-x10lola.txt | 334 - .../templates/remotes/X10_Lola/preview.jpg | Bin 11610 -> 0 bytes .../templates/remotes/atiusb/lircd.conf.atiusb | 1259 - .../remotes/avermedia/lircd.conf.avermedia | 72 - .../remotes/avermedia/lircd.conf.avermedia98 | 175 - .../templates/remotes/avermedia/lircd.conf.vdomate | 61 - .../remotes/avermedia/lircmd.conf.avermedia | 33 - .../remotes/avermedia/lircmd.conf.avermedia98 | 37 - .../templates/remotes/avermedia/preview.jpg | Bin 1587 -> 0 bytes .../templates/remotes/bestbuy/lircd.conf.bestbuy | 63 - .../templates/remotes/bestbuy/lircd.conf.bestbuy2 | 59 - .../templates/remotes/bestbuy/lircmd.conf.bestbuy | 33 - .../templates/remotes/bestbuy/lircmd.conf.bestbuy2 | 34 - .../templates/remotes/bestbuy/preview.jpg | Bin 1587 -> 0 bytes .../templates/remotes/caraca/lircd.conf.caraca | 46 - .../templates/remotes/caraca/lircrc.caraca | 134 - .../templates/remotes/caraca/preview.jpg | Bin 1587 -> 0 bytes .../templates/remotes/dvico/lircd.conf.fusionHDTV | 226 - .../templates/remotes/dvico/lircrc.txt | 883 - .../templates/remotes/dvico/preview.jpg | Bin 29813 -> 0 bytes .../templates/remotes/generic/DENON.conf | 31 - .../templates/remotes/generic/MOTOROLA.conf | 53 - .../templates/remotes/generic/NEC-pulse.conf | 32 - .../templates/remotes/generic/NEC-short-pulse.conf | 34 - .../templates/remotes/generic/NEC.conf | 30 - .../templates/remotes/generic/RC-5.conf | 30 - .../templates/remotes/generic/RC-6.conf | 28 - .../templates/remotes/generic/RCMM-32.conf | 23 - .../templates/remotes/generic/RECS80.conf | 31 - .../templates/remotes/generic/SANYO.conf | 34 - .../templates/remotes/generic/SONY12.conf | 28 - .../templates/remotes/generic/SONY20.conf | 29 - .../templates/remotes/gr8zap/lircd.conf.streamzap | 69 - .../templates/remotes/gr8zap/lircrc | 472 - .../templates/remotes/gr8zap/preview.jpg | Bin 83195 -> 0 bytes .../remotes/hauppauge-black/lircd-haupblack.conf | 55 - .../remotes/hauppauge-black/lircrc-haupblack.conf | 135 - .../templates/remotes/hauppauge-black/preview.jpg | Bin 35841 -> 0 bytes .../templates/remotes/hauppauge-blaster/lircd.conf | 31133 ---------- .../hauppauge-blaster/lircrc-haupgrey-g3.txt | 586 - .../remotes/hauppauge-blaster/preview.jpg | Bin 45763 -> 0 bytes .../hauppauge-grey-alt/lircd-haupgrey-alt.conf | 199 - .../remotes/hauppauge-grey-alt/lircrc-haupgrey-alt | 533 - .../remotes/hauppauge-grey-alt/preview.jpg | Bin 3069 -> 0 bytes .../remotes/hauppauge-grey/lircd-haupgrey.conf | 199 - .../remotes/hauppauge-grey/lircrc-haupgrey.txt | 505 - .../templates/remotes/hauppauge-grey/preview.jpg | Bin 3069 -> 0 bytes .../hauppauge-silver/lircd-haupgrey-g3.conf | 64 - .../hauppauge-silver/lircrc-haupgrey-g3.txt | 762 - .../templates/remotes/hauppauge-silver/preview.jpg | Bin 45763 -> 0 bytes .../system-templates/templates/remotes/i2c.id | 14 - .../templates/remotes/imon-pad/lircd.conf | 88 - .../templates/remotes/imon-pad/lircrc | 240 - .../templates/remotes/imon-pad/preview.jpg | Bin 35870 -> 0 bytes .../templates/remotes/imon/lircd.conf.imon | 79 - .../templates/remotes/imon/lircd.conf.imon-pad | 84 - .../templates/remotes/imon/lircd.conf.imon-rsc | 109 - .../system-templates/templates/remotes/imon/lircrc | 240 - .../templates/remotes/imon/preview.jpg | Bin 25799 -> 0 bytes .../templates/remotes/mceusb/lircd.conf.mceusb | 163 - .../templates/remotes/mceusb/lircrc-mceusb | 877 - .../templates/remotes/mceusb/preview.jpg | Bin 12551 -> 0 bytes .../templates/remotes/no_remote/preview.jpg | Bin 3087 -> 0 bytes .../templates/remotes/receiver_usb.id | 35 - .../remotes/sigma_designs/lircd.conf.realmagic | 83 - .../remotes/snapstream_firefly/lircd.snapstrm.conf | 127 - .../remotes/snapstream_firefly/lircrc-snapstrm.txt | 590 - .../remotes/snapstream_firefly/preview.jpg | Bin 63750 -> 0 bytes .../snapstream_mini/lircd-snapstreammini.conf | 70 - .../snapstream_mini/lircrc-snapstreammini.txt | 474 - .../templates/remotes/snapstream_mini/preview.jpg | Bin 17713 -> 0 bytes .../remotes/streamzap/lircd.conf.streamzap | 72 - .../templates/remotes/streamzap/lircrc | 832 - .../templates/remotes/streamzap/preview.jpg | Bin 83195 -> 0 bytes .../remotes/technisat/lircd.conf.mediafocusI | 42 - .../templates/remotes/unknown/preview.jpg | Bin 1587 -> 0 bytes .../templates/remotes/x10/lircd.conf.mouseremote | 116 - .../templates/remotes/x10/lircd.conf.mp3anywhere | 64 - .../templates/remotes/x10/lircmd.conf.mouseremote | 288 - .../templates/samba/smb.conf.template | 125 - .../templates/settings/default_1/jumppoints.txt | 44 - .../templates/settings/default_1/keybindings.txt | 209 - .../templates/settings/default_1/settings.txt | 320 - .../templates/settings/default_2/jumppoints.txt | 44 - .../templates/settings/default_2/keybindings.txt | 209 - .../templates/settings/default_2/settings.txt | 320 - .../system-templates/templates/sources/mv-core | 2 - .../templates/sources/mv-core-testing | 2 - .../system-templates/templates/sources/mv-extra | 2 - .../templates/sources/mv-extra-testing | 2 - .../system-templates/templates/sources/svc_pkg | 3 - .../transmit/Time_Warner_SA3250/lircd.conf | 413 - .../templates/transmit/amino_STB/lircd.conf | 162 - .../templates/transmit/coolsat_4000/lircd.conf | 51 - .../templates/transmit/coolsat_5000/lircd.conf | 60 - .../transmit/digitalstream_9900/lircd.conf | 69 - .../templates/transmit/dish301_311/lircd.conf | 78 - .../templates/transmit/dish501_508/lircd.conf | 78 - .../templates/transmit/dish_dvr625/lircd.conf | 68 - .../templates/transmit/dish_network/lircd.conf | 1272 - .../templates/transmit/echostar_2700/lircd.conf | 1274 - .../templates/transmit/echostar_4700/lircd.conf | 1274 - .../templates/transmit/echostar_4900/lircd.conf | 1274 - .../templates/transmit/echostar_5000/lircd.conf | 1274 - .../templates/transmit/expressvu3100/lircd.conf | 78 - .../templates/transmit/expressvu5xxx/lircd.conf | 78 - .../templates/transmit/fortec_lifetime/lircd.conf | 68 - .../templates/transmit/general_550/lircd.conf | 63 - .../templates/transmit/hughes_hbh/lircd.conf | 74 - .../templates/transmit/humax_5400/lircd.conf | 68 - .../templates/transmit/illusion_m3/lircd.conf | 72 - .../templates/transmit/motorola_dct2000/lircd.conf | 75 - .../templates/transmit/motorola_dct22xx/lircd.conf | 103 - .../templates/transmit/motorola_dct2524/lircd.conf | 83 - .../templates/transmit/motorola_dct6200/lircd.conf | 70 - .../templates/transmit/motorola_dct700/lircd.conf | 359 - .../templates/transmit/motorola_dsr205/lircd.conf | 239 - .../templates/transmit/motorola_dsr305/lircd.conf | 93 - .../templates/transmit/motorola_dsr315/lircd.conf | 239 - .../templates/transmit/motorola_dsr922/lircd.conf | 66 - .../templates/transmit/motorola_dth335/lircd.conf | 55 - .../templates/transmit/motorola_qip7100/lircd.conf | 81 - .../templates/transmit/motorola_rg2xxx/lircd.conf | 144 - .../templates/transmit/motorola_vip12xx/lircd.conf | 73 - .../templates/transmit/nokia_8003/lircd.conf | 87 - .../templates/transmit/nokia_9600/lircd.conf | 90 - .../templates/transmit/nokia_9780/lircd.conf | 261 - .../templates/transmit/nokia_9802/lircd.conf | 227 - .../templates/transmit/nokia_dbox2/lircd.conf | 59 - .../templates/transmit/pace_4001/lircd.conf | 70 - .../templates/transmit/pace_420/lircd.conf | 207 - .../templates/transmit/pace_dsr2000/lircd.conf | 71 - .../templates/transmit/pace_dsr600/lircd.conf | 71 - .../templates/transmit/pace_mss200/lircd.conf | 69 - .../templates/transmit/pace_mss300/lircd.conf | 68 - .../templates/transmit/pace_psr800/lircd.conf | 58 - .../templates/transmit/pace_psr900/lircd.conf | 61 - .../transmit/pace_xsat_cdtv410/lircd.conf | 70 - .../templates/transmit/pansat_2700a/lircd.conf | 86 - .../templates/transmit/pioneer_bdv300/lircd.conf | 92 - .../templates/transmit/pvr150/lircd.conf | 30947 ---------- .../transmit/rca_drd4xxrg_series/lircd.conf | 71 - .../transmit/rca_drd4xxrh_series/lircd.conf | 71 - .../templates/transmit/samsung_1000/lircd.conf | 71 - .../templates/transmit/samsung_300/lircd.conf | 50 - .../templates/transmit/samsung_702/lircd.conf | 75 - .../templates/transmit/sciatl_4200/lircd.conf | 87 - .../templates/transmit/sciatl_exp1840/lircd.conf | 77 - .../templates/transmit/sciatl_exp2000/lircd.conf | 423 - .../transmit/sciatl_exp2xxx_3xxx_4xxx/lircd.conf | 87 - .../templates/transmit/sciatl_exp8000/lircd.conf | 87 - .../templates/transmit/skymaster_9410/lircd.conf | 69 - .../templates/transmit/skyplus/lircd.conf | 74 - .../transmit/technisat_st3002s/lircd.conf | 64 - .../transmit/technisat_st3004s/lircd.conf | 67 - .../templates/transmit/zenith_dtt900/lircd.conf | 67 - .../templates/xine.config.template | 754 - .../templates/xorg/96xx_supported.txt | 175 - .../system-templates/templates/xorg/modeline.ATSC | 33 - .../system-templates/templates/xorg/modeline.DVD | 9 - .../system-templates/templates/xorg/modeline.NTSC | 10 - .../system-templates/templates/xorg/modeline.VESA | 163 - .../templates/xorg/modeline.custom | 1 - .../system-templates/templates/xorg/xorg.conf.ati | 98 - .../templates/xorg/xorg.conf.intel | 152 - .../templates/xorg/xorg.conf.nvidia | 88 - .../system-templates/templates/xorg/xorg.conf.vesa | 70 - .../system-templates/templates/xorg/xorg.conf.via | 75 - .../templates/xorg/xorg.conf.vmware | 70 - .../templates/xscreensaver.template | 255 - .../system-templates/templates/xscreensavers | 198 - abs/core-testing/sysvinit/PKGBUILD | 26 - abs/core-testing/sysvinit/halt-init.patch | 17 - abs/core-testing/taglib/PKGBUILD | 29 - abs/core-testing/talloc/PKGBUILD | 26 - abs/core-testing/tar/PKGBUILD | 22 - abs/core-testing/tar/tar.1 | 376 - abs/core-testing/tcl/ChangeLog | 16 - abs/core-testing/tcl/PKGBUILD | 41 - abs/core-testing/tcp_wrappers/PKGBUILD | 35 - abs/core-testing/tcp_wrappers/gcc340.patch | 11 - abs/core-testing/tcp_wrappers/hosts.allow | 5 - abs/core-testing/tcp_wrappers/hosts.deny | 7 - abs/core-testing/tcp_wrappers/safe_finger.8 | 34 - .../tcp_wrappers/shared_lib_plus_plus-1.patch | 1025 - abs/core-testing/tcp_wrappers/try-from.8 | 28 - abs/core-testing/tdb/PKGBUILD | 26 - abs/core-testing/tdb/gcc3.patch | 41 - abs/core-testing/test-pattern/PKGBUILD | 16 - abs/core-testing/test-pattern/test_pattern.bash | 326 - abs/core-testing/texinfo/ChangeLog | 17 - abs/core-testing/texinfo/PKGBUILD | 26 - abs/core-testing/texinfo/texinfo.install | 18 - abs/core-testing/tftp-hpa/LICENSE | 32 - abs/core-testing/tftp-hpa/PKGBUILD | 29 - abs/core-testing/tftp-hpa/tftpd.conf | 4 - abs/core-testing/tftp-hpa/tftpd.rc | 38 - abs/core-testing/tiacx-firmware/PKGBUILD | 22 - .../tiacx-firmware/tiacx-firmware.install | 18 - abs/core-testing/tiacx/PKGBUILD | 35 - abs/core-testing/tiacx/acx.install | 19 - abs/core-testing/tiacx/kernel-2.6.27.patch | 82 - abs/core-testing/tiacx/kernel-2.6.30.patch | 16 - abs/core-testing/tiacx/kernel-2.6.31.patch | 88 - abs/core-testing/tiacx/kernel-2.6.33.patch | 11 - abs/core-testing/tk/ChangeLog | 21 - abs/core-testing/tk/PKGBUILD | 37 - abs/core-testing/transcode/PKGBUILD | 67 - abs/core-testing/transcode/transcode.install | 6 - abs/core-testing/trapproto/PKGBUILD | 19 - abs/core-testing/ttf-bitstream-vera/PKGBUILD | 22 - abs/core-testing/ttf-bitstream-vera/vera.install | 20 - abs/core-testing/ttf-dejavu/ChangeLog | 19 - abs/core-testing/ttf-dejavu/PKGBUILD | 25 - abs/core-testing/ttf-dejavu/ttf-dejavu.install | 13 - abs/core-testing/tweaker/PKGBUILD | 45 - abs/core-testing/tweaker/bin/LocalIPCheck.pl | 47 - abs/core-testing/tweaker/bin/SQLtweaker.sh | 86 - abs/core-testing/tweaker/bin/create-linhes-sql.sh | 166 - abs/core-testing/tweaker/bin/tweaker.pl | 333 - abs/core-testing/tweaker/bin/twk_EXAMPLE.pl | 134 - abs/core-testing/tweaker/bin/twk_RAM.pl | 81 - abs/core-testing/tweaker/bin/twk_audio.pl | 390 - abs/core-testing/tweaker/bin/twk_cpu.pl | 163 - abs/core-testing/tweaker/bin/twk_dragon.pl | 65 - .../tweaker/bin/twk_fingerprint_hardware.sh | 98 - abs/core-testing/tweaker/bin/twk_general.pl | 590 - abs/core-testing/tweaker/bin/twk_general.pl.orig | 579 - abs/core-testing/tweaker/bin/twk_graphics.pl | 149 - abs/core-testing/tweaker/bin/twk_keymap.sh | 66 - abs/core-testing/tweaker/bin/twk_localization.pl | 72 - abs/core-testing/tweaker/bin/twk_misc.pl | 13 - abs/core-testing/tweaker/bin/twk_scrub_sql.pl | 96 - abs/core-testing/tweaker/bin/twk_tuners.pl | 491 - abs/core-testing/tweaker/bin/twk_tuners_notes.txt | 55 - abs/core-testing/tweaker/bin/twk_upgrade.pl | 190 - .../tweaker/bin/twk_what_has_changed.sh | 183 - abs/core-testing/tweaker/fs/etc/asound.conf | 15 - .../fs/home/mythtv/.config/smplayer/smplayer.ini | 429 - .../tweaker/fs/var/lib/alsa/ALC888.asound.state | 354 - .../tweaker/fs/var/lib/alsa/AV710.asound.state | 567 - .../tweaker/lib/Tweaker/Definitions.pm | 66 - abs/core-testing/tweaker/lib/Tweaker/Script.pm | 353 - abs/core-testing/tweaker/log4perl.conf | 13 - abs/core-testing/tweaker/tcf/EXAMPLE.tcf | 38 - abs/core-testing/tweaker/tcf/focus.tcf | 113 - abs/core-testing/tweaker/tcf/os.tcf | 10 - abs/core-testing/tweaker/tcf/tcf.dtd | 11 - abs/core-testing/tweaker/tcf/tweaker-core.tcf | 47 - abs/core-testing/tweaker/tcf/userland.tcf | 0 abs/core-testing/tweaker/tweaker.install | 39 - abs/core-testing/tweaker/tweaker.sh | 4 - abs/core-testing/tzdata/Makefile.patch | 140 - abs/core-testing/tzdata/PKGBUILD | 36 - abs/core-testing/tzdata/chile.patch | 65 - abs/core-testing/udev/81-arch.rules | 143 - abs/core-testing/udev/PKGBUILD | 127 - abs/core-testing/udev/arch-udev-rules.patch | 50 - abs/core-testing/udev/cdsymlinks.sh | 44 - abs/core-testing/udev/load-modules.sh | 80 - abs/core-testing/udev/logitech-rules.patch | 14 - abs/core-testing/udev/root-link.sh | 7 - abs/core-testing/udev/udev.install | 29 - abs/core-testing/unclutter/PKGBUILD | 28 - abs/core-testing/unclutter/unclutter.cfg | 2 - abs/core-testing/unzip/PKGBUILD | 32 - abs/core-testing/urlgrabber/PKGBUILD | 15 - abs/core-testing/usbutils/PKGBUILD | 25 - abs/core-testing/util-linux-ng/PKGBUILD | 49 - abs/core-testing/util-linux-ng/fix-findmnt.patch | 24 - .../util-linux-ng/util-linux-ng-cfdisk.patch | 57 - .../util-linux-ng/util-linux-ng-nilfs2.patch | 276 - .../util-linux-ng/util-linux-ng.install | 21 - abs/core-testing/v4l-dvb/PKGBUILD | 28 - abs/core-testing/v4l-dvb/hdpvr.diff | 22 - abs/core-testing/v4l-dvb/v4l-dvb.install | 23 - abs/core-testing/vbetool/PKGBUILD | 32 - abs/core-testing/vdpauinfo-legacy/PKGBUILD | 26 - abs/core-testing/vdpauinfo-legacy/vdpauinfo | 2 - abs/core-testing/vdpauinfo/PKGBUILD | 24 - abs/core-testing/vdpauinfo/__changelog | 2 - abs/core-testing/vi/PKGBUILD | 71 - abs/core-testing/vi/__changelog | 3 - abs/core-testing/vi/fetch_patches.sh | 61 - abs/core-testing/vi/fetch_runtime.sh | 117 - abs/core-testing/vi/vi.install | 37 - abs/core-testing/videoproto/PKGBUILD | 19 - abs/core-testing/wget/PKGBUILD | 29 - abs/core-testing/wget/wget-1.12-2-i686.pkg.tar.gz | 1 - abs/core-testing/wget/wget.install | 20 - abs/core-testing/which/PKGBUILD | 24 - abs/core-testing/which/which.install | 20 - abs/core-testing/wireless_tools/PKGBUILD | 27 - abs/core-testing/wireless_tools/wireless.conf.d | 12 - abs/core-testing/wpa_supplicant/PKGBUILD | 41 - abs/core-testing/wpa_supplicant/config | 385 - abs/core-testing/x264/PKGBUILD | 35 - abs/core-testing/xbitmaps/PKGBUILD | 22 - abs/core-testing/xcb-proto/PKGBUILD | 23 - abs/core-testing/xcb-util/LICENSE | 267 - abs/core-testing/xcb-util/PKGBUILD | 26 - abs/core-testing/xcmiscproto/PKGBUILD | 19 - abs/core-testing/xcursor-themes/LICENSE | 24 - abs/core-testing/xcursor-themes/PKGBUILD | 22 - abs/core-testing/xdotool/PKGBUILD | 28 - abs/core-testing/xextproto/PKGBUILD | 21 - abs/core-testing/xf86-input-acecad/PKGBUILD | 22 - abs/core-testing/xf86-input-aiptek/PKGBUILD | 22 - abs/core-testing/xf86-input-elographics/PKGBUILD | 26 - abs/core-testing/xf86-input-evdev/PKGBUILD | 26 - abs/core-testing/xf86-input-fpit/PKGBUILD | 22 - abs/core-testing/xf86-input-hyperpen/PKGBUILD | 22 - abs/core-testing/xf86-input-joystick/PKGBUILD | 23 - abs/core-testing/xf86-input-keyboard/PKGBUILD | 25 - .../xf86-input-keyboard/new-server.patch | 5087 -- abs/core-testing/xf86-input-mouse/PKGBUILD | 25 - abs/core-testing/xf86-input-mutouch/PKGBUILD | 22 - abs/core-testing/xf86-input-penmount/PKGBUILD | 22 - abs/core-testing/xf86-input-synaptics/PKGBUILD | 31 - abs/core-testing/xf86-input-vmmouse/PKGBUILD | 26 - abs/core-testing/xf86-input-void/PKGBUILD | 25 - abs/core-testing/xf86-video-amd/PKGBUILD | 28 - abs/core-testing/xf86-video-apm/LICENSE | 92 - abs/core-testing/xf86-video-apm/PKGBUILD | 27 - abs/core-testing/xf86-video-ark/LICENSE | 48 - abs/core-testing/xf86-video-ark/PKGBUILD | 26 - abs/core-testing/xf86-video-ati/PKGBUILD | 28 - abs/core-testing/xf86-video-ati/git-20081021.patch | 17245 ------ .../xf86-video-ati/mesa-7.1-link-shared.patch | 102 - abs/core-testing/xf86-video-chips/LICENSE | 89 - abs/core-testing/xf86-video-chips/PKGBUILD | 29 - abs/core-testing/xf86-video-cirrus/LICENSE | 22 - abs/core-testing/xf86-video-cirrus/PKGBUILD | 27 - abs/core-testing/xf86-video-dummy/PKGBUILD | 26 - abs/core-testing/xf86-video-fbdev/PKGBUILD | 26 - abs/core-testing/xf86-video-geode/PKGBUILD | 31 - abs/core-testing/xf86-video-glint/LICENSE | 84 - abs/core-testing/xf86-video-glint/PKGBUILD | 27 - abs/core-testing/xf86-video-i128/LICENSE | 23 - abs/core-testing/xf86-video-i128/PKGBUILD | 27 - abs/core-testing/xf86-video-i740/LICENSE | 47 - abs/core-testing/xf86-video-i740/PKGBUILD | 27 - abs/core-testing/xf86-video-imstt/PKGBUILD | 23 - .../xf86-video-intel/20_thinkpad_g40_quirk.patch | 18 - .../xf86-video-intel/21_quirk_lenovo.patch | 12 - .../23_quirks_studiohybrid_eeepc_and_w251u.patch | 13 - .../xf86-video-intel/25_quirk_nc6110.patch | 13 - .../26_i830-use-lfp-data-ptrs.patch | 63 - .../xf86-video-intel/27_disable_fbc_on_965.patch | 18 - abs/core-testing/xf86-video-intel/LICENSE | 440 - abs/core-testing/xf86-video-intel/PKGBUILD | 31 - .../intel-2.11-no-pageflipping.patch | 33 - abs/core-testing/xf86-video-ivtvfb/PKGBUILD | 26 - .../xf86-video-ivtv-pagesize.patch | 20 - abs/core-testing/xf86-video-mach64/LICENSE | 209 - abs/core-testing/xf86-video-mach64/PKGBUILD | 27 - .../xf86-video-mach64/mesa-7.1-link-shared.patch | 102 - abs/core-testing/xf86-video-mga/PKGBUILD | 26 - .../xf86-video-mga/mesa-7.1-link-shared.patch | 102 - abs/core-testing/xf86-video-neomagic/PKGBUILD | 26 - abs/core-testing/xf86-video-nouveau/PKGBUILD | 41 - .../xf86-video-nouveau/xf86-video-nouveau.install | 16 - abs/core-testing/xf86-video-nv/PKGBUILD | 27 - abs/core-testing/xf86-video-openchrome/LICENSE.txt | 26 - abs/core-testing/xf86-video-openchrome/PKGBUILD | 35 - .../xf86-video-openchrome/drm_stdint.patch | 10 - .../xf86-video-openchrome/svn-r839.patch | 1447 - abs/core-testing/xf86-video-r128/LICENSE | 219 - abs/core-testing/xf86-video-r128/PKGBUILD | 27 - .../xf86-video-r128/mesa-7.1-link-shared.patch | 102 - abs/core-testing/xf86-video-radeonhd/PKGBUILD | 26 - abs/core-testing/xf86-video-rendition/PKGBUILD | 28 - abs/core-testing/xf86-video-s3/LICENSE | 25 - abs/core-testing/xf86-video-s3/PKGBUILD | 27 - abs/core-testing/xf86-video-s3virge/LICENSE | 25 - abs/core-testing/xf86-video-s3virge/PKGBUILD | 26 - abs/core-testing/xf86-video-savage/LICENSE | 97 - abs/core-testing/xf86-video-savage/PKGBUILD | 29 - .../xf86-video-savage/mesa-7.1-link-shared.patch | 102 - abs/core-testing/xf86-video-siliconmotion/PKGBUILD | 27 - abs/core-testing/xf86-video-sis/PKGBUILD | 27 - .../xf86-video-sis/mesa-7.1-link-shared.patch | 102 - abs/core-testing/xf86-video-sisusb/PKGBUILD | 26 - abs/core-testing/xf86-video-tdfx/LICENSE | 160 - abs/core-testing/xf86-video-tdfx/PKGBUILD | 29 - .../xf86-video-tdfx/mesa-7.1-link-shared.patch | 102 - abs/core-testing/xf86-video-trident/PKGBUILD | 27 - .../xf86-video-trident/mesa-7.1-link-shared.patch | 102 - abs/core-testing/xf86-video-tseng/PKGBUILD | 26 - abs/core-testing/xf86-video-unichrome/LICENSE | 23 - abs/core-testing/xf86-video-unichrome/PKGBUILD | 29 - .../xf86-video-unichrome/drm-include.patch | 11 - .../xf86-video-unichrome/fix-defines.patch | 68 - abs/core-testing/xf86-video-v4l/LICENSE | 826 - abs/core-testing/xf86-video-v4l/PKGBUILD | 26 - abs/core-testing/xf86-video-vesa/COPYING | 24 - abs/core-testing/xf86-video-vesa/PKGBUILD | 26 - abs/core-testing/xf86-video-vmware/LICENSE | 27 - abs/core-testing/xf86-video-vmware/PKGBUILD | 28 - abs/core-testing/xf86-video-vmware/abi2.patch | 38 - abs/core-testing/xf86-video-voodoo/PKGBUILD | 26 - abs/core-testing/xf86bigfontproto/PKGBUILD | 19 - abs/core-testing/xf86dgaproto/PKGBUILD | 23 - abs/core-testing/xf86driproto/LICENSE | 50 - abs/core-testing/xf86driproto/PKGBUILD | 23 - abs/core-testing/xf86miscproto/PKGBUILD | 19 - abs/core-testing/xf86vidmodeproto/PKGBUILD | 21 - abs/core-testing/xfsprogs/PKGBUILD | 22 - abs/core-testing/xineramaproto/PKGBUILD | 19 - abs/core-testing/xkeyboard-config/PKGBUILD | 30 - abs/core-testing/xkeyboard-config/fix-abnt2.patch | 20 - abs/core-testing/xmlrpc-c/PKGBUILD | 32 - abs/core-testing/xmltv/PKGBUILD | 33 - abs/core-testing/xorg-apps/LICENSE | 1354 - abs/core-testing/xorg-apps/PKGBUILD | 82 - abs/core-testing/xorg-font-utils/PKGBUILD | 54 - abs/core-testing/xorg-font-utils/ttmkfdir.patch | 86 - .../xorg-font-utils/ttmkfdir_gcc43.patch | 8 - .../xorg-font-utils/xorg-font-utils.install | 8 - abs/core-testing/xorg-fonts-100dpi/PKGBUILD | 35 - abs/core-testing/xorg-fonts-100dpi/xfonts.install | 20 - abs/core-testing/xorg-fonts-75dpi/PKGBUILD | 35 - abs/core-testing/xorg-fonts-75dpi/xfonts.install | 20 - abs/core-testing/xorg-fonts-alias/PKGBUILD | 22 - abs/core-testing/xorg-fonts-encodings/PKGBUILD | 21 - .../xorg-fonts-encodings.install | 16 - abs/core-testing/xorg-fonts-misc/PKGBUILD | 45 - abs/core-testing/xorg-fonts-misc/xfonts.install | 20 - abs/core-testing/xorg-res-utils/PKGBUILD | 31 - abs/core-testing/xorg-server-utils/LICENSE.iceauth | 25 - abs/core-testing/xorg-server-utils/LICENSE.xcmsdb | 18 - abs/core-testing/xorg-server-utils/PKGBUILD | 73 - .../xorg-server/001_fedora_extramodes.patch | 85 - abs/core-testing/xorg-server/10-evdev.conf | 39 - abs/core-testing/xorg-server/10-quirks.conf | 10 - abs/core-testing/xorg-server/PKGBUILD | 88 - abs/core-testing/xorg-server/__changelog | 3 - .../xorg-redhat-die-ugly-pattern-die-die-die.patch | 16 - abs/core-testing/xorg-server/xorg-server.install | 14 - .../xorg-server/xserver-1.5-branch-4970d.patch | 246 - ...-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch | 69 - .../xserver-1.5.3-AEI-on-by-default.patch | 108 - .../xorg-server/xserver-1.7.1-gamma-kdm-fix.patch | 34 - .../xorg-server/xserver-1.7.1-libcrypto.patch | 32 - abs/core-testing/xorg-server/xvfb-run | 180 - abs/core-testing/xorg-server/xvfb-run.1 | 282 - abs/core-testing/xorg-util-macros/PKGBUILD | 23 - abs/core-testing/xorg-utils/LICENSE.xdpyinfo | 26 - abs/core-testing/xorg-utils/LICENSE.xfd | 25 - abs/core-testing/xorg-utils/LICENSE.xlsfonts | 22 - abs/core-testing/xorg-utils/LICENSE.xprop | 45 - abs/core-testing/xorg-utils/PKGBUILD | 60 - abs/core-testing/xorg-xauth/PKGBUILD | 23 - abs/core-testing/xorg-xinit/PKGBUILD | 39 - abs/core-testing/xorg-xinit/xinitrc | 18 - abs/core-testing/xorg-xinit/xserverrc | 1 - abs/core-testing/xorg-xinit/xsession | 10 - abs/core-testing/xorg-xkb-utils/PKGBUILD | 32 - abs/core-testing/xosd/PKGBUILD | 29 - abs/core-testing/xosd/__changelog | 7 - abs/core-testing/xosd/osd_cat.cfg | 6 - abs/core-testing/xproto/PKGBUILD | 22 - abs/core-testing/xterm/LICENSE | 73 - abs/core-testing/xterm/PKGBUILD | 57 - abs/core-testing/xtrans/PKGBUILD | 21 - abs/core-testing/xvidcore/PKGBUILD | 28 - abs/core-testing/xz/PKGBUILD | 42 - .../xz/xz-4.999.9beta-5-i686.pkg.tar.gz | 1 - abs/core-testing/yasm/PKGBUILD | 23 - abs/core-testing/zd1211-firmware/PKGBUILD | 23 - abs/core-testing/zlib/PKGBUILD | 33 - abs/core-testing/zlib/zlib-1.2.5-lfs-decls.patch | 13 - abs/core-testing/zoneminder/Makefile.patch | 13 - abs/core-testing/zoneminder/PKGBUILD | 93 - abs/core-testing/zoneminder/customdb | 31 - abs/core-testing/zoneminder/mootools.v1.11.js | 3 - abs/core-testing/zoneminder/run | 6 - abs/core-testing/zoneminder/zm.conf.patch | 20 - abs/core-testing/zoneminder/zm.rc.d | 172 - abs/core-testing/zoneminder/zmeventdump | 48 - abs/core-testing/zoneminder/zminit.arch | 143 - abs/core-testing/zoneminder/zmupdate.patch | 23 - abs/core-testing/zoneminder/zoneminder.install | 69 - abs/core/LinHES-config/LinHES-release | 2 +- abs/core/LinHES-config/PKGBUILD | 7 +- abs/core/LinHES-config/checkout_MythVantage.sh | 8 +- abs/core/LinHES-config/mv_install.py | 4 +- abs/core/alsa-lib/PKGBUILD | 8 +- abs/core/alsa-lib/python2.5.patch | 11 - ...ch-to-fix-converting-32bit-audio-to-16bit.patch | 242 - abs/core/alsa-utils/PKGBUILD | 20 +- abs/core/alsa-utils/alsa | 4 +- abs/core/alsa-utils/alsaconf.patch | 15 +- abs/core/apache/PKGBUILD | 158 +- abs/core/apache/apache.conf.d | 15 + abs/core/apache/apachectl-confd.patch | 15 + abs/core/apache/httpd | 65 +- abs/core/apache/httpd.install | 16 - abs/core/apache/httpd.logrotate | 1 + abs/core/apr-util/PKGBUILD | 17 +- abs/core/apr/PKGBUILD | 34 +- abs/core/ati-dri/PKGBUILD | 38 - abs/core/ati-dri/mesa-7.1-link-shared.patch | 102 - abs/core/atk/PKGBUILD | 14 +- abs/core/aufs-utils/PKGBUILD | 48 - abs/core/aufs/PKGBUILD | 71 - abs/core/aufs/aufs.install | 31 - abs/core/aufs2-util/PKGBUILD | 25 + abs/core/aufs2-util/create-tarball.sh | 11 + abs/core/aufs2/PKGBUILD | 58 + abs/core/aufs2/aufs2.install | 12 + abs/core/aufs2/create-tarball.sh | 14 + abs/core/avahi/ChangeLog | 8 + abs/core/avahi/PKGBUILD | 51 +- abs/core/avahi/avahi-daemon-dbus.patch | 16 + abs/core/bash/PKGBUILD | 116 +- abs/core/bash/bash-noinfo.patch | 12 - abs/core/bash/enable-system-config-files.patch | 15 + abs/core/bash/profile | 35 - abs/core/bash/profile.bash | 18 +- abs/core/bash/system.bashrc | 31 + abs/core/bc/PKGBUILD | 29 +- abs/core/bc/bc-1.06-info-dir-entry.patch | 11 + abs/core/bc/bc.install | 20 + abs/core/binutils/PKGBUILD | 88 +- abs/core/binutils/binutils.install | 13 +- abs/core/cairo/PKGBUILD | 11 +- abs/core/cloog-ppl/PKGBUILD | 32 + abs/core/coreutils/PKGBUILD | 90 +- abs/core/coreutils/__changelog | 2 - .../coreutils/coreutils-6.10-configuration.patch | 88 - .../coreutils-7.1-cp-recursiveinfloop.patch | 154 - .../coreutils/coreutils-7.1-sort-endoffields.patch | 102 - abs/core/coreutils/coreutils-8.5-2-i686.pkg.tar.gz | 1 + abs/core/coreutils/coreutils-i18n.patch | 4065 -- abs/core/coreutils/coreutils-pam.patch | 241 +- abs/core/coreutils/coreutils-uname.patch | 30 +- abs/core/coreutils/coreutils.install | 4 +- abs/core/coreutils/futimes.patch | 47 - abs/core/coreutils/su | 9 - abs/core/coreutils/su.pam | 9 + abs/core/cups/PKGBUILD | 113 + abs/core/cups/cups | 38 + abs/core/cups/cups-avahi.patch | 1088 + abs/core/cups/cups.install | 11 + abs/core/cups/cups.logrotate | 8 + abs/core/cups/cups.pam | 3 + abs/core/curl/ChangeLog | 5 + abs/core/curl/PKGBUILD | 55 +- abs/core/curl/m4-typo.patch | 13 + abs/core/damageproto/PKGBUILD | 18 +- abs/core/db/PKGBUILD | 36 +- abs/core/db/db.install | 30 +- abs/core/dbus-core/PKGBUILD | 26 +- abs/core/dbus-core/dbus | 2 +- abs/core/dbus-core/dbus.install | 19 +- abs/core/dbus-glib/PKGBUILD | 10 +- abs/core/dbus-python/PKGBUILD | 18 +- abs/core/dbus/PKGBUILD | 39 +- abs/core/device-mapper/ChangeLog | 103 + abs/core/device-mapper/PKGBUILD | 82 +- abs/core/device-mapper/device-mapper.rules | 1 - abs/core/device-mapper/lvm2_hook | 25 + abs/core/device-mapper/lvm2_install | 30 + abs/core/dnsutils/PKGBUILD | 45 +- abs/core/dnsutils/tools-only.patch | 15 +- abs/core/docutils/PKGBUILD | 29 + abs/core/dri2proto/PKGBUILD | 10 +- abs/core/e2fsprogs/MIT-LICENSE | 25 + abs/core/e2fsprogs/PKGBUILD | 55 +- abs/core/e2fsprogs/e2fsprogs.install | 23 +- abs/core/eggdbus/PKGBUILD | 22 + abs/core/elfutils/PKGBUILD | 32 + abs/core/expat/CVE-2009-3560.patch | 13 + abs/core/expat/CVE-2009-3720.patch | 12 + abs/core/expat/PKGBUILD | 26 +- abs/core/fbsplash/PKGBUILD | 103 +- abs/core/fbsplash/__changelog | 4 - abs/core/fbsplash/darch.tar.bz2 | Bin 1572821 -> 0 bytes abs/core/fbsplash/extra/encrypt_hook.patch | 24 - abs/core/fbsplash/fbcondecor.conf | 6 + abs/core/fbsplash/fbcondecor.daemon | 55 + abs/core/fbsplash/fbsplash-basic.sh | 201 + abs/core/fbsplash/fbsplash.bootsteps | 1 - abs/core/fbsplash/fbsplash.conf | 8 - abs/core/fbsplash/fbsplash.daemon | 56 - abs/core/fbsplash/fbsplash.git.patch | 166 + abs/core/fbsplash/fbsplash.initcpio_hook | 102 + abs/core/fbsplash/fbsplash.initcpio_install | 117 +- abs/core/fbsplash/fbsplash.inithooks | 91 - abs/core/fbsplash/fbsplash.install | 36 +- abs/core/fbsplash/splash-functions-arch.sh | 71 - abs/core/fbsplash/splash-functions.sh | 618 - abs/core/fbsplash/splash.conf | 63 + abs/core/filesystem/PKGBUILD | 89 +- abs/core/filesystem/__CHANGELOG | 2 + abs/core/filesystem/__changelog | 2 - abs/core/filesystem/filesystem.install | 20 +- abs/core/filesystem/fstab | 7 +- abs/core/filesystem/group | 47 +- abs/core/filesystem/gshadow | 2 + abs/core/filesystem/ld.so.conf | 2 + abs/core/filesystem/nsswitch.conf | 11 +- abs/core/filesystem/profile | 3 +- abs/core/filesystem/protocols | 57 - abs/core/filesystem/securetty | 15 +- abs/core/filesystem/services | 557 - abs/core/filesystem/shadow | 14 +- abs/core/fixesproto/PKGBUILD | 20 +- abs/core/fontconfig/30-urw-aliases.patch | 13 + abs/core/fontconfig/PKGBUILD | 31 +- abs/core/fontconfig/fontconfig.install | 2 +- abs/core/fontsproto/PKGBUILD | 18 +- abs/core/freetype2/PKGBUILD | 31 +- abs/core/gcc-libs/PKGBUILD | 72 - abs/core/gcc-libs/buildfix_new_bison.patch | 22 - abs/core/gcc-libs/gcc-hash-style-both.patch | 163 - abs/core/gcc-libs/gcc_pure64.patch | 26 - abs/core/gcc/PKGBUILD | 248 +- abs/core/gcc/buildfix_new_bison.patch | 22 - abs/core/gcc/gcc-ada.install | 22 + abs/core/gcc/gcc-fortran.install | 18 + abs/core/gcc/gcc-hash-style-both.patch | 12 +- abs/core/gcc/gcc-java-driver.patch | 11 - abs/core/gcc/gcc-libs.install | 14 + abs/core/gcc/gcc.install | 8 +- abs/core/ghostscript/PKGBUILD | 65 +- abs/core/ghostscript/ghostscript-fPIC.patch | 8 +- abs/core/ghostscript/ghostscript-pdf2dsc.patch | 12 + .../ghostscript/ghostscript-system-jasper.patch | 26 + abs/core/ghostscript/ghostscript.install | 14 - abs/core/ghostscript/libpng14.patch | 24 + abs/core/ghostscript/svn_r10890.patch | 99 + abs/core/git/ChangeLog | 12 +- abs/core/git/PKGBUILD | 61 +- abs/core/git/git-daemon | 70 + abs/core/git/git-daemon.conf | 4 + abs/core/glib2/PKGBUILD | 23 +- abs/core/glibc/ChangeLog | 39 - abs/core/glibc/PKGBUILD | 150 +- abs/core/glibc/fix-makecontext.patch | 33 - abs/core/glibc/glibc-2.10-bz4781.patch | 42 + .../glibc/glibc-2.10-dont-build-timezone.patch | 13 + abs/core/glibc/glibc-__i686.patch | 13 + abs/core/glibc/glibc.install | 131 +- abs/core/glibc/locale.gen | 438 - abs/core/gmp/PKGBUILD | 24 +- abs/core/gmp/gmp.install | 2 + abs/core/gnutls/PKGBUILD | 14 +- abs/core/gnutls/gnutls.install | 4 +- abs/core/gobject-introspection/PKGBUILD | 20 + abs/core/gpm/ChangeLog | 28 + abs/core/gpm/PKGBUILD | 33 +- abs/core/gpm/gpm | 5 +- abs/core/gpm/gpm.conf.d | 2 +- abs/core/gpm/gpm.install | 16 + abs/core/gpm/gpm.sh | 3 + abs/core/grub-gfx.tar.gz | Bin 0 -> 28009 bytes abs/core/grub-gfx/040_all_grub-0.96-nxstack.patch | 623 + abs/core/grub-gfx/05-grub-0.97-initrdaddr.diff | 16 + abs/core/grub-gfx/PKGBUILD | 106 + abs/core/grub-gfx/ext4.patch | 263 + abs/core/grub-gfx/grub-0.97-graphics.patch | 1293 + abs/core/grub-gfx/grub-gfx.install | 46 + abs/core/grub-gfx/grub-inode-size.patch | 94 + abs/core/grub-gfx/i2o.patch | 45 + abs/core/grub-gfx/install-grub | 187 + abs/core/grub-gfx/intelmac.patch | 67 + abs/core/grub-gfx/menu.lst | 47 + abs/core/grub-gfx/more-raid.patch | 100 + abs/core/grub-gfx/special-devices.patch | 18 + abs/core/grub-gfx/splash.xpm.gz | Bin 0 -> 4019 bytes abs/core/gtk2/PKGBUILD | 34 +- abs/core/gtk2/__changelog | 1 + abs/core/gtk2/revert_64bit_fix.patch | 31 + abs/core/gtk2/xid-collision-debug.patch | 15 + abs/core/hal-info/PKGBUILD | 12 +- abs/core/hal/PKGBUILD | 104 +- abs/core/hal/dbus-error-init.patch | 231 + abs/core/hal/fix-libusb-detection.patch | 66 + abs/core/hal/hal-HDAPS-blacklist.patch | 30 + abs/core/hal/hal-KVM-evdev.patch | 36 + abs/core/hal/hal-remove-dell-killswitch.patch | 201 + abs/core/hal/hal-use-at-console.patch | 45 + abs/core/hal/hal-xen-unignore-axes.patch | 39 + abs/core/hal/hal.install | 15 +- abs/core/hal/handle-input-touchpad.patch | 101 + abs/core/hal/macbook-fix-ioperm.patch | 41 + abs/core/hal/path-max.patch | 31 + abs/core/heimdal/001_all_heimdal-no_libedit.patch | 10 + abs/core/heimdal/002_all_heimal-fPIC.patch | 12 + abs/core/heimdal/003_all_heimdal-rxapps.patch | 22 + abs/core/heimdal/005_all_heimdal-suid_fix.patch | 20 + abs/core/heimdal/012_all_heimdal-berkdb.patch | 124 + abs/core/heimdal/013_all_heimdal-pthread-lib.patch | 11 + abs/core/heimdal/014_all_heimdal-path.patch | 50 + abs/core/heimdal/PKGBUILD | 96 +- abs/core/iana-etc/Makefile.patch | 11 + abs/core/iana-etc/PKGBUILD | 31 + abs/core/imagemagick/ChangeLog | 106 - abs/core/imagemagick/PKGBUILD | 93 +- abs/core/imagemagick/add_delegate.patch | 8 - abs/core/imagemagick/perlmagick.rpath.patch | 10 + abs/core/imlib2/PKGBUILD | 44 +- abs/core/initscripts/PKGBUILD | 32 +- abs/core/initscripts/initscripts.install | 28 +- abs/core/initscripts/rc.shutdown.patch | 28 +- abs/core/initscripts/rc.sysinit.patch | 18 +- abs/core/inputproto/PKGBUILD | 12 +- abs/core/intel-dri/PKGBUILD | 43 - abs/core/intel-dri/intel-disable-ttm-warning.patch | 13 - abs/core/intel-dri/intel-revert-vbl.patch | 21 - abs/core/intel-dri/mesa-7.1-link-shared.patch | 102 - abs/core/iproute2/PKGBUILD | 35 +- abs/core/iproute2/iproute2-fhs.patch | 57 + abs/core/iproute2/tc.patch | 26 + abs/core/ipw2100-fw/PKGBUILD | 39 +- abs/core/ipw2200-fw/PKGBUILD | 45 +- abs/core/iwlwifi-3945-ucode/PKGBUILD | 28 - abs/core/iwlwifi-4965-ucode/PKGBUILD | 26 - abs/core/jasper/PKGBUILD | 47 +- abs/core/jasper/jasper-1.900.1-CVE-2008-3520.patch | 928 + abs/core/jasper/jasper-1.900.1-CVE-2008-3522.patch | 14 + abs/core/jasper/jpc_dec.c.patch | 18 + .../jasper/patch-libjasper-stepsizes-overflow.diff | 14 + abs/core/kbproto/PKGBUILD | 17 +- abs/core/kernel-headers/PKGBUILD | 30 - abs/core/kernel-headers/netfilter-includes.patch | 91 - abs/core/kernel-headers/serial.diff | 13 - abs/core/kernel26.orig/PKGBUILD | 242 + abs/core/kernel26.orig/config | 4957 ++ abs/core/kernel26.orig/config.x86_64 | 4761 ++ abs/core/kernel26.orig/coretemp.patch | 86 + abs/core/kernel26.orig/ext4.patch | 152 + abs/core/kernel26.orig/kernel26.install | 147 + abs/core/kernel26.orig/kernel26.preset | 17 + abs/core/kernel26.orig/logo_linux_clut224.ppm | 883 + abs/core/kernel26.orig/logo_linux_mono.pbm | 95 + abs/core/kernel26.orig/logo_linux_vga16.ppm | 883 + abs/core/kernel26.orig/serial.diff | 13 + abs/core/kernel26/PKGBUILD | 207 +- abs/core/kernel26/config | 1660 +- abs/core/kernel26/config.arch | 4955 ++ abs/core/kernel26/config.x86_64 | 1609 +- abs/core/kernel26/coretemp.patch | 86 - abs/core/kernel26/ext4.patch | 152 - abs/core/kernel26/fbcondecor-2.6.34-fix.patch | 19 + abs/core/kernel26/kernel26.install | 27 +- abs/core/kernel26/kernel26.preset | 2 +- abs/core/kernel26/logo_linux_clut224.ppm | 883 - abs/core/kernel26/logo_linux_mono.pbm | 95 - abs/core/kernel26/logo_linux_vga16.ppm | 883 - abs/core/kernel26/serial.diff | 13 - abs/core/klibc-extras/PKGBUILD | 23 - abs/core/klibc-kbd/PKGBUILD | 48 - abs/core/klibc-kbd/keymap_hook | 27 - abs/core/klibc-kbd/keymap_install | 76 - abs/core/klibc-kbd/no-exit.patch | 31 - abs/core/klibc-kbd/no-fflush.patch | 14 - abs/core/klibc-kbd/no-isatty.patch | 58 - abs/core/klibc-module-init-tools/PKGBUILD | 25 - .../fix-modprobe-ignore-path.patch | 14 - abs/core/klibc-module-init-tools/makefile.patch | 54 - abs/core/klibc-udev/50-udev-default.rules | 5 - abs/core/klibc-udev/60-persistent-storage.rules | 47 - abs/core/klibc-udev/64-device-mapper.rules | 4 - abs/core/klibc-udev/64-md-raid.rules | 18 - abs/core/klibc-udev/80-drivers.rules | 7 - abs/core/klibc-udev/PKGBUILD | 59 - abs/core/klibc-udev/disable-uid-gid-lookup.patch | 33 - abs/core/klibc-udev/klibc-remove-revert.patch | 111 - abs/core/klibc-udev/load-modules.sh | 51 - abs/core/klibc-udev/post-107.patch | 176 - abs/core/klibc-udev/start_udev | 115 - abs/core/klibc-udev/udev-fix-klibc-build.patch | 48 - abs/core/klibc-udev/udev.rules | 187 - abs/core/klibc-udev/udev_hook | 10 - abs/core/klibc-udev/udev_install | 29 - abs/core/klibc-udev/vol_id-suspend2.patch | 15 - abs/core/klibc/PKGBUILD | 56 - abs/core/klibc/klibc-2.6.24.patch | 44 - abs/core/klibc/klibc-Kbuild.patch | 80 - .../klibc/klibc-compile-shared-by-default.patch | 12 - abs/core/klibc/klibc-fix-2.6.28-includes.patch | 12 - abs/core/klibc/klibc-module-init-tools.patch | 63 - abs/core/klibc/klibc-x86_64-fix-io.h.patch | 28 - abs/core/klibc/multiple_raid_assembly_fix.patch | 20 - abs/core/lcms/PKGBUILD | 22 +- abs/core/libarchive/PKGBUILD | 33 +- abs/core/libcups/PKGBUILD | 33 - abs/core/libdatrie/PKGBUILD | 6 +- abs/core/libdownload/PKGBUILD | 21 - abs/core/libdownload/largefiles.patch | 12 - abs/core/libdrm/COPYING | 48 + abs/core/libdrm/PKGBUILD | 36 +- abs/core/libdrm/libdrm-2.4.21-b803918f3f.patch | 506 + abs/core/libdrm/no-pthread-stubs.patch | 65 + abs/core/libfetch/Makefile | 9 +- abs/core/libfetch/PKGBUILD | 24 +- abs/core/libfetch/libfetch-2.33-1-i686.pkg.tar.gz | 1 + abs/core/libfontenc/PKGBUILD | 21 +- abs/core/libgcrypt/PKGBUILD | 31 +- abs/core/libgl/PKGBUILD | 40 - abs/core/libgl/mesa-7.1-link-shared.patch | 102 - abs/core/libgpg-error/PKGBUILD | 21 +- abs/core/libjpeg/PKGBUILD | 15 +- abs/core/libldap/PKGBUILD | 74 +- abs/core/libldap/ntlm.patch | 139 +- abs/core/libmpc/PKGBUILD | 28 + abs/core/libmpc/libmpc.install | 20 + abs/core/libpciaccess/PKGBUILD | 10 +- abs/core/libpng/PKGBUILD | 48 +- abs/core/libraw1394/PKGBUILD | 19 +- abs/core/libraw1394/libraw1394.install | 18 - abs/core/libtasn1/PKGBUILD | 22 +- abs/core/libthai/PKGBUILD | 10 +- abs/core/libtiff/ChangeLog | 27 + abs/core/libtiff/PKGBUILD | 43 +- abs/core/libtiff/libtiff-CVE-2009-2285.patch | 22 + abs/core/libtool/PKGBUILD | 34 +- abs/core/libtool/libtool-2.2.10-3-i686.pkg.tar.gz | 1 + abs/core/libtool/libtool.install | 6 +- abs/core/libx11/PKGBUILD | 24 +- abs/core/libxau/PKGBUILD | 19 +- abs/core/libxaw/PKGBUILD | 14 +- abs/core/libxcb/PKGBUILD | 12 +- abs/core/libxcb/libxcb-1.1-no-pthread-stubs.patch | 2 +- abs/core/libxdamage/PKGBUILD | 24 +- abs/core/libxext/PKGBUILD | 18 +- abs/core/libxfixes/PKGBUILD | 23 +- abs/core/libxfont/PKGBUILD | 26 +- abs/core/libxfontcache/LICENSE | 100 + abs/core/libxfontcache/PKGBUILD | 21 +- abs/core/libxft/PKGBUILD | 14 +- abs/core/libxi/PKGBUILD | 16 +- abs/core/libxml-perl/PKGBUILD | 23 - abs/core/libxml2/PKGBUILD | 13 +- abs/core/libxt/PKGBUILD | 19 +- abs/core/libxv/PKGBUILD | 12 +- abs/core/libxvmc/LICENSE | 23 + abs/core/libxvmc/PKGBUILD | 20 +- abs/core/libxxf86dga/PKGBUILD | 24 +- abs/core/libxxf86misc/PKGBUILD | 16 +- abs/core/libxxf86vm/PKGBUILD | 18 +- abs/core/linhes-scripts/PKGBUILD | 4 +- abs/core/linhes-scripts/removecommercials.sh | 50 +- abs/core/linux-api-headers/PKGBUILD | 43 + .../linux-api-headers-2.6.34-1-i686.pkg.tar.gz | 1 + abs/core/linux-api-headers/scsi.patch | 42 + abs/core/linux-firmware/PKGBUILD | 62 + abs/core/linuxtv-dvb-apps/PKGBUILD | 2 +- abs/core/lirc-utils/PKGBUILD | 73 +- abs/core/lirc-utils/hw_commandir.c | 1926 - abs/core/lirc-utils/hw_commandir.h | 175 - abs/core/lirc-utils/irexec.conf | 5 + abs/core/lirc-utils/irexecd | 38 + abs/core/lirc-utils/kernel-2.6.26.patch | 122 - abs/core/lirc-utils/kernel-2.6.33.patch | 475 + abs/core/lirc-utils/lirc.logrotate | 3 - abs/core/lirc-utils/lirc_atiusb.patch | 27 - abs/core/lirc-utils/lirc_patch | 270 + abs/core/lirc-utils/lircd | 12 +- abs/core/lirc-utils/lircd.conf | 8 + abs/core/lirc-utils/lircd.conf.d | 8 - abs/core/lirc/PKGBUILD | 68 +- abs/core/lirc/dvicoIR.rules | 15 - abs/core/lirc/hw_commandir.c | 1926 - abs/core/lirc/hw_commandir.h | 175 - abs/core/lirc/kernel-2.6.26.patch | 122 - abs/core/lirc/kernel-2.6.27.patch | 78 - abs/core/lirc/kernel-2.6.33.patch | 475 + abs/core/lirc/lirc.fdi | 11 - abs/core/lirc/lirc.install | 6 +- abs/core/lirc/lirc_atiusb.patch | 27 - abs/core/lirc/lirc_mod_mce.patch | 187 - abs/core/lirc_085-utils/PKGBUILD | 72 + abs/core/lirc_085-utils/hw_commandir.c | 1926 + abs/core/lirc_085-utils/hw_commandir.h | 175 + abs/core/lirc_085-utils/kernel-2.6.26.patch | 122 + abs/core/lirc_085-utils/lirc.logrotate | 8 + abs/core/lirc_085-utils/lirc_atiusb.patch | 27 + abs/core/lirc_085-utils/lircd | 43 + abs/core/lirc_085-utils/lircd.conf.d | 8 + abs/core/lirc_085-utils/lircmd | 36 + abs/core/lirc_085/PKGBUILD | 86 + abs/core/lirc_085/dvicoIR.rules | 15 + abs/core/lirc_085/hw_commandir.c | 1926 + abs/core/lirc_085/hw_commandir.h | 175 + abs/core/lirc_085/kernel-2.6.26.patch | 122 + abs/core/lirc_085/kernel-2.6.27.patch | 78 + abs/core/lirc_085/lirc.fdi | 11 + abs/core/lirc_085/lirc.install | 50 + abs/core/lirc_085/lirc_atiusb.patch | 27 + abs/core/lirc_085/lirc_mod_mce.patch | 187 + abs/core/local-website/PKGBUILD | 2 +- abs/core/local-website/htdocs/layout.css | 29 - abs/core/local-website/htdocs/style.css | 227 - abs/core/lvm2/ChangeLog | 103 + abs/core/lvm2/PKGBUILD | 83 +- abs/core/lvm2/lvm2_hook | 17 +- abs/core/lvm2/lvm2_install | 15 +- abs/core/madwifi-utils/PKGBUILD | 14 +- abs/core/madwifi/PKGBUILD | 20 +- abs/core/madwifi/kernel-2.6.30.patch | 14 + abs/core/madwifi/madwifi-ng.install | 21 +- abs/core/mdadm/mdadm | 37 - abs/core/mesa/LICENSE | 82 + abs/core/mesa/PKGBUILD | 188 +- abs/core/mesa/nouveau_class.h | 9019 +++ abs/core/mkinitcpio-busybox/PKGBUILD | 37 + abs/core/mkinitcpio-busybox/config | 922 + ...adfont-setfont-optional-psf2-font-support.patch | 453 + abs/core/mkinitcpio/PKGBUILD | 39 +- abs/core/mkinitcpio/mkinitcpio.conf.diff | 9 +- abs/core/module-init-tools/PKGBUILD | 56 +- abs/core/module-init-tools/modprobe.conf | 2 +- abs/core/mpfr/PKGBUILD | 27 +- abs/core/mpfr/mpfr.install | 2 + abs/core/mysql-clients/PKGBUILD | 37 - abs/core/mysql-python/PKGBUILD | 19 +- abs/core/mysql/PKGBUILD | 153 +- abs/core/mysql/__changelog | 15 +- abs/core/mysql/my.cnf | 18 +- abs/core/mysql/mysql-no-clients.patch | 65 - abs/core/mysql/mysql.install | 20 + abs/core/mysql/mysqld | 67 +- abs/core/mysql/mysqld.conf.d | 1 - abs/core/mysql/skip-abi-check.patch | 13 + abs/core/mythdb-initial/PKGBUILD | 8 +- abs/core/mythdb-initial/mythdb.install | 6 +- abs/core/mythinstall/PKGBUILD | 4 +- abs/core/mythinstall/checkout_MythVantage.sh | 2 +- abs/core/mythtv/stable-0.23/mythtv/PKGBUILD | 20 +- abs/core/mythtv/stable/glass-wide/PKGBUILD | 15 - abs/core/mythtv/stable/linhes-theme/PKGBUILD | 17 - abs/core/mythtv/stable/morethemes/PKGBUILD | 32 - abs/core/mythtv/stable/mytharchive/PKGBUILD | 35 - abs/core/mythtv/stable/mythbrowser/PKGBUILD | 33 - abs/core/mythtv/stable/mythcontrols/PKGBUILD | 32 - abs/core/mythtv/stable/mythdb-initial/PKGBUILD | 21 - abs/core/mythtv/stable/mythdb-initial/__changelog | 25 - abs/core/mythtv/stable/mythdb-initial/mc.sql | 2835 - .../mythtv/stable/mythdb-initial/mythdb.install | 31 - .../mythtv/stable/mythdb-initial/permissions.sql | 11 - abs/core/mythtv/stable/mythflix/PKGBUILD | 41 - abs/core/mythtv/stable/mythgallery/PKGBUILD | 33 - abs/core/mythtv/stable/mythgame/PKGBUILD | 32 - abs/core/mythtv/stable/mythmovies/PKGBUILD | 33 - abs/core/mythtv/stable/mythmusic/PKGBUILD | 35 - abs/core/mythtv/stable/mythmusic/music_flac.patch | 293 - .../mythtv/stable/mythmusic/mythmusic-0.21.patch | 22 - abs/core/mythtv/stable/mythnews/PKGBUILD | 32 - abs/core/mythtv/stable/mythphone/PKGBUILD | 32 - abs/core/mythtv/stable/mythsmolt/PKGBUILD | 26 - abs/core/mythtv/stable/mythstream/PKGBUILD | 35 - abs/core/mythtv/stable/mythstream/mythstream.diff | 79 - .../mythtv/stable/mythstream/mythstream.install | 23 - abs/core/mythtv/stable/myththemes/PKGBUILD | 33 - .../stable/mythtv/2.6.28_dvb_api_version.diff | 22 - abs/core/mythtv/stable/mythtv/PKGBUILD | 98 - abs/core/mythtv/stable/mythtv/QUICKSTART.archlinux | 69 - .../mythtv/stable/mythtv/gnome_screensaver.patch | 18 - .../stable/mythtv/menu-xml/HOST_SETTINGS.xml | 94 - abs/core/mythtv/stable/mythtv/menu-xml/is.xml | 3 - .../stable/mythtv/menu-xml/library.xml.patch | 15 - abs/core/mythtv/stable/mythtv/menu-xml/linhes.xml | 60 - .../stable/mythtv/menu-xml/mainmenu.xml.patch | 39 - .../mythtv/stable/mythtv/menu-xml/mythbackup.xml | 20 - .../mythtv/stable/mythtv/menu-xml/mythrestore.xml | 20 - .../stable/mythtv/menu-xml/optical_menu.xml.patch | 15 - .../mythtv/menu-xml/original/create_patch.sh | 5 - abs/core/mythtv/stable/mythtv/menu-xml/setup.xml | 111 - .../mythtv/stable/mythtv/menu-xml/siriusmenu.xml | 419 - abs/core/mythtv/stable/mythtv/menu-xml/update.xml | 20 - abs/core/mythtv/stable/mythtv/menu-xml/update2.xml | 26 - .../stable/mythtv/menu-xml/util_menu.xml.patch | 17 - abs/core/mythtv/stable/mythtv/menu-xml/xmmenu.xml | 574 - abs/core/mythtv/stable/mythtv/mpegpspatch | 66 - abs/core/mythtv/stable/mythtv/mythbackend | 38 - abs/core/mythtv/stable/mythtv/mythbackend.lr | 9 - abs/core/mythtv/stable/mythtv/mythfrontend.lr | 9 - .../mythtv/stable/mythtv/myththemedmenu.cpp.patch | 125 - .../mythtv/stable/mythtv/myththemedmenu.h.patch | 25 - abs/core/mythtv/stable/mythtv/mythtv.install | 55 - abs/core/mythtv/stable/mythtv/pretty | 2 - abs/core/mythtv/stable/mythtv/smolt_jump.patch | 9 - abs/core/mythtv/stable/mythvideo/PKGBUILD | 41 - abs/core/mythtv/stable/mythvideo/mtd | 36 - .../mythvideo-6338-use_tmdb_in_fixes.patch | 151 - abs/core/mythtv/stable/mythvideo/mythvideo.install | 20 - abs/core/mythtv/stable/mythweather/PKGBUILD | 32 - abs/core/mythtv/stable/mythweb/PKGBUILD | 39 - abs/core/mythtv/stable/mythweb/mythweb.install | 13 - .../2923-mythweb-gallery-English_GB_lang.diff | 102 - abs/core/mythtv/stable/mythweb/patch/icons.tar.gz | Bin 14759 -> 0 bytes .../mythtv/stable/mythweb/patch/mythweb.pl.diff | 23 - .../mythweb/patch/mythweb_gallery_updated1.diff | 1657 - abs/core/mythtv/stable/mythweb/transcoders.patch | 23 - abs/core/mythtv/stable/mythweb/wiiweb.tar.bz2 | Bin 23648 -> 0 bytes abs/core/mythtv/stable/mythzoneminder/PKGBUILD | 32 - abs/core/mythtv/trunk/mythflix/PKGBUILD | 50 - abs/core/ndiswrapper-utils/PKGBUILD | 21 +- abs/core/ndiswrapper/PKGBUILD | 22 +- abs/core/ndiswrapper/ndiswrapper.install | 17 +- abs/core/netcfg/PKGBUILD | 25 - abs/core/ntfs-3g/25-ntfs-config-write-policy.fdi | 42 + abs/core/ntfs-3g/PKGBUILD | 34 +- abs/core/ntfsprogs/PKGBUILD | 24 +- abs/core/ntp/PKGBUILD | 97 +- abs/core/ntp/fix-ipv6.patch | 10 + abs/core/ntp/ntp-4.2.4-html2man.patch | 183 + abs/core/ntp/ntp-4.2.4_p7-nano.patch | 20 + abs/core/ntp/ntp-client.conf | 4 + abs/core/ntp/ntp.conf | 80 +- abs/core/ntp/ntpd | 3 +- abs/core/nvidia-173xx-utils/20-nvidia.conf | 5 + abs/core/nvidia-173xx-utils/PKGBUILD | 22 +- abs/core/nvidia-173xx/PKGBUILD | 22 +- abs/core/nvidia-173xx/nvidia.install | 4 +- abs/core/nvidia-96xx-utils/nvidia-96xx.install | 22 - abs/core/nvidia-96xx/NVIDIA_173.14.12_2.6.27.patch | 87 - abs/core/nvidia-96xx/PKGBUILD | 9 +- abs/core/nvidia-96xx/nvidia-96xx.install | 22 - abs/core/nvidia-96xx/nvidia.install | 4 +- abs/core/nvidia-utils/20-nvidia.conf | 1 - abs/core/nvidia-utils/PKGBUILD | 143 +- abs/core/nvidia-utils/nvidia.install | 41 +- abs/core/nvidia/NVIDIA_kernel-169.12-2286310.diff | 637 - abs/core/nvidia/PKGBUILD | 37 +- abs/core/nvidia/nvidia.install | 20 +- abs/core/openssh/PKGBUILD | 67 +- abs/core/openssh/sshd | 3 +- abs/core/openssh/sshd.patch | 42 - abs/core/openssh/sshd_config.diff | 0 abs/core/openssl/PKGBUILD | 52 +- abs/core/openssl/ca-dir.patch | 33 + abs/core/openssl/fix-manpages.patch | 1887 + abs/core/openssl/no-rpath.patch | 11 + abs/core/pacman-mirrorlist/PKGBUILD | 26 +- abs/core/pacman-mirrorlist/mirrorlist | 384 +- abs/core/pacman/PKGBUILD | 32 +- abs/core/pacman/makepkg.conf | 10 +- abs/core/pacman/mirrorlist | 101 - ...lback-to-sane-defaults-for-library-stripp.patch | 32 + abs/core/pacman/old/PKGBUILD | 74 + abs/core/pacman/old/makepkg.conf | 115 + abs/core/pacman/old/mirrorlist | 101 + abs/core/pacman/old/pacman.conf | 84 + abs/core/pacman/old/pacman.install | 53 + abs/core/pacman/pacman-3.4.1-1-i686.pkg.tar.gz | 1 + abs/core/pacman/pacman.conf | 9 +- abs/core/pacman/pacman.conf.x86_64 | 84 + abs/core/pacman/pacman.install | 10 +- abs/core/pango/PKGBUILD | 16 +- abs/core/pango/pango.install | 5 - abs/core/parted/PKGBUILD | 37 +- abs/core/parted/__changelog | 2 - abs/core/parted/parted-1.7.1-fix-seg.patch | 13 - abs/core/parted/parted.install | 18 + abs/core/pcre/ChangeLog | 24 + abs/core/pcre/PKGBUILD | 38 +- abs/core/perl-xml-dom/PKGBUILD | 23 - abs/core/perlxml/PKGBUILD | 29 - abs/core/php/php.install | 4 +- abs/core/pixman/PKGBUILD | 10 +- abs/core/pkg-config/PKGBUILD | 32 + abs/core/pkg-config/autoconf-2.66.patch | 12 + abs/core/pkgconfig/PKGBUILD | 22 - abs/core/pm-utils/PKGBUILD | 38 +- abs/core/ppl/PKGBUILD | 27 + abs/core/ppl/ppl-0.10.2-gmp-5.0.patch | 30 + abs/core/procinfo-ng/PKGBUILD | 38 + abs/core/procinfo/PKGBUILD | 22 - abs/core/procinfo/procinfo-19.2.patch | 325 - abs/core/python-decorator/LICENSE.txt | 26 + abs/core/python-decorator/PKGBUILD | 29 + abs/core/python-iplib/PKGBUILD | 5 +- abs/core/python-parted/PKGBUILD | 11 +- abs/core/python/PKGBUILD | 36 +- abs/core/python/python-2.6-db-4.8.patch | 123 + abs/core/qt/PKGBUILD | 103 +- abs/core/qt/QtWebKit_Flash.patch | 48 - abs/core/qt/assistant.desktop | 2 +- abs/core/qt/ca-certificates.patch | 25 + abs/core/qt/designer.desktop | 2 +- abs/core/qt/linguist.desktop | 2 +- abs/core/qt/qdoc3.patch | 25 - .../qt/qt-webkit-4.6.3-flash-plugin-segfault.patch | 43 + abs/core/qt/qt.install | 11 + abs/core/qt/qtconfig.desktop | 2 +- abs/core/readline/PKGBUILD | 60 +- abs/core/readline/readline.install | 4 +- abs/core/reiserfsprogs/PKGBUILD | 32 +- abs/core/rpcbind/PKGBUILD | 26 + abs/core/rpcbind/rpcbind | 39 + abs/core/rsync/ChangeLog | 20 - abs/core/rt2500/PKGBUILD | 33 - abs/core/rt2500/kernel-2.6.22.patch | 24125 -------- abs/core/rt2500/kernel-2.6.24.patch | 20 - abs/core/rt2500/kernel-2.6.27.patch | 64 - abs/core/rt2500/rt2500.install | 26 - abs/core/rt2x00-rt61-fw/PKGBUILD | 18 - abs/core/rt2x00-rt71w-fw/PKGBUILD | 17 - abs/core/runit-scripts/PKGBUILD | 5 +- abs/core/runit-scripts/fbsplash-runit.sh | 35 +- abs/core/runit-scripts/runitscripts/1 | 1 + .../runitscripts/services/mdadm/finish | 17 - .../runit-scripts/runitscripts/services/mysql/run | 4 +- .../runit-scripts/runitscripts/services/tty2/run | 2 +- .../runit-scripts/runitscripts/services/tty3/run | 2 +- abs/core/smbclient/PKGBUILD | 57 - abs/core/sqlite3/PKGBUILD | 19 +- abs/core/squashfs-tools/PKGBUILD | 21 +- abs/core/squashfs-tools/mksquashfs-fix-race.patch | 23 + abs/core/system-templates/PKGBUILD | 2 +- abs/core/tiacx-firmware/PKGBUILD | 22 +- abs/core/tiacx-firmware/tiacx-firmware.install | 4 - abs/core/tiacx/PKGBUILD | 25 +- abs/core/tiacx/acx.install | 16 +- abs/core/tiacx/kernel-2.6.30.patch | 16 + abs/core/tiacx/kernel-2.6.31.patch | 88 + abs/core/tiacx/kernel-2.6.33.patch | 11 + abs/core/udev/81-arch.rules | 94 +- abs/core/udev/PKGBUILD | 149 +- abs/core/udev/__changelog | 1 - abs/core/udev/arch-udev-rules.patch | 172 +- abs/core/udev/cdsymlinks.sh | 11 +- abs/core/udev/load-modules.sh | 12 +- abs/core/udev/logitech-rules.patch | 14 + abs/core/udev/mount-usb | 51 - abs/core/udev/readme-udev-arch.txt | 266 - abs/core/udev/resolve-modalias.c | 62 - abs/core/udev/start_udev | 137 - abs/core/udev/udev-ntfs-3g.patch | 217 - abs/core/udev/udev.install | 23 +- abs/core/udev/udev.rules | 456 - abs/core/udev/usb-storage.rules | 4 - abs/core/unichrome-dri/PKGBUILD | 38 - abs/core/unichrome-dri/mesa-7.1-link-shared.patch | 102 - abs/core/unzip/unzip-5.5.2-CVE-2008-0888.patch | 50 - .../unzip/unzip-5.50-alt-iconv-v1.2-utf8.patch | 430 - abs/core/unzip/unzip542-size-64bit.patch | 72 - abs/core/util-linux-ng/PKGBUILD | 56 +- abs/core/util-linux-ng/cryptoloop-support.patch | 4649 -- abs/core/util-linux-ng/fix-findmnt.patch | 24 + .../util-linux-ng/util-linux-ng-2.14-20080624.diff | 6826 --- abs/core/util-linux-ng/util-linux-ng-cfdisk.patch | 57 + abs/core/util-linux-ng/util-linux-ng-nilfs2.patch | 276 + abs/core/util-linux-ng/util-linux-ng.install | 2 +- abs/core/vdpinfo-71xx/PKGBUILD | 25 - abs/core/vdpinfo-71xx/vdpinfo | 2 - abs/core/vdpinfo-96xx/PKGBUILD | 25 - abs/core/vdpinfo-96xx/vdpinfo | 2 - abs/core/vdpinfo/PKGBUILD | 35 - abs/core/wget/PKGBUILD | 20 +- abs/core/wget/wget-1.12-2-i686.pkg.tar.gz | 1 + abs/core/wget/wget.install | 20 + abs/core/wpa_supplicant/PKGBUILD | 21 +- abs/core/wpa_supplicant/config | 9 +- abs/core/xcb-proto/PKGBUILD | 8 +- abs/core/xcb-util/LICENSE | 267 + abs/core/xcb-util/PKGBUILD | 15 +- abs/core/xcursor-themes/LICENSE | 24 + abs/core/xcursor-themes/PKGBUILD | 18 +- abs/core/xextproto/PKGBUILD | 10 +- abs/core/xf86-input-calcomp/PKGBUILD | 22 - abs/core/xf86-input-citron/PKGBUILD | 24 - abs/core/xf86-input-digitaledge/PKGBUILD | 22 - abs/core/xf86-input-dmc/PKGBUILD | 22 - abs/core/xf86-input-dynapro/PKGBUILD | 22 - abs/core/xf86-input-elo2300/PKGBUILD | 22 - abs/core/xf86-input-evdev/PKGBUILD | 13 +- abs/core/xf86-input-jamstudio/PKGBUILD | 22 - abs/core/xf86-input-magellan/PKGBUILD | 22 - abs/core/xf86-input-magictouch/PKGBUILD | 22 - abs/core/xf86-input-microtouch/PKGBUILD | 22 - abs/core/xf86-input-palmax/PKGBUILD | 22 - abs/core/xf86-input-spaceorb/PKGBUILD | 23 - abs/core/xf86-input-summa/PKGBUILD | 22 - abs/core/xf86-input-tek4957/PKGBUILD | 22 - abs/core/xf86-input-ur98/PKGBUILD | 22 - abs/core/xf86-video-apm/LICENSE | 92 + abs/core/xf86-video-apm/PKGBUILD | 22 +- abs/core/xf86-video-ark/LICENSE | 48 + abs/core/xf86-video-ark/PKGBUILD | 21 +- abs/core/xf86-video-ati/PKGBUILD | 27 +- abs/core/xf86-video-chips/LICENSE | 89 + abs/core/xf86-video-chips/PKGBUILD | 26 +- abs/core/xf86-video-cirrus/LICENSE | 22 + abs/core/xf86-video-cirrus/PKGBUILD | 22 +- abs/core/xf86-video-dummy/PKGBUILD | 21 +- abs/core/xf86-video-fbdev/PKGBUILD | 18 +- abs/core/xf86-video-geode/PKGBUILD | 31 + abs/core/xf86-video-glint/LICENSE | 84 + abs/core/xf86-video-glint/PKGBUILD | 24 +- abs/core/xf86-video-i128/LICENSE | 23 + abs/core/xf86-video-i128/PKGBUILD | 26 +- abs/core/xf86-video-i740/LICENSE | 47 + abs/core/xf86-video-i740/PKGBUILD | 21 +- abs/core/xf86-video-intel/LICENSE | 440 + abs/core/xf86-video-intel/PKGBUILD | 46 +- .../intel-2.11-no-pageflipping.patch | 33 + abs/core/xf86-video-mach64/LICENSE | 209 + abs/core/xf86-video-mach64/PKGBUILD | 49 +- abs/core/xf86-video-mga/PKGBUILD | 52 +- abs/core/xf86-video-neomagic/PKGBUILD | 19 +- abs/core/xf86-video-nouveau/PKGBUILD | 41 + .../xf86-video-nouveau/xf86-video-nouveau.install | 16 + abs/core/xf86-video-nv/PKGBUILD | 23 +- abs/core/xf86-video-openchrome/PKGBUILD | 32 +- abs/core/xf86-video-openchrome/drm_stdint.patch | 10 + abs/core/xf86-video-openchrome/svn-r839.patch | 1447 + abs/core/xf86-video-r128/LICENSE | 219 + abs/core/xf86-video-r128/PKGBUILD | 47 +- abs/core/xf86-video-radeonhd/PKGBUILD | 19 +- abs/core/xf86-video-rendition/PKGBUILD | 29 +- abs/core/xf86-video-s3/LICENSE | 25 + abs/core/xf86-video-s3/PKGBUILD | 22 +- abs/core/xf86-video-s3virge/LICENSE | 25 + abs/core/xf86-video-s3virge/PKGBUILD | 24 +- abs/core/xf86-video-savage/LICENSE | 97 + abs/core/xf86-video-savage/PKGBUILD | 51 +- abs/core/xf86-video-siliconmotion/PKGBUILD | 22 +- abs/core/xf86-video-sis/PKGBUILD | 51 +- abs/core/xf86-video-sisusb/PKGBUILD | 21 +- abs/core/xf86-video-tdfx/LICENSE | 160 + abs/core/xf86-video-tdfx/PKGBUILD | 47 +- abs/core/xf86-video-trident/PKGBUILD | 52 +- abs/core/xf86-video-tseng/PKGBUILD | 23 +- abs/core/xf86-video-unichrome/LICENSE | 23 + abs/core/xf86-video-unichrome/PKGBUILD | 26 +- abs/core/xf86-video-unichrome/drm-include.patch | 11 + abs/core/xf86-video-v4l/LICENSE | 826 + abs/core/xf86-video-v4l/PKGBUILD | 19 +- abs/core/xf86-video-vesa/PKGBUILD | 24 +- abs/core/xf86-video-vga/PKGBUILD | 29 - abs/core/xf86-video-vga/pciaccess.patch | 371 - abs/core/xf86-video-vmware/LICENSE | 27 + abs/core/xf86-video-vmware/PKGBUILD | 25 +- abs/core/xf86-video-vmware/abi2.patch | 38 + abs/core/xf86-video-voodoo/PKGBUILD | 27 +- abs/core/xf86dgaproto/PKGBUILD | 23 +- abs/core/xf86driproto/LICENSE | 50 + abs/core/xf86driproto/PKGBUILD | 22 +- abs/core/xf86vidmodeproto/PKGBUILD | 18 +- abs/core/xfsprogs/PKGBUILD | 16 +- abs/core/xkeyboard-config/PKGBUILD | 22 +- abs/core/xmltv/PKGBUILD | 29 +- abs/core/xorg-apps/LICENSE | 1354 + abs/core/xorg-apps/PKGBUILD | 97 +- abs/core/xorg-server-utils/LICENSE.iceauth | 25 + abs/core/xorg-server-utils/LICENSE.xcmsdb | 18 + abs/core/xorg-server-utils/PKGBUILD | 90 +- abs/core/xorg-server/10-evdev.conf | 39 + abs/core/xorg-server/10-quirks.conf | 10 + abs/core/xorg-server/PKGBUILD | 133 +- abs/core/xorg-server/xorg-server.install | 29 +- .../xorg-server/xserver-1.7.1-gamma-kdm-fix.patch | 34 + abs/core/xorg-server/xserver-1.7.1-libcrypto.patch | 32 + abs/core/xorg-server/xvfb-run | 180 + abs/core/xorg-server/xvfb-run.1 | 282 + abs/core/xorg-util-macros/PKGBUILD | 18 +- abs/core/xorg-utils/LICENSE.xdpyinfo | 26 + abs/core/xorg-utils/LICENSE.xfd | 25 + abs/core/xorg-utils/LICENSE.xlsfonts | 22 + abs/core/xorg-utils/LICENSE.xprop | 45 + abs/core/xorg-utils/PKGBUILD | 60 +- abs/core/xterm/LICENSE | 73 + abs/core/xterm/PKGBUILD | 81 +- abs/core/xz-utils/PKGBUILD | 30 - abs/core/xz/PKGBUILD | 42 + abs/core/xz/xz-4.999.9beta-5-i686.pkg.tar.gz | 1 + abs/core/zd1211-firmware/PKGBUILD | 21 +- abs/core/zlib/PKGBUILD | 36 +- abs/core/zlib/zlib-1.2.5-lfs-decls.patch | 13 + abs/extra-testing/README | 0 abs/extra-testing/abs/ChangeLog | 41 - abs/extra-testing/abs/PKGBUILD | 33 - abs/extra-testing/abs/abs.install | 15 - abs/extra-testing/alpine/2.00-lpam.patch | 13 - abs/extra-testing/alpine/CVE-2008-5514.patch | 20 - abs/extra-testing/alpine/ChangeLog | 43 - abs/extra-testing/alpine/PKGBUILD | 37 - abs/extra-testing/alsa-firmware/PKGBUILD | 33 - abs/extra-testing/apache-ant/PKGBUILD | 41 - abs/extra-testing/apcupsd/PKGBUILD | 38 - abs/extra-testing/apcupsd/apcupsd | 44 - abs/extra-testing/apcupsd/apcupsd.conf | 325 - abs/extra-testing/apcupsd/run | 4 - abs/extra-testing/asciidoc/ChangeLog | 10 - abs/extra-testing/asciidoc/PKGBUILD | 30 - abs/extra-testing/atomicparsley/PKGBUILD | 18 - abs/extra-testing/autofs/Changelog | 6 - abs/extra-testing/autofs/PKGBUILD | 50 - abs/extra-testing/autofs/auto.master | 6 - abs/extra-testing/autofs/auto.misc | 7 - abs/extra-testing/autofs/autofs | 50 - abs/extra-testing/autofs/autofs.conf.d | 4 - abs/extra-testing/autofs/autofs.install | 5 - abs/extra-testing/autofs/finish | 9 - abs/extra-testing/autofs/heimdal.patch | 44 - abs/extra-testing/autofs/log.run | 2 - abs/extra-testing/autofs/run | 19 - abs/extra-testing/bash-completion/PKGBUILD | 34 - abs/extra-testing/bash-completion/cowsay.bashcomp | 34 - abs/extra-testing/beautiful-soup/PKGBUILD | 19 - abs/extra-testing/bluez-firmware/PKGBUILD | 23 - abs/extra-testing/bluez-hcidump/PKGBUILD | 22 - abs/extra-testing/bluez-python/PKGBUILD | 17 - abs/extra-testing/bluez/PKGBUILD | 63 - abs/extra-testing/bluez/__Changelog | 11 - abs/extra-testing/bluez/bluetooth.conf.d | 33 - abs/extra-testing/bluez/bluez.install | 15 - abs/extra-testing/bluez/run.bluetoothd | 12 - abs/extra-testing/bluez/run.dund | 14 - abs/extra-testing/bluez/run.hidd | 14 - abs/extra-testing/bluez/run.pand | 14 - abs/extra-testing/bluez/run.rfcomm | 17 - abs/extra-testing/bmp/0.9.7-visualization.patch | 12 - abs/extra-testing/bmp/0.9.7.1-visualization.patch | 12 - abs/extra-testing/bmp/PKGBUILD | 25 - .../bmp/bmp-0.9.7.1-crossfade-0.3.9.patch | 108 - .../boost/0001-date_time-gcc-4.3-fix.patch | 25 - abs/extra-testing/boost/PKGBUILD | 63 - abs/extra-testing/boost/serialization_gcc43.patch | 44 - abs/extra-testing/cabextract/PKGBUILD | 22 - abs/extra-testing/ccache/PKGBUILD | 35 - abs/extra-testing/cddb-py/PKGBUILD | 20 - abs/extra-testing/community/amule/PKGBUILD | 37 - abs/extra-testing/community/athcool/PKGBUILD | 24 - abs/extra-testing/community/athcool/athcool | 35 - .../community/athcool/athcool.install | 18 - abs/extra-testing/community/athcool/finish | 3 - abs/extra-testing/community/athcool/run | 2 - abs/extra-testing/community/blockcontrol/PKGBUILD | 37 - .../community/blockcontrol/blockcontrol.lib.patch | 15 - abs/extra-testing/community/cksfv/PKGBUILD | 21 - abs/extra-testing/community/codecs/PKGBUILD | 33 - abs/extra-testing/community/cpulimit/PKGBUILD | 20 - abs/extra-testing/community/cwiid-git/PKGBUILD | 62 - .../community/cwiid-git/cwiid.install | 16 - abs/extra-testing/community/deluge/PKGBUILD | 25 - .../community/desktop-file-utils/ChangeLog | 7 - .../community/desktop-file-utils/PKGBUILD | 20 - abs/extra-testing/community/djmount/PKGBUILD | 25 - abs/extra-testing/community/djmount/djmount.confd | 2 - abs/extra-testing/community/djmount/djmount.rcd | 39 - abs/extra-testing/community/enca/PKGBUILD | 23 - abs/extra-testing/community/firefox-i18n/PKGBUILD | 87 - abs/extra-testing/community/firefox/PKGBUILD | 77 - .../community/firefox/browser-app-makefile.patch | 11 - .../community/firefox/browser-defaulturls.patch | 26 - .../community/firefox/firefox-safe.desktop | 11 - .../community/firefox/firefox-version.patch | 11 - .../community/firefox/firefox.desktop | 83 - .../community/firefox/firefox.install | 24 - abs/extra-testing/community/firefox/mozconfig | 35 - .../firefox/mozilla-firefox-1.0-lang.patch | 12 - .../community/flashplugin-prerelease/PKGBUILD | 28 - abs/extra-testing/community/flashplugin/PKGBUILD | 27 - abs/extra-testing/community/fluidsynth/PKGBUILD | 25 - abs/extra-testing/community/fluxconf/PKGBUILD | 24 - abs/extra-testing/community/foldingathome/PKGBUILD | 28 - .../community/foldingathome/foldingathome.install | 47 - abs/extra-testing/community/foldingathome/run | 26 - abs/extra-testing/community/fuzemux/PKGBUILD | 42 - .../community/fuzemux/fuzemux-svn.install | 5 - abs/extra-testing/community/gnash-common/PKGBUILD | 40 - abs/extra-testing/community/gnash-gtk/PKGBUILD | 40 - .../community/gstreamer0.10-base-plugins/PKGBUILD | 33 - .../community/gstreamer0.10-base/PKGBUILD | 28 - abs/extra-testing/community/gstreamer0.10/PKGBUILD | 33 - .../community/gstreamer0.10/bgo555631.patch | 88 - abs/extra-testing/community/gtkglext/PKGBUILD | 25 - .../community/gtkglext/gtkglext-1.0.6-pangox.patch | 30 - abs/extra-testing/community/ircii/PKGBUILD | 16 - abs/extra-testing/community/jdk/PKGBUILD | 50 - abs/extra-testing/community/jdk/jdk.install | 14 - abs/extra-testing/community/jdk/jdk.profile | 3 - abs/extra-testing/community/libdvbpsi/PKGBUILD | 25 - abs/extra-testing/community/libelf/PKGBUILD | 22 - abs/extra-testing/community/libmodplug/PKGBUILD | 23 - .../community/libnetfilter_queue/PKGBUILD | 21 - abs/extra-testing/community/libnfnetlink/PKGBUILD | 18 - abs/extra-testing/community/liboil/PKGBUILD | 25 - abs/extra-testing/community/libshout/PKGBUILD | 23 - abs/extra-testing/community/libstdc++5/PKGBUILD | 41 - .../libstdc++5/gcc-3.4.3-no_multilib_amd64.patch | 11 - abs/extra-testing/community/libv4l/PKGBUILD | 19 - abs/extra-testing/community/lua/PKGBUILD | 30 - .../community/lua/lua-5.1-cflags.diff | 13 - .../community/lua/lua-5.1.3-official-patch1.diff | 12 - .../community/lua/lua-5.1.3-official-patch2.diff | 11 - .../community/lua/lua-5.1.3-official-patch3.diff | 21 - .../community/lua/lua-5.1.3-official-patch4.diff | 18 - abs/extra-testing/community/lua/lua-arch.patch | 55 - abs/extra-testing/community/mediatomb/PKGBUILD | 57 - .../mediatomb/mediatomb-0.11.0+glibc-2.10.patch | 23 - .../community/mediatomb/mediatomb-gcc-4.3.patch | 24 - .../community/mediatomb/mediatomb.conf | 5 - abs/extra-testing/community/mediatomb/mediatomb.rc | 58 - abs/extra-testing/community/mmv/PKGBUILD | 35 - abs/extra-testing/community/mmv/mmv.install | 19 - .../community/moblock/MoBlock-nfq.sh.patch | 53 - abs/extra-testing/community/moblock/PKGBUILD | 56 - abs/extra-testing/community/moblock/config | 30 - abs/extra-testing/community/moblock/moblock | 70 - abs/extra-testing/community/moblock/moblock-update | 174 - .../community/moblock/moblock.install | 30 - .../community/moblock/moblock.logrotate | 11 - .../community/moblock/moblock_0.9_rc2.patch | 912 - .../community/moblock/moblock_include.patch | 10 - abs/extra-testing/community/mobloquer/PKGBUILD | 26 - abs/extra-testing/community/motion-svn/PKGBUILD | 42 - .../community/motion-svn/motion-svn.install | 11 - abs/extra-testing/community/motion-svn/rc.motion | 36 - abs/extra-testing/community/mozplugger/ChangeLog | 7 - abs/extra-testing/community/mozplugger/PKGBUILD | 26 - .../community/mozplugger/mozplugger.install | 15 - abs/extra-testing/community/mpc/ChangeLog | 15 - abs/extra-testing/community/mpc/PKGBUILD | 26 - abs/extra-testing/community/mpd/PKGBUILD | 45 - abs/extra-testing/community/mpd/mpd | 42 - abs/extra-testing/community/mpd/mpd.install | 23 - abs/extra-testing/community/mre/PKGBUILD | 37 - abs/extra-testing/community/mre/mre-1.1.2.tar.gz | Bin 19685 -> 0 bytes abs/extra-testing/community/mre/mre.install | 20 - abs/extra-testing/community/mre/mre.lr | 9 - abs/extra-testing/community/mre/patch.diff | 293 - abs/extra-testing/community/mre/run | 12 - abs/extra-testing/community/mythpywii/CONTROLS | 25 - abs/extra-testing/community/mythpywii/PKGBUILD | 28 - .../community/mythpywii/mythpywii.install | 59 - .../community/mythpywii/wiimote.rules | 6 - .../mythtv-vdpau/2.6.28_dvb_api_version.diff | 22 - abs/extra-testing/community/mythtv-vdpau/PKGBUILD | 102 - .../community/mythtv-vdpau/PKGBUILD.orig | 102 - .../community/mythtv-vdpau/QUICKSTART.archlinux | 69 - .../mythtv-vdpau/menu-xml/HOST_SETTINGS.xml | 87 - .../community/mythtv-vdpau/menu-xml/is.xml | 3 - .../mythtv-vdpau/menu-xml/library.xml.patch | 15 - .../community/mythtv-vdpau/menu-xml/linhes.xml | 54 - .../mythtv-vdpau/menu-xml/mainmenu.xml.patch | 39 - .../community/mythtv-vdpau/menu-xml/mythbackup.xml | 20 - .../mythtv-vdpau/menu-xml/mythrestore.xml | 20 - .../mythtv-vdpau/menu-xml/optical_menu.xml.patch | 15 - .../mythtv-vdpau/menu-xml/original/create_patch.sh | 5 - .../community/mythtv-vdpau/menu-xml/setup.xml | 111 - .../community/mythtv-vdpau/menu-xml/siriusmenu.xml | 419 - .../mythtv-vdpau/menu-xml/util_menu.xml.patch | 17 - .../community/mythtv-vdpau/menu-xml/xmmenu.xml | 574 - .../community/mythtv-vdpau/mpegpspatch | 66 - .../community/mythtv-vdpau/mythbackend | 38 - .../community/mythtv-vdpau/mythbackend.lr | 9 - .../community/mythtv-vdpau/mythfrontend.lr | 9 - .../mythtv-vdpau/myththemedmenu.cpp.patch | 125 - .../community/mythtv-vdpau/myththemedmenu.h.patch | 25 - .../community/mythtv-vdpau/mythtv.install | 61 - abs/extra-testing/community/mythtv-vdpau/pretty | 2 - .../community/mythtv-vdpau/smolt_jump.patch | 9 - abs/extra-testing/community/ncdu/PKGBUILD | 19 - .../community/network-ups-tools/PKGBUILD | 53 - .../community/network-ups-tools/finish.upsd | 16 - .../community/network-ups-tools/nut.install | 21 - .../community/network-ups-tools/run.upsd | 21 - abs/extra-testing/community/nvclock/PKGBUILD | 27 - .../community/nvclock/nvclock-0.8b4-buildfix.patch | 16 - abs/extra-testing/community/nvidia-beta/PKGBUILD | 44 - .../community/nvidia-beta/nvidia.install | 22 - .../community/nvidia-utils-beta/PKGBUILD | 80 - .../community/nvidia-utils-beta/nvidia.install | 36 - .../nvidia-utils-beta/supported-cards.txt | 272 - abs/extra-testing/community/nxtvepg.tar.gz | Bin 2018 -> 0 bytes abs/extra-testing/community/nxtvepg/PKGBUILD | 45 - .../community/nxtvepg/nxtvepg-icon-16.png | Bin 193 -> 0 bytes .../community/nxtvepg/nxtvepg-icon-32.png | Bin 267 -> 0 bytes .../community/nxtvepg/nxtvepg-icon-48.png | Bin 333 -> 0 bytes .../community/nxtvepg/nxtvepg.desktop | 10 - abs/extra-testing/community/nxtvepg/tcl_85.patch | 13 - abs/extra-testing/community/nzbperl/PKGBUILD | 16 - abs/extra-testing/community/peardb/PKGBUILD | 22 - abs/extra-testing/community/pearlog/PKGBUILD | 25 - abs/extra-testing/community/powernowd/PKGBUILD | 28 - abs/extra-testing/community/powernowd/finish | 25 - .../community/powernowd/powernowd.conf.d | 6 - .../community/powernowd/powernowd.install | 19 - abs/extra-testing/community/powernowd/run | 25 - abs/extra-testing/community/projectx/PKGBUILD | 45 - abs/extra-testing/community/projectx/projectx | 10 - abs/extra-testing/community/pyxdg/PKGBUILD | 18 - abs/extra-testing/community/screen/PKGBUILD | 41 - abs/extra-testing/community/screen/screen.install | 27 - abs/extra-testing/community/screen/screen.pam | 1 - abs/extra-testing/community/smplayer/ChangeLog | 62 - abs/extra-testing/community/smplayer/PKGBUILD | 30 - .../community/squeezeboxserver/PKGBUILD | 34 - .../squeezeboxserver/squeezeboxserver.conf.d | 7 - .../squeezeboxserver/squeezeboxserver.install | 56 - .../community/squeezeboxserver/squeezeboxserver.rc | 47 - abs/extra-testing/community/torrentflux/PKGBUILD | 51 - .../srclinks.Ko3AqnsqY/torrentflux/PKGBUILD | 1 - .../torrentflux/torrentflux.install | 1 - .../community/torrentflux/torrentflux.install | 60 - .../community/transmission-cli/PKGBUILD | 41 - .../community/transmission-cli/run.transmissiond | 29 - .../transmission-cli/transmission-cli.install | 28 - .../transmission-cli/transmission.include | 15 - .../community/transmission-cli/transmissiond.conf | 2 - abs/extra-testing/community/tre/PKGBUILD | 19 - abs/extra-testing/community/unrar/PKGBUILD | 23 - .../unrar/unrar-3.5.2-optimalization-fix.patch | 12 - abs/extra-testing/community/uudeview/PKGBUILD | 30 - abs/extra-testing/community/vlc/PKGBUILD | 71 - abs/extra-testing/community/vsftpd/PKGBUILD | 52 - abs/extra-testing/community/vsftpd/run | 13 - abs/extra-testing/community/vsftpd/vsftpd.d | 40 - abs/extra-testing/community/vsftpd/vsftpd.install | 22 - abs/extra-testing/community/vsftpd/vsftpd.xinetd | 10 - abs/extra-testing/community/wiiuse/PKGBUILD | 26 - abs/extra-testing/community/wiiuse/wiiuse.install | 17 - .../community/xine-lib-vdpau-svn/PKGBUILD | 47 - abs/extra-testing/community/zvbi/PKGBUILD | 21 - abs/extra-testing/conky/PKGBUILD | 29 - abs/extra-testing/consolekit/PKGBUILD | 45 - .../consolekit/add_since_option.patch | 220 - abs/extra-testing/consolekit/consolekit.logrotate | 5 - abs/extra-testing/consolekit/nodaemon.patch | 9 - .../consolekit/pam-foreground-compat.ck | 16 - .../consolekit/reorder-initialization.patch | 40 - abs/extra-testing/cpufreqd/PKGBUILD | 30 - abs/extra-testing/cpufreqd/cpufreqd | 35 - abs/extra-testing/cpufreqd/cpufreqd.install | 26 - abs/extra-testing/cpufrequtils/PKGBUILD | 32 - abs/extra-testing/cpufrequtils/cpufreq.confd | 14 - abs/extra-testing/cpufrequtils/cpufreq.rcd | 60 - abs/extra-testing/crda/PKGBUILD | 50 - abs/extra-testing/crda/crda.conf.d | 4 - abs/extra-testing/crda/crda.rc | 26 - abs/extra-testing/crypto++/PKGBUILD | 27 - abs/extra-testing/cups/PKGBUILD | 105 - abs/extra-testing/cups/cups | 38 - abs/extra-testing/cups/cups-1.3.7-peercred.patch | 11 - abs/extra-testing/cups/cups-avahi.patch | 1089 - abs/extra-testing/cups/cups.install | 11 - abs/extra-testing/cups/cups.logrotate | 8 - abs/extra-testing/cups/cups.pam | 3 - abs/extra-testing/cups/fix-infinite-usb-loop.patch | 35 - abs/extra-testing/cvs/PKGBUILD | 28 - abs/extra-testing/cvs/cvs-1.11.23-getline64.patch | 34 - abs/extra-testing/cvs/cvs.install | 20 - abs/extra-testing/ddclient/PKGBUILD | 33 - .../ddclient/ddclient-foreground.patch | 47 - .../ddclient/ddclient.conf.dynamic.dyndns.sample | 162 - abs/extra-testing/deb2targz/PKGBUILD | 20 - abs/extra-testing/diffstat/PKGBUILD | 21 - abs/extra-testing/dnsmasq/PKGBUILD | 41 - abs/extra-testing/dnsmasq/rc.dnsmasq | 36 - abs/extra-testing/docbook-xml/PKGBUILD | 268 - abs/extra-testing/docbook-xml/docbook-xml.install | 46 - abs/extra-testing/docbook-xml/docbook.patch | 226 - abs/extra-testing/docbook-xsl/PKGBUILD | 37 - abs/extra-testing/docbook-xsl/docbook-xsl.install | 47 - abs/extra-testing/doxygen/PKGBUILD | 25 - abs/extra-testing/doxygen/PKGBUILD.orig | 24 - abs/extra-testing/dpgconv/PKGBUILD | 22 - abs/extra-testing/dpgconv/dpgconv-panscan.patch | 83 - abs/extra-testing/enchant/PKGBUILD | 21 - abs/extra-testing/ethtool/PKGBUILD | 22 - abs/extra-testing/evrouter/PKGBUILD | 19 - abs/extra-testing/evtest/PKGBUILD | 24 - abs/extra-testing/evtest/evtest.diff | 32 - abs/extra-testing/exo/PKGBUILD | 29 - abs/extra-testing/exo/exo.install | 11 - abs/extra-testing/fakeroot/PKGBUILD | 28 - abs/extra-testing/fakeroot/fakeroot.install | 30 - abs/extra-testing/fceu/PKGBUILD | 24 - abs/extra-testing/fftw/PKGBUILD | 49 - abs/extra-testing/fftw/fftw.install | 22 - abs/extra-testing/frozen-bubble/PKGBUILD | 31 - .../frozen-bubble/frozen-bubble.desktop | 9 - abs/extra-testing/fuppes-svn/PKGBUILD | 54 - abs/extra-testing/fuppes-svn/PKGBUILD.orig | 52 - .../fuppes-svn/fuppes-r634-archlinux.patch | 93 - abs/extra-testing/fuppes-svn/fuppes.cfg | 216 - abs/extra-testing/fuppes-svn/fuppes.ch | 2 - abs/extra-testing/fuppes-svn/fuppes.diff | 25 - abs/extra-testing/fuppes-svn/fuppes.install | 20 - abs/extra-testing/fuppes-svn/fuppes.lr | 9 - abs/extra-testing/fuppes-svn/run | 2 - .../gconf/01_xml-gettext-domain.patch | 362 - abs/extra-testing/gconf/PKGBUILD | 42 - abs/extra-testing/gconf/gconf-merge-schema | 34 - abs/extra-testing/gconf/gconf-reload.patch | 20 - abs/extra-testing/gconf/gconf.install | 26 - abs/extra-testing/gconf/gconfpkg | 50 - abs/extra-testing/gd/PKGBUILD | 23 - abs/extra-testing/gdl/PKGBUILD | 23 - abs/extra-testing/geoip/PKGBUILD | 25 - abs/extra-testing/glew/PKGBUILD | 23 - abs/extra-testing/gnome-common/PKGBUILD | 19 - abs/extra-testing/gnome-desktop/PKGBUILD | 27 - abs/extra-testing/gnome-doc-utils/PKGBUILD | 22 - abs/extra-testing/gnome-keyring/PKGBUILD | 34 - .../gnome-keyring/gnome-keyring.install | 19 - .../gnome-keyring/gnome-keyring.service | 3 - abs/extra-testing/gnome-menus/PKGBUILD | 26 - abs/extra-testing/gnome-menus/menus.patch | 25 - abs/extra-testing/gnome-mime-data/PKGBUILD | 25 - abs/extra-testing/gnome-python-extras/PKGBUILD | 23 - .../gnome-python-extras-2.19.1-pkg-config.patch | 61 - .../gnome-python-extras-2.19.1-xulrunner.patch | 22 - abs/extra-testing/gnome-python/PKGBUILD | 24 - abs/extra-testing/gnome-screensaver/PKGBUILD | 47 - abs/extra-testing/gnome-screensaver/__changelog | 5 - .../gnome-screensaver/bug564548.patch | 13 - .../gnome-screensaver/gnome-screensaver.install | 32 - .../gnome-screensaver/gnome-screensaver.pam | 3 - abs/extra-testing/gnome-screensaver/gscreensavers | 200 - abs/extra-testing/gnome-vfs/PKGBUILD | 49 - abs/extra-testing/gnome-vfs/gnome-vfs.install | 17 - abs/extra-testing/gnome-vfs/gnutls-config.patch | 25 - .../gnome-vfs/hal-show-volume-names.patch | 46 - abs/extra-testing/gnu-netcat/PKGBUILD | 23 - abs/extra-testing/gnu-netcat/gnu-netcat.install | 13 - abs/extra-testing/gnupg/PKGBUILD | 25 - abs/extra-testing/gnupg/gnupg.install | 21 - abs/extra-testing/gnuplot/PKGBUILD | 34 - abs/extra-testing/gpac/ChangeLog | 9 - abs/extra-testing/gpac/PKGBUILD | 27 - .../gpac/gpac-0.4.2-ffmpeg-errno.patch | 20 - abs/extra-testing/gpgme/PKGBUILD | 25 - abs/extra-testing/gpgme/__changelog | 1 - abs/extra-testing/gpgme/gpgme.install | 18 - abs/extra-testing/graphload/PKGBUILD | 16 - abs/extra-testing/graphload/graphload.sh | 17 - abs/extra-testing/gtk-doc/PKGBUILD | 23 - abs/extra-testing/gtk-doc/gtk-doc.install | 14 - abs/extra-testing/gtk-sharp-2/PKGBUILD | 28 - abs/extra-testing/gtkspell/PKGBUILD | 23 - abs/extra-testing/guile/PKGBUILD | 26 - abs/extra-testing/guile/guile.install | 27 - abs/extra-testing/gvim/PKGBUILD | 84 - abs/extra-testing/gvim/fetch_patches.sh | 61 - abs/extra-testing/gvim/gvim.desktop | 42 - abs/extra-testing/gvim/gvim.install | 24 - abs/extra-testing/hd2u/PKGBUILD | 21 - abs/extra-testing/hddtemp/ChangeLog | 14 - abs/extra-testing/hddtemp/PKGBUILD | 39 - abs/extra-testing/hddtemp/hddtemp | 39 - abs/extra-testing/hddtemp/hddtemp.confd | 2 - abs/extra-testing/hdhgrab/PKGBUILD | 19 - abs/extra-testing/help2man/PKGBUILD | 28 - .../help2man/help2man-1.37.1-respect-LDFLAGS.patch | 11 - abs/extra-testing/hicolor-icon-theme/PKGBUILD | 19 - abs/extra-testing/hspell/PKGBUILD | 23 - abs/extra-testing/htop/ChangeLog | 8 - abs/extra-testing/htop/PKGBUILD | 22 - abs/extra-testing/htop/htop-treeview.patch | 12 - abs/extra-testing/huludesktop/PKGBUILD | 21 - abs/extra-testing/huludesktop/huludesktop | 25 - abs/extra-testing/huludesktop/huludesktop.install | 26 - abs/extra-testing/hunspell/ChangeLog | 6 - abs/extra-testing/hunspell/PKGBUILD | 23 - abs/extra-testing/hunspell/__changelog | 1 - abs/extra-testing/i2c-tools/Makefile.patch | 19 - abs/extra-testing/i2c-tools/PKGBUILD | 21 - abs/extra-testing/icon-naming-utils/PKGBUILD | 24 - abs/extra-testing/id3lib/PKGBUILD | 29 - .../id3lib/id3lib-3.8.3-CVE-2007-4460.patch | 49 - .../id3lib/id3lib-3.8.3-gcc-4.3.patch | 83 - .../patch_id3lib_3.8.3_UTF16_writing_bug.diff | 39 - abs/extra-testing/ifenslave/PKGBUILD | 20 - abs/extra-testing/ifenslave/bonding.conf.d | 12 - abs/extra-testing/imdbpy/PKGBUILD | 28 - abs/extra-testing/inadyn/PKGBUILD | 18 - abs/extra-testing/inadyn/run | 4 - abs/extra-testing/irqbalance/Makefile.irqbalance | 13 - abs/extra-testing/irqbalance/PKGBUILD | 39 - abs/extra-testing/irqbalance/finish | 15 - abs/extra-testing/irqbalance/irqbalance.conf.d | 6 - abs/extra-testing/irqbalance/irqbalance.install | 10 - abs/extra-testing/irqbalance/run | 25 - abs/extra-testing/iso-codes/PKGBUILD | 19 - abs/extra-testing/iw/PKGBUILD | 20 - abs/extra-testing/jade/PKGBUILD | 31 - abs/extra-testing/java-sun/PKGBUILD | 123 - .../java-sun/java-control-panel.desktop | 12 - .../java-monitoring-and-management-console.desktop | 9 - .../java-sun/java-policy-settings.desktop | 10 - abs/extra-testing/java-sun/java-visualvm.desktop | 11 - abs/extra-testing/java-sun/java-web-start.desktop | 13 - abs/extra-testing/java-sun/jdk.install | 11 - abs/extra-testing/java-sun/jdk.profile | 4 - abs/extra-testing/java-sun/jre.install | 22 - abs/extra-testing/java-sun/jre.profile | 4 - abs/extra-testing/joyutils/PKGBUILD | 31 - abs/extra-testing/ladspa/PKGBUILD | 25 - abs/extra-testing/ladspa/hardcode-path.patch | 28 - abs/extra-testing/lcdproc/PKGBUILD | 26 - abs/extra-testing/lcdproc/__changelog | 4 - abs/extra-testing/lcdproc/lcdproc-add-serdisplib | 1353 - abs/extra-testing/lcdproc/lcdproc.install | 7 - abs/extra-testing/libbonobo/PKGBUILD | 30 - .../libbonobo/bonobo-activation-config.xml | 14 - abs/extra-testing/libbonobo/libbonobo.install | 23 - abs/extra-testing/libbonoboui/PKGBUILD | 24 - abs/extra-testing/libcdio/PKGBUILD | 26 - abs/extra-testing/libdvdcss/PKGBUILD | 22 - abs/extra-testing/libdvdnav/PKGBUILD | 22 - abs/extra-testing/libebml/PKGBUILD | 21 - abs/extra-testing/libffi/PKGBUILD | 24 - abs/extra-testing/libffi/libffi.install | 18 - abs/extra-testing/libftdi/PKGBUILD | 19 - abs/extra-testing/libgda/Changelog | 2 - abs/extra-testing/libgda/PKGBUILD | 23 - abs/extra-testing/libgda/bdb43.patch | 18 - abs/extra-testing/libgda/libgda.install | 16 - abs/extra-testing/libgdiplus/PKGBUILD | 22 - abs/extra-testing/libgdiplus/system-cairo.patch | 67 - abs/extra-testing/libgksu/PKGBUILD | 29 - abs/extra-testing/libgksu/libgksu.install | 17 - abs/extra-testing/libgnome/PKGBUILD | 28 - abs/extra-testing/libgnome/libgnome.install | 17 - abs/extra-testing/libgnomecanvas/PKGBUILD | 22 - abs/extra-testing/libgnomekbd/PKGBUILD | 28 - abs/extra-testing/libgnomekbd/libgnomekbd.install | 17 - abs/extra-testing/libgnomeui/PKGBUILD | 24 - abs/extra-testing/libgtkhtml/PKGBUILD | 22 - abs/extra-testing/libgtop/PKGBUILD | 28 - abs/extra-testing/libgtop/libgtop.install | 13 - abs/extra-testing/libidl2/PKGBUILD | 27 - abs/extra-testing/libidl2/libidl2.install | 13 - abs/extra-testing/libmatroska/PKGBUILD | 20 - abs/extra-testing/libmikmod/PKGBUILD | 22 - abs/extra-testing/libmms/PKGBUILD | 21 - abs/extra-testing/libmng/PKGBUILD | 25 - abs/extra-testing/libmpcdec/PKGBUILD | 22 - abs/extra-testing/libmrss/PKGBUILD | 20 - abs/extra-testing/libnl/PKGBUILD | 21 - abs/extra-testing/libnl/ulong_max.patch | 11 - abs/extra-testing/libnotify/PKGBUILD | 22 - abs/extra-testing/libnxml/PKGBUILD | 22 - abs/extra-testing/libsamplerate/ChangeLog | 14 - abs/extra-testing/libsamplerate/PKGBUILD | 23 - abs/extra-testing/libxfce4util/PKGBUILD | 25 - abs/extra-testing/libxklavier/PKGBUILD | 24 - abs/extra-testing/lm_sensors/ChangeLog | 50 - abs/extra-testing/lm_sensors/PKGBUILD | 44 - abs/extra-testing/lm_sensors/fancontrol.rc | 35 - abs/extra-testing/lm_sensors/healthd | 46 - abs/extra-testing/lm_sensors/healthd.conf | 16 - abs/extra-testing/lm_sensors/healthd.rc | 52 - abs/extra-testing/lm_sensors/sensord.conf | 4 - abs/extra-testing/lm_sensors/sensord.rc | 37 - abs/extra-testing/lm_sensors/sensors-detect.patch | 61 - abs/extra-testing/lm_sensors/sensors.install | 12 - abs/extra-testing/lm_sensors/sensors.rc | 119 - abs/extra-testing/lynx/PKGBUILD | 23 - abs/extra-testing/make/PKGBUILD | 20 - abs/extra-testing/mc/PKGBUILD | 55 - abs/extra-testing/mc/mc-4.6.1-bash-all.patch | 33 - abs/extra-testing/mc/mc-4.6.1-find.patch | 155 - abs/extra-testing/mc/mc-4.6.1-invalid-mtime.patch | 30 - abs/extra-testing/mc/mc-4.6.1-largefile.patch | 194 - abs/extra-testing/mc/mc-4.6.1-nonblock.patch | 11 - abs/extra-testing/mdbtools/PKGBUILD | 24 - abs/extra-testing/mdbtools/gmdb2.desktop | 9 - abs/extra-testing/mediaserv/PKGBUILD | 33 - abs/extra-testing/mediaserv/finish | 8 - .../mediaserv/linhes-mediaserv.tar.bz2 | Bin 17322 -> 0 bytes abs/extra-testing/mediaserv/mediaserv.install | 38 - .../mediaserv/mediaserv.no_daemon.patch | 17 - abs/extra-testing/mediaserv/run | 8 - abs/extra-testing/mednafen/PKGBUILD | 21 - abs/extra-testing/mercurial/ChangeLog | 21 - abs/extra-testing/mercurial/PKGBUILD | 35 - abs/extra-testing/mime-types/PKGBUILD | 17 - abs/extra-testing/mime-types/mime.types | 758 - abs/extra-testing/mingetty/PKGBUILD | 30 - abs/extra-testing/mingetty/mingetty-utf8.patch | 158 - abs/extra-testing/miro/ChangeLog | 34 - abs/extra-testing/miro/Changelog | 2 - abs/extra-testing/miro/Miro-xulrunner.patch | 64 - abs/extra-testing/miro/PKGBUILD | 32 - abs/extra-testing/miro/boost_1.36.0_fix.patch | 32 - abs/extra-testing/miro/miro-xine.patch | 12 - abs/extra-testing/miro/miro.exec.patch | 9 - abs/extra-testing/miro/miro.install | 54 - abs/extra-testing/miro/miro_python26.patch | 16 - abs/extra-testing/miro/missing-headers.patch | 33 - abs/extra-testing/mkvtoolnix/PKGBUILD | 22 - abs/extra-testing/monitorix-linhes.tar.gz | Bin 1970 -> 0 bytes abs/extra-testing/monitorix/PKGBUILD | 58 - abs/extra-testing/monitorix/monitorix.install | 30 - abs/extra-testing/monitorix/monitorix.rc.d | 54 - abs/extra-testing/mono/PKGBUILD | 47 - abs/extra-testing/mono/__changelog | 1 - abs/extra-testing/mono/bug434892.patch | 11 - abs/extra-testing/mono/mono.rc.d | 35 - abs/extra-testing/most/PKGBUILD | 20 - abs/extra-testing/most/most-debian.patch | 1655 - abs/extra-testing/mozilla-common/PKGBUILD | 17 - abs/extra-testing/mozilla-common/mozilla-common.sh | 1 - abs/extra-testing/mpeg_stat/PKGBUILD | 19 - abs/extra-testing/mpgtx/PKGBUILD | 16 - abs/extra-testing/mupen64plus-svn/PKGBUILD | 71 - .../mupen64plus-svn/fix-gcc4.4-const-char.patch | 22 - abs/extra-testing/mupen64plus-svn/install.patch | 13 - abs/extra-testing/mutt/PKGBUILD | 39 - abs/extra-testing/mutt/mutt-unmailbox.patch | 10 - abs/extra-testing/mutt/mutt.install | 15 - abs/extra-testing/myt2xvid3/PKGBUILD | 18 - abs/extra-testing/myt2xvid3/archive.php | 159 - abs/extra-testing/myt2xvid3/myt2xvid3 | 310 - abs/extra-testing/myt2xvid3/myt2xvid3-userjob.sh | 6 - abs/extra-testing/myt2xvid3/myt2xvid3.install | 38 - abs/extra-testing/myth2ipod/PKGBUILD | 19 - abs/extra-testing/myth2ipod/iPod.pm | 184 - abs/extra-testing/myth2ipod/m2iweb.php | 157 - abs/extra-testing/myth2ipod/myth2ipod | 310 - abs/extra-testing/myth2ipod/myth2ipod-userjob.sh | 6 - abs/extra-testing/myth2ipod/myth2ipod.install | 38 - abs/extra-testing/mythappletrailers/PKGBUILD | 35 - .../mythappletrailers/appletrailer.xml | 602 - .../mythappletrailers/fix_aple_url.sh | 3 - abs/extra-testing/mythappletrailers/loading.sh | 12 - .../mythappletrailers/myth_trailers_grabber | 214 - .../mythappletrailers/mythappletrailers.install | 37 - abs/extra-testing/mythappletrailers/trailers | 2 - abs/extra-testing/mythexport/PKGBUILD | 17 - abs/extra-testing/mythexport/mythexport.install | 10 - abs/extra-testing/mythfeed/PKGBUILD | 22 - abs/extra-testing/mythfeed/mythfeed.install | 37 - abs/extra-testing/mythnuv2mkv/PKGBUILD | 16 - abs/extra-testing/mythnuv2mkv/mythnuv2mkv.patch | 36 - abs/extra-testing/mythtv-contrib/6200ch.tar.gz | Bin 5040 -> 0 bytes abs/extra-testing/mythtv-contrib/PKGBUILD | 150 - .../mythtv-contrib/dct-channel_make.patch | 16 - .../mythtv-contrib/mythchanger.10f.beta.tar | Bin 30720 -> 0 bytes .../mythtv-contrib/mythchanger_make.patch | 8 - .../mythtv-contrib/mythtv-contrib.install | 7 - abs/extra-testing/mythtv-contrib/xbmc_mythlink.tgz | Bin 7766 -> 0 bytes abs/extra-testing/neon/PKGBUILD | 29 - abs/extra-testing/netkit-bsd-finger/LICENSE | 36 - abs/extra-testing/netkit-bsd-finger/PKGBUILD | 26 - abs/extra-testing/netkit-bsd-finger/finger.xinetd | 8 - abs/extra-testing/nspr/PKGBUILD | 53 - abs/extra-testing/nspr/nspr.pc.in | 10 - abs/extra-testing/nss/PKGBUILD | 84 - abs/extra-testing/nss/nss-config.in | 145 - abs/extra-testing/nss/nss-nolocalsql.patch | 53 - abs/extra-testing/nss/nss.pc.in | 11 - abs/extra-testing/numlockx/PKGBUILD | 26 - abs/extra-testing/nvram-wakup/PKGBUILD | 15 - abs/extra-testing/ocaml/PKGBUILD | 29 - abs/extra-testing/openjdk6/PKGBUILD | 155 - abs/extra-testing/openjdk6/aatext_by_default.diff | 35 - .../openjdk6/fix_corba_cmds_path.diff | 33 - abs/extra-testing/openjdk6/fix_jdk_cmds_path.diff | 33 - abs/extra-testing/openjdk6/fontconfig-paths.diff | 43 - .../openjdk6/gcjwebplugin_xulrunner.diff | 11 - abs/extra-testing/openjdk6/openjdk6.install | 12 - abs/extra-testing/openjdk6/openjdk6.profile | 4 - .../openjpeg/30_fix_build_for_debian.dpatch | 70 - abs/extra-testing/openjpeg/PKGBUILD | 27 - abs/extra-testing/openslp/PKGBUILD | 23 - abs/extra-testing/openslp/rc.slpd | 38 - abs/extra-testing/opera/PKGBUILD | 40 - abs/extra-testing/opera/opera-qt4-theme.patch | 11 - abs/extra-testing/opera/opera.desktop | 91 - abs/extra-testing/opera/opera_logo48.png | Bin 2468 -> 0 bytes abs/extra-testing/orbit2/PKGBUILD | 22 - abs/extra-testing/oss/PKGBUILD | 225 - abs/extra-testing/oss/hg-fix-devc.diff | 397 - abs/extra-testing/oss/hg-latest-fixes.diff | 104 - abs/extra-testing/oss/oss.install | 38 - abs/extra-testing/oss/oss.rc | 32 - abs/extra-testing/oss/oss.rm-init-scripts.patch | 52 - abs/extra-testing/p7zip/PKGBUILD | 45 - abs/extra-testing/perl-yaml/PKGBUILD | 28 - abs/extra-testing/phpmyadmin/PKGBUILD | 18 - abs/extra-testing/pm-quirks/PKGBUILD | 19 - abs/extra-testing/pmount/PKGBUILD | 27 - abs/extra-testing/pmount/pmount-dbus-close.patch | 11 - abs/extra-testing/polkit-gnome/PKGBUILD | 24 - abs/extra-testing/polkit/PKGBUILD | 29 - abs/extra-testing/polkit/polkit.pam | 7 - abs/extra-testing/poppler-data/PKGBUILD | 22 - abs/extra-testing/poppler/PKGBUILD | 67 - abs/extra-testing/postfix/PKGBUILD | 52 - abs/extra-testing/postfix/__changelog | 1 - abs/extra-testing/postfix/postfix | 58 - abs/extra-testing/postfix/postfix.install | 38 - abs/extra-testing/postfix/postfix.patch.bz2 | Bin 373 -> 0 bytes abs/extra-testing/postgresql-libs/PKGBUILD | 58 - abs/extra-testing/postgresql/PKGBUILD | 79 - abs/extra-testing/postgresql/build.patch | 11 - abs/extra-testing/postgresql/postgresql | 59 - abs/extra-testing/postgresql/postgresql.confd | 4 - abs/extra-testing/postgresql/postgresql.pam | 3 - abs/extra-testing/powertop/ChangeLog | 3 - abs/extra-testing/powertop/PKGBUILD | 20 - abs/extra-testing/procmail/PKGBUILD | 21 - abs/extra-testing/pth/PKGBUILD | 22 - abs/extra-testing/pycrypto/PKGBUILD | 19 - abs/extra-testing/pyopenssl/PKGBUILD | 15 - abs/extra-testing/pyorbit/PKGBUILD | 22 - abs/extra-testing/pyqt/ChangeLog | 21 - abs/extra-testing/pyqt/PKGBUILD | 30 - abs/extra-testing/pyrex/ChangeLog | 5 - abs/extra-testing/pyrex/PKGBUILD | 21 - abs/extra-testing/python-geoip/PKGBUILD | 20 - abs/extra-testing/python-lxml/PKGBUILD | 34 - abs/extra-testing/python-m2crypto/PKGBUILD | 22 - abs/extra-testing/python-pybluez/PKGBUILD | 24 - abs/extra-testing/python-pymedia/PKGBUILD | 19 - abs/extra-testing/python-pyserial/PKGBUILD | 20 - abs/extra-testing/pyusb/PKGBUILD | 16 - abs/extra-testing/qscintilla/ChangeLog | 13 - abs/extra-testing/qscintilla/PKGBUILD | 55 - abs/extra-testing/quilt/PKGBUILD | 22 - abs/extra-testing/rarian/PKGBUILD | 29 - abs/extra-testing/rarian/user-segfault.patch | 14 - abs/extra-testing/read-edid/PKGBUILD | 20 - abs/extra-testing/recstat/PKGBUILD | 19 - abs/extra-testing/recstat/recstat | 56 - abs/extra-testing/recstat/recstat.install | 13 - abs/extra-testing/recstat/recstat.py | 38 - abs/extra-testing/recstat/run | 7 - abs/extra-testing/rhino/PKGBUILD | 18 - abs/extra-testing/romdb/PKGBUILD | 17 - abs/extra-testing/romdb/romdb.install | 18 - abs/extra-testing/rrd_stats/PKGBUILD | 21 - abs/extra-testing/rrd_stats/rrd_stats.install | 34 - abs/extra-testing/rrd_stats/rrd_stats.tgz | Bin 8444 -> 0 bytes abs/extra-testing/rrd_stats/run_rrd.sh | 8 - abs/extra-testing/rrdtool/ChangeLog | 13 - abs/extra-testing/rrdtool/PKGBUILD | 29 - abs/extra-testing/rtmpdump/PKGBUILD | 19 - abs/extra-testing/ruby/PKGBUILD | 28 - abs/extra-testing/sample-media/PKGBUILD | 37 - abs/extra-testing/sample-media/audio/05-Hush.mp3 | Bin 4946841 -> 0 bytes abs/extra-testing/sample-media/images/115_1573.jpg | Bin 482585 -> 0 bytes .../sample-media/images/345-1217206791B81W.jpg | Bin 176991 -> 0 bytes .../sample-media/images/classic-menugraph.png | Bin 144106 -> 0 bytes .../sample-media/images/dvr_menugraph.png | Bin 207288 -> 0 bytes .../sample-media/images/menu_diagram_color.png | Bin 193264 -> 0 bytes abs/extra-testing/sample-media/rom/PACMAN.SMC | Bin 524800 -> 0 bytes abs/extra-testing/sample-media/sample.install | 41 - .../sample-media/video/TripThe1939.mpeg | Bin 23128735 -> 0 bytes abs/extra-testing/scanfw/PKGBUILD | 23 - abs/extra-testing/scanfw/scanfw-98d.beta.tar.gz | Bin 45883 -> 0 bytes abs/extra-testing/scanfw/scanfw.install | 5 - abs/extra-testing/scte65scan/PKGBUILD | 23 - abs/extra-testing/sdl_gfx/PKGBUILD | 29 - abs/extra-testing/sdl_image/PKGBUILD | 27 - .../sdl_image/SDL_image-IMG_lbm.patch | 28 - .../sdl_image/SDL_image-buffer-overflow.patch | 13 - abs/extra-testing/sdl_mixer/PKGBUILD | 25 - abs/extra-testing/sdl_net/PKGBUILD | 22 - abs/extra-testing/sdl_pango/PKGBUILD | 24 - .../sdl_pango/SDL_Pango-0.1.2-API-adds.patch | 116 - abs/extra-testing/sdl_perl/PKGBUILD | 32 - abs/extra-testing/sdl_sound/PKGBUILD | 25 - abs/extra-testing/sdl_sound/flac.patch | 126 - abs/extra-testing/sdl_ttf/PKGBUILD | 21 - abs/extra-testing/sdlmame/ChangeLog | 5 - abs/extra-testing/sdlmame/PKGBUILD | 89 - abs/extra-testing/sdlmame/extras.tar.gz | Bin 4093 -> 0 bytes abs/extra-testing/sdlmame/mame-0137-wiimote.diff | 424 - abs/extra-testing/sdlmame/sdlmame.install | 29 - abs/extra-testing/sdlmame/sdlmame.sh | 58 - abs/extra-testing/serdisplib/PKGBUILD | 22 - abs/extra-testing/shepherd/PKGBUILD | 16 - abs/extra-testing/sip/ChangeLog | 17 - abs/extra-testing/sip/PKGBUILD | 29 - abs/extra-testing/slang/ChangeLog | 7 - abs/extra-testing/slang/PKGBUILD | 24 - abs/extra-testing/smartmontools/PKGBUILD | 27 - abs/extra-testing/smartmontools/smartd | 35 - abs/extra-testing/smpeg/PKGBUILD | 28 - abs/extra-testing/smpeg/smpeg-0.4.4-gcc41.patch | 41 - abs/extra-testing/snes9x/PKGBUILD | 42 - abs/extra-testing/snes9x/snes9x-fixes2.patch | 29 - abs/extra-testing/snes9x/snes9x.install | 13 - abs/extra-testing/speex/PKGBUILD | 25 - abs/extra-testing/spidermonkey/PKGBUILD | 27 - abs/extra-testing/spidermonkey/header.patch | 12 - .../spidermonkey/spidermonkey-1.7-threadsafe.patch | 16 - abs/extra-testing/startup-notification/PKGBUILD | 19 - abs/extra-testing/strace/PKGBUILD | 21 - abs/extra-testing/strace/no_linux_socket_h.patch | 22 - abs/extra-testing/subversion/ChangeLog | 66 - abs/extra-testing/subversion/PKGBUILD | 94 - abs/extra-testing/subversion/__changelog | 1 - abs/extra-testing/subversion/subversion-neon.patch | 62 - .../subversion/subversion.rpath.fix.patch | 10 - .../subversion.suppress.deprecation.warnings.patch | 22 - abs/extra-testing/subversion/svn | 11 - abs/extra-testing/subversion/svnmerge.py | 2370 - abs/extra-testing/subversion/svnserve | 42 - abs/extra-testing/subversion/svnserve.conf | 7 - abs/extra-testing/swh-plugins/PKGBUILD | 28 - abs/extra-testing/swig/PKGBUILD | 23 - abs/extra-testing/sysstat/PKGBUILD | 35 - abs/extra-testing/sysstat/sysstat | 21 - abs/extra-testing/tablet-encode/PKGBUILD | 20 - abs/extra-testing/tango-icon-theme/PKGBUILD | 23 - abs/extra-testing/tatir/PKGBUILD | 21 - abs/extra-testing/tatir/tatir.install | 19 - abs/extra-testing/tatir/tatir.tar.bz2 | Bin 4525 -> 0 bytes abs/extra-testing/terminal/PKGBUILD | 30 - .../terminal/terminal-dont-die-on-dbus-kill.patch | 10 - abs/extra-testing/terminal/terminal.install | 11 - abs/extra-testing/terminus-font/PKGBUILD | 20 - abs/extra-testing/terminus-font/install.proto | 27 - .../terminus-font/terminus-font.install | 21 - abs/extra-testing/thunar/PKGBUILD | 30 - abs/extra-testing/thunar/__changelog | 1 - abs/extra-testing/thunar/thunar.install | 14 - abs/extra-testing/tightvnc/PKGBUILD | 37 - .../tightvnc/tightvnc-fontpath-xcolors.patch | 14 - abs/extra-testing/tree/PKGBUILD | 22 - abs/extra-testing/ttf-ms-fonts/PKGBUILD | 27 - .../ttf-ms-fonts/ttf-ms-fonts.install | 55 - abs/extra-testing/unetbootin/PKGBUILD | 28 - abs/extra-testing/unison/PKGBUILD | 44 - abs/extra-testing/unison/unison.desktop | 13 - abs/extra-testing/unison/unison.install | 32 - abs/extra-testing/unixodbc/PKGBUILD | 24 - abs/extra-testing/v4l-dvb-dvico2/PKGBUILD | 24 - ...vare-i2c-i2c-constify-client-address-data.patch | 25 - abs/extra-testing/v4l-dvb-dvico2/v4l-dvb.install | 23 - abs/extra-testing/v4l-dvb-dvico2/xc-bluebird.patch | 896 - abs/extra-testing/vcdimager/PKGBUILD | 22 - abs/extra-testing/vcdimager/__changelog | 1 - abs/extra-testing/vcdimager/cdio.patch | 11 - abs/extra-testing/vim/PKGBUILD | 66 - abs/extra-testing/vim/__changelog | 3 - abs/extra-testing/vim/fetch_patches.sh | 61 - abs/extra-testing/vim/vim.install | 38 - abs/extra-testing/vorbis-tools/ChangeLog | 10 - abs/extra-testing/vorbis-tools/PKGBUILD | 25 - abs/extra-testing/vorbis-tools/curl.patch | 10 - .../vorbis-tools-1.1.1-flac_gt_1.1.3_support.patch | 500 - abs/extra-testing/vte/PKGBUILD | 26 - .../vte/vte-0.16.0-reaper-python-bindings.patch | 62 - abs/extra-testing/wavpack/PKGBUILD | 25 - abs/extra-testing/webmin/PKGBUILD | 222 - abs/extra-testing/webmin/run | 11 - abs/extra-testing/webmin/webmin-config.tar.bz2 | Bin 3021 -> 0 bytes abs/extra-testing/webmin/webmin-pacman.tar.bz2 | Bin 924 -> 0 bytes abs/extra-testing/webmin/webmin.install | 39 - abs/extra-testing/webmin/webmin.rc | 44 - abs/extra-testing/windowmaker/PKGBUILD | 31 - .../windowmaker/windowmaker\n.build.log" | 1276 - .../windowmaker/windowmaker-gcc4.patch.tar.bz2 | Bin 39677 -> 0 bytes abs/extra-testing/wireshark/PKGBUILD | 26 - abs/extra-testing/wireshark/wireshark.desktop | 10 - abs/extra-testing/wireshark/wireshark.png | Bin 18535 -> 0 bytes abs/extra-testing/wol/PKGBUILD | 19 - abs/extra-testing/wol/wakeonlan.sh | 10 - abs/extra-testing/wxgtk/ChangeLog | 40 - abs/extra-testing/wxgtk/PKGBUILD | 39 - abs/extra-testing/wxgtk/__changelog | 1 - abs/extra-testing/wxgtk/gsocket.patch | 18 - abs/extra-testing/wxgtk/overflow.patch | 66 - abs/extra-testing/x11vnc/PKGBUILD | 21 - abs/extra-testing/xalan-java/PKGBUILD | 21 - abs/extra-testing/xautomation/PKGBUILD | 18 - abs/extra-testing/xbmc-svn/CHANGELOG | 110 - abs/extra-testing/xbmc-svn/Lircmap.xml | 233 - abs/extra-testing/xbmc-svn/PKGBUILD | 97 - abs/extra-testing/xbmc-svn/__changelog | 1 - abs/extra-testing/xbmc-svn/xbmc-svn.install | 13 - abs/extra-testing/xbmc/FEH.sh | 47 - abs/extra-testing/xbmc/Lircmap.xml | 233 - abs/extra-testing/xbmc/PKGBUILD | 116 - abs/extra-testing/xbmc/__changelog | 1 - .../use_cdio_system_headers_on_non_win32.patch | 130 - abs/extra-testing/xbmc/xbmc.install | 7 - abs/extra-testing/xdg-utils/PKGBUILD | 19 - abs/extra-testing/xe/PKGBUILD | 21 - abs/extra-testing/xe/xe.install | 18 - abs/extra-testing/xerces2-java/PKGBUILD | 22 - abs/extra-testing/xfsdump/PKGBUILD | 25 - abs/extra-testing/xine-lib/ChangeLog | 43 - abs/extra-testing/xine-lib/PKGBUILD | 41 - abs/extra-testing/xine-lib/__changelog | 3 - abs/extra-testing/xine-lib/xine-header.patch | 11 - abs/extra-testing/xine-lib/xine-imagemagick.patch | 11 - .../xine-lib-1.1.1-configure-no-mcpu-march.patch | 13 - abs/extra-testing/xine-lib/xine.install | 27 - abs/extra-testing/xine-ui/ChangeLog | 7 - abs/extra-testing/xine-ui/PKGBUILD | 30 - abs/extra-testing/xinetd/PKGBUILD | 32 - abs/extra-testing/xinetd/servers | 10 - abs/extra-testing/xinetd/services | 10 - abs/extra-testing/xinetd/xinetd | 38 - abs/extra-testing/xinetd/xinetd-2.3.14.tar.gz | Bin 301703 -> 0 bytes abs/extra-testing/xinetd/xinetd.conf | 14 - abs/extra-testing/xmbmon/Makefile.in.patch | 37 - abs/extra-testing/xmbmon/PKGBUILD | 20 - abs/extra-testing/xmlto/PKGBUILD | 24 - abs/extra-testing/xmms/PKGBUILD | 50 - abs/extra-testing/xmms/id3v2.patch | 3379 -- .../xmms/xmms-1.2.10-crossfade-0.3.9.patch | 101 - abs/extra-testing/xmms/xmms-fix.diff | 11 - abs/extra-testing/xmms/xmms-menu.patch | 35 - abs/extra-testing/xscreensaver/ChangeLog | 20 - abs/extra-testing/xscreensaver/LICENSE | 9 - abs/extra-testing/xscreensaver/PKGBUILD | 40 - abs/extra-testing/xscreensaver/__changelog | 3 - abs/extra-testing/xscreensaver/xscreensaver | 198 - .../xscreensaver/xscreensaver.install | 30 - abs/extra-testing/xscreensaver/xscreensaver.pam | 1 - abs/extra-testing/xscreensaver/xscreensavers | 198 - abs/extra-testing/xulrunner/PKGBUILD | 43 - abs/extra-testing/xulrunner/mozconfig | 33 - abs/extra-testing/xulrunner/xulrunner.install | 11 - abs/extra-testing/zip/ChangeLog | 5 - abs/extra-testing/zip/PKGBUILD | 32 - abs/extra-testing/zip/zip-3.0-build.patch | 34 - abs/extra-testing/zip/zip-3.0-exec-stack.patch | 20 - abs/extra-testing/zip/zip-3.0-no-crypt.patch | 51 - abs/extra-testing/zip/zip-3.0-pic.patch | 12 - abs/extra/alsa-firmware/PKGBUILD | 33 + abs/extra/autofs/PKGBUILD | 27 +- abs/extra/autofs/autofs | 17 +- abs/extra/bluez/rc.bluetooth | 106 - abs/extra/community/cwiid-svn/PKGBUILD | 49 - abs/extra/community/cwiid-svn/cwiid.install | 16 - abs/extra/community/jre/PKGBUILD | 58 - abs/extra/community/jre/jre.install | 26 - abs/extra/community/jre/jre.profile | 4 - abs/extra/community/libmatroska/PKGBUILD | 21 - abs/extra/community/libmpcdec/PKGBUILD | 22 - abs/extra/community/moblockcontrol/PKGBUILD | 42 - .../moblockcontrol/moblock-control-update.sh | 3 - .../community/moblockcontrol/moblock_control.patch | 11 - .../moblockcontrol/moblockcontrol.install | 28 - abs/extra/community/mre/PKGBUILD | 18 +- abs/extra/community/mre/livescores.tgz | Bin 39586 -> 0 bytes abs/extra/community/mre/mre.install | 2 +- abs/extra/community/mre/patch.diff | 232 +- abs/extra/community/mre/run | 2 + .../srclinks.Ko3AqnsqY/torrentflux/PKGBUILD | 1 + .../torrentflux/torrentflux.install | 1 + abs/extra/community/transmission-cli/ChangeLog | 60 - abs/extra/community/transmission-cli/transmissiond | 37 - abs/extra/community/xbmc-svn/CHANGELOG | 110 - abs/extra/community/xbmc-svn/Lircmap.xml | 233 - abs/extra/community/xbmc-svn/PKGBUILD | 139 - abs/extra/community/xbmc-svn/__changelog | 1 - .../community/xbmc-svn/libcurl-not-in-lib64.patch | 13 - abs/extra/community/xbmc-svn/xbmc-svn.install | 13 - abs/extra/community/xbmc/ChangeLog | 64 - abs/extra/community/xbmc/PKGBUILD | 118 - abs/extra/community/xbmc/xbmc.install | 9 - abs/extra/consolekit/PKGBUILD | 45 + abs/extra/consolekit/add_since_option.patch | 220 + abs/extra/consolekit/consolekit.logrotate | 5 + abs/extra/consolekit/nodaemon.patch | 9 + abs/extra/consolekit/pam-foreground-compat.ck | 16 + abs/extra/consolekit/reorder-initialization.patch | 40 + abs/extra/cups/PKGBUILD | 105 + abs/extra/cups/cups | 38 + abs/extra/cups/cups-1.3.7-peercred.patch | 11 + abs/extra/cups/cups-avahi.patch | 1089 + abs/extra/cups/cups.install | 11 + abs/extra/cups/cups.logrotate | 8 + abs/extra/cups/cups.pam | 3 + abs/extra/cups/fix-infinite-usb-loop.patch | 35 + abs/extra/cvs/PKGBUILD | 26 +- abs/extra/cvs/cvs-1.11.23-getline64.patch | 34 + abs/extra/cvs/cvs.install | 20 + abs/extra/ddclient/ChangeLog | 22 - abs/extra/ddclient/ddclient.conf.d | 2 - abs/extra/ddclient/ddclient.install | 41 - abs/extra/ddclient/ddclient.rc | 37 - abs/extra/gconf/01_xml-gettext-domain.patch | 193 +- .../05_from_vuntz_gconf2-pk-default-path.patch | 12 - abs/extra/gconf/PKGBUILD | 39 +- abs/extra/gconf/xml-gettext-domain.patch | 367 - abs/extra/gnome-common/PKGBUILD | 19 + abs/extra/gnome-vfs/PKGBUILD | 36 +- abs/extra/gnome-vfs/gnutls-config.patch | 25 + abs/extra/irqbalance/irqbalance.rc.d | 46 - abs/extra/java-sun/PKGBUILD | 123 + abs/extra/java-sun/java-control-panel.desktop | 12 + .../java-monitoring-and-management-console.desktop | 9 + abs/extra/java-sun/java-policy-settings.desktop | 10 + abs/extra/java-sun/java-visualvm.desktop | 11 + abs/extra/java-sun/java-web-start.desktop | 13 + abs/extra/java-sun/jdk.install | 11 + abs/extra/java-sun/jdk.profile | 4 + abs/extra/java-sun/jre.install | 22 + abs/extra/java-sun/jre.profile | 4 + abs/extra/lcdproc/lcdd | 38 - abs/extra/libffi/PKGBUILD | 24 + abs/extra/libffi/libffi.install | 18 + abs/extra/libglade/PKGBUILD | 28 - abs/extra/libglade/glade.install | 25 - abs/extra/libglade/libglade-2.0.1-nowarning.patch | 39 - abs/extra/libgnomeui/PKGBUILD | 14 +- abs/extra/libmng/PKGBUILD | 25 + abs/extra/libxp/PKGBUILD | 24 - abs/extra/neon/PKGBUILD | 21 +- abs/extra/nvram-wake/PKGBUILD | 16 - abs/extra/openjpeg/30_fix_build_for_debian.dpatch | 70 + abs/extra/openjpeg/PKGBUILD | 27 + abs/extra/openslp/PKGBUILD | 23 + abs/extra/openslp/rc.slpd | 38 + abs/extra/pm-quirks/PKGBUILD | 19 + abs/extra/policykit-gnome/PKGBUILD | 32 - abs/extra/policykit-gnome/policykit-gnome.install | 23 - abs/extra/policykit/PKGBUILD | 43 - abs/extra/policykit/entry-leak.patch | 37 - abs/extra/policykit/pk-ck-api-change.patch | 83 - abs/extra/policykit/policykit.install | 30 - abs/extra/policykit/polkit-0.8-dbus-policy.patch | 12 - abs/extra/policykit/polkit.pam | 7 - abs/extra/polkit-gnome/PKGBUILD | 24 + abs/extra/polkit/PKGBUILD | 29 + abs/extra/polkit/polkit.pam | 7 + abs/extra/poppler-data/PKGBUILD | 22 + abs/extra/poppler/PKGBUILD | 67 + abs/extra/printproto/PKGBUILD | 22 - abs/extra/removecommercials/PKGBUILD | 11 - abs/extra/removecommercials/removecommercials | 195 - abs/extra/subversion/ChangeLog | 48 + abs/extra/subversion/PKGBUILD | 156 +- abs/extra/subversion/__changelog | 1 + abs/extra/subversion/subversion.rpath.fix.patch | 10 + .../subversion.suppress.deprecation.warnings.patch | 22 + abs/extra/subversion/svnmerge.py | 2370 + abs/extra/subversion/svnserve | 2 +- abs/extra/unison/PKGBUILD | 22 +- abs/extra/unison/ocaml-3.08-extnames.patch | 14 - "abs/extra/windowmaker/windowmaker\n.build.log" | 1276 + abs/mv-core/MythVantage-config/.kdbgrc.mythinstall | 12 - abs/mv-core/MythVantage-config/MythVantage.sh | 3 - abs/mv-core/MythVantage-config/PKGBUILD | 112 - abs/mv-core/MythVantage-config/add_service.sh | 15 - abs/mv-core/MythVantage-config/autocard.py | 307 - abs/mv-core/MythVantage-config/bpopup-ui.xml | 164 - abs/mv-core/MythVantage-config/build_diskless.sh | 162 - abs/mv-core/MythVantage-config/builddir | 1 - .../MythVantage-config/checkout_MythVantage.sh | 49 - abs/mv-core/MythVantage-config/copy-back.sh | 8 - abs/mv-core/MythVantage-config/copy-to-mythbase.sh | 12 - abs/mv-core/MythVantage-config/create_master.sh | 104 - abs/mv-core/MythVantage-config/file_time_offset.py | 39 - abs/mv-core/MythVantage-config/install-ui.xml | 175 - .../MythVantage-config/install_db_chroot.sh | 51 - .../MythVantage-config/install_functions.sh | 344 - abs/mv-core/MythVantage-config/install_proxy.sh | 234 - abs/mv-core/MythVantage-config/issue | 1 - abs/mv-core/MythVantage-config/live-install.sh | 28 - abs/mv-core/MythVantage-config/live.install | 57 - abs/mv-core/MythVantage-config/mv_advanced.py | 384 - abs/mv-core/MythVantage-config/mv_common.py | 201 - abs/mv-core/MythVantage-config/mv_config.py | 14 - abs/mv-core/MythVantage-config/mv_hostype.py | 230 - abs/mv-core/MythVantage-config/mv_install.py | 1434 - abs/mv-core/MythVantage-config/mv_ir.py | 330 - abs/mv-core/MythVantage-config/mv_misc.py | 180 - abs/mv-core/MythVantage-config/mv_network.py | 507 - abs/mv-core/MythVantage-config/mv_screensaver.py | 199 - abs/mv-core/MythVantage-config/mv_smolt.py | 59 - abs/mv-core/MythVantage-config/mv_software.py | 41 - abs/mv-core/MythVantage-config/mv_webuser.py | 21 - abs/mv-core/MythVantage-config/myth_user_call | 172 - abs/mv-core/MythVantage-config/myth_user_call.py | 159 - abs/mv-core/MythVantage-config/mythvantage-release | 1 - abs/mv-core/MythVantage-config/networkconfig.sh | 313 - abs/mv-core/MythVantage-config/remove_service.sh | 8 - .../MythVantage-config/restore_default_settings.sh | 362 - abs/mv-core/MythVantage-config/soundconfig.sh | 254 - abs/mv-core/MythVantage-config/startx | 29 - abs/mv-core/MythVantage-config/systemconfig.py | 243 - abs/mv-core/MythVantage-config/systemconfig.sh | 19 - .../templates/LCD/Shuttle-SG33/LCDd.conf | 869 - .../templates/LCD/Silverstone/LCDd.conf | 869 - .../templates/LCD/Silverstone/modules | 1 - .../templates/LCD/antec_fusion/LCDd.conf | 869 - .../templates/LCD/antec_fusion/lircd.conf | 38 - .../templates/LCD/antec_fusion/lircrc | 15 - .../templates/LCD/antec_fusion/modules | 1 - .../templates/LCD/xosd/LCDd.conf | 957 - .../templates/audio/space_battle_A.wav | Bin 3782844 -> 0 bytes .../MythVantage-config/templates/cc.orig.sh | 35 - abs/mv-core/MythVantage-config/templates/cc.sh | 5 - abs/mv-core/MythVantage-config/templates/cc_vol.sh | 5 - .../MythVantage-config/templates/change_chan.sh | 19 - .../MythVantage-config/templates/cron.template | 4 - .../templates/etcnet/eth/ipv4address | 2 - .../templates/etcnet/eth/ipv4route | 2 - .../templates/etcnet/eth/iwconfig | 2 - .../templates/etcnet/eth/options | 7 - .../templates/evrouter/MythVantage-4 | 0 .../templates/evrouter/MythVantage-8 | 0 .../templates/evrouter/MythVantage-Full | 0 .../templates/evrouter/MythVantage8-minipac | 3 - .../templates/evrouter/MythVantage8-uhid | 3 - .../MythVantage-config/templates/exports.template | 8 - .../templates/fstab.conf.template | 16 - .../templates/modules/lirc_i2c.conf | 2 - .../MythVantage-config/templates/mysql.service | 13 - abs/mv-core/MythVantage-config/templates/mysql.txt | 29 - .../templates/ncid.conf.template | 51 - .../templates/ncidd.conf.template | 143 - .../templates/real_change_chan.sh | 19 - .../templates/remotes/ATI_wonder/lircd.ATI.conf | 357 - .../remotes/ATI_wonder/lircrc-atiwonder.txt | 922 - .../templates/remotes/ATI_wonder/preview.jpg | Bin 63480 -> 0 bytes .../remotes/MX-500-jams/lircd.conf.MX-500-JAMS | 115 - .../templates/remotes/MX-500-jams/lircrc | 832 - .../templates/remotes/MX-500-jams/preview.jpg | Bin 10473 -> 0 bytes .../templates/remotes/MythVantage-one/lircd.conf | 115 - .../templates/remotes/MythVantage-one/lircrc | 857 - .../templates/remotes/MythVantage-one/preview.jpg | Bin 88727 -> 0 bytes .../RadioShack_15-2116-Jarod_Wilson/lircd-rs.conf | 87 - .../RadioShack_15-2116-Jarod_Wilson/lircrc-rs | 539 - .../RadioShack_15-2116-Jarod_Wilson/preview.jpg | Bin 7504 -> 0 bytes .../templates/remotes/gr8zap/lircd.conf.streamzap | 69 - .../templates/remotes/gr8zap/lircrc | 472 - .../templates/remotes/gr8zap/preview.jpg | Bin 83195 -> 0 bytes .../remotes/hauppauge/lircd.conf.hauppauge | 274 - .../remotes/hauppauge/lircmd.conf.hauppauge | 33 - .../templates/remotes/hauppauge/preview.jpg | Bin 45763 -> 0 bytes .../MythVantage-config/templates/remotes/i2c.id | 5 - .../templates/remotes/imon-pad/lircd.conf | 88 - .../templates/remotes/imon-pad/lircrc | 240 - .../templates/remotes/imon-pad/preview.jpg | Bin 33321 -> 0 bytes .../templates/remotes/mceusb/lircd-mceusb.conf | 88 - .../templates/remotes/mceusb/lircrc-mceusb | 393 - .../templates/remotes/mceusb/preview.jpg | Bin 12551 -> 0 bytes .../templates/remotes/no_remote/preview.jpg | Bin 3087 -> 0 bytes .../remotes/one-for-juski/lircd.conf.juski | 59 - .../templates/remotes/one-for-juski/lircrc | 394 - .../templates/remotes/one-for-juski/preview.jpg | Bin 17751 -> 0 bytes .../templates/remotes/receiver_usb.id | 33 - .../remotes/snapstream_firefly/lircd.snapstrm.conf | 127 - .../remotes/snapstream_firefly/lircrc-snapstrm.txt | 590 - .../remotes/snapstream_firefly/preview.jpg | Bin 63750 -> 0 bytes .../remotes/streamzap/lircd.conf.streamzap | 69 - .../templates/remotes/streamzap/lircrc | 832 - .../templates/remotes/streamzap/preview.jpg | Bin 83195 -> 0 bytes .../templates/samba/smb.conf.home | 10 - .../templates/samba/smb.conf.media | 10 - .../templates/samba/smb.conf.template | 125 - .../templates/settings/default_1/keybindings.txt | 209 - .../templates/settings/default_1/settings.txt | 320 - .../templates/settings/default_2/keybindings.txt | 209 - .../templates/settings/default_2/settings.txt | 320 - .../MythVantage-config/templates/sources/mv-core | 2 - .../templates/sources/mv-core-testing | 2 - .../MythVantage-config/templates/sources/mv-extra | 2 - .../templates/sources/mv-extra-testing | 2 - .../MythVantage-config/templates/sources/svc_pkg | 3 - .../transmit/Time_Warner_SA3250/lircd.conf | 413 - .../templates/xine.config.template | 754 - .../templates/xorg/96xx_supported.txt | 175 - .../templates/xorg/modeline.ATSC | 33 - .../MythVantage-config/templates/xorg/modeline.DVD | 9 - .../templates/xorg/modeline.NTSC | 10 - .../templates/xorg/modeline.VESA | 163 - .../templates/xorg/modeline.custom | 1 - .../templates/xorg/xorg.conf.ati | 98 - .../templates/xorg/xorg.conf.intel | 152 - .../templates/xorg/xorg.conf.nvidia | 93 - .../templates/xorg/xorg.conf.vesa | 75 - .../templates/xorg/xorg.conf.via | 80 - .../templates/xorg/xorg.conf.vmware | 75 - abs/mv-core/MythVantage-config/timezip.py | 232 - abs/mv-core/MythVantage-config/timezone.bin | Bin 806343 -> 0 bytes abs/mv-core/MythVantage-config/xconfig.sh | 363 - abs/mv-core/MythVantage-system/45-event.rules | 1 - abs/mv-core/MythVantage-system/PKGBUILD | 43 - abs/mv-core/MythVantage-system/STB-start | 160 - abs/mv-core/MythVantage-system/STB.install | 116 - abs/mv-core/MythVantage-system/STBWINDOWMANAGER | 2 - abs/mv-core/MythVantage-system/backend_control.sh | 34 - abs/mv-core/MythVantage-system/backup_job | 63 - abs/mv-core/MythVantage-system/file_time_offset.py | 39 - abs/mv-core/MythVantage-system/firstboot.sh | 44 - abs/mv-core/MythVantage-system/grabkey.py | 111 - abs/mv-core/MythVantage-system/imdb-bulk-update.pl | 720 - abs/mv-core/MythVantage-system/initial_db_run | 24 - abs/mv-core/MythVantage-system/inittab | 34 - .../MythVantage-system/load-modules-mythvantage.sh | 32 - abs/mv-core/MythVantage-system/mbegdbcommands.txt | 8 - abs/mv-core/MythVantage-system/mfegdbcommands.txt | 8 - abs/mv-core/MythVantage-system/myth_mtc.py | 139 - abs/mv-core/MythVantage-system/myth_mtc.sh | 12 - abs/mv-core/MythVantage-system/notify.py | 29 - abs/mv-core/MythVantage-system/optimize_mythdb.py | 16 - abs/mv-core/MythVantage-system/playmedia.sh | 53 - abs/mv-core/MythVantage-system/repo_sync.sh | 11 - abs/mv-core/MythVantage-system/restartfrontend.sh | 4 - abs/mv-core/MythVantage-system/restore_job.sh | 39 - abs/mv-core/MythVantage-system/saytime.sh | 14 - abs/mv-core/MythVantage-system/smolt.cron | 11 - abs/mv-core/MythVantage-system/startfrontend | 147 - abs/mv-core/MythVantage-system/update_system | 52 - abs/mv-core/MythVantage-system/update_system_all | 10 - abs/mv-core/MythVantage-system/wmaker | 2 - abs/mv-core/certmaster/PKGBUILD | 29 - abs/mv-core/certmaster/certmaster-0.24.tar.gz | Bin 43666 -> 0 bytes abs/mv-core/certmaster/certmaster-0.25.tar.gz | Bin 50878 -> 0 bytes abs/mv-core/certmaster/certmaster.conf | 13 - abs/mv-core/certmaster/certmaster.install | 46 - abs/mv-core/certmaster/minion.conf | 8 - abs/mv-core/confuse/PKGBUILD | 19 - abs/mv-core/dnsmasq/PKGBUILD | 41 - .../dnsmasq/dnsmasq-capability-config.patch | 14 - abs/mv-core/dnsmasq/dnsmasq.conf | 38 - abs/mv-core/dnsmasq/dnsmasq.install | 21 - abs/mv-core/dnsmasq/dnsmasq.rc.d | 36 - abs/mv-core/dnsmasq/pxelinux.0 | Bin 13480 -> 0 bytes abs/mv-core/dnsmasq/pxelinux.default | 10 - abs/mv-core/e16-myth-settings/PKGBUILD | 32 - abs/mv-core/e16-myth-settings/e16.install | 43 - ...tv..e16.themes.mine.actionclasses.cfg.preparsed | 206 - ...e.mythtv..e16.themes.mine.borders.cfg.preparsed | 1636 - ...e.mythtv..e16.themes.mine.cursors.cfg.preparsed | 1 - ....mythtv..e16.themes.mine.desktops.cfg.preparsed | 13 - ...htv..e16.themes.mine.imageclasses.cfg.preparsed | 593 - ...home.mythtv..e16.themes.mine.init.cfg.preparsed | 38 - ...ythtv..e16.themes.mine.menustyles.cfg.preparsed | 59 - ...thtv..e16.themes.mine.textclasses.cfg.preparsed | 59 - ....mythtv..e16.themes.mine.tooltips.cfg.preparsed | 19 - ...tv..e16.themes.mine.windowmatches.cfg.preparsed | 3 - .../cfg/.usr.share.e16.config.menus.cfg.preparsed | 4 - .../e16/e_config--0.0.backgrounds | 17 - .../e16-myth-settings/e16/e_config--0.0.buttons | 0 .../e16-myth-settings/e16/e_config--0.0.cfg | 159 - .../e16-myth-settings/e16/e_config--0.0.ibox | 0 .../e16-myth-settings/e16/e_config--0.0.snapshots | 6 - .../e16-myth-settings/e16/menus/epplets.menu | 1 - abs/mv-core/e16-myth-settings/e16/menus/file.menu | 4 - .../e16/menus/menus_GNOME/index.menu | 1 - .../e16/menus/menus_KDE/index.menu | 1 - .../e16/menus/menus_Other/AudioVideo.menu | 3 - .../e16/menus/menus_Other/Network.menu | 2 - .../e16/menus/menus_Other/Settings.menu | 2 - .../e16/menus/menus_Other/System.menu | 3 - .../e16/menus/menus_Other/Utility.menu | 2 - .../e16/menus/menus_Other/index.menu | 5 - .../e16-myth-settings/e16/menus/user_apps.menu | 21 - abs/mv-core/e16-myth-settings/e16/themes/mine/MAIN | 30 - .../e16/themes/mine/actionclasses.cfg | 172 - .../e16/themes/mine/backgrounds/backgrounds.cfg | 18 - .../e16/themes/mine/backgrounds/blue.gif | Bin 848 -> 0 bytes .../e16/themes/mine/backgrounds/yellow.gif | Bin 859 -> 0 bytes .../e16-myth-settings/e16/themes/mine/borders.cfg | 3 - .../e16/themes/mine/borders/BORDERLESS/border.cfg | 7 - .../e16/themes/mine/borders/DEFAULT/border.cfg | 158 - .../mine/borders/DEFAULT/images/button_clear.png | Bin 930 -> 0 bytes .../borders/DEFAULT/images/button_clear2_stick.png | Bin 1041 -> 0 bytes .../borders/DEFAULT/images/button_clear_down.png | Bin 980 -> 0 bytes .../borders/DEFAULT/images/button_clear_hi.png | Bin 1056 -> 0 bytes .../borders/DEFAULT/images/button_clear_stick.png | Bin 960 -> 0 bytes .../DEFAULT/images/button_clear_stick_down.png | Bin 1026 -> 0 bytes .../DEFAULT/images/button_clear_stick_hi.png | Bin 1081 -> 0 bytes .../mine/borders/DEFAULT/images/button_green.png | Bin 968 -> 0 bytes .../borders/DEFAULT/images/button_green_down.png | Bin 1017 -> 0 bytes .../borders/DEFAULT/images/button_green_hi.png | Bin 1041 -> 0 bytes .../borders/DEFAULT/images/button_green_stick.png | Bin 1103 -> 0 bytes .../DEFAULT/images/button_green_stick_down.png | Bin 1087 -> 0 bytes .../DEFAULT/images/button_green_stick_hi.png | Bin 1121 -> 0 bytes .../borders/DEFAULT/images/button_inactive.png | Bin 689 -> 0 bytes .../mine/borders/DEFAULT/images/button_red.png | Bin 939 -> 0 bytes .../borders/DEFAULT/images/button_red_down.png | Bin 1011 -> 0 bytes .../mine/borders/DEFAULT/images/button_red_hi.png | Bin 1032 -> 0 bytes .../borders/DEFAULT/images/button_red_stick.png | Bin 1093 -> 0 bytes .../DEFAULT/images/button_red_stick_down.png | Bin 1089 -> 0 bytes .../borders/DEFAULT/images/button_red_stick_hi.png | Bin 1126 -> 0 bytes .../mine/borders/DEFAULT/images/button_yellow.png | Bin 946 -> 0 bytes .../borders/DEFAULT/images/button_yellow_down.png | Bin 985 -> 0 bytes .../borders/DEFAULT/images/button_yellow_hi.png | Bin 1004 -> 0 bytes .../borders/DEFAULT/images/button_yellow_stick.png | Bin 1087 -> 0 bytes .../DEFAULT/images/button_yellow_stick_down.png | Bin 1066 -> 0 bytes .../DEFAULT/images/button_yellow_stick_hi.png | Bin 1086 -> 0 bytes .../themes/mine/borders/DEFAULT/images/buttons.xcf | Bin 11770 -> 0 bytes .../themes/mine/borders/DEFAULT/images/frame.png | Bin 100 -> 0 bytes .../mine/borders/DEFAULT/images/resize_handle.png | Bin 319 -> 0 bytes .../borders/DEFAULT/images/resize_handle_stick.png | Bin 357 -> 0 bytes .../themes/mine/borders/DEFAULT/images/title.png | Bin 221 -> 0 bytes .../mine/borders/DEFAULT/images/title_active.png | Bin 264 -> 0 bytes .../mine/borders/DEFAULT/images/title_stick.png | Bin 870 -> 0 bytes .../borders/DEFAULT/images/title_stick_active.png | Bin 870 -> 0 bytes .../mine/borders/DEFAULT/images/titlebar.png | Bin 615 -> 0 bytes .../borders/DEFAULT/images/titlebar_active.png | Bin 630 -> 0 bytes .../mine/borders/DEFAULT/images/titlebar_mask.png | Bin 607 -> 0 bytes .../DEFAULT/images/titlebar_mask_active.png | Bin 625 -> 0 bytes .../mine/borders/DEFAULT/images/titlebar_stick.png | Bin 1424 -> 0 bytes .../DEFAULT/images/titlebar_stick_active.png | Bin 1424 -> 0 bytes .../borders/DEFAULT/images/titlebar_stick_mask.png | Bin 1424 -> 0 bytes .../DEFAULT/images/titlebar_stick_mask_active.png | Bin 1424 -> 0 bytes .../e16/themes/mine/borders/ICONBOX/border.cfg | 7 - .../e16/themes/mine/borders/PAGER/border.cfg | 213 - .../e16/themes/mine/borders/PAGER/images/pb1.png | Bin 110 -> 0 bytes .../e16/themes/mine/borders/PAGER/images/pb2.png | Bin 484 -> 0 bytes .../e16/themes/mine/borders/PAGER/images/pb3.png | Bin 473 -> 0 bytes .../e16/themes/mine/borders/PAGER/images/pb4.png | Bin 677 -> 0 bytes .../e16/themes/mine/borders/PAGER/images/pb5.png | Bin 477 -> 0 bytes .../e16/themes/mine/borders/PAGER/images/pb6.png | Bin 118 -> 0 bytes .../e16/themes/mine/borders/PAGER/images/pb8.png | Bin 497 -> 0 bytes .../e16/themes/mine/borders/RIGHT_PAGER/border.cfg | 212 - .../themes/mine/borders/RIGHT_PAGER/images/pb1.png | Bin 141 -> 0 bytes .../themes/mine/borders/RIGHT_PAGER/images/pb2.png | Bin 484 -> 0 bytes .../themes/mine/borders/RIGHT_PAGER/images/pb3.png | Bin 542 -> 0 bytes .../themes/mine/borders/RIGHT_PAGER/images/pb4.png | Bin 842 -> 0 bytes .../themes/mine/borders/RIGHT_PAGER/images/pb5.png | Bin 477 -> 0 bytes .../themes/mine/borders/RIGHT_PAGER/images/pb6.png | Bin 144 -> 0 bytes .../themes/mine/borders/RIGHT_PAGER/images/pb8.png | Bin 517 -> 0 bytes .../e16/themes/mine/borders/SMALL/border.cfg | 121 - .../mine/borders/SMALL/images/button_clear.png | Bin 660 -> 0 bytes .../borders/SMALL/images/button_clear_down.png | Bin 686 -> 0 bytes .../mine/borders/SMALL/images/button_clear_hi.png | Bin 707 -> 0 bytes .../mine/borders/SMALL/images/button_inactive.png | Bin 660 -> 0 bytes .../mine/borders/SMALL/images/button_red.png | Bin 696 -> 0 bytes .../mine/borders/SMALL/images/button_red_down.png | Bin 699 -> 0 bytes .../mine/borders/SMALL/images/button_red_hi.png | Bin 714 -> 0 bytes .../mine/borders/SMALL/images/button_yellow.png | Bin 691 -> 0 bytes .../borders/SMALL/images/button_yellow_down.png | Bin 682 -> 0 bytes .../mine/borders/SMALL/images/button_yellow_hi.png | Bin 698 -> 0 bytes .../e16/themes/mine/borders/SMALL/images/title.png | Bin 227 -> 0 bytes .../e16/themes/mine/borders/STEEL/border.cfg | 158 - .../e16/themes/mine/borders/TRANSIENT/border.cfg | 90 - .../themes/mine/borders/VERYSMALLFIXED/border.cfg | 90 - .../e16/themes/mine/borders/actions.cfg | 108 - .../e16/themes/mine/borders/borders.cfg | 10 - .../e16/themes/mine/borders/common/border.cfg | 689 - .../mine/borders/common/images/fixed_bottom_bg.png | Bin 147 -> 0 bytes .../mine/borders/common/images/fixed_bottom_fg.png | Bin 147 -> 0 bytes .../themes/mine/borders/common/images/left_bg.png | Bin 151 -> 0 bytes .../themes/mine/borders/common/images/left_fg.png | Bin 151 -> 0 bytes .../mine/borders/common/images/pager_bottom.png | Bin 479 -> 0 bytes .../mine/borders/common/images/pager_left.png | Bin 413 -> 0 bytes .../mine/borders/common/images/pager_right.png | Bin 427 -> 0 bytes .../mine/borders/common/images/pager_top.png | Bin 524 -> 0 bytes .../themes/mine/borders/common/images/right_bg.png | Bin 151 -> 0 bytes .../themes/mine/borders/common/images/right_fg.png | Bin 151 -> 0 bytes .../borders/common/images/transient_title_bg.png | Bin 153 -> 0 bytes .../borders/common/images/transient_title_fg.png | Bin 153 -> 0 bytes .../e16/themes/mine/borders/images.cfg | 247 - .../e16/themes/mine/colormodifiers.cfg | 2 - .../e16/themes/mine/common/images/bg.png | Bin 138 -> 0 bytes .../e16/themes/mine/common/images/blank.png | Bin 86 -> 0 bytes .../e16/themes/mine/common/images/selected.png | Bin 224 -> 0 bytes .../e16/themes/mine/coords/coords.cfg | 5 - .../e16-myth-settings/e16/themes/mine/cursors.cfg | 3 - .../e16-myth-settings/e16/themes/mine/desktops.cfg | 3 - .../e16/themes/mine/dialogs/dialogs.cfg | 165 - .../e16/themes/mine/dialogs/images/button_down.png | Bin 1960 -> 0 bytes .../themes/mine/dialogs/images/button_down2.png | Bin 1692 -> 0 bytes .../e16/themes/mine/dialogs/images/button_up.png | Bin 2610 -> 0 bytes .../e16/themes/mine/dialogs/images/button_up2.png | Bin 822 -> 0 bytes .../e16/themes/mine/dialogs/images/check_off.png | Bin 695 -> 0 bytes .../e16/themes/mine/dialogs/images/check_on.png | Bin 1525 -> 0 bytes .../e16/themes/mine/dialogs/images/radio_off.png | Bin 943 -> 0 bytes .../e16/themes/mine/dialogs/images/radio_on.png | Bin 1083 -> 0 bytes .../e16/themes/mine/dialogs/images/separator.png | Bin 117 -> 0 bytes .../themes/mine/dialogs/images/slider_horiz.png | Bin 279 -> 0 bytes .../mine/dialogs/images/slider_knob_horiz.png | Bin 484 -> 0 bytes .../mine/dialogs/images/slider_knob_vert.png | Bin 484 -> 0 bytes .../e16/themes/mine/dialogs/images/slider_vert.png | Bin 399 -> 0 bytes .../e16/themes/mine/dialogs/images/window.png | Bin 126 -> 0 bytes .../e16/themes/mine/dragbar/dragbar.cfg | 55 - .../mine/dragbar/images/.xvpics/downarrow.png | 5 - .../e16/themes/mine/dragbar/images/downarrow.png | Bin 619 -> 0 bytes .../themes/mine/dragbar/images/downarrow_cl.png | Bin 628 -> 0 bytes .../themes/mine/dragbar/images/dragbar_horiz.png | Bin 159 -> 0 bytes .../themes/mine/dragbar/images/dragbar_vert.png | Bin 150 -> 0 bytes .../e16/themes/mine/dragbar/images/uparrow.png | Bin 615 -> 0 bytes .../e16/themes/mine/dragbar/images/uparrow_cl.png | Bin 616 -> 0 bytes .../e16/themes/mine/focuslist/focuslist.cfg | 21 - .../e16/themes/mine/focuslist/images/lightbg.png | Bin 7733 -> 0 bytes .../themes/mine/focuslist/images/lightbg_hl.png | Bin 7798 -> 0 bytes .../e16/themes/mine/iconbox/iconbox.cfg | 118 - .../e16/themes/mine/iconbox/images/ar_d.png | Bin 505 -> 0 bytes .../e16/themes/mine/iconbox/images/ar_l.png | Bin 501 -> 0 bytes .../e16/themes/mine/iconbox/images/ar_r.png | Bin 489 -> 0 bytes .../e16/themes/mine/iconbox/images/ar_u.png | Bin 502 -> 0 bytes .../e16/themes/mine/iconbox/images/background.png | Bin 144 -> 0 bytes .../e16/themes/mine/iconbox/images/bt1.png | Bin 441 -> 0 bytes .../e16/themes/mine/iconbox/images/htrough.png | Bin 506 -> 0 bytes .../e16/themes/mine/iconbox/images/ib_cover_h.png | Bin 2125 -> 0 bytes .../e16/themes/mine/iconbox/images/ib_cover_v.png | Bin 2125 -> 0 bytes .../e16/themes/mine/iconbox/images/slh.png | Bin 1803 -> 0 bytes .../e16/themes/mine/iconbox/images/slv.png | Bin 1819 -> 0 bytes .../e16/themes/mine/iconbox/images/vtrough.png | Bin 500 -> 0 bytes .../e16/themes/mine/imageclasses.cfg | 13 - .../e16-myth-settings/e16/themes/mine/init.cfg | 3 - .../e16/themes/mine/init/images/bar.png | Bin 265 -> 0 bytes .../e16/themes/mine/init/images/header.png | Bin 96061 -> 0 bytes .../e16/themes/mine/init/init.cfg | 52 - .../e16-myth-settings/e16/themes/mine/logo.png | Bin 4882 -> 0 bytes .../e16/themes/mine/menus/actions.cfg | 30 - .../e16/themes/mine/menus/buttons.cfg | 53 - .../e16/themes/mine/menus/images.cfg | 21 - .../e16/themes/mine/menus/images/.xvpics/go_hi.png | 13 - .../e16/themes/mine/menus/images/.xvpics/help.png | Bin 1496 -> 0 bytes .../themes/mine/menus/images/.xvpics/help_hi.png | 5 - .../e16/themes/mine/menus/images/.xvpics/junk.png | 5 - .../mine/menus/images/.xvpics/preferences.png | Bin 1666 -> 0 bytes .../mine/menus/images/.xvpics/preferences_hi.png | 5 - .../themes/mine/menus/images/.xvpics/special.png | Bin 1188 -> 0 bytes .../mine/menus/images/.xvpics/special_hi.png | 5 - .../themes/mine/menus/images/.xvpics/themes.png | Bin 1122 -> 0 bytes .../e16/themes/mine/menus/images/go.png | Bin 772 -> 0 bytes .../e16/themes/mine/menus/images/go_hi.png | Bin 829 -> 0 bytes .../e16/themes/mine/menus/images/help.png | Bin 1491 -> 0 bytes .../e16/themes/mine/menus/images/help_hi.png | Bin 1529 -> 0 bytes .../e16/themes/mine/menus/images/junk.png | Bin 177 -> 0 bytes .../e16/themes/mine/menus/images/preferences.png | Bin 1319 -> 0 bytes .../themes/mine/menus/images/preferences_hi.png | Bin 1446 -> 0 bytes .../e16/themes/mine/menus/images/special.png | Bin 1090 -> 0 bytes .../e16/themes/mine/menus/images/special_hi.png | Bin 1197 -> 0 bytes .../e16/themes/mine/menus/images/themes.png | Bin 1558 -> 0 bytes .../e16/themes/mine/menus/menus.cfg | 26 - .../e16/themes/mine/menustyles.cfg | 5 - .../e16/themes/mine/menustyles/images/submenu.png | Bin 1414 -> 0 bytes .../mine/menustyles/images/submenu_selected.png | Bin 494 -> 0 bytes .../e16/themes/mine/menustyles/menustyles.cfg | 47 - .../e16/themes/mine/pager/images/selected.png | Bin 439 -> 0 bytes .../e16/themes/mine/pager/images/window.png | Bin 702 -> 0 bytes .../e16/themes/mine/pager/pager.cfg | 40 - .../e16/themes/mine/textclasses.cfg | 70 - .../e16-myth-settings/e16/themes/mine/tooltips.cfg | 3 - .../e16/themes/mine/tooltips/images/ttip.png | Bin 126 -> 0 bytes .../e16/themes/mine/tooltips/tooltips.cfg | 22 - .../e16-myth-settings/e16/themes/mine/vixar.ttf | Bin 18124 -> 0 bytes .../e16/themes/mine/windowmatches.cfg | 20 - abs/mv-core/e16-myth-settings/tilda/config_0 | 53 - abs/mv-core/enlightenment/PKGBUILD | 30 - abs/mv-core/enlightenment/e_gen_menu.patch | 11 - abs/mv-core/enlightenment/enlightenment.desktop | 8 - abs/mv-core/enlightenment/starting.patch | 11 - abs/mv-core/evrouter/PKGBUILD | 18 - abs/mv-core/func/PKGBUILD | 34 - abs/mv-core/func/failed_func.sh | 14 - abs/mv-core/func/fe_restart.py | 35 - abs/mv-core/func/func-0.24.tar.gz | Bin 130319 -> 0 bytes abs/mv-core/func/func-0.25.tar.gz | Bin 152871 -> 0 bytes abs/mv-core/func/func.install | 56 - abs/mv-core/func/minion.conf | 8 - abs/mv-core/func/pacman.py | 36 - abs/mv-core/func/power.py | 35 - abs/mv-core/ghosd/PKGBUILD | 33 - abs/mv-core/ghosd/blue800.png | Bin 2609 -> 0 bytes abs/mv-core/ghosd/gh800.png | Bin 2559 -> 0 bytes abs/mv-core/ghosd/ghosd-0.0.1/LICENSE | 20 - abs/mv-core/ghosd/ghosd-0.0.1/Makefile | 665 - abs/mv-core/ghosd/ghosd-0.0.1/Makefile.am | 10 - abs/mv-core/ghosd/ghosd-0.0.1/Makefile.in | 665 - abs/mv-core/ghosd/ghosd-0.0.1/README | 6 - abs/mv-core/ghosd/ghosd-0.0.1/aclocal.m4 | 6981 --- abs/mv-core/ghosd/ghosd-0.0.1/config.guess | 1465 - abs/mv-core/ghosd/ghosd-0.0.1/config.h | 59 - abs/mv-core/ghosd/ghosd-0.0.1/config.h.in | 58 - abs/mv-core/ghosd/ghosd-0.0.1/config.log | 965 - abs/mv-core/ghosd/ghosd-0.0.1/config.status | 1222 - abs/mv-core/ghosd/ghosd-0.0.1/config.sub | 1569 - abs/mv-core/ghosd/ghosd-0.0.1/configure | 21024 ------- abs/mv-core/ghosd/ghosd-0.0.1/configure.ac | 60 - abs/mv-core/ghosd/ghosd-0.0.1/depcomp | 529 - abs/mv-core/ghosd/ghosd-0.0.1/doc/Makefile | 541 - abs/mv-core/ghosd/ghosd-0.0.1/doc/Makefile.am | 72 - abs/mv-core/ghosd/ghosd-0.0.1/doc/Makefile.in | 541 - abs/mv-core/ghosd/ghosd-0.0.1/doc/ghosd-docs.sgml | 17 - .../ghosd/ghosd-0.0.1/doc/ghosd-overrides.txt | 0 .../ghosd/ghosd-0.0.1/doc/ghosd-sections.txt | 32 - abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ch01.html | 41 - .../ghosd/ghosd-0.0.1/doc/html/ghosd-Basics.html | 313 - .../ghosd-0.0.1/doc/html/ghosd-Main-Loop.html | 183 - .../ghosd/ghosd-0.0.1/doc/html/ghosd-Text.html | 100 - .../ghosd/ghosd-0.0.1/doc/html/ghosd.devhelp | 26 - abs/mv-core/ghosd/ghosd-0.0.1/doc/html/home.png | Bin 654 -> 0 bytes abs/mv-core/ghosd/ghosd-0.0.1/doc/html/index.html | 47 - abs/mv-core/ghosd/ghosd-0.0.1/doc/html/index.sgml | 17 - abs/mv-core/ghosd/ghosd-0.0.1/doc/html/left.png | Bin 459 -> 0 bytes abs/mv-core/ghosd/ghosd-0.0.1/doc/html/right.png | Bin 472 -> 0 bytes abs/mv-core/ghosd/ghosd-0.0.1/doc/html/style.css | 66 - abs/mv-core/ghosd/ghosd-0.0.1/doc/html/up.png | Bin 406 -> 0 bytes .../ghosd/ghosd-0.0.1/doc/tmpl/ghosd-unused.sgml | 0 abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/ghosd.sgml | 98 - .../ghosd/ghosd-0.0.1/doc/tmpl/main-loop.sgml | 55 - abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/text.sgml | 30 - abs/mv-core/ghosd/ghosd-0.0.1/doc/xml/ghosd.xml | 209 - .../ghosd/ghosd-0.0.1/doc/xml/main-loop.xml | 126 - abs/mv-core/ghosd/ghosd-0.0.1/doc/xml/text.xml | 77 - .../ghosd/ghosd-0.0.1/examples/.deps/animation.Po | 101 - .../ghosd-0.0.1/examples/.deps/example-shared.Plo | 240 - .../ghosd/ghosd-0.0.1/examples/.deps/image.Po | 266 - .../ghosd/ghosd-0.0.1/examples/.deps/text.Po | 383 - .../ghosd/ghosd-0.0.1/examples/.libs/animation | Bin 11951 -> 0 bytes abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/image | Bin 18765 -> 0 bytes .../ghosd/ghosd-0.0.1/examples/.libs/lt-image | Bin 18861 -> 0 bytes abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/text | Bin 12567 -> 0 bytes abs/mv-core/ghosd/ghosd-0.0.1/examples/Makefile | 486 - abs/mv-core/ghosd/ghosd-0.0.1/examples/Makefile.am | 21 - abs/mv-core/ghosd/ghosd-0.0.1/examples/Makefile.in | 486 - abs/mv-core/ghosd/ghosd-0.0.1/examples/animation | 117 - abs/mv-core/ghosd/ghosd-0.0.1/examples/animation.c | 97 - .../ghosd/ghosd-0.0.1/examples/example-shared.c | 66 - .../ghosd/ghosd-0.0.1/examples/example-shared.h | 16 - abs/mv-core/ghosd/ghosd-0.0.1/examples/image | 117 - abs/mv-core/ghosd/ghosd-0.0.1/examples/image.c | 113 - abs/mv-core/ghosd/ghosd-0.0.1/examples/text | 117 - abs/mv-core/ghosd/ghosd-0.0.1/examples/text.c | 83 - abs/mv-core/ghosd/ghosd-0.0.1/ghosd.pc | 11 - abs/mv-core/ghosd/ghosd-0.0.1/ghosd.pc.in | 11 - .../ghosd/ghosd-0.0.1/ghosd/.deps/ghosd-main.Plo | 142 - .../ghosd/ghosd-0.0.1/ghosd/.deps/ghosd-text.Plo | 353 - .../ghosd/ghosd-0.0.1/ghosd/.deps/ghosd.Plo | 148 - .../ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.lai | 35 - .../ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so | Bin 33187 -> 0 bytes .../ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so.0 | Bin 33187 -> 0 bytes .../ghosd-0.0.1/ghosd/.libs/libghosd.so.0.0.0 | Bin 33187 -> 0 bytes abs/mv-core/ghosd/ghosd-0.0.1/ghosd/Makefile | 516 - abs/mv-core/ghosd/ghosd-0.0.1/ghosd/Makefile.am | 24 - abs/mv-core/ghosd/ghosd-0.0.1/ghosd/Makefile.in | 516 - .../ghosd/ghosd-0.0.1/ghosd/ghosd-internal.h | 21 - abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-main.c | 158 - abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-text.c | 25 - abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-text.h | 22 - abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd.c | 226 - abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd.h | 129 - abs/mv-core/ghosd/ghosd-0.0.1/gtk-doc.make | 153 - abs/mv-core/ghosd/ghosd-0.0.1/install-sh | 323 - abs/mv-core/ghosd/ghosd-0.0.1/libtool | 7065 --- abs/mv-core/ghosd/ghosd-0.0.1/ltmain.sh | 6426 -- abs/mv-core/ghosd/ghosd-0.0.1/missing | 357 - abs/mv-core/ghosd/ghosd-0.0.1/stamp-h1 | 1 - abs/mv-core/ghosd/green-800.png | Bin 2448 -> 0 bytes abs/mv-core/ghosd/green800.png | Bin 2559 -> 0 bytes abs/mv-core/ghosd/grey800.png | Bin 870 -> 0 bytes abs/mv-core/ghosd/image.c | 97 - abs/mv-core/ghosd/osdClient.pl | 25 - abs/mv-core/ghosd/osdServer.config | 6 - abs/mv-core/ghosd/osdServer.pl | 189 - abs/mv-core/ghosd/red800.png | Bin 2546 -> 0 bytes abs/mv-core/ghosd/yellow800.png | Bin 2559 -> 0 bytes abs/mv-core/graphviz/PKGBUILD | 21 - abs/mv-core/graphviz/graphviz.install | 39 - abs/mv-core/hobbit-client/PKGBUILD | 20 - abs/mv-core/hobbit-client/client/bin/bb | Bin 176817 -> 0 bytes abs/mv-core/hobbit-client/client/bin/bbcmd | Bin 149012 -> 0 bytes abs/mv-core/hobbit-client/client/bin/bbdigest | Bin 192018 -> 0 bytes abs/mv-core/hobbit-client/client/bin/bbhostgrep | Bin 184354 -> 0 bytes abs/mv-core/hobbit-client/client/bin/bbhostshow | Bin 145965 -> 0 bytes abs/mv-core/hobbit-client/client/bin/clientupdate | Bin 180695 -> 0 bytes .../hobbit-client/client/bin/hobbitclient-aix.sh | 66 - .../client/bin/hobbitclient-darwin.sh | 57 - .../client/bin/hobbitclient-freebsd.sh | 65 - .../hobbit-client/client/bin/hobbitclient-hp-ux.sh | 67 - .../hobbit-client/client/bin/hobbitclient-irix.sh | 58 - .../hobbit-client/client/bin/hobbitclient-linux.sh | 83 - .../client/bin/hobbitclient-netbsd.sh | 62 - .../client/bin/hobbitclient-openbsd.sh | 62 - .../hobbit-client/client/bin/hobbitclient-osf1.sh | 60 - .../client/bin/hobbitclient-sco_sv.sh | 60 - .../hobbit-client/client/bin/hobbitclient-sunos.sh | 77 - .../hobbit-client/client/bin/hobbitclient.sh | 94 - abs/mv-core/hobbit-client/client/bin/hobbitlaunch | Bin 167103 -> 0 bytes abs/mv-core/hobbit-client/client/bin/logfetch | Bin 216887 -> 0 bytes abs/mv-core/hobbit-client/client/bin/msgcache | Bin 169641 -> 0 bytes abs/mv-core/hobbit-client/client/bin/orcahobbit | Bin 172935 -> 0 bytes .../hobbit-client/client/etc/clientlaunch.cfg | 43 - .../hobbit-client/client/etc/hobbitclient.cfg | 52 - .../hobbit-client/client/etc/localclient.cfg | 359 - .../hobbit-client/client/ext/hobbit-mem-myth.sh | 52 - abs/mv-core/hobbit-client/client/runclient.sh | 133 - abs/mv-core/hobbit-client/hobbit-client.install | 17 - abs/mv-core/hobbitmon/PKGBUILD | 84 - abs/mv-core/hobbitmon/be.png | Bin 15618 -> 0 bytes abs/mv-core/hobbitmon/clientlaunch.cfg.diff | 12 - abs/mv-core/hobbitmon/diffs/clientlaunch.cfg | 43 - abs/mv-core/hobbitmon/diffs/clientlaunch.cfg.diff | 12 - abs/mv-core/hobbitmon/diffs/clientlaunch.cfg.orig | 37 - abs/mv-core/hobbitmon/diffs/hobbitgraph.cfg | 1173 - abs/mv-core/hobbitmon/diffs/hobbitgraph.cfg.diff | 42 - abs/mv-core/hobbitmon/diffs/hobbitgraph.cfg.orig | 1138 - abs/mv-core/hobbitmon/diffs/hobbitlaunch.cfg | 240 - abs/mv-core/hobbitmon/diffs/hobbitlaunch.cfg.diff | 40 - abs/mv-core/hobbitmon/diffs/hobbitlaunch.cfg.orig | 206 - abs/mv-core/hobbitmon/diffs/hobbitserver.cfg | 226 - abs/mv-core/hobbitmon/diffs/hobbitserver.cfg.diff | 45 - abs/mv-core/hobbitmon/diffs/hobbitserver.cfg.orig | 224 - abs/mv-core/hobbitmon/hbfunc.py | 167 - abs/mv-core/hobbitmon/hbnotes.py | 344 - abs/mv-core/hobbitmon/hobbit-alerts.cfg | 124 - abs/mv-core/hobbitmon/hobbit-clients.cfg | 427 - abs/mv-core/hobbitmon/hobbit-mem-myth.sh | 52 - abs/mv-core/hobbitmon/hobbit-myth-orphan.sh | 54 - abs/mv-core/hobbitmon/hobbit.install | 32 - abs/mv-core/hobbitmon/hobbit_myth_data.py | 91 - abs/mv-core/hobbitmon/hobbit_notify.sh | 48 - abs/mv-core/hobbitmon/hobbitadd.py | 87 - abs/mv-core/hobbitmon/hobbitcheck.sh | 6 - abs/mv-core/hobbitmon/hobbitgraph.cfg.diff | 42 - abs/mv-core/hobbitmon/hobbitlaunch.cfg.diff | 40 - abs/mv-core/hobbitmon/hobbitserver.cfg.diff | 45 - abs/mv-core/hobbitmon/hobbitstorage.py | 121 - abs/mv-core/hobbitmon/tuner.png | Bin 7685 -> 0 bytes abs/mv-core/hobbitmon/tv.png | Bin 5968 -> 0 bytes abs/mv-core/initscripts/ChangeLog | 2447 - abs/mv-core/initscripts/PKGBUILD | 23 - abs/mv-core/initscripts/__changelog | 1 - abs/mv-core/initscripts/initscripts.install | 7 - abs/mv-core/initscripts/rc.shutdown.patch | 23 - abs/mv-core/initscripts/rc.sysinit.patch | 24 - abs/mv-core/keylaunch/PKGBUILD | 17 - abs/mv-core/keylaunch/example_rc | 18 - abs/mv-core/keylaunch/keylaunch.install | 40 - abs/mv-core/lcdproc/PKGBUILD | 25 - abs/mv-core/lcdproc/lcdd | 38 - abs/mv-core/lcdproc/lcdproc-CVS-current.tar.gz | Bin 838429 -> 0 bytes abs/mv-core/lcdproc/mythvantage.patch | 14 - abs/mv-core/lighttpd/PKGBUILD | 49 - abs/mv-core/lighttpd/index.html | 15 - abs/mv-core/lighttpd/lighttpd.conf | 369 - abs/mv-core/lighttpd/lighttpd.conf.d | 10 - abs/mv-core/lighttpd/lighttpd.install | 80 - abs/mv-core/lighttpd/lighttpd.logrotate.d | 8 - abs/mv-core/lighttpd/lighttpd.rc.d | 39 - abs/mv-core/lighttpd/spawn-php.conf.d | 33 - abs/mv-core/lighttpd/spawn-php.rc.d | 67 - abs/mv-core/lighttpd/ssl_fix.diff | 10 - abs/mv-core/lighttpd/tweakconf.vim | 22 - abs/mv-core/local-website/PKGBUILD | 22 - abs/mv-core/local-website/cgi/beclear.cgi | 4 - abs/mv-core/local-website/cgi/bestop.cgi | 6 - abs/mv-core/local-website/cgi/diskless.py | 11 - abs/mv-core/local-website/cgi/serverkey.cgi | 3 - abs/mv-core/local-website/contents/calllog.py | 66 - abs/mv-core/local-website/contents/calllog.shtml | 20 - abs/mv-core/local-website/contents/count.py | 89 - abs/mv-core/local-website/contents/docs.html | 65 - .../local-website/contents/error-handler.html | 9 - .../local-website/contents/error/hobbit.html | 11 - .../local-website/contents/error/mythweb.html | 16 - .../local-website/contents/error/phpadmin.html | 28 - .../local-website/contents/error/status-404.html | 9 - abs/mv-core/local-website/contents/frame.css | 176 - abs/mv-core/local-website/contents/header.html | 33 - abs/mv-core/local-website/contents/header.jpg | Bin 88341 -> 0 bytes abs/mv-core/local-website/contents/home.shtml | 23 - .../contents/images/classic-menugraph.png | Bin 144106 -> 0 bytes .../contents/images/dvr_menugraph.png | Bin 207288 -> 0 bytes .../contents/images/menu_diagram_color.png | Bin 193264 -> 0 bytes abs/mv-core/local-website/contents/index.html | 14 - abs/mv-core/local-website/contents/links.html | 26 - abs/mv-core/local-website/contents/mv.css | 82 - abs/mv-core/local-website/contents/mvp_process.py | 195 - abs/mv-core/local-website/contents/mvp_select.py | 146 - abs/mv-core/local-website/contents/mvpmc.shtml | 21 - .../local-website/contents/page_background.jpg | Bin 740 -> 0 bytes abs/mv-core/local-website/contents/process.py | 329 - abs/mv-core/mediadirs/PKGBUILD | 60 - abs/mv-core/mediadirs/mediadir.install | 43 - abs/mv-core/mp_all.sh | 31 - abs/mv-core/myth/stable/Midnight-blue/PKGBUILD | 21 - abs/mv-core/myth/stable/Midnight-wide/PKGBUILD | 21 - .../MythVantage-menu/HOST_SETTINGS.xml | 71 - .../MythVantage-menu/util_menu.xml | 121 - .../MythVantage-menu/util_menu.xml.mv | 106 - .../myth/stable/MythVanage-mythmenu/PKGBUILD | 15 - abs/mv-core/myth/stable/basic-amber/PKGBUILD | 20 - abs/mv-core/myth/stable/basic-blue/PKGBUILD | 20 - abs/mv-core/myth/stable/basic-green/PKGBUILD | 20 - abs/mv-core/myth/stable/basic-purple/PKGBUILD | 20 - abs/mv-core/myth/stable/basic-red/PKGBUILD | 20 - abs/mv-core/myth/stable/mp_all.sh | 30 - abs/mv-core/myth/stable/mytharchive/PKGBUILD | 41 - abs/mv-core/myth/stable/mythbrowser/PKGBUILD | 34 - abs/mv-core/myth/stable/mythcontrols/PKGBUILD | 36 - abs/mv-core/myth/stable/mythflix/PKGBUILD | 36 - abs/mv-core/myth/stable/mythgallery/PKGBUILD | 36 - abs/mv-core/myth/stable/mythgame/PKGBUILD | 36 - abs/mv-core/myth/stable/mythmovietime/PKGBUILD | 35 - abs/mv-core/myth/stable/mythmusic/PKGBUILD | 39 - abs/mv-core/myth/stable/mythmusic/music_flac.patch | 293 - abs/mv-core/myth/stable/mythnews/PKGBUILD | 34 - abs/mv-core/myth/stable/mythphone/PKGBUILD | 42 - abs/mv-core/myth/stable/mythsmolt/PKGBUILD | 27 - .../myth/stable/mythtv-release-fixes/3466-v1.patch | 240 - .../myth/stable/mythtv-release-fixes/PKGBUILD | 79 - .../stable/mythtv-release-fixes/dbconfig.patch | 19 - .../mythtv-release-fixes/debug_uitypes.cpp.patch | 21 - .../mythtv-release-fixes/debug_xmlparse.cpp.patch | 14 - .../mythtv-release-fixes/jump_snapshot.patch | 13 - .../mythtv-release-fixes/myth.find_orphans.pl | 260 - .../myth/stable/mythtv-release-fixes/myth.sh | 4 - .../myth/stable/mythtv-release-fixes/mythbackend | 37 - .../stable/mythtv-release-fixes/mythbackend.sh | 117 - .../mythtv-release-fixes/myththemedmenu.cpp.patch | 125 - .../mythtv-release-fixes/myththemedmenu.h.patch | 25 - .../stable/mythtv-release-fixes/mythtv.install | 59 - .../mythtv-release-fixes/pop_be_restart.cpp.patch | 51 - .../mythtv-release-fixes/pop_be_restart.h.patch | 10 - .../myth/stable/mythtv-release-fixes/reload.patch | 52 - .../mythtv-release-fixes/screenshot_jump.patch | 10 - .../stable/mythtv-release-fixes/screenshots.diff | 458 - .../stable/mythtv-release-fixes/screenshots2.diff | 467 - .../stable/mythtv-release-fixes/smolt_jump.patch | 10 - abs/mv-core/myth/stable/mythtv-themes/PKGBUILD | 36 - abs/mv-core/myth/stable/mythvideo/PKGBUILD | 36 - abs/mv-core/myth/stable/mythweather/PKGBUILD | 37 - abs/mv-core/myth/stable/mythweb/PKGBUILD | 34 - abs/mv-core/myth/stable/mythweb/dblogininit.inc | 6 - abs/mv-core/myth/stable/mythweb/mythweb.install | 37 - .../myth/stable/mythweb/mythweblighttpd.patch | 13 - .../myth/stable/syth-lacquer-clean/PKGBUILD | 23 - abs/mv-core/myth/stable/syth-lacquer-wide/PKGBUILD | 23 - abs/mv-core/mythdb-initial/PKGBUILD | 21 - abs/mv-core/mythdb-initial/mc.sql | 2330 - abs/mv-core/mythdb-initial/mythdb.install | 31 - abs/mv-core/mythdb-initial/permissions.sql | 11 - abs/mv-core/mythtv-status/PKGBUILD | 21 - abs/mv-core/mythtv-status/mythtv-status.cron | 4 - abs/mv-core/mythtv-status/mythtv-status.install | 51 - abs/mv-core/mythvantage-live/PKGBUILD | 30 - abs/mv-core/mythvantage-live/bin/gen_fstab | 122 - abs/mv-core/mythvantage-live/bin/km | 76 - abs/mv-core/mythvantage-live/etc/live-shutdown | 90 - abs/mv-core/mythvantage-live/etc/live-sysinit | 73 - abs/mv-core/mythvantage-live/etc/loginroot | 3 - abs/mv-core/mythvantage-live/etc/rc.shutdown-live | 168 - abs/mv-core/mythvantage-live/etc/rc.sysinit-live | 469 - abs/mv-core/mythvantage-live/etc/ulogin | 57 - .../mythvantage-live/lib/initcpio/gen_larch_init | 12 - .../mythvantage-live/lib/initcpio/hooks/larch1 | 125 - .../mythvantage-live/lib/initcpio/hooks/larch2 | 33 - .../lib/initcpio/hooks/larch2_aufs | 33 - .../mythvantage-live/lib/initcpio/hooks/larch3 | 196 - .../mythvantage-live/lib/initcpio/install/larch1 | 15 - .../mythvantage-live/lib/initcpio/install/larch2 | 15 - .../lib/initcpio/install/larch2_aufs | 15 - .../mythvantage-live/lib/initcpio/install/larch3 | 18 - abs/mv-core/mythvantage-live/lib/initcpio/kinit | 6 - .../mythvantage-live/lib/initcpio/mkinitcpio.conf | 54 - abs/mv-core/ncid/PKGBUILD | 63 - abs/mv-core/ncid/cid.sh | 11 - abs/mv-core/ncid/ncid-osd | 26 - abs/mv-core/ncid/ncid.conf | 59 - abs/mv-core/ncid/ncid.install | 17 - abs/mv-core/ncid/ncid.py | 59 - abs/mv-core/ncid/ncid.sql | 51 - abs/mv-core/ncid/ncidclient.sh | 2 - abs/mv-core/ncid/ncidd.conf | 143 - abs/mv-core/ncid/ncidpermissions.sql | 8 - abs/mv-core/runit-scripts-mv/PKGBUILD | 30 - abs/mv-core/runit-scripts-mv/fbsplash-runit.sh | 27 - abs/mv-core/runit-scripts-mv/runit.install | 56 - abs/mv-core/runit-scripts-mv/runitscripts/1 | 26 - abs/mv-core/runit-scripts-mv/runitscripts/1.local | 3 - abs/mv-core/runit-scripts-mv/runitscripts/2 | 8 - abs/mv-core/runit-scripts-mv/runitscripts/3 | 4 - .../runit-scripts-mv/runitscripts/ctrlaltdel | 9 - .../runit-scripts-mv/runitscripts/halt-runit | 2 - abs/mv-core/runit-scripts-mv/runitscripts/logger | 11 - .../runit-scripts-mv/runitscripts/reboot-runit | 2 - .../runitscripts/services/Xvfb/finish | 12 - .../runitscripts/services/Xvfb/run | 11 - .../runitscripts/services/acpid/log/run | 8 - .../runitscripts/services/acpid/run | 7 - .../runitscripts/services/alsa-utils/finish | 3 - .../runitscripts/services/alsa-utils/run | 6 - .../runitscripts/services/apache/run | 8 - .../runitscripts/services/avahi/run | 10 - .../runitscripts/services/certmaster/run | 9 - .../runitscripts/services/cron/run | 9 - .../runitscripts/services/dbus/run | 9 - .../runitscripts/services/dhcpd/run | 8 - .../runitscripts/services/dnsmasq/run | 10 - .../runitscripts/services/evrouter/finish | 10 - .../runitscripts/services/evrouter/run | 20 - .../runitscripts/services/frontend/finish | 27 - .../runitscripts/services/frontend/log/run | 8 - .../runitscripts/services/frontend/run | 17 - .../runitscripts/services/funcd/run | 16 - .../runitscripts/services/ghosd/run | 7 - .../runit-scripts-mv/runitscripts/services/gpm/run | 10 - .../runit-scripts-mv/runitscripts/services/hal/run | 8 - .../runitscripts/services/hobbit-client/run | 71 - .../runitscripts/services/hobbit/run | 7 - .../runitscripts/services/igdaemon/run | 9 - .../runitscripts/services/lcdd/run | 15 - .../runitscripts/services/lighttpd/run | 8 - .../runitscripts/services/lircd/finish | 16 - .../runitscripts/services/lircd/run | 137 - .../runitscripts/services/mdadm/finish | 17 - .../runitscripts/services/mdadm/run | 19 - .../runitscripts/services/mysql/run | 34 - .../runitscripts/services/mythbackend/log/run | 4 - .../runitscripts/services/mythbackend/run | 29 - .../runitscripts/services/ncid/finish | 9 - .../runitscripts/services/ncid/run | 21 - .../runitscripts/services/ncidd/finish | 9 - .../runitscripts/services/ncidd/run | 13 - .../runitscripts/services/netfs/finish | 3 - .../runitscripts/services/netfs/run | 6 - .../runitscripts/services/nfsd/run | 29 - .../runitscripts/services/nfslock/run | 8 - .../runitscripts/services/nmbd/run | 9 - .../runitscripts/services/ntpd/run | 10 - .../runitscripts/services/oss/finish | 4 - .../runit-scripts-mv/runitscripts/services/oss/run | 9 - .../runitscripts/services/portmap/run | 7 - .../runitscripts/services/smartd/finish | 9 - .../runitscripts/services/smartd/run | 13 - .../runitscripts/services/smbd/run | 9 - .../runitscripts/services/sshd/run | 13 - .../runitscripts/services/syslog-ng/run | 10 - .../runitscripts/services/tatir/run | 9 - .../runitscripts/services/tftpd/run | 8 - .../runitscripts/services/tty2/run | 7 - .../runitscripts/services/tty3/run | 6 - abs/mv-core/syslog-ng/PKGBUILD | 26 - abs/mv-core/syslog-ng/log_care.sh | 21 - abs/mv-core/syslog-ng/syslog-ng | 37 - abs/mv-core/syslog-ng/syslog-ng.conf | 129 - abs/mv-core/syslog-ng/syslog-ng.logrotate | 7 - abs/mv-core/syslog-ng/syslog.install | 56 - abs/mv-core/tilda/PKGBUILD | 20 - abs/mv-core/tilda/__changelog | 0 abs/mv-core/tilda/tilda.patch | 25 - abs/mv-core/webcal/PKGBUILD | 35 - abs/mv-core/webcal/config.php | 263 - abs/mv-core/webcal/createdb.sql | 810 - abs/mv-core/webcal/posix.tab | 586 - abs/mv-core/webcal/send_reminders.patch | 38 - abs/mv-core/webcal/sendreminders.sh | 5 - abs/mv-core/webcal/settings.php | 18 - abs/mv-core/webcal/webcal.install | 30 - 5132 files changed, 68134 insertions(+), 741430 deletions(-) delete mode 100644 abs/core-testing/Kernel_rebuild_list delete mode 100644 abs/core-testing/LinHES-config-svn/LinHES-release delete mode 100644 abs/core-testing/LinHES-config-svn/LinHES.install delete mode 100755 abs/core-testing/LinHES-config-svn/MythVantage.sh delete mode 100755 abs/core-testing/LinHES-config-svn/PKGBUILD delete mode 100644 abs/core-testing/LinHES-config-svn/README delete mode 100755 abs/core-testing/LinHES-config-svn/add_service.sh delete mode 100755 abs/core-testing/LinHES-config-svn/autocard.py delete mode 100755 abs/core-testing/LinHES-config-svn/bpopup-ui.xml delete mode 100755 abs/core-testing/LinHES-config-svn/build_diskless.sh delete mode 100755 abs/core-testing/LinHES-config-svn/checkout_MythVantage.sh delete mode 100755 abs/core-testing/LinHES-config-svn/create_master.sh delete mode 100755 abs/core-testing/LinHES-config-svn/file_time_offset.py delete mode 100755 abs/core-testing/LinHES-config-svn/install-ui.xml delete mode 100755 abs/core-testing/LinHES-config-svn/install_db_chroot.sh delete mode 100755 abs/core-testing/LinHES-config-svn/install_functions.sh delete mode 100755 abs/core-testing/LinHES-config-svn/install_proxy.sh delete mode 100644 abs/core-testing/LinHES-config-svn/issue delete mode 100755 abs/core-testing/LinHES-config-svn/live-install.sh delete mode 100644 abs/core-testing/LinHES-config-svn/myth_user_call delete mode 100644 abs/core-testing/LinHES-config-svn/networkconfig.sh delete mode 100755 abs/core-testing/LinHES-config-svn/remove_service.sh delete mode 100755 abs/core-testing/LinHES-config-svn/restore_default_settings.sh delete mode 100644 abs/core-testing/LinHES-config-svn/restore_km_db_chroot.sh delete mode 100755 abs/core-testing/LinHES-config-svn/soundconfig.sh delete mode 100755 abs/core-testing/LinHES-config-svn/startx delete mode 100755 abs/core-testing/LinHES-config-svn/systemconfig.sh delete mode 100755 abs/core-testing/LinHES-config-svn/timezip.py delete mode 100755 abs/core-testing/LinHES-config-svn/timezone.bin delete mode 100755 abs/core-testing/LinHES-config-svn/xconfig.sh delete mode 100644 abs/core-testing/LinHES-config/LinHES-release delete mode 100644 abs/core-testing/LinHES-config/LinHES.install delete mode 100755 abs/core-testing/LinHES-config/MythVantage.sh delete mode 100644 abs/core-testing/LinHES-config/PKGBUILD delete mode 100644 abs/core-testing/LinHES-config/README delete mode 100755 abs/core-testing/LinHES-config/add_service.sh delete mode 100755 abs/core-testing/LinHES-config/autocard.py delete mode 100755 abs/core-testing/LinHES-config/bpopup-ui.xml delete mode 100755 abs/core-testing/LinHES-config/build_diskless.sh delete mode 100755 abs/core-testing/LinHES-config/checkout_MythVantage.sh delete mode 100755 abs/core-testing/LinHES-config/create_master.sh delete mode 100755 abs/core-testing/LinHES-config/file_time_offset.py delete mode 100755 abs/core-testing/LinHES-config/install-ui.xml delete mode 100644 abs/core-testing/LinHES-config/install_db_chroot.sh delete mode 100755 abs/core-testing/LinHES-config/install_functions.sh delete mode 100755 abs/core-testing/LinHES-config/install_proxy.sh delete mode 100644 abs/core-testing/LinHES-config/issue delete mode 100755 abs/core-testing/LinHES-config/live-install.sh delete mode 100755 abs/core-testing/LinHES-config/mv_advanced.py delete mode 100755 abs/core-testing/LinHES-config/mv_common.py delete mode 100755 abs/core-testing/LinHES-config/mv_config.py delete mode 100755 abs/core-testing/LinHES-config/mv_ddns.py delete mode 100755 abs/core-testing/LinHES-config/mv_hostype.py delete mode 100755 abs/core-testing/LinHES-config/mv_install.py delete mode 100755 abs/core-testing/LinHES-config/mv_ir.py delete mode 100755 abs/core-testing/LinHES-config/mv_misc.py delete mode 100755 abs/core-testing/LinHES-config/mv_network.py delete mode 100755 abs/core-testing/LinHES-config/mv_screensaver.py delete mode 100755 abs/core-testing/LinHES-config/mv_smolt.py delete mode 100755 abs/core-testing/LinHES-config/mv_software.py delete mode 100755 abs/core-testing/LinHES-config/mv_webuser.py delete mode 100644 abs/core-testing/LinHES-config/myth_user_call delete mode 100755 abs/core-testing/LinHES-config/myth_user_call.py delete mode 100644 abs/core-testing/LinHES-config/mythvantage.cfg delete mode 100644 abs/core-testing/LinHES-config/networkconfig.sh delete mode 100755 abs/core-testing/LinHES-config/remove_service.sh delete mode 100755 abs/core-testing/LinHES-config/restore_default_settings.sh delete mode 100644 abs/core-testing/LinHES-config/restore_km_db_chroot.sh delete mode 100755 abs/core-testing/LinHES-config/soundconfig.sh delete mode 100755 abs/core-testing/LinHES-config/startx delete mode 100755 abs/core-testing/LinHES-config/systemconfig.py delete mode 100755 abs/core-testing/LinHES-config/systemconfig.sh delete mode 100755 abs/core-testing/LinHES-config/timezip.py delete mode 100755 abs/core-testing/LinHES-config/xconfig.sh delete mode 100644 abs/core-testing/LinHES-system/LinHES-profile.sh delete mode 100755 abs/core-testing/LinHES-system/LinHES-run delete mode 100755 abs/core-testing/LinHES-system/LinHES-session delete mode 100755 abs/core-testing/LinHES-system/LinHES-start delete mode 100644 abs/core-testing/LinHES-system/LinHES.install delete mode 100755 abs/core-testing/LinHES-system/PKGBUILD delete mode 100644 abs/core-testing/LinHES-system/alsa-base delete mode 100644 abs/core-testing/LinHES-system/bin/backupcommon delete mode 100755 abs/core-testing/LinHES-system/bin/checkbackup delete mode 100755 abs/core-testing/LinHES-system/bin/checkrestore delete mode 100755 abs/core-testing/LinHES-system/bin/library.sh delete mode 100755 abs/core-testing/LinHES-system/bin/mythbackup delete mode 100755 abs/core-testing/LinHES-system/bin/mythrestore delete mode 100755 abs/core-testing/LinHES-system/bin/rollback.sh delete mode 100755 abs/core-testing/LinHES-system/firstboot.sh delete mode 100755 abs/core-testing/LinHES-system/load-modules-mythvantage.sh delete mode 100644 abs/core-testing/LinHES-system/myth_mtc.lr delete mode 100755 abs/core-testing/LinHES-system/myth_mtc.py delete mode 100755 abs/core-testing/LinHES-system/myth_mtc.sh delete mode 100755 abs/core-testing/LinHES-system/mythfrontend-start delete mode 100755 abs/core-testing/LinHES-system/optimize_mythdb.py delete mode 100644 abs/core-testing/LinHES-system/smolt.cron delete mode 100755 abs/core-testing/LinHES-system/tvterm.sh delete mode 100644 abs/core-testing/LinHES-system/unclutter-toggle.sh delete mode 100644 abs/core-testing/LinHES-timezone/Makefile delete mode 100644 abs/core-testing/LinHES-timezone/PKGBUILD delete mode 100644 abs/core-testing/LinHES-timezone/Tux.csv delete mode 100644 abs/core-testing/LinHES-timezone/WorldTZ_102.zip delete mode 100644 abs/core-testing/LinHES-timezone/create_map_include.c delete mode 100644 abs/core-testing/LinHES-timezone/extract_map_data.c delete mode 100644 abs/core-testing/LinHES-timezone/linhes_timezone.c delete mode 100644 abs/core-testing/a delete mode 100644 abs/core-testing/a52dec/PKGBUILD delete mode 100644 abs/core-testing/a52dec/a52dec-0.7.4-build.patch delete mode 100644 abs/core-testing/aalib/PKGBUILD delete mode 100644 abs/core-testing/aalib/aclocal-fixes.patch delete mode 100644 abs/core-testing/acl/PKGBUILD delete mode 100644 abs/core-testing/acpid/Makefile delete mode 100644 abs/core-testing/acpid/PKGBUILD delete mode 100644 abs/core-testing/acpid/__changelog delete mode 100644 abs/core-testing/acpid/acpid delete mode 100644 abs/core-testing/acpid/acpid-1.0.4-gcc4.patch delete mode 100644 abs/core-testing/acpid/anything delete mode 100644 abs/core-testing/acpid/default delete mode 100755 abs/core-testing/acpid/handler.sh delete mode 100644 abs/core-testing/alsa-lib/PKGBUILD delete mode 100644 abs/core-testing/alsa-oss/PKGBUILD delete mode 100644 abs/core-testing/alsa-utils/PKGBUILD delete mode 100755 abs/core-testing/alsa-utils/alsa delete mode 100644 abs/core-testing/alsa-utils/alsa.conf.d delete mode 100644 abs/core-testing/alsa-utils/alsaconf.patch delete mode 100644 abs/core-testing/apache/PKGBUILD delete mode 100644 abs/core-testing/apache/apache.conf.d delete mode 100644 abs/core-testing/apache/apachectl-confd.patch delete mode 100644 abs/core-testing/apache/arch.layout delete mode 100755 abs/core-testing/apache/httpd delete mode 100644 abs/core-testing/apache/httpd.logrotate delete mode 100644 abs/core-testing/apr-util/PKGBUILD delete mode 100644 abs/core-testing/apr/PKGBUILD delete mode 100644 abs/core-testing/aspell/PKGBUILD delete mode 100644 abs/core-testing/aspell/aspell.install delete mode 100644 abs/core-testing/atk/PKGBUILD delete mode 100644 abs/core-testing/atl1e/PKGBUILD delete mode 100644 abs/core-testing/atl1e/atl1e.install delete mode 100644 abs/core-testing/attr/PKGBUILD delete mode 100644 abs/core-testing/audiofile/PKGBUILD delete mode 100644 abs/core-testing/audiofile/aclocal-fixes.patch delete mode 100644 abs/core-testing/aufs2-util/PKGBUILD delete mode 100755 abs/core-testing/aufs2-util/create-tarball.sh delete mode 100644 abs/core-testing/aufs2/PKGBUILD delete mode 100644 abs/core-testing/aufs2/aufs2.install delete mode 100755 abs/core-testing/aufs2/create-tarball.sh delete mode 100644 abs/core-testing/aumix/PKGBUILD delete mode 100644 abs/core-testing/aumix/aumix.patch delete mode 100644 abs/core-testing/autoconf/PKGBUILD delete mode 100644 abs/core-testing/autoconf/autoconf.install delete mode 100644 abs/core-testing/automake/PKGBUILD delete mode 100644 abs/core-testing/automake/automake.install delete mode 100644 abs/core-testing/avahi/ChangeLog delete mode 100644 abs/core-testing/avahi/PKGBUILD delete mode 100644 abs/core-testing/avahi/avahi-daemon-dbus.patch delete mode 100644 abs/core-testing/avahi/avahi.install delete mode 100644 abs/core-testing/avahi/gnome-nettool.png delete mode 100644 abs/core-testing/b43-fwcutter/PKGBUILD delete mode 100755 abs/core-testing/base.list delete mode 100644 abs/core-testing/bash/PKGBUILD delete mode 100644 abs/core-testing/bash/bash.install delete mode 100644 abs/core-testing/bash/bashrc delete mode 100644 abs/core-testing/bash/enable-system-config-files.patch delete mode 100644 abs/core-testing/bash/profile.bash delete mode 100644 abs/core-testing/bash/system.bashrc delete mode 100644 abs/core-testing/bc/PKGBUILD delete mode 100644 abs/core-testing/bc/bc-1.06-info-dir-entry.patch delete mode 100644 abs/core-testing/bc/bc.install delete mode 100644 abs/core-testing/bc/build-fix.patch delete mode 100644 abs/core-testing/bigreqsproto/PKGBUILD delete mode 100644 abs/core-testing/binutils/PKGBUILD delete mode 100644 abs/core-testing/binutils/binutils.install delete mode 100644 abs/core-testing/bison/ChangeLog delete mode 100644 abs/core-testing/bison/PKGBUILD delete mode 100644 abs/core-testing/bison/bison.install delete mode 100644 abs/core-testing/bzip2/PKGBUILD delete mode 100644 abs/core-testing/ca-certificates/PKGBUILD delete mode 100644 abs/core-testing/ca-certificates/ca-certificates.install delete mode 100644 abs/core-testing/cairo/PKGBUILD delete mode 100644 abs/core-testing/catalyst/PKGBUILD delete mode 100644 abs/core-testing/catalyst/amdcccle.desktop delete mode 100644 abs/core-testing/catalyst/atieventsd.sh delete mode 100644 abs/core-testing/catalyst/catalyst.install delete mode 100644 abs/core-testing/catalyst/catalyst.sh delete mode 100644 abs/core-testing/catalyst/fglrx-2.6.33.patch delete mode 100644 abs/core-testing/cdparanoia/ChangeLog delete mode 100644 abs/core-testing/cdparanoia/PKGBUILD delete mode 100644 abs/core-testing/cdparanoia/gcc.patch delete mode 100644 abs/core-testing/cdrdao/PKGBUILD delete mode 100644 abs/core-testing/cdrdao/cdrdao-1.2.2-gcc43.patch delete mode 100644 abs/core-testing/cdrdao/gcc4.patch delete mode 100644 abs/core-testing/cdrkit/ChangeLog delete mode 100644 abs/core-testing/cdrkit/PKGBUILD delete mode 100644 abs/core-testing/cloog-ppl/PKGBUILD delete mode 100644 abs/core-testing/cmake/PKGBUILD delete mode 100644 abs/core-testing/compositeproto/PKGBUILD delete mode 100644 abs/core-testing/coreutils/PKGBUILD delete mode 120000 abs/core-testing/coreutils/coreutils-8.5-2-i686.pkg.tar.gz delete mode 100644 abs/core-testing/coreutils/coreutils-pam.patch delete mode 100644 abs/core-testing/coreutils/coreutils-uname.patch delete mode 100644 abs/core-testing/coreutils/coreutils.install delete mode 100644 abs/core-testing/coreutils/su.pam delete mode 100644 abs/core-testing/cpio/PKGBUILD delete mode 100644 abs/core-testing/cpio/cpio-2.9-gcc43.patch delete mode 100644 abs/core-testing/cracklib/PKGBUILD delete mode 100644 abs/core-testing/cryptsetup/PKGBUILD delete mode 100644 abs/core-testing/cryptsetup/cryptsetup-1.0.5-run_udevsettle.patch delete mode 100644 abs/core-testing/cryptsetup/encrypt_hook delete mode 100644 abs/core-testing/cryptsetup/encrypt_install delete mode 100644 abs/core-testing/cryptsetup/luksOpen-status.patch delete mode 100644 abs/core-testing/cups/PKGBUILD delete mode 100755 abs/core-testing/cups/cups delete mode 100644 abs/core-testing/cups/cups-avahi.patch delete mode 100644 abs/core-testing/cups/cups.install delete mode 100644 abs/core-testing/cups/cups.logrotate delete mode 100644 abs/core-testing/cups/cups.pam delete mode 100644 abs/core-testing/curl/ChangeLog delete mode 100644 abs/core-testing/curl/PKGBUILD delete mode 100644 abs/core-testing/curl/m4-typo.patch delete mode 100644 abs/core-testing/damageproto/PKGBUILD delete mode 100644 abs/core-testing/dash/PKGBUILD delete mode 100644 abs/core-testing/db/PKGBUILD delete mode 100644 abs/core-testing/db/db.install delete mode 100644 abs/core-testing/db4.5/PKGBUILD delete mode 100644 abs/core-testing/dbus-core/PKGBUILD delete mode 100644 abs/core-testing/dbus-core/dbus delete mode 100644 abs/core-testing/dbus-core/dbus.install delete mode 100644 abs/core-testing/dbus-glib/PKGBUILD delete mode 100644 abs/core-testing/dbus-python/PKGBUILD delete mode 100644 abs/core-testing/dbus/30-dbus delete mode 100644 abs/core-testing/dbus/PKGBUILD delete mode 100644 abs/core-testing/dbus/dbus delete mode 100644 abs/core-testing/dbus/dbus.install delete mode 100644 abs/core-testing/dcron/PKGBUILD delete mode 100755 abs/core-testing/dcron/crond delete mode 100644 abs/core-testing/dcron/crond.logrotate delete mode 100644 abs/core-testing/dcron/dcron-3.1.patch delete mode 100644 abs/core-testing/dcron/root.crontab delete mode 100755 abs/core-testing/dcron/run-cron delete mode 100644 abs/core-testing/ddcxinfo-arch/PKGBUILD delete mode 100644 abs/core-testing/ddcxinfo/PKGBUILD delete mode 100644 abs/core-testing/ddcxinfo/ddcxinfo-kanotix_0.6.19.tar.gz delete mode 100644 abs/core-testing/ddcxinfo/lrmi.patch delete mode 100644 abs/core-testing/device-mapper/ChangeLog delete mode 100644 abs/core-testing/device-mapper/PKGBUILD delete mode 100644 abs/core-testing/device-mapper/lvm2_hook delete mode 100644 abs/core-testing/device-mapper/lvm2_install delete mode 100644 abs/core-testing/dhcp/ChangeLog delete mode 100644 abs/core-testing/dhcp/PKGBUILD delete mode 100644 abs/core-testing/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch delete mode 100644 abs/core-testing/dhcp/dhcp.conf.d delete mode 100644 abs/core-testing/dhcp/dhcp.install delete mode 100755 abs/core-testing/dhcp/dhcpd delete mode 100644 abs/core-testing/dhcpcd/PKGBUILD delete mode 100644 abs/core-testing/dhcpcd/dhcpcd.conf.d delete mode 100644 abs/core-testing/dialog/PKGBUILD delete mode 100644 abs/core-testing/dialog/timeout.patch delete mode 100644 abs/core-testing/diffutils/PKGBUILD delete mode 100644 abs/core-testing/directfb/ChangeLog delete mode 100644 abs/core-testing/directfb/PKGBUILD delete mode 100644 abs/core-testing/directfb/dfb_serial.diff delete mode 100644 abs/core-testing/diskless-legacy/PKGBUILD delete mode 100755 abs/core-testing/diskless-legacy/config_diskless_frontend.bash delete mode 100644 abs/core-testing/dmapi/PKGBUILD delete mode 100644 abs/core-testing/dmidecode/PKGBUILD delete mode 100644 abs/core-testing/dmxproto/PKGBUILD delete mode 100644 abs/core-testing/dnsutils/PKGBUILD delete mode 100644 abs/core-testing/dnsutils/bind.so_bsdcompat.diff delete mode 100644 abs/core-testing/dnsutils/tools-only.patch delete mode 100644 abs/core-testing/docutils/PKGBUILD delete mode 100644 abs/core-testing/dosfstools/PKGBUILD delete mode 100644 abs/core-testing/dosfstools/linux-2.6.patch delete mode 100644 abs/core-testing/dri2proto/PKGBUILD delete mode 100644 abs/core-testing/dvb-firmware/PKGBUILD delete mode 100644 abs/core-testing/dvb-firmware/dvb-usb-af9015.fw delete mode 100644 abs/core-testing/dvb-firmware/dvb-usb-dib0700-1.20.fw delete mode 100644 abs/core-testing/dvb-firmware/xc3028-v27.fw delete mode 100644 abs/core-testing/dvd+rw-tools/PKGBUILD delete mode 100644 abs/core-testing/dvd+rw-tools/buildpatch-7.0-3-20080108-karolina.patch delete mode 100644 abs/core-testing/dvdauthor/PKGBUILD delete mode 100644 abs/core-testing/e2fsprogs/MIT-LICENSE delete mode 100644 abs/core-testing/e2fsprogs/Makefile-fsck.static.patch delete mode 100644 abs/core-testing/e2fsprogs/PKGBUILD delete mode 100644 abs/core-testing/e2fsprogs/e2fsprogs.install delete mode 100644 abs/core-testing/e2fsprogs/mke2fs.conf delete mode 100644 abs/core-testing/ed/PKGBUILD delete mode 100644 abs/core-testing/ed/ed.install delete mode 100644 abs/core-testing/eggdbus/PKGBUILD delete mode 100644 abs/core-testing/eject/PKGBUILD delete mode 100644 abs/core-testing/eject/eject-2.1.5-handle-spaces.patch delete mode 100644 abs/core-testing/elfutils/PKGBUILD delete mode 100644 abs/core-testing/esound/PKGBUILD delete mode 100755 abs/core-testing/esound/esd delete mode 100644 abs/core-testing/esound/esd-0.2.38-alsa-drain.patch delete mode 100644 abs/core-testing/etcnet/10-defaults delete mode 100755 abs/core-testing/etcnet/PKGBUILD delete mode 100755 abs/core-testing/etcnet/adddhcp.patch delete mode 100755 abs/core-testing/etcnet/etcnet.install delete mode 100644 abs/core-testing/etcnet/functions.patch delete mode 100755 abs/core-testing/etcnet/ipv4address delete mode 100755 abs/core-testing/etcnet/ipv4route delete mode 100644 abs/core-testing/etcnet/network delete mode 100755 abs/core-testing/etcnet/options delete mode 100644 abs/core-testing/eventlog/PKGBUILD delete mode 100644 abs/core-testing/evieext/PKGBUILD delete mode 100644 abs/core-testing/expat/CVE-2009-3560.patch delete mode 100644 abs/core-testing/expat/CVE-2009-3720.patch delete mode 100644 abs/core-testing/expat/PKGBUILD delete mode 100644 abs/core-testing/expect/PKGBUILD delete mode 100644 abs/core-testing/faac/PKGBUILD delete mode 100644 abs/core-testing/faac/libmp4v2.patch delete mode 100644 abs/core-testing/faac/pipe-output.patch delete mode 100644 abs/core-testing/faad2/ChangeLog delete mode 100644 abs/core-testing/faad2/LICENSE delete mode 100644 abs/core-testing/faad2/PKGBUILD delete mode 100644 abs/core-testing/faad2/faad2-2.6.1-abi_has_changed.patch delete mode 100644 abs/core-testing/faad2/faad2-2.6.1-broken-pipe.patch delete mode 100644 abs/core-testing/faad2/faad2-2.6.1-implicitdeclar.patch delete mode 100644 abs/core-testing/faad2/faad2-2.6.1-libtool22.patch delete mode 100644 abs/core-testing/fam/PKGBUILD delete mode 100755 abs/core-testing/fam/fam delete mode 100644 abs/core-testing/fam/fam-2.7.0-dnotify.patch delete mode 100644 abs/core-testing/fam/fam-2.7.0-gcc43.patch delete mode 100644 abs/core-testing/fam/fam-2.7.0-largefiles.patch delete mode 100644 abs/core-testing/fam/fam-2.7.0-noc++.patch delete mode 100644 abs/core-testing/fam/include_fam_h.patch delete mode 100644 abs/core-testing/fbsplash/PKGBUILD delete mode 100644 abs/core-testing/fbsplash/fbcondecor.conf delete mode 100644 abs/core-testing/fbsplash/fbcondecor.daemon delete mode 100644 abs/core-testing/fbsplash/fbsplash-basic.sh delete mode 100644 abs/core-testing/fbsplash/fbsplash.git.patch delete mode 100644 abs/core-testing/fbsplash/fbsplash.initcpio_hook delete mode 100644 abs/core-testing/fbsplash/fbsplash.initcpio_install delete mode 100644 abs/core-testing/fbsplash/fbsplash.install delete mode 100644 abs/core-testing/fbsplash/splash.conf delete mode 100644 abs/core-testing/fcgi/PKGBUILD delete mode 100644 abs/core-testing/fcgi/fcgi-configure.patch delete mode 100644 abs/core-testing/feh/PKGBUILD delete mode 100644 abs/core-testing/ffmpeg-svn/PKGBUILD delete mode 100644 abs/core-testing/fftw2/PKGBUILD delete mode 100644 abs/core-testing/fftw2/__changelog delete mode 100644 abs/core-testing/file/PKGBUILD delete mode 100644 abs/core-testing/filesystem/PKGBUILD delete mode 100644 abs/core-testing/filesystem/__CHANGELOG delete mode 100644 abs/core-testing/filesystem/crypttab delete mode 100644 abs/core-testing/filesystem/filesystem.install delete mode 100644 abs/core-testing/filesystem/fstab delete mode 100644 abs/core-testing/filesystem/group delete mode 100644 abs/core-testing/filesystem/gshadow delete mode 100644 abs/core-testing/filesystem/host.conf delete mode 100644 abs/core-testing/filesystem/hosts delete mode 100644 abs/core-testing/filesystem/issue delete mode 100644 abs/core-testing/filesystem/ld.so.conf delete mode 100644 abs/core-testing/filesystem/modprobe.d.usb-load-ehci-first delete mode 100644 abs/core-testing/filesystem/motd delete mode 100644 abs/core-testing/filesystem/nsswitch.conf delete mode 100644 abs/core-testing/filesystem/passwd delete mode 100644 abs/core-testing/filesystem/profile delete mode 100644 abs/core-testing/filesystem/resolv.conf delete mode 100644 abs/core-testing/filesystem/securetty delete mode 100644 abs/core-testing/filesystem/shadow delete mode 100644 abs/core-testing/filesystem/shells delete mode 100644 abs/core-testing/findutils/PKGBUILD delete mode 100644 abs/core-testing/fixesproto/PKGBUILD delete mode 100644 abs/core-testing/flac/PKGBUILD delete mode 100644 abs/core-testing/flac/flac-1.2.1-gcc43.patch delete mode 100644 abs/core-testing/flac/flac-linking.diff delete mode 100644 abs/core-testing/flac/xmms-plugin.patch delete mode 100644 abs/core-testing/flex/PKGBUILD delete mode 100644 abs/core-testing/flex/flex-yytext.patch delete mode 100644 abs/core-testing/flex/lex.sh delete mode 100644 abs/core-testing/fltk/PKGBUILD delete mode 100644 abs/core-testing/fluxbox/ChangeLog delete mode 100644 abs/core-testing/fluxbox/PKGBUILD delete mode 100644 abs/core-testing/fluxbox/fluxbox-1.0.0-gcc43.patch delete mode 100644 abs/core-testing/fluxbox/fluxbox.desktop delete mode 100644 abs/core-testing/fluxbox/fluxbox_fullscreen_focus.patch delete mode 100644 abs/core-testing/fluxbox/keys delete mode 100644 abs/core-testing/fontcacheproto/PKGBUILD delete mode 100644 abs/core-testing/fontconfig/29-replace-bitmap-fonts.conf delete mode 100644 abs/core-testing/fontconfig/30-urw-aliases.patch delete mode 100644 abs/core-testing/fontconfig/PKGBUILD delete mode 100644 abs/core-testing/fontconfig/fontconfig.install delete mode 100644 abs/core-testing/fontsproto/PKGBUILD delete mode 100644 abs/core-testing/freeglut/PKGBUILD delete mode 100644 abs/core-testing/freeglut/glut-cursor-inherit.patch delete mode 100644 abs/core-testing/freetype2-static/PKGBUILD delete mode 100644 abs/core-testing/freetype2-static/bytecode.patch delete mode 100644 abs/core-testing/freetype2-static/freetype-2.2.1-enable-valid.patch delete mode 100644 abs/core-testing/freetype2-static/freetype-2.2.1-memcpy-fix.patch delete mode 100644 abs/core-testing/freetype2-static/freetype-2.3.0-enable-spr.patch delete mode 100644 abs/core-testing/freetype2/PKGBUILD delete mode 100644 abs/core-testing/freetype2/bytecode.patch delete mode 100644 abs/core-testing/freetype2/freetype-2.2.1-enable-valid.patch delete mode 100644 abs/core-testing/freetype2/freetype-2.2.1-memcpy-fix.patch delete mode 100644 abs/core-testing/freetype2/freetype-2.3.0-enable-spr.patch delete mode 100644 abs/core-testing/freetype2/freetype-2.3.3-ftbitmap.patch delete mode 100644 abs/core-testing/freetype2/freetype2.install delete mode 100644 abs/core-testing/fribidi/ChangeLog delete mode 100644 abs/core-testing/fribidi/PKGBUILD delete mode 100644 abs/core-testing/ftgl/PKGBUILD delete mode 100644 abs/core-testing/ftgl/ftgl-gcc411.patch delete mode 100644 abs/core-testing/fuse/PKGBUILD delete mode 100644 abs/core-testing/fuse/fuse.install delete mode 100755 abs/core-testing/fuse/fuse.rc.d delete mode 100644 abs/core-testing/fxload/PKGBUILD delete mode 100644 abs/core-testing/gawk/PKGBUILD delete mode 100644 abs/core-testing/gawk/gawk-3.1.5-segfault_fix-1.patch delete mode 100644 abs/core-testing/gcc/PKGBUILD delete mode 100644 abs/core-testing/gcc/gcc-ada.install delete mode 100644 abs/core-testing/gcc/gcc-fortran.install delete mode 100644 abs/core-testing/gcc/gcc-hash-style-both.patch delete mode 100644 abs/core-testing/gcc/gcc-libs.install delete mode 100644 abs/core-testing/gcc/gcc.install delete mode 100644 abs/core-testing/gcc/gcc_pure64.patch delete mode 100644 abs/core-testing/gdb/PKGBUILD delete mode 100644 abs/core-testing/gdb/gdb.install delete mode 100644 abs/core-testing/gdbm/PKGBUILD delete mode 100644 abs/core-testing/gdk-pixbuf/PKGBUILD delete mode 100644 abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch delete mode 100644 abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch delete mode 100644 abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch delete mode 100644 abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-m4.patch delete mode 100644 abs/core-testing/gen-init-cpio/Makefile delete mode 100644 abs/core-testing/gen-init-cpio/PKGBUILD delete mode 100644 abs/core-testing/gen-init-cpio/gen_init_cpio.c delete mode 100644 abs/core-testing/gettext/PKGBUILD delete mode 100644 abs/core-testing/ghostscript/PKGBUILD delete mode 100644 abs/core-testing/ghostscript/ghostscript-fPIC.patch delete mode 100644 abs/core-testing/ghostscript/ghostscript-pdf2dsc.patch delete mode 100644 abs/core-testing/ghostscript/ghostscript-system-jasper.patch delete mode 100644 abs/core-testing/ghostscript/libpng14.patch delete mode 100644 abs/core-testing/ghostscript/svn_r10890.patch delete mode 100644 abs/core-testing/giblib/PKGBUILD delete mode 100644 abs/core-testing/giflib/PKGBUILD delete mode 100644 abs/core-testing/git/ChangeLog delete mode 100644 abs/core-testing/git/PKGBUILD delete mode 100644 abs/core-testing/git/git-daemon delete mode 100644 abs/core-testing/git/git-daemon.conf delete mode 100644 abs/core-testing/glib/PKGBUILD delete mode 100644 abs/core-testing/glib/__changelog delete mode 100644 abs/core-testing/glib/aclocal-fixes.patch delete mode 100644 abs/core-testing/glib/gcc340.patch delete mode 100644 abs/core-testing/glib2/PKGBUILD delete mode 100644 abs/core-testing/glib2/gkeyfile-bool-nocase.patch delete mode 100644 abs/core-testing/glib2/glib2.csh delete mode 100644 abs/core-testing/glib2/glib2.sh delete mode 100644 abs/core-testing/glibc/PKGBUILD delete mode 100644 abs/core-testing/glibc/glibc-2.10-bz4781.patch delete mode 100644 abs/core-testing/glibc/glibc-2.10-dont-build-timezone.patch delete mode 100644 abs/core-testing/glibc/glibc-__i686.patch delete mode 100644 abs/core-testing/glibc/glibc.install delete mode 100755 abs/core-testing/glibc/locale-gen delete mode 100644 abs/core-testing/glibc/locale.gen.txt delete mode 100755 abs/core-testing/glibc/nscd delete mode 100644 abs/core-testing/glproto/PKGBUILD delete mode 100644 abs/core-testing/gmp/PKGBUILD delete mode 100644 abs/core-testing/gmp/gmp.install delete mode 100644 abs/core-testing/gnutls/PKGBUILD delete mode 100644 abs/core-testing/gnutls/gnutls.install delete mode 100644 abs/core-testing/gobject-introspection/PKGBUILD delete mode 100644 abs/core-testing/gperf/PKGBUILD delete mode 100644 abs/core-testing/gpm/ChangeLog delete mode 100644 abs/core-testing/gpm/PKGBUILD delete mode 100755 abs/core-testing/gpm/gpm delete mode 100644 abs/core-testing/gpm/gpm.conf.d delete mode 100644 abs/core-testing/gpm/gpm.install delete mode 100755 abs/core-testing/gpm/gpm.sh delete mode 100644 abs/core-testing/grep/01-fgrep.patch delete mode 100644 abs/core-testing/grep/02-bracket.patch delete mode 100644 abs/core-testing/grep/03-i18n.patch delete mode 100644 abs/core-testing/grep/04-oi.patch delete mode 100644 abs/core-testing/grep/05-manpage.patch delete mode 100644 abs/core-testing/grep/06-color.patch delete mode 100644 abs/core-testing/grep/07-icolor.patch delete mode 100644 abs/core-testing/grep/08-skip.patch delete mode 100644 abs/core-testing/grep/09-egf-speedup.patch delete mode 100644 abs/core-testing/grep/10-dfa-optional.patch delete mode 100644 abs/core-testing/grep/11-tests.patch delete mode 100644 abs/core-testing/grep/12-w.patch delete mode 100644 abs/core-testing/grep/13-P.patch delete mode 100644 abs/core-testing/grep/14-mem-exhausted.patch delete mode 100644 abs/core-testing/grep/15-empty-pattern.patch delete mode 100644 abs/core-testing/grep/64-egf-speedup.patch delete mode 100644 abs/core-testing/grep/PKGBUILD delete mode 100644 abs/core-testing/groff/PKGBUILD delete mode 100644 abs/core-testing/groff/man-utf8.tmac delete mode 100644 abs/core-testing/grub-gfx.tar.gz delete mode 100644 abs/core-testing/grub-gfx/040_all_grub-0.96-nxstack.patch delete mode 100644 abs/core-testing/grub-gfx/05-grub-0.97-initrdaddr.diff delete mode 100644 abs/core-testing/grub-gfx/PKGBUILD delete mode 100644 abs/core-testing/grub-gfx/ext4.patch delete mode 100644 abs/core-testing/grub-gfx/grub-0.97-graphics.patch delete mode 100644 abs/core-testing/grub-gfx/grub-gfx.install delete mode 100644 abs/core-testing/grub-gfx/grub-inode-size.patch delete mode 100644 abs/core-testing/grub-gfx/i2o.patch delete mode 100755 abs/core-testing/grub-gfx/install-grub delete mode 100644 abs/core-testing/grub-gfx/intelmac.patch delete mode 100644 abs/core-testing/grub-gfx/menu.lst delete mode 100644 abs/core-testing/grub-gfx/more-raid.patch delete mode 100644 abs/core-testing/grub-gfx/special-devices.patch delete mode 100644 abs/core-testing/grub-gfx/splash.xpm.gz delete mode 100644 abs/core-testing/grub/040_all_grub-0.96-nxstack.patch delete mode 100644 abs/core-testing/grub/05-grub-0.97-initrdaddr.diff delete mode 100644 abs/core-testing/grub/PKGBUILD delete mode 100644 abs/core-testing/grub/ext4.patch delete mode 100644 abs/core-testing/grub/grub-0.97-gpt.patch delete mode 100644 abs/core-testing/grub/grub-inode-size.patch delete mode 100644 abs/core-testing/grub/grub.install delete mode 100644 abs/core-testing/grub/i2o.patch delete mode 100644 abs/core-testing/grub/install-grub delete mode 100755 abs/core-testing/grub/install-grub.orig delete mode 100644 abs/core-testing/grub/intelmac.patch delete mode 100644 abs/core-testing/grub/menu.lst delete mode 100644 abs/core-testing/grub/more-raid.patch delete mode 100644 abs/core-testing/grub/special-devices.patch delete mode 100644 abs/core-testing/gsfonts/PKGBUILD delete mode 100644 abs/core-testing/gsfonts/xfonts.install delete mode 100644 abs/core-testing/gtk/PKGBUILD delete mode 100644 abs/core-testing/gtk/__changelog delete mode 100644 abs/core-testing/gtk/aclocal-fixes.patch delete mode 100644 abs/core-testing/gtk2/PKGBUILD delete mode 100644 abs/core-testing/gtk2/__changelog delete mode 100644 abs/core-testing/gtk2/gtk2-emit-size-change.patch delete mode 100644 abs/core-testing/gtk2/gtk2.install delete mode 100644 abs/core-testing/gtk2/gtkclipboard-check.patch delete mode 100644 abs/core-testing/gtk2/revert_64bit_fix.patch delete mode 100644 abs/core-testing/gtk2/xid-collision-debug.patch delete mode 100644 abs/core-testing/gzip/PKGBUILD delete mode 100644 abs/core-testing/gzip/gzip-fixpaths.patch delete mode 100644 abs/core-testing/gzip/gzip-fixutimens.patch delete mode 100644 abs/core-testing/gzip/gzip-security-update.patch delete mode 100644 abs/core-testing/hal-info/PKGBUILD delete mode 100644 abs/core-testing/hal/PKGBUILD delete mode 100644 abs/core-testing/hal/cryptsetup_location.patch delete mode 100644 abs/core-testing/hal/dbus-error-init.patch delete mode 100644 abs/core-testing/hal/fix-libusb-detection.patch delete mode 100644 abs/core-testing/hal/fix-udev-compatibility.patch delete mode 100644 abs/core-testing/hal/hal delete mode 100644 abs/core-testing/hal/hal-0.5.9-hide-diagnostic.patch delete mode 100644 abs/core-testing/hal/hal-HDAPS-blacklist.patch delete mode 100644 abs/core-testing/hal/hal-KVM-evdev.patch delete mode 100644 abs/core-testing/hal/hal-policy.patch delete mode 100644 abs/core-testing/hal/hal-remove-dell-killswitch.patch delete mode 100644 abs/core-testing/hal/hal-use-at-console.patch delete mode 100644 abs/core-testing/hal/hal-xen-unignore-axes.patch delete mode 100644 abs/core-testing/hal/hal.install delete mode 100644 abs/core-testing/hal/handle-input-touchpad.patch delete mode 100644 abs/core-testing/hal/macbook-fix-ioperm.patch delete mode 100644 abs/core-testing/hal/ntfs-mount-fix.patch delete mode 100644 abs/core-testing/hal/ntfs3g-valid-options.patch delete mode 100644 abs/core-testing/hal/path-max.patch delete mode 100755 abs/core-testing/hauppauge-hvr-firmware/PKGBUILD delete mode 100755 abs/core-testing/hd3000firmware/PKGBUILD delete mode 100755 abs/core-testing/hdhomerun/PKGBUILD delete mode 100644 abs/core-testing/hdparm/PKGBUILD delete mode 100644 abs/core-testing/heimdal/001_all_heimdal-no_libedit.patch delete mode 100644 abs/core-testing/heimdal/002_all_heimal-fPIC.patch delete mode 100644 abs/core-testing/heimdal/002_all_heimdal-no_libedit.patch delete mode 100644 abs/core-testing/heimdal/003_all_heimdal-fPIC.patch delete mode 100644 abs/core-testing/heimdal/003_all_heimdal-rxapps.patch delete mode 100644 abs/core-testing/heimdal/004_all_heimdal-rxapps.patch delete mode 100644 abs/core-testing/heimdal/005_all_heimdal-suid_fix.patch delete mode 100644 abs/core-testing/heimdal/006_all_heimdal-suid_fix.patch delete mode 100644 abs/core-testing/heimdal/010_all_heimdal-system-libss.patch delete mode 100644 abs/core-testing/heimdal/012_all_heimdal-berkdb.patch delete mode 100644 abs/core-testing/heimdal/013_all_heimdal-pthread-lib.patch delete mode 100644 abs/core-testing/heimdal/014_all_heimdal-path.patch delete mode 100644 abs/core-testing/heimdal/PKGBUILD delete mode 100644 abs/core-testing/heimdal/heimdal-kdc.rc delete mode 100644 abs/core-testing/heimdal/heimdal.install delete mode 100644 abs/core-testing/heimdal/kadmind.rc delete mode 100644 abs/core-testing/heimdal/kpasswd.rc delete mode 100644 abs/core-testing/hwd/PKGBUILD delete mode 100644 abs/core-testing/hwd/hwd.install delete mode 100644 abs/core-testing/hwdetect/PKGBUILD delete mode 100755 abs/core-testing/hwdetect/hwdetect delete mode 100644 abs/core-testing/iana-etc/Makefile.patch delete mode 100644 abs/core-testing/iana-etc/PKGBUILD delete mode 100755 abs/core-testing/iguanair/PKGBUILD delete mode 100644 abs/core-testing/ilmbase/PKGBUILD delete mode 100644 abs/core-testing/imagemagick/PKGBUILD delete mode 100644 abs/core-testing/imagemagick/libpng_mmx_patch_x86_64.patch delete mode 100644 abs/core-testing/imagemagick/perlmagick.rpath.patch delete mode 100644 abs/core-testing/imake/PKGBUILD delete mode 100644 abs/core-testing/imake/linuxconfig.patch delete mode 100644 abs/core-testing/imlib2/PKGBUILD delete mode 100644 abs/core-testing/initscripts/ChangeLog delete mode 100644 abs/core-testing/initscripts/PKGBUILD delete mode 100644 abs/core-testing/initscripts/__changelog delete mode 100644 abs/core-testing/initscripts/initscripts.install delete mode 100644 abs/core-testing/initscripts/rc.shutdown.patch delete mode 100644 abs/core-testing/initscripts/rc.sysinit.patch delete mode 100644 abs/core-testing/inputproto/PKGBUILD delete mode 100644 abs/core-testing/intltool/ChangeLog delete mode 100644 abs/core-testing/intltool/PKGBUILD delete mode 100644 abs/core-testing/iproute2/PKGBUILD delete mode 100644 abs/core-testing/iproute2/iproute2-2.4.7-now-ss020116.patch delete mode 100644 abs/core-testing/iproute2/iproute2-fhs.patch delete mode 100644 abs/core-testing/iproute2/libdir.patch delete mode 100644 abs/core-testing/iproute2/tc.patch delete mode 100644 abs/core-testing/iptables/PKGBUILD delete mode 100644 abs/core-testing/iptables/PKGBUILD.orig delete mode 100644 abs/core-testing/iptables/empty.rules delete mode 100755 abs/core-testing/iptables/ip6tables delete mode 100755 abs/core-testing/iptables/iptables delete mode 100644 abs/core-testing/iptables/iptables.conf.d delete mode 100644 abs/core-testing/iptables/simple_firewall.rules delete mode 100644 abs/core-testing/iputils/PKGBUILD delete mode 100644 abs/core-testing/iputils/iputils-20070202-no-open-max.patch delete mode 100644 abs/core-testing/iputils/iputils-big-patches.patch delete mode 100644 abs/core-testing/iputils/iputils-ss021109-try.patch delete mode 100644 abs/core-testing/iputils/iputils.patch delete mode 100644 abs/core-testing/iputils/protocols delete mode 100644 abs/core-testing/iputils/services delete mode 100644 abs/core-testing/ipw2100-fw/PKGBUILD delete mode 100644 abs/core-testing/ipw2100-fw/ipw2100-fw.install delete mode 100644 abs/core-testing/ipw2200-fw/PKGBUILD delete mode 100644 abs/core-testing/ipw2200-fw/ipw2200-fw.install delete mode 100644 abs/core-testing/ipw3945-ucode/PKGBUILD delete mode 100644 abs/core-testing/ipw3945-ucode/ipw3945-ucode.install delete mode 100644 abs/core-testing/ipw3945d/PKGBUILD delete mode 100644 abs/core-testing/ipw3945d/ipw3945d.install delete mode 100644 abs/core-testing/ipw3945d/ipw3945d.rc delete mode 100644 abs/core-testing/ivtv-utils/PKGBUILD delete mode 100644 abs/core-testing/ivtv-utils/ivtv-utils.install delete mode 100644 abs/core-testing/jack-audio-connection-kit/PKGBUILD delete mode 100644 abs/core-testing/jack-audio-connection-kit/jack-audio-connection-kit.conf.d delete mode 100644 abs/core-testing/jack-audio-connection-kit/jack-audio-connection-kit.install delete mode 100644 abs/core-testing/jack-audio-connection-kit/jack-audio-connection-kit.rc.d delete mode 100644 abs/core-testing/jasper/PKGBUILD delete mode 100644 abs/core-testing/jasper/jasper-1.900.1-CVE-2008-3520.patch delete mode 100644 abs/core-testing/jasper/jasper-1.900.1-CVE-2008-3522.patch delete mode 100644 abs/core-testing/jasper/jpc_dec.c.patch delete mode 100644 abs/core-testing/jasper/patch-libjasper-stepsizes-overflow.diff delete mode 100644 abs/core-testing/jfsutils/PKGBUILD delete mode 100644 abs/core-testing/kakasi/PKGBUILD delete mode 100644 abs/core-testing/kbd/PKGBUILD delete mode 100644 abs/core-testing/kbd/kbd-1.12-alias.patch delete mode 100644 abs/core-testing/kbd/kbd-1.12-find_map_fix.patch delete mode 100644 abs/core-testing/kbd/kbd-1.12-no-user-map.patch delete mode 100644 abs/core-testing/kbd/keymap_hook delete mode 100644 abs/core-testing/kbd/keymap_install delete mode 100644 abs/core-testing/kbd/rename-duplicates.patch delete mode 100644 abs/core-testing/kbproto/PKGBUILD delete mode 100644 abs/core-testing/kdelibs3/PKGBUILD delete mode 100644 abs/core-testing/kdelibs3/__changelog delete mode 100755 abs/core-testing/kdelibs3/kde3.profile delete mode 100644 abs/core-testing/kdelibs3/kdelibs3.install delete mode 100644 abs/core-testing/kernel26.orig/PKGBUILD delete mode 100644 abs/core-testing/kernel26.orig/config delete mode 100644 abs/core-testing/kernel26.orig/config.x86_64 delete mode 100644 abs/core-testing/kernel26.orig/coretemp.patch delete mode 100644 abs/core-testing/kernel26.orig/ext4.patch delete mode 100644 abs/core-testing/kernel26.orig/kernel26.install delete mode 100644 abs/core-testing/kernel26.orig/kernel26.preset delete mode 100644 abs/core-testing/kernel26.orig/logo_linux_clut224.ppm delete mode 100644 abs/core-testing/kernel26.orig/logo_linux_mono.pbm delete mode 100644 abs/core-testing/kernel26.orig/logo_linux_vga16.ppm delete mode 100644 abs/core-testing/kernel26.orig/serial.diff delete mode 100644 abs/core-testing/kernel26/PKGBUILD delete mode 100644 abs/core-testing/kernel26/config delete mode 100644 abs/core-testing/kernel26/config.arch delete mode 100644 abs/core-testing/kernel26/config.x86_64 delete mode 100644 abs/core-testing/kernel26/fbcondecor-2.6.34-fix.patch delete mode 100644 abs/core-testing/kernel26/kernel26.install delete mode 100644 abs/core-testing/kernel26/kernel26.preset delete mode 100644 abs/core-testing/lame/PKGBUILD delete mode 100644 abs/core-testing/lame/shared-frontend.patch delete mode 100644 abs/core-testing/lcms/PKGBUILD delete mode 100644 abs/core-testing/less/PKGBUILD delete mode 100644 abs/core-testing/less/zless delete mode 100644 abs/core-testing/libao/ChangeLog delete mode 100644 abs/core-testing/libao/PKGBUILD delete mode 100644 abs/core-testing/libao/libao.conf delete mode 100644 abs/core-testing/libarchive/PKGBUILD delete mode 100644 abs/core-testing/libart-lgpl/PKGBUILD delete mode 100644 abs/core-testing/libart-lgpl/art_misc.h-cplusplus.patch delete mode 100644 abs/core-testing/libavc1394/PKGBUILD delete mode 100644 abs/core-testing/libcaca/PKGBUILD delete mode 100644 abs/core-testing/libcap/PKGBUILD delete mode 100644 abs/core-testing/libcap/libcap-1.10-debian.patch delete mode 100644 abs/core-testing/libcap/libcap-1.10-fixcflags.patch delete mode 100644 abs/core-testing/libcap/libcap-1.10-shared.patch delete mode 100644 abs/core-testing/libcdaudio/PKGBUILD delete mode 100644 abs/core-testing/libcddb/PKGBUILD delete mode 100644 abs/core-testing/libcroco/PKGBUILD delete mode 100644 abs/core-testing/libdaemon/PKGBUILD delete mode 100644 abs/core-testing/libdatrie/PKGBUILD delete mode 100644 abs/core-testing/libdc1394/PKGBUILD delete mode 100644 abs/core-testing/libdca/PKGBUILD delete mode 100644 abs/core-testing/libdmx/PKGBUILD delete mode 100644 abs/core-testing/libdrm/COPYING delete mode 100644 abs/core-testing/libdrm/PKGBUILD delete mode 100644 abs/core-testing/libdrm/libdrm-2.4.21-b803918f3f.patch delete mode 100644 abs/core-testing/libdrm/no-pthread-stubs.patch delete mode 100644 abs/core-testing/libdv/PKGBUILD delete mode 100644 abs/core-testing/libdv/libdv-0.104-amd64reloc.patch delete mode 100644 abs/core-testing/libdvdread/PKGBUILD delete mode 100644 abs/core-testing/libdvdread/libdvdread.install delete mode 100644 abs/core-testing/libevent/PKGBUILD delete mode 100644 abs/core-testing/libexif/PKGBUILD delete mode 100644 abs/core-testing/libfetch/Makefile delete mode 100644 abs/core-testing/libfetch/PKGBUILD delete mode 120000 abs/core-testing/libfetch/libfetch-2.33-1-i686.pkg.tar.gz delete mode 100644 abs/core-testing/libfontenc/PKGBUILD delete mode 100644 abs/core-testing/libgcrypt/PKGBUILD delete mode 100644 abs/core-testing/libgcrypt/libgcrypt.install delete mode 100644 abs/core-testing/libglade/PKGBUILD delete mode 100644 abs/core-testing/libglade/glade.install delete mode 100644 abs/core-testing/libglade/libglade-2.0.1-nowarning.patch delete mode 100644 abs/core-testing/libgpg-error/PKGBUILD delete mode 100644 abs/core-testing/libgsf/PKGBUILD delete mode 100644 abs/core-testing/libice/PKGBUILD delete mode 100644 abs/core-testing/libid3tag/PKGBUILD delete mode 100644 abs/core-testing/libid3tag/id3tag.pc delete mode 100644 abs/core-testing/libidn/PKGBUILD delete mode 100644 abs/core-testing/libidn/libidn.install delete mode 100644 abs/core-testing/libiec61883/PKGBUILD delete mode 100644 abs/core-testing/libiec61883/libiec61883-1.2.0-Makefile.patch delete mode 100644 abs/core-testing/libjpeg/PKGBUILD delete mode 100644 abs/core-testing/libjpeg6/PKGBUILD delete mode 100644 abs/core-testing/libjpeg6/libjpeg6.install delete mode 100644 abs/core-testing/liblbxutil/PKGBUILD delete mode 100644 abs/core-testing/libldap/PKGBUILD delete mode 100644 abs/core-testing/libldap/ntlm.patch delete mode 100644 abs/core-testing/libldap/peercred.patch delete mode 100644 abs/core-testing/libmad/PKGBUILD delete mode 100644 abs/core-testing/libmad/libmad.patch delete mode 100644 abs/core-testing/libmad/libmad_gcc43.patch delete mode 100644 abs/core-testing/libmcrypt/PKGBUILD delete mode 100644 abs/core-testing/libmcrypt/aclocal-fixes.patch delete mode 100644 abs/core-testing/libmng/PKGBUILD delete mode 100644 abs/core-testing/libmp4v2/PKGBUILD delete mode 100644 abs/core-testing/libmpc/PKGBUILD delete mode 100644 abs/core-testing/libmpc/libmpc.install delete mode 100644 abs/core-testing/libmpeg2/PKGBUILD delete mode 100644 abs/core-testing/libmysqlclient/PKGBUILD delete mode 100644 abs/core-testing/libogg/PKGBUILD delete mode 100644 abs/core-testing/libpcap/PKGBUILD delete mode 100644 abs/core-testing/libpcap/libpcap-shared.patch delete mode 100644 abs/core-testing/libpciaccess/PKGBUILD delete mode 100644 abs/core-testing/libpng/ChangeLog delete mode 100644 abs/core-testing/libpng/PKGBUILD delete mode 100644 abs/core-testing/libpng/libpng-1.2.29-apng.patch delete mode 100644 abs/core-testing/libpng/libpng-1.2.31-apng.patch delete mode 100644 abs/core-testing/libraw1394/PKGBUILD delete mode 100644 abs/core-testing/librsvg/PKGBUILD delete mode 100644 abs/core-testing/librsvg/librsvg.install delete mode 100644 abs/core-testing/libsasl/PKGBUILD delete mode 100644 abs/core-testing/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch delete mode 100644 abs/core-testing/libsasl/db-4.7.patch delete mode 100644 abs/core-testing/libsasl/libsasl.install delete mode 100644 abs/core-testing/libsm/PKGBUILD delete mode 100644 abs/core-testing/libsmbios/PKGBUILD delete mode 100644 abs/core-testing/libsndfile/PKGBUILD delete mode 100644 abs/core-testing/libsndfile/flac-1.1.4.dpatch delete mode 100644 abs/core-testing/libsndfile/lossy_comp_test-overflow.dpatch delete mode 100644 abs/core-testing/libsndfile/overflow.dpatch delete mode 100644 abs/core-testing/libstatgrab/PKGBUILD delete mode 100644 abs/core-testing/libtasn1/PKGBUILD delete mode 100644 abs/core-testing/libtasn1/libtasn1.install delete mode 100644 abs/core-testing/libthai/PKGBUILD delete mode 100644 abs/core-testing/libtheora/PKGBUILD delete mode 100644 abs/core-testing/libtiff/CVE-2006-3459-3465.patch delete mode 100644 abs/core-testing/libtiff/ChangeLog delete mode 100644 abs/core-testing/libtiff/PKGBUILD delete mode 100644 abs/core-testing/libtiff/libtiff-CVE-2009-2285.patch delete mode 100644 abs/core-testing/libtiff/tiff-3.8.2-CVE-2008-2327.patch delete mode 100644 abs/core-testing/libtiff/tiff2pdf-compression.patch delete mode 100644 abs/core-testing/libtiff/tiff2pdf-octal-printf.patch delete mode 100644 abs/core-testing/libtiff/tiffsplit-fname-overflow.patch delete mode 100644 abs/core-testing/libtool/PKGBUILD delete mode 120000 abs/core-testing/libtool/libtool-2.2.10-3-i686.pkg.tar.gz delete mode 100644 abs/core-testing/libtool/libtool.install delete mode 100644 abs/core-testing/libusb/PKGBUILD delete mode 100644 abs/core-testing/libvdpau/PKGBUILD delete mode 100644 abs/core-testing/libvisual-plugins/01_disable-gforce-dfsg.patch delete mode 100644 abs/core-testing/libvisual-plugins/02_64-bit_JESS_fix.patch delete mode 100644 abs/core-testing/libvisual-plugins/03_build_against_gl_fixes.patch delete mode 100644 abs/core-testing/libvisual-plugins/04_lv_analyzer_build_fix.patch delete mode 100644 abs/core-testing/libvisual-plugins/05_fix_po.patch delete mode 100644 abs/core-testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch delete mode 100644 abs/core-testing/libvisual-plugins/90_autoreconf.patch delete mode 100644 abs/core-testing/libvisual-plugins/PKGBUILD delete mode 100644 abs/core-testing/libvisual-plugins/__changelog delete mode 100644 abs/core-testing/libvisual-plugins/libvisual-plugins.install delete mode 100644 abs/core-testing/libvisual-projectm/PKGBUILD delete mode 100644 abs/core-testing/libvisual/PKGBUILD delete mode 100644 abs/core-testing/libvorbis/PKGBUILD delete mode 100644 abs/core-testing/libwmf/PKGBUILD delete mode 100644 abs/core-testing/libwmf/libwmf.install delete mode 100644 abs/core-testing/libx11/012_ru_RU_UTF-8_XLC_LOCALE.diff delete mode 100644 abs/core-testing/libx11/PKGBUILD delete mode 100644 abs/core-testing/libx11/xorg.sh delete mode 100644 abs/core-testing/libx86/PKGBUILD delete mode 100644 abs/core-testing/libx86/lrmi.patch delete mode 100644 abs/core-testing/libxau/PKGBUILD delete mode 100644 abs/core-testing/libxaw/PKGBUILD delete mode 100644 abs/core-testing/libxcb/PKGBUILD delete mode 100644 abs/core-testing/libxcb/libxcb-1.1-no-pthread-stubs.patch delete mode 100644 abs/core-testing/libxcb/libxcb-1.1-sloppy-lock.patch delete mode 100644 abs/core-testing/libxcb/xcb_xlib-no-assert-on-lock.patch delete mode 100644 abs/core-testing/libxcomposite/PKGBUILD delete mode 100644 abs/core-testing/libxcursor/PKGBUILD delete mode 100644 abs/core-testing/libxdamage/PKGBUILD delete mode 100644 abs/core-testing/libxdmcp/PKGBUILD delete mode 100644 abs/core-testing/libxext/PKGBUILD delete mode 100644 abs/core-testing/libxfixes/PKGBUILD delete mode 100644 abs/core-testing/libxfixes/xfixes_coverity576.patch delete mode 100644 abs/core-testing/libxfont/PKGBUILD delete mode 100644 abs/core-testing/libxfontcache/LICENSE delete mode 100644 abs/core-testing/libxfontcache/PKGBUILD delete mode 100644 abs/core-testing/libxft/PKGBUILD delete mode 100644 abs/core-testing/libxi/PKGBUILD delete mode 100644 abs/core-testing/libxinerama/PKGBUILD delete mode 100644 abs/core-testing/libxkbfile/PKGBUILD delete mode 100644 abs/core-testing/libxkbui/PKGBUILD delete mode 100644 abs/core-testing/libxml2/PKGBUILD delete mode 100644 abs/core-testing/libxml2/largefile64.patch delete mode 100644 abs/core-testing/libxmu/PKGBUILD delete mode 100644 abs/core-testing/libxp/PKGBUILD delete mode 100644 abs/core-testing/libxpm/PKGBUILD delete mode 100644 abs/core-testing/libxrandr/PKGBUILD delete mode 100644 abs/core-testing/libxrender/PKGBUILD delete mode 100644 abs/core-testing/libxres/PKGBUILD delete mode 100644 abs/core-testing/libxslt/ChangeLog delete mode 100644 abs/core-testing/libxslt/PKGBUILD delete mode 100644 abs/core-testing/libxss/PKGBUILD delete mode 100644 abs/core-testing/libxt/PKGBUILD delete mode 100644 abs/core-testing/libxtrap/PKGBUILD delete mode 100644 abs/core-testing/libxtst/PKGBUILD delete mode 100644 abs/core-testing/libxv/PKGBUILD delete mode 100644 abs/core-testing/libxvmc/LICENSE delete mode 100644 abs/core-testing/libxvmc/PKGBUILD delete mode 100644 abs/core-testing/libxxf86dga/PKGBUILD delete mode 100644 abs/core-testing/libxxf86misc/PKGBUILD delete mode 100644 abs/core-testing/libxxf86vm/PKGBUILD delete mode 100644 abs/core-testing/licenses/LICENSE.ralink-firmware.txt delete mode 100644 abs/core-testing/licenses/PKGBUILD delete mode 100644 abs/core-testing/licenses/ZopePublicLicense.txt delete mode 100644 abs/core-testing/licenses/cc-by-3.0.txt delete mode 100644 abs/core-testing/licenses/cc-by-nc-3.0.txt delete mode 100644 abs/core-testing/licenses/cc-by-nc-nd-3.0.txt delete mode 100644 abs/core-testing/licenses/cc-by-nc-sa-3.0.txt delete mode 100644 abs/core-testing/licenses/cc-by-nd-3.0.txt delete mode 100644 abs/core-testing/licenses/cc-by-sa-3.0.txt delete mode 100644 abs/core-testing/licenses/cc-readme.txt delete mode 100644 abs/core-testing/licenses/cddl-1.0.txt delete mode 100644 abs/core-testing/licenses/cpl-1.0.txt delete mode 100644 abs/core-testing/licenses/eclipse-1.0.txt delete mode 100644 abs/core-testing/licenses/perlartistic.txt delete mode 100644 abs/core-testing/licenses/python-2.txt delete mode 100644 abs/core-testing/lighttpd/PKGBUILD delete mode 100644 abs/core-testing/lighttpd/__changelog delete mode 100644 abs/core-testing/lighttpd/auth-inc.conf delete mode 100644 abs/core-testing/lighttpd/lighttpd.conf delete mode 100755 abs/core-testing/lighttpd/lighttpd.install delete mode 100644 abs/core-testing/lighttpd/lighttpd.logrotate.d delete mode 100644 abs/core-testing/lighttpd/lighttpd.rc.d delete mode 100644 abs/core-testing/lighttpd/openssl-0.9.8m.patch delete mode 100644 abs/core-testing/linhes-live/PKGBUILD delete mode 100755 abs/core-testing/linhes-live/bin/gen_fstab delete mode 100755 abs/core-testing/linhes-live/bin/km delete mode 100644 abs/core-testing/linhes-live/etc/live-shutdown delete mode 100644 abs/core-testing/linhes-live/etc/live-sysinit delete mode 100755 abs/core-testing/linhes-live/etc/loginroot delete mode 100755 abs/core-testing/linhes-live/etc/rc.shutdown-live delete mode 100755 abs/core-testing/linhes-live/etc/rc.sysinit-live delete mode 100755 abs/core-testing/linhes-live/etc/ulogin delete mode 100755 abs/core-testing/linhes-live/lib/initcpio/gen_larch_init delete mode 100644 abs/core-testing/linhes-live/lib/initcpio/hooks/larch1 delete mode 100644 abs/core-testing/linhes-live/lib/initcpio/hooks/larch2 delete mode 100644 abs/core-testing/linhes-live/lib/initcpio/hooks/larch2_aufs delete mode 100644 abs/core-testing/linhes-live/lib/initcpio/hooks/larch3 delete mode 100644 abs/core-testing/linhes-live/lib/initcpio/install/larch1 delete mode 100644 abs/core-testing/linhes-live/lib/initcpio/install/larch2 delete mode 100644 abs/core-testing/linhes-live/lib/initcpio/install/larch2_aufs delete mode 100644 abs/core-testing/linhes-live/lib/initcpio/install/larch3 delete mode 100755 abs/core-testing/linhes-live/lib/initcpio/kinit delete mode 100644 abs/core-testing/linhes-live/lib/initcpio/mkinitcpio.conf delete mode 100755 abs/core-testing/linhes-scripts/770-wrapper.sh delete mode 100644 abs/core-testing/linhes-scripts/PKGBUILD delete mode 100644 abs/core-testing/linhes-scripts/dct700-cc.sh delete mode 100755 abs/core-testing/linhes-scripts/idle.sh delete mode 100755 abs/core-testing/linhes-scripts/importfiles.sh delete mode 100644 abs/core-testing/linhes-scripts/install_hulu.sh delete mode 100755 abs/core-testing/linhes-scripts/limit-mythcommflag.sh delete mode 100644 abs/core-testing/linhes-scripts/linhes-scripts.install delete mode 100644 abs/core-testing/linhes-scripts/linhes_update.sh delete mode 100644 abs/core-testing/linhes-scripts/linhes_update2.sh delete mode 100644 abs/core-testing/linhes-scripts/linhes_update3.sh delete mode 100755 abs/core-testing/linhes-scripts/mplayer-resumer-vdpau.pl delete mode 100755 abs/core-testing/linhes-scripts/mplayer-resumer.pl delete mode 100755 abs/core-testing/linhes-scripts/myth2fuze delete mode 100755 abs/core-testing/linhes-scripts/myth2mp3 delete mode 100755 abs/core-testing/linhes-scripts/myth2x264 delete mode 100755 abs/core-testing/linhes-scripts/myth2xvid delete mode 100755 abs/core-testing/linhes-scripts/mythwelcome-config.py delete mode 100755 abs/core-testing/linhes-scripts/mythwelcome-set-alarm.sh delete mode 100755 abs/core-testing/linhes-scripts/mythwelcome-test-wakeup.sh delete mode 100755 abs/core-testing/linhes-scripts/pause-mythcommflag.sh delete mode 100755 abs/core-testing/linhes-scripts/pause_mythcommflag delete mode 100755 abs/core-testing/linhes-scripts/qip7100-cc.sh delete mode 100644 abs/core-testing/linhes-scripts/remove_php_mythvideo.sh delete mode 100755 abs/core-testing/linhes-scripts/removecommercials.sh delete mode 100755 abs/core-testing/linhes-scripts/run-limit-mythcommflag delete mode 100755 abs/core-testing/linhes-scripts/run-pause-mythcommflag delete mode 100755 abs/core-testing/linhes-scripts/screenshooter.sh delete mode 100755 abs/core-testing/linhes-scripts/shootscreens-mythtv.sh delete mode 100755 abs/core-testing/linhes-scripts/shootscreens.sh delete mode 100755 abs/core-testing/linhes-scripts/system-cleanup.sh delete mode 100644 abs/core-testing/linhes-scripts/update_schema_021_to_022.sh delete mode 100755 abs/core-testing/linhes-scripts/upgrade_linhes.sh delete mode 100644 abs/core-testing/linhes-scripts/upgrade_to_0.22.sh delete mode 100755 abs/core-testing/linhes-scripts/vdpau-detector delete mode 100644 abs/core-testing/linhes-sounds/PKGBUILD delete mode 100644 abs/core-testing/linhes-sounds/beg.wav delete mode 100644 abs/core-testing/linhes-sounds/complete.wav delete mode 100644 abs/core-testing/linhes-sounds/end.wav delete mode 100644 abs/core-testing/linhes-sounds/fail.wav delete mode 100644 abs/core-testing/linhes-sounds/half_second_of_silence.wav delete mode 100644 abs/core-testing/linhes-sounds/init.wav delete mode 100644 abs/core-testing/linhes-sounds/restore.wav delete mode 100644 abs/core-testing/linhes-sounds/restored.wav delete mode 100644 abs/core-testing/linhes-sounds/rf.wav delete mode 100644 abs/core-testing/linhes-sounds/testing.wav delete mode 100644 abs/core-testing/linhes-sounds/vr.wav delete mode 100644 abs/core-testing/linhes-splash/1024x768.cfg delete mode 100644 abs/core-testing/linhes-splash/800x600.cfg delete mode 100644 abs/core-testing/linhes-splash/PKGBUILD delete mode 100644 abs/core-testing/linhes-splash/Vera.copyright delete mode 100644 abs/core-testing/linhes-splash/Vera.ttf delete mode 100644 abs/core-testing/linhes-splash/__changelog delete mode 100644 abs/core-testing/linhes-splash/background-1024x768.png delete mode 100644 abs/core-testing/linhes-splash/background-800x600.png delete mode 100644 abs/core-testing/linhes-splash/verbose-1024x768.png delete mode 100644 abs/core-testing/linhes-splash/verbose-800x600.png delete mode 100644 abs/core-testing/linhes-theme/PKGBUILD delete mode 100644 abs/core-testing/linux-api-headers/PKGBUILD delete mode 120000 abs/core-testing/linux-api-headers/linux-api-headers-2.6.34-1-i686.pkg.tar.gz delete mode 100644 abs/core-testing/linux-api-headers/scsi.patch delete mode 100644 abs/core-testing/linux-atm/PKGBUILD delete mode 100644 abs/core-testing/linux-atm/linux-atm-2.5.0-glibc28.patch delete mode 100644 abs/core-testing/linux-firmware/PKGBUILD delete mode 100644 abs/core-testing/linuxtv-dvb-apps/ChangeLog delete mode 100644 abs/core-testing/linuxtv-dvb-apps/PKGBUILD delete mode 100644 abs/core-testing/linuxtv-dvb-apps/linuxtv-dvb-apps.install delete mode 100644 abs/core-testing/lirc-utils/PKGBUILD delete mode 100644 abs/core-testing/lirc-utils/irexec.conf delete mode 100755 abs/core-testing/lirc-utils/irexecd delete mode 100644 abs/core-testing/lirc-utils/kernel-2.6.33.patch delete mode 100644 abs/core-testing/lirc-utils/lirc.logrotate delete mode 100644 abs/core-testing/lirc-utils/lirc_patch delete mode 100755 abs/core-testing/lirc-utils/lircd delete mode 100644 abs/core-testing/lirc-utils/lircd.conf delete mode 100755 abs/core-testing/lirc-utils/lircmd delete mode 100644 abs/core-testing/lirc/PKGBUILD delete mode 100644 abs/core-testing/lirc/kernel-2.6.33.patch delete mode 100644 abs/core-testing/lirc/lirc.install delete mode 100644 abs/core-testing/lirc_085-utils/PKGBUILD delete mode 100755 abs/core-testing/lirc_085-utils/hw_commandir.c delete mode 100755 abs/core-testing/lirc_085-utils/hw_commandir.h delete mode 100644 abs/core-testing/lirc_085-utils/kernel-2.6.26.patch delete mode 100644 abs/core-testing/lirc_085-utils/lirc.logrotate delete mode 100644 abs/core-testing/lirc_085-utils/lirc_atiusb.patch delete mode 100755 abs/core-testing/lirc_085-utils/lircd delete mode 100644 abs/core-testing/lirc_085-utils/lircd.conf.d delete mode 100755 abs/core-testing/lirc_085-utils/lircmd delete mode 100644 abs/core-testing/lirc_085/PKGBUILD delete mode 100644 abs/core-testing/lirc_085/dvicoIR.rules delete mode 100755 abs/core-testing/lirc_085/hw_commandir.c delete mode 100755 abs/core-testing/lirc_085/hw_commandir.h delete mode 100644 abs/core-testing/lirc_085/kernel-2.6.26.patch delete mode 100644 abs/core-testing/lirc_085/kernel-2.6.27.patch delete mode 100644 abs/core-testing/lirc_085/lirc.fdi delete mode 100644 abs/core-testing/lirc_085/lirc.install delete mode 100644 abs/core-testing/lirc_085/lirc_atiusb.patch delete mode 100644 abs/core-testing/lirc_085/lirc_mod_mce.patch delete mode 100644 abs/core-testing/live-media/PKGBUILD delete mode 100644 abs/core-testing/local-website/PKGBUILD delete mode 100755 abs/core-testing/local-website/htdocs/404.html delete mode 100644 abs/core-testing/local-website/htdocs/KnoppMyth.css delete mode 100644 abs/core-testing/local-website/htdocs/favicon.ico delete mode 100644 abs/core-testing/local-website/htdocs/fuppes.php delete mode 100644 abs/core-testing/local-website/htdocs/header.png delete mode 100755 abs/core-testing/local-website/htdocs/index.html delete mode 100644 abs/core-testing/local-website/htdocs/linhes.html delete mode 100644 abs/core-testing/local-website/htdocs/linhes/default/header.css delete mode 100644 abs/core-testing/local-website/htdocs/linhes/default/menus.css delete mode 100644 abs/core-testing/local-website/htdocs/linhes/default/programming.css delete mode 100644 abs/core-testing/local-website/htdocs/linhes/default/style.css delete mode 100644 abs/core-testing/local-website/htdocs/linhes/default/welcome.css delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/AC_OETags.js delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/flowplayer-3.1.1.min.js delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/pngbehavior.htc delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/prototip/classic_toolbar.gif delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/prototip/close.gif delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/prototip/close_hover.gif delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/prototip/close_hover_red.gif delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/prototip/prototip.css delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/prototip/prototip.js delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/prototype.js delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/scriptaculous/builder.js delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/scriptaculous/controls.js delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/scriptaculous/dragdrop.js delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/scriptaculous/effects.js delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/scriptaculous/jw_effects.js delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/scriptaculous/scriptaculous.js delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/scriptaculous/slider.js delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/scriptaculous/sound.js delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/scriptaculous/unittest.js delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/table_sort.js delete mode 100644 abs/core-testing/local-website/htdocs/linhes/js/utils.js delete mode 100755 abs/core-testing/local-website/htdocs/mediaserv.php delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/BlockDiagramofavideocapturedevice.eps delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/BlockDiagramofavideocapturedevice.png delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/Card1 HDTV Card2 Cable.png delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/Card1 Pri 0 Card2 Pri -1-TDS.png delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/Card1 Pri 0 Card2 Pri -1.png delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/Card1 Pri 0 Card2 Pri 0.png delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/Makefile delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/add.eps delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/add.png delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/doxygen-architecture-document.cpp delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/doxygen-create-developer-docs.cfg delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/doxygen.perl.patch delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/i18n/.svn/all-wcprops delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/i18n/.svn/entries delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/i18n/.svn/format delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/i18n/.svn/text-base/keys_de.txt.svn-base delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/i18n/keys_de.txt delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/index.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/keys.txt delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-1.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-10.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-11.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-12.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-13.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-14.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-15.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-16.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-17.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-18.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-19.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-2.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-20.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-21.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-22.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-23.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-24.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-3.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-4.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-5.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-6.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-7.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-8.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-9.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO-singlehtml.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO.html delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO.pdf delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO.sgml delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/mythtv-HOWTO.txt delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/stop.eps delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/stop.png delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/warning.eps delete mode 100644 abs/core-testing/local-website/htdocs/mythtv-doc/warning.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/COPYING delete mode 100644 abs/core-testing/local-website/htdocs/remote/CREDITS delete mode 100644 abs/core-testing/local-website/htdocs/remote/Changelog delete mode 100644 abs/core-testing/local-website/htdocs/remote/Issues delete mode 100644 abs/core-testing/local-website/htdocs/remote/README delete mode 100644 abs/core-testing/local-website/htdocs/remote/backend.php delete mode 100644 abs/core-testing/local-website/htdocs/remote/csshover.htc delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/blank.gif delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/button_30.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/button_30g.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/button_30r.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/button_text.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/button_textg.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/button_textr.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/down.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/down_g.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/down_r.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/fast_forward.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/fast_forward_g.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/fast_forward_r.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/fast_rewind.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/fast_rewind_g.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/fast_rewind_r.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/left.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/left_g.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/left_r.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/ok.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/ok_g.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/ok_r.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/pause.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/pause_g.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/pause_r.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/rec.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/rec_g.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/rec_r.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/right.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/right_g.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/right_r.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/skip_back.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/skip_back_g.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/skip_back_r.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/skip_forward.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/skip_forward_g.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/skip_forward_r.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/stop.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/stop_g.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/stop_r.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/up.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/up_g.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/images/up_r.png delete mode 100644 abs/core-testing/local-website/htdocs/remote/inc/process.php delete mode 100644 abs/core-testing/local-website/htdocs/remote/index.html delete mode 100644 abs/core-testing/local-website/htdocs/remote/layout-wide.html delete mode 100644 abs/core-testing/local-website/htdocs/remote/layout.html delete mode 100644 abs/core-testing/local-website/htdocs/remote/nav.php delete mode 100644 abs/core-testing/local-website/htdocs/remote/num.php delete mode 100644 abs/core-testing/local-website/htdocs/remote/pda.php delete mode 100644 abs/core-testing/local-website/htdocs/remote/remote-wide.html delete mode 100644 abs/core-testing/local-website/htdocs/remote/remote-wide.php delete mode 100644 abs/core-testing/local-website/htdocs/remote/remote.css delete mode 100644 abs/core-testing/local-website/htdocs/remote/remote.html delete mode 100644 abs/core-testing/local-website/htdocs/remote/remote.php delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/button.svg delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/button_30.xcf delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/button_g.svg delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/button_r.svg delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/down.svg delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/fast_forward.svg delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/fast_rewind.svg delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/left.svg delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/ok.svg delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/pause.svg delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/rec.svg delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/right.svg delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/scratch.svg delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/skip_back.svg delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/skip_forward.svg delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/stop.svg delete mode 100644 abs/core-testing/local-website/htdocs/remote/svg/up.svg delete mode 100644 abs/core-testing/local-website/htdocs/rrd/Disabled delete mode 100644 abs/core-testing/local-website/htdocs/rrd/index.html delete mode 100755 abs/core-testing/local-website/htdocs/wap.html delete mode 100644 abs/core-testing/logrotate/PKGBUILD delete mode 100644 abs/core-testing/logrotate/logrotate.conf delete mode 100755 abs/core-testing/logrotate/logrotate.cron.daily delete mode 100644 abs/core-testing/lshw/PKGBUILD delete mode 100644 abs/core-testing/lshw/abi_stdlib.diff delete mode 100644 abs/core-testing/lshw/gcc4.3.patch delete mode 100644 abs/core-testing/lsof/PKGBUILD delete mode 100644 abs/core-testing/lsof/license.txt delete mode 100644 abs/core-testing/lvm2/ChangeLog delete mode 100644 abs/core-testing/lvm2/PKGBUILD delete mode 100644 abs/core-testing/lvm2/lvm2_hook delete mode 100644 abs/core-testing/lvm2/lvm2_install delete mode 100644 abs/core-testing/lzo2/PKGBUILD delete mode 100644 abs/core-testing/lzop/PKGBUILD delete mode 100644 abs/core-testing/m4/PKGBUILD delete mode 100644 abs/core-testing/m4/m4.install delete mode 100644 abs/core-testing/madwifi-utils/PKGBUILD delete mode 100644 abs/core-testing/madwifi/PKGBUILD delete mode 100644 abs/core-testing/madwifi/kernel-2.6.19.patch delete mode 100644 abs/core-testing/madwifi/kernel-2.6.20.patch delete mode 100644 abs/core-testing/madwifi/kernel-2.6.30.patch delete mode 100644 abs/core-testing/madwifi/madwifi-ng.install delete mode 100644 abs/core-testing/mailx/PKGBUILD delete mode 100644 abs/core-testing/mailx/mailx-8.1.1.patch delete mode 100644 abs/core-testing/mailx/mailx-gcc4.patch delete mode 100644 abs/core-testing/man-pages/PKGBUILD delete mode 100644 abs/core-testing/man/PKGBUILD delete mode 100644 abs/core-testing/man/man-troff.patch delete mode 100755 abs/core-testing/man/whatis.cron.daily delete mode 100644 abs/core-testing/mcpp/PKGBUILD delete mode 100644 abs/core-testing/mcpp/mcpp-2.6.4-patch delete mode 100644 abs/core-testing/mdadm/PKGBUILD delete mode 100644 abs/core-testing/mdadm/mdadm.conf delete mode 100644 abs/core-testing/mdadm/raid-partitions_hook delete mode 100644 abs/core-testing/mdadm/raid-partitions_install delete mode 100644 abs/core-testing/media_dirs/PKGBUILD delete mode 100644 abs/core-testing/media_dirs/media_dirs.install delete mode 100644 abs/core-testing/mesa/LICENSE delete mode 100644 abs/core-testing/mesa/PKGBUILD delete mode 100644 abs/core-testing/mesa/mesa-6.5-apps-noglut.patch delete mode 100644 abs/core-testing/mesa/mesa-7.1-link-shared.patch delete mode 100644 abs/core-testing/mesa/nouveau_class.h delete mode 100644 abs/core-testing/miscsplashutils/ChangeLog delete mode 100644 abs/core-testing/miscsplashutils/PKGBUILD delete mode 100644 abs/core-testing/miscsplashutils/miscsplashutils.install delete mode 100644 abs/core-testing/mjpegtools/1.9.patch delete mode 100644 abs/core-testing/mjpegtools/PKGBUILD delete mode 100644 abs/core-testing/mjpegtools/__changelog delete mode 100644 abs/core-testing/mjpegtools/mjpegtools-1.8.0-gcc41.patch delete mode 100644 abs/core-testing/mjpegtools/mjpegtools-1.8.0-libc.patch delete mode 100644 abs/core-testing/mjpegtools/mjpegtools-1.8.0-limits.h.patch delete mode 100644 abs/core-testing/mkinitcpio-busybox/PKGBUILD delete mode 100644 abs/core-testing/mkinitcpio-busybox/config delete mode 100644 abs/core-testing/mkinitcpio-busybox/loadfont-setfont-optional-psf2-font-support.patch delete mode 100644 abs/core-testing/mkinitcpio/PKGBUILD delete mode 100644 abs/core-testing/mkinitcpio/mkinitcpio.conf.diff delete mode 100644 abs/core-testing/mlocate/PKGBUILD delete mode 100644 abs/core-testing/mlocate/mlocate.db delete mode 100644 abs/core-testing/mlocate/mlocate.install delete mode 100644 abs/core-testing/mlocate/updatedb.conf delete mode 100755 abs/core-testing/mlocate/updatedb.cron.daily delete mode 100644 abs/core-testing/module-init-tools/PKGBUILD delete mode 100644 abs/core-testing/module-init-tools/fix-modprobe-ignore-path.patch delete mode 100644 abs/core-testing/module-init-tools/makefile.patch delete mode 100644 abs/core-testing/module-init-tools/modprobe.conf delete mode 100644 abs/core-testing/module-init-tools/modutils-gcc4.patch delete mode 100644 abs/core-testing/mpfr/PKGBUILD delete mode 100644 abs/core-testing/mpfr/mpfr.install delete mode 100644 abs/core-testing/mplayer-wrapper/PKGBUILD delete mode 100644 abs/core-testing/mplayer-wrapper/mplayer-wrapper.install delete mode 100644 abs/core-testing/mplayer-wrapper/mplayer-wrapper.pl delete mode 100644 abs/core-testing/mplayer/PKGBUILD delete mode 100644 abs/core-testing/mtools/PKGBUILD delete mode 100644 abs/core-testing/mysql-python/PKGBUILD delete mode 100644 abs/core-testing/mysql/PKGBUILD delete mode 100644 abs/core-testing/mysql/__changelog delete mode 100644 abs/core-testing/mysql/my.cnf delete mode 100644 abs/core-testing/mysql/mysql.install delete mode 100755 abs/core-testing/mysql/mysqld delete mode 100644 abs/core-testing/mysql/skip-abi-check.patch delete mode 100755 abs/core-testing/mythdb-initial/PKGBUILD delete mode 100644 abs/core-testing/mythdb-initial/__changelog delete mode 100644 abs/core-testing/mythdb-initial/custom.sql delete mode 100644 abs/core-testing/mythdb-initial/dvd_transcode_r6.sql delete mode 100644 abs/core-testing/mythdb-initial/mc.sql delete mode 100755 abs/core-testing/mythdb-initial/mythdb.install delete mode 100755 abs/core-testing/mythdb-initial/permissions.sql delete mode 100644 abs/core-testing/mythinstall/PKGBUILD delete mode 100755 abs/core-testing/mythinstall/checkout_MythVantage.sh delete mode 100755 abs/core-testing/mythinstall/install-ui.xml delete mode 100644 abs/core-testing/mythstream/PKGBUILD delete mode 100644 abs/core-testing/mythstream/mythstream.install delete mode 100644 abs/core-testing/mythstream/mythstream.patch delete mode 100644 abs/core-testing/mythstream/streams.res delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/glass-wide/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/morethemes/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mytharchive/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythbrowser/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythcontrols/PKGBUILD delete mode 100755 abs/core-testing/mythtv/old/stable-0.21/mythdb-initial/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythdb-initial/__changelog delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythdb-initial/mc.sql delete mode 100755 abs/core-testing/mythtv/old/stable-0.21/mythdb-initial/mythdb.install delete mode 100755 abs/core-testing/mythtv/old/stable-0.21/mythdb-initial/permissions.sql delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythflix/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythgallery/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythgame/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythmovies/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythmusic/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythmusic/music_flac.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythmusic/mythmusic-0.21.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythnews/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythphone/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythsmolt/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythstream/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythstream/mythstream.diff delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythstream/mythstream.install delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/myththemes/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/2.6.28_dvb_api_version.diff delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/QUICKSTART.archlinux delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/gnome_screensaver.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/HOST_SETTINGS.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/is.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/library.xml.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/linhes.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/mainmenu.xml.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/mythbackup.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/mythrestore.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/optical_menu.xml.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/original/create_patch.sh delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/setup.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/siriusmenu.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/update.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/update2.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/util_menu.xml.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/xmmenu.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/mpegpspatch delete mode 100755 abs/core-testing/mythtv/old/stable-0.21/mythtv/mythbackend delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/mythbackend.lr delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/mythfrontend.lr delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/myththemedmenu.cpp.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/myththemedmenu.h.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/mythtv.install delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/pretty delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythtv/smolt_jump.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythvideo/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythvideo/mtd delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythvideo/mythvideo-6338-use_tmdb_in_fixes.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythvideo/mythvideo.install delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythweather/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythweb/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythweb/mythweb.install delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythweb/patch/2923-mythweb-gallery-English_GB_lang.diff delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythweb/patch/icons.tar.gz delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythweb/patch/mythweb.pl.diff delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythweb/patch/mythweb_gallery_updated1.diff delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythweb/transcoders.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythweb/wiiweb.tar.bz2 delete mode 100644 abs/core-testing/mythtv/old/stable-0.21/mythzoneminder/PKGBUILD delete mode 100755 abs/core-testing/mythtv/old/stable-0.22/clean_all.sh delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/morethemes/PKGBUILD delete mode 100755 abs/core-testing/mythtv/old/stable-0.22/mp_all.sh delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mytharchive/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythbrowser/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythflix/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythgallery/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythgame/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythmovies/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythmusic/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythnews/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythsmolt/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythsmolt/smolt_init_login.sh delete mode 100755 abs/core-testing/mythtv/old/stable-0.22/myththemes/PKGBUILD delete mode 100755 abs/core-testing/mythtv/old/stable-0.22/mythtv/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/changeset_r23616.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/HOST_SETTINGS.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/is.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/library.xml.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/linhes.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/mainmenu.tv.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/mainmenu.xml.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/mythbackup.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/mythrestore.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/optical_menu.xml.patch delete mode 100755 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/original/create_patch.sh delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/setup.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/siriusmenu.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/themeinfo.xml-tv delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/update.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/update2.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/util_menu.xml.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menu-xml/xmmenu.xml delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/menutheme_fallback.patch delete mode 100755 abs/core-testing/mythtv/old/stable-0.22/mythtv/myth.sh delete mode 100755 abs/core-testing/mythtv/old/stable-0.22/mythtv/mythbackend delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/mythbackend.lr delete mode 100755 abs/core-testing/mythtv/old/stable-0.22/mythtv/mythbackend.sh delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/mythfrontend.lr delete mode 100755 abs/core-testing/mythtv/old/stable-0.22/mythtv/mythtv.install delete mode 100755 abs/core-testing/mythtv/old/stable-0.22/mythtv/pretty delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythtv/smolt_jump.patch delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythvideo/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythweather/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythweb/PKGBUILD delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythweb/mythweb.install delete mode 100644 abs/core-testing/mythtv/old/stable-0.22/mythzoneminder/PKGBUILD delete mode 100755 abs/core-testing/mythtv/stable-0.23/clean_all.sh delete mode 100755 abs/core-testing/mythtv/stable-0.23/morethemes/PKGBUILD delete mode 100644 abs/core-testing/mythtv/stable-0.23/morethemes/retro-wide_video-ui.xml-filetypes.patch delete mode 100755 abs/core-testing/mythtv/stable-0.23/mp_all.sh delete mode 100644 abs/core-testing/mythtv/stable-0.23/mytharchive/PKGBUILD delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythbrowser/PKGBUILD delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythgallery/PKGBUILD delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythgame/PKGBUILD delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythmovies/PKGBUILD delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythmusic/PKGBUILD delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythnetvision/PKGBUILD delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythnews/PKGBUILD delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythsmolt/PKGBUILD delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythsmolt/mythsmolt.patch delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythsmolt/smolt_init_login.sh delete mode 100755 abs/core-testing/mythtv/stable-0.23/myththemes/PKGBUILD delete mode 100755 abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/HOST_SETTINGS.xml delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/is.xml delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/library.xml.patch delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/linhes.xml delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/mainmenu.xml.patch delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/mythbackup.xml delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/mythrestore.xml delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/optical_menu.xml.patch delete mode 100755 abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/original/create_patch.sh delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/setup.xml delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/siriusmenu.xml delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/update.xml delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/update2.xml delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/util_menu.xml.patch delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/menu-xml/xmmenu.xml delete mode 100755 abs/core-testing/mythtv/stable-0.23/mythtv/myth.sh delete mode 100755 abs/core-testing/mythtv/stable-0.23/mythtv/mythbackend delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/mythbackend.lr delete mode 100755 abs/core-testing/mythtv/stable-0.23/mythtv/mythbackend.sh delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/mythfrontend.lr delete mode 100755 abs/core-testing/mythtv/stable-0.23/mythtv/mythtv.install delete mode 100755 abs/core-testing/mythtv/stable-0.23/mythtv/pretty delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythtv/smolt_jump.patch delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythvideo/PKGBUILD delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythweather/PKGBUILD delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythweb/PKGBUILD delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythweb/mythweb.install delete mode 100644 abs/core-testing/mythtv/stable-0.23/mythzoneminder/PKGBUILD delete mode 100755 abs/core-testing/mythtv/trunk/clean_all.sh delete mode 100644 abs/core-testing/mythtv/trunk/morethemes/PKGBUILD delete mode 100755 abs/core-testing/mythtv/trunk/mp_all.sh delete mode 100644 abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD delete mode 100644 abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD delete mode 100644 abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD delete mode 100644 abs/core-testing/mythtv/trunk/mythgame/PKGBUILD delete mode 100644 abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD delete mode 100644 abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD delete mode 100644 abs/core-testing/mythtv/trunk/mythnetvision/PKGBUILD delete mode 100644 abs/core-testing/mythtv/trunk/mythnews/PKGBUILD delete mode 100755 abs/core-testing/mythtv/trunk/myththemes/PKGBUILD delete mode 100755 abs/core-testing/mythtv/trunk/mythtv/PKGBUILD delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/menu-xml/is.xml delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/menu-xml/library.xml.patch delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/menu-xml/linhes.xml delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythbackup.xml delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythrestore.xml delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/menu-xml/optical_menu.xml.patch delete mode 100755 abs/core-testing/mythtv/trunk/mythtv/menu-xml/original/create_patch.sh delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/menu-xml/setup.xml delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/menu-xml/siriusmenu.xml delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/menu-xml/update.xml delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/menu-xml/update2.xml delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/menu-xml/util_menu.xml.patch delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/menu-xml/xmmenu.xml delete mode 100755 abs/core-testing/mythtv/trunk/mythtv/myth.sh delete mode 100755 abs/core-testing/mythtv/trunk/mythtv/mythbackend delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/mythbackend.lr delete mode 100755 abs/core-testing/mythtv/trunk/mythtv/mythbackend.sh delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/mythfrontend.lr delete mode 100755 abs/core-testing/mythtv/trunk/mythtv/mythtv.install delete mode 100755 abs/core-testing/mythtv/trunk/mythtv/pretty delete mode 100644 abs/core-testing/mythtv/trunk/mythtv/smolt_jump.patch delete mode 100644 abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD delete mode 100644 abs/core-testing/mythtv/trunk/mythweather/PKGBUILD delete mode 100644 abs/core-testing/mythtv/trunk/mythweb/PKGBUILD delete mode 100644 abs/core-testing/mythtv/trunk/mythweb/mythweb.install delete mode 100644 abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD delete mode 100644 abs/core-testing/nano/PKGBUILD delete mode 100644 abs/core-testing/nano/nano.install delete mode 100644 abs/core-testing/nasm/PKGBUILD delete mode 100644 abs/core-testing/ncurses/ChangeLog delete mode 100644 abs/core-testing/ncurses/PKGBUILD delete mode 100644 abs/core-testing/ncurses/ncurses.install delete mode 100644 abs/core-testing/ndiswrapper-utils/PKGBUILD delete mode 100644 abs/core-testing/ndiswrapper/PKGBUILD delete mode 100644 abs/core-testing/ndiswrapper/kernel-2.6.27.patch delete mode 100644 abs/core-testing/ndiswrapper/ndiswrapper-CVE-2008-4395.patch delete mode 100644 abs/core-testing/ndiswrapper/ndiswrapper.install delete mode 100644 abs/core-testing/net-tools/PKGBUILD delete mode 100644 abs/core-testing/net-tools/gcc340.patch delete mode 100644 abs/core-testing/net-tools/net-tools-1.60-2.6-compilefix.patch delete mode 100644 abs/core-testing/net-tools/net-tools-1.60-miiioctl.patch delete mode 100644 abs/core-testing/net-tools/net-tools-1.60-nameif.patch delete mode 100644 abs/core-testing/net-tools/net-tools-1.60-nameif_strncpy.patch delete mode 100644 abs/core-testing/net-tools/net-tools.patch delete mode 100644 abs/core-testing/net-tools/nisdomainname.conf.d delete mode 100644 abs/core-testing/netkit-telnet/PKGBUILD delete mode 100644 abs/core-testing/netkit-telnet/netkit-telnet-0.17.patch delete mode 100644 abs/core-testing/netkit-telnet/telnet.xinetd delete mode 100644 abs/core-testing/nfs-utils/PKGBUILD delete mode 100644 abs/core-testing/nfs-utils/exports delete mode 100644 abs/core-testing/nfs-utils/nfs-utils.install delete mode 100644 abs/core-testing/nfs-utils/nfs.conf.d delete mode 100755 abs/core-testing/nfs-utils/nfsd delete mode 100755 abs/core-testing/nfs-utils/nfslock delete mode 100644 abs/core-testing/nfs-utils/start-statd.patch delete mode 100644 abs/core-testing/nfsidmap/PKGBUILD delete mode 100755 abs/core-testing/nmbscan/PKGBUILD delete mode 100644 abs/core-testing/ntfs-3g/20-ntfs-config-write-policy.fdi delete mode 100644 abs/core-testing/ntfs-3g/25-ntfs-config-write-policy.fdi delete mode 100644 abs/core-testing/ntfs-3g/PKGBUILD delete mode 100644 abs/core-testing/ntfs-3g/ntfs-3g.install delete mode 100644 abs/core-testing/ntfsprogs/PKGBUILD delete mode 100644 abs/core-testing/ntfsprogs/ntfsprogs.install delete mode 100755 abs/core-testing/ntp/PKGBUILD delete mode 100644 abs/core-testing/ntp/fix-ipv6.patch delete mode 100644 abs/core-testing/ntp/ntp-4.2.4-html2man.patch delete mode 100644 abs/core-testing/ntp/ntp-4.2.4_p7-nano.patch delete mode 100755 abs/core-testing/ntp/ntp-client.conf delete mode 100755 abs/core-testing/ntp/ntp.conf delete mode 100755 abs/core-testing/ntp/ntpd delete mode 100755 abs/core-testing/ntp/ntpdate delete mode 100755 abs/core-testing/nuvexport/MP4.pm delete mode 100644 abs/core-testing/nuvexport/PKGBUILD delete mode 100755 abs/core-testing/nuvexport/XviD.pm delete mode 100644 abs/core-testing/nuvexport/nuvexport-ipod-disable.patch delete mode 100644 abs/core-testing/nvidia-173xx-utils/20-nvidia.conf delete mode 100644 abs/core-testing/nvidia-173xx-utils/PKGBUILD delete mode 100644 abs/core-testing/nvidia-173xx-utils/nvidia.install delete mode 100644 abs/core-testing/nvidia-173xx-utils/supported-cards.txt delete mode 100644 abs/core-testing/nvidia-173xx/PKGBUILD delete mode 100644 abs/core-testing/nvidia-173xx/nvidia-96.43.11-2.6.30.patch delete mode 100644 abs/core-testing/nvidia-173xx/nvidia.install delete mode 100644 abs/core-testing/nvidia-71xx-utils/PKGBUILD delete mode 100644 abs/core-testing/nvidia-71xx-utils/nvidia-71xx.install delete mode 100644 abs/core-testing/nvidia-71xx-utils/supported-cards.txt delete mode 100644 abs/core-testing/nvidia-71xx/NVIDIA_kernel-96.43.05-2290218.diff.txt delete mode 100644 abs/core-testing/nvidia-71xx/PKGBUILD delete mode 100644 abs/core-testing/nvidia-71xx/nvidia-71xx.install delete mode 100644 abs/core-testing/nvidia-96xx-utils/PKGBUILD delete mode 100644 abs/core-testing/nvidia-96xx-utils/nvidia.install delete mode 100644 abs/core-testing/nvidia-96xx-utils/supported-cards.txt delete mode 100644 abs/core-testing/nvidia-96xx/PKGBUILD delete mode 100644 abs/core-testing/nvidia-96xx/nvidia-96.43.11-2.6.30.patch delete mode 100644 abs/core-testing/nvidia-96xx/nvidia.install delete mode 100644 abs/core-testing/nvidia-utils/20-nvidia.conf delete mode 100644 abs/core-testing/nvidia-utils/PKGBUILD delete mode 100644 abs/core-testing/nvidia-utils/nvidia.install delete mode 100644 abs/core-testing/nvidia-utils/supported-cards.txt delete mode 100644 abs/core-testing/nvidia/PKGBUILD delete mode 100644 abs/core-testing/nvidia/nvidia.install delete mode 100644 abs/core-testing/openexr/PKGBUILD delete mode 100644 abs/core-testing/openexr/gcc43.patch delete mode 100644 abs/core-testing/openexr/openexr-gcc4.patch delete mode 100644 abs/core-testing/openssh/PKGBUILD delete mode 100755 abs/core-testing/openssh/sshd delete mode 100644 abs/core-testing/openssh/sshd.confd delete mode 100644 abs/core-testing/openssh/sshd.pam delete mode 100644 abs/core-testing/openssl/PKGBUILD delete mode 100644 abs/core-testing/openssl/ca-dir.patch delete mode 100644 abs/core-testing/openssl/fix-manpages.patch delete mode 100644 abs/core-testing/openssl/no-rpath.patch delete mode 100644 abs/core-testing/pacman-mirrorlist/PKGBUILD delete mode 100644 abs/core-testing/pacman-mirrorlist/mirrorlist delete mode 100644 abs/core-testing/pacman/PKGBUILD delete mode 100644 abs/core-testing/pacman/makepkg.conf delete mode 100644 abs/core-testing/pacman/old/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch delete mode 100644 abs/core-testing/pacman/old/PKGBUILD delete mode 100644 abs/core-testing/pacman/old/makepkg.conf delete mode 100644 abs/core-testing/pacman/old/mirrorlist delete mode 100644 abs/core-testing/pacman/old/pacman.conf delete mode 100644 abs/core-testing/pacman/old/pacman.install delete mode 120000 abs/core-testing/pacman/pacman-3.4.1-1-i686.pkg.tar.gz delete mode 100644 abs/core-testing/pacman/pacman.conf delete mode 100644 abs/core-testing/pacman/pacman.conf.x86_64 delete mode 100644 abs/core-testing/pacman/pacman.install delete mode 100644 abs/core-testing/pam/PKGBUILD delete mode 100644 abs/core-testing/pam/other delete mode 100644 abs/core-testing/pam/pam.install delete mode 100644 abs/core-testing/pango/PKGBUILD delete mode 100644 abs/core-testing/pango/bgo563356.patch delete mode 100644 abs/core-testing/pango/pango.install delete mode 100644 abs/core-testing/parted/PKGBUILD delete mode 100644 abs/core-testing/parted/parted.install delete mode 100644 abs/core-testing/patch/PKGBUILD delete mode 100644 abs/core-testing/pciutils/PKGBUILD delete mode 100644 abs/core-testing/pcmciautils/PKGBUILD delete mode 100644 abs/core-testing/pcre/ChangeLog delete mode 100644 abs/core-testing/pcre/PKGBUILD delete mode 100644 abs/core-testing/pcre/libpcre-7.7-buffer-overflow.patch delete mode 100644 abs/core-testing/perl/PKGBUILD delete mode 100644 abs/core-testing/perl/archlinux-cpan-installdir.patch delete mode 100644 abs/core-testing/perl/archlinux-inc-order.patch delete mode 100644 abs/core-testing/perl/perl-5.10.0-archlinux-cpan-installdir.patch delete mode 100644 abs/core-testing/perl/perl-5.10.0-archlinux-inc-order.patch delete mode 100644 abs/core-testing/perl/perl-5.8.6-picdl.patch0 delete mode 100644 abs/core-testing/perl/perl-5.8.8-gcc-4.2.0.patch delete mode 100644 abs/core-testing/perl/perl-5.8.8-utf-regexes.patch delete mode 100644 abs/core-testing/perl/perl.install delete mode 100755 abs/core-testing/perl/perlbin.sh delete mode 100644 abs/core-testing/perl_modules/libxml-perl/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-algorithm-diff/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-archive-zip/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-astro-suntime/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-class-data-inheritable/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-class-factory-util/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-class-methodmaker/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-class-singleton/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-compress-raw-zlib/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-compress-zlib/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-config-simple/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-crypt-ssleay/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-data-dumper/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-date-manip/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-datetime-format-builder/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-datetime-format-iso8601/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-datetime-format-mail/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-datetime-format-strptime/ChangeLog delete mode 100644 abs/core-testing/perl_modules/perl-datetime-format-strptime/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-datetime-format-w3cdtf/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-datetime-locale/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-datetime-timezone/ChangeLog delete mode 100644 abs/core-testing/perl_modules/perl-datetime-timezone/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-datetime/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-dbd-mysql/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-dbi/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-devel-stacktrace/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-device-serialport/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-digest-sha1/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-error/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-exception-class/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-fcgi/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-file-slurp/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-getopt-long/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-getopt-lucid/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-html-parser/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-html-tagset/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-html-tree/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-http-cache-transparent/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-image-size/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-io-compress-zlib/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-io-socket-ssl/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-io-stringy/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-javascript/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-libwww/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-libxml/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-libxml/perl-libxml.install delete mode 100644 abs/core-testing/perl_modules/perl-lingua-en-numbers-ordinate/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-lingua-en-numbers/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-lingua-preferred/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-list-compare/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-list-member/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-list-moreutils/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-locale-gettext/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-log-dispatch/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-log-log4perl/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-mailtools/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-math-round/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-mime-lite/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-mime-parser/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-mime-tools/ChangeLog delete mode 100644 abs/core-testing/perl_modules/perl-mime-tools/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-mime-types/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-net-ssleay/PKGBUILD delete mode 100755 abs/core-testing/perl_modules/perl-net-upnp/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-net-upnp/perl-config-simple/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-params-validate/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-parse-yapp/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-pathtools/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-pathtools/license.txt delete mode 100644 abs/core-testing/perl_modules/perl-php-serialization/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-proc-daemon/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-proc-pid-file/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-soap-lite/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-term-progressbar/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-term-readkey/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-test-pod/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-text-bidi/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-text-iconv/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-text-kakasi/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-time-format/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-time-modules/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-timedate/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-tk-tablematrix/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-tk/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-unicode-map/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-unicode-string/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-unicode-utf8simple/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-uri/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-www-mechanize/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-x10/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-xml-dom/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-xml-libxml-common/ChangeLog delete mode 100644 abs/core-testing/perl_modules/perl-xml-libxml-common/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-xml-libxml/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-xml-libxml/perl-xml-libxml.install delete mode 100644 abs/core-testing/perl_modules/perl-xml-libxslt/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-xml-namespacesupport/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-xml-parser/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-xml-regexp/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-xml-rss/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-xml-sax/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-xml-sax/perl-xml-sax.install delete mode 100644 abs/core-testing/perl_modules/perl-xml-sax/perl-xml-sax.patch delete mode 100644 abs/core-testing/perl_modules/perl-xml-simple/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-xml-twig/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-xml-writer/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perl-xml-xpath/PKGBUILD delete mode 100755 abs/core-testing/perl_modules/perl-xml-xql/PKGBUILD delete mode 100644 abs/core-testing/perl_modules/perlxml/PKGBUILD delete mode 100644 abs/core-testing/php/PKGBUILD delete mode 100644 abs/core-testing/php/__changelog delete mode 100644 abs/core-testing/php/apache.conf delete mode 100644 abs/core-testing/php/db-configure.patch delete mode 100644 abs/core-testing/php/php.ini delete mode 100644 abs/core-testing/php/php.install delete mode 100644 abs/core-testing/pil/PKGBUILD delete mode 100644 abs/core-testing/pil/__changelog delete mode 100644 abs/core-testing/pixman/PKGBUILD delete mode 100644 abs/core-testing/pkg-config/PKGBUILD delete mode 100644 abs/core-testing/pkg-config/autoconf-2.66.patch delete mode 100644 abs/core-testing/plextor-convertX-driver/.svn/all-wcprops delete mode 100644 abs/core-testing/plextor-convertX-driver/.svn/entries delete mode 100644 abs/core-testing/plextor-convertX-driver/.svn/format delete mode 100644 abs/core-testing/plextor-convertX-driver/.svn/prop-base/PKGBUILD.svn-base delete mode 100644 abs/core-testing/plextor-convertX-driver/.svn/prop-base/convertX.install.svn-base delete mode 100644 abs/core-testing/plextor-convertX-driver/.svn/prop-base/download.php?id=9719.svn-base delete mode 100644 abs/core-testing/plextor-convertX-driver/.svn/prop-base/wis-go-0.9.8-2.6.17.patch.svn-base delete mode 100644 abs/core-testing/plextor-convertX-driver/.svn/text-base/PKGBUILD.svn-base delete mode 100644 abs/core-testing/plextor-convertX-driver/.svn/text-base/convertX.install.svn-base delete mode 100644 abs/core-testing/plextor-convertX-driver/.svn/text-base/download.php?id=9719.svn-base delete mode 100644 abs/core-testing/plextor-convertX-driver/.svn/text-base/wis-go-0.9.8-2.6.17.patch.svn-base delete mode 100755 abs/core-testing/plextor-convertX-driver/PKGBUILD delete mode 100755 abs/core-testing/plextor-convertX-driver/convertX.install delete mode 100644 abs/core-testing/plextor-convertX-driver/wis-go7007-2.6.26-nopage.diff delete mode 100644 abs/core-testing/plextor-convertX-driver/wis-go7007-linux-0.9.8-2-2.6.27.patch delete mode 100644 abs/core-testing/pm-utils/11netcfg delete mode 100644 abs/core-testing/pm-utils/PKGBUILD delete mode 100644 abs/core-testing/pm-utils/pm-utils.install delete mode 100644 abs/core-testing/pm-utils/service.patch delete mode 100644 abs/core-testing/popt/PKGBUILD delete mode 100644 abs/core-testing/portmap/PKGBUILD delete mode 100644 abs/core-testing/portmap/gcc3-errno_h.patch delete mode 100755 abs/core-testing/portmap/portmap delete mode 100644 abs/core-testing/portmap/portmap_5beta.patch.bz2 delete mode 100644 abs/core-testing/ppl/PKGBUILD delete mode 100644 abs/core-testing/ppl/ppl-0.10.2-gmp-5.0.patch delete mode 100644 abs/core-testing/ppp/PKGBUILD delete mode 100644 abs/core-testing/ppp/ip-down delete mode 100644 abs/core-testing/ppp/ip-up delete mode 100644 abs/core-testing/ppp/options delete mode 100644 abs/core-testing/ppp/plog delete mode 100644 abs/core-testing/ppp/poff delete mode 100644 abs/core-testing/ppp/pon delete mode 100644 abs/core-testing/ppp/pon.1 delete mode 100644 abs/core-testing/ppp/ppp delete mode 100644 abs/core-testing/printproto/PKGBUILD delete mode 100644 abs/core-testing/procinfo-ng/PKGBUILD delete mode 100644 abs/core-testing/procps/PKGBUILD delete mode 100644 abs/core-testing/procps/sysctl.conf delete mode 100644 abs/core-testing/projectm/PKGBUILD delete mode 100644 abs/core-testing/projectm/projectm.install delete mode 100644 abs/core-testing/psmisc/PKGBUILD delete mode 100644 abs/core-testing/pvr150-firmware/PKGBUILD delete mode 100644 abs/core-testing/pycairo/PKGBUILD delete mode 100644 abs/core-testing/pycairo/pycairo-1.8.0-threading.diff delete mode 100644 abs/core-testing/pygobject/PKGBUILD delete mode 100644 abs/core-testing/pygtk/PKGBUILD delete mode 100644 abs/core-testing/python-decorator/LICENSE.txt delete mode 100644 abs/core-testing/python-decorator/PKGBUILD delete mode 100755 abs/core-testing/python-iplib/PKGBUILD delete mode 100644 abs/core-testing/python-netifaces/PKGBUILD delete mode 100644 abs/core-testing/python-numeric/PKGBUILD delete mode 100644 abs/core-testing/python-parted/PKGBUILD delete mode 100644 abs/core-testing/python-pexpect/PKGBUILD delete mode 100644 abs/core-testing/python-pycurl/PKGBUILD delete mode 100644 abs/core-testing/python-simplejson/PKGBUILD delete mode 100644 abs/core-testing/python/ChangeLog delete mode 100644 abs/core-testing/python/PKGBUILD delete mode 100644 abs/core-testing/python/Python-2.4.4-gdbm-1.patch delete mode 100644 abs/core-testing/python/Python-2.5.2-idlelib.patch delete mode 100644 abs/core-testing/python/db4.6-setup.py-detection.patch delete mode 100644 abs/core-testing/python/modulator-launcher delete mode 100644 abs/core-testing/python/pynche-launcher delete mode 100644 abs/core-testing/python/python-2.5.CVE-2007-4965-int-overflow.patch delete mode 100644 abs/core-testing/python/python-2.6-db-4.8.patch delete mode 100644 abs/core-testing/python/python-2.6-gdbm.patch delete mode 100644 abs/core-testing/python/python-2.6-internal-expat.patch delete mode 100644 abs/core-testing/python/python.install delete mode 100644 abs/core-testing/python/python2.6-set_wakeup_fd4.patch delete mode 100644 abs/core-testing/qt/PKGBUILD delete mode 100644 abs/core-testing/qt/__changelog delete mode 100644 abs/core-testing/qt/assistant.desktop delete mode 100644 abs/core-testing/qt/ca-certificates.patch delete mode 100644 abs/core-testing/qt/designer.desktop delete mode 100644 abs/core-testing/qt/linguist.desktop delete mode 100644 abs/core-testing/qt/qt-webkit-4.6.3-flash-plugin-segfault.patch delete mode 100644 abs/core-testing/qt/qt.install delete mode 100644 abs/core-testing/qt/qtconfig.desktop delete mode 100644 abs/core-testing/qt3/PKGBUILD delete mode 100644 abs/core-testing/qt3/mysql.patch delete mode 100644 abs/core-testing/qt3/qt-copy-kde-patches.tar.bz2 delete mode 100644 abs/core-testing/qt3/qt-font-default-subst.diff delete mode 100644 abs/core-testing/qt3/qt-patches.tar.bz2 delete mode 100644 abs/core-testing/qt3/qt.install delete mode 100644 abs/core-testing/qt3/qt.profile delete mode 100644 abs/core-testing/qt3/utf8-bug-qt3.diff delete mode 100644 abs/core-testing/randrproto/PKGBUILD delete mode 100644 abs/core-testing/readline/PKGBUILD delete mode 100644 abs/core-testing/readline/inputrc delete mode 100644 abs/core-testing/readline/readline.install delete mode 100644 abs/core-testing/recordproto/PKGBUILD delete mode 100644 abs/core-testing/reiserfsprogs/PKGBUILD delete mode 100644 abs/core-testing/renderproto/PKGBUILD delete mode 100644 abs/core-testing/resourceproto/PKGBUILD delete mode 100644 abs/core-testing/rp-pppoe/PKGBUILD delete mode 100755 abs/core-testing/rp-pppoe/adsl delete mode 100644 abs/core-testing/rpcbind/PKGBUILD delete mode 100755 abs/core-testing/rpcbind/rpcbind delete mode 100644 abs/core-testing/rsync/PKGBUILD delete mode 100644 abs/core-testing/rsync/__changelog delete mode 100644 abs/core-testing/rsync/rsync.xinetd delete mode 100644 abs/core-testing/rsync/rsyncd delete mode 100644 abs/core-testing/rsync/rsyncd.conf delete mode 100644 abs/core-testing/run-parts/PKGBUILD delete mode 100755 abs/core-testing/runit-scripts/PKGBUILD delete mode 100755 abs/core-testing/runit-scripts/fbsplash-runit.sh delete mode 100755 abs/core-testing/runit-scripts/runit.install delete mode 100755 abs/core-testing/runit-scripts/runitscripts/1 delete mode 100755 abs/core-testing/runit-scripts/runitscripts/1.local delete mode 100755 abs/core-testing/runit-scripts/runitscripts/2 delete mode 100755 abs/core-testing/runit-scripts/runitscripts/3 delete mode 100755 abs/core-testing/runit-scripts/runitscripts/ctrlaltdel delete mode 100755 abs/core-testing/runit-scripts/runitscripts/ctrlaltdel.off delete mode 100755 abs/core-testing/runit-scripts/runitscripts/halt-runit delete mode 100755 abs/core-testing/runit-scripts/runitscripts/logger delete mode 100755 abs/core-testing/runit-scripts/runitscripts/reboot-runit delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/Xvfb/finish delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/Xvfb/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/acpid/log/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/acpid/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/alsa-utils/finish delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/alsa-utils/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/apache/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/avahi/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/cron/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/dbus/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/ddclient/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/dhcpd/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/dnsmasq/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/evrouter/finish delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/evrouter/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/frontend/finish delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/frontend/log/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/frontend/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/gpm/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/hal/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/hobbit-client/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/hobbit/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/igdaemon/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/lcdd/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/lighttpd/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/lircd/finish delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/lircd/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/mdadm/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/mysql/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/mythbackend/log/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/mythbackend/run delete mode 100644 abs/core-testing/runit-scripts/runitscripts/services/ncid/finish delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/ncid/run delete mode 100644 abs/core-testing/runit-scripts/runitscripts/services/ncidd/finish delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/ncidd/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/netfs/finish delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/netfs/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/nfsd/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/nfslock/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/nmbd/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/ntpd/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/oss/finish delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/oss/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/portmap/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/postfix/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/smartd/finish delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/smartd/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/smbd/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/sshd/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/syslog-ng/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/tatir/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/tftpd/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/tty2/run delete mode 100755 abs/core-testing/runit-scripts/runitscripts/services/tty3/run delete mode 100755 abs/core-testing/runit/PKGBUILD delete mode 100755 abs/core-testing/runit/add_service.sh delete mode 100755 abs/core-testing/runit/halt.script delete mode 100755 abs/core-testing/runit/poweroff.script delete mode 100755 abs/core-testing/runit/reboot.script delete mode 100755 abs/core-testing/runit/remove_service.sh delete mode 100755 abs/core-testing/runit/runit.install delete mode 100755 abs/core-testing/runit/shutdown.script delete mode 100644 abs/core-testing/samba/PKGBUILD delete mode 100644 abs/core-testing/samba/__changelog delete mode 100644 abs/core-testing/samba/heimdal.patch delete mode 100644 abs/core-testing/samba/no-clients.patch delete mode 100755 abs/core-testing/samba/samba delete mode 100644 abs/core-testing/samba/samba-3.0.21a-ntlmssp.patch delete mode 100644 abs/core-testing/samba/samba.conf.d delete mode 100644 abs/core-testing/samba/samba.logrotate delete mode 100644 abs/core-testing/samba/samba.pam delete mode 100644 abs/core-testing/samba/swat.xinetd delete mode 100644 abs/core-testing/scrnsaverproto/PKGBUILD delete mode 100644 abs/core-testing/sdl/PKGBUILD delete mode 100644 abs/core-testing/sdl/__changelog delete mode 100644 abs/core-testing/sdl/sdl-1.2.13-dynaminc-esd.patch delete mode 100644 abs/core-testing/sdparm/PKGBUILD delete mode 100644 abs/core-testing/sed/PKGBUILD delete mode 100644 abs/core-testing/setserial/PKGBUILD delete mode 100644 abs/core-testing/setserial/setserial.patch delete mode 100644 abs/core-testing/setuptools/PKGBUILD delete mode 100644 abs/core-testing/sg3_utils/PKGBUILD delete mode 100644 abs/core-testing/shadow/PKGBUILD delete mode 100644 abs/core-testing/shadow/adduser delete mode 100644 abs/core-testing/shadow/chage delete mode 100644 abs/core-testing/shadow/chsh delete mode 100644 abs/core-testing/shadow/defaults.pam delete mode 100644 abs/core-testing/shadow/login delete mode 100644 abs/core-testing/shadow/login.defs delete mode 100644 abs/core-testing/shadow/passwd delete mode 100644 abs/core-testing/shadow/shadow delete mode 100644 abs/core-testing/shadow/shadow-4.0.18.2-useradd-fix-1.patch delete mode 100644 abs/core-testing/shadow/shadow-UID_GID.patch delete mode 100755 abs/core-testing/shadow/shadow.cron.daily delete mode 100644 abs/core-testing/shadow/shadow.install delete mode 100644 abs/core-testing/shadow/useradd delete mode 100644 abs/core-testing/shadow/useradd-default.patch delete mode 100644 abs/core-testing/shadow/useradd.defaults delete mode 100644 abs/core-testing/shadow/xstrdup.patch delete mode 100644 abs/core-testing/shared-mime-info/PKGBUILD delete mode 100644 abs/core-testing/shared-mime-info/shared-mime-info.install delete mode 100644 abs/core-testing/sharutils/PKGBUILD delete mode 100644 abs/core-testing/sqlite3/PKGBUILD delete mode 100644 abs/core-testing/sqlite3/build_fts_as_part_of_libsqlite.patch delete mode 100644 abs/core-testing/sqlite3/license.txt delete mode 100644 abs/core-testing/sqlite3/sqlite-3.5.8-pkgconfig-version.patch delete mode 100644 abs/core-testing/squashfs-tools/PKGBUILD delete mode 100644 abs/core-testing/squashfs-tools/mksquashfs-fix-race.patch delete mode 100644 abs/core-testing/sudo/PKGBUILD delete mode 100644 abs/core-testing/sudo/sudo.pam delete mode 100644 abs/core-testing/sysfsutils/PKGBUILD delete mode 100644 abs/core-testing/syslinux/PKGBUILD delete mode 100644 abs/core-testing/syslog-ng/PKGBUILD delete mode 100755 abs/core-testing/syslog-ng/syslog-ng delete mode 100644 abs/core-testing/syslog-ng/syslog-ng.conf delete mode 100644 abs/core-testing/syslog-ng/syslog-ng.logrotate delete mode 100755 abs/core-testing/system-templates/PKGBUILD delete mode 100644 abs/core-testing/system-templates/templates/LCD/Shuttle-SG33/LCDd.conf delete mode 100644 abs/core-testing/system-templates/templates/LCD/Silverstone/LCDd.conf delete mode 100644 abs/core-testing/system-templates/templates/LCD/Silverstone/modules delete mode 100644 abs/core-testing/system-templates/templates/LCD/antec_fusion/LCDd.conf delete mode 100644 abs/core-testing/system-templates/templates/LCD/antec_fusion/lircd.conf delete mode 100644 abs/core-testing/system-templates/templates/LCD/antec_fusion/lircrc delete mode 100644 abs/core-testing/system-templates/templates/LCD/antec_fusion/modules delete mode 100644 abs/core-testing/system-templates/templates/LCD/xosd/LCDd.conf delete mode 100755 abs/core-testing/system-templates/templates/cc.orig.sh delete mode 100755 abs/core-testing/system-templates/templates/cc.sh delete mode 100755 abs/core-testing/system-templates/templates/cc_vol.sh delete mode 100755 abs/core-testing/system-templates/templates/change_chan.sh delete mode 100644 abs/core-testing/system-templates/templates/cron.template delete mode 100644 abs/core-testing/system-templates/templates/etcnet/eth/ipv4address delete mode 100644 abs/core-testing/system-templates/templates/etcnet/eth/ipv4route delete mode 100644 abs/core-testing/system-templates/templates/etcnet/eth/iwconfig delete mode 100644 abs/core-testing/system-templates/templates/etcnet/eth/options delete mode 100644 abs/core-testing/system-templates/templates/evrouter/MythVantage-4 delete mode 100644 abs/core-testing/system-templates/templates/evrouter/MythVantage-8 delete mode 100644 abs/core-testing/system-templates/templates/evrouter/MythVantage-Full delete mode 100644 abs/core-testing/system-templates/templates/evrouter/MythVantage8-minipac delete mode 100644 abs/core-testing/system-templates/templates/evrouter/MythVantage8-uhid delete mode 100644 abs/core-testing/system-templates/templates/exports.template delete mode 100755 abs/core-testing/system-templates/templates/fstab.conf.template delete mode 100644 abs/core-testing/system-templates/templates/gscreensavers delete mode 100644 abs/core-testing/system-templates/templates/modules/lirc_i2c.conf delete mode 100644 abs/core-testing/system-templates/templates/mysql.service delete mode 100755 abs/core-testing/system-templates/templates/mysql.txt delete mode 100755 abs/core-testing/system-templates/templates/ncid.conf.template delete mode 100644 abs/core-testing/system-templates/templates/ncidd.conf.template delete mode 100755 abs/core-testing/system-templates/templates/real_change_chan.sh delete mode 100644 abs/core-testing/system-templates/templates/remotes/AOpen-EA65/lircd.conf.ea65 delete mode 100644 abs/core-testing/system-templates/templates/remotes/AOpen-EA65/lircrc.ea65 delete mode 100644 abs/core-testing/system-templates/templates/remotes/AOpen-EA65/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.asus delete mode 100644 abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.digimatrix delete mode 100644 abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/ATI_Remote_Wonder/lircd.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/ATI_Remote_Wonder/lircrc delete mode 100644 abs/core-testing/system-templates/templates/remotes/ATI_Remote_Wonder/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/ATI_Remote_Wonder_Plus/lircd.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/ATI_Remote_Wonder_Plus/lircrc delete mode 100644 abs/core-testing/system-templates/templates/remotes/ATI_Remote_Wonder_Plus/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Avermedia_77x/lircd-avermedia77x.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Avermedia_77x/lircrc-avermedia771.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Avermedia_77x/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Avermedia_98/lircd-avermedia98.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Avermedia_98/lircrc-avermedia98.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Avermedia_98/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Avertv_USB/lircd-avertvusb.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Avertv_USB/lircrc-avertvusb.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Avertv_USB/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Cinergy/lircd-cinergy400600.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Cinergy/lircrc-cinergy400600.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Cinergy/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Cinergy_1400/lircd-cinergy1400.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Cinergy_1400/lircrc-cinergy1400.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Cinergy_1400/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Cinergy_T2/lircd-cinergyT2.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Cinergy_T2/lircrc-cinergyT2.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Cinergy_T2/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Compro/lircd-compro.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Compro/lircrc-compro.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Compro/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/lircd.conf.dvico-dual-digital4 delete mode 100644 abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/lircrc.dvico-dual-digital4 delete mode 100644 abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Flyvideo_2000/lircd-flyvideo2000.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Flyvideo_2000/lircrc-flyvideo2000.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Flyvideo_2000/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Flyvideo_3000/lircd-flyvideo3000.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Flyvideo_3000/lircrc-flyvideo3000.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Flyvideo_3000/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Hercules/lircd-hercules.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Hercules/lircrc-hercules.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Hercules/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Kworld_110/lircd-kworld110.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Kworld_110/lircrc-kworld110.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Kworld_110/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Kworld_220/lircd-kworld220.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Kworld_220/lircrc-kworld220.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Kworld_220/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Kworld_310/lircd-kworld310.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Kworld_310/lircrc-kworld310.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Kworld_310/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Kworld_DVBT/lircd-kworlddvbt.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Kworld_DVBT/lircrc-kworlddvbt.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Kworld_DVBT/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Kworld_tv878/lircd-kworldtv878.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Kworld_tv878/lircrc-kworldv878.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Kworld_tv878/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Leadtek_2000XP/lircd-leadtek2000xp.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Leadtek_2000XP/lircrc-leadtek2000xp.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Leadtek_2000XP/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Leadtek_PVR/lircd-leadtekPVR.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Leadtek_PVR/lircrc-leadtekPVR.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Leadtek_PVR/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Lifeview/lircd-lifeview.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Lifeview/lircrc-lifeview.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Lifeview/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/MX-500-jams/lircd.conf.MX-500-JAMS delete mode 100644 abs/core-testing/system-templates/templates/remotes/MX-500-jams/lircrc delete mode 100644 abs/core-testing/system-templates/templates/remotes/MX-500-jams/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Medion_RF/lircd-medion-rf.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Medion_RF/lircrc-medion-rf.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Medion_RF/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Medion_X10_8080/lircd-medionx10-8080.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Medion_X10_8080/lircrc-medionx10-8080.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Medion_X10_8080/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Medion_X10_8802/lircd-medionx10-8802.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Medion_X10_8802/lircrc-medionx10-8802.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Medion_X10_8802/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/MythVantage-one/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/MythVantage-one/lircrc delete mode 100644 abs/core-testing/system-templates/templates/remotes/MythVantage-one/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Nebula/lircd-nebula.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Nebula/lircrc-nebula.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Nebula/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Nexus/lircd-nexus.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Nexus/lircrc-nexus.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Nexus/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Nova_500/lircd-nova500.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Nova_500/lircrc-nova500.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Nova_500/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Nova_T/lircd-novat.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Nova_T/lircrc-novat.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Nova_T/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Nova_T_USB2/lircd-novatusb2.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Nova_T_USB2/lircrc-novatusb2.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Nova_T_USB2/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Nvidia/lircd-nvidia.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Nvidia/lircrc-nvidia.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Nvidia/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Nvidia_X10/lircd-nvidiax10.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Nvidia_X10/lircrc-nvidiax10.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Nvidia_X10/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/One4All/lircd-one4all.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/One4All/lircrc-one4all.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/One4All/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/One4All_6131/lircd-one4all6131.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/One4All_6131/lircrc-one4all6131.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/One4All_6131/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/One4All_7544/lircd-one4all7544.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/One4All_7544/lircrc-one4all7544.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/One4All_7544/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/One4All_9910/lircd-one4all9910.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/One4All_9910/lircrc-one4all9910.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/One4All_9910/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Packard_bell/lircd-packard.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Packard_bell/lircrc-packard.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Packard_bell/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Pinnacle/lircd-pinnacle.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Pinnacle/lircrc-pinnacle.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Pinnacle/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Provideo/lircd-provideo.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Provideo/lircrc-provideo.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Provideo/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/RadioShack_15-2116-Jarod_Wilson/lircd-rs.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/RadioShack_15-2116-Jarod_Wilson/lircrc-rs delete mode 100644 abs/core-testing/system-templates/templates/remotes/RadioShack_15-2116-Jarod_Wilson/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Sasem/lircd-sasem.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Sasem/lircrc-sasem.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Sasem/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Technisat/lircd-technisat.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Technisat/lircrc-technisat.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Technisat/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Tekram/lircd-tekram.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Tekram/lircrc-tekram.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Tekram/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/Twinham/lircd-twinhan.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/Twinham/lircrc-twinhan.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/Twinham/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/X10_Lola/lircd-x10lola.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/X10_Lola/lircrc-x10lola.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/X10_Lola/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/atiusb/lircd.conf.atiusb delete mode 100644 abs/core-testing/system-templates/templates/remotes/avermedia/lircd.conf.avermedia delete mode 100644 abs/core-testing/system-templates/templates/remotes/avermedia/lircd.conf.avermedia98 delete mode 100644 abs/core-testing/system-templates/templates/remotes/avermedia/lircd.conf.vdomate delete mode 100644 abs/core-testing/system-templates/templates/remotes/avermedia/lircmd.conf.avermedia delete mode 100644 abs/core-testing/system-templates/templates/remotes/avermedia/lircmd.conf.avermedia98 delete mode 100644 abs/core-testing/system-templates/templates/remotes/avermedia/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/bestbuy/lircd.conf.bestbuy delete mode 100644 abs/core-testing/system-templates/templates/remotes/bestbuy/lircd.conf.bestbuy2 delete mode 100644 abs/core-testing/system-templates/templates/remotes/bestbuy/lircmd.conf.bestbuy delete mode 100644 abs/core-testing/system-templates/templates/remotes/bestbuy/lircmd.conf.bestbuy2 delete mode 100644 abs/core-testing/system-templates/templates/remotes/bestbuy/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/caraca/lircd.conf.caraca delete mode 100644 abs/core-testing/system-templates/templates/remotes/caraca/lircrc.caraca delete mode 100644 abs/core-testing/system-templates/templates/remotes/caraca/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/dvico/lircd.conf.fusionHDTV delete mode 100644 abs/core-testing/system-templates/templates/remotes/dvico/lircrc.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/dvico/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/generic/DENON.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/generic/MOTOROLA.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/generic/NEC-pulse.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/generic/NEC-short-pulse.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/generic/NEC.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/generic/RC-5.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/generic/RC-6.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/generic/RCMM-32.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/generic/RECS80.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/generic/SANYO.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/generic/SONY12.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/generic/SONY20.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/gr8zap/lircd.conf.streamzap delete mode 100644 abs/core-testing/system-templates/templates/remotes/gr8zap/lircrc delete mode 100644 abs/core-testing/system-templates/templates/remotes/gr8zap/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/hauppauge-black/lircd-haupblack.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/hauppauge-black/lircrc-haupblack.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/hauppauge-black/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/hauppauge-blaster/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/hauppauge-blaster/lircrc-haupgrey-g3.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/hauppauge-blaster/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/hauppauge-grey-alt/lircd-haupgrey-alt.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/hauppauge-grey-alt/lircrc-haupgrey-alt delete mode 100644 abs/core-testing/system-templates/templates/remotes/hauppauge-grey-alt/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/hauppauge-grey/lircd-haupgrey.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/hauppauge-grey/lircrc-haupgrey.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/hauppauge-grey/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/hauppauge-silver/lircd-haupgrey-g3.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/hauppauge-silver/lircrc-haupgrey-g3.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/hauppauge-silver/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/i2c.id delete mode 100644 abs/core-testing/system-templates/templates/remotes/imon-pad/lircd.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/imon-pad/lircrc delete mode 100644 abs/core-testing/system-templates/templates/remotes/imon-pad/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/imon/lircd.conf.imon delete mode 100644 abs/core-testing/system-templates/templates/remotes/imon/lircd.conf.imon-pad delete mode 100644 abs/core-testing/system-templates/templates/remotes/imon/lircd.conf.imon-rsc delete mode 100644 abs/core-testing/system-templates/templates/remotes/imon/lircrc delete mode 100644 abs/core-testing/system-templates/templates/remotes/imon/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/mceusb/lircd.conf.mceusb delete mode 100644 abs/core-testing/system-templates/templates/remotes/mceusb/lircrc-mceusb delete mode 100644 abs/core-testing/system-templates/templates/remotes/mceusb/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/no_remote/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/receiver_usb.id delete mode 100644 abs/core-testing/system-templates/templates/remotes/sigma_designs/lircd.conf.realmagic delete mode 100644 abs/core-testing/system-templates/templates/remotes/snapstream_firefly/lircd.snapstrm.conf delete mode 100644 abs/core-testing/system-templates/templates/remotes/snapstream_firefly/lircrc-snapstrm.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/snapstream_firefly/preview.jpg delete mode 100755 abs/core-testing/system-templates/templates/remotes/snapstream_mini/lircd-snapstreammini.conf delete mode 100755 abs/core-testing/system-templates/templates/remotes/snapstream_mini/lircrc-snapstreammini.txt delete mode 100644 abs/core-testing/system-templates/templates/remotes/snapstream_mini/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/streamzap/lircd.conf.streamzap delete mode 100755 abs/core-testing/system-templates/templates/remotes/streamzap/lircrc delete mode 100644 abs/core-testing/system-templates/templates/remotes/streamzap/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/technisat/lircd.conf.mediafocusI delete mode 100644 abs/core-testing/system-templates/templates/remotes/unknown/preview.jpg delete mode 100644 abs/core-testing/system-templates/templates/remotes/x10/lircd.conf.mouseremote delete mode 100644 abs/core-testing/system-templates/templates/remotes/x10/lircd.conf.mp3anywhere delete mode 100644 abs/core-testing/system-templates/templates/remotes/x10/lircmd.conf.mouseremote delete mode 100644 abs/core-testing/system-templates/templates/samba/smb.conf.template delete mode 100644 abs/core-testing/system-templates/templates/settings/default_1/jumppoints.txt delete mode 100644 abs/core-testing/system-templates/templates/settings/default_1/keybindings.txt delete mode 100644 abs/core-testing/system-templates/templates/settings/default_1/settings.txt delete mode 100644 abs/core-testing/system-templates/templates/settings/default_2/jumppoints.txt delete mode 100644 abs/core-testing/system-templates/templates/settings/default_2/keybindings.txt delete mode 100644 abs/core-testing/system-templates/templates/settings/default_2/settings.txt delete mode 100644 abs/core-testing/system-templates/templates/sources/mv-core delete mode 100644 abs/core-testing/system-templates/templates/sources/mv-core-testing delete mode 100644 abs/core-testing/system-templates/templates/sources/mv-extra delete mode 100644 abs/core-testing/system-templates/templates/sources/mv-extra-testing delete mode 100644 abs/core-testing/system-templates/templates/sources/svc_pkg delete mode 100755 abs/core-testing/system-templates/templates/transmit/Time_Warner_SA3250/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/amino_STB/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/coolsat_4000/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/coolsat_5000/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/digitalstream_9900/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/dish301_311/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/dish501_508/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/dish_dvr625/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/dish_network/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/echostar_2700/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/echostar_4700/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/echostar_4900/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/echostar_5000/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/expressvu3100/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/expressvu5xxx/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/fortec_lifetime/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/general_550/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/hughes_hbh/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/humax_5400/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/illusion_m3/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/motorola_dct2000/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/motorola_dct22xx/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/motorola_dct2524/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/motorola_dct6200/lircd.conf delete mode 100644 abs/core-testing/system-templates/templates/transmit/motorola_dct700/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/motorola_dsr205/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/motorola_dsr305/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/motorola_dsr315/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/motorola_dsr922/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/motorola_dth335/lircd.conf delete mode 100644 abs/core-testing/system-templates/templates/transmit/motorola_qip7100/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/motorola_rg2xxx/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/motorola_vip12xx/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/nokia_8003/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/nokia_9600/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/nokia_9780/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/nokia_9802/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/nokia_dbox2/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/pace_4001/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/pace_420/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/pace_dsr2000/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/pace_dsr600/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/pace_mss200/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/pace_mss300/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/pace_psr800/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/pace_psr900/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/pace_xsat_cdtv410/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/pansat_2700a/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/pioneer_bdv300/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/pvr150/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/rca_drd4xxrg_series/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/rca_drd4xxrh_series/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/samsung_1000/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/samsung_300/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/samsung_702/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/sciatl_4200/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/sciatl_exp1840/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/sciatl_exp2000/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/sciatl_exp2xxx_3xxx_4xxx/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/sciatl_exp8000/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/skymaster_9410/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/skyplus/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/technisat_st3002s/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/technisat_st3004s/lircd.conf delete mode 100755 abs/core-testing/system-templates/templates/transmit/zenith_dtt900/lircd.conf delete mode 100644 abs/core-testing/system-templates/templates/xine.config.template delete mode 100644 abs/core-testing/system-templates/templates/xorg/96xx_supported.txt delete mode 100644 abs/core-testing/system-templates/templates/xorg/modeline.ATSC delete mode 100644 abs/core-testing/system-templates/templates/xorg/modeline.DVD delete mode 100644 abs/core-testing/system-templates/templates/xorg/modeline.NTSC delete mode 100644 abs/core-testing/system-templates/templates/xorg/modeline.VESA delete mode 100644 abs/core-testing/system-templates/templates/xorg/modeline.custom delete mode 100644 abs/core-testing/system-templates/templates/xorg/xorg.conf.ati delete mode 100644 abs/core-testing/system-templates/templates/xorg/xorg.conf.intel delete mode 100755 abs/core-testing/system-templates/templates/xorg/xorg.conf.nvidia delete mode 100755 abs/core-testing/system-templates/templates/xorg/xorg.conf.vesa delete mode 100644 abs/core-testing/system-templates/templates/xorg/xorg.conf.via delete mode 100755 abs/core-testing/system-templates/templates/xorg/xorg.conf.vmware delete mode 100644 abs/core-testing/system-templates/templates/xscreensaver.template delete mode 100644 abs/core-testing/system-templates/templates/xscreensavers delete mode 100644 abs/core-testing/sysvinit/PKGBUILD delete mode 100644 abs/core-testing/sysvinit/halt-init.patch delete mode 100644 abs/core-testing/taglib/PKGBUILD delete mode 100644 abs/core-testing/talloc/PKGBUILD delete mode 100644 abs/core-testing/tar/PKGBUILD delete mode 100644 abs/core-testing/tar/tar.1 delete mode 100644 abs/core-testing/tcl/ChangeLog delete mode 100644 abs/core-testing/tcl/PKGBUILD delete mode 100644 abs/core-testing/tcp_wrappers/PKGBUILD delete mode 100644 abs/core-testing/tcp_wrappers/gcc340.patch delete mode 100644 abs/core-testing/tcp_wrappers/hosts.allow delete mode 100644 abs/core-testing/tcp_wrappers/hosts.deny delete mode 100644 abs/core-testing/tcp_wrappers/safe_finger.8 delete mode 100644 abs/core-testing/tcp_wrappers/shared_lib_plus_plus-1.patch delete mode 100644 abs/core-testing/tcp_wrappers/try-from.8 delete mode 100644 abs/core-testing/tdb/PKGBUILD delete mode 100644 abs/core-testing/tdb/gcc3.patch delete mode 100644 abs/core-testing/test-pattern/PKGBUILD delete mode 100755 abs/core-testing/test-pattern/test_pattern.bash delete mode 100644 abs/core-testing/texinfo/ChangeLog delete mode 100644 abs/core-testing/texinfo/PKGBUILD delete mode 100644 abs/core-testing/texinfo/texinfo.install delete mode 100644 abs/core-testing/tftp-hpa/LICENSE delete mode 100644 abs/core-testing/tftp-hpa/PKGBUILD delete mode 100644 abs/core-testing/tftp-hpa/tftpd.conf delete mode 100755 abs/core-testing/tftp-hpa/tftpd.rc delete mode 100644 abs/core-testing/tiacx-firmware/PKGBUILD delete mode 100644 abs/core-testing/tiacx-firmware/tiacx-firmware.install delete mode 100644 abs/core-testing/tiacx/PKGBUILD delete mode 100644 abs/core-testing/tiacx/acx.install delete mode 100644 abs/core-testing/tiacx/kernel-2.6.27.patch delete mode 100644 abs/core-testing/tiacx/kernel-2.6.30.patch delete mode 100644 abs/core-testing/tiacx/kernel-2.6.31.patch delete mode 100644 abs/core-testing/tiacx/kernel-2.6.33.patch delete mode 100644 abs/core-testing/tk/ChangeLog delete mode 100644 abs/core-testing/tk/PKGBUILD delete mode 100644 abs/core-testing/transcode/PKGBUILD delete mode 100644 abs/core-testing/transcode/transcode.install delete mode 100644 abs/core-testing/trapproto/PKGBUILD delete mode 100644 abs/core-testing/ttf-bitstream-vera/PKGBUILD delete mode 100644 abs/core-testing/ttf-bitstream-vera/vera.install delete mode 100644 abs/core-testing/ttf-dejavu/ChangeLog delete mode 100644 abs/core-testing/ttf-dejavu/PKGBUILD delete mode 100644 abs/core-testing/ttf-dejavu/ttf-dejavu.install delete mode 100644 abs/core-testing/tweaker/PKGBUILD delete mode 100755 abs/core-testing/tweaker/bin/LocalIPCheck.pl delete mode 100755 abs/core-testing/tweaker/bin/SQLtweaker.sh delete mode 100755 abs/core-testing/tweaker/bin/create-linhes-sql.sh delete mode 100755 abs/core-testing/tweaker/bin/tweaker.pl delete mode 100755 abs/core-testing/tweaker/bin/twk_EXAMPLE.pl delete mode 100755 abs/core-testing/tweaker/bin/twk_RAM.pl delete mode 100755 abs/core-testing/tweaker/bin/twk_audio.pl delete mode 100755 abs/core-testing/tweaker/bin/twk_cpu.pl delete mode 100755 abs/core-testing/tweaker/bin/twk_dragon.pl delete mode 100755 abs/core-testing/tweaker/bin/twk_fingerprint_hardware.sh delete mode 100755 abs/core-testing/tweaker/bin/twk_general.pl delete mode 100755 abs/core-testing/tweaker/bin/twk_general.pl.orig delete mode 100755 abs/core-testing/tweaker/bin/twk_graphics.pl delete mode 100755 abs/core-testing/tweaker/bin/twk_keymap.sh delete mode 100755 abs/core-testing/tweaker/bin/twk_localization.pl delete mode 100755 abs/core-testing/tweaker/bin/twk_misc.pl delete mode 100755 abs/core-testing/tweaker/bin/twk_scrub_sql.pl delete mode 100755 abs/core-testing/tweaker/bin/twk_tuners.pl delete mode 100644 abs/core-testing/tweaker/bin/twk_tuners_notes.txt delete mode 100755 abs/core-testing/tweaker/bin/twk_upgrade.pl delete mode 100755 abs/core-testing/tweaker/bin/twk_what_has_changed.sh delete mode 100644 abs/core-testing/tweaker/fs/etc/asound.conf delete mode 100644 abs/core-testing/tweaker/fs/home/mythtv/.config/smplayer/smplayer.ini delete mode 100644 abs/core-testing/tweaker/fs/var/lib/alsa/ALC888.asound.state delete mode 100644 abs/core-testing/tweaker/fs/var/lib/alsa/AV710.asound.state delete mode 100644 abs/core-testing/tweaker/lib/Tweaker/Definitions.pm delete mode 100644 abs/core-testing/tweaker/lib/Tweaker/Script.pm delete mode 100644 abs/core-testing/tweaker/log4perl.conf delete mode 100644 abs/core-testing/tweaker/tcf/EXAMPLE.tcf delete mode 100644 abs/core-testing/tweaker/tcf/focus.tcf delete mode 100644 abs/core-testing/tweaker/tcf/os.tcf delete mode 100644 abs/core-testing/tweaker/tcf/tcf.dtd delete mode 100644 abs/core-testing/tweaker/tcf/tweaker-core.tcf delete mode 100644 abs/core-testing/tweaker/tcf/userland.tcf delete mode 100644 abs/core-testing/tweaker/tweaker.install delete mode 100644 abs/core-testing/tweaker/tweaker.sh delete mode 100644 abs/core-testing/tzdata/Makefile.patch delete mode 100644 abs/core-testing/tzdata/PKGBUILD delete mode 100644 abs/core-testing/tzdata/chile.patch delete mode 100644 abs/core-testing/udev/81-arch.rules delete mode 100644 abs/core-testing/udev/PKGBUILD delete mode 100644 abs/core-testing/udev/arch-udev-rules.patch delete mode 100755 abs/core-testing/udev/cdsymlinks.sh delete mode 100755 abs/core-testing/udev/load-modules.sh delete mode 100644 abs/core-testing/udev/logitech-rules.patch delete mode 100755 abs/core-testing/udev/root-link.sh delete mode 100644 abs/core-testing/udev/udev.install delete mode 100755 abs/core-testing/unclutter/PKGBUILD delete mode 100644 abs/core-testing/unclutter/unclutter.cfg delete mode 100644 abs/core-testing/unzip/PKGBUILD delete mode 100644 abs/core-testing/urlgrabber/PKGBUILD delete mode 100644 abs/core-testing/usbutils/PKGBUILD delete mode 100644 abs/core-testing/util-linux-ng/PKGBUILD delete mode 100644 abs/core-testing/util-linux-ng/fix-findmnt.patch delete mode 100644 abs/core-testing/util-linux-ng/util-linux-ng-cfdisk.patch delete mode 100644 abs/core-testing/util-linux-ng/util-linux-ng-nilfs2.patch delete mode 100644 abs/core-testing/util-linux-ng/util-linux-ng.install delete mode 100644 abs/core-testing/v4l-dvb/PKGBUILD delete mode 100644 abs/core-testing/v4l-dvb/hdpvr.diff delete mode 100644 abs/core-testing/v4l-dvb/v4l-dvb.install delete mode 100644 abs/core-testing/vbetool/PKGBUILD delete mode 100644 abs/core-testing/vdpauinfo-legacy/PKGBUILD delete mode 100755 abs/core-testing/vdpauinfo-legacy/vdpauinfo delete mode 100644 abs/core-testing/vdpauinfo/PKGBUILD delete mode 100644 abs/core-testing/vdpauinfo/__changelog delete mode 100644 abs/core-testing/vi/PKGBUILD delete mode 100644 abs/core-testing/vi/__changelog delete mode 100644 abs/core-testing/vi/fetch_patches.sh delete mode 100644 abs/core-testing/vi/fetch_runtime.sh delete mode 100644 abs/core-testing/vi/vi.install delete mode 100644 abs/core-testing/videoproto/PKGBUILD delete mode 100644 abs/core-testing/wget/PKGBUILD delete mode 120000 abs/core-testing/wget/wget-1.12-2-i686.pkg.tar.gz delete mode 100644 abs/core-testing/wget/wget.install delete mode 100644 abs/core-testing/which/PKGBUILD delete mode 100644 abs/core-testing/which/which.install delete mode 100644 abs/core-testing/wireless_tools/PKGBUILD delete mode 100644 abs/core-testing/wireless_tools/wireless.conf.d delete mode 100644 abs/core-testing/wpa_supplicant/PKGBUILD delete mode 100644 abs/core-testing/wpa_supplicant/config delete mode 100644 abs/core-testing/x264/PKGBUILD delete mode 100644 abs/core-testing/xbitmaps/PKGBUILD delete mode 100644 abs/core-testing/xcb-proto/PKGBUILD delete mode 100644 abs/core-testing/xcb-util/LICENSE delete mode 100644 abs/core-testing/xcb-util/PKGBUILD delete mode 100644 abs/core-testing/xcmiscproto/PKGBUILD delete mode 100644 abs/core-testing/xcursor-themes/LICENSE delete mode 100644 abs/core-testing/xcursor-themes/PKGBUILD delete mode 100644 abs/core-testing/xdotool/PKGBUILD delete mode 100644 abs/core-testing/xextproto/PKGBUILD delete mode 100644 abs/core-testing/xf86-input-acecad/PKGBUILD delete mode 100644 abs/core-testing/xf86-input-aiptek/PKGBUILD delete mode 100644 abs/core-testing/xf86-input-elographics/PKGBUILD delete mode 100644 abs/core-testing/xf86-input-evdev/PKGBUILD delete mode 100644 abs/core-testing/xf86-input-fpit/PKGBUILD delete mode 100644 abs/core-testing/xf86-input-hyperpen/PKGBUILD delete mode 100644 abs/core-testing/xf86-input-joystick/PKGBUILD delete mode 100644 abs/core-testing/xf86-input-keyboard/PKGBUILD delete mode 100644 abs/core-testing/xf86-input-keyboard/new-server.patch delete mode 100644 abs/core-testing/xf86-input-mouse/PKGBUILD delete mode 100644 abs/core-testing/xf86-input-mutouch/PKGBUILD delete mode 100644 abs/core-testing/xf86-input-penmount/PKGBUILD delete mode 100644 abs/core-testing/xf86-input-synaptics/PKGBUILD delete mode 100644 abs/core-testing/xf86-input-vmmouse/PKGBUILD delete mode 100644 abs/core-testing/xf86-input-void/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-amd/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-apm/LICENSE delete mode 100644 abs/core-testing/xf86-video-apm/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-ark/LICENSE delete mode 100644 abs/core-testing/xf86-video-ark/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-ati/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-ati/git-20081021.patch delete mode 100644 abs/core-testing/xf86-video-ati/mesa-7.1-link-shared.patch delete mode 100644 abs/core-testing/xf86-video-chips/LICENSE delete mode 100644 abs/core-testing/xf86-video-chips/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-cirrus/LICENSE delete mode 100644 abs/core-testing/xf86-video-cirrus/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-dummy/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-fbdev/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-geode/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-glint/LICENSE delete mode 100644 abs/core-testing/xf86-video-glint/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-i128/LICENSE delete mode 100644 abs/core-testing/xf86-video-i128/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-i740/LICENSE delete mode 100644 abs/core-testing/xf86-video-i740/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-imstt/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-intel/20_thinkpad_g40_quirk.patch delete mode 100644 abs/core-testing/xf86-video-intel/21_quirk_lenovo.patch delete mode 100644 abs/core-testing/xf86-video-intel/23_quirks_studiohybrid_eeepc_and_w251u.patch delete mode 100644 abs/core-testing/xf86-video-intel/25_quirk_nc6110.patch delete mode 100644 abs/core-testing/xf86-video-intel/26_i830-use-lfp-data-ptrs.patch delete mode 100644 abs/core-testing/xf86-video-intel/27_disable_fbc_on_965.patch delete mode 100644 abs/core-testing/xf86-video-intel/LICENSE delete mode 100644 abs/core-testing/xf86-video-intel/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-intel/intel-2.11-no-pageflipping.patch delete mode 100644 abs/core-testing/xf86-video-ivtvfb/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-ivtvfb/xf86-video-ivtv-pagesize.patch delete mode 100644 abs/core-testing/xf86-video-mach64/LICENSE delete mode 100644 abs/core-testing/xf86-video-mach64/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-mach64/mesa-7.1-link-shared.patch delete mode 100644 abs/core-testing/xf86-video-mga/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-mga/mesa-7.1-link-shared.patch delete mode 100644 abs/core-testing/xf86-video-neomagic/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-nouveau/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-nouveau/xf86-video-nouveau.install delete mode 100644 abs/core-testing/xf86-video-nv/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-openchrome/LICENSE.txt delete mode 100644 abs/core-testing/xf86-video-openchrome/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-openchrome/drm_stdint.patch delete mode 100644 abs/core-testing/xf86-video-openchrome/svn-r839.patch delete mode 100644 abs/core-testing/xf86-video-r128/LICENSE delete mode 100644 abs/core-testing/xf86-video-r128/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-r128/mesa-7.1-link-shared.patch delete mode 100644 abs/core-testing/xf86-video-radeonhd/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-rendition/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-s3/LICENSE delete mode 100644 abs/core-testing/xf86-video-s3/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-s3virge/LICENSE delete mode 100644 abs/core-testing/xf86-video-s3virge/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-savage/LICENSE delete mode 100644 abs/core-testing/xf86-video-savage/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-savage/mesa-7.1-link-shared.patch delete mode 100644 abs/core-testing/xf86-video-siliconmotion/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-sis/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-sis/mesa-7.1-link-shared.patch delete mode 100644 abs/core-testing/xf86-video-sisusb/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-tdfx/LICENSE delete mode 100644 abs/core-testing/xf86-video-tdfx/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-tdfx/mesa-7.1-link-shared.patch delete mode 100644 abs/core-testing/xf86-video-trident/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-trident/mesa-7.1-link-shared.patch delete mode 100644 abs/core-testing/xf86-video-tseng/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-unichrome/LICENSE delete mode 100644 abs/core-testing/xf86-video-unichrome/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-unichrome/drm-include.patch delete mode 100644 abs/core-testing/xf86-video-unichrome/fix-defines.patch delete mode 100644 abs/core-testing/xf86-video-v4l/LICENSE delete mode 100644 abs/core-testing/xf86-video-v4l/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-vesa/COPYING delete mode 100644 abs/core-testing/xf86-video-vesa/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-vmware/LICENSE delete mode 100644 abs/core-testing/xf86-video-vmware/PKGBUILD delete mode 100644 abs/core-testing/xf86-video-vmware/abi2.patch delete mode 100644 abs/core-testing/xf86-video-voodoo/PKGBUILD delete mode 100644 abs/core-testing/xf86bigfontproto/PKGBUILD delete mode 100644 abs/core-testing/xf86dgaproto/PKGBUILD delete mode 100644 abs/core-testing/xf86driproto/LICENSE delete mode 100644 abs/core-testing/xf86driproto/PKGBUILD delete mode 100644 abs/core-testing/xf86miscproto/PKGBUILD delete mode 100644 abs/core-testing/xf86vidmodeproto/PKGBUILD delete mode 100644 abs/core-testing/xfsprogs/PKGBUILD delete mode 100644 abs/core-testing/xineramaproto/PKGBUILD delete mode 100644 abs/core-testing/xkeyboard-config/PKGBUILD delete mode 100644 abs/core-testing/xkeyboard-config/fix-abnt2.patch delete mode 100644 abs/core-testing/xmlrpc-c/PKGBUILD delete mode 100755 abs/core-testing/xmltv/PKGBUILD delete mode 100644 abs/core-testing/xorg-apps/LICENSE delete mode 100644 abs/core-testing/xorg-apps/PKGBUILD delete mode 100644 abs/core-testing/xorg-font-utils/PKGBUILD delete mode 100644 abs/core-testing/xorg-font-utils/ttmkfdir.patch delete mode 100644 abs/core-testing/xorg-font-utils/ttmkfdir_gcc43.patch delete mode 100644 abs/core-testing/xorg-font-utils/xorg-font-utils.install delete mode 100644 abs/core-testing/xorg-fonts-100dpi/PKGBUILD delete mode 100644 abs/core-testing/xorg-fonts-100dpi/xfonts.install delete mode 100644 abs/core-testing/xorg-fonts-75dpi/PKGBUILD delete mode 100644 abs/core-testing/xorg-fonts-75dpi/xfonts.install delete mode 100644 abs/core-testing/xorg-fonts-alias/PKGBUILD delete mode 100644 abs/core-testing/xorg-fonts-encodings/PKGBUILD delete mode 100644 abs/core-testing/xorg-fonts-encodings/xorg-fonts-encodings.install delete mode 100644 abs/core-testing/xorg-fonts-misc/PKGBUILD delete mode 100644 abs/core-testing/xorg-fonts-misc/xfonts.install delete mode 100644 abs/core-testing/xorg-res-utils/PKGBUILD delete mode 100644 abs/core-testing/xorg-server-utils/LICENSE.iceauth delete mode 100644 abs/core-testing/xorg-server-utils/LICENSE.xcmsdb delete mode 100644 abs/core-testing/xorg-server-utils/PKGBUILD delete mode 100644 abs/core-testing/xorg-server/001_fedora_extramodes.patch delete mode 100644 abs/core-testing/xorg-server/10-evdev.conf delete mode 100644 abs/core-testing/xorg-server/10-quirks.conf delete mode 100644 abs/core-testing/xorg-server/PKGBUILD delete mode 100644 abs/core-testing/xorg-server/__changelog delete mode 100644 abs/core-testing/xorg-server/xorg-redhat-die-ugly-pattern-die-die-die.patch delete mode 100644 abs/core-testing/xorg-server/xorg-server.install delete mode 100644 abs/core-testing/xorg-server/xserver-1.5-branch-4970d.patch delete mode 100644 abs/core-testing/xorg-server/xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch delete mode 100644 abs/core-testing/xorg-server/xserver-1.5.3-AEI-on-by-default.patch delete mode 100644 abs/core-testing/xorg-server/xserver-1.7.1-gamma-kdm-fix.patch delete mode 100644 abs/core-testing/xorg-server/xserver-1.7.1-libcrypto.patch delete mode 100644 abs/core-testing/xorg-server/xvfb-run delete mode 100644 abs/core-testing/xorg-server/xvfb-run.1 delete mode 100644 abs/core-testing/xorg-util-macros/PKGBUILD delete mode 100644 abs/core-testing/xorg-utils/LICENSE.xdpyinfo delete mode 100644 abs/core-testing/xorg-utils/LICENSE.xfd delete mode 100644 abs/core-testing/xorg-utils/LICENSE.xlsfonts delete mode 100644 abs/core-testing/xorg-utils/LICENSE.xprop delete mode 100644 abs/core-testing/xorg-utils/PKGBUILD delete mode 100644 abs/core-testing/xorg-xauth/PKGBUILD delete mode 100644 abs/core-testing/xorg-xinit/PKGBUILD delete mode 100644 abs/core-testing/xorg-xinit/xinitrc delete mode 100644 abs/core-testing/xorg-xinit/xserverrc delete mode 100644 abs/core-testing/xorg-xinit/xsession delete mode 100644 abs/core-testing/xorg-xkb-utils/PKGBUILD delete mode 100644 abs/core-testing/xosd/PKGBUILD delete mode 100644 abs/core-testing/xosd/__changelog delete mode 100644 abs/core-testing/xosd/osd_cat.cfg delete mode 100644 abs/core-testing/xproto/PKGBUILD delete mode 100644 abs/core-testing/xterm/LICENSE delete mode 100644 abs/core-testing/xterm/PKGBUILD delete mode 100644 abs/core-testing/xtrans/PKGBUILD delete mode 100644 abs/core-testing/xvidcore/PKGBUILD delete mode 100644 abs/core-testing/xz/PKGBUILD delete mode 120000 abs/core-testing/xz/xz-4.999.9beta-5-i686.pkg.tar.gz delete mode 100644 abs/core-testing/yasm/PKGBUILD delete mode 100644 abs/core-testing/zd1211-firmware/PKGBUILD delete mode 100644 abs/core-testing/zlib/PKGBUILD delete mode 100644 abs/core-testing/zlib/zlib-1.2.5-lfs-decls.patch delete mode 100644 abs/core-testing/zoneminder/Makefile.patch delete mode 100644 abs/core-testing/zoneminder/PKGBUILD delete mode 100755 abs/core-testing/zoneminder/customdb delete mode 100644 abs/core-testing/zoneminder/mootools.v1.11.js delete mode 100755 abs/core-testing/zoneminder/run delete mode 100644 abs/core-testing/zoneminder/zm.conf.patch delete mode 100644 abs/core-testing/zoneminder/zm.rc.d delete mode 100755 abs/core-testing/zoneminder/zmeventdump delete mode 100644 abs/core-testing/zoneminder/zminit.arch delete mode 100644 abs/core-testing/zoneminder/zmupdate.patch delete mode 100644 abs/core-testing/zoneminder/zoneminder.install delete mode 100644 abs/core/alsa-lib/python2.5.patch delete mode 100644 abs/core/alsa-lib/revert-patch-to-fix-converting-32bit-audio-to-16bit.patch create mode 100644 abs/core/apache/apache.conf.d create mode 100644 abs/core/apache/apachectl-confd.patch delete mode 100644 abs/core/apache/httpd.install delete mode 100644 abs/core/ati-dri/PKGBUILD delete mode 100644 abs/core/ati-dri/mesa-7.1-link-shared.patch delete mode 100644 abs/core/aufs-utils/PKGBUILD delete mode 100644 abs/core/aufs/PKGBUILD delete mode 100644 abs/core/aufs/aufs.install create mode 100644 abs/core/aufs2-util/PKGBUILD create mode 100755 abs/core/aufs2-util/create-tarball.sh create mode 100644 abs/core/aufs2/PKGBUILD create mode 100644 abs/core/aufs2/aufs2.install create mode 100755 abs/core/aufs2/create-tarball.sh create mode 100644 abs/core/avahi/avahi-daemon-dbus.patch delete mode 100644 abs/core/bash/bash-noinfo.patch create mode 100644 abs/core/bash/enable-system-config-files.patch delete mode 100644 abs/core/bash/profile create mode 100644 abs/core/bash/system.bashrc create mode 100644 abs/core/bc/bc-1.06-info-dir-entry.patch create mode 100644 abs/core/bc/bc.install create mode 100644 abs/core/cloog-ppl/PKGBUILD delete mode 100644 abs/core/coreutils/__changelog delete mode 100644 abs/core/coreutils/coreutils-6.10-configuration.patch delete mode 100644 abs/core/coreutils/coreutils-7.1-cp-recursiveinfloop.patch delete mode 100644 abs/core/coreutils/coreutils-7.1-sort-endoffields.patch create mode 120000 abs/core/coreutils/coreutils-8.5-2-i686.pkg.tar.gz delete mode 100644 abs/core/coreutils/coreutils-i18n.patch delete mode 100644 abs/core/coreutils/futimes.patch delete mode 100644 abs/core/coreutils/su create mode 100644 abs/core/coreutils/su.pam create mode 100644 abs/core/cups/PKGBUILD create mode 100755 abs/core/cups/cups create mode 100644 abs/core/cups/cups-avahi.patch create mode 100644 abs/core/cups/cups.install create mode 100644 abs/core/cups/cups.logrotate create mode 100644 abs/core/cups/cups.pam create mode 100644 abs/core/curl/m4-typo.patch create mode 100644 abs/core/device-mapper/ChangeLog delete mode 100644 abs/core/device-mapper/device-mapper.rules create mode 100644 abs/core/device-mapper/lvm2_hook create mode 100644 abs/core/device-mapper/lvm2_install create mode 100644 abs/core/docutils/PKGBUILD create mode 100644 abs/core/e2fsprogs/MIT-LICENSE create mode 100644 abs/core/eggdbus/PKGBUILD create mode 100644 abs/core/elfutils/PKGBUILD create mode 100644 abs/core/expat/CVE-2009-3560.patch create mode 100644 abs/core/expat/CVE-2009-3720.patch delete mode 100644 abs/core/fbsplash/__changelog delete mode 100644 abs/core/fbsplash/darch.tar.bz2 delete mode 100644 abs/core/fbsplash/extra/encrypt_hook.patch create mode 100644 abs/core/fbsplash/fbcondecor.conf create mode 100644 abs/core/fbsplash/fbcondecor.daemon create mode 100644 abs/core/fbsplash/fbsplash-basic.sh delete mode 100644 abs/core/fbsplash/fbsplash.bootsteps delete mode 100644 abs/core/fbsplash/fbsplash.conf delete mode 100644 abs/core/fbsplash/fbsplash.daemon create mode 100644 abs/core/fbsplash/fbsplash.git.patch create mode 100644 abs/core/fbsplash/fbsplash.initcpio_hook delete mode 100644 abs/core/fbsplash/fbsplash.inithooks delete mode 100644 abs/core/fbsplash/splash-functions-arch.sh delete mode 100644 abs/core/fbsplash/splash-functions.sh create mode 100644 abs/core/fbsplash/splash.conf create mode 100644 abs/core/filesystem/__CHANGELOG delete mode 100644 abs/core/filesystem/__changelog delete mode 100644 abs/core/filesystem/protocols delete mode 100644 abs/core/filesystem/services create mode 100644 abs/core/fontconfig/30-urw-aliases.patch delete mode 100644 abs/core/gcc-libs/PKGBUILD delete mode 100644 abs/core/gcc-libs/buildfix_new_bison.patch delete mode 100644 abs/core/gcc-libs/gcc-hash-style-both.patch delete mode 100644 abs/core/gcc-libs/gcc_pure64.patch delete mode 100644 abs/core/gcc/buildfix_new_bison.patch create mode 100644 abs/core/gcc/gcc-ada.install create mode 100644 abs/core/gcc/gcc-fortran.install delete mode 100644 abs/core/gcc/gcc-java-driver.patch create mode 100644 abs/core/gcc/gcc-libs.install create mode 100644 abs/core/ghostscript/ghostscript-pdf2dsc.patch create mode 100644 abs/core/ghostscript/ghostscript-system-jasper.patch delete mode 100644 abs/core/ghostscript/ghostscript.install create mode 100644 abs/core/ghostscript/libpng14.patch create mode 100644 abs/core/ghostscript/svn_r10890.patch create mode 100644 abs/core/git/git-daemon create mode 100644 abs/core/git/git-daemon.conf delete mode 100644 abs/core/glibc/ChangeLog delete mode 100644 abs/core/glibc/fix-makecontext.patch create mode 100644 abs/core/glibc/glibc-2.10-bz4781.patch create mode 100644 abs/core/glibc/glibc-2.10-dont-build-timezone.patch create mode 100644 abs/core/glibc/glibc-__i686.patch delete mode 100644 abs/core/glibc/locale.gen create mode 100644 abs/core/gobject-introspection/PKGBUILD create mode 100644 abs/core/gpm/gpm.install create mode 100755 abs/core/gpm/gpm.sh create mode 100644 abs/core/grub-gfx.tar.gz create mode 100644 abs/core/grub-gfx/040_all_grub-0.96-nxstack.patch create mode 100644 abs/core/grub-gfx/05-grub-0.97-initrdaddr.diff create mode 100644 abs/core/grub-gfx/PKGBUILD create mode 100644 abs/core/grub-gfx/ext4.patch create mode 100644 abs/core/grub-gfx/grub-0.97-graphics.patch create mode 100644 abs/core/grub-gfx/grub-gfx.install create mode 100644 abs/core/grub-gfx/grub-inode-size.patch create mode 100644 abs/core/grub-gfx/i2o.patch create mode 100755 abs/core/grub-gfx/install-grub create mode 100644 abs/core/grub-gfx/intelmac.patch create mode 100644 abs/core/grub-gfx/menu.lst create mode 100644 abs/core/grub-gfx/more-raid.patch create mode 100644 abs/core/grub-gfx/special-devices.patch create mode 100644 abs/core/grub-gfx/splash.xpm.gz create mode 100644 abs/core/gtk2/__changelog create mode 100644 abs/core/gtk2/revert_64bit_fix.patch create mode 100644 abs/core/gtk2/xid-collision-debug.patch create mode 100644 abs/core/hal/dbus-error-init.patch create mode 100644 abs/core/hal/fix-libusb-detection.patch create mode 100644 abs/core/hal/hal-HDAPS-blacklist.patch create mode 100644 abs/core/hal/hal-KVM-evdev.patch create mode 100644 abs/core/hal/hal-remove-dell-killswitch.patch create mode 100644 abs/core/hal/hal-use-at-console.patch create mode 100644 abs/core/hal/hal-xen-unignore-axes.patch create mode 100644 abs/core/hal/handle-input-touchpad.patch create mode 100644 abs/core/hal/macbook-fix-ioperm.patch create mode 100644 abs/core/hal/path-max.patch create mode 100644 abs/core/heimdal/001_all_heimdal-no_libedit.patch create mode 100644 abs/core/heimdal/002_all_heimal-fPIC.patch create mode 100644 abs/core/heimdal/003_all_heimdal-rxapps.patch create mode 100644 abs/core/heimdal/005_all_heimdal-suid_fix.patch create mode 100644 abs/core/heimdal/012_all_heimdal-berkdb.patch create mode 100644 abs/core/heimdal/013_all_heimdal-pthread-lib.patch create mode 100644 abs/core/heimdal/014_all_heimdal-path.patch create mode 100644 abs/core/iana-etc/Makefile.patch create mode 100644 abs/core/iana-etc/PKGBUILD delete mode 100644 abs/core/imagemagick/ChangeLog delete mode 100644 abs/core/imagemagick/add_delegate.patch create mode 100644 abs/core/imagemagick/perlmagick.rpath.patch delete mode 100644 abs/core/intel-dri/PKGBUILD delete mode 100644 abs/core/intel-dri/intel-disable-ttm-warning.patch delete mode 100644 abs/core/intel-dri/intel-revert-vbl.patch delete mode 100644 abs/core/intel-dri/mesa-7.1-link-shared.patch create mode 100644 abs/core/iproute2/iproute2-fhs.patch create mode 100644 abs/core/iproute2/tc.patch delete mode 100644 abs/core/iwlwifi-3945-ucode/PKGBUILD delete mode 100644 abs/core/iwlwifi-4965-ucode/PKGBUILD create mode 100644 abs/core/jasper/jasper-1.900.1-CVE-2008-3520.patch create mode 100644 abs/core/jasper/jasper-1.900.1-CVE-2008-3522.patch create mode 100644 abs/core/jasper/jpc_dec.c.patch create mode 100644 abs/core/jasper/patch-libjasper-stepsizes-overflow.diff delete mode 100644 abs/core/kernel-headers/PKGBUILD delete mode 100644 abs/core/kernel-headers/netfilter-includes.patch delete mode 100644 abs/core/kernel-headers/serial.diff create mode 100644 abs/core/kernel26.orig/PKGBUILD create mode 100644 abs/core/kernel26.orig/config create mode 100644 abs/core/kernel26.orig/config.x86_64 create mode 100644 abs/core/kernel26.orig/coretemp.patch create mode 100644 abs/core/kernel26.orig/ext4.patch create mode 100644 abs/core/kernel26.orig/kernel26.install create mode 100644 abs/core/kernel26.orig/kernel26.preset create mode 100644 abs/core/kernel26.orig/logo_linux_clut224.ppm create mode 100644 abs/core/kernel26.orig/logo_linux_mono.pbm create mode 100644 abs/core/kernel26.orig/logo_linux_vga16.ppm create mode 100644 abs/core/kernel26.orig/serial.diff create mode 100644 abs/core/kernel26/config.arch delete mode 100644 abs/core/kernel26/coretemp.patch delete mode 100644 abs/core/kernel26/ext4.patch create mode 100644 abs/core/kernel26/fbcondecor-2.6.34-fix.patch delete mode 100644 abs/core/kernel26/logo_linux_clut224.ppm delete mode 100644 abs/core/kernel26/logo_linux_mono.pbm delete mode 100644 abs/core/kernel26/logo_linux_vga16.ppm delete mode 100644 abs/core/kernel26/serial.diff delete mode 100644 abs/core/klibc-extras/PKGBUILD delete mode 100644 abs/core/klibc-kbd/PKGBUILD delete mode 100644 abs/core/klibc-kbd/keymap_hook delete mode 100644 abs/core/klibc-kbd/keymap_install delete mode 100644 abs/core/klibc-kbd/no-exit.patch delete mode 100644 abs/core/klibc-kbd/no-fflush.patch delete mode 100644 abs/core/klibc-kbd/no-isatty.patch delete mode 100644 abs/core/klibc-module-init-tools/PKGBUILD delete mode 100644 abs/core/klibc-module-init-tools/fix-modprobe-ignore-path.patch delete mode 100644 abs/core/klibc-module-init-tools/makefile.patch delete mode 100644 abs/core/klibc-udev/50-udev-default.rules delete mode 100644 abs/core/klibc-udev/60-persistent-storage.rules delete mode 100644 abs/core/klibc-udev/64-device-mapper.rules delete mode 100644 abs/core/klibc-udev/64-md-raid.rules delete mode 100644 abs/core/klibc-udev/80-drivers.rules delete mode 100644 abs/core/klibc-udev/PKGBUILD delete mode 100644 abs/core/klibc-udev/disable-uid-gid-lookup.patch delete mode 100644 abs/core/klibc-udev/klibc-remove-revert.patch delete mode 100755 abs/core/klibc-udev/load-modules.sh delete mode 100644 abs/core/klibc-udev/post-107.patch delete mode 100755 abs/core/klibc-udev/start_udev delete mode 100644 abs/core/klibc-udev/udev-fix-klibc-build.patch delete mode 100644 abs/core/klibc-udev/udev.rules delete mode 100644 abs/core/klibc-udev/udev_hook delete mode 100644 abs/core/klibc-udev/udev_install delete mode 100644 abs/core/klibc-udev/vol_id-suspend2.patch delete mode 100644 abs/core/klibc/PKGBUILD delete mode 100644 abs/core/klibc/klibc-2.6.24.patch delete mode 100644 abs/core/klibc/klibc-Kbuild.patch delete mode 100644 abs/core/klibc/klibc-compile-shared-by-default.patch delete mode 100644 abs/core/klibc/klibc-fix-2.6.28-includes.patch delete mode 100644 abs/core/klibc/klibc-module-init-tools.patch delete mode 100644 abs/core/klibc/klibc-x86_64-fix-io.h.patch delete mode 100644 abs/core/klibc/multiple_raid_assembly_fix.patch delete mode 100644 abs/core/libcups/PKGBUILD delete mode 100644 abs/core/libdownload/PKGBUILD delete mode 100644 abs/core/libdownload/largefiles.patch create mode 100644 abs/core/libdrm/COPYING create mode 100644 abs/core/libdrm/libdrm-2.4.21-b803918f3f.patch create mode 100644 abs/core/libdrm/no-pthread-stubs.patch create mode 120000 abs/core/libfetch/libfetch-2.33-1-i686.pkg.tar.gz delete mode 100644 abs/core/libgl/PKGBUILD delete mode 100644 abs/core/libgl/mesa-7.1-link-shared.patch create mode 100644 abs/core/libmpc/PKGBUILD create mode 100644 abs/core/libmpc/libmpc.install delete mode 100644 abs/core/libraw1394/libraw1394.install create mode 100644 abs/core/libtiff/libtiff-CVE-2009-2285.patch create mode 120000 abs/core/libtool/libtool-2.2.10-3-i686.pkg.tar.gz create mode 100644 abs/core/libxfontcache/LICENSE delete mode 100644 abs/core/libxml-perl/PKGBUILD create mode 100644 abs/core/libxvmc/LICENSE create mode 100644 abs/core/linux-api-headers/PKGBUILD create mode 120000 abs/core/linux-api-headers/linux-api-headers-2.6.34-1-i686.pkg.tar.gz create mode 100644 abs/core/linux-api-headers/scsi.patch create mode 100644 abs/core/linux-firmware/PKGBUILD delete mode 100755 abs/core/lirc-utils/hw_commandir.c delete mode 100755 abs/core/lirc-utils/hw_commandir.h create mode 100644 abs/core/lirc-utils/irexec.conf create mode 100755 abs/core/lirc-utils/irexecd delete mode 100644 abs/core/lirc-utils/kernel-2.6.26.patch create mode 100644 abs/core/lirc-utils/kernel-2.6.33.patch delete mode 100644 abs/core/lirc-utils/lirc_atiusb.patch create mode 100644 abs/core/lirc-utils/lirc_patch create mode 100644 abs/core/lirc-utils/lircd.conf delete mode 100644 abs/core/lirc-utils/lircd.conf.d delete mode 100644 abs/core/lirc/dvicoIR.rules delete mode 100755 abs/core/lirc/hw_commandir.c delete mode 100755 abs/core/lirc/hw_commandir.h delete mode 100644 abs/core/lirc/kernel-2.6.26.patch delete mode 100644 abs/core/lirc/kernel-2.6.27.patch create mode 100644 abs/core/lirc/kernel-2.6.33.patch delete mode 100644 abs/core/lirc/lirc.fdi delete mode 100644 abs/core/lirc/lirc_atiusb.patch delete mode 100644 abs/core/lirc/lirc_mod_mce.patch create mode 100644 abs/core/lirc_085-utils/PKGBUILD create mode 100755 abs/core/lirc_085-utils/hw_commandir.c create mode 100755 abs/core/lirc_085-utils/hw_commandir.h create mode 100644 abs/core/lirc_085-utils/kernel-2.6.26.patch create mode 100644 abs/core/lirc_085-utils/lirc.logrotate create mode 100644 abs/core/lirc_085-utils/lirc_atiusb.patch create mode 100755 abs/core/lirc_085-utils/lircd create mode 100644 abs/core/lirc_085-utils/lircd.conf.d create mode 100755 abs/core/lirc_085-utils/lircmd create mode 100644 abs/core/lirc_085/PKGBUILD create mode 100644 abs/core/lirc_085/dvicoIR.rules create mode 100755 abs/core/lirc_085/hw_commandir.c create mode 100755 abs/core/lirc_085/hw_commandir.h create mode 100644 abs/core/lirc_085/kernel-2.6.26.patch create mode 100644 abs/core/lirc_085/kernel-2.6.27.patch create mode 100644 abs/core/lirc_085/lirc.fdi create mode 100644 abs/core/lirc_085/lirc.install create mode 100644 abs/core/lirc_085/lirc_atiusb.patch create mode 100644 abs/core/lirc_085/lirc_mod_mce.patch delete mode 100644 abs/core/local-website/htdocs/layout.css delete mode 100644 abs/core/local-website/htdocs/style.css create mode 100644 abs/core/lvm2/ChangeLog create mode 100644 abs/core/madwifi/kernel-2.6.30.patch delete mode 100755 abs/core/mdadm/mdadm create mode 100644 abs/core/mesa/LICENSE create mode 100644 abs/core/mesa/nouveau_class.h create mode 100644 abs/core/mkinitcpio-busybox/PKGBUILD create mode 100644 abs/core/mkinitcpio-busybox/config create mode 100644 abs/core/mkinitcpio-busybox/loadfont-setfont-optional-psf2-font-support.patch delete mode 100644 abs/core/mysql-clients/PKGBUILD delete mode 100644 abs/core/mysql/mysql-no-clients.patch create mode 100644 abs/core/mysql/mysql.install delete mode 100644 abs/core/mysql/mysqld.conf.d create mode 100644 abs/core/mysql/skip-abi-check.patch delete mode 100644 abs/core/mythtv/stable/glass-wide/PKGBUILD delete mode 100644 abs/core/mythtv/stable/linhes-theme/PKGBUILD delete mode 100644 abs/core/mythtv/stable/morethemes/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mytharchive/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythbrowser/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythcontrols/PKGBUILD delete mode 100755 abs/core/mythtv/stable/mythdb-initial/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythdb-initial/__changelog delete mode 100644 abs/core/mythtv/stable/mythdb-initial/mc.sql delete mode 100755 abs/core/mythtv/stable/mythdb-initial/mythdb.install delete mode 100755 abs/core/mythtv/stable/mythdb-initial/permissions.sql delete mode 100644 abs/core/mythtv/stable/mythflix/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythgallery/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythgame/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythmovies/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythmusic/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythmusic/music_flac.patch delete mode 100644 abs/core/mythtv/stable/mythmusic/mythmusic-0.21.patch delete mode 100644 abs/core/mythtv/stable/mythnews/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythphone/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythsmolt/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythstream/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythstream/mythstream.diff delete mode 100644 abs/core/mythtv/stable/mythstream/mythstream.install delete mode 100644 abs/core/mythtv/stable/myththemes/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythtv/2.6.28_dvb_api_version.diff delete mode 100644 abs/core/mythtv/stable/mythtv/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythtv/QUICKSTART.archlinux delete mode 100644 abs/core/mythtv/stable/mythtv/gnome_screensaver.patch delete mode 100644 abs/core/mythtv/stable/mythtv/menu-xml/HOST_SETTINGS.xml delete mode 100644 abs/core/mythtv/stable/mythtv/menu-xml/is.xml delete mode 100644 abs/core/mythtv/stable/mythtv/menu-xml/library.xml.patch delete mode 100644 abs/core/mythtv/stable/mythtv/menu-xml/linhes.xml delete mode 100644 abs/core/mythtv/stable/mythtv/menu-xml/mainmenu.xml.patch delete mode 100644 abs/core/mythtv/stable/mythtv/menu-xml/mythbackup.xml delete mode 100644 abs/core/mythtv/stable/mythtv/menu-xml/mythrestore.xml delete mode 100644 abs/core/mythtv/stable/mythtv/menu-xml/optical_menu.xml.patch delete mode 100644 abs/core/mythtv/stable/mythtv/menu-xml/original/create_patch.sh delete mode 100644 abs/core/mythtv/stable/mythtv/menu-xml/setup.xml delete mode 100644 abs/core/mythtv/stable/mythtv/menu-xml/siriusmenu.xml delete mode 100644 abs/core/mythtv/stable/mythtv/menu-xml/update.xml delete mode 100644 abs/core/mythtv/stable/mythtv/menu-xml/update2.xml delete mode 100644 abs/core/mythtv/stable/mythtv/menu-xml/util_menu.xml.patch delete mode 100644 abs/core/mythtv/stable/mythtv/menu-xml/xmmenu.xml delete mode 100644 abs/core/mythtv/stable/mythtv/mpegpspatch delete mode 100755 abs/core/mythtv/stable/mythtv/mythbackend delete mode 100644 abs/core/mythtv/stable/mythtv/mythbackend.lr delete mode 100644 abs/core/mythtv/stable/mythtv/mythfrontend.lr delete mode 100644 abs/core/mythtv/stable/mythtv/myththemedmenu.cpp.patch delete mode 100644 abs/core/mythtv/stable/mythtv/myththemedmenu.h.patch delete mode 100644 abs/core/mythtv/stable/mythtv/mythtv.install delete mode 100644 abs/core/mythtv/stable/mythtv/pretty delete mode 100644 abs/core/mythtv/stable/mythtv/smolt_jump.patch delete mode 100644 abs/core/mythtv/stable/mythvideo/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythvideo/mtd delete mode 100644 abs/core/mythtv/stable/mythvideo/mythvideo-6338-use_tmdb_in_fixes.patch delete mode 100644 abs/core/mythtv/stable/mythvideo/mythvideo.install delete mode 100644 abs/core/mythtv/stable/mythweather/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythweb/PKGBUILD delete mode 100644 abs/core/mythtv/stable/mythweb/mythweb.install delete mode 100644 abs/core/mythtv/stable/mythweb/patch/2923-mythweb-gallery-English_GB_lang.diff delete mode 100644 abs/core/mythtv/stable/mythweb/patch/icons.tar.gz delete mode 100644 abs/core/mythtv/stable/mythweb/patch/mythweb.pl.diff delete mode 100644 abs/core/mythtv/stable/mythweb/patch/mythweb_gallery_updated1.diff delete mode 100644 abs/core/mythtv/stable/mythweb/transcoders.patch delete mode 100644 abs/core/mythtv/stable/mythweb/wiiweb.tar.bz2 delete mode 100644 abs/core/mythtv/stable/mythzoneminder/PKGBUILD delete mode 100644 abs/core/mythtv/trunk/mythflix/PKGBUILD delete mode 100644 abs/core/netcfg/PKGBUILD create mode 100644 abs/core/ntfs-3g/25-ntfs-config-write-policy.fdi create mode 100644 abs/core/ntp/fix-ipv6.patch create mode 100644 abs/core/ntp/ntp-4.2.4-html2man.patch create mode 100644 abs/core/ntp/ntp-4.2.4_p7-nano.patch create mode 100644 abs/core/nvidia-173xx-utils/20-nvidia.conf delete mode 100644 abs/core/nvidia-96xx-utils/nvidia-96xx.install delete mode 100644 abs/core/nvidia-96xx/NVIDIA_173.14.12_2.6.27.patch delete mode 100644 abs/core/nvidia-96xx/nvidia-96xx.install delete mode 100644 abs/core/nvidia/NVIDIA_kernel-169.12-2286310.diff delete mode 100644 abs/core/openssh/sshd.patch delete mode 100644 abs/core/openssh/sshd_config.diff create mode 100644 abs/core/openssl/ca-dir.patch create mode 100644 abs/core/openssl/fix-manpages.patch create mode 100644 abs/core/openssl/no-rpath.patch delete mode 100644 abs/core/pacman/mirrorlist create mode 100644 abs/core/pacman/old/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch create mode 100644 abs/core/pacman/old/PKGBUILD create mode 100644 abs/core/pacman/old/makepkg.conf create mode 100644 abs/core/pacman/old/mirrorlist create mode 100644 abs/core/pacman/old/pacman.conf create mode 100644 abs/core/pacman/old/pacman.install create mode 120000 abs/core/pacman/pacman-3.4.1-1-i686.pkg.tar.gz create mode 100644 abs/core/pacman/pacman.conf.x86_64 delete mode 100644 abs/core/parted/__changelog delete mode 100644 abs/core/parted/parted-1.7.1-fix-seg.patch create mode 100644 abs/core/parted/parted.install delete mode 100644 abs/core/perl-xml-dom/PKGBUILD delete mode 100644 abs/core/perlxml/PKGBUILD create mode 100644 abs/core/pkg-config/PKGBUILD create mode 100644 abs/core/pkg-config/autoconf-2.66.patch delete mode 100644 abs/core/pkgconfig/PKGBUILD create mode 100644 abs/core/ppl/PKGBUILD create mode 100644 abs/core/ppl/ppl-0.10.2-gmp-5.0.patch create mode 100644 abs/core/procinfo-ng/PKGBUILD delete mode 100644 abs/core/procinfo/PKGBUILD delete mode 100644 abs/core/procinfo/procinfo-19.2.patch create mode 100644 abs/core/python-decorator/LICENSE.txt create mode 100644 abs/core/python-decorator/PKGBUILD create mode 100644 abs/core/python/python-2.6-db-4.8.patch mode change 100755 => 100644 abs/core/qt/PKGBUILD delete mode 100644 abs/core/qt/QtWebKit_Flash.patch create mode 100644 abs/core/qt/ca-certificates.patch delete mode 100644 abs/core/qt/qdoc3.patch create mode 100644 abs/core/qt/qt-webkit-4.6.3-flash-plugin-segfault.patch create mode 100644 abs/core/qt/qt.install create mode 100644 abs/core/rpcbind/PKGBUILD create mode 100755 abs/core/rpcbind/rpcbind delete mode 100644 abs/core/rsync/ChangeLog delete mode 100644 abs/core/rt2500/PKGBUILD delete mode 100644 abs/core/rt2500/kernel-2.6.22.patch delete mode 100644 abs/core/rt2500/kernel-2.6.24.patch delete mode 100644 abs/core/rt2500/kernel-2.6.27.patch delete mode 100644 abs/core/rt2500/rt2500.install delete mode 100644 abs/core/rt2x00-rt61-fw/PKGBUILD delete mode 100644 abs/core/rt2x00-rt71w-fw/PKGBUILD delete mode 100755 abs/core/runit-scripts/runitscripts/services/mdadm/finish delete mode 100644 abs/core/smbclient/PKGBUILD create mode 100644 abs/core/squashfs-tools/mksquashfs-fix-race.patch create mode 100644 abs/core/tiacx/kernel-2.6.30.patch create mode 100644 abs/core/tiacx/kernel-2.6.31.patch create mode 100644 abs/core/tiacx/kernel-2.6.33.patch delete mode 100644 abs/core/udev/__changelog create mode 100644 abs/core/udev/logitech-rules.patch delete mode 100644 abs/core/udev/mount-usb delete mode 100644 abs/core/udev/readme-udev-arch.txt delete mode 100644 abs/core/udev/resolve-modalias.c delete mode 100755 abs/core/udev/start_udev delete mode 100644 abs/core/udev/udev-ntfs-3g.patch delete mode 100644 abs/core/udev/udev.rules delete mode 100644 abs/core/udev/usb-storage.rules delete mode 100644 abs/core/unichrome-dri/PKGBUILD delete mode 100644 abs/core/unichrome-dri/mesa-7.1-link-shared.patch delete mode 100644 abs/core/unzip/unzip-5.5.2-CVE-2008-0888.patch delete mode 100644 abs/core/unzip/unzip-5.50-alt-iconv-v1.2-utf8.patch delete mode 100644 abs/core/unzip/unzip542-size-64bit.patch delete mode 100644 abs/core/util-linux-ng/cryptoloop-support.patch create mode 100644 abs/core/util-linux-ng/fix-findmnt.patch delete mode 100644 abs/core/util-linux-ng/util-linux-ng-2.14-20080624.diff create mode 100644 abs/core/util-linux-ng/util-linux-ng-cfdisk.patch create mode 100644 abs/core/util-linux-ng/util-linux-ng-nilfs2.patch delete mode 100644 abs/core/vdpinfo-71xx/PKGBUILD delete mode 100755 abs/core/vdpinfo-71xx/vdpinfo delete mode 100644 abs/core/vdpinfo-96xx/PKGBUILD delete mode 100755 abs/core/vdpinfo-96xx/vdpinfo delete mode 100644 abs/core/vdpinfo/PKGBUILD create mode 120000 abs/core/wget/wget-1.12-2-i686.pkg.tar.gz create mode 100644 abs/core/wget/wget.install create mode 100644 abs/core/xcb-util/LICENSE create mode 100644 abs/core/xcursor-themes/LICENSE delete mode 100644 abs/core/xf86-input-calcomp/PKGBUILD delete mode 100644 abs/core/xf86-input-citron/PKGBUILD delete mode 100644 abs/core/xf86-input-digitaledge/PKGBUILD delete mode 100644 abs/core/xf86-input-dmc/PKGBUILD delete mode 100644 abs/core/xf86-input-dynapro/PKGBUILD delete mode 100644 abs/core/xf86-input-elo2300/PKGBUILD delete mode 100644 abs/core/xf86-input-jamstudio/PKGBUILD delete mode 100644 abs/core/xf86-input-magellan/PKGBUILD delete mode 100644 abs/core/xf86-input-magictouch/PKGBUILD delete mode 100644 abs/core/xf86-input-microtouch/PKGBUILD delete mode 100644 abs/core/xf86-input-palmax/PKGBUILD delete mode 100644 abs/core/xf86-input-spaceorb/PKGBUILD delete mode 100644 abs/core/xf86-input-summa/PKGBUILD delete mode 100644 abs/core/xf86-input-tek4957/PKGBUILD delete mode 100644 abs/core/xf86-input-ur98/PKGBUILD create mode 100644 abs/core/xf86-video-apm/LICENSE create mode 100644 abs/core/xf86-video-ark/LICENSE create mode 100644 abs/core/xf86-video-chips/LICENSE create mode 100644 abs/core/xf86-video-cirrus/LICENSE create mode 100644 abs/core/xf86-video-geode/PKGBUILD create mode 100644 abs/core/xf86-video-glint/LICENSE create mode 100644 abs/core/xf86-video-i128/LICENSE create mode 100644 abs/core/xf86-video-i740/LICENSE create mode 100644 abs/core/xf86-video-intel/LICENSE create mode 100644 abs/core/xf86-video-intel/intel-2.11-no-pageflipping.patch create mode 100644 abs/core/xf86-video-mach64/LICENSE create mode 100644 abs/core/xf86-video-nouveau/PKGBUILD create mode 100644 abs/core/xf86-video-nouveau/xf86-video-nouveau.install create mode 100644 abs/core/xf86-video-openchrome/drm_stdint.patch create mode 100644 abs/core/xf86-video-openchrome/svn-r839.patch create mode 100644 abs/core/xf86-video-r128/LICENSE create mode 100644 abs/core/xf86-video-s3/LICENSE create mode 100644 abs/core/xf86-video-s3virge/LICENSE create mode 100644 abs/core/xf86-video-savage/LICENSE create mode 100644 abs/core/xf86-video-tdfx/LICENSE create mode 100644 abs/core/xf86-video-unichrome/LICENSE create mode 100644 abs/core/xf86-video-unichrome/drm-include.patch create mode 100644 abs/core/xf86-video-v4l/LICENSE delete mode 100644 abs/core/xf86-video-vga/PKGBUILD delete mode 100644 abs/core/xf86-video-vga/pciaccess.patch create mode 100644 abs/core/xf86-video-vmware/LICENSE create mode 100644 abs/core/xf86-video-vmware/abi2.patch create mode 100644 abs/core/xf86driproto/LICENSE create mode 100644 abs/core/xorg-apps/LICENSE create mode 100644 abs/core/xorg-server-utils/LICENSE.iceauth create mode 100644 abs/core/xorg-server-utils/LICENSE.xcmsdb create mode 100644 abs/core/xorg-server/10-evdev.conf create mode 100644 abs/core/xorg-server/10-quirks.conf create mode 100644 abs/core/xorg-server/xserver-1.7.1-gamma-kdm-fix.patch create mode 100644 abs/core/xorg-server/xserver-1.7.1-libcrypto.patch create mode 100644 abs/core/xorg-server/xvfb-run create mode 100644 abs/core/xorg-server/xvfb-run.1 create mode 100644 abs/core/xorg-utils/LICENSE.xdpyinfo create mode 100644 abs/core/xorg-utils/LICENSE.xfd create mode 100644 abs/core/xorg-utils/LICENSE.xlsfonts create mode 100644 abs/core/xorg-utils/LICENSE.xprop create mode 100644 abs/core/xterm/LICENSE delete mode 100644 abs/core/xz-utils/PKGBUILD create mode 100644 abs/core/xz/PKGBUILD create mode 120000 abs/core/xz/xz-4.999.9beta-5-i686.pkg.tar.gz create mode 100644 abs/core/zlib/zlib-1.2.5-lfs-decls.patch delete mode 100644 abs/extra-testing/README delete mode 100644 abs/extra-testing/abs/ChangeLog delete mode 100644 abs/extra-testing/abs/PKGBUILD delete mode 100644 abs/extra-testing/abs/abs.install delete mode 100644 abs/extra-testing/alpine/2.00-lpam.patch delete mode 100644 abs/extra-testing/alpine/CVE-2008-5514.patch delete mode 100644 abs/extra-testing/alpine/ChangeLog delete mode 100644 abs/extra-testing/alpine/PKGBUILD delete mode 100644 abs/extra-testing/alsa-firmware/PKGBUILD delete mode 100644 abs/extra-testing/apache-ant/PKGBUILD delete mode 100644 abs/extra-testing/apcupsd/PKGBUILD delete mode 100755 abs/extra-testing/apcupsd/apcupsd delete mode 100644 abs/extra-testing/apcupsd/apcupsd.conf delete mode 100644 abs/extra-testing/apcupsd/run delete mode 100644 abs/extra-testing/asciidoc/ChangeLog delete mode 100644 abs/extra-testing/asciidoc/PKGBUILD delete mode 100644 abs/extra-testing/atomicparsley/PKGBUILD delete mode 100755 abs/extra-testing/autofs/Changelog delete mode 100755 abs/extra-testing/autofs/PKGBUILD delete mode 100644 abs/extra-testing/autofs/auto.master delete mode 100644 abs/extra-testing/autofs/auto.misc delete mode 100644 abs/extra-testing/autofs/autofs delete mode 100644 abs/extra-testing/autofs/autofs.conf.d delete mode 100644 abs/extra-testing/autofs/autofs.install delete mode 100755 abs/extra-testing/autofs/finish delete mode 100644 abs/extra-testing/autofs/heimdal.patch delete mode 100755 abs/extra-testing/autofs/log.run delete mode 100755 abs/extra-testing/autofs/run delete mode 100644 abs/extra-testing/bash-completion/PKGBUILD delete mode 100644 abs/extra-testing/bash-completion/cowsay.bashcomp delete mode 100644 abs/extra-testing/beautiful-soup/PKGBUILD delete mode 100644 abs/extra-testing/bluez-firmware/PKGBUILD delete mode 100644 abs/extra-testing/bluez-hcidump/PKGBUILD delete mode 100644 abs/extra-testing/bluez-python/PKGBUILD delete mode 100644 abs/extra-testing/bluez/PKGBUILD delete mode 100644 abs/extra-testing/bluez/__Changelog delete mode 100644 abs/extra-testing/bluez/bluetooth.conf.d delete mode 100644 abs/extra-testing/bluez/bluez.install delete mode 100644 abs/extra-testing/bluez/run.bluetoothd delete mode 100644 abs/extra-testing/bluez/run.dund delete mode 100644 abs/extra-testing/bluez/run.hidd delete mode 100644 abs/extra-testing/bluez/run.pand delete mode 100644 abs/extra-testing/bluez/run.rfcomm delete mode 100644 abs/extra-testing/bmp/0.9.7-visualization.patch delete mode 100644 abs/extra-testing/bmp/0.9.7.1-visualization.patch delete mode 100644 abs/extra-testing/bmp/PKGBUILD delete mode 100644 abs/extra-testing/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch delete mode 100644 abs/extra-testing/boost/0001-date_time-gcc-4.3-fix.patch delete mode 100644 abs/extra-testing/boost/PKGBUILD delete mode 100644 abs/extra-testing/boost/serialization_gcc43.patch delete mode 100644 abs/extra-testing/cabextract/PKGBUILD delete mode 100644 abs/extra-testing/ccache/PKGBUILD delete mode 100755 abs/extra-testing/cddb-py/PKGBUILD delete mode 100644 abs/extra-testing/community/amule/PKGBUILD delete mode 100644 abs/extra-testing/community/athcool/PKGBUILD delete mode 100644 abs/extra-testing/community/athcool/athcool delete mode 100644 abs/extra-testing/community/athcool/athcool.install delete mode 100755 abs/extra-testing/community/athcool/finish delete mode 100644 abs/extra-testing/community/athcool/run delete mode 100644 abs/extra-testing/community/blockcontrol/PKGBUILD delete mode 100644 abs/extra-testing/community/blockcontrol/blockcontrol.lib.patch delete mode 100644 abs/extra-testing/community/cksfv/PKGBUILD delete mode 100644 abs/extra-testing/community/codecs/PKGBUILD delete mode 100644 abs/extra-testing/community/cpulimit/PKGBUILD delete mode 100644 abs/extra-testing/community/cwiid-git/PKGBUILD delete mode 100644 abs/extra-testing/community/cwiid-git/cwiid.install delete mode 100644 abs/extra-testing/community/deluge/PKGBUILD delete mode 100644 abs/extra-testing/community/desktop-file-utils/ChangeLog delete mode 100644 abs/extra-testing/community/desktop-file-utils/PKGBUILD delete mode 100644 abs/extra-testing/community/djmount/PKGBUILD delete mode 100644 abs/extra-testing/community/djmount/djmount.confd delete mode 100755 abs/extra-testing/community/djmount/djmount.rcd delete mode 100644 abs/extra-testing/community/enca/PKGBUILD delete mode 100644 abs/extra-testing/community/firefox-i18n/PKGBUILD delete mode 100644 abs/extra-testing/community/firefox/PKGBUILD delete mode 100644 abs/extra-testing/community/firefox/browser-app-makefile.patch delete mode 100644 abs/extra-testing/community/firefox/browser-defaulturls.patch delete mode 100644 abs/extra-testing/community/firefox/firefox-safe.desktop delete mode 100644 abs/extra-testing/community/firefox/firefox-version.patch delete mode 100644 abs/extra-testing/community/firefox/firefox.desktop delete mode 100644 abs/extra-testing/community/firefox/firefox.install delete mode 100644 abs/extra-testing/community/firefox/mozconfig delete mode 100644 abs/extra-testing/community/firefox/mozilla-firefox-1.0-lang.patch delete mode 100644 abs/extra-testing/community/flashplugin-prerelease/PKGBUILD delete mode 100644 abs/extra-testing/community/flashplugin/PKGBUILD delete mode 100644 abs/extra-testing/community/fluidsynth/PKGBUILD delete mode 100644 abs/extra-testing/community/fluxconf/PKGBUILD delete mode 100644 abs/extra-testing/community/foldingathome/PKGBUILD delete mode 100644 abs/extra-testing/community/foldingathome/foldingathome.install delete mode 100644 abs/extra-testing/community/foldingathome/run delete mode 100644 abs/extra-testing/community/fuzemux/PKGBUILD delete mode 100644 abs/extra-testing/community/fuzemux/fuzemux-svn.install delete mode 100644 abs/extra-testing/community/gnash-common/PKGBUILD delete mode 100644 abs/extra-testing/community/gnash-gtk/PKGBUILD delete mode 100644 abs/extra-testing/community/gstreamer0.10-base-plugins/PKGBUILD delete mode 100644 abs/extra-testing/community/gstreamer0.10-base/PKGBUILD delete mode 100644 abs/extra-testing/community/gstreamer0.10/PKGBUILD delete mode 100644 abs/extra-testing/community/gstreamer0.10/bgo555631.patch delete mode 100644 abs/extra-testing/community/gtkglext/PKGBUILD delete mode 100644 abs/extra-testing/community/gtkglext/gtkglext-1.0.6-pangox.patch delete mode 100644 abs/extra-testing/community/ircii/PKGBUILD delete mode 100644 abs/extra-testing/community/jdk/PKGBUILD delete mode 100644 abs/extra-testing/community/jdk/jdk.install delete mode 100644 abs/extra-testing/community/jdk/jdk.profile delete mode 100644 abs/extra-testing/community/libdvbpsi/PKGBUILD delete mode 100644 abs/extra-testing/community/libelf/PKGBUILD delete mode 100644 abs/extra-testing/community/libmodplug/PKGBUILD delete mode 100644 abs/extra-testing/community/libnetfilter_queue/PKGBUILD delete mode 100644 abs/extra-testing/community/libnfnetlink/PKGBUILD delete mode 100644 abs/extra-testing/community/liboil/PKGBUILD delete mode 100644 abs/extra-testing/community/libshout/PKGBUILD delete mode 100644 abs/extra-testing/community/libstdc++5/PKGBUILD delete mode 100644 abs/extra-testing/community/libstdc++5/gcc-3.4.3-no_multilib_amd64.patch delete mode 100644 abs/extra-testing/community/libv4l/PKGBUILD delete mode 100644 abs/extra-testing/community/lua/PKGBUILD delete mode 100644 abs/extra-testing/community/lua/lua-5.1-cflags.diff delete mode 100644 abs/extra-testing/community/lua/lua-5.1.3-official-patch1.diff delete mode 100644 abs/extra-testing/community/lua/lua-5.1.3-official-patch2.diff delete mode 100644 abs/extra-testing/community/lua/lua-5.1.3-official-patch3.diff delete mode 100644 abs/extra-testing/community/lua/lua-5.1.3-official-patch4.diff delete mode 100644 abs/extra-testing/community/lua/lua-arch.patch delete mode 100644 abs/extra-testing/community/mediatomb/PKGBUILD delete mode 100644 abs/extra-testing/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch delete mode 100644 abs/extra-testing/community/mediatomb/mediatomb-gcc-4.3.patch delete mode 100644 abs/extra-testing/community/mediatomb/mediatomb.conf delete mode 100755 abs/extra-testing/community/mediatomb/mediatomb.rc delete mode 100644 abs/extra-testing/community/mmv/PKGBUILD delete mode 100644 abs/extra-testing/community/mmv/mmv.install delete mode 100644 abs/extra-testing/community/moblock/MoBlock-nfq.sh.patch delete mode 100755 abs/extra-testing/community/moblock/PKGBUILD delete mode 100644 abs/extra-testing/community/moblock/config delete mode 100755 abs/extra-testing/community/moblock/moblock delete mode 100755 abs/extra-testing/community/moblock/moblock-update delete mode 100644 abs/extra-testing/community/moblock/moblock.install delete mode 100644 abs/extra-testing/community/moblock/moblock.logrotate delete mode 100644 abs/extra-testing/community/moblock/moblock_0.9_rc2.patch delete mode 100644 abs/extra-testing/community/moblock/moblock_include.patch delete mode 100644 abs/extra-testing/community/mobloquer/PKGBUILD delete mode 100644 abs/extra-testing/community/motion-svn/PKGBUILD delete mode 100644 abs/extra-testing/community/motion-svn/motion-svn.install delete mode 100644 abs/extra-testing/community/motion-svn/rc.motion delete mode 100644 abs/extra-testing/community/mozplugger/ChangeLog delete mode 100644 abs/extra-testing/community/mozplugger/PKGBUILD delete mode 100644 abs/extra-testing/community/mozplugger/mozplugger.install delete mode 100644 abs/extra-testing/community/mpc/ChangeLog delete mode 100644 abs/extra-testing/community/mpc/PKGBUILD delete mode 100644 abs/extra-testing/community/mpd/PKGBUILD delete mode 100755 abs/extra-testing/community/mpd/mpd delete mode 100644 abs/extra-testing/community/mpd/mpd.install delete mode 100644 abs/extra-testing/community/mre/PKGBUILD delete mode 100644 abs/extra-testing/community/mre/mre-1.1.2.tar.gz delete mode 100755 abs/extra-testing/community/mre/mre.install delete mode 100644 abs/extra-testing/community/mre/mre.lr delete mode 100644 abs/extra-testing/community/mre/patch.diff delete mode 100755 abs/extra-testing/community/mre/run delete mode 100644 abs/extra-testing/community/mythpywii/CONTROLS delete mode 100644 abs/extra-testing/community/mythpywii/PKGBUILD delete mode 100644 abs/extra-testing/community/mythpywii/mythpywii.install delete mode 100644 abs/extra-testing/community/mythpywii/wiimote.rules delete mode 100644 abs/extra-testing/community/mythtv-vdpau/2.6.28_dvb_api_version.diff delete mode 100644 abs/extra-testing/community/mythtv-vdpau/PKGBUILD delete mode 100644 abs/extra-testing/community/mythtv-vdpau/PKGBUILD.orig delete mode 100644 abs/extra-testing/community/mythtv-vdpau/QUICKSTART.archlinux delete mode 100755 abs/extra-testing/community/mythtv-vdpau/menu-xml/HOST_SETTINGS.xml delete mode 100644 abs/extra-testing/community/mythtv-vdpau/menu-xml/is.xml delete mode 100644 abs/extra-testing/community/mythtv-vdpau/menu-xml/library.xml.patch delete mode 100644 abs/extra-testing/community/mythtv-vdpau/menu-xml/linhes.xml delete mode 100644 abs/extra-testing/community/mythtv-vdpau/menu-xml/mainmenu.xml.patch delete mode 100644 abs/extra-testing/community/mythtv-vdpau/menu-xml/mythbackup.xml delete mode 100644 abs/extra-testing/community/mythtv-vdpau/menu-xml/mythrestore.xml delete mode 100644 abs/extra-testing/community/mythtv-vdpau/menu-xml/optical_menu.xml.patch delete mode 100644 abs/extra-testing/community/mythtv-vdpau/menu-xml/original/create_patch.sh delete mode 100644 abs/extra-testing/community/mythtv-vdpau/menu-xml/setup.xml delete mode 100644 abs/extra-testing/community/mythtv-vdpau/menu-xml/siriusmenu.xml delete mode 100644 abs/extra-testing/community/mythtv-vdpau/menu-xml/util_menu.xml.patch delete mode 100644 abs/extra-testing/community/mythtv-vdpau/menu-xml/xmmenu.xml delete mode 100644 abs/extra-testing/community/mythtv-vdpau/mpegpspatch delete mode 100755 abs/extra-testing/community/mythtv-vdpau/mythbackend delete mode 100644 abs/extra-testing/community/mythtv-vdpau/mythbackend.lr delete mode 100644 abs/extra-testing/community/mythtv-vdpau/mythfrontend.lr delete mode 100644 abs/extra-testing/community/mythtv-vdpau/myththemedmenu.cpp.patch delete mode 100644 abs/extra-testing/community/mythtv-vdpau/myththemedmenu.h.patch delete mode 100644 abs/extra-testing/community/mythtv-vdpau/mythtv.install delete mode 100644 abs/extra-testing/community/mythtv-vdpau/pretty delete mode 100644 abs/extra-testing/community/mythtv-vdpau/smolt_jump.patch delete mode 100644 abs/extra-testing/community/ncdu/PKGBUILD delete mode 100644 abs/extra-testing/community/network-ups-tools/PKGBUILD delete mode 100644 abs/extra-testing/community/network-ups-tools/finish.upsd delete mode 100644 abs/extra-testing/community/network-ups-tools/nut.install delete mode 100644 abs/extra-testing/community/network-ups-tools/run.upsd delete mode 100644 abs/extra-testing/community/nvclock/PKGBUILD delete mode 100644 abs/extra-testing/community/nvclock/nvclock-0.8b4-buildfix.patch delete mode 100644 abs/extra-testing/community/nvidia-beta/PKGBUILD delete mode 100644 abs/extra-testing/community/nvidia-beta/nvidia.install delete mode 100644 abs/extra-testing/community/nvidia-utils-beta/PKGBUILD delete mode 100644 abs/extra-testing/community/nvidia-utils-beta/nvidia.install delete mode 100644 abs/extra-testing/community/nvidia-utils-beta/supported-cards.txt delete mode 100644 abs/extra-testing/community/nxtvepg.tar.gz delete mode 100644 abs/extra-testing/community/nxtvepg/PKGBUILD delete mode 100644 abs/extra-testing/community/nxtvepg/nxtvepg-icon-16.png delete mode 100644 abs/extra-testing/community/nxtvepg/nxtvepg-icon-32.png delete mode 100644 abs/extra-testing/community/nxtvepg/nxtvepg-icon-48.png delete mode 100644 abs/extra-testing/community/nxtvepg/nxtvepg.desktop delete mode 100644 abs/extra-testing/community/nxtvepg/tcl_85.patch delete mode 100755 abs/extra-testing/community/nzbperl/PKGBUILD delete mode 100755 abs/extra-testing/community/peardb/PKGBUILD delete mode 100755 abs/extra-testing/community/pearlog/PKGBUILD delete mode 100644 abs/extra-testing/community/powernowd/PKGBUILD delete mode 100644 abs/extra-testing/community/powernowd/finish delete mode 100644 abs/extra-testing/community/powernowd/powernowd.conf.d delete mode 100644 abs/extra-testing/community/powernowd/powernowd.install delete mode 100644 abs/extra-testing/community/powernowd/run delete mode 100644 abs/extra-testing/community/projectx/PKGBUILD delete mode 100644 abs/extra-testing/community/projectx/projectx delete mode 100644 abs/extra-testing/community/pyxdg/PKGBUILD delete mode 100644 abs/extra-testing/community/screen/PKGBUILD delete mode 100644 abs/extra-testing/community/screen/screen.install delete mode 100644 abs/extra-testing/community/screen/screen.pam delete mode 100644 abs/extra-testing/community/smplayer/ChangeLog delete mode 100644 abs/extra-testing/community/smplayer/PKGBUILD delete mode 100644 abs/extra-testing/community/squeezeboxserver/PKGBUILD delete mode 100644 abs/extra-testing/community/squeezeboxserver/squeezeboxserver.conf.d delete mode 100644 abs/extra-testing/community/squeezeboxserver/squeezeboxserver.install delete mode 100644 abs/extra-testing/community/squeezeboxserver/squeezeboxserver.rc delete mode 100644 abs/extra-testing/community/torrentflux/PKGBUILD delete mode 120000 abs/extra-testing/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/PKGBUILD delete mode 120000 abs/extra-testing/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/torrentflux.install delete mode 100644 abs/extra-testing/community/torrentflux/torrentflux.install delete mode 100644 abs/extra-testing/community/transmission-cli/PKGBUILD delete mode 100755 abs/extra-testing/community/transmission-cli/run.transmissiond delete mode 100644 abs/extra-testing/community/transmission-cli/transmission-cli.install delete mode 100644 abs/extra-testing/community/transmission-cli/transmission.include delete mode 100644 abs/extra-testing/community/transmission-cli/transmissiond.conf delete mode 100644 abs/extra-testing/community/tre/PKGBUILD delete mode 100644 abs/extra-testing/community/unrar/PKGBUILD delete mode 100644 abs/extra-testing/community/unrar/unrar-3.5.2-optimalization-fix.patch delete mode 100644 abs/extra-testing/community/uudeview/PKGBUILD delete mode 100644 abs/extra-testing/community/vlc/PKGBUILD delete mode 100644 abs/extra-testing/community/vsftpd/PKGBUILD delete mode 100644 abs/extra-testing/community/vsftpd/run delete mode 100644 abs/extra-testing/community/vsftpd/vsftpd.d delete mode 100644 abs/extra-testing/community/vsftpd/vsftpd.install delete mode 100644 abs/extra-testing/community/vsftpd/vsftpd.xinetd delete mode 100644 abs/extra-testing/community/wiiuse/PKGBUILD delete mode 100644 abs/extra-testing/community/wiiuse/wiiuse.install delete mode 100644 abs/extra-testing/community/xine-lib-vdpau-svn/PKGBUILD delete mode 100644 abs/extra-testing/community/zvbi/PKGBUILD delete mode 100644 abs/extra-testing/conky/PKGBUILD delete mode 100644 abs/extra-testing/consolekit/PKGBUILD delete mode 100644 abs/extra-testing/consolekit/add_since_option.patch delete mode 100644 abs/extra-testing/consolekit/consolekit.logrotate delete mode 100644 abs/extra-testing/consolekit/nodaemon.patch delete mode 100644 abs/extra-testing/consolekit/pam-foreground-compat.ck delete mode 100644 abs/extra-testing/consolekit/reorder-initialization.patch delete mode 100644 abs/extra-testing/cpufreqd/PKGBUILD delete mode 100644 abs/extra-testing/cpufreqd/cpufreqd delete mode 100644 abs/extra-testing/cpufreqd/cpufreqd.install delete mode 100644 abs/extra-testing/cpufrequtils/PKGBUILD delete mode 100644 abs/extra-testing/cpufrequtils/cpufreq.confd delete mode 100644 abs/extra-testing/cpufrequtils/cpufreq.rcd delete mode 100644 abs/extra-testing/crda/PKGBUILD delete mode 100644 abs/extra-testing/crda/crda.conf.d delete mode 100755 abs/extra-testing/crda/crda.rc delete mode 100644 abs/extra-testing/crypto++/PKGBUILD delete mode 100644 abs/extra-testing/cups/PKGBUILD delete mode 100755 abs/extra-testing/cups/cups delete mode 100644 abs/extra-testing/cups/cups-1.3.7-peercred.patch delete mode 100644 abs/extra-testing/cups/cups-avahi.patch delete mode 100644 abs/extra-testing/cups/cups.install delete mode 100644 abs/extra-testing/cups/cups.logrotate delete mode 100644 abs/extra-testing/cups/cups.pam delete mode 100644 abs/extra-testing/cups/fix-infinite-usb-loop.patch delete mode 100644 abs/extra-testing/cvs/PKGBUILD delete mode 100644 abs/extra-testing/cvs/cvs-1.11.23-getline64.patch delete mode 100644 abs/extra-testing/cvs/cvs.install delete mode 100644 abs/extra-testing/ddclient/PKGBUILD delete mode 100644 abs/extra-testing/ddclient/ddclient-foreground.patch delete mode 100644 abs/extra-testing/ddclient/ddclient.conf.dynamic.dyndns.sample delete mode 100644 abs/extra-testing/deb2targz/PKGBUILD delete mode 100644 abs/extra-testing/diffstat/PKGBUILD delete mode 100644 abs/extra-testing/dnsmasq/PKGBUILD delete mode 100755 abs/extra-testing/dnsmasq/rc.dnsmasq delete mode 100644 abs/extra-testing/docbook-xml/PKGBUILD delete mode 100644 abs/extra-testing/docbook-xml/docbook-xml.install delete mode 100644 abs/extra-testing/docbook-xml/docbook.patch delete mode 100644 abs/extra-testing/docbook-xsl/PKGBUILD delete mode 100644 abs/extra-testing/docbook-xsl/docbook-xsl.install delete mode 100644 abs/extra-testing/doxygen/PKGBUILD delete mode 100644 abs/extra-testing/doxygen/PKGBUILD.orig delete mode 100644 abs/extra-testing/dpgconv/PKGBUILD delete mode 100644 abs/extra-testing/dpgconv/dpgconv-panscan.patch delete mode 100644 abs/extra-testing/enchant/PKGBUILD delete mode 100644 abs/extra-testing/ethtool/PKGBUILD delete mode 100644 abs/extra-testing/evrouter/PKGBUILD delete mode 100644 abs/extra-testing/evtest/PKGBUILD delete mode 100644 abs/extra-testing/evtest/evtest.diff delete mode 100644 abs/extra-testing/exo/PKGBUILD delete mode 100644 abs/extra-testing/exo/exo.install delete mode 100644 abs/extra-testing/fakeroot/PKGBUILD delete mode 100644 abs/extra-testing/fakeroot/fakeroot.install delete mode 100755 abs/extra-testing/fceu/PKGBUILD delete mode 100644 abs/extra-testing/fftw/PKGBUILD delete mode 100644 abs/extra-testing/fftw/fftw.install delete mode 100644 abs/extra-testing/frozen-bubble/PKGBUILD delete mode 100644 abs/extra-testing/frozen-bubble/frozen-bubble.desktop delete mode 100644 abs/extra-testing/fuppes-svn/PKGBUILD delete mode 100644 abs/extra-testing/fuppes-svn/PKGBUILD.orig delete mode 100644 abs/extra-testing/fuppes-svn/fuppes-r634-archlinux.patch delete mode 100644 abs/extra-testing/fuppes-svn/fuppes.cfg delete mode 100644 abs/extra-testing/fuppes-svn/fuppes.ch delete mode 100644 abs/extra-testing/fuppes-svn/fuppes.diff delete mode 100644 abs/extra-testing/fuppes-svn/fuppes.install delete mode 100644 abs/extra-testing/fuppes-svn/fuppes.lr delete mode 100755 abs/extra-testing/fuppes-svn/run delete mode 100644 abs/extra-testing/gconf/01_xml-gettext-domain.patch delete mode 100644 abs/extra-testing/gconf/PKGBUILD delete mode 100755 abs/extra-testing/gconf/gconf-merge-schema delete mode 100644 abs/extra-testing/gconf/gconf-reload.patch delete mode 100644 abs/extra-testing/gconf/gconf.install delete mode 100755 abs/extra-testing/gconf/gconfpkg delete mode 100644 abs/extra-testing/gd/PKGBUILD delete mode 100644 abs/extra-testing/gdl/PKGBUILD delete mode 100644 abs/extra-testing/geoip/PKGBUILD delete mode 100644 abs/extra-testing/glew/PKGBUILD delete mode 100644 abs/extra-testing/gnome-common/PKGBUILD delete mode 100644 abs/extra-testing/gnome-desktop/PKGBUILD delete mode 100644 abs/extra-testing/gnome-doc-utils/PKGBUILD delete mode 100644 abs/extra-testing/gnome-keyring/PKGBUILD delete mode 100644 abs/extra-testing/gnome-keyring/gnome-keyring.install delete mode 100644 abs/extra-testing/gnome-keyring/gnome-keyring.service delete mode 100644 abs/extra-testing/gnome-menus/PKGBUILD delete mode 100644 abs/extra-testing/gnome-menus/menus.patch delete mode 100644 abs/extra-testing/gnome-mime-data/PKGBUILD delete mode 100644 abs/extra-testing/gnome-python-extras/PKGBUILD delete mode 100644 abs/extra-testing/gnome-python-extras/gnome-python-extras-2.19.1-pkg-config.patch delete mode 100644 abs/extra-testing/gnome-python-extras/gnome-python-extras-2.19.1-xulrunner.patch delete mode 100644 abs/extra-testing/gnome-python/PKGBUILD delete mode 100644 abs/extra-testing/gnome-screensaver/PKGBUILD delete mode 100644 abs/extra-testing/gnome-screensaver/__changelog delete mode 100644 abs/extra-testing/gnome-screensaver/bug564548.patch delete mode 100644 abs/extra-testing/gnome-screensaver/gnome-screensaver.install delete mode 100644 abs/extra-testing/gnome-screensaver/gnome-screensaver.pam delete mode 100644 abs/extra-testing/gnome-screensaver/gscreensavers delete mode 100644 abs/extra-testing/gnome-vfs/PKGBUILD delete mode 100644 abs/extra-testing/gnome-vfs/gnome-vfs.install delete mode 100644 abs/extra-testing/gnome-vfs/gnutls-config.patch delete mode 100644 abs/extra-testing/gnome-vfs/hal-show-volume-names.patch delete mode 100644 abs/extra-testing/gnu-netcat/PKGBUILD delete mode 100644 abs/extra-testing/gnu-netcat/gnu-netcat.install delete mode 100644 abs/extra-testing/gnupg/PKGBUILD delete mode 100644 abs/extra-testing/gnupg/gnupg.install delete mode 100644 abs/extra-testing/gnuplot/PKGBUILD delete mode 100644 abs/extra-testing/gpac/ChangeLog delete mode 100755 abs/extra-testing/gpac/PKGBUILD delete mode 100755 abs/extra-testing/gpac/gpac-0.4.2-ffmpeg-errno.patch delete mode 100644 abs/extra-testing/gpgme/PKGBUILD delete mode 100644 abs/extra-testing/gpgme/__changelog delete mode 100644 abs/extra-testing/gpgme/gpgme.install delete mode 100644 abs/extra-testing/graphload/PKGBUILD delete mode 100755 abs/extra-testing/graphload/graphload.sh delete mode 100644 abs/extra-testing/gtk-doc/PKGBUILD delete mode 100644 abs/extra-testing/gtk-doc/gtk-doc.install delete mode 100644 abs/extra-testing/gtk-sharp-2/PKGBUILD delete mode 100644 abs/extra-testing/gtkspell/PKGBUILD delete mode 100644 abs/extra-testing/guile/PKGBUILD delete mode 100644 abs/extra-testing/guile/guile.install delete mode 100644 abs/extra-testing/gvim/PKGBUILD delete mode 100644 abs/extra-testing/gvim/fetch_patches.sh delete mode 100644 abs/extra-testing/gvim/gvim.desktop delete mode 100644 abs/extra-testing/gvim/gvim.install delete mode 100644 abs/extra-testing/hd2u/PKGBUILD delete mode 100644 abs/extra-testing/hddtemp/ChangeLog delete mode 100644 abs/extra-testing/hddtemp/PKGBUILD delete mode 100644 abs/extra-testing/hddtemp/hddtemp delete mode 100644 abs/extra-testing/hddtemp/hddtemp.confd delete mode 100755 abs/extra-testing/hdhgrab/PKGBUILD delete mode 100644 abs/extra-testing/help2man/PKGBUILD delete mode 100644 abs/extra-testing/help2man/help2man-1.37.1-respect-LDFLAGS.patch delete mode 100644 abs/extra-testing/hicolor-icon-theme/PKGBUILD delete mode 100644 abs/extra-testing/hspell/PKGBUILD delete mode 100644 abs/extra-testing/htop/ChangeLog delete mode 100644 abs/extra-testing/htop/PKGBUILD delete mode 100644 abs/extra-testing/htop/htop-treeview.patch delete mode 100644 abs/extra-testing/huludesktop/PKGBUILD delete mode 100644 abs/extra-testing/huludesktop/huludesktop delete mode 100644 abs/extra-testing/huludesktop/huludesktop.install delete mode 100644 abs/extra-testing/hunspell/ChangeLog delete mode 100644 abs/extra-testing/hunspell/PKGBUILD delete mode 100644 abs/extra-testing/hunspell/__changelog delete mode 100644 abs/extra-testing/i2c-tools/Makefile.patch delete mode 100644 abs/extra-testing/i2c-tools/PKGBUILD delete mode 100644 abs/extra-testing/icon-naming-utils/PKGBUILD delete mode 100644 abs/extra-testing/id3lib/PKGBUILD delete mode 100644 abs/extra-testing/id3lib/id3lib-3.8.3-CVE-2007-4460.patch delete mode 100644 abs/extra-testing/id3lib/id3lib-3.8.3-gcc-4.3.patch delete mode 100644 abs/extra-testing/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff delete mode 100644 abs/extra-testing/ifenslave/PKGBUILD delete mode 100644 abs/extra-testing/ifenslave/bonding.conf.d delete mode 100644 abs/extra-testing/imdbpy/PKGBUILD delete mode 100644 abs/extra-testing/inadyn/PKGBUILD delete mode 100644 abs/extra-testing/inadyn/run delete mode 100644 abs/extra-testing/irqbalance/Makefile.irqbalance delete mode 100644 abs/extra-testing/irqbalance/PKGBUILD delete mode 100644 abs/extra-testing/irqbalance/finish delete mode 100644 abs/extra-testing/irqbalance/irqbalance.conf.d delete mode 100644 abs/extra-testing/irqbalance/irqbalance.install delete mode 100644 abs/extra-testing/irqbalance/run delete mode 100644 abs/extra-testing/iso-codes/PKGBUILD delete mode 100644 abs/extra-testing/iw/PKGBUILD delete mode 100644 abs/extra-testing/jade/PKGBUILD delete mode 100644 abs/extra-testing/java-sun/PKGBUILD delete mode 100644 abs/extra-testing/java-sun/java-control-panel.desktop delete mode 100644 abs/extra-testing/java-sun/java-monitoring-and-management-console.desktop delete mode 100644 abs/extra-testing/java-sun/java-policy-settings.desktop delete mode 100644 abs/extra-testing/java-sun/java-visualvm.desktop delete mode 100644 abs/extra-testing/java-sun/java-web-start.desktop delete mode 100644 abs/extra-testing/java-sun/jdk.install delete mode 100644 abs/extra-testing/java-sun/jdk.profile delete mode 100644 abs/extra-testing/java-sun/jre.install delete mode 100644 abs/extra-testing/java-sun/jre.profile delete mode 100644 abs/extra-testing/joyutils/PKGBUILD delete mode 100644 abs/extra-testing/ladspa/PKGBUILD delete mode 100644 abs/extra-testing/ladspa/hardcode-path.patch delete mode 100644 abs/extra-testing/lcdproc/PKGBUILD delete mode 100644 abs/extra-testing/lcdproc/__changelog delete mode 100644 abs/extra-testing/lcdproc/lcdproc-add-serdisplib delete mode 100644 abs/extra-testing/lcdproc/lcdproc.install delete mode 100644 abs/extra-testing/libbonobo/PKGBUILD delete mode 100644 abs/extra-testing/libbonobo/bonobo-activation-config.xml delete mode 100644 abs/extra-testing/libbonobo/libbonobo.install delete mode 100644 abs/extra-testing/libbonoboui/PKGBUILD delete mode 100644 abs/extra-testing/libcdio/PKGBUILD delete mode 100644 abs/extra-testing/libdvdcss/PKGBUILD delete mode 100644 abs/extra-testing/libdvdnav/PKGBUILD delete mode 100644 abs/extra-testing/libebml/PKGBUILD delete mode 100644 abs/extra-testing/libffi/PKGBUILD delete mode 100644 abs/extra-testing/libffi/libffi.install delete mode 100644 abs/extra-testing/libftdi/PKGBUILD delete mode 100644 abs/extra-testing/libgda/Changelog delete mode 100644 abs/extra-testing/libgda/PKGBUILD delete mode 100644 abs/extra-testing/libgda/bdb43.patch delete mode 100644 abs/extra-testing/libgda/libgda.install delete mode 100644 abs/extra-testing/libgdiplus/PKGBUILD delete mode 100644 abs/extra-testing/libgdiplus/system-cairo.patch delete mode 100644 abs/extra-testing/libgksu/PKGBUILD delete mode 100644 abs/extra-testing/libgksu/libgksu.install delete mode 100644 abs/extra-testing/libgnome/PKGBUILD delete mode 100644 abs/extra-testing/libgnome/libgnome.install delete mode 100644 abs/extra-testing/libgnomecanvas/PKGBUILD delete mode 100644 abs/extra-testing/libgnomekbd/PKGBUILD delete mode 100644 abs/extra-testing/libgnomekbd/libgnomekbd.install delete mode 100644 abs/extra-testing/libgnomeui/PKGBUILD delete mode 100644 abs/extra-testing/libgtkhtml/PKGBUILD delete mode 100644 abs/extra-testing/libgtop/PKGBUILD delete mode 100644 abs/extra-testing/libgtop/libgtop.install delete mode 100644 abs/extra-testing/libidl2/PKGBUILD delete mode 100644 abs/extra-testing/libidl2/libidl2.install delete mode 100644 abs/extra-testing/libmatroska/PKGBUILD delete mode 100644 abs/extra-testing/libmikmod/PKGBUILD delete mode 100644 abs/extra-testing/libmms/PKGBUILD delete mode 100644 abs/extra-testing/libmng/PKGBUILD delete mode 100644 abs/extra-testing/libmpcdec/PKGBUILD delete mode 100644 abs/extra-testing/libmrss/PKGBUILD delete mode 100644 abs/extra-testing/libnl/PKGBUILD delete mode 100644 abs/extra-testing/libnl/ulong_max.patch delete mode 100644 abs/extra-testing/libnotify/PKGBUILD delete mode 100644 abs/extra-testing/libnxml/PKGBUILD delete mode 100644 abs/extra-testing/libsamplerate/ChangeLog delete mode 100644 abs/extra-testing/libsamplerate/PKGBUILD delete mode 100644 abs/extra-testing/libxfce4util/PKGBUILD delete mode 100644 abs/extra-testing/libxklavier/PKGBUILD delete mode 100644 abs/extra-testing/lm_sensors/ChangeLog delete mode 100644 abs/extra-testing/lm_sensors/PKGBUILD delete mode 100644 abs/extra-testing/lm_sensors/fancontrol.rc delete mode 100644 abs/extra-testing/lm_sensors/healthd delete mode 100644 abs/extra-testing/lm_sensors/healthd.conf delete mode 100644 abs/extra-testing/lm_sensors/healthd.rc delete mode 100644 abs/extra-testing/lm_sensors/sensord.conf delete mode 100644 abs/extra-testing/lm_sensors/sensord.rc delete mode 100644 abs/extra-testing/lm_sensors/sensors-detect.patch delete mode 100644 abs/extra-testing/lm_sensors/sensors.install delete mode 100644 abs/extra-testing/lm_sensors/sensors.rc delete mode 100644 abs/extra-testing/lynx/PKGBUILD delete mode 100644 abs/extra-testing/make/PKGBUILD delete mode 100644 abs/extra-testing/mc/PKGBUILD delete mode 100644 abs/extra-testing/mc/mc-4.6.1-bash-all.patch delete mode 100644 abs/extra-testing/mc/mc-4.6.1-find.patch delete mode 100644 abs/extra-testing/mc/mc-4.6.1-invalid-mtime.patch delete mode 100644 abs/extra-testing/mc/mc-4.6.1-largefile.patch delete mode 100644 abs/extra-testing/mc/mc-4.6.1-nonblock.patch delete mode 100644 abs/extra-testing/mdbtools/PKGBUILD delete mode 100644 abs/extra-testing/mdbtools/gmdb2.desktop delete mode 100644 abs/extra-testing/mediaserv/PKGBUILD delete mode 100644 abs/extra-testing/mediaserv/finish delete mode 100644 abs/extra-testing/mediaserv/linhes-mediaserv.tar.bz2 delete mode 100644 abs/extra-testing/mediaserv/mediaserv.install delete mode 100644 abs/extra-testing/mediaserv/mediaserv.no_daemon.patch delete mode 100644 abs/extra-testing/mediaserv/run delete mode 100755 abs/extra-testing/mednafen/PKGBUILD delete mode 100644 abs/extra-testing/mercurial/ChangeLog delete mode 100644 abs/extra-testing/mercurial/PKGBUILD delete mode 100644 abs/extra-testing/mime-types/PKGBUILD delete mode 100644 abs/extra-testing/mime-types/mime.types delete mode 100644 abs/extra-testing/mingetty/PKGBUILD delete mode 100644 abs/extra-testing/mingetty/mingetty-utf8.patch delete mode 100644 abs/extra-testing/miro/ChangeLog delete mode 100644 abs/extra-testing/miro/Changelog delete mode 100644 abs/extra-testing/miro/Miro-xulrunner.patch delete mode 100644 abs/extra-testing/miro/PKGBUILD delete mode 100644 abs/extra-testing/miro/boost_1.36.0_fix.patch delete mode 100644 abs/extra-testing/miro/miro-xine.patch delete mode 100644 abs/extra-testing/miro/miro.exec.patch delete mode 100644 abs/extra-testing/miro/miro.install delete mode 100644 abs/extra-testing/miro/miro_python26.patch delete mode 100644 abs/extra-testing/miro/missing-headers.patch delete mode 100644 abs/extra-testing/mkvtoolnix/PKGBUILD delete mode 100644 abs/extra-testing/monitorix-linhes.tar.gz delete mode 100644 abs/extra-testing/monitorix/PKGBUILD delete mode 100644 abs/extra-testing/monitorix/monitorix.install delete mode 100644 abs/extra-testing/monitorix/monitorix.rc.d delete mode 100644 abs/extra-testing/mono/PKGBUILD delete mode 100644 abs/extra-testing/mono/__changelog delete mode 100644 abs/extra-testing/mono/bug434892.patch delete mode 100644 abs/extra-testing/mono/mono.rc.d delete mode 100644 abs/extra-testing/most/PKGBUILD delete mode 100644 abs/extra-testing/most/most-debian.patch delete mode 100644 abs/extra-testing/mozilla-common/PKGBUILD delete mode 100755 abs/extra-testing/mozilla-common/mozilla-common.sh delete mode 100644 abs/extra-testing/mpeg_stat/PKGBUILD delete mode 100644 abs/extra-testing/mpgtx/PKGBUILD delete mode 100644 abs/extra-testing/mupen64plus-svn/PKGBUILD delete mode 100644 abs/extra-testing/mupen64plus-svn/fix-gcc4.4-const-char.patch delete mode 100644 abs/extra-testing/mupen64plus-svn/install.patch delete mode 100644 abs/extra-testing/mutt/PKGBUILD delete mode 100644 abs/extra-testing/mutt/mutt-unmailbox.patch delete mode 100644 abs/extra-testing/mutt/mutt.install delete mode 100755 abs/extra-testing/myt2xvid3/PKGBUILD delete mode 100644 abs/extra-testing/myt2xvid3/archive.php delete mode 100755 abs/extra-testing/myt2xvid3/myt2xvid3 delete mode 100755 abs/extra-testing/myt2xvid3/myt2xvid3-userjob.sh delete mode 100755 abs/extra-testing/myt2xvid3/myt2xvid3.install delete mode 100755 abs/extra-testing/myth2ipod/PKGBUILD delete mode 100755 abs/extra-testing/myth2ipod/iPod.pm delete mode 100755 abs/extra-testing/myth2ipod/m2iweb.php delete mode 100755 abs/extra-testing/myth2ipod/myth2ipod delete mode 100755 abs/extra-testing/myth2ipod/myth2ipod-userjob.sh delete mode 100755 abs/extra-testing/myth2ipod/myth2ipod.install delete mode 100644 abs/extra-testing/mythappletrailers/PKGBUILD delete mode 100644 abs/extra-testing/mythappletrailers/appletrailer.xml delete mode 100644 abs/extra-testing/mythappletrailers/fix_aple_url.sh delete mode 100755 abs/extra-testing/mythappletrailers/loading.sh delete mode 100755 abs/extra-testing/mythappletrailers/myth_trailers_grabber delete mode 100644 abs/extra-testing/mythappletrailers/mythappletrailers.install delete mode 100755 abs/extra-testing/mythappletrailers/trailers delete mode 100644 abs/extra-testing/mythexport/PKGBUILD delete mode 100644 abs/extra-testing/mythexport/mythexport.install delete mode 100644 abs/extra-testing/mythfeed/PKGBUILD delete mode 100644 abs/extra-testing/mythfeed/mythfeed.install delete mode 100644 abs/extra-testing/mythnuv2mkv/PKGBUILD delete mode 100644 abs/extra-testing/mythnuv2mkv/mythnuv2mkv.patch delete mode 100644 abs/extra-testing/mythtv-contrib/6200ch.tar.gz delete mode 100644 abs/extra-testing/mythtv-contrib/PKGBUILD delete mode 100644 abs/extra-testing/mythtv-contrib/dct-channel_make.patch delete mode 100644 abs/extra-testing/mythtv-contrib/mythchanger.10f.beta.tar delete mode 100644 abs/extra-testing/mythtv-contrib/mythchanger_make.patch delete mode 100644 abs/extra-testing/mythtv-contrib/mythtv-contrib.install delete mode 100644 abs/extra-testing/mythtv-contrib/xbmc_mythlink.tgz delete mode 100644 abs/extra-testing/neon/PKGBUILD delete mode 100644 abs/extra-testing/netkit-bsd-finger/LICENSE delete mode 100644 abs/extra-testing/netkit-bsd-finger/PKGBUILD delete mode 100644 abs/extra-testing/netkit-bsd-finger/finger.xinetd delete mode 100644 abs/extra-testing/nspr/PKGBUILD delete mode 100644 abs/extra-testing/nspr/nspr.pc.in delete mode 100644 abs/extra-testing/nss/PKGBUILD delete mode 100644 abs/extra-testing/nss/nss-config.in delete mode 100644 abs/extra-testing/nss/nss-nolocalsql.patch delete mode 100644 abs/extra-testing/nss/nss.pc.in delete mode 100644 abs/extra-testing/numlockx/PKGBUILD delete mode 100755 abs/extra-testing/nvram-wakup/PKGBUILD delete mode 100644 abs/extra-testing/ocaml/PKGBUILD delete mode 100644 abs/extra-testing/openjdk6/PKGBUILD delete mode 100644 abs/extra-testing/openjdk6/aatext_by_default.diff delete mode 100644 abs/extra-testing/openjdk6/fix_corba_cmds_path.diff delete mode 100644 abs/extra-testing/openjdk6/fix_jdk_cmds_path.diff delete mode 100644 abs/extra-testing/openjdk6/fontconfig-paths.diff delete mode 100644 abs/extra-testing/openjdk6/gcjwebplugin_xulrunner.diff delete mode 100644 abs/extra-testing/openjdk6/openjdk6.install delete mode 100644 abs/extra-testing/openjdk6/openjdk6.profile delete mode 100644 abs/extra-testing/openjpeg/30_fix_build_for_debian.dpatch delete mode 100644 abs/extra-testing/openjpeg/PKGBUILD delete mode 100644 abs/extra-testing/openslp/PKGBUILD delete mode 100755 abs/extra-testing/openslp/rc.slpd delete mode 100644 abs/extra-testing/opera/PKGBUILD delete mode 100644 abs/extra-testing/opera/opera-qt4-theme.patch delete mode 100644 abs/extra-testing/opera/opera.desktop delete mode 100644 abs/extra-testing/opera/opera_logo48.png delete mode 100644 abs/extra-testing/orbit2/PKGBUILD delete mode 100644 abs/extra-testing/oss/PKGBUILD delete mode 100644 abs/extra-testing/oss/hg-fix-devc.diff delete mode 100644 abs/extra-testing/oss/hg-latest-fixes.diff delete mode 100644 abs/extra-testing/oss/oss.install delete mode 100644 abs/extra-testing/oss/oss.rc delete mode 100644 abs/extra-testing/oss/oss.rm-init-scripts.patch delete mode 100644 abs/extra-testing/p7zip/PKGBUILD delete mode 100644 abs/extra-testing/perl-yaml/PKGBUILD delete mode 100755 abs/extra-testing/phpmyadmin/PKGBUILD delete mode 100644 abs/extra-testing/pm-quirks/PKGBUILD delete mode 100644 abs/extra-testing/pmount/PKGBUILD delete mode 100644 abs/extra-testing/pmount/pmount-dbus-close.patch delete mode 100644 abs/extra-testing/polkit-gnome/PKGBUILD delete mode 100644 abs/extra-testing/polkit/PKGBUILD delete mode 100644 abs/extra-testing/polkit/polkit.pam delete mode 100644 abs/extra-testing/poppler-data/PKGBUILD delete mode 100644 abs/extra-testing/poppler/PKGBUILD delete mode 100644 abs/extra-testing/postfix/PKGBUILD delete mode 100644 abs/extra-testing/postfix/__changelog delete mode 100755 abs/extra-testing/postfix/postfix delete mode 100644 abs/extra-testing/postfix/postfix.install delete mode 100644 abs/extra-testing/postfix/postfix.patch.bz2 delete mode 100644 abs/extra-testing/postgresql-libs/PKGBUILD delete mode 100644 abs/extra-testing/postgresql/PKGBUILD delete mode 100644 abs/extra-testing/postgresql/build.patch delete mode 100755 abs/extra-testing/postgresql/postgresql delete mode 100644 abs/extra-testing/postgresql/postgresql.confd delete mode 100644 abs/extra-testing/postgresql/postgresql.pam delete mode 100644 abs/extra-testing/powertop/ChangeLog delete mode 100644 abs/extra-testing/powertop/PKGBUILD delete mode 100644 abs/extra-testing/procmail/PKGBUILD delete mode 100644 abs/extra-testing/pth/PKGBUILD delete mode 100644 abs/extra-testing/pycrypto/PKGBUILD delete mode 100644 abs/extra-testing/pyopenssl/PKGBUILD delete mode 100644 abs/extra-testing/pyorbit/PKGBUILD delete mode 100644 abs/extra-testing/pyqt/ChangeLog delete mode 100644 abs/extra-testing/pyqt/PKGBUILD delete mode 100644 abs/extra-testing/pyrex/ChangeLog delete mode 100644 abs/extra-testing/pyrex/PKGBUILD delete mode 100644 abs/extra-testing/python-geoip/PKGBUILD delete mode 100644 abs/extra-testing/python-lxml/PKGBUILD delete mode 100644 abs/extra-testing/python-m2crypto/PKGBUILD delete mode 100644 abs/extra-testing/python-pybluez/PKGBUILD delete mode 100755 abs/extra-testing/python-pymedia/PKGBUILD delete mode 100644 abs/extra-testing/python-pyserial/PKGBUILD delete mode 100644 abs/extra-testing/pyusb/PKGBUILD delete mode 100644 abs/extra-testing/qscintilla/ChangeLog delete mode 100644 abs/extra-testing/qscintilla/PKGBUILD delete mode 100644 abs/extra-testing/quilt/PKGBUILD delete mode 100644 abs/extra-testing/rarian/PKGBUILD delete mode 100644 abs/extra-testing/rarian/user-segfault.patch delete mode 100644 abs/extra-testing/read-edid/PKGBUILD delete mode 100644 abs/extra-testing/recstat/PKGBUILD delete mode 100644 abs/extra-testing/recstat/recstat delete mode 100644 abs/extra-testing/recstat/recstat.install delete mode 100644 abs/extra-testing/recstat/recstat.py delete mode 100755 abs/extra-testing/recstat/run delete mode 100644 abs/extra-testing/rhino/PKGBUILD delete mode 100644 abs/extra-testing/romdb/PKGBUILD delete mode 100644 abs/extra-testing/romdb/romdb.install delete mode 100644 abs/extra-testing/rrd_stats/PKGBUILD delete mode 100644 abs/extra-testing/rrd_stats/rrd_stats.install delete mode 100644 abs/extra-testing/rrd_stats/rrd_stats.tgz delete mode 100644 abs/extra-testing/rrd_stats/run_rrd.sh delete mode 100644 abs/extra-testing/rrdtool/ChangeLog delete mode 100644 abs/extra-testing/rrdtool/PKGBUILD delete mode 100644 abs/extra-testing/rtmpdump/PKGBUILD delete mode 100644 abs/extra-testing/ruby/PKGBUILD delete mode 100644 abs/extra-testing/sample-media/PKGBUILD delete mode 100644 abs/extra-testing/sample-media/audio/05-Hush.mp3 delete mode 100644 abs/extra-testing/sample-media/images/115_1573.jpg delete mode 100644 abs/extra-testing/sample-media/images/345-1217206791B81W.jpg delete mode 100644 abs/extra-testing/sample-media/images/classic-menugraph.png delete mode 100644 abs/extra-testing/sample-media/images/dvr_menugraph.png delete mode 100644 abs/extra-testing/sample-media/images/menu_diagram_color.png delete mode 100644 abs/extra-testing/sample-media/rom/PACMAN.SMC delete mode 100644 abs/extra-testing/sample-media/sample.install delete mode 100644 abs/extra-testing/sample-media/video/TripThe1939.mpeg delete mode 100644 abs/extra-testing/scanfw/PKGBUILD delete mode 100644 abs/extra-testing/scanfw/scanfw-98d.beta.tar.gz delete mode 100644 abs/extra-testing/scanfw/scanfw.install delete mode 100644 abs/extra-testing/scte65scan/PKGBUILD delete mode 100644 abs/extra-testing/sdl_gfx/PKGBUILD delete mode 100644 abs/extra-testing/sdl_image/PKGBUILD delete mode 100644 abs/extra-testing/sdl_image/SDL_image-IMG_lbm.patch delete mode 100644 abs/extra-testing/sdl_image/SDL_image-buffer-overflow.patch delete mode 100644 abs/extra-testing/sdl_mixer/PKGBUILD delete mode 100644 abs/extra-testing/sdl_net/PKGBUILD delete mode 100644 abs/extra-testing/sdl_pango/PKGBUILD delete mode 100644 abs/extra-testing/sdl_pango/SDL_Pango-0.1.2-API-adds.patch delete mode 100644 abs/extra-testing/sdl_perl/PKGBUILD delete mode 100644 abs/extra-testing/sdl_sound/PKGBUILD delete mode 100644 abs/extra-testing/sdl_sound/flac.patch delete mode 100644 abs/extra-testing/sdl_ttf/PKGBUILD delete mode 100644 abs/extra-testing/sdlmame/ChangeLog delete mode 100644 abs/extra-testing/sdlmame/PKGBUILD delete mode 100644 abs/extra-testing/sdlmame/extras.tar.gz delete mode 100644 abs/extra-testing/sdlmame/mame-0137-wiimote.diff delete mode 100644 abs/extra-testing/sdlmame/sdlmame.install delete mode 100644 abs/extra-testing/sdlmame/sdlmame.sh delete mode 100644 abs/extra-testing/serdisplib/PKGBUILD delete mode 100644 abs/extra-testing/shepherd/PKGBUILD delete mode 100644 abs/extra-testing/sip/ChangeLog delete mode 100644 abs/extra-testing/sip/PKGBUILD delete mode 100644 abs/extra-testing/slang/ChangeLog delete mode 100644 abs/extra-testing/slang/PKGBUILD delete mode 100644 abs/extra-testing/smartmontools/PKGBUILD delete mode 100644 abs/extra-testing/smartmontools/smartd delete mode 100644 abs/extra-testing/smpeg/PKGBUILD delete mode 100644 abs/extra-testing/smpeg/smpeg-0.4.4-gcc41.patch delete mode 100644 abs/extra-testing/snes9x/PKGBUILD delete mode 100644 abs/extra-testing/snes9x/snes9x-fixes2.patch delete mode 100755 abs/extra-testing/snes9x/snes9x.install delete mode 100644 abs/extra-testing/speex/PKGBUILD delete mode 100644 abs/extra-testing/spidermonkey/PKGBUILD delete mode 100644 abs/extra-testing/spidermonkey/header.patch delete mode 100644 abs/extra-testing/spidermonkey/spidermonkey-1.7-threadsafe.patch delete mode 100644 abs/extra-testing/startup-notification/PKGBUILD delete mode 100644 abs/extra-testing/strace/PKGBUILD delete mode 100644 abs/extra-testing/strace/no_linux_socket_h.patch delete mode 100644 abs/extra-testing/subversion/ChangeLog delete mode 100644 abs/extra-testing/subversion/PKGBUILD delete mode 100644 abs/extra-testing/subversion/__changelog delete mode 100644 abs/extra-testing/subversion/subversion-neon.patch delete mode 100644 abs/extra-testing/subversion/subversion.rpath.fix.patch delete mode 100644 abs/extra-testing/subversion/subversion.suppress.deprecation.warnings.patch delete mode 100644 abs/extra-testing/subversion/svn delete mode 100644 abs/extra-testing/subversion/svnmerge.py delete mode 100755 abs/extra-testing/subversion/svnserve delete mode 100644 abs/extra-testing/subversion/svnserve.conf delete mode 100644 abs/extra-testing/swh-plugins/PKGBUILD delete mode 100644 abs/extra-testing/swig/PKGBUILD delete mode 100644 abs/extra-testing/sysstat/PKGBUILD delete mode 100644 abs/extra-testing/sysstat/sysstat delete mode 100644 abs/extra-testing/tablet-encode/PKGBUILD delete mode 100644 abs/extra-testing/tango-icon-theme/PKGBUILD delete mode 100644 abs/extra-testing/tatir/PKGBUILD delete mode 100644 abs/extra-testing/tatir/tatir.install delete mode 100644 abs/extra-testing/tatir/tatir.tar.bz2 delete mode 100644 abs/extra-testing/terminal/PKGBUILD delete mode 100644 abs/extra-testing/terminal/terminal-dont-die-on-dbus-kill.patch delete mode 100644 abs/extra-testing/terminal/terminal.install delete mode 100644 abs/extra-testing/terminus-font/PKGBUILD delete mode 100644 abs/extra-testing/terminus-font/install.proto delete mode 100644 abs/extra-testing/terminus-font/terminus-font.install delete mode 100644 abs/extra-testing/thunar/PKGBUILD delete mode 100644 abs/extra-testing/thunar/__changelog delete mode 100644 abs/extra-testing/thunar/thunar.install delete mode 100644 abs/extra-testing/tightvnc/PKGBUILD delete mode 100644 abs/extra-testing/tightvnc/tightvnc-fontpath-xcolors.patch delete mode 100644 abs/extra-testing/tree/PKGBUILD delete mode 100644 abs/extra-testing/ttf-ms-fonts/PKGBUILD delete mode 100644 abs/extra-testing/ttf-ms-fonts/ttf-ms-fonts.install delete mode 100644 abs/extra-testing/unetbootin/PKGBUILD delete mode 100644 abs/extra-testing/unison/PKGBUILD delete mode 100644 abs/extra-testing/unison/unison.desktop delete mode 100644 abs/extra-testing/unison/unison.install delete mode 100644 abs/extra-testing/unixodbc/PKGBUILD delete mode 100644 abs/extra-testing/v4l-dvb-dvico2/PKGBUILD delete mode 100644 abs/extra-testing/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch delete mode 100644 abs/extra-testing/v4l-dvb-dvico2/v4l-dvb.install delete mode 100644 abs/extra-testing/v4l-dvb-dvico2/xc-bluebird.patch delete mode 100644 abs/extra-testing/vcdimager/PKGBUILD delete mode 100644 abs/extra-testing/vcdimager/__changelog delete mode 100644 abs/extra-testing/vcdimager/cdio.patch delete mode 100644 abs/extra-testing/vim/PKGBUILD delete mode 100644 abs/extra-testing/vim/__changelog delete mode 100644 abs/extra-testing/vim/fetch_patches.sh delete mode 100644 abs/extra-testing/vim/vim.install delete mode 100644 abs/extra-testing/vorbis-tools/ChangeLog delete mode 100644 abs/extra-testing/vorbis-tools/PKGBUILD delete mode 100644 abs/extra-testing/vorbis-tools/curl.patch delete mode 100644 abs/extra-testing/vorbis-tools/vorbis-tools-1.1.1-flac_gt_1.1.3_support.patch delete mode 100644 abs/extra-testing/vte/PKGBUILD delete mode 100644 abs/extra-testing/vte/vte-0.16.0-reaper-python-bindings.patch delete mode 100644 abs/extra-testing/wavpack/PKGBUILD delete mode 100644 abs/extra-testing/webmin/PKGBUILD delete mode 100644 abs/extra-testing/webmin/run delete mode 100644 abs/extra-testing/webmin/webmin-config.tar.bz2 delete mode 100644 abs/extra-testing/webmin/webmin-pacman.tar.bz2 delete mode 100644 abs/extra-testing/webmin/webmin.install delete mode 100644 abs/extra-testing/webmin/webmin.rc delete mode 100644 abs/extra-testing/windowmaker/PKGBUILD delete mode 100644 "abs/extra-testing/windowmaker/windowmaker\n.build.log" delete mode 100644 abs/extra-testing/windowmaker/windowmaker-gcc4.patch.tar.bz2 delete mode 100644 abs/extra-testing/wireshark/PKGBUILD delete mode 100644 abs/extra-testing/wireshark/wireshark.desktop delete mode 100644 abs/extra-testing/wireshark/wireshark.png delete mode 100755 abs/extra-testing/wol/PKGBUILD delete mode 100755 abs/extra-testing/wol/wakeonlan.sh delete mode 100644 abs/extra-testing/wxgtk/ChangeLog delete mode 100644 abs/extra-testing/wxgtk/PKGBUILD delete mode 100644 abs/extra-testing/wxgtk/__changelog delete mode 100644 abs/extra-testing/wxgtk/gsocket.patch delete mode 100644 abs/extra-testing/wxgtk/overflow.patch delete mode 100644 abs/extra-testing/x11vnc/PKGBUILD delete mode 100644 abs/extra-testing/xalan-java/PKGBUILD delete mode 100644 abs/extra-testing/xautomation/PKGBUILD delete mode 100644 abs/extra-testing/xbmc-svn/CHANGELOG delete mode 100644 abs/extra-testing/xbmc-svn/Lircmap.xml delete mode 100644 abs/extra-testing/xbmc-svn/PKGBUILD delete mode 100644 abs/extra-testing/xbmc-svn/__changelog delete mode 100644 abs/extra-testing/xbmc-svn/xbmc-svn.install delete mode 100644 abs/extra-testing/xbmc/FEH.sh delete mode 100644 abs/extra-testing/xbmc/Lircmap.xml delete mode 100644 abs/extra-testing/xbmc/PKGBUILD delete mode 100644 abs/extra-testing/xbmc/__changelog delete mode 100644 abs/extra-testing/xbmc/use_cdio_system_headers_on_non_win32.patch delete mode 100644 abs/extra-testing/xbmc/xbmc.install delete mode 100644 abs/extra-testing/xdg-utils/PKGBUILD delete mode 100644 abs/extra-testing/xe/PKGBUILD delete mode 100644 abs/extra-testing/xe/xe.install delete mode 100644 abs/extra-testing/xerces2-java/PKGBUILD delete mode 100644 abs/extra-testing/xfsdump/PKGBUILD delete mode 100644 abs/extra-testing/xine-lib/ChangeLog delete mode 100644 abs/extra-testing/xine-lib/PKGBUILD delete mode 100644 abs/extra-testing/xine-lib/__changelog delete mode 100644 abs/extra-testing/xine-lib/xine-header.patch delete mode 100644 abs/extra-testing/xine-lib/xine-imagemagick.patch delete mode 100644 abs/extra-testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch delete mode 100755 abs/extra-testing/xine-lib/xine.install delete mode 100644 abs/extra-testing/xine-ui/ChangeLog delete mode 100644 abs/extra-testing/xine-ui/PKGBUILD delete mode 100644 abs/extra-testing/xinetd/PKGBUILD delete mode 100644 abs/extra-testing/xinetd/servers delete mode 100644 abs/extra-testing/xinetd/services delete mode 100755 abs/extra-testing/xinetd/xinetd delete mode 100644 abs/extra-testing/xinetd/xinetd-2.3.14.tar.gz delete mode 100644 abs/extra-testing/xinetd/xinetd.conf delete mode 100644 abs/extra-testing/xmbmon/Makefile.in.patch delete mode 100644 abs/extra-testing/xmbmon/PKGBUILD delete mode 100644 abs/extra-testing/xmlto/PKGBUILD delete mode 100644 abs/extra-testing/xmms/PKGBUILD delete mode 100644 abs/extra-testing/xmms/id3v2.patch delete mode 100644 abs/extra-testing/xmms/xmms-1.2.10-crossfade-0.3.9.patch delete mode 100644 abs/extra-testing/xmms/xmms-fix.diff delete mode 100644 abs/extra-testing/xmms/xmms-menu.patch delete mode 100644 abs/extra-testing/xscreensaver/ChangeLog delete mode 100644 abs/extra-testing/xscreensaver/LICENSE delete mode 100644 abs/extra-testing/xscreensaver/PKGBUILD delete mode 100644 abs/extra-testing/xscreensaver/__changelog delete mode 100644 abs/extra-testing/xscreensaver/xscreensaver delete mode 100644 abs/extra-testing/xscreensaver/xscreensaver.install delete mode 100644 abs/extra-testing/xscreensaver/xscreensaver.pam delete mode 100644 abs/extra-testing/xscreensaver/xscreensavers delete mode 100644 abs/extra-testing/xulrunner/PKGBUILD delete mode 100644 abs/extra-testing/xulrunner/mozconfig delete mode 100644 abs/extra-testing/xulrunner/xulrunner.install delete mode 100644 abs/extra-testing/zip/ChangeLog delete mode 100644 abs/extra-testing/zip/PKGBUILD delete mode 100644 abs/extra-testing/zip/zip-3.0-build.patch delete mode 100644 abs/extra-testing/zip/zip-3.0-exec-stack.patch delete mode 100644 abs/extra-testing/zip/zip-3.0-no-crypt.patch delete mode 100644 abs/extra-testing/zip/zip-3.0-pic.patch create mode 100644 abs/extra/alsa-firmware/PKGBUILD delete mode 100644 abs/extra/bluez/rc.bluetooth delete mode 100644 abs/extra/community/cwiid-svn/PKGBUILD delete mode 100644 abs/extra/community/cwiid-svn/cwiid.install delete mode 100644 abs/extra/community/jre/PKGBUILD delete mode 100644 abs/extra/community/jre/jre.install delete mode 100644 abs/extra/community/jre/jre.profile delete mode 100644 abs/extra/community/libmatroska/PKGBUILD delete mode 100644 abs/extra/community/libmpcdec/PKGBUILD delete mode 100644 abs/extra/community/moblockcontrol/PKGBUILD delete mode 100644 abs/extra/community/moblockcontrol/moblock-control-update.sh delete mode 100644 abs/extra/community/moblockcontrol/moblock_control.patch delete mode 100644 abs/extra/community/moblockcontrol/moblockcontrol.install delete mode 100644 abs/extra/community/mre/livescores.tgz create mode 120000 abs/extra/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/PKGBUILD create mode 120000 abs/extra/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/torrentflux.install delete mode 100644 abs/extra/community/transmission-cli/ChangeLog delete mode 100644 abs/extra/community/transmission-cli/transmissiond delete mode 100644 abs/extra/community/xbmc-svn/CHANGELOG delete mode 100644 abs/extra/community/xbmc-svn/Lircmap.xml delete mode 100644 abs/extra/community/xbmc-svn/PKGBUILD delete mode 100644 abs/extra/community/xbmc-svn/__changelog delete mode 100644 abs/extra/community/xbmc-svn/libcurl-not-in-lib64.patch delete mode 100644 abs/extra/community/xbmc-svn/xbmc-svn.install delete mode 100644 abs/extra/community/xbmc/ChangeLog delete mode 100644 abs/extra/community/xbmc/PKGBUILD delete mode 100644 abs/extra/community/xbmc/xbmc.install create mode 100644 abs/extra/consolekit/PKGBUILD create mode 100644 abs/extra/consolekit/add_since_option.patch create mode 100644 abs/extra/consolekit/consolekit.logrotate create mode 100644 abs/extra/consolekit/nodaemon.patch create mode 100644 abs/extra/consolekit/pam-foreground-compat.ck create mode 100644 abs/extra/consolekit/reorder-initialization.patch create mode 100644 abs/extra/cups/PKGBUILD create mode 100755 abs/extra/cups/cups create mode 100644 abs/extra/cups/cups-1.3.7-peercred.patch create mode 100644 abs/extra/cups/cups-avahi.patch create mode 100644 abs/extra/cups/cups.install create mode 100644 abs/extra/cups/cups.logrotate create mode 100644 abs/extra/cups/cups.pam create mode 100644 abs/extra/cups/fix-infinite-usb-loop.patch create mode 100644 abs/extra/cvs/cvs-1.11.23-getline64.patch create mode 100644 abs/extra/cvs/cvs.install delete mode 100644 abs/extra/ddclient/ChangeLog delete mode 100644 abs/extra/ddclient/ddclient.conf.d delete mode 100644 abs/extra/ddclient/ddclient.install delete mode 100644 abs/extra/ddclient/ddclient.rc delete mode 100644 abs/extra/gconf/05_from_vuntz_gconf2-pk-default-path.patch delete mode 100644 abs/extra/gconf/xml-gettext-domain.patch create mode 100644 abs/extra/gnome-common/PKGBUILD create mode 100644 abs/extra/gnome-vfs/gnutls-config.patch delete mode 100644 abs/extra/irqbalance/irqbalance.rc.d create mode 100644 abs/extra/java-sun/PKGBUILD create mode 100644 abs/extra/java-sun/java-control-panel.desktop create mode 100644 abs/extra/java-sun/java-monitoring-and-management-console.desktop create mode 100644 abs/extra/java-sun/java-policy-settings.desktop create mode 100644 abs/extra/java-sun/java-visualvm.desktop create mode 100644 abs/extra/java-sun/java-web-start.desktop create mode 100644 abs/extra/java-sun/jdk.install create mode 100644 abs/extra/java-sun/jdk.profile create mode 100644 abs/extra/java-sun/jre.install create mode 100644 abs/extra/java-sun/jre.profile delete mode 100755 abs/extra/lcdproc/lcdd create mode 100644 abs/extra/libffi/PKGBUILD create mode 100644 abs/extra/libffi/libffi.install delete mode 100644 abs/extra/libglade/PKGBUILD delete mode 100644 abs/extra/libglade/glade.install delete mode 100644 abs/extra/libglade/libglade-2.0.1-nowarning.patch create mode 100644 abs/extra/libmng/PKGBUILD delete mode 100644 abs/extra/libxp/PKGBUILD delete mode 100755 abs/extra/nvram-wake/PKGBUILD create mode 100644 abs/extra/openjpeg/30_fix_build_for_debian.dpatch create mode 100644 abs/extra/openjpeg/PKGBUILD create mode 100644 abs/extra/openslp/PKGBUILD create mode 100755 abs/extra/openslp/rc.slpd create mode 100644 abs/extra/pm-quirks/PKGBUILD delete mode 100644 abs/extra/policykit-gnome/PKGBUILD delete mode 100644 abs/extra/policykit-gnome/policykit-gnome.install delete mode 100644 abs/extra/policykit/PKGBUILD delete mode 100644 abs/extra/policykit/entry-leak.patch delete mode 100644 abs/extra/policykit/pk-ck-api-change.patch delete mode 100644 abs/extra/policykit/policykit.install delete mode 100644 abs/extra/policykit/polkit-0.8-dbus-policy.patch delete mode 100644 abs/extra/policykit/polkit.pam create mode 100644 abs/extra/polkit-gnome/PKGBUILD create mode 100644 abs/extra/polkit/PKGBUILD create mode 100644 abs/extra/polkit/polkit.pam create mode 100644 abs/extra/poppler-data/PKGBUILD create mode 100644 abs/extra/poppler/PKGBUILD delete mode 100644 abs/extra/printproto/PKGBUILD delete mode 100755 abs/extra/removecommercials/PKGBUILD delete mode 100755 abs/extra/removecommercials/removecommercials create mode 100644 abs/extra/subversion/__changelog create mode 100644 abs/extra/subversion/subversion.rpath.fix.patch create mode 100644 abs/extra/subversion/subversion.suppress.deprecation.warnings.patch create mode 100644 abs/extra/subversion/svnmerge.py delete mode 100644 abs/extra/unison/ocaml-3.08-extnames.patch create mode 100644 "abs/extra/windowmaker/windowmaker\n.build.log" delete mode 100644 abs/mv-core/MythVantage-config/.kdbgrc.mythinstall delete mode 100755 abs/mv-core/MythVantage-config/MythVantage.sh delete mode 100755 abs/mv-core/MythVantage-config/PKGBUILD delete mode 100755 abs/mv-core/MythVantage-config/add_service.sh delete mode 100755 abs/mv-core/MythVantage-config/autocard.py delete mode 100755 abs/mv-core/MythVantage-config/bpopup-ui.xml delete mode 100755 abs/mv-core/MythVantage-config/build_diskless.sh delete mode 100644 abs/mv-core/MythVantage-config/builddir delete mode 100755 abs/mv-core/MythVantage-config/checkout_MythVantage.sh delete mode 100755 abs/mv-core/MythVantage-config/copy-back.sh delete mode 100755 abs/mv-core/MythVantage-config/copy-to-mythbase.sh delete mode 100755 abs/mv-core/MythVantage-config/create_master.sh delete mode 100755 abs/mv-core/MythVantage-config/file_time_offset.py delete mode 100755 abs/mv-core/MythVantage-config/install-ui.xml delete mode 100755 abs/mv-core/MythVantage-config/install_db_chroot.sh delete mode 100755 abs/mv-core/MythVantage-config/install_functions.sh delete mode 100755 abs/mv-core/MythVantage-config/install_proxy.sh delete mode 100644 abs/mv-core/MythVantage-config/issue delete mode 100755 abs/mv-core/MythVantage-config/live-install.sh delete mode 100644 abs/mv-core/MythVantage-config/live.install delete mode 100755 abs/mv-core/MythVantage-config/mv_advanced.py delete mode 100755 abs/mv-core/MythVantage-config/mv_common.py delete mode 100755 abs/mv-core/MythVantage-config/mv_config.py delete mode 100755 abs/mv-core/MythVantage-config/mv_hostype.py delete mode 100755 abs/mv-core/MythVantage-config/mv_install.py delete mode 100755 abs/mv-core/MythVantage-config/mv_ir.py delete mode 100755 abs/mv-core/MythVantage-config/mv_misc.py delete mode 100755 abs/mv-core/MythVantage-config/mv_network.py delete mode 100755 abs/mv-core/MythVantage-config/mv_screensaver.py delete mode 100755 abs/mv-core/MythVantage-config/mv_smolt.py delete mode 100755 abs/mv-core/MythVantage-config/mv_software.py delete mode 100755 abs/mv-core/MythVantage-config/mv_webuser.py delete mode 100644 abs/mv-core/MythVantage-config/myth_user_call delete mode 100755 abs/mv-core/MythVantage-config/myth_user_call.py delete mode 100644 abs/mv-core/MythVantage-config/mythvantage-release delete mode 100644 abs/mv-core/MythVantage-config/networkconfig.sh delete mode 100755 abs/mv-core/MythVantage-config/remove_service.sh delete mode 100755 abs/mv-core/MythVantage-config/restore_default_settings.sh delete mode 100755 abs/mv-core/MythVantage-config/soundconfig.sh delete mode 100755 abs/mv-core/MythVantage-config/startx delete mode 100755 abs/mv-core/MythVantage-config/systemconfig.py delete mode 100755 abs/mv-core/MythVantage-config/systemconfig.sh delete mode 100644 abs/mv-core/MythVantage-config/templates/LCD/Shuttle-SG33/LCDd.conf delete mode 100644 abs/mv-core/MythVantage-config/templates/LCD/Silverstone/LCDd.conf delete mode 100644 abs/mv-core/MythVantage-config/templates/LCD/Silverstone/modules delete mode 100644 abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/LCDd.conf delete mode 100644 abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/lircd.conf delete mode 100644 abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/lircrc delete mode 100644 abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/modules delete mode 100644 abs/mv-core/MythVantage-config/templates/LCD/xosd/LCDd.conf delete mode 100644 abs/mv-core/MythVantage-config/templates/audio/space_battle_A.wav delete mode 100755 abs/mv-core/MythVantage-config/templates/cc.orig.sh delete mode 100755 abs/mv-core/MythVantage-config/templates/cc.sh delete mode 100755 abs/mv-core/MythVantage-config/templates/cc_vol.sh delete mode 100755 abs/mv-core/MythVantage-config/templates/change_chan.sh delete mode 100644 abs/mv-core/MythVantage-config/templates/cron.template delete mode 100644 abs/mv-core/MythVantage-config/templates/etcnet/eth/ipv4address delete mode 100644 abs/mv-core/MythVantage-config/templates/etcnet/eth/ipv4route delete mode 100644 abs/mv-core/MythVantage-config/templates/etcnet/eth/iwconfig delete mode 100644 abs/mv-core/MythVantage-config/templates/etcnet/eth/options delete mode 100644 abs/mv-core/MythVantage-config/templates/evrouter/MythVantage-4 delete mode 100644 abs/mv-core/MythVantage-config/templates/evrouter/MythVantage-8 delete mode 100644 abs/mv-core/MythVantage-config/templates/evrouter/MythVantage-Full delete mode 100644 abs/mv-core/MythVantage-config/templates/evrouter/MythVantage8-minipac delete mode 100644 abs/mv-core/MythVantage-config/templates/evrouter/MythVantage8-uhid delete mode 100644 abs/mv-core/MythVantage-config/templates/exports.template delete mode 100755 abs/mv-core/MythVantage-config/templates/fstab.conf.template delete mode 100644 abs/mv-core/MythVantage-config/templates/modules/lirc_i2c.conf delete mode 100644 abs/mv-core/MythVantage-config/templates/mysql.service delete mode 100755 abs/mv-core/MythVantage-config/templates/mysql.txt delete mode 100755 abs/mv-core/MythVantage-config/templates/ncid.conf.template delete mode 100644 abs/mv-core/MythVantage-config/templates/ncidd.conf.template delete mode 100755 abs/mv-core/MythVantage-config/templates/real_change_chan.sh delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/ATI_wonder/lircd.ATI.conf delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/ATI_wonder/lircrc-atiwonder.txt delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/ATI_wonder/preview.jpg delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/MX-500-jams/lircd.conf.MX-500-JAMS delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/MX-500-jams/lircrc delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/MX-500-jams/preview.jpg delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/MythVantage-one/lircd.conf delete mode 100755 abs/mv-core/MythVantage-config/templates/remotes/MythVantage-one/lircrc delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/MythVantage-one/preview.jpg delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/RadioShack_15-2116-Jarod_Wilson/lircd-rs.conf delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/RadioShack_15-2116-Jarod_Wilson/lircrc-rs delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/RadioShack_15-2116-Jarod_Wilson/preview.jpg delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/gr8zap/lircd.conf.streamzap delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/gr8zap/lircrc delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/gr8zap/preview.jpg delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/hauppauge/lircd.conf.hauppauge delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/hauppauge/lircmd.conf.hauppauge delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/hauppauge/preview.jpg delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/i2c.id delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/imon-pad/lircd.conf delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/imon-pad/lircrc delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/imon-pad/preview.jpg delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/mceusb/lircd-mceusb.conf delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/mceusb/lircrc-mceusb delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/mceusb/preview.jpg delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/no_remote/preview.jpg delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/one-for-juski/lircd.conf.juski delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/one-for-juski/lircrc delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/one-for-juski/preview.jpg delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/receiver_usb.id delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/snapstream_firefly/lircd.snapstrm.conf delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/snapstream_firefly/lircrc-snapstrm.txt delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/snapstream_firefly/preview.jpg delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/streamzap/lircd.conf.streamzap delete mode 100755 abs/mv-core/MythVantage-config/templates/remotes/streamzap/lircrc delete mode 100644 abs/mv-core/MythVantage-config/templates/remotes/streamzap/preview.jpg delete mode 100755 abs/mv-core/MythVantage-config/templates/samba/smb.conf.home delete mode 100755 abs/mv-core/MythVantage-config/templates/samba/smb.conf.media delete mode 100644 abs/mv-core/MythVantage-config/templates/samba/smb.conf.template delete mode 100644 abs/mv-core/MythVantage-config/templates/settings/default_1/keybindings.txt delete mode 100644 abs/mv-core/MythVantage-config/templates/settings/default_1/settings.txt delete mode 100644 abs/mv-core/MythVantage-config/templates/settings/default_2/keybindings.txt delete mode 100644 abs/mv-core/MythVantage-config/templates/settings/default_2/settings.txt delete mode 100644 abs/mv-core/MythVantage-config/templates/sources/mv-core delete mode 100644 abs/mv-core/MythVantage-config/templates/sources/mv-core-testing delete mode 100644 abs/mv-core/MythVantage-config/templates/sources/mv-extra delete mode 100644 abs/mv-core/MythVantage-config/templates/sources/mv-extra-testing delete mode 100644 abs/mv-core/MythVantage-config/templates/sources/svc_pkg delete mode 100755 abs/mv-core/MythVantage-config/templates/transmit/Time_Warner_SA3250/lircd.conf delete mode 100644 abs/mv-core/MythVantage-config/templates/xine.config.template delete mode 100644 abs/mv-core/MythVantage-config/templates/xorg/96xx_supported.txt delete mode 100644 abs/mv-core/MythVantage-config/templates/xorg/modeline.ATSC delete mode 100644 abs/mv-core/MythVantage-config/templates/xorg/modeline.DVD delete mode 100644 abs/mv-core/MythVantage-config/templates/xorg/modeline.NTSC delete mode 100644 abs/mv-core/MythVantage-config/templates/xorg/modeline.VESA delete mode 100644 abs/mv-core/MythVantage-config/templates/xorg/modeline.custom delete mode 100644 abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.ati delete mode 100644 abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.intel delete mode 100755 abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.nvidia delete mode 100755 abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.vesa delete mode 100644 abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.via delete mode 100755 abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.vmware delete mode 100755 abs/mv-core/MythVantage-config/timezip.py delete mode 100755 abs/mv-core/MythVantage-config/timezone.bin delete mode 100755 abs/mv-core/MythVantage-config/xconfig.sh delete mode 100644 abs/mv-core/MythVantage-system/45-event.rules delete mode 100644 abs/mv-core/MythVantage-system/PKGBUILD delete mode 100644 abs/mv-core/MythVantage-system/STB-start delete mode 100644 abs/mv-core/MythVantage-system/STB.install delete mode 100644 abs/mv-core/MythVantage-system/STBWINDOWMANAGER delete mode 100755 abs/mv-core/MythVantage-system/backend_control.sh delete mode 100755 abs/mv-core/MythVantage-system/backup_job delete mode 100755 abs/mv-core/MythVantage-system/file_time_offset.py delete mode 100755 abs/mv-core/MythVantage-system/firstboot.sh delete mode 100755 abs/mv-core/MythVantage-system/grabkey.py delete mode 100644 abs/mv-core/MythVantage-system/imdb-bulk-update.pl delete mode 100644 abs/mv-core/MythVantage-system/initial_db_run delete mode 100644 abs/mv-core/MythVantage-system/inittab delete mode 100755 abs/mv-core/MythVantage-system/load-modules-mythvantage.sh delete mode 100644 abs/mv-core/MythVantage-system/mbegdbcommands.txt delete mode 100644 abs/mv-core/MythVantage-system/mfegdbcommands.txt delete mode 100755 abs/mv-core/MythVantage-system/myth_mtc.py delete mode 100755 abs/mv-core/MythVantage-system/myth_mtc.sh delete mode 100755 abs/mv-core/MythVantage-system/notify.py delete mode 100755 abs/mv-core/MythVantage-system/optimize_mythdb.py delete mode 100755 abs/mv-core/MythVantage-system/playmedia.sh delete mode 100755 abs/mv-core/MythVantage-system/repo_sync.sh delete mode 100755 abs/mv-core/MythVantage-system/restartfrontend.sh delete mode 100755 abs/mv-core/MythVantage-system/restore_job.sh delete mode 100755 abs/mv-core/MythVantage-system/saytime.sh delete mode 100644 abs/mv-core/MythVantage-system/smolt.cron delete mode 100755 abs/mv-core/MythVantage-system/startfrontend delete mode 100755 abs/mv-core/MythVantage-system/update_system delete mode 100755 abs/mv-core/MythVantage-system/update_system_all delete mode 100644 abs/mv-core/MythVantage-system/wmaker delete mode 100644 abs/mv-core/certmaster/PKGBUILD delete mode 100644 abs/mv-core/certmaster/certmaster-0.24.tar.gz delete mode 100644 abs/mv-core/certmaster/certmaster-0.25.tar.gz delete mode 100644 abs/mv-core/certmaster/certmaster.conf delete mode 100755 abs/mv-core/certmaster/certmaster.install delete mode 100644 abs/mv-core/certmaster/minion.conf delete mode 100755 abs/mv-core/confuse/PKGBUILD delete mode 100644 abs/mv-core/dnsmasq/PKGBUILD delete mode 100644 abs/mv-core/dnsmasq/dnsmasq-capability-config.patch delete mode 100644 abs/mv-core/dnsmasq/dnsmasq.conf delete mode 100644 abs/mv-core/dnsmasq/dnsmasq.install delete mode 100755 abs/mv-core/dnsmasq/dnsmasq.rc.d delete mode 100644 abs/mv-core/dnsmasq/pxelinux.0 delete mode 100644 abs/mv-core/dnsmasq/pxelinux.default delete mode 100755 abs/mv-core/e16-myth-settings/PKGBUILD delete mode 100755 abs/mv-core/e16-myth-settings/e16.install delete mode 100644 abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.actionclasses.cfg.preparsed delete mode 100644 abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.borders.cfg.preparsed delete mode 100644 abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.cursors.cfg.preparsed delete mode 100644 abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.desktops.cfg.preparsed delete mode 100644 abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.imageclasses.cfg.preparsed delete mode 100644 abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.init.cfg.preparsed delete mode 100644 abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.menustyles.cfg.preparsed delete mode 100644 abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.textclasses.cfg.preparsed delete mode 100644 abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.tooltips.cfg.preparsed delete mode 100644 abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.windowmatches.cfg.preparsed delete mode 100644 abs/mv-core/e16-myth-settings/e16/cached/cfg/.usr.share.e16.config.menus.cfg.preparsed delete mode 100644 abs/mv-core/e16-myth-settings/e16/e_config--0.0.backgrounds delete mode 100755 abs/mv-core/e16-myth-settings/e16/e_config--0.0.buttons delete mode 100755 abs/mv-core/e16-myth-settings/e16/e_config--0.0.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/e_config--0.0.ibox delete mode 100644 abs/mv-core/e16-myth-settings/e16/e_config--0.0.snapshots delete mode 100755 abs/mv-core/e16-myth-settings/e16/menus/epplets.menu delete mode 100755 abs/mv-core/e16-myth-settings/e16/menus/file.menu delete mode 100755 abs/mv-core/e16-myth-settings/e16/menus/menus_GNOME/index.menu delete mode 100755 abs/mv-core/e16-myth-settings/e16/menus/menus_KDE/index.menu delete mode 100755 abs/mv-core/e16-myth-settings/e16/menus/menus_Other/AudioVideo.menu delete mode 100755 abs/mv-core/e16-myth-settings/e16/menus/menus_Other/Network.menu delete mode 100755 abs/mv-core/e16-myth-settings/e16/menus/menus_Other/Settings.menu delete mode 100755 abs/mv-core/e16-myth-settings/e16/menus/menus_Other/System.menu delete mode 100755 abs/mv-core/e16-myth-settings/e16/menus/menus_Other/Utility.menu delete mode 100755 abs/mv-core/e16-myth-settings/e16/menus/menus_Other/index.menu delete mode 100755 abs/mv-core/e16-myth-settings/e16/menus/user_apps.menu delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/MAIN delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/actionclasses.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/backgrounds/backgrounds.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/backgrounds/blue.gif delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/backgrounds/yellow.gif delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/BORDERLESS/border.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/border.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear2_stick.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_down.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_stick.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_stick_down.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_stick_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_down.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_stick.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_stick_down.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_stick_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_inactive.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_down.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_stick.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_stick_down.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_stick_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_down.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_stick.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_stick_down.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_stick_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/buttons.xcf delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/frame.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/resize_handle.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/resize_handle_stick.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title_active.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title_stick.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title_stick_active.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_active.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_mask.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_mask_active.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick_active.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick_mask.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick_mask_active.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/ICONBOX/border.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/border.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb1.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb2.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb3.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb4.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb5.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb6.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb8.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/border.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb1.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb2.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb3.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb4.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb5.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb6.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb8.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/border.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_clear.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_clear_down.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_clear_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_inactive.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_red.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_red_down.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_red_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_yellow.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_yellow_down.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_yellow_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/title.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/STEEL/border.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/TRANSIENT/border.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/VERYSMALLFIXED/border.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/actions.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/borders.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/border.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/fixed_bottom_bg.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/fixed_bottom_fg.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/left_bg.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/left_fg.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_bottom.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_left.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_right.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_top.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/right_bg.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/right_fg.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/transient_title_bg.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/transient_title_fg.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/borders/images.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/colormodifiers.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/common/images/bg.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/common/images/blank.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/common/images/selected.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/coords/coords.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/cursors.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/desktops.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/dialogs.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_down.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_down2.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_up.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_up2.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/check_off.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/check_on.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/radio_off.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/radio_on.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/separator.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_horiz.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_knob_horiz.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_knob_vert.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_vert.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/window.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/dragbar.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/.xvpics/downarrow.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/downarrow.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/downarrow_cl.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/dragbar_horiz.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/dragbar_vert.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/uparrow.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/uparrow_cl.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/focuslist/focuslist.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/focuslist/images/lightbg.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/focuslist/images/lightbg_hl.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/iconbox.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_d.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_l.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_r.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_u.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/background.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/bt1.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/htrough.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ib_cover_h.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ib_cover_v.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/slh.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/slv.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/vtrough.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/imageclasses.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/init.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/init/images/bar.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/init/images/header.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/init/init.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/logo.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/actions.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/buttons.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/go_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/help.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/help_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/junk.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/preferences.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/preferences_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/special.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/special_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/themes.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/go.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/go_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/help.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/help_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/junk.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/preferences.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/preferences_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/special.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/special_hi.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/themes.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menus/menus.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles/images/submenu.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles/images/submenu_selected.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles/menustyles.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/pager/images/selected.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/pager/images/window.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/pager/pager.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/textclasses.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/tooltips.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/tooltips/images/ttip.png delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/tooltips/tooltips.cfg delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/vixar.ttf delete mode 100755 abs/mv-core/e16-myth-settings/e16/themes/mine/windowmatches.cfg delete mode 100755 abs/mv-core/e16-myth-settings/tilda/config_0 delete mode 100644 abs/mv-core/enlightenment/PKGBUILD delete mode 100644 abs/mv-core/enlightenment/e_gen_menu.patch delete mode 100644 abs/mv-core/enlightenment/enlightenment.desktop delete mode 100644 abs/mv-core/enlightenment/starting.patch delete mode 100644 abs/mv-core/evrouter/PKGBUILD delete mode 100644 abs/mv-core/func/PKGBUILD delete mode 100755 abs/mv-core/func/failed_func.sh delete mode 100644 abs/mv-core/func/fe_restart.py delete mode 100644 abs/mv-core/func/func-0.24.tar.gz delete mode 100644 abs/mv-core/func/func-0.25.tar.gz delete mode 100755 abs/mv-core/func/func.install delete mode 100644 abs/mv-core/func/minion.conf delete mode 100644 abs/mv-core/func/pacman.py delete mode 100644 abs/mv-core/func/power.py delete mode 100755 abs/mv-core/ghosd/PKGBUILD delete mode 100644 abs/mv-core/ghosd/blue800.png delete mode 100755 abs/mv-core/ghosd/gh800.png delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/LICENSE delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/Makefile delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/Makefile.am delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/Makefile.in delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/README delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/aclocal.m4 delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/config.guess delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/config.h delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/config.h.in delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/config.log delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/config.status delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/config.sub delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/configure delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/configure.ac delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/depcomp delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/Makefile delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/Makefile.am delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/Makefile.in delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/ghosd-docs.sgml delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/ghosd-overrides.txt delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/ghosd-sections.txt delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ch01.html delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd-Basics.html delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd-Main-Loop.html delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd-Text.html delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd.devhelp delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/html/home.png delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/html/index.html delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/html/index.sgml delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/html/left.png delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/html/right.png delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/html/style.css delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/html/up.png delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/ghosd-unused.sgml delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/ghosd.sgml delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/main-loop.sgml delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/text.sgml delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/xml/ghosd.xml delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/xml/main-loop.xml delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/doc/xml/text.xml delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/animation.Po delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/example-shared.Plo delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/image.Po delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/text.Po delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/animation delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/image delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/lt-image delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/text delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/examples/Makefile delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/examples/Makefile.am delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/examples/Makefile.in delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/examples/animation delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/examples/animation.c delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/examples/example-shared.c delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/examples/example-shared.h delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/examples/image delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/examples/image.c delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/examples/text delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/examples/text.c delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/ghosd.pc delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/ghosd.pc.in delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.deps/ghosd-main.Plo delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.deps/ghosd-text.Plo delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.deps/ghosd.Plo delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.lai delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so.0 delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so.0.0.0 delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/Makefile delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/Makefile.am delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/Makefile.in delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-internal.h delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-main.c delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-text.c delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-text.h delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd.c delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd.h delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/gtk-doc.make delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/install-sh delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/libtool delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/ltmain.sh delete mode 100755 abs/mv-core/ghosd/ghosd-0.0.1/missing delete mode 100644 abs/mv-core/ghosd/ghosd-0.0.1/stamp-h1 delete mode 100644 abs/mv-core/ghosd/green-800.png delete mode 100644 abs/mv-core/ghosd/green800.png delete mode 100644 abs/mv-core/ghosd/grey800.png delete mode 100644 abs/mv-core/ghosd/image.c delete mode 100755 abs/mv-core/ghosd/osdClient.pl delete mode 100644 abs/mv-core/ghosd/osdServer.config delete mode 100755 abs/mv-core/ghosd/osdServer.pl delete mode 100644 abs/mv-core/ghosd/red800.png delete mode 100644 abs/mv-core/ghosd/yellow800.png delete mode 100644 abs/mv-core/graphviz/PKGBUILD delete mode 100755 abs/mv-core/graphviz/graphviz.install delete mode 100755 abs/mv-core/hobbit-client/PKGBUILD delete mode 100755 abs/mv-core/hobbit-client/client/bin/bb delete mode 100755 abs/mv-core/hobbit-client/client/bin/bbcmd delete mode 100755 abs/mv-core/hobbit-client/client/bin/bbdigest delete mode 100755 abs/mv-core/hobbit-client/client/bin/bbhostgrep delete mode 100755 abs/mv-core/hobbit-client/client/bin/bbhostshow delete mode 100755 abs/mv-core/hobbit-client/client/bin/clientupdate delete mode 100755 abs/mv-core/hobbit-client/client/bin/hobbitclient-aix.sh delete mode 100755 abs/mv-core/hobbit-client/client/bin/hobbitclient-darwin.sh delete mode 100755 abs/mv-core/hobbit-client/client/bin/hobbitclient-freebsd.sh delete mode 100755 abs/mv-core/hobbit-client/client/bin/hobbitclient-hp-ux.sh delete mode 100755 abs/mv-core/hobbit-client/client/bin/hobbitclient-irix.sh delete mode 100755 abs/mv-core/hobbit-client/client/bin/hobbitclient-linux.sh delete mode 100755 abs/mv-core/hobbit-client/client/bin/hobbitclient-netbsd.sh delete mode 100755 abs/mv-core/hobbit-client/client/bin/hobbitclient-openbsd.sh delete mode 100755 abs/mv-core/hobbit-client/client/bin/hobbitclient-osf1.sh delete mode 100755 abs/mv-core/hobbit-client/client/bin/hobbitclient-sco_sv.sh delete mode 100755 abs/mv-core/hobbit-client/client/bin/hobbitclient-sunos.sh delete mode 100755 abs/mv-core/hobbit-client/client/bin/hobbitclient.sh delete mode 100755 abs/mv-core/hobbit-client/client/bin/hobbitlaunch delete mode 100755 abs/mv-core/hobbit-client/client/bin/logfetch delete mode 100755 abs/mv-core/hobbit-client/client/bin/msgcache delete mode 100755 abs/mv-core/hobbit-client/client/bin/orcahobbit delete mode 100644 abs/mv-core/hobbit-client/client/etc/clientlaunch.cfg delete mode 100644 abs/mv-core/hobbit-client/client/etc/hobbitclient.cfg delete mode 100644 abs/mv-core/hobbit-client/client/etc/localclient.cfg delete mode 100755 abs/mv-core/hobbit-client/client/ext/hobbit-mem-myth.sh delete mode 100755 abs/mv-core/hobbit-client/client/runclient.sh delete mode 100755 abs/mv-core/hobbit-client/hobbit-client.install delete mode 100755 abs/mv-core/hobbitmon/PKGBUILD delete mode 100644 abs/mv-core/hobbitmon/be.png delete mode 100644 abs/mv-core/hobbitmon/clientlaunch.cfg.diff delete mode 100644 abs/mv-core/hobbitmon/diffs/clientlaunch.cfg delete mode 100644 abs/mv-core/hobbitmon/diffs/clientlaunch.cfg.diff delete mode 100644 abs/mv-core/hobbitmon/diffs/clientlaunch.cfg.orig delete mode 100644 abs/mv-core/hobbitmon/diffs/hobbitgraph.cfg delete mode 100644 abs/mv-core/hobbitmon/diffs/hobbitgraph.cfg.diff delete mode 100644 abs/mv-core/hobbitmon/diffs/hobbitgraph.cfg.orig delete mode 100644 abs/mv-core/hobbitmon/diffs/hobbitlaunch.cfg delete mode 100644 abs/mv-core/hobbitmon/diffs/hobbitlaunch.cfg.diff delete mode 100644 abs/mv-core/hobbitmon/diffs/hobbitlaunch.cfg.orig delete mode 100644 abs/mv-core/hobbitmon/diffs/hobbitserver.cfg delete mode 100644 abs/mv-core/hobbitmon/diffs/hobbitserver.cfg.diff delete mode 100644 abs/mv-core/hobbitmon/diffs/hobbitserver.cfg.orig delete mode 100755 abs/mv-core/hobbitmon/hbfunc.py delete mode 100755 abs/mv-core/hobbitmon/hbnotes.py delete mode 100644 abs/mv-core/hobbitmon/hobbit-alerts.cfg delete mode 100755 abs/mv-core/hobbitmon/hobbit-clients.cfg delete mode 100755 abs/mv-core/hobbitmon/hobbit-mem-myth.sh delete mode 100755 abs/mv-core/hobbitmon/hobbit-myth-orphan.sh delete mode 100755 abs/mv-core/hobbitmon/hobbit.install delete mode 100755 abs/mv-core/hobbitmon/hobbit_myth_data.py delete mode 100755 abs/mv-core/hobbitmon/hobbit_notify.sh delete mode 100755 abs/mv-core/hobbitmon/hobbitadd.py delete mode 100755 abs/mv-core/hobbitmon/hobbitcheck.sh delete mode 100644 abs/mv-core/hobbitmon/hobbitgraph.cfg.diff delete mode 100644 abs/mv-core/hobbitmon/hobbitlaunch.cfg.diff delete mode 100644 abs/mv-core/hobbitmon/hobbitserver.cfg.diff delete mode 100755 abs/mv-core/hobbitmon/hobbitstorage.py delete mode 100644 abs/mv-core/hobbitmon/tuner.png delete mode 100644 abs/mv-core/hobbitmon/tv.png delete mode 100644 abs/mv-core/initscripts/ChangeLog delete mode 100644 abs/mv-core/initscripts/PKGBUILD delete mode 100644 abs/mv-core/initscripts/__changelog delete mode 100644 abs/mv-core/initscripts/initscripts.install delete mode 100644 abs/mv-core/initscripts/rc.shutdown.patch delete mode 100644 abs/mv-core/initscripts/rc.sysinit.patch delete mode 100644 abs/mv-core/keylaunch/PKGBUILD delete mode 100644 abs/mv-core/keylaunch/example_rc delete mode 100755 abs/mv-core/keylaunch/keylaunch.install delete mode 100755 abs/mv-core/lcdproc/PKGBUILD delete mode 100755 abs/mv-core/lcdproc/lcdd delete mode 100644 abs/mv-core/lcdproc/lcdproc-CVS-current.tar.gz delete mode 100644 abs/mv-core/lcdproc/mythvantage.patch delete mode 100755 abs/mv-core/lighttpd/PKGBUILD delete mode 100644 abs/mv-core/lighttpd/index.html delete mode 100755 abs/mv-core/lighttpd/lighttpd.conf delete mode 100644 abs/mv-core/lighttpd/lighttpd.conf.d delete mode 100644 abs/mv-core/lighttpd/lighttpd.install delete mode 100644 abs/mv-core/lighttpd/lighttpd.logrotate.d delete mode 100644 abs/mv-core/lighttpd/lighttpd.rc.d delete mode 100644 abs/mv-core/lighttpd/spawn-php.conf.d delete mode 100755 abs/mv-core/lighttpd/spawn-php.rc.d delete mode 100644 abs/mv-core/lighttpd/ssl_fix.diff delete mode 100644 abs/mv-core/lighttpd/tweakconf.vim delete mode 100755 abs/mv-core/local-website/PKGBUILD delete mode 100755 abs/mv-core/local-website/cgi/beclear.cgi delete mode 100755 abs/mv-core/local-website/cgi/bestop.cgi delete mode 100755 abs/mv-core/local-website/cgi/diskless.py delete mode 100755 abs/mv-core/local-website/cgi/serverkey.cgi delete mode 100755 abs/mv-core/local-website/contents/calllog.py delete mode 100755 abs/mv-core/local-website/contents/calllog.shtml delete mode 100755 abs/mv-core/local-website/contents/count.py delete mode 100755 abs/mv-core/local-website/contents/docs.html delete mode 100755 abs/mv-core/local-website/contents/error-handler.html delete mode 100755 abs/mv-core/local-website/contents/error/hobbit.html delete mode 100755 abs/mv-core/local-website/contents/error/mythweb.html delete mode 100755 abs/mv-core/local-website/contents/error/phpadmin.html delete mode 100755 abs/mv-core/local-website/contents/error/status-404.html delete mode 100755 abs/mv-core/local-website/contents/frame.css delete mode 100755 abs/mv-core/local-website/contents/header.html delete mode 100644 abs/mv-core/local-website/contents/header.jpg delete mode 100755 abs/mv-core/local-website/contents/home.shtml delete mode 100755 abs/mv-core/local-website/contents/images/classic-menugraph.png delete mode 100755 abs/mv-core/local-website/contents/images/dvr_menugraph.png delete mode 100755 abs/mv-core/local-website/contents/images/menu_diagram_color.png delete mode 100755 abs/mv-core/local-website/contents/index.html delete mode 100755 abs/mv-core/local-website/contents/links.html delete mode 100755 abs/mv-core/local-website/contents/mv.css delete mode 100755 abs/mv-core/local-website/contents/mvp_process.py delete mode 100755 abs/mv-core/local-website/contents/mvp_select.py delete mode 100755 abs/mv-core/local-website/contents/mvpmc.shtml delete mode 100644 abs/mv-core/local-website/contents/page_background.jpg delete mode 100755 abs/mv-core/local-website/contents/process.py delete mode 100644 abs/mv-core/mediadirs/PKGBUILD delete mode 100644 abs/mv-core/mediadirs/mediadir.install delete mode 100644 abs/mv-core/mp_all.sh delete mode 100755 abs/mv-core/myth/stable/Midnight-blue/PKGBUILD delete mode 100755 abs/mv-core/myth/stable/Midnight-wide/PKGBUILD delete mode 100755 abs/mv-core/myth/stable/MythVanage-mythmenu/MythVantage-menu/HOST_SETTINGS.xml delete mode 100644 abs/mv-core/myth/stable/MythVanage-mythmenu/MythVantage-menu/util_menu.xml delete mode 100755 abs/mv-core/myth/stable/MythVanage-mythmenu/MythVantage-menu/util_menu.xml.mv delete mode 100755 abs/mv-core/myth/stable/MythVanage-mythmenu/PKGBUILD delete mode 100755 abs/mv-core/myth/stable/basic-amber/PKGBUILD delete mode 100755 abs/mv-core/myth/stable/basic-blue/PKGBUILD delete mode 100755 abs/mv-core/myth/stable/basic-green/PKGBUILD delete mode 100755 abs/mv-core/myth/stable/basic-purple/PKGBUILD delete mode 100755 abs/mv-core/myth/stable/basic-red/PKGBUILD delete mode 100644 abs/mv-core/myth/stable/mp_all.sh delete mode 100644 abs/mv-core/myth/stable/mytharchive/PKGBUILD delete mode 100644 abs/mv-core/myth/stable/mythbrowser/PKGBUILD delete mode 100644 abs/mv-core/myth/stable/mythcontrols/PKGBUILD delete mode 100644 abs/mv-core/myth/stable/mythflix/PKGBUILD delete mode 100644 abs/mv-core/myth/stable/mythgallery/PKGBUILD delete mode 100644 abs/mv-core/myth/stable/mythgame/PKGBUILD delete mode 100644 abs/mv-core/myth/stable/mythmovietime/PKGBUILD delete mode 100644 abs/mv-core/myth/stable/mythmusic/PKGBUILD delete mode 100644 abs/mv-core/myth/stable/mythmusic/music_flac.patch delete mode 100644 abs/mv-core/myth/stable/mythnews/PKGBUILD delete mode 100644 abs/mv-core/myth/stable/mythphone/PKGBUILD delete mode 100644 abs/mv-core/myth/stable/mythsmolt/PKGBUILD delete mode 100755 abs/mv-core/myth/stable/mythtv-release-fixes/3466-v1.patch delete mode 100755 abs/mv-core/myth/stable/mythtv-release-fixes/PKGBUILD delete mode 100644 abs/mv-core/myth/stable/mythtv-release-fixes/dbconfig.patch delete mode 100644 abs/mv-core/myth/stable/mythtv-release-fixes/debug_uitypes.cpp.patch delete mode 100644 abs/mv-core/myth/stable/mythtv-release-fixes/debug_xmlparse.cpp.patch delete mode 100644 abs/mv-core/myth/stable/mythtv-release-fixes/jump_snapshot.patch delete mode 100755 abs/mv-core/myth/stable/mythtv-release-fixes/myth.find_orphans.pl delete mode 100755 abs/mv-core/myth/stable/mythtv-release-fixes/myth.sh delete mode 100755 abs/mv-core/myth/stable/mythtv-release-fixes/mythbackend delete mode 100755 abs/mv-core/myth/stable/mythtv-release-fixes/mythbackend.sh delete mode 100644 abs/mv-core/myth/stable/mythtv-release-fixes/myththemedmenu.cpp.patch delete mode 100644 abs/mv-core/myth/stable/mythtv-release-fixes/myththemedmenu.h.patch delete mode 100755 abs/mv-core/myth/stable/mythtv-release-fixes/mythtv.install delete mode 100644 abs/mv-core/myth/stable/mythtv-release-fixes/pop_be_restart.cpp.patch delete mode 100644 abs/mv-core/myth/stable/mythtv-release-fixes/pop_be_restart.h.patch delete mode 100644 abs/mv-core/myth/stable/mythtv-release-fixes/reload.patch delete mode 100644 abs/mv-core/myth/stable/mythtv-release-fixes/screenshot_jump.patch delete mode 100644 abs/mv-core/myth/stable/mythtv-release-fixes/screenshots.diff delete mode 100644 abs/mv-core/myth/stable/mythtv-release-fixes/screenshots2.diff delete mode 100644 abs/mv-core/myth/stable/mythtv-release-fixes/smolt_jump.patch delete mode 100755 abs/mv-core/myth/stable/mythtv-themes/PKGBUILD delete mode 100644 abs/mv-core/myth/stable/mythvideo/PKGBUILD delete mode 100644 abs/mv-core/myth/stable/mythweather/PKGBUILD delete mode 100755 abs/mv-core/myth/stable/mythweb/PKGBUILD delete mode 100755 abs/mv-core/myth/stable/mythweb/dblogininit.inc delete mode 100755 abs/mv-core/myth/stable/mythweb/mythweb.install delete mode 100755 abs/mv-core/myth/stable/mythweb/mythweblighttpd.patch delete mode 100755 abs/mv-core/myth/stable/syth-lacquer-clean/PKGBUILD delete mode 100755 abs/mv-core/myth/stable/syth-lacquer-wide/PKGBUILD delete mode 100755 abs/mv-core/mythdb-initial/PKGBUILD delete mode 100755 abs/mv-core/mythdb-initial/mc.sql delete mode 100755 abs/mv-core/mythdb-initial/mythdb.install delete mode 100755 abs/mv-core/mythdb-initial/permissions.sql delete mode 100755 abs/mv-core/mythtv-status/PKGBUILD delete mode 100644 abs/mv-core/mythtv-status/mythtv-status.cron delete mode 100644 abs/mv-core/mythtv-status/mythtv-status.install delete mode 100644 abs/mv-core/mythvantage-live/PKGBUILD delete mode 100755 abs/mv-core/mythvantage-live/bin/gen_fstab delete mode 100755 abs/mv-core/mythvantage-live/bin/km delete mode 100644 abs/mv-core/mythvantage-live/etc/live-shutdown delete mode 100644 abs/mv-core/mythvantage-live/etc/live-sysinit delete mode 100755 abs/mv-core/mythvantage-live/etc/loginroot delete mode 100755 abs/mv-core/mythvantage-live/etc/rc.shutdown-live delete mode 100755 abs/mv-core/mythvantage-live/etc/rc.sysinit-live delete mode 100755 abs/mv-core/mythvantage-live/etc/ulogin delete mode 100755 abs/mv-core/mythvantage-live/lib/initcpio/gen_larch_init delete mode 100644 abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch1 delete mode 100644 abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch2 delete mode 100644 abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch2_aufs delete mode 100644 abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch3 delete mode 100644 abs/mv-core/mythvantage-live/lib/initcpio/install/larch1 delete mode 100644 abs/mv-core/mythvantage-live/lib/initcpio/install/larch2 delete mode 100644 abs/mv-core/mythvantage-live/lib/initcpio/install/larch2_aufs delete mode 100644 abs/mv-core/mythvantage-live/lib/initcpio/install/larch3 delete mode 100755 abs/mv-core/mythvantage-live/lib/initcpio/kinit delete mode 100644 abs/mv-core/mythvantage-live/lib/initcpio/mkinitcpio.conf delete mode 100644 abs/mv-core/ncid/PKGBUILD delete mode 100755 abs/mv-core/ncid/cid.sh delete mode 100644 abs/mv-core/ncid/ncid-osd delete mode 100644 abs/mv-core/ncid/ncid.conf delete mode 100755 abs/mv-core/ncid/ncid.install delete mode 100755 abs/mv-core/ncid/ncid.py delete mode 100644 abs/mv-core/ncid/ncid.sql delete mode 100755 abs/mv-core/ncid/ncidclient.sh delete mode 100644 abs/mv-core/ncid/ncidd.conf delete mode 100755 abs/mv-core/ncid/ncidpermissions.sql delete mode 100755 abs/mv-core/runit-scripts-mv/PKGBUILD delete mode 100755 abs/mv-core/runit-scripts-mv/fbsplash-runit.sh delete mode 100755 abs/mv-core/runit-scripts-mv/runit.install delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/1 delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/1.local delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/2 delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/3 delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/ctrlaltdel delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/halt-runit delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/logger delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/reboot-runit delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/finish delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/log/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/finish delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/apache/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/avahi/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/certmaster/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/cron/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/dbus/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/dhcpd/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/dnsmasq/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/finish delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/finish delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/log/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/funcd/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/ghosd/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/gpm/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/hal/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit-client/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/igdaemon/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/lcdd/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/lighttpd/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/finish delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/mysql/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/log/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/run delete mode 100644 abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/finish delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/run delete mode 100644 abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/finish delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/finish delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/nfsd/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/nfslock/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/nmbd/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/ntpd/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/oss/finish delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/oss/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/portmap/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/finish delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/smbd/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/sshd/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/syslog-ng/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/tatir/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/tftpd/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/tty2/run delete mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/tty3/run delete mode 100644 abs/mv-core/syslog-ng/PKGBUILD delete mode 100755 abs/mv-core/syslog-ng/log_care.sh delete mode 100755 abs/mv-core/syslog-ng/syslog-ng delete mode 100644 abs/mv-core/syslog-ng/syslog-ng.conf delete mode 100644 abs/mv-core/syslog-ng/syslog-ng.logrotate delete mode 100755 abs/mv-core/syslog-ng/syslog.install delete mode 100755 abs/mv-core/tilda/PKGBUILD delete mode 100644 abs/mv-core/tilda/__changelog delete mode 100644 abs/mv-core/tilda/tilda.patch delete mode 100755 abs/mv-core/webcal/PKGBUILD delete mode 100644 abs/mv-core/webcal/config.php delete mode 100644 abs/mv-core/webcal/createdb.sql delete mode 100644 abs/mv-core/webcal/posix.tab delete mode 100644 abs/mv-core/webcal/send_reminders.patch delete mode 100644 abs/mv-core/webcal/sendreminders.sh delete mode 100644 abs/mv-core/webcal/settings.php delete mode 100644 abs/mv-core/webcal/webcal.install diff --git a/abs/core-testing/Kernel_rebuild_list b/abs/core-testing/Kernel_rebuild_list deleted file mode 100644 index d9136ad..0000000 --- a/abs/core-testing/Kernel_rebuild_list +++ /dev/null @@ -1,8 +0,0 @@ -Kernel -lirc -nvidia -rt2500 -tiacx -madwifi -ndiswrapper -oss diff --git a/abs/core-testing/LinHES-config-svn/LinHES-release b/abs/core-testing/LinHES-config-svn/LinHES-release deleted file mode 100644 index ecc4a3e..0000000 --- a/abs/core-testing/LinHES-config-svn/LinHES-release +++ /dev/null @@ -1 +0,0 @@ -LinHES R6.00.07 (Scale preview) diff --git a/abs/core-testing/LinHES-config-svn/LinHES.install b/abs/core-testing/LinHES-config-svn/LinHES.install deleted file mode 100644 index a0a9d31..0000000 --- a/abs/core-testing/LinHES-config-svn/LinHES.install +++ /dev/null @@ -1,78 +0,0 @@ -# This is a default template for a post-install scriptlet. You can -# remove any functions you don't need (and this header). - -# arg 1: the new package version -pre_install() { - rm -f /etc/issue - rm -f /etc/arch-release - -} - -# arg 1: the new package version -post_install() { - if [ ! -f /etc/blacklist.package ] - then - echo "List of packages to ignore" > /etc/blacklist.package - echo "one package per line" >> /etc/blacklist.package - fi - -LINE="mythtv ALL = NOPASSWD:/usr/MythVantage/bin/mythvantage" -LINE1="mythtv ALL = NOPASSWD:/usr/MythVantage/bin/MythVantage" -for i in "$LINE" "$LINE1" -do - cp /etc/sudoers /etc/sudoers.bak - grep -q "$i" /etc/sudoers - if [ $? != 0 ] - then - echo "$i" >> /etc/sudoers - visudo -cf /etc/sudoers - if [ ! $? = 0 ] - then - cp /etc/sudoers.bak /etc/sudoers - echo $i - echo "Error adding files" - exit 1 - fi - fi -done - - -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - /bin/true -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - . /etc/profile - ps -ef|grep mysqld|grep -v grep - status=$? - echo "status $status" - if [ $status = 0 ] - then - restore_default_settings.sh -c load - fi - if [ ! -f /etc/blacklist.package ] - then - echo "List of packages to ignore" > /etc/blacklist.package - echo "one package per line" >> /etc/blacklist.package - fi -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - -op=$1 -shift -$op $* diff --git a/abs/core-testing/LinHES-config-svn/MythVantage.sh b/abs/core-testing/LinHES-config-svn/MythVantage.sh deleted file mode 100755 index 286c908..0000000 --- a/abs/core-testing/LinHES-config-svn/MythVantage.sh +++ /dev/null @@ -1,3 +0,0 @@ -export MV_ROOT=/usr/MythVantage -export PATH=$PATH:$MV_ROOT/bin -export TEMPLATES=$MV_ROOT/templates diff --git a/abs/core-testing/LinHES-config-svn/PKGBUILD b/abs/core-testing/LinHES-config-svn/PKGBUILD deleted file mode 100755 index 32645a2..0000000 --- a/abs/core-testing/LinHES-config-svn/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -pkgname=LinHES-config-svn -pkgver=1.0 -pkgrel=299 -conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) -pkgdesc="Install and configure your system" -depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates ) -arch=('i686') - -source=(mythinstall.bin myth_user_call file_time_offset.py install-ui.xml install_proxy.sh install_functions.sh systemconfig.sh install_db_chroot.sh restore_default_settings.sh xconfig.sh timezip.py soundconfig.sh LinHES-release issue MythVantage.sh create_master.sh build_diskless.sh networkconfig.sh timezone.bin autocard.py restore_km_db_chroot.sh README) - -install=LinHES.install -build() { - mkdir -p $startdir/pkg/etc - mkdir -p $startdir/pkg/usr/share/mythtv/themes/default - - MVDIR=$startdir/pkg/usr/MythVantage - mkdir $startdir/pkg/etc/profile.d - install -m 0755 MythVantage.sh $startdir/pkg/etc/profile.d/MythVantage.sh - mkdir -p $MVDIR/bin - mkdir -p $MVDIR/etc - -#copy in all the installer specific stuff - install -m0700 myth_user_call $MVDIR/bin/myth_user_call - install -m 0755 install_proxy.sh $MVDIR/bin/install_proxy.sh - install -m 0755 install_functions.sh $MVDIR/bin/install_functions.sh - install -m 0755 systemconfig.sh $MVDIR/bin/systemconfig.sh - install -m 0755 xconfig.sh $MVDIR/bin/xconfig.sh - install -m 0755 install_db_chroot.sh $MVDIR/bin/install_db_chroot.sh - install -m 0755 restore_km_db_chroot.sh $MVDIR/bin/restore_km_db_chroot.sh - install -m 0755 restore_default_settings.sh $MVDIR/bin/restore_default_settings.sh - install -m 0755 soundconfig.sh $MVDIR/bin/soundconfig.sh - install -m 0755 networkconfig.sh $MVDIR/bin/networkconfig.sh - install -m 0755 create_master.sh $MVDIR/bin/create_master.sh - install -m 0755 build_diskless.sh $MVDIR/bin/build_diskless.sh - install -m 0755 timezone.bin $MVDIR/bin/timezone.bin - install -m 0755 timezip.py $MVDIR/bin/timezip.py - install -m 0755 autocard.py $MVDIR/bin/autocard.py - #Readme used for mythvantage -r - install -m 0755 README $MVDIR/README - - mkdir -p $startdir/pkg/usr/bin - install -m 0755 file_time_offset.py $startdir/pkg/usr/bin/file_time_offset.py -#copy in the branding stuff - install -m 0755 LinHES-release $startdir/pkg/etc/LinHES-release - install -m 0755 issue $startdir/pkg/etc/issue - -# copy over the ui files - install -m 0755 install-ui.xml $startdir/pkg/usr/share/mythtv/themes/default/ - -#copy in the binaries - install -m 4755 mythinstall.bin $MVDIR/bin/MythVantage - cd $MVDIR/bin - ln -s MythVantage mythvantage - ln -s MythVantage mythinstall - cd - -} - diff --git a/abs/core-testing/LinHES-config-svn/README b/abs/core-testing/LinHES-config-svn/README deleted file mode 100644 index a615389..0000000 --- a/abs/core-testing/LinHES-config-svn/README +++ /dev/null @@ -1,10 +0,0 @@ -Thanks for giving this Preview Release of LinHES a try! -While the core of LinHes is quite stable, we still need to -implement some features. At the moment, LinHES is compiled for i686. If you have an i586 class system, LinHES won't work for you. We do intend for LinHES to be full i586 compatible. In addition, we still have to implement support for more remotes and blasters. The TV out of the PVR-350 isn't supported at this time. - -Support for LinHES can be obtained at: -http://linhes.org -irc.freenode.net #linhes - -Bugs can be reported at: -http://linhes.org/flyspray diff --git a/abs/core-testing/LinHES-config-svn/add_service.sh b/abs/core-testing/LinHES-config-svn/add_service.sh deleted file mode 100755 index 190d604..0000000 --- a/abs/core-testing/LinHES-config-svn/add_service.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -SERVICE_DIR=/var/service -SCRIPT_DIR=/etc/sv -if [ -d $SCRIPT_DIR/$1 ] -then - if [ -d $SERVICE_DIR/$1 ] - then - echo "$1 already there" - else - ln -s $SCRIPT_DIR/$1 $SERVICE_DIR/$1 - echo "adding $1" - fi -else - echo "couldn't find $SCRIPT_DIR/$1" -fi diff --git a/abs/core-testing/LinHES-config-svn/autocard.py b/abs/core-testing/LinHES-config-svn/autocard.py deleted file mode 100755 index 03eecac..0000000 --- a/abs/core-testing/LinHES-config-svn/autocard.py +++ /dev/null @@ -1,307 +0,0 @@ -#!/usr/bin/python -# import MySQL module -#jm -import MySQLdb -import sys -import getopt -import socket -import os -import time -import string -import glob -from string import letters -from string import digits -def INSERTNULL_SOURCE(name,xmltvgrabber,userid,freqtable,lineupid,password,useeit): - cursor = db.cursor() - cursor.execute("INSERT INTO videosource(name,xmltvgrabber,userid,freqtable,lineupid,password,useeit) VALUES(%s,%s,%s,%s,%s,%s,%s);",(name,xmltvgrabber,userid,freqtable,lineupid,password,useeit)) - -def INSERTCARD_INTOMYTH(Device,Driver,Cardvendor): - global currenthostname - print Device - print Driver, - print Cardvendor - cursor = db.cursor() - insert = "false" - if Driver == "ivtv" : - cardtype="MPEG" - defaultinput="Tuner 1" - insert="true" - if Cardvendor == "pcHDTV HD3000 HDTV": - insert="false" - cardtype ="whocares" - - #print insert - if insert == "true" : - cursor.execute("INSERT INTO capturecard (videodevice,cardtype,defaultinput,hostname) VALUES(%s,%s,%s,%s);",(Device,cardtype,defaultinput,currenthostname)) - -def INSERTHDR_INTOMYTH(deviceid,tuner_number): - cardtype='HDHOMERUN' - defaultinput='MPEG2TS' - global currenthostname - print deviceid - print cardtype - print defaultinput - print tuner_number - cursor = db.cursor() - #print insert - cursor.execute("INSERT INTO capturecard (videodevice,cardtype,defaultinput,dbox2_port ,hostname) VALUES(%s,%s,%s,%s,%s);",(deviceid,cardtype,defaultinput,tuner_number,currenthostname)) - -def INSERTAUTOCARD(): - global cardlist - global currenthostname - # create a cursor - cursor = db.cursor() - - - for i in range( 1 , len(cardlist)): - insert = "false" -# print cardlist[i] - Device=cardlist[i][0] - Driver=cardlist[i][1] - Cardvendor=cardlist[i][2] - Businfo=cardlist[i][3] - if Driver == "ivtv" : - insert="true" - devicestatus="unused" - if Cardvendor == "pcHDTV HD3000 HDTV": - insert="false" - cardtype ="whocares" - if Driver == "hdr": - insert="true" - devicestatus="unused" - - if insert == "true" : - cursor.execute("delete from autocard where uniqid=%s;",(Businfo)) - if Driver=="hdr": - Cardvendor="HDHOMERUN Tuner 1" - cursor.execute("INSERT INTO autocard (dev,driver,description,uniqid,devicestatus,hostname) VALUES(%s,%s,%s,%s,%s,%s);",(Device,Driver,Cardvendor,Businfo,devicestatus,currenthostname)) - Cardvendor="HDHOMERUN Tuner 2" - cursor.execute("INSERT INTO autocard (dev,driver,description,uniqid,devicestatus,hostname) VALUES(%s,%s,%s,%s,%s,%s);",(Device,Driver,Cardvendor,Businfo,devicestatus,currenthostname)) - - else: - cursor.execute("INSERT INTO autocard (dev,driver,description,uniqid,devicestatus,hostname) VALUES(%s,%s,%s,%s,%s,%s);",(Device,Driver,Cardvendor,Businfo,devicestatus,currenthostname)) - - - -def PRINTINFO(): - global cardlist - - for list in cardlist: - if list != "_placeholder_": - print list - #print "-------------" - -def GATHER_HDR(): - global cardlist - command="/usr/bin/hdhomerun_config --discover" - results=os.popen(command,'r') - line=results.readline() - if line.strip().split()[0] == "no": - print "HDHOMERUN not detected" - else: - print line - hdrdevice=line.strip().split()[2] - print hdrdevice - Driver="hdr" - Device=hdrdevice - Cardtype="HDHOMERUN" - Businfo=hdrdevice - cardprops = [Device,Driver , Cardtype , Businfo] - cardlist.append(cardprops) - - -def GATHER_v4l_CARDS(): - global cardlist - cardlist=["_placeholder_"] - # print "Looking for v4l cards" - try: - filelist = os.listdir('/dev/v4l/') - except OSError: - filelist=" " - #fakelist=['/dev/v4l/video3', 'ivtv', 'WinTV PVR 500 (unit #2)', '0000:04:09.0'] - #cardlist.append(fakelist) - try: - filelist = glob.glob("/dev/v4l/video?") - Driver="" - Cardtype="" - Businfo="" - numcards = 0 - for Device in filelist: - #print card - numcards = numcards+1 - cmd = 'v4l2-ctl -D -d' + Device - for line in os.popen(cmd).readlines(): - #print line - pos = string.find(line,"Driver name") - if pos >=0: - splitline= line.split(':') - Driver=splitline[1].strip() - pos = string.find(line,"Card type") - if pos >=0: - splitline= line.split(':') - Cardtype=splitline[1].strip() - - pos = string.find(line,"Bus info") - if pos >=0: - splitline= line.split(':',1) - Businfo=splitline[1].strip() - - #print Device,Driver , Cardtype , Businfo,numcards - cardprops = [Device,Driver , Cardtype , Businfo] - cardlist.append(cardprops) - except IOError: - print "no v4l cards found" - sys.exit(2) - - -def WRITEUDEV_IVTV(): - global insertmyth - cursor = db.cursor() - #add ivtv,cid lookup loop through until empty. - cursor.execute("select distinct(uniqid) from autocard where driver='ivtv' and devicestatus='will-add'") - cidrows = cursor.fetchall() - for row in cidrows: - cid=row[0] - cursor.execute("select dev,driver,description,devicestatus,hostname from autocard where uniqid=%s limit 1;",(cid)) - result = cursor.fetchone() - description=result[2] - driver='DRIVERS==\"ivtv\"' - ATTRNAME='ATTR{name}=="ivtv? encoder MPG"' - KERNELS='KERNELS==\"' - KERNELS+=cid - KERNELS+="\"" - #filter out non digit or chars - keep=letters.join(digits) - description=filter(lambda c: c in keep, description) - devnode="ivtv/" - #devnode+=description + "_" - udevcid=cid.partition(":") - devnode+=udevcid[2] - devnode+="_video" - UDEV_RULE=driver +', '+ATTRNAME+', '+ KERNELS +', ' + 'NAME=\"' + devnode + '"' - print "Here is the udev rule" - print UDEV_RULE - filename='/etc/udev/rules.d/11-ivtv-'+cid+'.rules' - file = open(filename,'w') - file.write(UDEV_RULE) - if ( insertmyth == "true"): - devnode="/dev/"+devnode - INSERTCARD_INTOMYTH(devnode,"ivtv",description) - cursor.execute("update autocard set devicestatus='done' where uniqid=%s;",(cid)) -#now insert HDR - cursor.execute("select distinct(uniqid),description from autocard where driver='hdr' and devicestatus='will-add'") - cidrows = cursor.fetchall() - for row in cidrows: - if ( insertmyth == "true"): - deviceid=row[0] - #cardtype="HDHOMRUN" - #defaultinput="MPEG2TS" - dbox2_port=row[1] - tuner_number=dbox2_port.rpartition(' ')[2] - INSERTHDR_INTOMYTH(deviceid,tuner_number) - cursor.execute("update autocard set devicestatus='done' where uniqid=%s and description=%s;",(deviceid,dbox2_port)) - - - -def CLEARAUTOCARD(): - cursor = db.cursor() - cursor.execute("delete from autocard") - -def RELOADUDEV(): - print "relaoding udev rules" - os.system('udevcontrol reload_rules') - os.system('rmmod ivtv') - os.system('udevtrigger') - - -def usage(): - print " -h help" - print " -g gather and print out the found cards" - print " -w write out the udev rules" - print " -i insert cards into myth that are marked will-add(only used with -w)" - print " -r reload udev rules" - print " -c clear the autocard db" - -def main(argv): - global db - global cardlist - global currenthostname - currenthostname="" - writeudev="false" - global insertmyth - insertmyth ="false" - - db = MySQLdb.connect(host="localhost", user="mythtv", passwd="mythtv", db="mythconverg") - try: - cursor = db.cursor() - cursor.execute("describe autocard;") - except MySQLdb.Error, e: - cursor.execute("create table autocard(dev varchar(50),driver varchar(50),description varchar(50),uniqid varchar(50), devicestatus varchar(50),hostname varchar(50));") - print "table created" - - if ( currenthostname == "" ): - currenthostname = socket.gethostname() - - - try: - opts, args = getopt.getopt(argv, "hgwircd", ["help", "gathercards", "writeudev" ,"insert" , "reloadudev" , "clearautocard"] ) - except getopt.GetoptError: - sys.exit(2) - for opt, arg in opts: - if opt in ("-h", "--help"): - usage() - sys.exit() - elif opt in ( "-g" , "--gathercards"): - GATHER_v4l_CARDS() - GATHER_HDR() - INSERTAUTOCARD() - PRINTINFO() - elif opt in ("-w", "--writeudev"): - writeudev="true" - elif opt in ("-i", "--insert"): - insertmyth="true" - elif opt in ( "-r" , "--reloadudev"): - RELOADUDEV() - elif opt in ( "-c" , "--clearautocard"): - CLEARAUTOCARD() - elif opt in ( "-d" ): - INSERTCARD_INTOMYTH("file:/myth/video/TripThe1939.mpeg","ivtv","Dummy tuner") - INSERTNULL_SOURCE("dummy","/bin/true","","default","NULL","NULL","0") - - if ( writeudev == "true"): - WRITEUDEV_IVTV() - - - - - - -if __name__ == "__main__": - main(sys.argv[1:]) - - - - - -#mysql> create table autocard(dev varchar(50),driver varchar(50),description varchar(50),uniqid varchar(50), devicestatus varchar(50),hostname varchar(50)); -#Query OK, 0 rows affected (0.14 sec) - -#mysql> describe autocard; -#+--------------+-------------+------+-----+---------+-------+ -#| Field | Type | Null | Key | Default | Extra | -#+--------------+-------------+------+-----+---------+-------+ -#| dev | varchar(50) | YES | | NULL | | -#| driver | varchar(50) | YES | | NULL | | -#| description | varchar(50) | YES | | NULL | | -#| uniqid | varchar(50) | YES | | NULL | | -#| devicestatus | varchar(50) | YES | | NULL | | -#| hostname | varchar(50) | YES | | NULL | | -#+--------------+-------------+------+-----+---------+-------+ - - - - - - - - diff --git a/abs/core-testing/LinHES-config-svn/bpopup-ui.xml b/abs/core-testing/LinHES-config-svn/bpopup-ui.xml deleted file mode 100755 index df0598b..0000000 --- a/abs/core-testing/LinHES-config-svn/bpopup-ui.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - #ffff00 - #000000 - 24 - 3,3 - yes - - - - #9999cc - 18 - yes - - - - #ffff00 - #000000 - 18 - 3,3 - yes - - - - #ffffff - 18 - yes - - - - #ffffff - 50 - yes - - - #ff0000 - #000000 - 16 - 2,2 - yes - - - - #ffff00 - 14 - yes - - - - 0,0,800,600 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/abs/core-testing/LinHES-config-svn/build_diskless.sh b/abs/core-testing/LinHES-config-svn/build_diskless.sh deleted file mode 100755 index 4dfd5fc..0000000 --- a/abs/core-testing/LinHES-config-svn/build_diskless.sh +++ /dev/null @@ -1,143 +0,0 @@ -#!/bin/bash -#CD=/mnt/cd -. /etc/profile -. /etc/systemconfig - -TFTP=/data/srv/tftp -CD=/data/srv/tftp/live -DESTCD=/data/srv/tftp/CD -BASE=/data/srv/tftp/masterbuild - -MODULES=$DESTCD/MythVantage/base/ -myip=`ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'|head -n1` -SRCFILES=$BASE/mnt/live/mnt/MythVantage/base/ - -function log () { -echo $1 -} - -function check_xvfb () { -export DISPLAY=127.0.0.1:25 - Xvfb -ac :25 & - -} - - -function create_base_image() { -echo $SRCFILES -if [ -f $SRCFILES/data.lzm ] -then - mkdir $HOST_IMG_DIR - cd $SRCFILES - echo "Creating image.." > $BASE/tmp/.install_state - LIST=`ls *.lzm` - for i in $LIST - do - echo $i - echo $i > $BASE/tmp/.install_percent - lzm2dir $i \/$HOST_IMG_DIR - done - - for i in sys proc dev tmp - do - mkdir /$HOST_IMG_DIR/$i - done - - chmod 777 /$HOST_IMG_DIR/tmp - mknod /$HOST_IMG_DIR/dev/null c 1 3 - mknod /$HOST_IMG_DIR/dev/null c 1 5 - mknod /$HOST_IMG_DIR/dev/console c 5 1 - chmod +s /$HOST_IMG_DIR/usr/bin/Xorg - chmod +s /$HOST_IMG_DIR/usr/bin/crontab - chmod +s /$HOST_IMG_DIR/usr/bin/sudo - chmod +s /$HOST_IMG_DIR/bin/mount - #copy fstab from masterbuild - cp -f $BASE/etc/fstab /$HOST_IMG_DIR/etc/fstab - echo "Done: installing data" > $BASE/tmp/.install_state - return 0 -else - echo "Error: no modules" > $BASE/tmp/.install_state - log "couldn't find modules to install" - return 1 -fi -} - -function configure_image () { - echo "Configuring system" > $BASE/tmp/.install_state - cp -f $BASE/etc/systemconfig $HOST_IMG_DIR/etc/systemconfig - chown root:mythtv $HOST_IMG_DIR/etc/systemconfig - chmod 775 "$HOST_IMG_DIR" /etc/systemconfig - cp /etc/mtab $HOST_IMG_DIR/etc/mtab - mount --bind /dev $HOST_IMG_DIR/dev - - chroot "$HOST_IMG_DIR" $MV_ROOT/bin/systemconfig.sh misc,hostype,network,this_is_install -#copy syssettings template to here. - SE=$BASE$TEMPLATES/settings/syssettings - mkdir -p $HOST_IMG_DIR/$TEMPLATES/settings/syssettings - cp -rp $SE/* ${HOST_IMG_DIR}/$TEMPLATES/settings/syssettings - chown root:mythtv $HOST_IMG_DIR/etc/systemconfig - chown -R mythtv:mythtv $HOST_IMG_DIR/$TEMPLATES/settings/syssettings - chmod -R 775 $HOST_IMG_DIR/$TEMPLATES/settings/syssettings -#update remotedb with this host settings - OLDDISPLAY=$DISPLAY - check_xvfb - chroot $HOST_IMG_DIR $MV_ROOT/bin/MythVantage -t restore,default_1 - chroot $HOST_IMG_DIR $MV_ROOT/bin/restore_default_settings.sh -c restore -t syssettings - if [ ! $? = 0 ] - then - touch $mountpoint/tmp/.dbsysfailed - chmod 777 $mountpoint/tmp/.dbsysfailed - else - #Run second time - chroot "$HOST_IMG_DIR" $MV_ROOT/bin/systemconfig.sh misc,hostype,network,this_is_install - chroot "$HOST_IMG_DIR" $MV_ROOT/bin/restore_default_settings.sh -c ACCESSCONTROL - fi -chroot "$HOST_IMG_DIR" $MV_ROOT/bin/systemconfig.sh advanced,this_is_install -cp -f $BASE/etc/X11/xorg.conf $HOST_IMG_DIR/etc/X11/xorg.conf -echo "Done" > $BASE/tmp/.install_state -DISPLAY=$OLDDISPLAY - -#cp /tmp/mythvantage_install.log $HOST_IMG_DIR/var/log/ -} - -function create_tftp_boot () { - - CFGFILE=$TFTP/pxelinux.cfg/01-$2 - echo "DEFAULT mythfe" > $CFGFILE - echo "LABEL mythfe" >> $CFGFILE - echo "kernel masterbuild/boot/vmlinuz26STB" >> $CFGFILE - echo "append vga=normal root=/dev/nfs rw netboot nfsroot=$myip:/data/srv/tftp/$1 ip=dhcp init=/sbin/runit" >> $CFGFILE - echo "TIMEOUT 2" >> $CFGFILE -} - -function create_nfs_export () { -echo "/data/srv/tftp/$1 *(rw,no_root_squash,anonuid=1000,anongid=1000) " >> /etc/exports -exportfs -arv -} - -#-------------------------------------------------------------------------------MAIN PROGRAM --------------------------------------------------------------------- -if [ x$1 = x -o x$2 = x ] -then - echo "usage: hostname macaddress" - exit 1 -fi - -image_name=$1 -mac_address=`echo $2| tr "[:upper:]" "[:lower:]"` - -echo "using image_name of $image_name" -echo "using mac_address of $mac_address" - -HOST_IMG_DIR=$TFTP/$1 - -create_base_image $image_name -configure_image -umount $HOST_IMG_DIR/dev -create_tftp_boot $image_name $mac_address -create_nfs_export $image_name - - - - -#create_dhcp_entry $mac_address - diff --git a/abs/core-testing/LinHES-config-svn/checkout_MythVantage.sh b/abs/core-testing/LinHES-config-svn/checkout_MythVantage.sh deleted file mode 100755 index 2583e6b..0000000 --- a/abs/core-testing/LinHES-config-svn/checkout_MythVantage.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -MYDIR=`pwd` -MYTHPATH="\/data\/LinHES-PKGBUILD\/abs\/core-testing\/mythtv\/trunk\/mythtv\/src\/mythtv" - -function setup_links { -rm mythinstall.bin -rm mythbeselect.bin -ln -s $MYDIR/src/MythVantage-app/mythinstall/mythinstall ./mythinstall.bin -ln -s $MYDIR/src/MythVantage-app/mythbeselect/mythbeselect ./mythbeselect.bin -} - -function dl_repo { -mkdir src -cd src -if [ ! -d MythVantage-app ] -then - git clone http://mythvantage.com/MythVantage-app.git/ - cd MythVantage-app - git checkout --track -b MYTHUI origin/MYTHUI - cd $MYDIR - setup_links - cd - -else - echo "updating exisiting tree" - cd MythVantage-app - git pull - git merge - cd - -fi - - -} - -dl_repo -sed -i "s/^MYTHPATH.*$/MYTHPATH\=\"$MYTHPATH\"/g" $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro -sed -i "s/#define __MVAPP__/\/\/#define __MVAPP__/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h -sed -i "s/mythvantage/LinHES/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h - -echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythbeselect/mythberestart.pro -echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro -cd $MYDIR/src/MythVantage-app/mythinstall && qmake -make || exit 1 -cd $MYDIR/src/MythVantage-app/mythbeselect && qmake -make ||exit 1 - diff --git a/abs/core-testing/LinHES-config-svn/create_master.sh b/abs/core-testing/LinHES-config-svn/create_master.sh deleted file mode 100755 index 1e641b4..0000000 --- a/abs/core-testing/LinHES-config-svn/create_master.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -#CD=/mnt/cd -CD=/data/srv/tftp/live -DESTCD=/data/srv/tftp/CD -DEST=/data/srv/tftp/masterbuild -MODULES=$DESTCD/MythVantage/base/ -myip=`ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'|head -n1` - -mkdir -p $DESTCD -mkdir -p $DEST - -mount $CD -status=0 -if [ -f $CD/MythVantage/base/data.lzm ] -then - status=0 -else - status=1 -fi -if [ x$status = x0 ] -then - echo "copying to disk" - cp -rp $CD/* $DESTCD - cd $MODULES - for i in *.lzm - do - echo $i - lzm2dir $i \/$DEST - done - for i in sys proc dev tmp - do - mkdir $DEST/$i - done - chmod 777 /$DEST/tmp - mknod $DEST/dev/null c 1 3 - mknod $DEST/dev/null c 1 5 - mknod $DEST/dev/console c 5 1 - chmod +s $DEST/usr/bin/Xorg - chmod +s $DEST/usr/bin/crontab - chmod +s $DEST/usr/bin/sudo - chmod +s $DEST/bin/mount -fi -if [ ! -f $DEST/etc/fstab.bak ] -then - cp $DEST/etc/fstab $DEST/etc/fstab.bak -fi -tac $DEST/etc/fstab.bak|tail +4|tac > $DEST/etc/fstab -echo "$myip:/data/srv/tftp/masterbuild / nfs" >> $DEST/etc/fstab -echo "/data/srv/tftp/masterbuild *(rw,no_root_squash,anonuid=1000,anongid=1000)" >> /etc/exports - - -exportfs -arv - -#copy in the modules -mkdir -p $DEST/mnt/live/mnt/ -mv $DESTCD/* $DEST/mnt/live/mnt/ - diff --git a/abs/core-testing/LinHES-config-svn/file_time_offset.py b/abs/core-testing/LinHES-config-svn/file_time_offset.py deleted file mode 100755 index f2973d0..0000000 --- a/abs/core-testing/LinHES-config-svn/file_time_offset.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/python - - -import time -import os -import glob -import getopt -import sys -def main(argv): - filecount=0 -# root = "/tmp" -# offset = 4 - now = int(time.time()) - - - try: - opts, args = getopt.getopt(argv, "hs:d:") - except getopt.GetoptError: - sys.exit(2) - for opt, arg in opts: - if opt in ("-h", "--help"): - print "-s seconds -d /testdir" - print "default if 4 seconds" - sys.exit() - elif opt in ( "-s" ): - offset = int(arg) - elif opt in ("-d"): - root = arg - - for item in glob.glob(root+"/*"): - lastmodDate = os.path.getmtime(item) - tdiff= now-lastmodDate - #print tdiff, offset - - if tdiff > offset: - filecount+=1 - print filecount -if __name__ == "__main__": - main(sys.argv[1:]) diff --git a/abs/core-testing/LinHES-config-svn/install-ui.xml b/abs/core-testing/LinHES-config-svn/install-ui.xml deleted file mode 100755 index 2b3a043..0000000 --- a/abs/core-testing/LinHES-config-svn/install-ui.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - #ffff00 - #000000 - 20 - 3,3 - yes - - - - #9999cc - 18 - yes - - - - #ffff00 - #000000 - 18 - 3,3 - yes - - - - #ffffff - 18 - yes - - - - #ffffff - 50 - yes - - - #ff0000 - #000000 - 16 - 2,2 - yes - - - - #ffff00 - 14 - yes - - - #9999cc - 12 - no - - - - 0,0,800,600 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/abs/core-testing/LinHES-config-svn/install_db_chroot.sh b/abs/core-testing/LinHES-config-svn/install_db_chroot.sh deleted file mode 100755 index 808dbb9..0000000 --- a/abs/core-testing/LinHES-config-svn/install_db_chroot.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/bash -. /etc/profile -. /etc/systemconfig - - -myhost=$hostname -hostname $myhost -echo $myhost > /etc/hostname -echo "$0 hostname is $hostname" - -. $MV_ROOT/bin/install_functions.sh -#myhost=`cat /etc/hostname` - -# Before this script is called, the mysqld that facilitated the installation is killed. -# We need to make sure to stop and start the mysqld that will be used post-install so -# that the database can be initialized. - -/etc/rc.d/mysqld stop -killall -9 mysqld -/etc/rc.d/mysqld start -sleep 1 - -# Put a limit on how many times we try to (re-)start MySQL -success_test() { - # parameter: number of tries to start mysqld so far - PID=`pidof -o %PPID /usr/sbin/mysqld` - if [ -z "$PID" ]; then # mysqld isn't running - if [ $1 -gt 3 ]; then - echo "ERROR: Failed to start MySQL server in $1 attempts." - sleep 5 - exit 1 - else - echo "Tried $1 time(s) to start MySQL server." - return 1 - fi - else # mysqld is running - return 0 - fi - # should never get here - return 1 -} - -mysqld_tries=0 -# See if MySQL server is running; try several ways to start it if it's not. -while true; do - success_test $mysqld_tries - if [ $? -eq 0 ]; then - echo "MySQL server is running" - break - else - echo "MySQL server is not running. Trying to start it." - # Maybe it just needs to be started - sleep 1 - /etc/rc.d/mysqld start - mysqld_tries=$((mysqld_tries + 1)) - success_test $mysqld_tries - if [ $? -eq 0 ]; then - echo "MySQL server has been started" - break - else - echo "MySQL server may not be installed. Trying to install it." - # Maybe it's not installed; try (re-)installing it and starting it - sleep 1 - pacman --noconfirm -Sf mysql - sleep 1 - /etc/rc.d/mysqld start - mysqld_tries=$((mysqld_tries + 1)) - success_test $mysqld_tries - if [ $? -eq 0 ]; then - echo "MySQL server has been installed and started" - break - else - echo "MySQL server would not start, even after (re-)installing it." - fi - fi - fi -done - -# At this point, MySQL server should be up and running - -while true; do - mysql -e "show databases;" - - if [ $? -eq 0 ]; then - pacman --noconfirm -R mythdb-initial - pacman --noconfirm -S mythdb-initial - $MV_ROOT/bin/restore_default_settings.sh -c load - DISPLAY=127.0.0.1:0 $MV_ROOT/bin/MythVantage -t restore,default_1 - $MV_ROOT/bin/restore_default_settings.sh -c restore -t syssettings - $MV_ROOT/bin/systemconfig.sh misc,hostype,this_is_install - - update_db_settings HostServiceMythWEB "1" - echo 'UseMythWEB="1"' >> /etc/systemconfig - - #update database to allow user jobs on this host. - $MV_ROOT/bin/restore_default_settings.sh -c USERJOBALLOW - $MV_ROOT/bin/restore_default_settings.sh -c ACCESSCONTROL - #if [ -d /var/lib/mysql/mythconverg ] - if [ -d /data/srv/mysql/mythconverg ]; then - # pacman --noconfirm -R webcalendar - # pacman --noconfirm --nodeps -S webcalendar - break - else - echo "Failed to create mythconverg database. Will re-try." - sleep 1 - fi -# if [ $SystemType = "Master_backend" ] -# then -# $MV_ROOT/bin/restore_default_settings.sh -c BECONFIG -s master -a $dbhost -# fi - else - echo "Failed to look for databases. Will re-try." - sleep 1 - fi -done -/etc/rc.d/mysqld stop -#umount /proc diff --git a/abs/core-testing/LinHES-config-svn/install_functions.sh b/abs/core-testing/LinHES-config-svn/install_functions.sh deleted file mode 100755 index 4f6f7ed..0000000 --- a/abs/core-testing/LinHES-config-svn/install_functions.sh +++ /dev/null @@ -1,621 +0,0 @@ -#!/bin/bash -. /etc/profile -disk=$2 -mountpoint=new_boot - -#------------------------------------------- -MYTHDBUSER=mythtv -MYTHTVPASSWD=mythtv -CMDLINE=$(cat /proc/cmdline) -hostname=`hostname` -MYSQLCMD_C="mysql -u$MYTHDBUSER -p$MYTHTVPASSWD mythconverg -B --exec" -BASE="" - - -function update_db_settings () { - - echo "setting database value $1 to $2 for $hostname" - $MYSQLCMD_C "delete from settings where value='${1}' and hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set value='${1}', data='${2}' , hostname=\"$hostname\";" -} - -function random_theme () { -THEMES="basic-blue -basic-green -basic-red -basic-purple -basic-amber" - -theme=($THEMES) # Read into array variable. - -num_themes=${#theme[*]} # Count how many elements. - -pick=${theme[$((RANDOM%num_themes))]} -echo "Selected $pick as the theme" -update_db_settings Theme "$pick" -} - - -function splash_setup (){ - echo $CMDLINE | grep -q splash=silent - if [ $? -eq 0 ] - then - update_db_settings Hostbootsplash 1 - else - update_db_settings Hostbootsplash 0 - fi -} - - -function setupremote { - [ -e $BASE/etc/lircd.conf ] && mv -f $BASE/etc/lircd.conf $BASE/etc/lircd.conf.`date +%Y-%m-%d-%H-%M` - if [ -d $TEMPLATES/remotes/$Remotetype ] - then - cd $TEMPLATES/remotes/$Remotetype - for i in lircd* - do - cat $i >> $BASE/etc/lircd.conf - done - cp -f lircrc* $BASE/etc/lircrc 2> /dev/null - [ -e /etc/lircrc ] && chmod 755 /etc/lircrc - update_db_settings HostRemoteType "$Remotetype" - #special case for special remote - echo "Starting with support for $Remotetype" - if [ "$Remotetype" == "dvico" ] - then - /usr/sbin/lircd -d /dev/usb/hiddev0 - else - /usr/sbin/lircd -d /dev/lirc0 - fi - [ -e /root/.mythtv ] || mkdir /root/.mythtv 2>/dev/null - ln -s /etc/lircrc /root/.mythtv/lircrc 2>/dev/null - else - echo "Couldn't open directory $TEMPLATES/remotes/$Remotetype" - fi -} - -function scan_for_hpg_receiver() { -echo "Scanning for Hauppauge receiver" -for hpgid in `lspci -nm -d4444: |cut -d" " -f6- |tr -d '"'|tr " " :` -do - line=`grep $hpgid $TEMPLATES/remotes/i2c.id` - if [ $? -eq 0 ] - then - modprobe lirc_i2c - FoundReceiverType=`echo "$line"|cut -d"|" -f2` - Remotetype=`echo "$line"|cut -d"|" -f4` - statusline=`echo "$line"|cut -d"|" -f2,4` - echo "Found $statusline , $Remotetype" - update_db_settings HostReceiverType $FoundReceiverType - setupremote - break - fi - -done -} - - -function scan_for_usb_remote () { -found_remote=1 -echo "Scanning for usb receiver/remote" -while read line -do - USBID=`echo "$line"|cut -d"|" -f1` - lsusb -d "$USBID" > /dev/null 2>/dev/null - if [ $? -eq 0 ] - then - Remotetype=`echo "$line"|cut -d"|" -f2` - echo "Found $Remotetype" - setupremote - found_remote=0 - break - fi -done <$BASE/$TEMPLATES/remotes/receiver_usb.id -if [ $found_remote -eq 1 ] -then - scan_for_hpg_receiver -fi -echo "Scanning for TatIR..." -if lsusb | grep 04d8:0004 > /dev/null 2>/dev/null -then - /usr/bin/PyroUsb.py > /dev/null 2>&1 & -fi -} - -function rest_of_network () { - #netmask - echo $CMDLINE | grep -q netmask - if [ $? -eq 0 ] - then - TEMPVAR=${CMDLINE#*netmask=} - NETMASK=${TEMPVAR%% *} - /sbin/ifconfig eth0 $IP netmask $NETMASK - nm=`/usr/bin/nmconv.py -obits $NETMASK` - NETMASK="/$nm $NETMASK" - echo $NETMASK - update_db_settings HostNETMASK${MYTHDEFAULT} "$NETMASK" - else - echo "netmask not found" - fi - #gateway - echo $CMDLINE | grep -q gateway - if [ $? -eq 0 ] - then - TEMPVAR=${CMDLINE#*gateway=} - GATEWAY=${TEMPVAR%% *} - /sbin/route add default gw $GATEWAY - update_db_settings HostGW${MYTHDEFAULT} "$GATEWAY" - - else - echo "gateway not found" - fi - - #dns - echo $CMDLINE | grep -q dns - if [ $? -eq 0 ] - then - TEMPVAR=${CMDLINE#*dns=} - DNS=${TEMPVAR%% *} - echo "nameserver $DNS" >> /etc/resolv.conf - update_db_settings HostDNS${MYTHDEFAULT} "$DNS" - else - echo "DNS not found" - fi -} - -function init_network { - echo $CMDLINE |grep -q netdev - if [ $? -eq 0 ] - then - TEMPVAR=${CMDLINE#*netdev=} - MYTHDEFAULT=${TEMPVAR%% *} - else - MYTHDEFAULT="eth0" - fi - - - - echo $CMDLINE | grep -q ip - if [ $? -eq 0 ] - then - update_db_settings HostDefaulteth0 0 - update_db_settings HostDefault${MYTHDEFAULT} 1 - - update_db_settings HostActiveonbooteth0 0 - update_db_settings HostActiveonboot${MYTHDEFAULT} 1 - update_db_settings HostNetDevice ${MYTHDEFAULT} - - TEMPVAR=${CMDLINE#*ip=} - IP=${TEMPVAR%% *} - if [ "$IP" == "dhcp" ] - then - /sbin/dhcpcd $MYTHDEFAULT - update_db_settings HostUseDHCP${MYTHDEFAULT} 0 - else - /sbin/ifconfig ${MYTHDEFAULT} $IP - update_db_settings HostUseDHCP${MYTHDEFAULT} 1 - update_db_settings HostIP${MYTHDEFAULT} "$IP" - rest_of_network - fi - fi -} - -function init_remote { - echo $CMDLINE | grep -q remoteport - if [ $? -eq 0 ] - then - TEMPVAR=${CMDLINE#*remoteport=} - REMOTEPORT=${TEMPVAR%% *} - if [ "$ReceiverType" == "Serial" ] - then - if [ -e /dev/$REMOTEPORT ] - then - /usr/bin/setserial /dev/$REMOTEPORT uart none - /sbin/modprobe lirc_serial - update_db_settings HostReceiverType Serial - update_db_settings HostSerialPortlirc "$REMOTEPORT" - fi - fi - - fi - - echo $CMDLINE | grep -q remote - if [ $? -eq 0 ] - then - TEMPVAR=${CMDLINE#*remote=} - Remotetype=${TEMPVAR%% *} - setupremote - else - scan_for_usb_remote - fi -} - -#----------------------- - -#set -x - -partition_it () { -ROOT=$1 -DATA=$2 -SWAP=$3 - -if [ "$SWAP" != "NO" ] - then - SWAPLINE=",$SWAP,S" - MKSWAPCMD="mkswap /dev/${disk}2" - else - SWAPLINE=",0,0" - MKSWAPCMD="" - fi - -if [ "$DATA" == "ALL" ] -then - DATALINE=",,," - EXTRALINE="" -else - DATALINE=",$DATA,," - EXTRALINE=",0,," -fi -sfdisk /dev/$disk -uM << EOF -,$1,,* -$SWAPLINE -$DATALINE -$EXTRALINE -; -EOF - -$MKSWAPCMD -#sfdisk -l /dev/$disk -} - - -function fscmd () { - -case $1 in - reiserfs) FSCMDC="mkreiserfs -q -l ROOT" - ;; - - xfs) FSCMDC="mkfs -t $1 -f" - ;; - ext3) FSCMDC="mkfs.ext3" - ;; - jfs) FSCMDC="mkfs.jfs -q " - ;; - ext4) FSCMDC="mkfs.ext4" - ;; - *) FSCMDC="echo $1" - ;; -esac -} - -format_it () { - fscmd $1 - $FSCMDC /dev/${disk}1| tr -s [:cntrl:] \\n - fscmd $2 - $FSCMDC /dev/${disk}3| tr -s [:cntrl:] \\n -} - -mount_it () { - if [ ! -d \/$mountpoint ] - then - mkdir \/$mountpoint - fi - mount /dev/${disk}1 \/$mountpoint - mkdir \/$mountpoint/myth - mount /dev/${disk}3 \/$mountpoint/myth -} - -unmount_it () { - umount /dev/${disk}1 - umount /dev/${disk}3 - umount \/$mountpoint/myth - umount \/$mountpoint -} - - -copy_it () { - - if [ "$1" == "ALL" ] - then - echo "Transferring system" - unsquashfs -f -d /$mountpoint /.livesys/medium/system.sqf - else - echo "Upgrading system" - unsquashfs -e $1 -f -d /$mountpoint /.livesys/medium/system.sqf - fi - - for i in sys proc dev tmp - do - mkdir /$mountpoint/$i - - done - chmod 777 /$mountpoint/tmp - mknod /$mountpoint/dev/null c 1 3 - mknod /$mountpoint/dev/null c 1 5 - mknod /$mountpoint/dev/console c 5 1 - chmod +s /$mountpoint/usr/bin/Xorg - chmod +s /$mountpoint/usr/bin/crontab - chmod +s /$mountpoint/usr/bin/sudo - chmod +s /$mountpoint/bin/mount - -} - - -device_node () { - cd /dev - mknod hda b 3 0 - mknod hda1 b 3 1 - mknod hda2 b 3 2 - mknod hda3 b 3 3 - mknod hda4 b 3 4 - mknod hda5 b 3 5 - mknod hda6 b 3 6 - mknod hda7 b 3 7 - mknod hda8 b 3 8 - mknod sda b 8 0 - mknod sda1 b 8 1 - mknod sda2 b 8 2 - mknod sda3 b 8 3 - mknod sda4 b 8 4 - mknod sda5 b 8 5 - mknod sda6 b 8 6 - mknod sda7 b 8 7 - mknod sda8 b 8 8 - mknod sdb b 8 16 - mknod sdb1 b 8 17 - mknod sdb2 b 8 18 - mknod sdb3 b 8 19 - mknod sdb4 b 8 20 - mknod sdb5 b 8 21 - mknod sdb6 b 8 22 - mknod sdb7 b 8 23 - mknod sdb8 b 8 24 - cd - - } - - - - -function create_fstab() -{ -echo "creating fstab" -cat > /$mountpoint/etc/fstab << EOF -# -none /dev/pts devpts defaults 0 0 -none /dev/shm tmpfs defaults 0 0 -/dev/cdrom /media/cdrom auto ro,user,noauto,unhide 0 0 -/dev/dvd /media/dvd auto ro,user,noauto,unhide 0 0 -UUID=ROOTUID / auto defaults 0 1 -UUID=DATAUID /myth auto defaults 0 1 -UUID=SWAPUID swap swap defaults 0 0 -EOF - - -} - - -function find_uuid() { - uuid=`blkid -s UUID /dev/$1 |cut -d= -f2|cut -d\" -f2` - echo $uuid for $1 - FOUNDUUID=$uuid - -} - - -get_grub_map() { - [ -e /tmp/dev.map ] && rm /tmp/dev.map - /sbin/grub --no-floppy --device-map /tmp/dev.map < /dev/null 2>&1 - echo "freezing xfs fs" - /usr/sbin/xfs_freeze -f /$mountpoint - if [ $? -eq 0 ] - then - sleep 40 - echo "unfreezing xfs" - /usr/sbin/xfs_freeze -u /$mountpoint - fi - fi - #$DESTDIR/sbin/grub-install --recheck --root-directory=$DESTDIR $bootdev >/tmp/grub.log 2>&1 - echo grub-install --recheck --root-directory=/$mountpoint $bootdev - grub-install --recheck --root-directory=/$mountpoint $bootdev - # unfreeze xfs filesystems - - - if grep "Error [0-9]*: " /tmp/grub.log >/dev/null; then - echo "Error installing GRUB. " - return 1 - fi - echo "GRUB was successfully installed." -} - -function removevg () { - LIST=`pvscan |grep $1|tr -s " " |cut -d" " -f 5` - for vg in $LIST - do - echo "Removing vg $vg" - vgremove -f -v $vg - done - - - - -} - - -case $1 in - partition_it ) - #drive ROOT DATA(ALL) SWAP(NO) - for i in `mount | grep $disk | awk ' { print $1 } '` - do - umount $i - done - swap=`cat /etc/fstab |grep $disk|grep swap|awk ' { print $1 } '` - swapoff $swap - removevg $disk - partition_it $3 $4 $5 - exit 0 - - ;; - format_it ) - device_node - - format_it $3 $4 - exit 0 - ;; - mount_it ) - mount_it - ;; - copy_it ) - copy_it $3 - - ;; - - - fstab_fix_it) - echo $@ >> /tmp/fstab.input - if [ ! -f /$mountpoint/etc/fstab ] - then - create_fstab - fi - #was 5 - if [ "$3" == "UPGRADE" ] - then - if [ ! -f /tmp/etc/KnoppMyth-version ] - then - if [ -f /tmp/etc/fstab ] - then - cp -f /tmp/etc/fstab /$mountpoint/etc/fstab - else - create_fstab - fi - else - create_fstab - fi - fi - - #search for UUID - FOUNDUUID="" - find_uuid ${2}1 - ROOTUUID=$FOUNDUUID - echo "--" - echo $ROOTUUID - echo "--" - FOUNDUUID="" - find_uuid ${2}2 - SWAPUUID=$FOUNDUUID - - FOUNDUUID="" - if [ "$4" == "" ] - then - #upgrade - find_uuid ${2}3 - elif [ "$5" == "FULL_INSTALL" ] - then - #install - find_uuid ${2}3 - else - #upgrade with non statndard myth - find_uuid $4 - fi - - DATAUUID=$FOUNDUUID - - - - sed -i -e "s/.*\/\ .*$/UUID=$ROOTUUID \/ auto defaults,noatime 0 1/g" /$mountpoint/etc/fstab - sed -i -e "s/.*\/myth\ .*$/UUID=$DATAUUID \/myth auto defaults,noatime 0 1/g" /$mountpoint/etc/fstab - sed -i -e "s/.*swap\ .*$/UUID=$SWAPUUID swap swap defaults 0/g" /$mountpoint/etc/fstab - -#if Knoppmyth upgrade then loop through old fstab picking out vg - if [ -f /tmp/etc/KnoppMyth-version ] - then - if [ -f /tmp/etc/fstab ] - then - grep -q /dev/vg /tmp/etc/fstab - if [ $? -eq 0 ] - then - grep /dev/vg /tmp/etc/fstab >> /$mountpoint/etc/fstab - grep /dev/vg /tmp/etc/fstab | awk -v mount=$mountpoint ' { print "/" mount $2 }' |xargs mkdir - grep /dev/vg /tmp/etc/fstab | awk -v mount=$mountpoint ' { print "/" mount $2 }' |xargs chown -R mythtv:users - fi - fi - fi - ;; - - grub_it ) - - #grub-install --recheck --no-floppy --root-directory=/$mountpoint "(hd0)" - #fixing grub/menu.1st - dogrub ${disk} - FOUNDUUID="" - find_uuid ${disk}1 - ROOTUUID=$FOUNDUUID - sed -i -e "s/root=.\S*/root=\/dev\/disk\/by-uuid\/$ROOTUUID/g" /$mountpoint/boot/grub/menu.lst - mkinitcpio -g /$mountpoint/boot/kernel26.img - ;; - umount_it) - umount \/$mountpoint/myth - umount \/$mountpoint - ;; - update_db_it ) - update_db_settings "$2" "$3" - ;; - - -esac - - - diff --git a/abs/core-testing/LinHES-config-svn/install_proxy.sh b/abs/core-testing/LinHES-config-svn/install_proxy.sh deleted file mode 100755 index 32d01d7..0000000 --- a/abs/core-testing/LinHES-config-svn/install_proxy.sh +++ /dev/null @@ -1,717 +0,0 @@ -#!/bin/bash -#chroot and /tmp -export TERM=vt100 -MVHOSTNAME=larch5 -. /etc/profile -TEMP_TEMPLATES=/tmp/templates -disk=$2 -rootfs=$3 -rootsize=$4 -datafs=$5 -datasize=$6 -swapsize=$7 -mountpoint="/new_boot" -run=$MV_ROOT/bin/install_functions.sh -. /etc/systemconfig 2>/dev/null -. $MV_ROOT/bin/networkconfig.sh -CMDLINE=$(cat /proc/cmdline) -BACKUPFILE="/myth/backup/mythconverg.sql.gz" - -#TEMPNET="Hostip"$default_interface -#eval MYTHIP=\$${TEMPNET} -function create_chroot_mnt_points() { - - echo "Creating directory for media in chroot" - mkdir -p $mountpoint/media/cdrom - mkdir -p $mountpoint/media/dvd - mkdir -p $mountpoint/mnt - -} -function cp_and_log () { - ls $1 >/dev/null 2>&1 - status=$? - if [ $status = 0 ] - then - echo "copying $1 to $2" - cp -rfp $1 $2 - else - echo "$1 is not present, skipping..." - fi - -} - -function mdadm_find () { - - PREFIX=$1 - if [ -e $PREFIX/etc/KnoppMyth-version ] - then - MDADM_CONF="/etc/mdadm/mdadm.conf" - else - MDADM_CONF="/etc/mdadm.conf" - fi - echo "Using $MDADM_CONF" -} - -progress () { -mypercent=`echo "$1" | cut -d. -f1` -if [ x$mypercent = x ] -then -echo "" > /tmp/.install_percent -else -echo "${mypercent}% complete" > /tmp/.install_percent -fi - - -} - -function apply_new_auth () { -#check if file is present - if [ -f /root/myth_user_call.out ] - then - #read in file, running each command in chroot - exec 4 /tmp/user_auth.update - fi - done - rm -f /root/myth_user_call.out - else - echo "No new password changes to apply" - fi -} - - -function backup_sql_check { - if [ -f ${mountpoint}${BACKUPFILE} ] - then - echo "found ${mountpoint}${BACKUPFILE} " - rc=0 - else - echo "did not find ${mountpoint}${BACKUPFILE} " - rc=1 - fi - return $rc -} - -function mdadm_assemble_all { - - mdadm_find /tmp - mdadm --assemble --scan -c /tmp${MDADM_CONF} - MDLIST=`grep ARRAY /tmp${MDADM_CONF}|tr -s [:space:]|cut -d" " -f2` - for array in $MDLIST - do - echo "assembling array $array" - mdadm --assemble -c /tmp${MDADM_CONF} $array - sleep 2 - fsck -p $array - done - -} - -function upgrade_mount_search { - - MYTH_P=`cat /tmp/etc/fstab |grep -E /myth[[:space:]] | awk ' {print $1 '} ` - umount $mountpoint/myth - - #should probably just mdadm all the time - echo $MYTH_P |grep -q \/md. - if [ $? = 0 ] - then - mdadm_assemble_all - fi - - echo $MYTH_P |grep -q UUID - if [ $? = 0 ] - then - MUUID=`echo $MYTH_P|cut -d= -f2|tr -d \"` - echo blkid $MUUID - blkid -t UUID=$MUUID - if [ ! $? = 0 ] - then - echo "couldn't find $MUUID, starting md support" - mdadm_assemble_all - fi - mount -U $MUUID $mountpoint/myth - echo mount -U $MUUID $mountpoint/myth - MYTHMOUNT=`blkid -t UUID=$MUUID|cut -d: -f1` - MYTHMOUNT=`basename $MYTHMOUNT` - echo "MYTHMOUNT is $MYTHMOUNT" - else - mount $MYTH_P $mountpoint/myth - echo mount $MYTH_P $mountpoint/myth - MYTHMOUNT=`basename $MYTH_P` - echo "MYTHMOUNT is $MYTHMOUNT" - fi - sleep 2 - backup_sql_check - if [ $? = 1 ] - then - mkdir -p /new_boot/root/backup - if [ ! -e /tmp/mythconverg.sql.gz ] - then - echo "Couldn't find ANY database to restore, upgrade will continue but a new database will be installed." - else - cp_and_log /tmp/mythconverg.sql.gz /new_boot/root/backup/mythconverg.sql.gz - BACKUPFILE="/root/backup/mythconverg.sql.gz" - echo "setting BACKUPFILE to $BACKUPFILE" - fi - fi - return 0 -} - - -full_install () { - if [ -f /tmp/.this_is_upgrade ] - then - rm /tmp/.this_is_upgrade - fi - echo "Partitioning $disk" > /tmp/.install_state - progress 1 - sleep 1 - $run partition_it $disk $rootsize $datasize $swapsize - - echo "Formatting $disk" > /tmp/.install_state - progress 2 - sleep 1 - $run format_it $disk $rootfs $datafs - - echo "Preparing $disk" > /tmp/.install_state - progress 3 - sleep 1 - $run mount_it $disk - - startsize=`statgrab -M disk.|grep $disk.write_bytes|cut -d= -f 2|tr -d " "` - - echo "STARTSIZE=$startsize">/tmp/.startsize.io - echo "Creating $hostname" > /tmp/.install_state - - sleep 1 - $run copy_it $disk ALL - rm $mountpoint/etc/fstab - $run fstab_fix_it $disk $rootfs $datafs FULL_INSTALL - echo "Configuring system" > /tmp/.install_state - progress 100 - #progress 99 - sleep 1 - $run grub_it $disk - - - #echo "Configuring system" > /tmp/.install_state - #progress 100 - sleep 1 - cp_and_log /etc/systemconfig "$mountpoint"/etc - cp_and_log /root/xorg.conf.install "$mountpoint"/etc/X11/xorg.conf.install - #run save syssettings to save settings, then copy to new mountpoint - $MV_ROOT/bin/restore_default_settings.sh -c save -t syssettings -h $MVHOSTNAME -d localhost - SE=$TEMPLATES/settings/syssettings - mkdir -p ${mountpoint}$SE - #cp -rp $SE/* ${mountpoint}$SE/ - cp_and_log "$SE/*" "${mountpoint}$SE/" - chown root:mythtv "$mountpoint"/etc/systemconfig - chown -R mythtv:mythtv ${mountpoint}$SE - - chmod -R 775 ${mountpoint}$SE - chmod 775 "$mountpoint"/etc/systemconfig - mkdir -p "$mountpoint"/var/log/mythtv - chown mythtv "$mountpoint"/var/log/mythtv - #copy over any updates that might have occured - #cp -rp $MV_ROOT/bin/*.sh "$mountpoint"$MV_ROOT/bin/ - cp_and_log "$MV_ROOT/bin/*.sh" "$mountpoint"$MV_ROOT/bin/ - chmod -R 755 ${mountpoint}/root - create_chroot_mnt_points - cp_and_log /etc/mtab "$mountpoint"/etc/mtab - # cp_and_log /etc/hostname "$mountpoint"/etc/hostname - apply_new_auth - - - if [ $SystemType = "Master_backend" -o $SystemType = "Standalone" ] - then - #installing DB to local machine - #turn off old live database, so the chroot one can start - echo "---------------------CHROOT INSTALLDB-------------------------" - /etc/rc.d/mysqld stop - mount --bind /dev "$mountpoint/dev" - mount --bind /proc "$mountpoint/proc" - chroot "$mountpoint" "$MV_ROOT/bin/install_db_chroot.sh" 2>&1 |tee /tmp/chrootdb.out - #chroot "$mountpoint" "$MV_ROOT/bin/install_db_chroot.sh" - chroot "$mountpoint" $MV_ROOT/bin/systemconfig.sh misc,hostype,network,advanced,this_is_install - echo "stopping mysql in chroot" - chroot "$mountpoint" /etc/rc.d/mysqld stop - kill_dhcp_chroot - sleep 2 - lsof |grep new_boot - umount -l "$mountpoint/dev" - umount -l "$mountpoint/proc" - - echo "---------------------END CHROOT INSTALLDB-------------------------" - /etc/rc.d/mysqld start - else - #update remotedb with this host settings - chroot "$mountpoint" DISPLAY=127.0.0.1:0 /usr/local/bin/MythVantage -t restore,default_1 - chroot "$mountpoint" $MV_ROOT/bin/restore_default_settings.sh -c restore -t syssettings - if [ ! $? = 0 ] - then - touch $mountpoint/tmp/.dbsysfailed - chmod 777 $mountpoint/tmp/.dbsysfailed - else - #Run second time - chroot "$mountpoint" $MV_ROOT/bin/systemconfig.sh misc,hostype,network,advanced,this_is_install - chroot "$mountpoint" $MV_ROOT/bin/restore_default_settings.sh -c ACCESSCONTROL - fi - fi - chroot "$mountpoint" $MV_ROOT/bin/systemconfig.sh advanced - touch $mountpoint/home/mythtv/.configure && chmod 777 $mountpoint/home/mythtv/.configure - - echo "Done" > /tmp/.install_state - cp_and_log /tmp/mythvantage_install.log $mountpoint/var/log/ - $run umount_it $disk - -} - -function createsquashlist(){ -if [ -f $1 ] -then - rm -f -$1 -fi -for i in bin boot etc home lib opt root sbin usr var data -do -echo $i >> $1 -done - - -} - - - - -function upgrade () { - touch /tmp/.this_is_upgrade - - if [ ! x$rootfs = "xDo_not_format" ] - then - echo "Formatting $disk" > /tmp/.install_state - progress 2 - sleep 1 - $run format_it $disk $rootfs NO - fi - echo "Preparing $disk" > /tmp/.install_state - progress 3 - sleep 1 - $run mount_it $disk - startsize=`statgrab -M disk.|grep $disk.write_bytes|cut -d= -f 2|tr -d " "` - echo "STARTSIZE=$startsize">/tmp/.startsize.io - echo "Upgrading $hostname" > /tmp/.install_state - sleep 1 - cp_and_log /tmp/etc /new_boot/etc.old - cp_and_log /tmp/oss /new_boot/var/lib/oss.old - - - SQUASHLIST="/tmp/.squashlist" - createsquashlist $SQUASHLIST - $run copy_it $disk $SQUASHLIST - #copy back ssh keys - -# cp_and_log -rp /data/var/cache/pacman/pkg/* /new_boot/data/var/cache/pacman/pkg/ - cp_and_log "/new_boot/etc.old/ssh/*.pub" /new_boot/etc/ssh/ - cp_and_log "/new_boot/etc.old/ssh/*.key" /new_boot/etc/ssh/ - cp_and_log "/new_boot/etc.old/ssh/*key" /new_boot/etc/ssh/ - mdadm_find /tmp - cp_and_log /tmp${MDADM_CONF} /new_boot/etc - #cp_and_log /new_boot/etc.old/mdadm/mdadm.conf /new_boot/etc/ - cp_and_log /new_boot/etc.old/asound.state /new_boot/etc/ - if [ ! -f /tmp/etc/KnoppMyth-version ] - then - #passwd/shadow/group - cp_and_log /new_boot/etc.old/passwd /new_boot/etc/ - cp_and_log /new_boot/etc.old/shadow /new_boot/etc/ - cp_and_log /new_boot/etc.old/group /new_boot/etc/ - fi - mkdir -p "$mountpoint"/var/log/mythtv - chown mythtv "$mountpoint"/var/log/mythtv - if [ x$rootfs = "xDo_not_format" ] - then - rootfs=`grep \/\ /tmp/etc/fstab |awk ' { print $3 } '` - fi - #this is here to copy in the systemconfig file as soon as possible. - cp_and_log /etc/systemconfig "$mountpoint"/etc/systemconfig - echo "Configuring system" > /tmp/.install_state - progress 100 - backup_sql_check - if [ $? = 1 ] - then - upgrade_mount_search - fi - echo $run fstab_fix_it $disk UPGRADE $MYTHMOUNT - $run fstab_fix_it $disk UPGRADE $MYTHMOUNT - create_chroot_mnt_points - - #echo "Writing boot sector" > /tmp/.install_state - #progress 99 - sleep 1 - $run grub_it $disk - #echo "Configuring system" > /tmp/.install_state - #progress 100 - sleep 1 - cp_and_log /etc/mtab "$mountpoint"/etc/mtab - cp_and_log /etc/systemconfig "$mountpoint"/etc - cp_and_log /root/xorg.conf.install "$mountpoint"/etc/X11/xorg.conf.install -#make sure mythconverg.sql.gz is present - #backup_sql_check - #if [ $? = 1 ] - #then - # upgrade_mount_search - #fi - echo $CMDLINE | grep -q clean_upgrade - status=$? - if [ -f /tmp/etc/KnoppMyth-version -o $status = 0 ] - then - #run save syssettings to save settings, then copy to new mountpoint - $MV_ROOT/bin/restore_default_settings.sh -c save -t syssettings -h $MVHOSTNAME -d localhost - SE=$TEMPLATES/settings/syssettings - mkdir -p ${mountpoint}$SE - #cp -rfp $SE/* ${mountpoint}$SE/ - cp_and_log "$SE/*" "${mountpoint}$SE/" - chown root:mythtv "$mountpoint"/etc/systemconfig - chown -R mythtv:mythtv ${mountpoint}$SE - chmod -R 775 ${mountpoint}$SE - if [ ! $status = 0 ] - then - touch $mountpoint/home/mythtv/.kmupgrade && chmod 777 $mountpoint/home/mythtv/.kmupgrade - fi - fi - - - - cp_and_log "$MV_ROOT/bin/*.sh" "$mountpoint"$MV_ROOT/bin/ - chmod -R 755 ${mountpoint}/root - chown root:mythtv "$mountpoint"/etc/systemconfig - chmod 775 "$mountpoint"/etc/systemconfig - #mount /proc and /dev - mount --bind /dev "$mountpoint/dev" - mount --bind /proc "$mountpoint/proc" - - chroot "$mountpoint" $MV_ROOT/bin/systemconfig.sh misc,hostype,network,advanced,this_is_install - #wrap this in a network check_network, no need to update the db if the import worked. - ##### do I need to start mysql? - /etc/rc.d/mysqld stop - if [ $SystemType = "Master_backend" -o $SystemType = "Standalone" ] - then - echo $CMDLINE | grep -q clean_upgrade - status=$? - if [ $status = 0 ] - then - #new db as part of clean upgrade - echo "--------------------------------" - echo "clean upgrade installing new database" - echo "--------------------------------" - chroot "$mountpoint" "$MV_ROOT/bin/install_db_chroot.sh" |tee /tmp/chrootdb.out - echo "############################################" - echo "End Installing new database/clean" - echo "############################################" - else - #proceed as normal - if [ -f "$mountpoint"/$BACKUPFILE ] - then - echo "--------------------------------" - echo "Restoring database with $BACKUPFILE" - echo "--------------------------------" - chroot "$mountpoint" "$MV_ROOT/bin/restore_km_db_chroot.sh" "$BACKUPFILE" |tee /tmp/chrootdb_km.out - echo "############################################" - echo "End Restoring database" - echo "############################################" - else - echo "--------------------------------" - echo "Couldn't find backup file, installing new database" - echo "--------------------------------" - touch /tmp/.upgrade_db_failed - chroot "$mountpoint" "$MV_ROOT/bin/install_db_chroot.sh" |tee /tmp/chrootdb.out - echo "############################################" - echo "End Installing new database" - echo "############################################" - fi - fi - fi - - if [ -f /tmp/etc/KnoppMyth-version ] - then - chroot "$mountpoint" $MV_ROOT/bin/restore_default_settings.sh -c restore -t hostsettings - #change permissions of /myth (only needed on km->linhes) - chown -R mythtv:mythtv $mountpoint/myth - chown -R root:root $mountpoint/myth/backup - else - chroot "$mountpoint" $MV_ROOT/bin/restore_default_settings.sh -c restore -t syssettings - fi - # - #Run second time - chroot "$mountpoint" $MV_ROOT/bin/systemconfig.sh misc,hostype,network,advanced,this_is_install - chroot "$mountpoint" $MV_ROOT/bin/systemconfig.sh advanced,this_is_install - echo "stopping mysql in chroot" - chroot "$mountpoint" /etc/rc.d/mysqld stop - apply_new_auth - kill_dhcp_chroot - umount -l "$mountpoint/dev" - umount -l "$mountpoint/proc" - - echo "Done" > /tmp/.install_state - cp_and_log /tmp/mythvantage_install.log $mountpoint/var/log/ - - $run umount_it $disk - /etc/rc.d/mysqld start -} - -function netboot-full_install () { - TEMPVAR=${CMDLINE#*nfsroot=} - NFSROOT=${TEMPVAR%% *} - NFSROOT=`echo $NFSROOT|cut -d: -f1` - MAC=`/sbin/ifconfig eth0|grep HWaddr| cut -d: -f2-|awk '{ print $3}'|tr : -` - URL="http://$NFSROOT:1337/diskless.py?HOSTNAME=$hostname&MAC=$MAC" - echo "calling $URL" - echo "Starting" > /tmp/.install_state - curl $URL - ${MV_ROOT}/bin/xconfig.sh -} - -# function killdhcp () { -# if [ -f /etc/dhcpc/dhcpcd-eth0.pid ] -# then -# pid=`cat /etc/dhcpc/dhcpcd-eth0.pid` -# kill -9 $pid -# rm -f /etc/dhcpc/dhcpcd-eth0.pid -# rm -f /var/run/dhcpcd* -# fi -# if [ -f /var/run/dhcpcd-eth0.pid ] -# then -# pid=`cat /var/run/dhcpcd-eth0.pid` -# kill -9 $pid -# rm -f /var/run/dhcpcd-eth0.pid* -# fi -# ip address flush dev eth0 -# } - - - -function SANE_SYSETTINGS () { -sed -e '/HOSTrootfstype/d' \ - -e '/HOSTrootfstype/d' \ - -e '/HOSTdatafstype/d' \ - -e '/HOSTOSsize/d' \ - -e '/HostUseALLdata/d' \ - -e '/HOSTDATAsize/d' \ - -e '/HOSTuprootfstype/d' \ - -e '/HostUseSWAP/d' \ - -e '/HOSTSWAPsize/d ' /tmp/templates/settings/syssettings/settings.txt > /tmp/settings.new - mv /tmp/settings.new /tmp/templates/settings/syssettings/settings.txt -} - -case $1 in - full_install_it ) full_install ;; - - NETBOOT) -echo "-----------------------------------------------------------------------3-----" - netboot-full_install ;; - - find_update) - - #TRY TO mount first partition of drive - #copy /etc/systemconfig to live, import settings into db - #umount drive - echo $CMDLINE | grep -q clean_upgrade - if [ $? = 1 ] - then - $run mount_it $disk - [ -e "/new_boot/root/backup/mythconverg.sql.gz" ] && cp /new_boot/root/backup/mythconverg.sql.gz /tmp - - - if [ -f /new_boot/etc/systemconfig ] - then - ###########ADD templates - mkdir -p $TEMP_TEMPLATES - cp_and_log /new_boot/$TEMPLATES $TEMP_TEMPLATES - SANE_SYSETTINGS - cp_and_log $TEMP_TEMPLATES/settings $TEMPLATES/ - cp_and_log /new_boot/etc/systemconfig /etc/systemconfig - cp_and_log /new_boot/etc /tmp/etc - cp_and_log /new_boot/var/lib/oss /tmp/oss - [ -e /tmp/etc/mdadm.conf ] && cp_and_log /tmp/etc/mdadm.conf /etc/ - - $MV_ROOT/bin/restore_default_settings.sh -c restore -t syssettings -h $MVHOSTNAME -d 127.0.0.1 - else - cp_and_log /new_boot/etc /tmp/etc - [ -e /tmp/etc/mdadm.conf ] && cp_and_log /tmp/etc/mdadm.conf /etc/ - #now we search for the timezone and try to update - TZREGION=`cat /tmp/etc/timezone | cut -d"/" -f1` - TZSUB=`cat /tmp/etc/timezone | cut -d"/" -f2 -` - - - if [ $TZREGION = $TZSUB ] - then - $run update_db_it HostTimeZoneRegion "$TZREGION" - else - $run update_db_it HostTimeZoneRegion "$TZREGION" - $run update_db_it HostTimeZoneRegion_$TZREGION "$TZSUB" - fi - fi - backup_sql_check - echo $? - upgrade_mount_search - echo $? - $run umount_it $disk - fi - ;; - - upgrade_it) - upgrade - ;; - disk_model_it) - model="unknown" - size="xxx" - case $2 in - - h* ) - model=`cat /proc/ide/$2/model` - ;; - s*) model=`sginfo /dev/$2|grep Product|awk ' { print $2 } '` - ;; - esac - size=`parted /dev/$2 print |grep Disk|awk ' { print $3 } ' ` - echo ""$model" $size " >/tmp/model - ;; - network_check_it) - #Should never return from check_network - case $2 in - setup_network) - vnc_check - install_network_setup - ;; - - check_self) - myipdefault=`ifconfig | grep -C1 $default_interface| grep -v $default_interface | cut -d: -f2 | awk '{ print $1}'` - echo "network check myself" - ifconfig - ping -c 1 $myipdefault - if [ ! $? = 0 ] - then - exit 3 - #can't ping yourself - fi - ;; - check_gw) - #check gateway - echo "network check gateway" - /sbin/route -n - mygwdefault=`/sbin/route -n |grep $default_interface|grep UG|awk '{ print $2}'` - echo "Default gateway seems to be $mygwdefault" - if [ ! x$mygwdefault = x ] - then - sleep 2 - ping -c 5 $mygwdefault - if [ ! $? = 0 ] - then - exit 4 - fi - fi - ;; - check_ns) - #check nameserver - echo " network check nameserver" - mydns=`cat /etc/resolv.conf|grep nameserver|head -1|awk '{ print $2}'` - ping -c 1 $mydns - if [ ! $? = 0 ] - then - exit 5 - fi - ;; - check_names) - echo "network check resolve names" - host google.com - if [ ! $? = 0 ] - then - exit 6 - fi - ;; - host_names) - #if host is found, then check to see if it's online - #if hoip matchs my ip assume it's ok - echo "network check my hostname $hostname" - hout=`host $hostname` - status=$? - #found host, now grab the ip - if [ $status = 0 ] - then - hoip=`echo $hout|awk '{print $4}'` - /sbin/ifconfig -a |grep -q $hoip - if [ $? = 0 ] - then - echo "DNS ip matches on of my ips" - status=0 - else - echo "IP in DNS but doesn't match mine, hostname is not safe to use" - status=7 - fi - else - echo "Couldn't find hostname in DNS, must be safe to use" - status=0 - fi - exit $status - ;; - - esac - exit 0 - ;; - - - * ) - if [ -f /tmp/.install_state ] - then - state=`cat /tmp/.install_state` - else - state=" " - fi - if [ x"${state}" = "xConfiguring system" ] - then - progress "" - else - - if [ -f /tmp/.startsize.io ] - then - . /tmp/.startsize.io - #finding the drive - ddrive=`df | grep $mountpoint | head -n1 | awk -F/ ' { print $3 } ' | cut -d" " -f 1|cut -b1,2,3 ` - used=`statgrab -M disk.|grep ${ddrive}.write_bytes|cut -d= -f 2|tr -d " "` - used=`echo $used-$STARTSIZE|bc` - #echo $used - fi - - if [ ! x$used = x ] - then - . /root/.install_size - #somehow find if it's an install or update - if [ -f /tmp/.this_is_upgrade ] - then - total=$UPGRADESIZE - else - total=$TOTALSIZE - fi - percent=`echo "scale=2 ; ($used/$total) * 100 " |bc ` - cond2=$(echo "$percent > 98" |bc ) - if [ $cond2 -eq 1 ] - then - percent=98 - fi - cond3=$(echo "$percent < 3" |bc ) - if [ $cond3 -eq 0 ] - then - progress $percent - fi - fi - fi - ;; -esac - - - diff --git a/abs/core-testing/LinHES-config-svn/issue b/abs/core-testing/LinHES-config-svn/issue deleted file mode 100644 index 3c01679..0000000 --- a/abs/core-testing/LinHES-config-svn/issue +++ /dev/null @@ -1 +0,0 @@ -LinHes \ No newline at end of file diff --git a/abs/core-testing/LinHES-config-svn/live-install.sh b/abs/core-testing/LinHES-config-svn/live-install.sh deleted file mode 100755 index 573bb1f..0000000 --- a/abs/core-testing/LinHES-config-svn/live-install.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -#redirect stderr to stdout, then rediret stdout to file -. /etc/profile -exec 2>&1 -exec > /tmp/mythvantage_install.log -. /etc/X11/STBWINDOWMANAGER -/usr/bin/nvidia-settings -a InitialPixmapPlacement=2 -keylaunch & -/usr/bin/tilda & -/usr/X11R6/bin/unclutter -root -idle 0 -jitter 400 -noevents & -export MALLOC_CHECK_=0 -if [ -f /opt/vmware/bin32/vmware-user-wrapper ] -then - /opt/vmware/bin32/vmware-user-wrapper & -fi -xhost + -CMDLINE=$(cat /proc/cmdline) -echo $CMDLINE |grep -q nfsroot -NFSROOT=$? -if [ x$NFSROOT = x1 ] -then - - unbuffer MythVantage & -else - NETBOOT=YES MythVantage & -fi - -exec $STBWINDOWMANAGER diff --git a/abs/core-testing/LinHES-config-svn/myth_user_call b/abs/core-testing/LinHES-config-svn/myth_user_call deleted file mode 100644 index 0479895..0000000 --- a/abs/core-testing/LinHES-config-svn/myth_user_call +++ /dev/null @@ -1,172 +0,0 @@ -#!/bin/bash -#Wrapper script to manage USERNAME accounts + web security -# myth_USERNAME_all -c add -u USERNAME -# myth_USERNAME_all -c delete -u USERNAME -# myth_USERNAME_all -c pass -u USERNAME -p pass -# myth_USERNAME_all -c web -u USERNAME -p pass - -INIT_CHECK=TRUE -FULL_CALL="$@" -function CHROOT_CHECK { - INIT=`ps -p 1 -o comm=` - if [ x$INIT = xrunit ] - then - CHROOT_NEEDED=FALSE - else - CHROOT_NEEDED=TRUE - fi -} - -function store_commands () { - echo "$FULL_CALL" >> /root/myth_user_call.out - chmod 600 /root/myth_user_call.out -} - - -function add_user() { - if [ $CHROOT_NEEDED = TRUE ] - then - echo "calling myth_call_user in chroot to add user" - store_commands - else - echo "adding user $USERNAME" - useradd -m -s /bin/bash $USERNAME -G audio,video,optical,storage,users - fi - -} - - -function del_user() { - if [ $CHROOT_NEEDED = TRUE ] - then - echo "calling myth_call_user in chroot to delete user" - store_commands - else - echo "removing user $USERNAME" - userdel $USERNAME - fi - -} - - -function pass_change() { - if [ $CHROOT_NEEDED = TRUE ] - then - echo "calling myth_call_user in chroot to change password" - store_commands - else - echo "changing password for $USERNAME" - echo $USERNAME:$PASSWORD | chpasswd - fi - -} - - -function web_security { - - grep -q ${USERNAME}: /etc/lighttpd/lighttpd.user - if [ $? = 0 ] - then - #delete user - sed -i "/${USERNAME}\:/d" /etc/lighttpd/lighttpd.user - fi - echo "${USERNAME}:${PASSWORD}" >> /etc/lighttpd/lighttpd.user - -} - -function ARG_ERR() { - if [ x$OPTARG = "x" ] - then - echo "$SWITCH NEEDS AND ARG" - exit 11 - fi -} - - -function print_help { - - echo "Valid options are:" - echo " -c (add|delete|pass|web)" - echo " -u USERNAMEname" - echo " -p password" - exit 1 -} - -if [ $# -eq 0 ] -then - print_help -fi - -declare -r OPTSTRING="c:u:p:i" -while getopts "$OPTSTRING" SWITCH -do - case $SWITCH in - - c) ARG_ERR - OPERATION=$OPTARG - ;; - u) ARG_ERR - USERNAME=$OPTARG - ;; - p) ARG_ERR - PASSWORD=$OPTARG - ;; - i) INIT_CHECK=FALSE - - esac -done - -if [ $INIT_CHECK = TRUE ] -then - CHROOT_CHECK -else - CHROOT_NEEDED=FALSE -fi - -case $OPERATION in - add) - if [ x$USERNAME = x ] - then - print_help - fi - add_user - ;; - delete) - if [ x$USERNAME = x ] - then - print_help - fi - del_user - ;; - pass) - if [ x$USERNAME = x ] - then - print_help - fi - - if [ x$PASSWORD = x ] - then - print_help - fi - pass_change - ;; - - web) - if [ x$USERNAME = x ] - then - print_help - fi - - - if [ x$PASSWORD = x ] - then - print_help - fi - echo "adding webUSERNAME $USERNAME with pass $PASSWORD" - web_security - ;; - *) print_help - ;; -esac - - diff --git a/abs/core-testing/LinHES-config-svn/networkconfig.sh b/abs/core-testing/LinHES-config-svn/networkconfig.sh deleted file mode 100644 index 38b819a..0000000 --- a/abs/core-testing/LinHES-config-svn/networkconfig.sh +++ /dev/null @@ -1,331 +0,0 @@ -#!/bin/bash -#. /etc/profile -#. /etc/systemconfig -#BASE=/tmp -ETCNETDIR=$BASE/etc/net/ifaces - - - -function kill_dhcp () -{ -#for i in ${BASE}/etc/dhcpc/dhcpcd-*.pid -for i in ${BASE}/var/run/dhcpcd-*.pid -do - if [ -f ${i} ] - then - pid=`cat ${i}` - kill -9 $pid - rm -f ${i} - fi - if [ x$1 = xflush ] - then - for ifdev in eth0 wlan0 eth1 wlan1 - do - echo ${i} |grep $ifdev - status=$? - if [ $status = 1 ] - then - ip address flush $ifdev - fi - done - fi - -done - -} - -function kill_dhcp_chroot () -{ -#for i in ${BASE}/etc/dhcpc/dhcpcd-*.pid -for i in ${mountpoint}/var/run/dhcpcd-*.pid -do - if [ -f ${i} ] - then - pid=`cat ${i}` - kill -9 $pid - rm -f ${i} - fi -done - -} - - - -function setup_nameserver(){ -grep -q $1 ${BASE}/etc/resolv.conf -status=$? -if [ ! $status = 0 ] -then - echo "nameserver $1" >> ${BASE}/etc/resolv.conf -fi - -} - -function change_iface_state () { - if [ x$2 = xenabled ] - then - echo "setting $1 to active" - sed -i -e 's/^ONBOOT=.*$/ONBOOT=yes/g' $ETCNETDIR/$1/options - sed -i -e 's/^DISABLED=.*$/DISABLED=no/g' $ETCNETDIR/$1/options - else - echo "setting $1 to inactive" - if [ -e $ETCNETDIR/$1/options ] - then - sed -i -e 's/^ONBOOT=.*$/ONBOOT=no/g' $ETCNETDIR/$1/options - sed -i -e 's/^DISABLED=.*$/DISABLED=yes/g' $ETCNETDIR/$1/options - fi - /sbin/ifconfig $1 down - ip address flush $1 - fi - -} - -function setup_interfaces() { - local IS_WIRELESS - local ip - local netmask - local isactive - local dns - local UseDHCP - local GW - local ESSID - local KEY - local ENCRYPT - local TEMPNET - IS_WIRELESS=false - - #local ip - TEMPNET="Hostip"$1 - echo $TEMPNET - eval ip=\$${TEMPNET} - - TEMPNET=Hostnetmask$1 - eval netmask=\$${TEMPNET} - netmask=`echo "$netmask" | cut -d " " -f1` - - TEMPNET=HostActive$1 - eval isactive=\$${TEMPNET} - - TEMPNET=HostDNS$1 - eval dns=\$${TEMPNET} - - TEMPNET="HostUSEDHCP"$1 - eval UseDHCP=\$${TEMPNET} - - TEMPNET=HostGW$1 - eval GW=\$${TEMPNET} - - TEMPNET=HOST_iswireless$1 - eval wireless=\$${TEMPNET} - - - - - if [ x$wireless = x1 ] - then - IS_WIRELESS=TRUE - TEMPNET=HostESSID$1 - eval ESSID=\$${TEMPNET} - - TEMPNET="HostKey"$1 - eval KEY=\$${TEMPNET} - - TEMPNET=HostUseEncryption$1 - eval ENCRYPT=\$${TEMPNET} - fi - - - echo "Setup $1 in progress, wireless: $IS_WIRELESS" - - if [ ! -d $ETCNETDIR/$1 ] - then - mkdir -p $ETCNETDIR/$1 - fi - - if [ ! -f $ETCNETDIR/$1/options ] - then - cp -f $TEMPLATES/etcnet/eth/options $ETCNETDIR/$1/options - fi - - if [ x$isactive = x1 ] - then - change_iface_state $1 enabled - #echo "setting $1 to active" - #sed -i -e 's/^ONBOOT=.*$/ONBOOT=yes/g' $ETCNETDIR/$1/options - #sed -i -e 's/^DISABLED=.*$/DISABLED=no/g' $ETCNETDIR/$1/options - else - change_iface_state $1 disabled - #echo "setting $1 to inactive" - #sed -i -e 's/^ONBOOT=.*$/ONBOOT=no/g' $ETCNETDIR/$1/options - #sed -i -e 's/^DISABLED=.*$/DISABLED=yes/g' $ETCNETDIR/$1/options - fi - - if [ x$IS_WIRELESS = xTRUE ] - then - echo "setting $1 wireless" - sed -i -e 's/^CONFIG_WIRELESS=.*$/CONFIG_WIRLESS=yes/g' $ETCNETDIR/$1/options - #set the key and essid - echo "essid $ESSID" > $ETCNETDIR/$1/iwconfig - if [ x$ENCRYPT = x1 ] - then - echo "key $KEY" >> $ETCNETDIR/$1/iwconfig - fi - - else - echo "disabling wireless" - sed -i -e 's/^CONFIG_WIRLESS=.*$/CONFIG_WIRLESS=no/g' $ETCNETDIR/$1/options - fi - - - - - if [ x$UseDHCP = x0 ] - then - echo using dhcp - sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=dhcp/g' $ETCNETDIR/$1/options - - else - echo "using static ip" - sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=static/g' $ETCNETDIR/$1/options - echo "default via $GW" > $ETCNETDIR/$1/ipv4route - echo "$ip$netmask" > $ETCNETDIR/$1/ipv4address - setup_nameserver $dns - fi -} - - -function find_active () { -#HostActiveeth1="1" -rm -f ${BASE}/etc/resolv.conf -if [ x$MYTHDHCP = x1 ] - then - #add 127.0.0.1 to /etc/resolv.conf - echo "search lan" > ${BASE}/etc/resolv.conf - echo "nameserver 127.0.0.1" >> ${BASE}/etc/resolv.conf - fi - -for i in eth0 eth1 wlan0 wlan1 -do - CURRENTIF="HostActive"$i - eval IFSTATE=\$${CURRENTIF} - echo $IFSTATE "---" - echo $i - if [ x$IFSTATE = x1 ] - then - setup_interfaces $i - else - change_iface_state $i disabled - fi -done - -} - -function setup_hostname { -#set the hostname -if [ ! x$hostname = x ] -then - echo $hostname > ${BASE}/etc/hostname - cat $BASE/etc/hosts |grep -v 127.0.0.1|grep -v $hostname > /tmp/hosts - #cat $BASE/etc/hosts |grep -v 127.0.0.1|grep -v $hostname | grep -v $ip > /tmp/hosts - - if [ x$MYTHDHCP = x1 ] - then - echo "127.0.0.1 localhost " > ${BASE}/etc/hosts - echo "$MYTHIP $hostname " >> ${BASE}/etc/hosts - else - echo "127.0.0.1 $hostname localhost " > ${BASE}/etc/hosts - fi - cat /tmp/hosts >> ${BASE}/etc/hosts -fi - -kill_dhcp -} - -function vnc_check() { - CMDLINE=$(cat /proc/cmdline) - echo $CMDLINE |grep -q vnc - USEVNC=$? - echo $CMDLINE |grep -q nfsroot - NETBOOT=$? - echo $USEVNC - if [ ! x$USEVNC = x0 ] - then - echo "not using vnc" - if [ ! x$NETBOOT = x0 ] - then - echo "not using netboot" - else - echo "using netboot" - USEVNC=0 - fi - - else - echo " using vnc" - fi -} - -function setup_MYTH_vars { - TEMPMYTH="Hostip"$default_interface - #echo $TEMPMYTH - eval MYTHIP=\$${TEMPMYTH} - - TEMPMYTH="HostUSEDHCP"$default_interface - eval MYTHDHCP=\$${TEMPMYTH} - - - -} - - - - -function start_network { -if [ ! $USEVNC = 0 ] -then - /etc/net/scripts/network.init reload - /etc/net/scripts/network.init restart -else - echo "VNC/NETBOOT in use, will NOT restart network" -fi - -} - -function setup_network { - setup_MYTH_vars - setup_hostname - find_active -} - - -function stop_network { -if [ ! $USEVNC = 0 ] -then - echo "stopping the network" - kill_dhcp flush - ip address flush dev eth0 2>&1 >/dev/null - ip address flush dev eth1 2>&1 >/dev/null - ip address flush dev wlan0 2>&1 >/dev/null - ip address flush dev wlan1 2>&1 >/dev/null -else - echo "VNC/NETBOOT in use, will NOT restart network" -fi - -} - - -#this is used by the install process to start the network -function install_network_setup { - setup_MYTH_vars - setup_hostname - stop_network - find_active - start_network - -} - - - - - - - diff --git a/abs/core-testing/LinHES-config-svn/remove_service.sh b/abs/core-testing/LinHES-config-svn/remove_service.sh deleted file mode 100755 index 6cc4b4f..0000000 --- a/abs/core-testing/LinHES-config-svn/remove_service.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -SERVICE_DIR=/var/service -SCRIPT_DIR=/etc/sv -if [ -e $SERVICE_DIR/$1 ] -then - echo "removing" - rm $SERVICE_DIR/$1 -fi diff --git a/abs/core-testing/LinHES-config-svn/restore_default_settings.sh b/abs/core-testing/LinHES-config-svn/restore_default_settings.sh deleted file mode 100755 index dcf5e23..0000000 --- a/abs/core-testing/LinHES-config-svn/restore_default_settings.sh +++ /dev/null @@ -1,362 +0,0 @@ -#!/bin/bash -. /etc/profile -. /etc/systemconfig -shopt -s -o nounset -echo $@ >> /tmp/restore.out -#TEMPLATES="/usr/share/templates/settings" -TEMPLATES="$TEMPLATES/settings" -TABLES="settings keybindings" -MYTHDBUSER=mythtv -MYTHTVPASSWD=mythtv -declare -r OPTSTRING="c:e:t:d:h:s:a:z:Ho" -Thistemplate="" -declare -i OVERRIDE=0 -declare -i EVERYTHING=0 - - -function CMD_DEFINE () { - #add override check - if [ x$Thistemplate = xsyssettings -a $OVERRIDE -eq 1 ] - then - MYSQLCMD="mysql --local-infile -s -u$MYTHDBUSER -p$MYTHTVPASSWD -h$ovdbhost mythconverg -B --exec" - MYSQLCMD_C="mysql -u$MYTHDBUSER -p$MYTHTVPASSWD -h$ovdbhost mythconverg -B --exec" - MYSQLCMD_UPDATE_HOST="UPDATE settings set data='$oldhostname' where value='HostMyhostname' and hostname=\"$hostname\";" - else - MYSQLCMD="mysql --local-infile -s -u$MYTHDBUSER -p$MYTHTVPASSWD -h$dbhost mythconverg -B --exec" - MYSQLCMD_C="mysql -u$MYTHDBUSER -p$MYTHTVPASSWD -h$dbhost mythconverg -B --exec" - MYSQLCMD_UPDATE_HOST="select hostname from settings;" - fi -} - -function SQL_DEFINE () { - thostname=`echo ${hostname}|tr -C [:alpha:] _` - echo "Using $thostname for temp table postfix" - - #$1 is the table name - if [ $1 = "settings" ] - then - ALTERSQL="Alter table temp_${1}_${thostname} add unique ( value )" - else - ALTERSQL=";" - fi - - CREATESQL="create table temp_${1}_${thostname} like $1;" - COPY_TMP_SQL="replace into temp_${1}_${thostname} (select * from $1 where hostname=\"$hostname\");" - INSERTSQL="LOAD DATA local INFILE '/tmp/$1.txt' REPLACE INTO TABLE temp_${1}_${thostname} FIELDS TERMINATED BY '\t';" - #INSERTSQL="LOAD DATA local INFILE '$TEMPLATES/$Thistemplate/$1.txt' REPLACE INTO TABLE temp_${1}_${hostname} FIELDS TERMINATED BY '\t';" - DROPSQL="delete from $1 where hostname=\"$hostname\";" - COPY_BCK_SQL="replace into $1 (select * from temp_${1}_${thostname} where hostname=\"$hostname\");" - DROP_TABLE="Drop table temp_${1}_${thostname}" -} - -function ARG_ERR() { - if [ x$OPTARG = "x" ] - then - echo "$SWITCH NEEDS AND ARG" - exit 11 - fi -} - -function ALSADEVICE () { -#ALSA:hw:1,4 - if [ x$Audiotype = xALSA ] - then - SoundDevice=ALSA:$SoundDevice - MixerDevice="ALSA:default" - else - MixerDevice="/dev/mixer" - fi - -} - - - -if [ $# -eq 0 ] -then - echo "Valid options are:" - echo " -c (save|restore|load|uhostname|BECONFIG|ZIP|ACCESSCONTROL)" - echo " -t (syssettings|hostsettings)" - echo " -d databasename" - echo " -h hostname" - echo " -s systemtype (master|slave|standalone|frontendonly)" - echo " -a ipaddress" - echo " -z zipcode" - echo " -o override (only used upgrade installs)" - exit 1 -fi - - - - -while getopts "$OPTSTRING" SWITCH -do - case $SWITCH in - # \?) echo "unkown option" - # exit 11 ;; - c) echo "$SWITCH" "$OPTARG" - ARG_ERR - OPERATION=$OPTARG - ;; - t) echo "$SWITCH" "$OPTARG" - ARG_ERR - Thistemplate=$OPTARG - - if [ x$Thistemplate = x"syssettings" ] - then - echo "template is syssettings" - loadhost=false - elif [ x$Thistemplate = x"hostsettings" ] - then - echo "template is hostsettings" - Thistemplate=syssettings - loadhost=true - else - echo "invalid template name" - exit 1 - fi - ;; - d) echo "$SWITCH" "$OPTARG" - ARG_ERR - if [ $OVERRIDE = 1 ] - then - ovdbhost=$OPTARG - else - dbhost=$OPTARG - fi - ;; - h) echo "$SWITCH" "$OPTARG" - ARG_ERR - if [ $OVERRIDE = 1 ] - then - oldhostname=$hostname - hostname=$OPTARG - else - hostname=$OPTARG - fi - - ;; - s) echo "$SWITCH" "$OPTARG" - ARG_ERR - SYSTEMTYPE=$OPTARG - ;; - a) echo "$SWITCH" "$OPTARG" - ARG_ERR - IP_ADDRESS=$OPTARG - ;; - z) echo "$SWITCH" "$OPTARG" - ARG_ERR - ZIPCODE=$OPTARG - ;; - o) OVERRIDE=1 - ;; - - esac -done - -echo $OVERRIDE - -#setup the Mysql commands -CMD_DEFINE - -$MYSQLCMD_C "show tables" > /dev/null -status=$? -if [ $status = 1 ] -then - echo "$@ failed" - echo "$@ failed" >> /tmp/restore.out - exit 1 -fi - - - - - - - -case $OPERATION in - - restore) - #used to restore settings from syssettings - if [ -d $TEMPLATES/$Thistemplate ] - then - cd $TEMPLATES/$Thistemplate - if [ $loadhost = false ] - then - for i in $TABLES - do - SQL_DEFINE $i - sed -e "s/REPLACEME/$hostname/g" $i.txt > /tmp/$i.txt - #echo $MYSQLCMD "$SELECTSQL" - echo $i - $MYSQLCMD "$CREATESQL" - $MYSQLCMD "$ALTERSQL" - $MYSQLCMD "$COPY_TMP_SQL" - $MYSQLCMD "$INSERTSQL" - $MYSQLCMD "$DROPSQL" - $MYSQLCMD "$COPY_BCK_SQL " - $MYSQLCMD "$DROP_TABLE " - #rm /tmp/$i.txt - done - fi - if [ $loadhost = true ] - then - #only load the settings table with values HOST - i=settings - SQL_DEFINE $i - sed -e "s/REPLACEME/$hostname/g" $i.txt > /tmp/$i.txt - echo $i - $MYSQLCMD "$CREATESQL" - $MYSQLCMD "$ALTERSQL" - $MYSQLCMD "$INSERTSQL" - $MYSQLCMD "$COPY_TMP_SQL" - $MYSQLCMD "$DROPSQL" - $MYSQLCMD "$COPY_BCK_SQL" - $MYSQLCMD "$DROP_TABLE " - fi - else - echo "couldn't find $TEMPLATES/$Thistemplate" - fi - ;; - - save) - - if [ ! -d $TEMPLATES/$Thistemplate ] - then - mkdir -p $TEMPLATES/$Thistemplate - fi - - cd $TEMPLATES/$Thistemplate - for i in $TABLES - do - EXTRACLAUSE="" - case $i in - settings) - EXTRACLAUSE="and not (value like \"BackendServerIP\") and not (value like \"locale\") order by value" - SQL="select value,data,'REPLACEME' as hostname from $i where hostname=\"$hostname\" "$EXTRACLAUSE" ;" - # SQL="select * from $i where hostname=\"$hostname\" "$EXTRACLAUSE" ;" - $MYSQLCMD_C "$SQL" > $TEMPLATES/$Thistemplate/$i.txt - ;; - keybindings) - SQL="select context,action,description,keylist,'REPLACEME' as hostname from $i where hostname=\"$hostname\" "$EXTRACLAUSE" ;" - $MYSQLCMD_C "$SQL" > $TEMPLATES/$Thistemplate/$i.txt - ;; - esac - # sed -e "s/$hostname/REPLACEME/g" $i > $i.txt && rm $i - - done - ;; - - load) - - #will load both default_1 and default_2 unless either file is not found - for i in default_1 default_2 - do - if [ -f $TEMPLATES/$i/settings.txt ] - then - echo $i - for tablename in $TABLES - do - #create table - CREATESQL="create table IF NOT EXISTS ${tablename}_${i} like $tablename;" - $MYSQLCMD_C "$CREATESQL" - #truncate table - TRUNCATESQL="truncate ${tablename}_${i} " - $MYSQLCMD_C "$TRUNCATESQL" - #load table - INSERTSQL="LOAD DATA local INFILE '$TEMPLATES/$i/$tablename.txt' REPLACE INTO TABLE ${tablename}_${i} FIELDS TERMINATED BY '\t';" - $MYSQLCMD_C "$INSERTSQL" - #update_hostname - UPDATEHOSTNAMESQL="update ${tablename}_${i} set hostname='$i' ; " - $MYSQLCMD_C "$UPDATEHOSTNAMESQL" - done - else - - echo "couldn't find $TEMPLATES/$i/settings.txt template to load" - fi - CREATESQL="create table IF NOT EXISTS settings_user1 like settings;" - $MYSQLCMD_C "$CREATESQL" - CREATESQL="create table IF NOT EXISTS settings_user2 like settings;" - $MYSQLCMD_C "$CREATESQL" - CREATESQL="create table IF NOT EXISTS settings_user3 like settings;" - $MYSQLCMD_C "$CREATESQL" - - CREATESQL="create table IF NOT EXISTS keybindings_user1 like keybindings;" - $MYSQLCMD_C "$CREATESQL" - CREATESQL="create table IF NOT EXISTS keybindings_user2 like keybindings;" - $MYSQLCMD_C "$CREATESQL" - CREATESQL="create table IF NOT EXISTS keybindings_user3 like keybindings;" - $MYSQLCMD_C "$CREATESQL" - done -;; - - - - BECONFIG) - if [ $SYSTEMTYPE = "master" ] - then - $MYSQLCMD_C "UPDATE settings set data='${IP_ADDRESS}' where value='MasterServerIP';" - $MYSQLCMD_C "delete from settings where value='BackendServerIP' and hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='${IP_ADDRESS}' , value='BackendServerIP' , hostname=\"$hostname\";" - fi - - if [ $SYSTEMTYPE = "slave" ] - then - $MYSQLCMD_C "delete from settings where value='BackendServerIP' and hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='${IP_ADDRESS}' , value='BackendServerIP' , hostname=\"$hostname\";" - fi - ;; - ZIP) - $MYSQLCMD_C "delete from settings where value='locale' and hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='$ZIPCODE' , value='locale' , hostname=\"$hostname\";" - $MYSQLCMD_C "delete from settings where value='MythMovies.ZipCode' and hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='$ZIPCODE', value='MythMovies.ZipCode' , hostname=\"$hostname\";" - ;; - MUSICFRONT) - ALSADEVICE - $MYSQLCMD_C "delete from settings where value='AudioOutputDevice' and hostname=\"$hostname\";" - $MYSQLCMD_C "delete from settings where value='MixerDevice' and hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='$SoundDevice', value='AudioOutputDevice' , hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='$MixerDevice', value='MixerDevice' , hostname=\"$hostname\";" - #need to reload the settings. - systemconfig.sh reloadfe - ;; - MUSICMYTH) - ALSADEVICE - $MYSQLCMD_C "delete from settings where value='MusicAudioDevice' and hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='$SoundDevice', value='MusicAudioDevice' , hostname=\"$hostname\";" - ;; - uhostname) - #used when the hostname is changed. - TABLES="settings capturecard keybindings storagegroup recorded" - for i in $TABLES - do - USQL="update $i set hostname=\"$oldhostname\" where hostname=\"$hostname\" ;" - $MYSQLCMD_C "$USQL" - done - - ;; - USERJOBALLOW) - SQL="update settings set data='1' where value like 'JobAllowUserJob%' and hostname=\"$hostname\" ;" - $MYSQLCMD_C "$SQL" - ;; - - ACCESSCONTROL) - LIST="Hostaccessnetwork Hostaccesshostype HostaccesshostypeSystemtype Hostaccessmisc Hostaccesssleep Hostaccessadvanced HostaccessadvancedX Hostaccesssound" - - for i in $LIST - do - $MYSQLCMD_C "delete from settings where value=\"$i\" and hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='1', value=\"$i\" , hostname=\"$hostname\";" - done - SQL="update settings set data='0' where value='HostaccesshostypeSystemtype' and hostname=\"$hostname\" ;" - $MYSQLCMD_C "$SQL" - SQL="update settings set data='0' where value='Hostaccessuser' and hostname=\"$hostname\" ;" - $MYSQLCMD_C "$SQL" - ;; - esac - -#SELECT * INTO OUTFILE 'data.txt' -# FIELDS TERMINATED BY ',' -# FROM table2; - - diff --git a/abs/core-testing/LinHES-config-svn/restore_km_db_chroot.sh b/abs/core-testing/LinHES-config-svn/restore_km_db_chroot.sh deleted file mode 100644 index e72e8c2..0000000 --- a/abs/core-testing/LinHES-config-svn/restore_km_db_chroot.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -. /etc/profile -. /etc/systemconfig -. $MV_ROOT/bin/install_functions.sh - -myhost=$hostname -hostname $myhost -mount -t proc none /proc -DBFILE=$1 - -if [ $SystemType = "Master_backend" -o $SystemType = "Standalone" ] - then - #restore database - pacman --noconfirm -Sf mysql - status=1 - mysqlstatus=1 - while [ ! $status = 0 ] - do - /etc/rc.d/mysqld stop - sleep 1 - /etc/rc.d/mysqld start - mysqlstatus=$? - if [ $mysqlstatus = 0 ] - then - mysql -e "show databases;" - showstatus=$? - if [ $showstatus = 0 ] - then - #load database - pacman --noconfirm -R mythdb-initial - pacman --noconfirm -S mythdb-initial - - if [ -f $DBFILE ] - then - echo "restoring old database" - gunzip -c $DBFILE > /tmp/mythconverg.sql - mysql mythconverg < /tmp/mythconverg.sql - update_db_settings HostServiceMythWEB "1" - echo 'UseMythWEB="1"' >> /etc/systemconfig - else - echo "Could not restore old database, mythconverg.sql is missing." - touch /tmp/.upgrade_db_failed - fi - - if [ -d /data/srv/mysql/mythconverg ] - then - status=0 - fi - fi - fi - done - rm -f /tmp/mythconverg.sql - else - exit 0 - fi - -#/etc/rc.d/mysqld stop -#umount /proc - - - diff --git a/abs/core-testing/LinHES-config-svn/soundconfig.sh b/abs/core-testing/LinHES-config-svn/soundconfig.sh deleted file mode 100755 index 75998d6..0000000 --- a/abs/core-testing/LinHES-config-svn/soundconfig.sh +++ /dev/null @@ -1,254 +0,0 @@ -#!/bin/bash -. /etc/systemconfig -. /etc/profile -echo $@ >/tmp/audio.call -#set -x -BASE="" -. /etc/profile -#TEMPLATES="/usr/share/templates" -#TESTFILE="$TEMPLATES/audio/space_battle_A.wav" -TESTFILE="/usr/share/sounds/alsa/Front_Center.wav" -OSSinstalled="false" - -function testaudio () { - -ossplay -d$AUDIODEVICE $TESTFILE - -} - -function load_alsa() { - - remove_service.sh alsa-utils -# cd /lib/modules/2.6.21-STB - KER=`uname -r` - cd /lib/modules/$KER/kernel/ - tar -xvf /lib/modules/alsa-$KER.tar - pacman -Sf --noconfirm alsa-lib - - depmod -a - cd - - udevadm trigger - udevadm settle - udevadm trigger - - add_service.sh alsa-utils - sleep 4 - sv start alsa-utils -} - - -function unload_alsa () { -#kill $(lsof -t /dev/dsp* /dev/audio* /dev/mixer* /dev/snd/*) && modprobe -r $(lsmod |grep ^snd |awk '{print $1}') - sv stop alsa-utils - remove_service.sh alsa-utils - rm -rf /dev/adsp* - rm -rf /dev/snd/* - rm -rf /dev/audio - modprobe -r $(lsmod |grep ^snd |awk '{print $1}') -} - -function unload_oss { - sv stop oss - soundoff - rm -rf /dev/dsp* - rm -rf /dev/oss* - rm -rf /dev/sndstat - remove_service.sh oss -} - -function installOSS { - echo "installing oss" - pacman -Q oss 2>/dev/null - if [ ! $? = 0 ] - then - pacman --noconfirm -Sf oss - fi - add_service.sh oss - sleep 4 - sv start oss -} - - -function SYNCXINE { -echo "modify xine config file" - if [ -f /data/home/mythtv/.xine/config ] - then - cp -f /data/home/mythtv/.xine/config $TEMPLATES/xine.config - else - cp $TEMPLATES/xine.config.template $TEMPLATES/xine.config - fi - - if [ x$Audiotype = xOSS ] - then - DEVICENUMBER=`echo $SoundDevice|awk -F/ ' { print $3 } '|tr -d dsp ` - sed -e "s/^.*audio.driver.*$/audio.driver:oss/" \ - -e "s/^.audio.device.oss_device_name.*$/audio.device.oss_device_name:\/dev\/dsp/" \ - -e "s/^.audio.devic.oss_device_number.*$/audio.device.oss_device_number:$DEVICENUMER/" \ - -e "s/^.*audio.output.speaker_arrangement:.*$/Audio.output.speaker_arrangement:PassThrough/" \ - $TEMPLATES/xine.config > /data/home/mythtv/.xine/config - else - cp $TEMPLATES/xine.config /data/home/mythtv/.xine/config - fi - -} - -function SYNCMPLAYER { -echo "modify mplayer not implmented yet" -} - -function SYNCMYTHMUSIC { -echo "sync mythmusic" -$MV_ROOT/bin/restore_default_settings.sh -c MUSICMYTH -} - -function SYNCMYTHFRONTEND { -echo "sync mythfrontend" -$MV_ROOT/bin/restore_default_settings.sh -c MUSICFRONT -} - - -function checkOSSinstalled () { - ossinfo |grep Version |grep -q OSS >/dev/null - resultcode=$? - echo $resultcode - if [ $resultcode = 0 ] - then - OSSinstalled='true' - else - OSSinstalled='false' - fi -} - -function sound_config_system { - - if [ x$syncXine = x1 ] - then - SYNCXINE - fi - if [ x$syncMplayer = x1 ] - then - SYNCMPLAYER - fi - if [ x$syncMythMusic = x1 ] - then - SYNCMYTHMUSIC - fi - if [ x$syncMythFrontend = x1 ] - then - SYNCMYTHFRONTEND - fi - -} - -function loadsound (){ - checkOSSinstalled - if [ x$AUDIOTYPE = xOSS -o x$AUDIOTYPE = xoss ] - #then - # if [ $OSSinstalled = "false" ] - then - while [ $OSSinstalled = "false" ] - do - unload_alsa - rm /tmp/.alsatest - installOSS - installOSS - sleep 2 - checkOSSinstalled - done - # fi - else - touch /tmp/.alsatest - unload_oss - load_alsa - load_alsa - rm /tmp/.alsatest - - fi - -} - - - - -#####################MAIN PROGRAM########################## - -declare -r OPTSTRING="i:t:d:" - -if [ $# -eq 0 ] -then - echo "Valid options are:" - echo " -i (oss|alsa) oss or alsa subsystem " - echo " -t (test|real|LOAD) " - echo " -d device" - exit 1 -fi - - - - -while getopts "$OPTSTRING" SWITCH -do - case $SWITCH in - \?) echo "unkown option" - exit 11 ;; - i) echo "$SWITCH" "$OPTARG" - AUDIOTYPE="$OPTARG" - ;; - d) echo "$SWITCH" "$OPTARG" - AUDIODEVICE=$OPTARG - ;; - t) echo "$SWITCH" "$OPTARG" - SOUNDOPTYPE="$OPTARG" - if [ x"$OPTARG" = xtest ] - then - TEST=true - else - TEST=false - fi - - - ;; - - esac -done - - - - -case $SOUNDOPTYPE in - REAL|real ) - loadsound - sound_config_system - ;; - test|TEST) - echo $@ > /tmp/audio.test - #loadsound - if [ x$AUDIOTYPE = xOSS -o x$AUDIOTYPE = xoss ] - then - echo "testing OSS $AUDIODEVICE " - ossplay -d$AUDIODEVICE $TESTFILE - else - echo "testing ALSA $AUDIODEVICE " - aplay --device=$AUDIODEVICE $TESTFILE - fi - - ;; - - LOAD|load) - loadsound - ;; - esac - - -exit 0 - - - - - - - - - - - diff --git a/abs/core-testing/LinHES-config-svn/startx b/abs/core-testing/LinHES-config-svn/startx deleted file mode 100755 index 0ffdf8c..0000000 --- a/abs/core-testing/LinHES-config-svn/startx +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -. /etc/profile - -export USER=root -export HOME=/root -#TEMPLATES=/usr/share/templates - -CMDLINE=$(cat /proc/cmdline) -TEMPVAR=${CMDLINE#*ip=} -IP=${TEMPVAR%% *} -echo $CMDLINE |grep -q vnc -USEVNC=$? - -if [ x$USEVNC = x1 ] -then - $MV_ROOT/bin/xconfig.sh - cat /etc/X11/xorg.conf | sed -e 's/dev\/mouse/dev\/psaux/g'> /root/xorg.conf.install - startx /root/live-install.sh -- -config /root/xorg.conf.install -allowMouseOpenFail - else - #VNC - pacman -Sf --noconfirm tightvnc - cd /root - mkdir .vnc - echo mythvantage |vncpasswd -f > /root/.vnc/passwd - chmod 500 /root/.vnc/passwd - rm /root/.vnc/xstartup - ln -s /root/live-install.sh /root/.vnc/xstartup - vncserver -fi diff --git a/abs/core-testing/LinHES-config-svn/systemconfig.sh b/abs/core-testing/LinHES-config-svn/systemconfig.sh deleted file mode 100755 index 6d63f5c..0000000 --- a/abs/core-testing/LinHES-config-svn/systemconfig.sh +++ /dev/null @@ -1,1368 +0,0 @@ -#!/bin/bash -################################################################### -#Script to configure your system based off the values in /etc/systemconfig -#Any changes made to config files will be removed when systemconfig.sh is run -# -#JM -################################################################### -#set -x -. /etc/profile -#MVRELEASE=`cat /etc/mythvantage-release |cut -d" " -f -2` -MVRELEASE=`cat /etc/LinHES-release ` -echo $@ >/tmp/systemconfig.call -echo "----------------------start of systemconfig $@ ----------------------" -BASE="" - -#TEMPLATES="/usr/share/templates" -. /etc/profile -. $MV_ROOT/bin/networkconfig.sh -PACMAN="pacman --noconfirm" -postfix=`cat ${BASE}/usr/local/share/mythtv/.releasetype` -PKGBLACKLIST=$BASE/etc/blacklist.package - -if [ x$1 = x"Mysql_only" ] - then - rm -f /tmp/mysql.txt - sed -e "s/^DBHostName=.*$/DBHostName=$2/" $TEMPLATES/mysql.txt > /tmp/mysql.txt - exit 0 - fi - - -if [ -f /etc/systemconfig ] -then - . /etc/systemconfig - setup_MYTH_vars -TEMPNET="Hostip"$default_interface -echo $TEMPNET -eval MYTHIP=\$${TEMPNET} -else - echo "could not find /etc/systemconfig" - exit 1 -fi - - -function cp_and_log () { - if [ -e $1 ] - then - echo "copying $1 to $2" - cp -rfp "$1" "$2" - else - echo "$1 is not present, skipping..." - fi - -} - - -#----------------------------------------------------- - - -function setupmysql { -#setup mysql.txt to find the database servers -echo "running setup mysql" - if [ $SystemType = "Master_backend" ] - then - if [ $MYTHDHCP = 0 ] - then - #this grabs eth0, as that is all thats supported. -# dbhost=`ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'|head -n1` - dbhost=`ifconfig | grep -C1 $default_interface| grep -v $default_interface | cut -d: -f2 | awk '{ print $1}'` - sed -e "s/^dbhost=.*$/dbhost=\"$dbhost\"/" /etc/systemconfig >/tmp/systemconfig.old - cp_and_log /tmp/systemconfig.old ${BASE}/etc/systemconfig - ##logic to change master_serverip and backend_serverip in db - - ${BASE}${MV_ROOT}/bin/restore_default_settings.sh -c BECONFIG -s master -a $dbhost - else - - dbhost=$MYTHIP - sed -e "s/^dbhost=.*$/dbhost=\"$dbhost\"/" /etc/systemconfig >/tmp/systemconfig.old - cp_and_log /tmp/systemconfig.old ${BASE}/etc/systemconfig - #logic to change dbhost in db - ${BASE}${MV_ROOT}/bin/restore_default_settings.sh -c BECONFIG -s master -a $dbhost - fi - fi - - if [ $SystemType = "Slave_backend" ] - then - if [ $MYTHDHCP = 0 ] - then - #this grabs eth0, as that is all thats supported. - #slavehost=`ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'|head -n1` - slavehost=`ifconfig | grep -C1 $default_interface| grep -v $default_interface | cut -d: -f2 | awk '{ print $1}'` - ##logic to change backend_serverip in db - ${BASE}${MV_ROOT}/bin/restore_default_settings.sh -c BECONFIG -s slave -a $slavehost - else - slavehost=$MYTHIP - - #logic to change backend_serverif in db - ${BASE}${MV_ROOT}/bin/restore_default_settings.sh -c BECONFIG -s slave -a $slavehost - fi - fi - - MYSQLTXT=${BASE}/usr/share/mythtv/mysql.txt - if [ $SystemType = "Standalone" ] - then - sed -e "s/^DBHostName=.*$/DBHostName="localhost"/" $TEMPLATES/mysql.txt > $MYSQLTXT - else - sed -e "s/^DBHostName=.*$/DBHostName=$dbhost/" $TEMPLATES/mysql.txt > $MYSQLTXT - fi - rm ${BASE}/home/mythtv/.mythtv/mysql.txt - rm ${BASE}${MV_ROOT}/bin/mythtv/.mythtv/mysql.txt - if [ -f ${BASE}/home/mythtv/templates/mysql.txt ] - then - cp_and_log ${BASE}/home/mythtv/templates/mysql.txt $MYSQLTXT - fi - - chmod 755 $MYSQLTXT - chown mythtv $MYSQLTXT - -} - -function setupmysqlnetwork(){ -MFILE=etc/my.cnf -grep "#skip-networking" $BASE/$MFILE -status=$? - - - - if [ $SystemType = "Standalone" ] - then - sed -ie "s/^#skip-networking/skip-networking/g" $BASE/$MFILE - if [ $status = 0 ] - then - sudo sv restart mysql - echo "restarting mysql with no network" - fi - - fi - - if [ $SystemType = "Master_backend" ] - then - sed -ie "s/^skip-networking/#skip-networking/g" $BASE/$MFILE - if [ $status = 1 ] - then - sudo sv restart mysql - echo "restarting mysql with network" - fi - - fi - - -} - - -function settimezone { -#set the timezone -if [ x"$timezone" = x ] -then - timezone="unknown" -fi -rm ${BASE}/etc/localtime -echo $timezone -ln -s "/usr/share/zoneinfo/$timezone" ${BASE}/etc/localtime - sed -e "s~^TIMEZONE=.*$~TIMEZONE=\"${timezone}\"~" ${BASE}/etc/rc.conf > $TEMPLATES/rc.conf - - # echo CLOCK="UTC" > ${BASE}/etc/conf.dclock - # echo CLOCK_SYSTOCH="yes" >> ${BASE}/etc/conf.d/clock - # echo TIMEZONE="$timezone" >> ${BASE}/etc/conf.d/clock -cp_and_log $TEMPLATES/rc.conf ${BASE}/etc/rc.conf -#Check for Atomic Ant - if grep disablemodules=agpart,intel_agp /proc/cmdline >/dev/null - then - cat /etc/rc.conf | sed -e '/MOD_BLACKLIST/ c\MOD_BLACKLIST=($ALSABLACKLIST agpart intel_agp)' > /etc/rc.conf.aa - mv /etc/rc.conf /etc/rc.conf.preaa - mv /etc/rc.conf.aa /etc/rc.conf -# else -# exit 1 - fi - -} - - -function setupreceiver { - case $ReceiverType in - tinker) echo "do nothing" - ;; - Serial) echo "setup serial lirc" - sed -i -e '/.*#lirc/d' ${BASE}/etc/modules.mythvantage - echo "lirc_serial #lirc" >> ${BASE}/etc/modules.mythvantage - load-modules-mythvantage.sh - ;; - Usb-imon) echo "setup receiver-usb-imon" - sed -i -e '/.*#lirc/d' ${BASE}/etc/modules.mythvantage - echo "lirc_imon #lirc" >> ${BASE}/etc/modules.mythvantage - load-modules-mythvantage.sh - ;; - Hauppauge) echo "setup hauppauge reciever (lirc_i2c)" - sed -i -e '/.*#lirc/d' ${BASE}/etc/modules.mythvantage - echo "lirc_i2c #lirc" >> ${BASE}/etc/modules.mythvantage - cp_and_log $TEMPLATES/modules/lirc_i2c.conf ${BASE}/etc/modprobe.d/lirc_i2c.conf - rmmod lirc_i2c 2>/dev/null - load-modules-mythvantage.sh - ;; - *) sed -i -e '/.*#lirc/d' ${BASE}/etc/modules.mythvantage - ;; - esac - - -} - -function setupremote { - case $Remotetype in - no_remote) echo "No remote selected" - daemon_remove="lircd $daemon_remove" - ;; - tinker) echo "Remote in tinker mode" - ;; - *) echo "Setup remote" - mv ${BASE}/etc/lircd.conf ${BASE}/etc/lircd.conf.`date +%Y-%m-%d-%H-%M` - cd $TEMPLATES/remotes/$Remotetype - for i in lircd* - do - cat $i >> ${BASE}/etc/lircd.conf - done - cp -f lircrc* $BASE/etc/lircrc 2> /dev/null - if [ -f $TEMPLATES/LCD/$LCDtype/lircrc ] - then - cat $TEMPLATES/LCD/$LCDtype/lircrc >> /etc/lircrc - cat $TEMPLATES/LCD/$LCDtype/lircd.conf >> /etc/lircd.conf - fi - if [ -f $TEMPLATES/transmit/$Blastertype/lircd.conf ] - then - cat $TEMPLATES/transmit/$Blastertype/lircd.conf >> ${BASE}/etc/lircd.conf - fi - chmod 755 /etc/lircrc - daemon_add="lircd $daemon_add" - sv hup lircd - - if [ ! -e /home/mythtv/.mythtv/lircrc ] - then - if [ ! -d /home/mythtv/.mythtv ] - then - mkdir /home/mythtv/.mythtv - chown mythtv:mythtv /home/mythtv/.mythtv - fi - - ln -s /etc/lircrc /home/mythtv/.mythtv/lircrc 2> /dev/null - fi - if [ ! -e /home/mythtv/.lircrc ] - then - - ln -s /etc/lircrc /home/mythtv/.lircrc 2> /dev/null - fi - - - ;; -esac - -} - -function setupblaster { - #cd $TEMPLATES/transmit/$Blastertype - #for i in lircd* - #do - # cat lircd.conf >> ${BASE}/etc/lircd.conf - #done - # REMOTE_NAME${BASE}/usr/bin/change_chan.sh=`grep name lircd.conf* |awk -F" " ' { print $2 } '` - sed -e "s/^REMOTE_NAME=.*$/REMOTE_NAME=${Blastertype} /" $TEMPLATES/change_chan.sh > ${BASE}/usr/bin/change_chan.sh - chmod 755 ${BASE}/usr/bin/change_chan.sh - #channel change script change - setupremote - -} - -function setupevrouter { - if [ x$UseEvrouter = x1 ] - then - case x$EvrouterConfig in - xtinker ) - echo "do nothing for evrouter" - ;; - x ) echo "empty evrouter" - ;; - * ) echo "setup evrouter for $EvrouterConfig " - cp_and_log $TEMPLATES/evrouter/$EvrouterConfig /etc/evrouter.cfg - daemon_add="evrouter Xvfb $daemon_remove" - - ;; - esac - else - # disable evrouter - daemon_remove="evrouter Xvfb $daemon_remove" - fi - - - - -} - -function setupLCD { - case x$LCDtype in - xtinker) echo "do nothing" - ;; - xno_lcd) echo "disabling lcd" - sv down lcdd - load-modules-mythvantage.sh UNLOAD LCD - sed -i -e '/.*#LCD/d' ${BASE}/etc/modules.mythvantage - daemon_remove="lcdd $daemon_remove" - ;; - x) echo "empty lcd" ;; - - *) echo "setup lcd" - if [ -f $TEMPLATES/LCD/$LCDtype/modules ] - then - sed -i -e '/.*#LCD/d' ${BASE}/etc/modules.mythvantage - cat $TEMPLATES/LCD/$LCDtype/modules >> ${BASE}/etc/modules.mythvantage - #should also modprobe - fi - - - if [ -f $TEMPLATES/LCD/$LCDtype/LCDd.conf ] - then - cp_and_log $TEMPLATES/LCD/$LCDtype/LCDd.conf /etc - # install="lcdproc $install" - daemon_add="lcdd $daemon_add" - load-modules-mythvantage.sh - RESTART_FE="true" - RESTART_LCD="true" - fi - #check if lirc capable,if so then call setupremote - if [ -f $TEMPLATES/LCD/$LCDtype/lircrc ] - then - setupremote - fi - ;; - esac - -} - - - -function scrubnfs { - cp_and_log /etc/fstab $TEMPLATES/fstab.conf.template - grep -v nfs $TEMPLATES/fstab.conf.template > ${BASE}/etc/fstab - } - -function setupfstab () { -# setupfstab $NFSserver $NFSshare $NFSmount - echo "$1 $2 nfs" >> ${BASE}/etc/fstab - if [ ! -e "$2" ] - then - mkdir -p "$2" - chown mythtv:mythtv "$2" - fi - if [ x$DCONFIG = x ] - then - mount $2 & - fi - -} - -function setupncidclient -{ - sed -e "s/^set Host.*$/set Host $dbhost /" $TEMPLATES/ncid.conf.template >${BASE}/etc/ncid/ncid.conf -} - -function setupnciddaemon { - if [ x$Runncidd = x1 ] - then - cp_and_log /etc/ncid/ncidd.conf $TEMPLATES/ncidd.conf.template - sed -e "s/.*set ttyport.*$/set ttyport = \/dev\/$nciddSerialPort /" $TEMPLATES/ncidd.conf.template >${BASE}/etc/ncid/ncidd.conf - fi - -} - -function setupntp () { - #this is used for backend or standlone types - if [ $1 = "1" ] - then - #MBE/STD use deafult - echo "Not changing ntp config" - else - #echo "server $dbhost" >> ${BASE}/etc/ntp.conf - echo "setting ntp to $dbhost" - sed -i "s/pool.ntp.org/$dbhost/g" ${BASE}/etc/ntp.conf - fi - - -} - -function setupplugins (){ - -pkglistinstall="" -pkglistremove="" -#default enabled -for i in mythcontrols mythgallery mythmovietime mythmusic mythsmolt mythvideo -do - eval pkgvalue=\$${i} - if [ x$pkgvalue = x ] - then - pkglistinstall="$pkglistinstall $i$postfix" - else - if [ x$pkgvalue = x1 ] - then - pkglistinstall="$pkglistinstall $i$postfix" - else - pkglistremove="$pkglistremove $i$postfix" - fi - fi -done - -#default disabled -for i in mythphone mytharchive mythbrowser mythnews mythgame mythflix mythweather mythappletrailers mythstream mythvodka -do - eval pkgvalue=\$${i} - if [ x$pkgvalue = x ] - then - pkglistremove="$pkglistremove $i$postfix" - else - if [ x$pkgvalue = x1 ] - then - pkglistinstall="$pkglistinstall $i$postfix" - else - pkglistremove="$pkglistremove $i$postfix" - fi - fi -done -#everything else -for i in miro xe romdb xine dvdcss webmin -do - eval pkgvalue=\$${i} - case $i in - xine) - if [ x$pkgvalue = x1 ] - then - pkglistinstall="$pkglistinstall xine-ui" - else - pkglistremove="$pkglistremove xine-ui" - fi - ;; - dvdcss) - if [ x$pkgvalue = x1 ] - then - pkglistinstall="$pkglistinstall libdvdcss" - else - pkglistremove="$pkglistremove libdvdcss" - fi - ;; - webmin) - ##Daemon_add is here because webmin is on the software page instead of the advanced screen - if [ x$pkgvalue = x1 ] - then - pkglistinstall="$pkglistinstall webmin" - daemon_add="webmin $daemon_add" - else - pkglistremove="$pkglistremove webmin" - daemon_remove="webmin $daemon_remove" - fi - ;; - *) - if [ x$pkgvalue = x1 ] - then - pkglistinstall="$pkglistinstall $i" - else - pkglistremove="$pkglistremove $i" - fi - ;; -esac - -done - - -install="$pkglistinstall $install" -remove="$pkglistremove $remove" - -} -function LCDcheck () { - case x$LCDtype in - xtinker) echo "do nothing lcd " - ;; - xno_lcd) echo "no lcd " - ;; - xxosd) install="xosd lcdproc $install" - ;; - x) echo "lcd empty " - ;; - *) - install="lcdproc $install" - ;; -esac -} - - -function packages () { -#see which plugins need to be installed -echo " Starting to install Packages" -setupplugins -LCDcheck -if [ ! -f $PKGBLACKLIST ] -then - touch $PKGBLACKLIST -fi - for i in $remove - do - if [ ! x$i = xnone ] - then - echo "-----------$i --------------" - grep -q $i $PKGBLACKLIST - if [ $? = 1 ] - then - pacman -Q $i 2>/dev/null - #VAR=`pacman -Q $i 2>&1 ` - if [ $? = 0 ] - then - if [ $i = "mythweb$postfix" ] - then - pacman --noconfirm -R mythweb$postfix - echo removed $i - else - pacman --noconfirm -Rs $i - echo removed $i - fi - fi - else - echo "$i is black listed" - fi - fi - done - - - for i in $install - do - if [ ! x$i = xnone ] - then - echo "-----------$i --------------" - grep -q $i $PKGBLACKLIST - if [ $? = 1 ] - then - pacman -Q $i 2>/dev/null - #VAR=`pacman -Q $i 2>&1 ` - # echo $VAR |grep -vq error: - - if [ ! $? = 0 ] - then - pacman --noconfirm -Sf $i - echo installed $i - else - echo "$i already installed" - fi - else - echo "$i is black listed" - fi - fi - done -} - -function daemons { -echo "Daemons on boot" - - for i in $daemon_remove - do - sv check $i 1>/dev/null - status=$? - if [ $status -eq 0 ] - then - sv down $i - fi - remove_service.sh $i - done - - - for i in $daemon_add - do - sv check $i 1>/dev/null - status=$? - add_service.sh $i - - if [ $status -eq 0 ] - then - case $i in - mysql*) sv hup $i - ;; - mythback*) sv hup $i - ;; - lirc* ) sv hup $i - ;; - frontend) sv check frontend 1>/dev/null - ;; - - smbd ) sv hup $i - ;; - nmbd ) sv hup $i - ;; - evrouter) sv restart $i - ;; - *) sv down $i - sleep 1 - sv up $i - ;; - esac - fi - - done - -} - - -function services -{ -ser_install="" -ser_daemon_add="" -ser_remove="" -ser_daemon_remove="" -if [ x$UseEvrouter = x1 ] -then - ser_daemon_add="evrouter Xvfb $ser_daemon_add" -else - ser_daemon_remove="evrouter Xvfb $ser_remove" -fi - -if [ x$RunDHCP = x1 ] -then - ser_daemon_add="dnsmasq $ser_daemon_add" - ser_install="dnsmasq mvpmc $ser_install" - -else - ser_daemon_remove="dnsmasq $ser_daemon_remove" - ser_remove="dnsmasq mvpmc $ser_remove" -fi - -if [ x$RunFrontend = x1 ] -then - ser_daemon_add="frontend hal $ser_daemon_add" - ser_install=" $ser_install" - showX=true - else - ser_daemon_remove="frontend hal $ser_daemon_remove" - ser_remove="$ser_remove" - fi - -if [ x$UseMythWEB = x1 ] -then - ser_install="lighttpd mythweb$postfix $ser_install" - ser_daemon_add="lighttpd $ser_daemon_add" - else - ser_remove="mythweb$postfix $ser_remove" - ser_daemon_remove="$ser_daemon_remove" - fi - -#samba -if [ x$UseSamba = x1 ] -then - ser_install="samba $ser_install" - ser_daemon_add="nmbd smbd $ser_daemon_add " - if [ x$Samba_mediareadonly = x1 ] - then - smreadonly="no" - else - smreadonly="yes" - fi - - if [ x$Samba_homereadonly = x1 ] - then - shreadonly="no" - else - shreadonly="yes" - fi - - if [ ! -d ${BASE}/etc/samba ] - then - mkdir ${BASE}/etc/samba - fi - - if [ -f ${BASE}/data/home/mythtv/templates/smb.conf ] - then - install -D -m755 ${BASE}/data/home/mythtv/templates/smb.conf ${BASE}/etc/samba/smb.conf - else - sed -e "s/^.*workgroup =.*$/ workgroup = $Samba_domain/g " \ - -e "s/^.*server string = .*$/ server string = $hostname/g" $TEMPLATES/samba/smb.conf.template > ${BASE}/etc/samba/smb.conf - - if [ x$Samba_media = "x1" ] - then - echo "include = /etc/samba/smb.conf.media" >> ${BASE}/etc/samba/smb.conf - sed -e "s/^.*writeable.*$/writeable = $smreadonly/g" $TEMPLATES/samba/smb.conf.media > ${BASE}/etc/samba/smb.conf.media - fi - - if [ x$Samba_home = "x1" ] - then - echo "include = /etc/samba/smb.conf.home" >> ${BASE}/etc/samba/smb.conf - sed -e "s/^.*writeable.*$/writeable = $shreadonly/g" $TEMPLATES/samba/smb.conf.home > ${BASE}/etc/samba/smb.conf.home - - fi - - fi -else - ser_remove="samba $ser_remove" - ser_install="smbclient $ser_install" - ser_daemon_remove="smbd nmbd $ser_daemon_remove" -fi - - -if [ x$UseNFS = x1 ] -then - ser_install="nfs-utils portmap $ser_install" - ser_daemon_add="nfsd nfslock portmap $ser_daemon_add" - sed -e "s/REPLACEME/*/g" $TEMPLATES/exports.template > ${BASE}/etc/exports - -else - ser_remove="$ser_remove" - ser_daemon_remove="nfsd $ser_daemon_remove" -fi - -if [ x$Runncidd = x1 ] -then - ser_daemon_add="ncidd ncid $ser_daemon_add" - ser_install="ncid $ser_install" -else - ser_daemon_remove="ncidd ncid $ser_daemon_remove" - ser_remove="ncid $ser_remove" -fi - - -if [ x$UseEvrouter = x1 ] -then - ser_install="evrouter Xvfb $ser_install" - else - ser_remove="evrouter $ser_remove" -fi - - - - -#Setting the default, just to avoid the or statement.. -#if [ x$UseHobbit = x ] -#then -# UseHobbit=0 -#fi - -#if [ x$UseHobbit = x1 ] -#then -# case $SystemType in -# Standalone|Master_backend ) -# ser_daemon_add="hobbit $ser_daemon_add" -# ser_install="hobbitserver $ser_install" -# ;; -# -# *) ser_daemon_add="hobbit-client $ser_daemon_add" -# ser_install="hobbit-client $ser_install" -# ;; -# esac -#else -# ser_daemon_remove="hobbit hobbit-client $ser_daemon_remove" -# ser_remove="hobbit-client hobbitserver $ser_remove" -# rm -f /data/srv/httpd/htdocs/hobbit/index.html -# -# fi - - - -} - - - -function setupsleep { -if [ x$AutoShutdown = x1 ] -then - cronshutdowntime="" - if [ x$Shutdowntime != x-1 ] - then - cronshutdowntime=$Shutdowntime - fi - if [ x$Shutdowntime2 != x-1 ] - then - if [ x$cronshutdowntime = x ] - then - cronshutdowntime=$Shutdowntime2 - else - cronshutdowntime="${cronshutdowntime},${Shutdowntime2}" - fi - fi - - sed -e "s/HOUR/$cronshutdowntime/g" $TEMPLATES/cron.template | crontab - -u mythtv -else - sed -e "/00 HOUR.*/d" $TEMPLATES/cron.template | crontab - -u mythtv -fi - -} - - -function setuppacman () { -#setup link to httpd dir -echo "Configuring pacman" - if [ ! x$1 = x ] - then - ln -s ${BASE}/data/var ${BASE}/data/srv/httpd/htdocs/repo - echo "creating the link for the pacman repo mirror" - fi - - for i in mv-core mv-core-testing mv-extra mv-extra-testing - do - echo "[$i]" > ${BASE}/etc/pacman.d/$i - #add mirror if needed - if [ x$PKG_MIRROR = x1 ] - then - echo " Server = http://$dbhost/repo/$i " >> ${BASE}/etc/pacman.d/$i - fi - #add user templates - USERTEMPLATES="/data/home/mythtv/templates" - if [ -f $USERTEMPLATES/sources/$i ] - then - echo "Adding user $i" - cat $USERTEMPLATES/sources/$i >> ${BASE}/etc/pacman.d/$i - fi - cat $TEMPLATES/sources/$i >> ${BASE}/etc/pacman.d/$i - echo "setting local mirror to $dbhost for $i " - done - - #sed -e "s/REPLACEME/$dbhost/g" $TEMPLATES/sources/svc_pkg > /etc/pacman.d/svc_pkg - - -} - - -function setupzipcode () { - if [ ! x$zipcode = x ] - then - ${MV_ROOT}/bin/restore_default_settings.sh -c ZIP -z $zipcode - #Let's also speed things up for those in North America - mkdir /usr/bin/perlbin/vendor/tv_grabbers_non_na - mv /usr/bin/perlbin/vendor/tv_grab_* /usr/bin/perlbin/vendor/tv_grabbers_non_na - mv /usr/bin/perlbin/vendor/tv_grabbers_non_na/tv_grab_na* /usr/bin/perlbin/vendor/ - fi -} - -function process_nfsmap () { -#first look for a local copy of nfsmap -if [ $1 = noip ] -then - if [ -f /data/home/mythtv/templates/nfsmap ] - then - NFSMAP="/data/home/mythtv/templates/nfsmap" - else - mv -f /tmp/nfsmap /tmp/nfsmap.old - wget -O /tmp/nfsmap http://$dbhost:1337/templates/nfsmap - if [ $? = 0 ] - then - NFSMAP="/tmp/nfsmap" - fi - fi -else - mv -f /tmp/nfsmap /tmp/nfsmap.old - wget -O /tmp/nfsmap http://$1:1337/templates/nfsmap - if [ $? = 0 ] - then - NFSMAP="/tmp/nfsmap" - fi -fi - - if [ -f $NFSMAP ] - then - #read in file - while read line - do - NFSserver=`echo "$line"|cut -d" " -f1` - NFSmount=`echo "$line"|cut -d" " -f2` - setupfstab $NFSserver $NFSmount - done <$NFSMAP - else - echo "couldn't find nfsmap" - - fi -} - -function setupcnfs () { - scrubnfs - if [ $HaveCentralNFS = "yes" ] - then - case x$NFSserver in - xfile:nfsmap ) - process_nfsmap noip - ;; - *:nfsmap ) - nfsmapip=`echo "$NFSserver" | cut -d: -f1 ` - process_nfsmap $nfsmapip - ;; - *) setupfstab $NFSserver $NFSmount - esac - - #if [ ! x"$NFSserver" = "xfile:nfsmap" ] - #then - # setupfstab $NFSserver $NFSmount - #else - # process_nfsmap - #fi - else - echo "fe_nfs" - #if no central nfs found, then use the mbe. - if [ $SystemType = "Frontend_only" ] - then - setupfstab ${dbhost}:/myth /myth - fi - fi - -} - -function setupbootsplash () { - -if [ x$Usebootsplash = x1 ] -then - COMMAND="%s/^default.*0/default 1/g" -else - COMMAND="%s/^default.*1/default 0/g" -fi - -ex ${BASE}/boot/grub/menu.lst < ${BASE}/etc/resolv.conf - echo "nameserver 127.0.0.1" >> ${BASE}/etc/resolv.conf - echo "nameserver $nameserver" >> ${BASE}/etc/resolv.conf -fi - -#setup dongle.config -COMMAND="%s/mvpmc -f .*/mvpmc -f \/etc\/helvR10.fon -s ${ip} \& /" -ex ${BASE}/data/srv/tftp/dongle.bin.config < /etc/os_myth_release -echo "systemtype=$smoltsystem" > /home/mythtv/.mythtv/smolt.info 2>/dev/null -echo "remote=$Remotetype" >> /home/mythtv/.mythtv/smolt.info 2>/dev/null - diff --git a/abs/core-testing/LinHES-config-svn/timezip.py b/abs/core-testing/LinHES-config-svn/timezip.py deleted file mode 100755 index 31acd67..0000000 --- a/abs/core-testing/LinHES-config-svn/timezip.py +++ /dev/null @@ -1,231 +0,0 @@ -#!/usr/bin/python -# import MySQL module -#used to import the zipcode/timezone/nfs info fromMBE -import MySQLdb -import sys -import getopt -import socket - - -def usage(): - print " -h --help" - print " -d --installdb" - print " -m --masterdb" - print " -n --hostname of current machine" - -def printvars(): - print "masterdb: " + masterdb - print "installdb:" + installdb - print "hostname: " + thishostname - print "BEhostname:" + BEhostname - print "zipcode:" + zipcode - print "timezone:" + tz - print "timezone region:" + tz_region - print "timezone subregion:" + tz_subregion - print "nfsip:" + nfsip - print "nfstoggle:" + nfstoggle - print "nfsmount:" + nfsmount - print "hobbitclient:" + hobbitclient -# connect -def selectvars(): - - global BEhostname - global zipcode - global tz - global tz_region - global tz_subregion - global nfsip - global nfstoggle - global nfsmount - global hobbitclient - - db = MySQLdb.connect(host=masterdb, user="mythtv", passwd="mythtv", db="mythconverg") - # create a cursor - cursor = db.cursor() - # execute SQL statement - cursor.execute("select hostname from settings where value='BackendServerIP' and data=(%s)",(masterdb)) - result = cursor.fetchone() - try: - BEhostname=result[0] - except TypeError: - BEhostname="" - - cursor.execute("select data from settings where value='HostZipcode' and hostname=(%s)",(BEhostname)) - result = cursor.fetchone() - try: - zipcode = result[0] - except TypeError: - zipcode="" - - cursor.execute("select data from settings where value='HostCentralNFSIP' and hostname=(%s)",(BEhostname)) - result = cursor.fetchone() - try: - nfsip=result[0] - except TypeError: - nfsip="" - - cursor.execute("select data from settings where value='HostHaveCentralNFS' and hostname=(%s)",(BEhostname)) - result = cursor.fetchone() - try: - nfstoggle=result[0] - except TypeError: - nfstoggle="" - - cursor.execute("select data from settings where value='HostNFSmountpoint' and hostname=(%s)",(BEhostname)) - result = cursor.fetchone() - try: - nfsmount=result[0] - except TypeError: - nfsmount="" - - cursor.execute("select data from settings where value='HostTimeZone' and hostname=(%s)",(BEhostname)) - result = cursor.fetchone() - try: - tz=result[0] - except TypeError: - tz="" -########## - cursor.execute("select data from settings where value='HostTimeZoneRegion' and hostname=(%s)",(BEhostname)) - result = cursor.fetchone() - try: - tz_region=result[0] - except TypeError: - tz="" - tempsubregion="HostTimeZoneRegion_" + tz_region - - cursor.execute("select data from settings where value=%s and hostname=(%s)",(tempsubregion,BEhostname)) - result = cursor.fetchone() - try: - tz_subregion=result[0] - except TypeError: - tz_subregion="" -############### - if ( thishostname != BEhostname ): - cursor.execute("select data from settings where value='GlobalServiceHobbitserver'") - result = cursor.fetchone() - try: - hobbitclient=result[0] - except TypeError: - hobbitclient="1" - - - -def insertvars(): - - db = MySQLdb.connect(host=installdb, user="mythtv", passwd="mythtv", db="mythconverg") - cursor = db.cursor() -#inserting the zipcode - cursor.execute("select * from settings where value='HostZipcode' and hostname=(%s)",(thishostname)) - result = cursor.fetchone() - if ( zipcode!="" ): - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostZipcode',(%s),(%s))",(zipcode,thishostname)) - print "inserting zipcode" - else: - cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostZipcode'",(zipcode,thishostname)) - print "updating zipcode" - -#inserting the timezone - cursor.execute("select * from settings where value='HostTimeZone' and hostname=(%s)",(thishostname)) - result = cursor.fetchone() - if ( tz != ""): - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostTimeZone',(%s),(%s))",(tz,thishostname)) - print "inserting timezone" - else: - cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostTimeZone'",(tz,thishostname)) - print "updating timezone" - - cursor.execute("select * from settings where value='HostTimeZoneRegion' and hostname=(%s)",(thishostname)) - result = cursor.fetchone() - if ( tz != ""): - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostTimeZoneRegion',(%s),(%s))",(tz_region,thishostname)) - print "inserting timezone region" - else: - cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostTimeZoneRegion'",(tz_region,thishostname)) - print "updating timezone region" - - tempsubregion="HostTimeZoneRegion_" + tz_region - cursor.execute("select * from settings where value=%s and hostname=(%s)",(tempsubregion,thishostname)) - result = cursor.fetchone() - if ( tz != ""): - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ((%s),(%s),(%s))",(tempsubregion,tz_subregion,thishostname)) - print "inserting timezone subregion" - else: - cursor.execute("update settings set data=(%s) where hostname=(%s) and value=(%s)",(tempsubregion,tz_subregion,thishostname)) - print "updating timezone subregion" - - -#start of NFSIP - cursor.execute("select data from settings where value='HostCentralNFSIP' and hostname=(%s)",(thishostname)) - result = cursor.fetchone() - if ( nfsip != ""): - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostCentralNFSIP',(%s),(%s))",(nfsip,thishostname)) - print "inserting nfsip" - - if (nfstoggle != ""): - cursor.execute("select data from settings where value='HostHaveCentralNFS' and hostname=(%s)",(thishostname)) - result = cursor.fetchone() - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostHaveCentralNFS',(%s),(%s))",(nfstoggle,thishostname)) - print "inserting nfstoggle" - - if ( nfsmount !="") : - cursor.execute("select data from settings where value='HostNFSmountpoint' and hostname=(%s)",(thishostname)) - result = cursor.fetchone() - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostNFSmountpoint',(%s),(%s))",(nfsmount,thishostname)) - print "inserting nfsmountpoint" - -#hobbitclient - cursor.execute("select * from settings where value='HostServiceHobbitclient' and hostname=(%s)",(thishostname)) - result = cursor.fetchone() - if ( tz != ""): - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostServiceHobbitclient',(%s),(%s))",(hobbitclient,thishostname)) - print "inserting hobbitcleint" - else: - cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostServiceHobbitclient'",(hobbitclient,thishostname)) - print "updating hobbitclient" - - -def main(argv): - global masterdb - global installdb - global thishostname - thishostname="" - global BEhostname - global zipcode - global tz - global tz_region - global tz_subregion - - global nfsip - global hobbitclient - try: - opts, args = getopt.getopt(argv, "hm:d:n:", ["help", "masterdb=", "installdb=" , "hostname=" ] ) - except getopt.GetoptError: - sys.exit(2) - for opt, arg in opts: - if opt in ("-h", "--help"): - usage() - sys.exit() - elif opt in ( "-d" , "--installdb"): - installdb = arg - elif opt in ("-m", "--masterdb"): - masterdb = arg - elif opt in ("-n", "--hostname"): - thishostname = arg - - if ( thishostname == "" ): - thishostname = socket.gethostname() - - selectvars() - printvars() - insertvars() -if __name__ == "__main__": - main(sys.argv[1:]) - diff --git a/abs/core-testing/LinHES-config-svn/timezone.bin b/abs/core-testing/LinHES-config-svn/timezone.bin deleted file mode 100755 index cff931a..0000000 Binary files a/abs/core-testing/LinHES-config-svn/timezone.bin and /dev/null differ diff --git a/abs/core-testing/LinHES-config-svn/xconfig.sh b/abs/core-testing/LinHES-config-svn/xconfig.sh deleted file mode 100755 index e2a48ed..0000000 --- a/abs/core-testing/LinHES-config-svn/xconfig.sh +++ /dev/null @@ -1,305 +0,0 @@ -#!/bin/bash -#NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel unichrome-dri xf86-video-unichrome xf86-video-mga xf86-video-savage xf86-video-trident" -NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel xf86-video-mga xf86-video-savage xf86-video-trident" -BASE="" -. /etc/profile -NVIDIA_96XX="$TEMPLATES/xorg/96xx_supported.txt" -#TEMPLATES="/usr/share/templates" -MYTHHOME=$BASE/home/mythtv - -function Xvalues { - CMDLINE=$(cat /proc/cmdline) - echo "$CMDLINE" | grep -q forceXvesa - if [ $? = 0 ] - then - VGACARDTYPE=vesa - else - VGACARDTYPE=`lspci | grep -i vga | sort -r | head -n 1 | cut -d: -f3 | cut -d" " -f2` - VGAPCIID=`lspci | grep -i vga | sort -r | head -n 1 | cut -d" " -f1` - CARDID=`lspci -n | grep "$VGAPCIID" | grep 10de | cut -d" " -f3 | cut -d: -f2` - VENDORID=`lspci -n | grep "$VGAPCIID" | grep 10de | cut -d" " -f3 | cut -d: -f1` - fi - echo "$VGACARDTYPE" - currentmode=`cat "$BASE/etc/X11/xorg.conf" | grep Modes | awk -Fs '{ print $2 }'` -} - -function presetupX { - if [ -f /etc/sysconfig/IGNORE_X ] - then - echo "Will not run xconfig.sh due to presence of /etc/sysconfig/IGNORE_X" - return 1 - else - if [ "$XIgnoreConfig" = 1 ] - then - echo "Using User supplied X" - if [ -f "$MYTHHOME/templates/xorg.user" ] - then - cp -f "$MYTHHOME/templates/xorg.user" "$XORG_CONF" - else - echo "Didn't find the file" - echo "Copy your config file to $MYTHHOME/templates/xorg.user" > "$XORG_CONF" - fi - else - if [ "$XUseAdvanced" = 1 ] - then - setupAdvancedX - else - setupX - fi - fi - fi - -} - -function setupAdvancedX { - echo "#doing the advanced" > /tmp/options - Xcategory=`echo "$Xresadvanced" | cut -d_ -f1` - Xres=`echo "$Xresadvanced" | cut -d_ -f2` - echo "$Xcategory" - if [ "$Xcategory" = "Nvidia" ] - then - Xres="" - if [ "$XnVidia1080p" = "1" ] - then - Xres="${Xres} \"1920x1080_60\"" - fi - if [ "$XnVidia1080i" = "1" ] - then - Xres="${Xres} \"1920x1080_60i\"" - fi - if [ "$XnVidia720p" = "1" ] - then - Xres="${Xres} \"1280x720_60\"" - fi - if [ "$XnVidia480p" = "1" ] - then - Xres="${Xres} \"720x480_60\"" - fi - ML="\t Modes ${Xres}" - else - - ML="\t Modes \"${Xres}\"" - fi -# echo $ML - case $Xcardtype in - NVIDIA|nVidia) - case $Xconnection in - DVI) ConnectedMonitor=DFP ;; - vga) ConnectedMonitor=CRT;; - Auto) ConnectedMonitor=Auto;; - TV) ConnectedMonitor=TV - echo "Option \"TVStandard\" \"$XTVstandard\"" >>/tmp/options - echo "Option \"TVOutFormat\" \"$XTVconnection\"" >> /tmp/options - ;; - esac - if [ "$ConnectedMonitor" = Auto ] - then - echo "auto connection" - else - echo "Option \"ConnectedMonitor\" \"$ConnectedMonitor\"" >> /tmp/options - echo "Option \"FlatPanelProperties\" \"Scaling = centered, Dithering = enabled\"" >> /tmp/options - echo "Option \"DigitalVibrance\" \"0\"" >> /tmp/options - fi - - if [ "$XignoreEDID" = 1 ] - then - EDIDvalue=true - EDIDFREQ=false - DS=" DisplaySize $XDisplaysize" - HS=" HorizSync $XHsync" - VR=" VertRefresh $XVrefresh" - else - EDIDvalue=false - EDIDFREQ=true - DS="# Display size edid used " - HS="# Hsync edid used " - VR="# Vertrefresh edid used " - fi - echo "Option \"UseEdidFreqs\" \"$EDIDFREQ\"" >> /tmp/options - echo "Option \"IgnoreEDID\" \"$EDIDvalue\"" >> /tmp/options - - - sed -e "s/^.*Modes.*$/${ML}/" \ - -e "/INSERT MODELINE/r $TEMPLATES/xorg/modeline.$Xcategory" \ - -e "s/^.*DisplaySize.*$/ $DS/" \ - -e "s/^#.*HorizSync.*$/ $HS/g" \ - -e "s/^#.*VertRefresh.*$/ $VR/g" \ - -e "/INSERT HERE/r /tmp/options" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF" - ;; - - ati|ATI) - case $Xconnection in - DVI) ConnectedMonitor="tmds1,nocrt1,notv";; - VGA) ConnectedMonitor="crt1,notmds1,notv" ;; - TV) ConnectedMonitor="tv,nocrt1,notmds1" - echo "Option \"TVStandard\" \"$XTVstandard\"" >>/tmp/options - echo "Option \"TVFormat\" \"$XTVconnection\"" >> /tmp/options - ;; - esac - if [ "$XignoreEDID" = 1 ] - then - DS=" DisplaySize $XDisplaysize" - HS=" HorizSync $XHsync" - VR=" VertRefresh $XVrefresh" - else - DS="# Display size edid used " - HS="# Hsync edid used " - VR="# Vertrefresh edid used " - fi - - echo "Option \"ForceMonitors\" \"$ConnectedMonitor\"" >> /tmp/options - - sed -e "s/^.*Modes.*$/\t $ML/" \ - -e "/INSERT MODELINE/r $TEMPLATES/xorg/modeline.$Xcategory" \ - -e "s/^.*DisplaySize.*$/ $DS/" \ - -e "s/^#.*HorizSync.*$/ $HS/g" \ - -e "s/^#.*VertRefresh.*$/ $VR/g" \ - -e "/INSERT HERE/r /tmp/options" "$TEMPLATES/xorg/xorg.conf.ati" > "$XORG_CONF" - ;; - - via|VIA|Via|S3) - # Need to add appropriate Modules, Device and DRI sections - # See the http://www.mythtv.org/wiki/XvMC wiki page - echo "no via here" - ;; - - *) - echo "unknown card type" - ;; - esac -} - - -function setupX { - Xvalues - #echo "$currentmode ____ ${Xres}" - #if [ "${currentmode}" != \"${Xres}\" ] - if [ x = x ] - then - case $VGACARDTYPE in - nVidia) - sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF" - if [ "$TESTMODE" != "test" ] - then - #nvidia check right here - grep -qi "$CARDID" "$NVIDIA_96XX" - if [ $? = 0 ] - then - #install 96xx drivers - echo "installing nvidia 96xx drivers" - pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 - pacman --noconfirm -S nvidia-96xx nvidia-96xx-utils > /dev/null 2>&1 - else - #install latest drivers - echo "installing current nvidia drivers" - pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 - pacman --noconfirm -S nvidia nvidia-utils > /dev/null 2>&1 - fi - fi - echo "/usr/lib/libXvMCNVIDIA_dynamic.so.1" > "$XVMC_CONFIG" - ;; - - # VMware) - # sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.vmware" > "$XORG_CONF" - # ;; - - VIA|S3) - # There are actually multiple options here - # xf86-video-openchrome - # xf86-video-unichrome - # There is also a seperate driver for the Unichrome Pro - sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.via" > "$XORG_CONF" - if [ "$TESTMODE" != "test" ] - then - if [ "$OPENCHROME" = "1" ] - then - pacman --noconfirm -R nvidia nvidia-utils > /dev/null 2>&1 - pacman --noconfirm -S libgl unichrome-dri xf86-video-openchrome > /dev/null 2>&1 - else - pacman --noconfirm -R nvidia nvidia-utils > /dev/null 2>&1 - pacman --noconfirm -S libgl unichrome-dri xf86-video-unichrome > /dev/null 2>&1 - fi - fi - # I'm making educated guesses here... - if lspci | grep "VGA" | grep -qi "Unichrome Pro" - then - if [ -f "/usr/lib/libchromeXvMCPro.so.1" ] - then - echo "/usr/lib/libchromeXvMCPro.so.1" > "$XVMC_CONFIG" - else - echo "/usr/lib/libviaXvMCPro.so.1" > "$XVMC_CONFIG" - fi - else - if [ -f "/usr/lib/libchromeXvMC.so.1" ] - then - echo "/usr/lib/libchromeXvMC.so.1" > "$XVMC_CONFIG" - else - echo "/usr/lib/libviaXvMC.so.1" > "$XVMC_CONFIG" - fi - fi - ;; - - Intel) - sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.intel" > "$XORG_CONF" - if [ "$TESTMODE" != "test" ] - then - pacman --noconfirm -R nvidia-utils > /dev/null 2>&1 - pacman --noconfirm -S libgl > /dev/null 2>&1 - fi - echo "/usr/lib/libIntelXvMC.so.1" > "$XVMC_CONFIG" - ;; - - vesa|InnoTek) - sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.vesa" > "$XORG_CONF" - ;; - - *) - XCONF=/root/xorg.conf.new - XCONFB=/etc/X11/xorg.conf.install - X -configure - if [ -f "$XCONF" ] - then - echo "Using $XCONF" - grep -v Modes "$XCONF" | sed -e "/Depth.*16/a Modes \"${Xres}\" " -e "/Depth.*24/a Modes \"${Xres}\"" -e 's/dev\/mouse/dev\/psaux/g'> "$XORG_CONF" - elif [ -f "$XCONFB" ] - then - echo "Using $XCONFB" - sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$XCONFB" > "$XORG_CONF" - else - echo "Xorg configuration failed" - fi - rm -f "$XCONF" 2>&1 > /dev/null - ;; - esac - fi - -} - -#MAIN -TESTMODE="$1" -if [ "$TESTMODE" = "test" ] -then - XORG_CONF="/tmp/xorg.conf.test" - XVMC_CONFIG="/tmp/XvMCConfig.test" - XUseAdvanced="1" - XIgnoreConfig="${2}" - Xcardtype="${3}" - XIgnoreEDID="${4}" - Xconnection="${5}" - XHsync="${6}" - XVrefresh="${7}" - Xresadvanced="${8}" - XTVstandard="${9}" - XTVconnection="${10}" - XDisplaysize="${11}" -else - if [ -f /etc/systemconfig ] - then - . /etc/systemconfig - else - Xres="800x600" - fi - XORG_CONF="/etc/X11/xorg.conf" - XVMC_CONFIG="/etc/X11/XvMCConfig" -fi -presetupX diff --git a/abs/core-testing/LinHES-config/LinHES-release b/abs/core-testing/LinHES-config/LinHES-release deleted file mode 100644 index 156ac78..0000000 --- a/abs/core-testing/LinHES-config/LinHES-release +++ /dev/null @@ -1 +0,0 @@ -LinHES R7.00.01 (Punta Gorda) diff --git a/abs/core-testing/LinHES-config/LinHES.install b/abs/core-testing/LinHES-config/LinHES.install deleted file mode 100644 index 2b2d53c..0000000 --- a/abs/core-testing/LinHES-config/LinHES.install +++ /dev/null @@ -1,79 +0,0 @@ -# This is a default template for a post-install scriptlet. You can -# remove any functions you don't need (and this header). - -# arg 1: the new package version -pre_install() { - rm -f /etc/issue - rm -f /etc/arch-release - -} - -# arg 1: the new package version -post_install() { - if [ ! -f /etc/blacklist.package ] - then - echo "List of packages to ignore" > /etc/blacklist.package - echo "one package per line" >> /etc/blacklist.package - fi - -LINE="mythtv ALL = NOPASSWD:/usr/MythVantage/bin/mythvantage" -LINE1="mythtv ALL = NOPASSWD:/usr/MythVantage/bin/MythVantage" -for i in "$LINE" "$LINE1" -do - cp /etc/sudoers /etc/sudoers.bak - grep -q "$i" /etc/sudoers - if [ $? != 0 ] - then - echo "$i" >> /etc/sudoers - visudo -cf /etc/sudoers - if [ ! $? = 0 ] - then - cp /etc/sudoers.bak /etc/sudoers - echo $i - echo "Error adding files" - exit 1 - fi - fi -done - - -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - /bin/true -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - . /etc/profile - ps -ef|grep mysqld|grep -v grep - status=$? - echo "status $status" - if [ $status = 0 ] - then - restore_default_settings.sh -c load - fi - if [ ! -f /etc/blacklist.package ] - then - echo "List of packages to ignore" > /etc/blacklist.package - echo "one package per line" >> /etc/blacklist.package - fi - cat /etc/LinHES-release > /etc/os_myth_release -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - -op=$1 -shift -$op $* diff --git a/abs/core-testing/LinHES-config/MythVantage.sh b/abs/core-testing/LinHES-config/MythVantage.sh deleted file mode 100755 index 286c908..0000000 --- a/abs/core-testing/LinHES-config/MythVantage.sh +++ /dev/null @@ -1,3 +0,0 @@ -export MV_ROOT=/usr/MythVantage -export PATH=$PATH:$MV_ROOT/bin -export TEMPLATES=$MV_ROOT/templates diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD deleted file mode 100644 index ef25620..0000000 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ /dev/null @@ -1,138 +0,0 @@ -pkgname=LinHES-config -pkgver=2.1 -pkgrel=45 -conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) -pkgdesc="Install and configure your system" -depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' - 'sg3_utils' 'nmbscan' 'system-templates' 'rsync' 'python-parted' - 'ddcxinfo' 'python-pexpect' 'python-netifaces' 'LinHES-timezone' - 'python-iplib' 'mythinstall>=2-10') -arch=('i686') - -source=(mv_install.py - mv_config.py - myth_user_call - file_time_offset.py - install_proxy.sh - install_functions.sh - systemconfig.sh - install_db_chroot.sh - restore_default_settings.sh - xconfig.sh - timezip.py - soundconfig.sh - LinHES-release - issue - MythVantage.sh - create_master.sh - build_diskless.sh - networkconfig.sh - autocard.py - restore_km_db_chroot.sh - README - mv_advanced.py - mv_common.py - mv_ddns.py - mv_ir.py - mv_misc.py - mv_network.py - mv_screensaver.py - mv_smolt.py - mv_software.py - mv_webuser.py - mv_hostype.py - systemconfig.py - myth_user_call.py - mythvantage.cfg) - -backup=(etc/mythvantage.cfg) -install=LinHES.install - -build() { - mkdir -p $startdir/pkg/etc - mkdir -p $startdir/pkg/usr/share/mythtv/themes/default - - MVDIR=$startdir/pkg/usr/MythVantage - mkdir $startdir/pkg/etc/profile.d - install -m 0755 MythVantage.sh $startdir/pkg/etc/profile.d/MythVantage.sh - mkdir -p $MVDIR/bin - mkdir -p $MVDIR/etc - - #copy in all the installer specific stuff -# install -m0700 myth_user_call $MVDIR/bin/myth_user_call - install -m0700 myth_user_call.py $MVDIR/bin/myth_user_call - install -m 0755 install_proxy.sh $MVDIR/bin/install_proxy.sh - install -m 0755 install_functions.sh $MVDIR/bin/install_functions.sh - install -m 0755 systemconfig.sh $MVDIR/bin/systemconfig.sh - install -m 0755 xconfig.sh $MVDIR/bin/xconfig.sh - install -m 0755 install_db_chroot.sh $MVDIR/bin/install_db_chroot.sh - install -m 0755 restore_km_db_chroot.sh $MVDIR/bin/restore_km_db_chroot.sh - install -m 0755 restore_default_settings.sh $MVDIR/bin/restore_default_settings.sh - install -m 0755 soundconfig.sh $MVDIR/bin/soundconfig.sh - install -m 0755 networkconfig.sh $MVDIR/bin/networkconfig.sh - install -m 0755 create_master.sh $MVDIR/bin/create_master.sh - install -m 0755 build_diskless.sh $MVDIR/bin/build_diskless.sh - install -m 0755 timezip.py $MVDIR/bin/timezip.py - install -m 0755 autocard.py $MVDIR/bin/autocard.py - install -m 0755 mv_config.py $MVDIR/bin/mv_config.py - install -m 0755 mv_install.py $MVDIR/bin/mv_install.py - install -m 0755 mv_advanced.py $MVDIR/bin/ - install -m 0755 mv_common.py $MVDIR/bin/ - install -m 0755 mv_ddns.py $MVDIR/bin/ - install -m 0755 mv_ir.py $MVDIR/bin/ - install -m 0755 mv_misc.py $MVDIR/bin/ - install -m 0755 mv_network.py $MVDIR/bin/ - install -m 0755 mv_screensaver.py $MVDIR/bin/ - install -m 0755 mv_smolt.py $MVDIR/bin/ - install -m 0755 mv_software.py $MVDIR/bin/ - install -m 0755 mv_webuser.py $MVDIR/bin/ - install -m 0755 mv_hostype.py $MVDIR/bin/ - install -m 0755 systemconfig.py $MVDIR/bin/ - install -m 0755 mythvantage.cfg $startdir/pkg/etc/ - - #README file displayed on install - install -m 0755 README $MVDIR/README - - mkdir -p $startdir/pkg/usr/bin - install -m 0755 file_time_offset.py $startdir/pkg/usr/bin/file_time_offset.py - - #Copy in the branding stuff - install -m 0755 LinHES-release $startdir/pkg/etc/LinHES-release - install -m 0755 issue $startdir/pkg/etc/issue - -} -md5sums=('381de315bceff755c7c5106ee693059f' - '1a4694fcd694b362c339bda781ed0f3e' - 'e36da536dd651ef182e7642337889e77' - '3baa23764e1b6bcb2d66d7d859096940' - 'd7a8cd4a0060399ae22e69f74e04eb07' - '7a45287a07145fde5aa664583d4f6fba' - 'f88d2fb88339a4bf8ec9217a3fbcdef7' - '8ac1cfd2eca0f641737da0d0aca416a7' - '9ae8d79f620c6d19973c55c32a921874' - '4620f6f498ef4523398635cb0bd59425' - '06188493e5ed79cb501d3c5694dee8ca' - 'e459ed069317bccb20351f037a9df3d2' - 'b47f477693ed3e83a0cd951a616e16d1' - '6aff504ed5e860adc1b7317cd0780900' - '55fccb1da0417a896b724f7cfc32dd5a' - 'ab2aa42c2947148c2b1cac0ade6d1d55' - 'd429b59d3cfb37b0624c6a4a71a7c2c0' - 'a225143e3df6f56d451c2875e54ddbae' - '687555968d4ca688d8f95c8f13e1d8d4' - '3d1e4a119f38cff0498bf8a67e94e4b3' - '5b41cfc6f4ad5cdbcd28cf980110f135' - 'ee7c8e1f025ce1527ecfffabafb26806' - '41b03fb1e0a9d9ae7588e3b813212772' - 'a9ffe72c3ede99d505fdc97572a7c256' - 'df43bce1712320508d4eef8449c5d223' - '65d93f15ac85adf8299552581789a731' - '4badc3c664c55f87396a473e6c14d4bc' - 'e2aa772fe0bf366e26eaaf663f9257bd' - 'fe5e31b833cc6707209e9d656b6eb53c' - 'd328d63eaa4252f3d4888476c79bbff6' - '23d0e12b7ca1cc6ea6b993c1d7ff20b9' - '857a831e8627727306208f0e776b1b98' - 'cf35353141b70145f3ee8b0bd852c9f1' - 'cf60e7ba4cf3467bb5539d5c51da61b6' - 'a63ff9ef5250965aeabc74bfa8e43981') diff --git a/abs/core-testing/LinHES-config/README b/abs/core-testing/LinHES-config/README deleted file mode 100644 index e045f2c..0000000 --- a/abs/core-testing/LinHES-config/README +++ /dev/null @@ -1,9 +0,0 @@ -Thanks for choosing LinHES! At the moment, LinHES is compiled for i686. -If you have an i586 class system, LinHES won't work for you. I've not seen a great request for i586. If you want it, you have to drum up support for it. - -Support for LinHES can be obtained at: -http://linhes.org -irc.freenode.net #linhes - -Bugs can be reported at: -http://linhes.org/bugs diff --git a/abs/core-testing/LinHES-config/add_service.sh b/abs/core-testing/LinHES-config/add_service.sh deleted file mode 100755 index 190d604..0000000 --- a/abs/core-testing/LinHES-config/add_service.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -SERVICE_DIR=/var/service -SCRIPT_DIR=/etc/sv -if [ -d $SCRIPT_DIR/$1 ] -then - if [ -d $SERVICE_DIR/$1 ] - then - echo "$1 already there" - else - ln -s $SCRIPT_DIR/$1 $SERVICE_DIR/$1 - echo "adding $1" - fi -else - echo "couldn't find $SCRIPT_DIR/$1" -fi diff --git a/abs/core-testing/LinHES-config/autocard.py b/abs/core-testing/LinHES-config/autocard.py deleted file mode 100755 index 03eecac..0000000 --- a/abs/core-testing/LinHES-config/autocard.py +++ /dev/null @@ -1,307 +0,0 @@ -#!/usr/bin/python -# import MySQL module -#jm -import MySQLdb -import sys -import getopt -import socket -import os -import time -import string -import glob -from string import letters -from string import digits -def INSERTNULL_SOURCE(name,xmltvgrabber,userid,freqtable,lineupid,password,useeit): - cursor = db.cursor() - cursor.execute("INSERT INTO videosource(name,xmltvgrabber,userid,freqtable,lineupid,password,useeit) VALUES(%s,%s,%s,%s,%s,%s,%s);",(name,xmltvgrabber,userid,freqtable,lineupid,password,useeit)) - -def INSERTCARD_INTOMYTH(Device,Driver,Cardvendor): - global currenthostname - print Device - print Driver, - print Cardvendor - cursor = db.cursor() - insert = "false" - if Driver == "ivtv" : - cardtype="MPEG" - defaultinput="Tuner 1" - insert="true" - if Cardvendor == "pcHDTV HD3000 HDTV": - insert="false" - cardtype ="whocares" - - #print insert - if insert == "true" : - cursor.execute("INSERT INTO capturecard (videodevice,cardtype,defaultinput,hostname) VALUES(%s,%s,%s,%s);",(Device,cardtype,defaultinput,currenthostname)) - -def INSERTHDR_INTOMYTH(deviceid,tuner_number): - cardtype='HDHOMERUN' - defaultinput='MPEG2TS' - global currenthostname - print deviceid - print cardtype - print defaultinput - print tuner_number - cursor = db.cursor() - #print insert - cursor.execute("INSERT INTO capturecard (videodevice,cardtype,defaultinput,dbox2_port ,hostname) VALUES(%s,%s,%s,%s,%s);",(deviceid,cardtype,defaultinput,tuner_number,currenthostname)) - -def INSERTAUTOCARD(): - global cardlist - global currenthostname - # create a cursor - cursor = db.cursor() - - - for i in range( 1 , len(cardlist)): - insert = "false" -# print cardlist[i] - Device=cardlist[i][0] - Driver=cardlist[i][1] - Cardvendor=cardlist[i][2] - Businfo=cardlist[i][3] - if Driver == "ivtv" : - insert="true" - devicestatus="unused" - if Cardvendor == "pcHDTV HD3000 HDTV": - insert="false" - cardtype ="whocares" - if Driver == "hdr": - insert="true" - devicestatus="unused" - - if insert == "true" : - cursor.execute("delete from autocard where uniqid=%s;",(Businfo)) - if Driver=="hdr": - Cardvendor="HDHOMERUN Tuner 1" - cursor.execute("INSERT INTO autocard (dev,driver,description,uniqid,devicestatus,hostname) VALUES(%s,%s,%s,%s,%s,%s);",(Device,Driver,Cardvendor,Businfo,devicestatus,currenthostname)) - Cardvendor="HDHOMERUN Tuner 2" - cursor.execute("INSERT INTO autocard (dev,driver,description,uniqid,devicestatus,hostname) VALUES(%s,%s,%s,%s,%s,%s);",(Device,Driver,Cardvendor,Businfo,devicestatus,currenthostname)) - - else: - cursor.execute("INSERT INTO autocard (dev,driver,description,uniqid,devicestatus,hostname) VALUES(%s,%s,%s,%s,%s,%s);",(Device,Driver,Cardvendor,Businfo,devicestatus,currenthostname)) - - - -def PRINTINFO(): - global cardlist - - for list in cardlist: - if list != "_placeholder_": - print list - #print "-------------" - -def GATHER_HDR(): - global cardlist - command="/usr/bin/hdhomerun_config --discover" - results=os.popen(command,'r') - line=results.readline() - if line.strip().split()[0] == "no": - print "HDHOMERUN not detected" - else: - print line - hdrdevice=line.strip().split()[2] - print hdrdevice - Driver="hdr" - Device=hdrdevice - Cardtype="HDHOMERUN" - Businfo=hdrdevice - cardprops = [Device,Driver , Cardtype , Businfo] - cardlist.append(cardprops) - - -def GATHER_v4l_CARDS(): - global cardlist - cardlist=["_placeholder_"] - # print "Looking for v4l cards" - try: - filelist = os.listdir('/dev/v4l/') - except OSError: - filelist=" " - #fakelist=['/dev/v4l/video3', 'ivtv', 'WinTV PVR 500 (unit #2)', '0000:04:09.0'] - #cardlist.append(fakelist) - try: - filelist = glob.glob("/dev/v4l/video?") - Driver="" - Cardtype="" - Businfo="" - numcards = 0 - for Device in filelist: - #print card - numcards = numcards+1 - cmd = 'v4l2-ctl -D -d' + Device - for line in os.popen(cmd).readlines(): - #print line - pos = string.find(line,"Driver name") - if pos >=0: - splitline= line.split(':') - Driver=splitline[1].strip() - pos = string.find(line,"Card type") - if pos >=0: - splitline= line.split(':') - Cardtype=splitline[1].strip() - - pos = string.find(line,"Bus info") - if pos >=0: - splitline= line.split(':',1) - Businfo=splitline[1].strip() - - #print Device,Driver , Cardtype , Businfo,numcards - cardprops = [Device,Driver , Cardtype , Businfo] - cardlist.append(cardprops) - except IOError: - print "no v4l cards found" - sys.exit(2) - - -def WRITEUDEV_IVTV(): - global insertmyth - cursor = db.cursor() - #add ivtv,cid lookup loop through until empty. - cursor.execute("select distinct(uniqid) from autocard where driver='ivtv' and devicestatus='will-add'") - cidrows = cursor.fetchall() - for row in cidrows: - cid=row[0] - cursor.execute("select dev,driver,description,devicestatus,hostname from autocard where uniqid=%s limit 1;",(cid)) - result = cursor.fetchone() - description=result[2] - driver='DRIVERS==\"ivtv\"' - ATTRNAME='ATTR{name}=="ivtv? encoder MPG"' - KERNELS='KERNELS==\"' - KERNELS+=cid - KERNELS+="\"" - #filter out non digit or chars - keep=letters.join(digits) - description=filter(lambda c: c in keep, description) - devnode="ivtv/" - #devnode+=description + "_" - udevcid=cid.partition(":") - devnode+=udevcid[2] - devnode+="_video" - UDEV_RULE=driver +', '+ATTRNAME+', '+ KERNELS +', ' + 'NAME=\"' + devnode + '"' - print "Here is the udev rule" - print UDEV_RULE - filename='/etc/udev/rules.d/11-ivtv-'+cid+'.rules' - file = open(filename,'w') - file.write(UDEV_RULE) - if ( insertmyth == "true"): - devnode="/dev/"+devnode - INSERTCARD_INTOMYTH(devnode,"ivtv",description) - cursor.execute("update autocard set devicestatus='done' where uniqid=%s;",(cid)) -#now insert HDR - cursor.execute("select distinct(uniqid),description from autocard where driver='hdr' and devicestatus='will-add'") - cidrows = cursor.fetchall() - for row in cidrows: - if ( insertmyth == "true"): - deviceid=row[0] - #cardtype="HDHOMRUN" - #defaultinput="MPEG2TS" - dbox2_port=row[1] - tuner_number=dbox2_port.rpartition(' ')[2] - INSERTHDR_INTOMYTH(deviceid,tuner_number) - cursor.execute("update autocard set devicestatus='done' where uniqid=%s and description=%s;",(deviceid,dbox2_port)) - - - -def CLEARAUTOCARD(): - cursor = db.cursor() - cursor.execute("delete from autocard") - -def RELOADUDEV(): - print "relaoding udev rules" - os.system('udevcontrol reload_rules') - os.system('rmmod ivtv') - os.system('udevtrigger') - - -def usage(): - print " -h help" - print " -g gather and print out the found cards" - print " -w write out the udev rules" - print " -i insert cards into myth that are marked will-add(only used with -w)" - print " -r reload udev rules" - print " -c clear the autocard db" - -def main(argv): - global db - global cardlist - global currenthostname - currenthostname="" - writeudev="false" - global insertmyth - insertmyth ="false" - - db = MySQLdb.connect(host="localhost", user="mythtv", passwd="mythtv", db="mythconverg") - try: - cursor = db.cursor() - cursor.execute("describe autocard;") - except MySQLdb.Error, e: - cursor.execute("create table autocard(dev varchar(50),driver varchar(50),description varchar(50),uniqid varchar(50), devicestatus varchar(50),hostname varchar(50));") - print "table created" - - if ( currenthostname == "" ): - currenthostname = socket.gethostname() - - - try: - opts, args = getopt.getopt(argv, "hgwircd", ["help", "gathercards", "writeudev" ,"insert" , "reloadudev" , "clearautocard"] ) - except getopt.GetoptError: - sys.exit(2) - for opt, arg in opts: - if opt in ("-h", "--help"): - usage() - sys.exit() - elif opt in ( "-g" , "--gathercards"): - GATHER_v4l_CARDS() - GATHER_HDR() - INSERTAUTOCARD() - PRINTINFO() - elif opt in ("-w", "--writeudev"): - writeudev="true" - elif opt in ("-i", "--insert"): - insertmyth="true" - elif opt in ( "-r" , "--reloadudev"): - RELOADUDEV() - elif opt in ( "-c" , "--clearautocard"): - CLEARAUTOCARD() - elif opt in ( "-d" ): - INSERTCARD_INTOMYTH("file:/myth/video/TripThe1939.mpeg","ivtv","Dummy tuner") - INSERTNULL_SOURCE("dummy","/bin/true","","default","NULL","NULL","0") - - if ( writeudev == "true"): - WRITEUDEV_IVTV() - - - - - - -if __name__ == "__main__": - main(sys.argv[1:]) - - - - - -#mysql> create table autocard(dev varchar(50),driver varchar(50),description varchar(50),uniqid varchar(50), devicestatus varchar(50),hostname varchar(50)); -#Query OK, 0 rows affected (0.14 sec) - -#mysql> describe autocard; -#+--------------+-------------+------+-----+---------+-------+ -#| Field | Type | Null | Key | Default | Extra | -#+--------------+-------------+------+-----+---------+-------+ -#| dev | varchar(50) | YES | | NULL | | -#| driver | varchar(50) | YES | | NULL | | -#| description | varchar(50) | YES | | NULL | | -#| uniqid | varchar(50) | YES | | NULL | | -#| devicestatus | varchar(50) | YES | | NULL | | -#| hostname | varchar(50) | YES | | NULL | | -#+--------------+-------------+------+-----+---------+-------+ - - - - - - - - diff --git a/abs/core-testing/LinHES-config/bpopup-ui.xml b/abs/core-testing/LinHES-config/bpopup-ui.xml deleted file mode 100755 index df0598b..0000000 --- a/abs/core-testing/LinHES-config/bpopup-ui.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - #ffff00 - #000000 - 24 - 3,3 - yes - - - - #9999cc - 18 - yes - - - - #ffff00 - #000000 - 18 - 3,3 - yes - - - - #ffffff - 18 - yes - - - - #ffffff - 50 - yes - - - #ff0000 - #000000 - 16 - 2,2 - yes - - - - #ffff00 - 14 - yes - - - - 0,0,800,600 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/abs/core-testing/LinHES-config/build_diskless.sh b/abs/core-testing/LinHES-config/build_diskless.sh deleted file mode 100755 index 4dfd5fc..0000000 --- a/abs/core-testing/LinHES-config/build_diskless.sh +++ /dev/null @@ -1,143 +0,0 @@ -#!/bin/bash -#CD=/mnt/cd -. /etc/profile -. /etc/systemconfig - -TFTP=/data/srv/tftp -CD=/data/srv/tftp/live -DESTCD=/data/srv/tftp/CD -BASE=/data/srv/tftp/masterbuild - -MODULES=$DESTCD/MythVantage/base/ -myip=`ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'|head -n1` -SRCFILES=$BASE/mnt/live/mnt/MythVantage/base/ - -function log () { -echo $1 -} - -function check_xvfb () { -export DISPLAY=127.0.0.1:25 - Xvfb -ac :25 & - -} - - -function create_base_image() { -echo $SRCFILES -if [ -f $SRCFILES/data.lzm ] -then - mkdir $HOST_IMG_DIR - cd $SRCFILES - echo "Creating image.." > $BASE/tmp/.install_state - LIST=`ls *.lzm` - for i in $LIST - do - echo $i - echo $i > $BASE/tmp/.install_percent - lzm2dir $i \/$HOST_IMG_DIR - done - - for i in sys proc dev tmp - do - mkdir /$HOST_IMG_DIR/$i - done - - chmod 777 /$HOST_IMG_DIR/tmp - mknod /$HOST_IMG_DIR/dev/null c 1 3 - mknod /$HOST_IMG_DIR/dev/null c 1 5 - mknod /$HOST_IMG_DIR/dev/console c 5 1 - chmod +s /$HOST_IMG_DIR/usr/bin/Xorg - chmod +s /$HOST_IMG_DIR/usr/bin/crontab - chmod +s /$HOST_IMG_DIR/usr/bin/sudo - chmod +s /$HOST_IMG_DIR/bin/mount - #copy fstab from masterbuild - cp -f $BASE/etc/fstab /$HOST_IMG_DIR/etc/fstab - echo "Done: installing data" > $BASE/tmp/.install_state - return 0 -else - echo "Error: no modules" > $BASE/tmp/.install_state - log "couldn't find modules to install" - return 1 -fi -} - -function configure_image () { - echo "Configuring system" > $BASE/tmp/.install_state - cp -f $BASE/etc/systemconfig $HOST_IMG_DIR/etc/systemconfig - chown root:mythtv $HOST_IMG_DIR/etc/systemconfig - chmod 775 "$HOST_IMG_DIR" /etc/systemconfig - cp /etc/mtab $HOST_IMG_DIR/etc/mtab - mount --bind /dev $HOST_IMG_DIR/dev - - chroot "$HOST_IMG_DIR" $MV_ROOT/bin/systemconfig.sh misc,hostype,network,this_is_install -#copy syssettings template to here. - SE=$BASE$TEMPLATES/settings/syssettings - mkdir -p $HOST_IMG_DIR/$TEMPLATES/settings/syssettings - cp -rp $SE/* ${HOST_IMG_DIR}/$TEMPLATES/settings/syssettings - chown root:mythtv $HOST_IMG_DIR/etc/systemconfig - chown -R mythtv:mythtv $HOST_IMG_DIR/$TEMPLATES/settings/syssettings - chmod -R 775 $HOST_IMG_DIR/$TEMPLATES/settings/syssettings -#update remotedb with this host settings - OLDDISPLAY=$DISPLAY - check_xvfb - chroot $HOST_IMG_DIR $MV_ROOT/bin/MythVantage -t restore,default_1 - chroot $HOST_IMG_DIR $MV_ROOT/bin/restore_default_settings.sh -c restore -t syssettings - if [ ! $? = 0 ] - then - touch $mountpoint/tmp/.dbsysfailed - chmod 777 $mountpoint/tmp/.dbsysfailed - else - #Run second time - chroot "$HOST_IMG_DIR" $MV_ROOT/bin/systemconfig.sh misc,hostype,network,this_is_install - chroot "$HOST_IMG_DIR" $MV_ROOT/bin/restore_default_settings.sh -c ACCESSCONTROL - fi -chroot "$HOST_IMG_DIR" $MV_ROOT/bin/systemconfig.sh advanced,this_is_install -cp -f $BASE/etc/X11/xorg.conf $HOST_IMG_DIR/etc/X11/xorg.conf -echo "Done" > $BASE/tmp/.install_state -DISPLAY=$OLDDISPLAY - -#cp /tmp/mythvantage_install.log $HOST_IMG_DIR/var/log/ -} - -function create_tftp_boot () { - - CFGFILE=$TFTP/pxelinux.cfg/01-$2 - echo "DEFAULT mythfe" > $CFGFILE - echo "LABEL mythfe" >> $CFGFILE - echo "kernel masterbuild/boot/vmlinuz26STB" >> $CFGFILE - echo "append vga=normal root=/dev/nfs rw netboot nfsroot=$myip:/data/srv/tftp/$1 ip=dhcp init=/sbin/runit" >> $CFGFILE - echo "TIMEOUT 2" >> $CFGFILE -} - -function create_nfs_export () { -echo "/data/srv/tftp/$1 *(rw,no_root_squash,anonuid=1000,anongid=1000) " >> /etc/exports -exportfs -arv -} - -#-------------------------------------------------------------------------------MAIN PROGRAM --------------------------------------------------------------------- -if [ x$1 = x -o x$2 = x ] -then - echo "usage: hostname macaddress" - exit 1 -fi - -image_name=$1 -mac_address=`echo $2| tr "[:upper:]" "[:lower:]"` - -echo "using image_name of $image_name" -echo "using mac_address of $mac_address" - -HOST_IMG_DIR=$TFTP/$1 - -create_base_image $image_name -configure_image -umount $HOST_IMG_DIR/dev -create_tftp_boot $image_name $mac_address -create_nfs_export $image_name - - - - -#create_dhcp_entry $mac_address - diff --git a/abs/core-testing/LinHES-config/checkout_MythVantage.sh b/abs/core-testing/LinHES-config/checkout_MythVantage.sh deleted file mode 100755 index 21f25e5..0000000 --- a/abs/core-testing/LinHES-config/checkout_MythVantage.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -MYDIR=`pwd` -#MYTHPATH="\/data\/LinHES-PKGBUILD\/abs\/core-testing\/mythtv\/stable\/mythtv\/src\/mythtv-0.23" -MYTHPATH="\/data\/LinHES-PKGBUILD\/abs\/core-testing\/mythtv\/stable-0.23\/mythtv\/src\/mythtv" -function setup_links { -rm mythinstall.bin -rm mythbeselect.bin -ln -s $MYDIR/src/MythVantage-app/mythinstall/mythinstall ./mythinstall.bin -ln -s $MYDIR/src/MythVantage-app/mythbeselect/mythbeselect ./mythbeselect.bin -} - -function dl_repo { -mkdir src -cd src -if [ ! -d MythVantage-app ] -then - git clone http://mythvantage.com/MythVantage-app.git/ - cd MythVantage-app - git checkout --track -b LinHES origin/LinHES - cd $MYDIR - setup_links - cd - -else - echo "updating exisiting tree" - cd MythVantage-app - git pull - git checkout master - git merge - cd - -fi - -cd MythVantage-app -git checkout master -#git checkout origin/LinHES - -} - -dl_repo -sed -i "s/^MYTHPATH.*$/MYTHPATH\=\"$MYTHPATH\"/g" $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro -sed -i "s/#define __MVAPP__/\/\/#define __MVAPP__/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h -sed -i "s/mythvantage/LinHES/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h - -echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythbeselect/mythberestart.pro -echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro -cd $MYDIR/src/MythVantage-app/mythinstall && qmake -make || exit 1 -#cd $MYDIR/src/MythVantage-app/mythbeselect && qmake -#make ||exit 1 - diff --git a/abs/core-testing/LinHES-config/create_master.sh b/abs/core-testing/LinHES-config/create_master.sh deleted file mode 100755 index 1e641b4..0000000 --- a/abs/core-testing/LinHES-config/create_master.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -#CD=/mnt/cd -CD=/data/srv/tftp/live -DESTCD=/data/srv/tftp/CD -DEST=/data/srv/tftp/masterbuild -MODULES=$DESTCD/MythVantage/base/ -myip=`ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'|head -n1` - -mkdir -p $DESTCD -mkdir -p $DEST - -mount $CD -status=0 -if [ -f $CD/MythVantage/base/data.lzm ] -then - status=0 -else - status=1 -fi -if [ x$status = x0 ] -then - echo "copying to disk" - cp -rp $CD/* $DESTCD - cd $MODULES - for i in *.lzm - do - echo $i - lzm2dir $i \/$DEST - done - for i in sys proc dev tmp - do - mkdir $DEST/$i - done - chmod 777 /$DEST/tmp - mknod $DEST/dev/null c 1 3 - mknod $DEST/dev/null c 1 5 - mknod $DEST/dev/console c 5 1 - chmod +s $DEST/usr/bin/Xorg - chmod +s $DEST/usr/bin/crontab - chmod +s $DEST/usr/bin/sudo - chmod +s $DEST/bin/mount -fi -if [ ! -f $DEST/etc/fstab.bak ] -then - cp $DEST/etc/fstab $DEST/etc/fstab.bak -fi -tac $DEST/etc/fstab.bak|tail +4|tac > $DEST/etc/fstab -echo "$myip:/data/srv/tftp/masterbuild / nfs" >> $DEST/etc/fstab -echo "/data/srv/tftp/masterbuild *(rw,no_root_squash,anonuid=1000,anongid=1000)" >> /etc/exports - - -exportfs -arv - -#copy in the modules -mkdir -p $DEST/mnt/live/mnt/ -mv $DESTCD/* $DEST/mnt/live/mnt/ - diff --git a/abs/core-testing/LinHES-config/file_time_offset.py b/abs/core-testing/LinHES-config/file_time_offset.py deleted file mode 100755 index f2973d0..0000000 --- a/abs/core-testing/LinHES-config/file_time_offset.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/python - - -import time -import os -import glob -import getopt -import sys -def main(argv): - filecount=0 -# root = "/tmp" -# offset = 4 - now = int(time.time()) - - - try: - opts, args = getopt.getopt(argv, "hs:d:") - except getopt.GetoptError: - sys.exit(2) - for opt, arg in opts: - if opt in ("-h", "--help"): - print "-s seconds -d /testdir" - print "default if 4 seconds" - sys.exit() - elif opt in ( "-s" ): - offset = int(arg) - elif opt in ("-d"): - root = arg - - for item in glob.glob(root+"/*"): - lastmodDate = os.path.getmtime(item) - tdiff= now-lastmodDate - #print tdiff, offset - - if tdiff > offset: - filecount+=1 - print filecount -if __name__ == "__main__": - main(sys.argv[1:]) diff --git a/abs/core-testing/LinHES-config/install-ui.xml b/abs/core-testing/LinHES-config/install-ui.xml deleted file mode 100755 index 2b3a043..0000000 --- a/abs/core-testing/LinHES-config/install-ui.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - #ffff00 - #000000 - 20 - 3,3 - yes - - - - #9999cc - 18 - yes - - - - #ffff00 - #000000 - 18 - 3,3 - yes - - - - #ffffff - 18 - yes - - - - #ffffff - 50 - yes - - - #ff0000 - #000000 - 16 - 2,2 - yes - - - - #ffff00 - 14 - yes - - - #9999cc - 12 - no - - - - 0,0,800,600 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/abs/core-testing/LinHES-config/install_db_chroot.sh b/abs/core-testing/LinHES-config/install_db_chroot.sh deleted file mode 100644 index 94305d2..0000000 --- a/abs/core-testing/LinHES-config/install_db_chroot.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash -. /etc/profile -. /etc/systemconfig - - -myhost=$hostname -hostname $myhost -echo $myhost > /etc/hostname -echo "install_db_chroot hostname is $hostname" - -. $MV_ROOT/bin/install_functions.sh -#myhost=`cat /etc/hostname` - -#mount -t proc none /proc -pacman --noconfirm -Sf mysql -/etc/rc.d/mysqld - -status=1 -mysqlstatus=1 -while [ ! $status = 0 ] -do - /etc/rc.d/mysqld stop - sleep 1 - /etc/rc.d/mysqld start - mysqlstatus=$? - if [ $mysqlstatus = 0 ] - then - mysql -e "show databases;" - showstatus=$? - if [ $showstatus = 0 ] - then - pacman --noconfirm -R mythdb-initial - pacman --noconfirm -S mythdb-initial - $MV_ROOT/bin/restore_default_settings.sh -c load - DISPLAY=127.0.0.1:0 $MV_ROOT/bin/MythVantage -t restore,default_1 - $MV_ROOT/bin/restore_default_settings.sh -c restore -t syssettings - $MV_ROOT/bin/systemconfig.sh misc,hostype,this_is_install - - update_db_settings HostServiceMythWEB "1" - echo 'UseMythWEB="1"' >> /etc/systemconfig - - #update database to allow user jobs on this host. - $MV_ROOT/bin/restore_default_settings.sh -c USERJOBALLOW - $MV_ROOT/bin/restore_default_settings.sh -c ACCESSCONTROL - if [ -d /data/srv/mysql/mythconverg ] - #if [ -d /var/lib/mysql/mythconverg ] - then - # pacman --noconfirm -R webcalendar - # pacman --noconfirm --nodeps -S webcalendar - status=0 - fi -# if [ $SystemType = "Master_backend" ] -# then -# $MV_ROOT/bin/restore_default_settings.sh -c BECONFIG -s master -a $dbhost -# fi - fi - fi -done -/etc/rc.d/mysqld stop -#umount /proc - - - diff --git a/abs/core-testing/LinHES-config/install_functions.sh b/abs/core-testing/LinHES-config/install_functions.sh deleted file mode 100755 index 83a2bed..0000000 --- a/abs/core-testing/LinHES-config/install_functions.sh +++ /dev/null @@ -1,344 +0,0 @@ -#!/bin/bash -. /etc/profile - -disk=$2 -mountpoint=new_boot - -#------------------------------------------- -MYTHDBUSER=mythtv -MYTHTVPASSWD=mythtv -CMDLINE=$(cat /proc/cmdline) -hostname=`hostname` -MYSQLCMD_C="mysql -u$MYTHDBUSER -p$MYTHTVPASSWD mythconverg -B --exec" -BASE="" -found_remote=1 - -function update_db_settings () { - - printhl " setting database value $1 to $2 for $hostname" - $MYSQLCMD_C "delete from settings where value='${1}' and hostname=\"$hostname\";" 2>/dev/null - $MYSQLCMD_C "REPLACE INTO settings set value='${1}', data='${2}' , hostname=\"$hostname\";" 2>/dev/null -} - -function random_theme () { -THEMES="basic-blue -basic-green -basic-red -basic-purple -basic-amber" - -theme=($THEMES) # Read into array variable. - -num_themes=${#theme[*]} # Count how many elements. - -pick=${theme[$((RANDOM%num_themes))]} -printhl " Selected $pick as the theme" -update_db_settings Theme "$pick" -} - -function parse_cmdline_2_db(){ - echo $CMDLINE | grep -q displayres - if [ $? -eq 0 ] - then - TEMPVAR=${CMDLINE#*displayres=} - update_db_settings HostXres $TEMPVAR - fi - -} - - -function bootsplash_setup (){ - echo $CMDLINE | grep -q splash=silent - if [ $? -eq 0 ] - then - update_db_settings Hostbootsplash 1 - else - update_db_settings Hostbootsplash 0 - fi -} - - -function setupremote { - [ -e $BASE/etc/lircd.conf ] && mv -f $BASE/etc/lircd.conf $BASE/etc/lircd.conf.`date +%Y-%m-%d-%H-%M` - if [ -d $TEMPLATES/remotes/$Remotetype ] - then - cd $TEMPLATES/remotes/$Remotetype - for i in lircd* - do - cat $i >> $BASE/etc/lircd.conf - done - cp -f lircrc* $BASE/etc/lircrc 2> /dev/null - [ -e /etc/lircrc ] && chmod 755 /etc/lircrc - update_db_settings HostRemoteType "$Remotetype" - #special case for special remote - printhl "Starting with support for $Remotetype" - if [ "$Remotetype" == "dvico" ] - then - /usr/sbin/lircd -d /dev/usb/hiddev0 --driver=dvico - elif [ "$Remotetype" == "Dvico-Dual-Digital4-rev2" ] - then - /usr/sbin/lircd -d /dev/input/irremote --driver=devinput - else - /usr/sbin/lircd -d /dev/lirc0 - fi - [ -e /root/.mythtv ] || mkdir /root/.mythtv 2>/dev/null - ln -s /etc/lircrc /root/.mythtv/lircrc 2>/dev/null - else - echo "Couldn't open directory $TEMPLATES/remotes/$Remotetype" - fi -} - -function scan_for_hpg_receiver() { -printhl " Scanning for Hauppauge receiver" -for hpgid in `lspci -nm -d4444: |cut -d" " -f6- |tr -d '"'|tr " " :` -do - line=`grep $hpgid $TEMPLATES/remotes/i2c.id` - if [ $? -eq 0 ] - then - modprobe lirc_i2c - FoundReceiverType=`echo "$line"|cut -d"|" -f2` - Remotetype=`echo "$line"|cut -d"|" -f4` - statusline=`echo "$line"|cut -d"|" -f2,4` - #echo "Found $statusline , $Remotetype" - echo "Found Hauppauge" - echo "-------------------" - echo " 1) Hauppauge black" - echo " 2) Hauppauge silver" - echo " 3) hauppauge-grey-g3" - echo "" - read -p "Which Hauppauge remote (5 sec): " -t 5 ans - echo - if [ "$?" != "0" ]; then - echo - echo "Using default $Remotetype" - else - case $ans in - 1) Remotetype="hauppauge-black";; - 2) Remotetype="hauppauge-silver";; - 3) Remotetype="hauppauge-grey-g3" ;; - *) echo "Using default $Remotetype";; - esac - fi - update_db_settings HostReceiverType $FoundReceiverType - found_remote=0 - setupremote - break - fi -done -} - - -function scan_for_usb_remote () { -#found_remote=1 -printhl " Scanning for usb receiver/remote" -while read line -do - USBID=`echo "$line"|cut -d"|" -f1` - lsusb -d "$USBID" > /dev/null 2>/dev/null - if [ $? -eq 0 ] - then - Remotetype=`echo "$line"|cut -d"|" -f2` - printhl "Found $Remotetype" - setupremote - found_remote=0 - break - fi -done <$BASE/$TEMPLATES/remotes/receiver_usb.id -if [ $found_remote -eq 1 ] -then - scan_for_hpg_receiver -fi -printhl " Scanning for TatIR" -if lsusb | grep 04d8:0004 > /dev/null 2>/dev/null -then - /usr/bin/PyroUsb.py > /dev/null 2>&1 & -fi - -if [ $found_remote -eq 1 ] -then -#No remote found_remote - update_db_settings HostRemoteType "no_remote" -fi - -} - -function rest_of_network () { - #netmask - echo $CMDLINE | grep -q cnetmask - if [ $? -eq 0 ] - then - TEMPVAR=${CMDLINE#*cnetmask=} - NETMASK=${TEMPVAR%% *} - /sbin/ifconfig eth0 $IP netmask $NETMASK - nm=`/usr/bin/nmconv.py -obits $NETMASK` - NETMASK="/$nm $NETMASK" - #echo $NETMASK - update_db_settings HostNETMASK${MYTHDEFAULT} "$NETMASK" - else - printhl " Netmask not found" - fi - #gateway - echo $CMDLINE | grep -q cgateway - if [ $? -eq 0 ] - then - TEMPVAR=${CMDLINE#*cgateway=} - GATEWAY=${TEMPVAR%% *} - /sbin/route add default gw $GATEWAY - update_db_settings HostGW${MYTHDEFAULT} "$GATEWAY" - else - printhl " Gateway not found" - fi - - #dns - echo $CMDLINE | grep -q cdns - if [ $? -eq 0 ] - then - TEMPVAR=${CMDLINE#*cdns=} - DNS=${TEMPVAR%% *} - echo "nameserver $DNS" >> /etc/resolv.conf - update_db_settings HostDNS${MYTHDEFAULT} "$DNS" - else - printhl " DNS not found" - fi - echo $CMDLINE | grep -q chostname - if [ $? -eq 0 ] - then - TEMPVAR=${CMDLINE#*chostname=} - MYHOST=${TEMPVAR%% *} - update_db_settings HostMyhostname "$MYHOST" - else - printhl " hostname not found" - fi -} - -function init_network { - echo $CMDLINE |grep -q cnetdev - if [ $? -eq 0 ] - then - TEMPVAR=${CMDLINE#*cnetdev=} - MYTHDEFAULT=${TEMPVAR%% *} - else - MYTHDEFAULT="eth0" - fi - - echo $CMDLINE | grep -q ip - if [ $? -eq 0 ] - then - update_db_settings HostDefaulteth0 0 - update_db_settings HostDefault${MYTHDEFAULT} 1 - - update_db_settings HostActiveonbooteth0 0 - update_db_settings HostActiveonboot${MYTHDEFAULT} 1 - update_db_settings HostNetDevice ${MYTHDEFAULT} - - TEMPVAR=${CMDLINE#*cip=} - IP=${TEMPVAR%% *} - if [ "$IP" == "dhcp" ] - then - /sbin/dhcpcd $MYTHDEFAULT - update_db_settings HostUseDHCP${MYTHDEFAULT} 0 - else - /sbin/ifconfig ${MYTHDEFAULT} $IP - update_db_settings HostUseDHCP${MYTHDEFAULT} 1 - update_db_settings HostIP${MYTHDEFAULT} "$IP" - rest_of_network - fi - fi - - - - -} - -function dev_up_check(){ - /sbin/ifconfig $1 1>/dev/null 2>/dev/null - status=$? - if [ $status -eq 1 ] - then - return 0 - else - devip=`/sbin/ifconfig | grep -C1 $1| grep inet|grep -v inet6 | cut -d: -f2 | awk '{ print $1}'` - if [ "x$devip" = "x" ] - then - return 1 - else - return 0 - fi - fi -} - -function request_dhcp(){ - echo $CMDLINE |grep -q cnetdev - if [ $? -eq 0 ] - then - TEMPVAR=${CMDLINE#*cnetdev=} - MYTHDEFAULT_NET=${TEMPVAR%% *} - else - MYTHDEFAULT_NET="eth0" - fi - for ndev in eth0 eth1 wlan0 wlan1 ath0 - do - dev_up_check $ndev - status=$? - if [ $status -eq 1 ] - then - #interface is down, lets see if dhcp responds - dhcpcd -Td -t2 $ndev -h "" > /tmp/dhcpinfo.$ndev 2>/dev/null - #check for hostname here - - TEMPVAR=`grep new_ip_address /tmp/dhcpinfo.$ndev |cut -d\= -f2` - if [ ! x$TEMPVAR = x ] - then - update_db_settings HostIP$ndev "$TEMPVAR" - TEMPVAR=`grep new_subnet_mask /tmp/dhcpinfo.$ndev |cut -d\= -f2` - nm=`/usr/bin/nmconv.py -obits $TEMPVAR` - TEMPVAR="/$nm $TEMPVAR" - update_db_settings HostNETMASK$ndev "$TEMPVAR" - TEMPVAR=`grep new_routers /tmp/dhcpinfo.$ndev |cut -d\= -f2` - update_db_settings HostGW$ndev "$TEMPVAR" - TEMPVAR=`grep new_domain_name_servers /tmp/dhcpinfo.$ndev |cut -d\= -f2| tr -d \"|tr -d \'|cut -d" " -f 1` - update_db_settings HostDNS$ndev "$TEMPVAR" - fi - fi - done - TEMPVAR=`grep new_host_name /tmp/dhcpinfo.$MYTHDEFAULT_NET |cut -d\= -f2` - if [ ! x$TEMPVAR = x ] - then - update_db_settings HostMyhostname "$TEMPVAR" - fi - -} - -function init_remote { - echo $CMDLINE | grep -q remoteport - if [ $? -eq 0 ] - then - TEMPVAR=${CMDLINE#*remoteport=} - REMOTEPORT=${TEMPVAR%% *} - if [ x"$ReceiverType" = "xSerial" ] - then - if [ -e /dev/$REMOTEPORT ] - then - /usr/bin/setserial /dev/$REMOTEPORT uart none - /sbin/modprobe lirc_serial - update_db_settings HostReceiverType Serial - update_db_settings HostSerialPortlirc "$REMOTEPORT" - fi - fi - - fi - - echo $CMDLINE | grep -q remote - if [ $? -eq 0 ] - then - TEMPVAR=${CMDLINE#*remote=} - Remotetype=${TEMPVAR%% *} - setupremote - else - scan_for_usb_remote - fi -} - -#----------------------- - - diff --git a/abs/core-testing/LinHES-config/install_proxy.sh b/abs/core-testing/LinHES-config/install_proxy.sh deleted file mode 100755 index 71b675b..0000000 --- a/abs/core-testing/LinHES-config/install_proxy.sh +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/bash -export TERM=vt100 -MVHOSTNAME=larch5 -. /etc/profile -TEMP_TEMPLATES=/tmp/templates -disk=$2 -rootfs=$3 -rootsize=$4 -datafs=$5 -datasize=$6 -swapsize=$7 -mountpoint="/new_boot" -run=$MV_ROOT/bin/install_functions.sh -. /etc/systemconfig 2>/dev/null -. $MV_ROOT/bin/networkconfig.sh -CMDLINE=$(cat /proc/cmdline) -BACKUPFILE="/myth/backup/mythconverg.sql.gz" - - -progress () { - mypercent=`echo "$1" | cut -d. -f1` - if [ x$mypercent = x ] - then - echo "" > /tmp/.install_percent - else - echo "${mypercent}% complete" > /tmp/.install_percent - fi -} - - -case $1 in - full_install_it ) - mv_install.py --rootdisk=$disk --rootfs=$rootfs --rootsize=$rootsize --datafs=$datafs --datasize=$datasize --datadisk=$disk --swapsize=$swapsize -c full_install - rc=$? - echo "mv_install.py exit code $rc" - if [ $rc != 0 ] - then - echo "mv_install error" >> /tmp/.install_error - fi - exit $rc - ;; - - NETBOOT) - echo "-----------------------------------------------------------------------3-----" - netboot-full_install - ;; - - find_update) - mv_install.py --rootdisk=$disk -c find_upgrade - ;; - - upgrade_it) - mv_install.py --rootdisk=$disk --rootfs=$rootfs -c upgrade - ;; - - disk_model_it) - model="unknown" - size="xxx" - case $2 in - h* ) - model=`cat /proc/ide/$2/model` - ;; - s*) model=`sginfo /dev/$2|grep Product|awk ' { print $2 } '` - ;; - esac - size=`parted /dev/$2 print |grep Disk|awk ' { print $3 } ' ` - echo ""$model" $size " >/tmp/model - ;; - - network_check_it) - #Should never return from check_network - case $2 in - setup_network) - vnc_check - install_network_setup - ;; - - check_self) - myipdefault=`ifconfig | grep -C1 $default_interface| grep -v $default_interface | cut -d: -f2 | awk '{ print $1}'` - echo "network check myself" - ifconfig - ping -c 1 $myipdefault - if [ ! $? = 0 ] - then - exit 3 - #can't ping yourself - fi - ;; - check_gw) - #check gateway - echo "network check gateway" - /sbin/route -n - mygwdefault=`/sbin/route -n |grep $default_interface|grep UG|awk '{ print $2}'` - echo "Default gateway seems to be $mygwdefault" - if [ ! x$mygwdefault = x ] - then - sleep 2 - ping -c 5 $mygwdefault - if [ ! $? = 0 ] - then - exit 4 - fi - fi - ;; - check_ns) - #check nameserver - echo " network check nameserver" - mydns=`cat /etc/resolv.conf|grep nameserver|head -1|awk '{ print $2}'` - ping -c 1 $mydns - if [ ! $? = 0 ] - then - exit 5 - fi - ;; - check_names) - echo "network check resolve names" - host google.com - if [ ! $? = 0 ] - then - exit 6 - fi - ;; - host_names) - #if host is found, then check to see if it's online - #if hoip matchs my ip assume it's ok - echo "network check my hostname $hostname" - hout=`host $hostname|head -n1` - status=$? - hoip=`echo $hout|awk '{print $4}'` - if [ $hoip = found: ] - then - status=1 - fi - - if [ $hoip = "out;" ] - then - #;; connection timed out; no servers could be reached - echo "DNS servers not found" - status=1 - fi - - unkownhost=`host unkown.linhes.org |head -n1 ` - unkownhostip=`echo $unkownhost |awk '{print $4}'` - - #found host, now grab the ip - if [ $status = 0 ] - then - hoip=`echo $hout|awk '{print $4}'` - /sbin/ifconfig -a |grep -q $hoip - if [ $? = 0 ] - then - echo "DNS ip matches on of my ips $hoip" - status=0 - else - if [ $unkownhostip = $hoip ] - then - echo "Bad DNS returning false hits" - echo "Assuming hostname is OK" - echo "DNS unknown: $unkownhostip" - echo " HOSTDNS: $hoip " - /sbin/ifconfig -a |grep "inet addr" - else - echo "IP in DNS but doesn't match mine, hostname is not safe to use" - echo "DNS:$hoip" - echo "HOST: " - /sbin/ifconfig -a |grep "inet addr" - status=7 - fi - fi - else - echo "Couldn't find hostname in DNS, must be safe to use" - status=0 - fi - exit $status - ;; - - esac - exit 0 - ;; - - * ) - if [ -f /tmp/.install_state ] - then - state=`cat /tmp/.install_state` - else - state=" " - fi - if [ x"${state}" = "xConfiguring system" ] - then - progress "" - else - - if [ -f /tmp/.startsize.io ] - then - . /tmp/.startsize.io - #finding the drive - ddrive=`df | grep $mountpoint | head -n1 | awk -F/ ' { print $3 } ' | cut -d" " -f 1|cut -b1,2,3 ` - used=`statgrab -M disk.|grep ${ddrive}.write_bytes|cut -d= -f 2|tr -d " "` - used=`echo $used-$STARTSIZE|bc` - #echo $used - fi - - if [ ! x$used = x ] - then - . /root/.install_size - #somehow find if it's an install or update - if [ -f /tmp/.this_is_upgrade ] - then - total=$UPGRADESIZE - else - total=$TOTALSIZE - fi - percent=`echo "scale=2 ; ($used/$total) * 100 " |bc ` - cond2=$(echo "$percent > 98" |bc ) - if [ $cond2 -eq 1 ] - then - percent=98 - fi - if [ x"${state}" = "xDone" ] - then - percent=100 - fi - cond3=$(echo "$percent < 3" |bc ) - if [ $cond3 -eq 0 ] - then - progress $percent - fi - fi - fi - ;; -esac - - - diff --git a/abs/core-testing/LinHES-config/issue b/abs/core-testing/LinHES-config/issue deleted file mode 100644 index 00d4abd..0000000 --- a/abs/core-testing/LinHES-config/issue +++ /dev/null @@ -1,2 +0,0 @@ -LinHes - diff --git a/abs/core-testing/LinHES-config/live-install.sh b/abs/core-testing/LinHES-config/live-install.sh deleted file mode 100755 index 573bb1f..0000000 --- a/abs/core-testing/LinHES-config/live-install.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -#redirect stderr to stdout, then rediret stdout to file -. /etc/profile -exec 2>&1 -exec > /tmp/mythvantage_install.log -. /etc/X11/STBWINDOWMANAGER -/usr/bin/nvidia-settings -a InitialPixmapPlacement=2 -keylaunch & -/usr/bin/tilda & -/usr/X11R6/bin/unclutter -root -idle 0 -jitter 400 -noevents & -export MALLOC_CHECK_=0 -if [ -f /opt/vmware/bin32/vmware-user-wrapper ] -then - /opt/vmware/bin32/vmware-user-wrapper & -fi -xhost + -CMDLINE=$(cat /proc/cmdline) -echo $CMDLINE |grep -q nfsroot -NFSROOT=$? -if [ x$NFSROOT = x1 ] -then - - unbuffer MythVantage & -else - NETBOOT=YES MythVantage & -fi - -exec $STBWINDOWMANAGER diff --git a/abs/core-testing/LinHES-config/mv_advanced.py b/abs/core-testing/LinHES-config/mv_advanced.py deleted file mode 100755 index bc0d19e..0000000 --- a/abs/core-testing/LinHES-config/mv_advanced.py +++ /dev/null @@ -1,390 +0,0 @@ -# -*- coding: utf-8 -*- -import logging, os, re -import mv_common - -def setup_pacman(create_link): - if create_link: - logging.info(" Creating pacman link") - #LOOK - #This is not implmented yet, below is the bash code for reference - #if [ ! x$1 = x ] - #then - #ln -s ${BASE}/data/var ${BASE}/data/srv/httpd/htdocs/repo - #echo "creating the link for the pacman repo mirror" - #fi - - #for i in mv-core mv-core-testing mv-extra mv-extra-testing - #do - #echo "[$i]" > ${BASE}/etc/pacman.d/$i - ##add mirror if needed - #if [ x$PKG_MIRROR = x1 ] - #then - #echo " Server = http://$dbhost/repo/$i " >> ${BASE}/etc/pacman.d/$i - #fi - ##add user templates - #USERTEMPLATES="/data/home/mythtv/templates" - #if [ -f $USERTEMPLATES/sources/$i ] - #then - #echo "Adding user $i" - #cat $USERTEMPLATES/sources/$i >> ${BASE}/etc/pacman.d/$i - #fi - #cat $TEMPLATES/sources/$i >> ${BASE}/etc/pacman.d/$i - #echo "setting local mirror to $dbhost for $i " - #done - else: - logging.info(" Pacman link will not be created") - return - -def setup_ncid_client(dbhost,templatefile): - #This always runs - logging.debug(" Configuring ncid client with server %s",dbhost) - cmd = '''sed -e "s/^set Host.*$/set Host %s /" %s >/etc/ncid/ncid.conf''' %(dbhost, templatefile) - return - -def setup_ncid_daemon(port,templatefile,Runncidd): - logging.info(" Configuring callerid daemon") - if Runncidd == "1": - logging.debug(" Port: %s",port) - mv_common.cp_and_log("/etc/ncid/ncidd.conf",templatefile) - cmd = '''sed -e "s/.*set ttyport.*$/set ttyport = \/dev\/%s /" %s >/etc/ncid/ncidd.conf''' %(port,templatefile) - mv_common.runcmd(cmd) - mv_common.pacinstall("ncidd") - mv_common.add_service("ncidd") - else: - logging.debug(" Callerid will not run") - mv_common.pacremove("ncidd") - mv_common.remove_service("ncidd") - return - -def setup_splash(Usebootsplash): - if Usebootsplash == "1": - logging.info(" Enabling splash") - cmd = ''' sed -i "s/^default.*0/default 1/g" /boot/grub/menu.lst''' - mv_common.runcmd(cmd) - else: - logging.info(" Disabling splash") - cmd = ''' sed -i "s/^default.*1/default 0/g" /boot/grub/menu.lst''' - mv_common.runcmd(cmd) - return -def setup_rrd(UseRRD): - if UseRRD == "1": - logging.info(" Enabling rrd_stats") - mv_common.pacinstall("rrd_stats") - else: - logging.info(" Disabling rrd_stats") - mv_common.pacremove("rrd_stats") - - -def setup_hobbit(UseHobbit,SystemType,dbhost): - if UseHobbit == "1": - if SystemType == "Standalone" or SystemType == "Master_backend": - logging.info(" Installing hobbit server") - mv_common.pacinstall("hobbitserver") - mv_common.add_service("hobbit") - else: - logging.info(" Installing hobbit client") - mv_common.pacinstall("hobbit-client") - setup_hobbit_client(dbhost) - mv_common.add_service("hobbit-client") - - else: - logging.info(" Removing Hobbit") - mv_common.pacremove("hobbit") - mv_common.pacremove("hobbit-client") - mv_common.remove_service("hobbit-client") - mv_common.remove_service("hobbitserver") - cmd = "rm -f /data/srv/httpd/htdocs/hobbit/index.html" - mv_common.runcmd(cmd) - return - -def setup_hobbit_client(dbhost): - logging.info(" Configuring hobbit client") - logging.debug(" hobbit server is %s:", dbhost) - cmd='''sed -i "s/^BBDISP.*$/BBDISP=%s/g" /data/srv/hobbit/client/etc/hobbitclient.cfg ''' %dbhost - mv_common.runcmd(cmd) - return - -def setup_evrouter(UseEvrouter,EvrouterConfig,template): - if UseEvrouter == "1": - logging.info(" Configuring everouter") - logging.debug(" EvrouterConfig is %s:",EvrouterConfig) - if EvrouterConfig == "tinker": - logging.debug(" tinker mode, not changing the config") - return - mv_common.pacinstall("evrouter") - mv_common.pacinstall("Xvfb") - mv_common.cp_and_log(template+"/evrouter/"+EvrouterConfig,"/etc/evrouter.cfg") - mv_common.add_service("evrouter") - mv_common.add_service("Xvfb") - else: - logging.info(" Not using evrouter") - mv_common.pacremove("evrouter") - mv_common.remove_service("evrouter") - mv_common.remove_service("Xvfb") - - return - -def setup_DNSmasq(RunDHCP,ip,gw,nameserver): - if RunDHCP == "1": - logging.info(" Configuring dhcp server(dnsmasq)") - logging.debug(" ip: %s", ip) - logging.debug(" gw: %s", gw) - logging.debug(" ns: %s", nameserver) - mv_common.pacinstall("dnsmasq") - mv_common.pacinstall("mvpmc") - mv_common.add_service("dnsmasq") - logging.debug(" Setting default route to my gw: %s",gw) - try: - f = open("/etc/dnsmasq.conf",'r') - dnsconf = f.readlines() - f.close() - except: - logging.info(" Couldn't open dnsmasq.conf") - return - for line in dnsconf: - outline = line - if re.match("^dhcp-option=3",line): - logging.debug(" Setting default route to my gw: %s",gw) - outline = "dhcp-option=3,%s\n" %gw - if re.match("^dhcp-option=6",line): - logging.debug(" Setting dns to my ip: %s",ip) - outline = "dhcp-option=6,%s\n" %ip - f.write(outline) - f.close() - - logging.debug(" change nfsroot to my ip:%s",ip) - cmd = '''sed -i "s/nfsroot=.*:/nfsroot=%s:/g" /data/srv/tftp/pxelinux.cfg/default''' %ip - mv_common.runcmd(cmd) - - logging.debug(" Adding 127.0.0.1 to resolv.conf") - logging.debug(" other nameserver is %s",nameserver) - try: - f = open("/etc/resolv.conf",'r') - dns = f.readlines() - f.close() - except: - dns='' - logging.debug(" Couldn't open resolv.conf for reading") - try: - f = open("/etc/resolv.conf",'w') - line="search lan\n" - f.write(line) - line="nameserver 127.0.0.1\n" - f.write(line) - line="nameserver %s\n" %nameserver - f.write(line) - for line in dns: - f.write(line) - f.close() - except: - logging.debug(" Couldn't open resolv.conf for writing") - - logging.debug(" setup dongle.config") - cmd = ''' sed -i "s/mvpmc -f .*/mvpmc -f \/etc\/helvR10.fon -s %s \& /" /data/srv/tftp/dongle.bin.config ''' %ip - #COMMAND="%s/mvpmc -f .*/mvpmc -f \/etc\/helvR10.fon -s ${ip} \& /" - #ex ${BASE}/data/srv/tftp/dongle.bin.config </etc/exports''' %templatefile - mv_common.add_service("nfsd") - mv_common.add_service("nfs-utils") - mv_common.add_service("portmap") - else: - logging.info(" Removing NFS server") - mv_common.remove_service("nfsd") - return - -def setup_dyndns(DDnsEnable): - if DDnsEnable == "1": - logging.info(" Installing Dynamic DNS client") - mv_common.pacinstall("inadyn") - mv_common.add_service("inadyn") - else: - logging.info(" Removing Dynamic DNS client") - mv_common.pacremove("inadyn") - mv_common.remove_service("inadyn") - - -def setup_advanced(systemconfig,data_config): - if mv_common.read_config(mv_common.module_config,"advanced") == False : - logging.info("____Skipping of Advanced, config disabled____") - return - logging.info("____Start of advanced configuration____") - create_link = False - if systemconfig["SystemType"] == "Master_backend": - create_link = True - setup_pacman(create_link) - setup_ncid_client(systemconfig["dbhost"], - systemconfig["TEMPLATES"]+"/ncid.conf.template") - - setup_ncid_daemon(systemconfig["nciddSerialPort"], - systemconfig["TEMPLATES"]+"/ncidd.conf.template", - systemconfig["Runncidd"]) - - setup_splash(systemconfig["Usebootsplash"]) - if data_config.SYSTEMTYPE == "MythVantage": - setup_hobbit(systemconfig["UseHobbit"], - systemconfig["SystemType"], - systemconfig["dbhost"]) - if data_config.SYSTEMTYPE == "LinHES": - setup_rrd(systemconfig["UseRRD"]) - - setup_evrouter(systemconfig["UseEvrouter"], - systemconfig["EvrouterConfig"], - systemconfig["TEMPLATES"]) - - setup_DNSmasq(systemconfig["RunDHCP"], - systemconfig["mythip"], - systemconfig["mythgw"], - systemconfig["mythdns"]) - - setup_mythweb(systemconfig["UseMythWEB"]) - setup_samba(systemconfig,data_config) - setup_NFSshares(systemconfig["UseNFS"], - systemconfig["TEMPLATES"]+"/exports.template") - - setup_dyndns(systemconfig["DDnsEnable"]) - logging.info("__End of advanced configuration\n") diff --git a/abs/core-testing/LinHES-config/mv_common.py b/abs/core-testing/LinHES-config/mv_common.py deleted file mode 100755 index 0272809..0000000 --- a/abs/core-testing/LinHES-config/mv_common.py +++ /dev/null @@ -1,232 +0,0 @@ -# -*- coding: utf-8 -*- -import logging, os, time -import commands -import ConfigParser -config_file = "mv_config" -data_config = __import__(config_file, globals(), locals(), []) - -module_config = ConfigParser.RawConfigParser() -try: - module_config.read('/etc/mythvantage.cfg') -except: - logging.info("couldn't read mythvantage.cfg") - - -def read_config(module_config,data): - rvalue = True - section = "mythvantage" - try: - rvalue = module_config.get(section, data) - if rvalue == "False": - rvalue = False - if rvalue == "no": - rvalue = False - - - except: - logging.debug("Couldn't read mythvantage.cfg") - rvalue = True - - return rvalue - -def runcmd(cmd): - if data_config.NOOPDEBUG=="FALSE": - pass - else: - cmd = "echo "+cmd - logging.debug(" %s",cmd) - cmdout = commands.getstatusoutput(cmd) - logging.debug(" %s",cmdout) - return cmdout[0] - -def runcmd_output(cmd): - if data_config.NOOPDEBUG=="FALSE": - pass - else: - cmd = "echo "+cmd - logging.debug(" %s",cmd) - cmdout = commands.getstatusoutput(cmd) - logging.debug(" %s",cmdout) - return cmdout[1] - -def services(systemconfig): - logging.debug("______Start of services______") - logging.debug("__End services") - -def cp_and_log(srcfile,destfile): - #return - if not os.path.exists(srcfile): - logging.info("%s is not present, skipping...",srcfile) - else: - cmd = ("rsync -arhp %s %s") %(srcfile,destfile) - runcmd(cmd) - - -def add_service(daemon): - logging.info(" Adding service %s",daemon) - cmd = "add_service.sh %s" %daemon - runcmd(cmd) - -def remove_service(daemon): - logging.info(" Removing service %s",daemon) - stop_service(daemon) - cmd = "remove_service.sh %s" %daemon - runcmd(cmd) - -def start_service(daemon): - logging.info(" start service %s",daemon) - cmd = "sv start %s" %daemon - runcmd(cmd) - -def stop_service(daemon): - logging.info(" stop service %s",daemon) - cmd = "sv stop %s" %daemon - runcmd(cmd) - -def restart_service(daemon): - logging.info(" Restarting service %s",daemon) - if daemon == "lcdd": - stop_service(daemon) - logging.debug(" killing all lcdd") - cmd = "killall -9 LCDd" - runcmd(cmd) - time.sleep(2) - start_service(daemon) - else: - cmd = "sv restart %s" %daemon - runcmd(cmd) - -def hup_service(daemon): - logging.info(" hup service %s",daemon) - cmd = "sv hup %s" %daemon - runcmd(cmd) - - - -def pkg_blacklist_check(pkg): - cmd = '''grep -q %s /etc/blacklist.package''' %pkg - rc = runcmd(cmd) - if rc == 0: - return True - else: - return False - -def pkg_installed_check(pkg): - logging.debug(" Checking if %sis installed",pkg) - cmd = "pacman -Q %s " %pkg - rc = runcmd(cmd) - if rc == 0: - return True - else: - return False - - -def pacinstall(pkg): - logging.info(" Checking %s for install",pkg) - #extra pkg check - if pkg == "xine": - pacinstall("xine-ui") - elif pkg == "dvdcss": - pacinstall("libdvdcss") - elif pkg == "webmin": - add_service("webmin") - elif pkg == "fuppes": - pacinstall("fuppes-svn") - elif pkg == "mupen64": - pacinstall("mupen64plus-svn") - - if not pkg_blacklist_check(pkg): - if pkg_installed_check(pkg): - logging.info(" %s is already installed, will not install",pkg) - else: - logging.info(" Installing %s",pkg) - cmd ='''pacman --noconfirm -Sf %s ''' %pkg - runcmd(cmd) - else: - logging.info(" %s is blacklisted, will not install",pkg) - -def pacremove(pkg): - logging.info(" Checking %s for removal",pkg) - if pkg == "xine": - pacremove("xine-ui") - elif pkg == "dvdcss": - pacremove("libdvdcss") - elif pkg == "webmin": - remove_service("webmin") - elif pkg == "fuppes": - pacremove("fuppes-svn") - elif pkg == "mupen64": - pacremove("mupen64plus-svn") - - if not pkg_blacklist_check(pkg): - if not pkg_installed_check(pkg): - logging.info(" %s is not installed, will not remove",pkg) - else: - logging.info(" Removing %s",pkg) - cmd ='''pacman --noconfirm -R %s ''' %pkg - runcmd(cmd) - else: - logging.info(" %s is blacklisted, will not remove",pkg) - -def getpid(process): - return commands.getoutput('pidof %s' % process) - -def remove_file(filename): - logging.debug(" Removing %s", filename) - try: - os.remove(filename) - except: - logging.debug("* Could not remove %s", filename) - - -def restartLCD(RESTART_LCD): - if RESTART_LCD : - logging.info(" Restarting lcd server") - cmd = "killall -9 mythlcdserver" - runcmd(cmd) - else: - logging.debug(" Not restarting MYTHLCD server") - - -def reloadfe(dbhost,RESTART_LCD): - logging.debug("____Start of reloadfe____") - if data_config.SYSTEMTYPE == "MythVantage": - logging.info(" Clearing Backend cache") - cmd = '''/usr/bin/backend_control.sh clearcache behost %s''' %dbhost - runcmd(cmd) - - restartLCD(RESTART_LCD) - for pid in getpid("mythfrontend"): - cmd = ''' kill -s USR1 %s ''' %pid - #runcmd(cmd) - logging.info(" Reloading frontend with pid of %s",pid) - - logging.debug("__End of reloadfe\n") - - -def restartfe(RESTART_LCD): - logging.debug("____Start of restartfe____") - if data_config.SYSTEMTYPE=="LinHES": - logging.debug(" LinHES seems to be running will not restartfe") - return - logging.info(" Restarting frontend") - restartLCD(RESTART_LCD) - cmd="killall -9 mythfrontend" - runcmd(cmd) - cmd="killall -9 welcome" - runcmd(cmd) - logging.debug("__End of restartfe\n") - - -def udev_trigger(): - logging.info(" Triggering udev") - cmd = "udevadm settle" - runcmd(cmd) - cmd = "udevadm trigger" - runcmd(cmd) - cmd = "udevadm settle" - runcmd(cmd) - cmd = "udevadm trigger" - runcmd(cmd) - - diff --git a/abs/core-testing/LinHES-config/mv_config.py b/abs/core-testing/LinHES-config/mv_config.py deleted file mode 100755 index 1ac4fea..0000000 --- a/abs/core-testing/LinHES-config/mv_config.py +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- -SYSTEMTYPE="LinHES" -MVHOSTNAME="larch5" -MOUNTPOINT="/new_boot" -DATAMOUNT="/myth" -MYTHHOME="/home/mythtv" -SQUASHFILE="/tmp/.squashlist" -SQUASHLIST=("bin","boot","etc","home","lib","opt","root","sbin","usr","var","data") -NOOPDEBUG="FALSE" -BACKUPFILE="mythconverg.sql.gz" -BACKUPPATH="/myth/backup/" -TEMP_TEMPLATES="/tmp/templates" -SMEDIA="myth" - - - - diff --git a/abs/core-testing/LinHES-config/mv_ddns.py b/abs/core-testing/LinHES-config/mv_ddns.py deleted file mode 100755 index 9695f76..0000000 --- a/abs/core-testing/LinHES-config/mv_ddns.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -import logging, mv_common -import os, re - -config_file = "mv_config" - -def setup_ddns(systemconfig): - if mv_common.read_config(mv_common.module_config,"ddns") == False : - logging.info("____Skipping of DDNS, config disabled____") - return - logging.info("____Start of setup_ddns____") - - if systemconfig["DDnsEnable"] == "1": - logging.debug(" Enabling DDNS") - mv_common.pacinstall("ddclient") - mv_common.cp_and_log("/etc/ddclient/ddclient.conf.dynamic.dyndns.sample", - "/etc/ddclient/ddclient.conf") - cmd = ''' sed -i -e "s/your-dynamic-dyndns-login/%s/g" /etc/ddclient/ddclient.conf''' %(systemconfig["DDnslogin"]) - mv_common.runcmd(cmd) - cmd = ''' sed -i -e "s/your-dynamic-dyndns-password/%s/g" /etc/ddclient/ddclient.conf''' %(systemconfig["DDnspassword"]) - mv_common.runcmd(cmd) - cmd = ''' sed -i -e "s/your-dynamic-dyndns-host/%s/g" /etc/ddclient/ddclient.conf''' %(systemconfig["DDnshostname"]) - mv_common.runcmd(cmd) - mv_common.add_service("ddclient") - else: - logging.debug(" Disabling DDNS") - mv_common.remove_service("ddclient") - - logging.info("__End of ddns\n") diff --git a/abs/core-testing/LinHES-config/mv_hostype.py b/abs/core-testing/LinHES-config/mv_hostype.py deleted file mode 100755 index 4eade73..0000000 --- a/abs/core-testing/LinHES-config/mv_hostype.py +++ /dev/null @@ -1,233 +0,0 @@ -# -*- coding: utf-8 -*- -import logging, mv_common -import os - -config_file = "mv_config" -data_config = __import__(config_file, globals(), locals(), []) - -def setup_ntp(usepool,ntpserver): - if usepool: - logging.info("Setting ntp server to %s",ntpserver) - print '''sed -i "s/pool.ntp.org/$dbhost/g" ${BASE}/etc/ntp.conf''' - else: - logging.info("Not changing ntp configuration") - -def setup_avahi(templates): - file="/etc/avahi/services/mysql.service" - if not os.path.exists(file): - logging.debug(" copying in mysql.service for avahi") - try: - os.makedirs("/etc/avahi/services") - except: - logging.debug(" Couldn't create /etc/avahi/services") - mv_common.cp_and_log(templates+"/mysql.service",file) - cmd="sudo sv restart avahi" - mv_common.runcmd(cmd) - -def remove_avahi_service(): - file="/etc/avahi/services/mysql.service" - if os.path.exists(file): - logging.debug(" Removing avahi mysql.service file") - cmd="rm -rf %s" %file - mv_common.runcmd(cmd) - cmd="sudo sv restart avahi" - mv_common.runcmd(cmd) - -def setup_db(): - logging.debug(" Setting up the database") - -def setup_mysqlnetwork(EnableNetwork): - logging.debug(" Setting up mysql network") - mysqlconf = "/etc/my.cnf" - cmd = '''grep "#skip-networking" %s ''' %mysqlconf - status = mv_common.runcmd(cmd) - - if EnableNetwork : - logging.debug(" Enabling mysql networking") - if status == 0 : - logging.debug(" Network is already enabled for mysql") - else: - cmd = '''sed -ie "s/^skip-networking/#skip-networking/g" %s ''' %mysqlconf - mv_common.runcmd(cmd) - mv_common.restart_service("mysqld") - else: - logging.debug(" Disabling mysql networking") - if status == 1 : - logging.debug(" Network is already disabled for mysql") - else: - cmd = '''sed -ie "s/#skip-networking/skip-networking/g" %s ''' %mysqlconf - mv_common.runcmd(cmd) - mv_common.restart_service("mysqld") - -def setup_mysql_connection(systemconfig): - logging.info(" Configuring database connection") - mythip = systemconfig["mythip"] - systemtype = systemconfig["SystemType"] - mv_root = systemconfig["MVROOT"] - mysqltxt = "/usr/share/mythtv/mysql.txt" - templates = systemconfig["TEMPLATES"] - mysqltemplate = templates + "/mysql.txt" - dbhost = systemconfig["dbhost"] - - if systemtype == "Master_backend": - logging.debug(" Setting dbhost to %s in systemconfig", mythip) - dbhost = mythip - cmd = '''sed -ei "s/^dbhost=.*$/dbhost=\"%s\"/" /etc/systemconfig ''' %dbhost - mv_common.runcmd(cmd) - logging.debug(" Changing dbhost in settings table for master_backend") - cmd = '''%s/bin/restore_default_settings.sh -c BECONFIG -s master -a %s ''' %(mv_root, dbhost) - mv_common.runcmd(cmd) - - if systemtype == "Slave_backend": - slavehost = mythip - logging.debug(" Changing slave in settings: %s", slavehost) - cmd = '''%s/bin/restore_default_settings.sh -c BECONFIG -s slave -a %s ''' %(mv_root, slavehost) - mv_common.runcmd(cmd) - - if systemtype == "Master_backend": - logging.debug(" changing mysql.txt file to use localhost") - cmd = '''sed -e "s/^DBHostName=.*$/DBHostName="localhost"/" %s > %s ''' %(mysqltemplate, mysqltxt) - mv_common.runcmd(cmd) - else: - logging.debug(" changing mysql.txt file to use %s", dbhost) - cmd = '''sed -e "s/^DBHostName=.*$/DBHostName=%s/" %s > %s ''' %(dbhost, mysqltemplate, mysqltxt) - mv_common.runcmd(cmd) - - delfile = data_config.MYTHHOME + "/.mythtv/mysql.txt" - mv_common.remove_file(delfile) - delfile = mv_root + "/bin/mythtv/.mythtv/mysql.txt" - mv_common.remove_file(delfile) - filecheck = data_config.MYTHHOME + "/templates/mysql.txt" - if os.path.exists(filecheck): - logging.info(" Scrapping all the previous work and using %s for mysql.txt", filecheck) - mv_common.cp_and_log(filecheck, mysqltxt) - - - -def setup_func_key(): - if data_config.SYSTEMTYPE == "MythVantage": - logging.debug(" Grabbing the key for Func") - cmd="/usr/MythVantage/bin/grabkey.py" - mv_common.runcmd(cmd) - -def setup_func_minion(dbhost): - logging.info(" Setting up the func minion:") - logging.debug(" certmaster is %s:",dbhost) - #cmd='''sed -i "s/^certmaster.*$/certmaster = %s/" /etc/func/minion.conf ''' %dbhost - #mv_common.runcmd(cmd) - cmd='''sed -i "s/^certmaster.*$/certmaster = %s/" /etc/certmaster/minion.conf ''' %dbhost - mv_common.runcmd(cmd) - -def setup_syslog(dbhost): - logging.debug(" Setting syslog to log to %s",dbhost) - cmd ='''sed -i "s/^destination d_remote.*$/destination d_remote \{tcp\(\"%s\" port\(514\)\) \;\} \;/" /etc/syslog-ng.conf''' %dbhost - return - -def hostypeprint(systemconfig): - if mv_common.read_config(mv_common.module_config,"hostype") == False : - logging.info("____Skipping of hostype, config disabled____") - return - logging.info("______Start of hostype config_____") - mv_common.services(systemconfig) - install_list='' - remove_list='' - daemon_list='' - daemon_remove_list='' - run_mysqlnetwork = False - - if systemconfig["SystemType"] == "Standalone": - logging.info("Stand alone system being configured") - setup_ntp(False,"null") - remove_avahi_service() - EnableNetwork = False - run_mysqlnetwork = True - if systemconfig["hostypec"]: - setup_db() - install_list=["mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"] - daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"] - if data_config.SYSTEMTYPE == "MythVantage": - install_list.append('ghosd') - - elif systemconfig["SystemType"] == "Master_backend": - logging.info("Master backend system being configured") - setup_ntp(False,"null") - setup_avahi(systemconfig["TEMPLATES"]) - install_list=["mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"] - daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"] - EnableNetwork = True - run_mysqlnetwork = True - if data_config.SYSTEMTYPE == "MythVantage": - install_list.append('func') - daemon_list.append('func') - install_list.append('certmaster') - daemon_list.append('certmaster') - install_list.append('ghosd') - - elif systemconfig["SystemType"] == "Slave_backend": - logging.info("Slave backend system being configured") - setup_ntp(True,systemconfig["dbhost"]) - remove_avahi_service() - if systemconfig["hostypec"]: - setup_db() - install_list = ["portmap", "nfs-utils", "local-website", "avahi", "libmysqlclient" ] - daemon_list = ["mythbackend", "portmap", "nfs-utils", "netfs", "lighttpd", "avahi" ] - daemon_remove_list=('mysql') - if data_config.SYSTEMTYPE == "MythVantage": - install_list.remove("local-website") - daemon_list.remove("lighttpd") - install_list.append('func') - daemon_list.append('funcd') - remove_list.append("lighttpd") - install_list.append('ghosd') - - - elif systemconfig["SystemType"] == "Frontend_only": - logging.info("Frontend only system being configured") - setup_ntp(True,systemconfig["dbhost"]) - remove_avahi_service() - install_list=["mysql-clients", "libmysqlclient", "avahi", "portmap", "nfs-utils", "local-website"] - remove_list=["mysql"] - daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"] - daemon_remove_list=("mysql", "mythbackend") - if data_config.SYSTEMTYPE == "MythVantage": - install_list.remove("local-website") - daemon_list.remove("lighttpd") - install_list.append('func') - daemon_list.append('funcd') - remove_list.append("lighttpd") - install_list.append('ghosd') - - - for pkg in install_list: - mv_common.pacinstall(pkg) - for pkg in remove_list: - mv_common.pacinstall(pkg) - for daemon in daemon_list: - mv_common.add_service(daemon) - for daemon in daemon_remove_list: - mv_common.remove_service(daemon) - if systemconfig["RunFrontend"] == "1": - logging.debug(" Will run the frontend") - mv_common.add_service("frontend") - mv_common.add_service("hal") - if data_config.SYSTEMTYPE == "MythVantage": - mv_common.add_service("ghosd") - else: - logging.debug(" Will NOT run the frontend") - mv_common.remove_service("frontend") - mv_common.add_service("hal") - if data_config.SYSTEMTYPE == "MythVantage": - mv_common.remove_service("ghosd") - - - if run_mysqlnetwork: - setup_mysqlnetwork(EnableNetwork) - else: - logging.debug(" Not running setup_mysql_connection") - - setup_mysql_connection(systemconfig) - if data_config.SYSTEMTYPE == "MythVantage": - setup_func_minion(systemconfig["dbhost"]) - setup_func_key() - setup_syslog(systemconfig["dbhost"]) - logging.info("__End of hostype config\n") diff --git a/abs/core-testing/LinHES-config/mv_install.py b/abs/core-testing/LinHES-config/mv_install.py deleted file mode 100755 index 908851b..0000000 --- a/abs/core-testing/LinHES-config/mv_install.py +++ /dev/null @@ -1,1432 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -import sys, os, commands, glob, time -import getopt, re, MySQLdb -import logging -try: - import parted -except: - print "module parted not found" - -def usage(): - print "help text:" - print "example usage: --rootdisk=sda --rootfs=ext4 --rootsize=34240 --datafs=ext4 --datasize=3400 --datadisk=sda --swapsize=340 -c full_install" - -def clean_upgrade(): - return False - -def error_out(errmsg): - cmd = '''echo %s >> /tmp/.install_error ''' %errmsg - runcmd(cmd) - logging.critical("***********************************") - logging.critical("error: %s",errmsg) - print "***********************************" - print "ERROR: mv_install.py: %s" %errmsg - print "***********************************" - sys.exit(1) - - -def update_db(value, data): - db = MySQLdb.connect(host="localhost", user="mythtv", passwd="mythtv", db="mythconverg") - try: - cursor = db.cursor() - cursor.execute("DELETE FROM settings where value=%s and hostname=%s;", (value, data_config.MVHOSTNAME)) - cursor.execute("REPLACE INTO settings set value=%s, data=%s, hostname=%s;", (value, data, data_config.MVHOSTNAME)) - logging.debug("Updated database with %s, %s", data, value) - except MySQLdb.Error, e: - logging.debug("Unable to update database with %s, %s", data, value) - - -def progress(pgnum): - progressline = str(pgnum) + "% complete" - logging.debug("Progress: %s", pgnum) - f = open('/tmp/.install_percent', 'w') - f.write(progressline) - f.close() - -def update_status(status): - logging.debug("Status: %s", status) - f = open('/tmp/.install_state', 'w') - f.write(str(status)) - f.close() - -def kill_dhcp_chroot(): - logging.debug("Killing off chroot dhcpcd") - stddir = os.getcwd() - piddir = ("%s/var/run/") %data_config.MOUNTPOINT - try: - os.chdir(piddir) - for FILE in glob.glob("dhcpcd-*.pid"): - f = open(FILE, 'r') - pid = f.readline() - f.close() - cmd = "kill -9 %s" %pid - runcmd(cmd) - os.remove(FILE) - os.chdir(stddir) - except: - pass - -def statgrab(disk): - cmd = "statgrab -M disk. |grep %s.write_bytes" % hostoptions["rootdisk"] - out = commands.getoutput(cmd) - try: - prewritebytes = out.split("=")[1].strip() - except: - prewritebytes = "1024" - outline = "STARTSIZE=%s" %prewritebytes - f = open('/tmp/.startsize.io', 'w') - f.write(str(outline)) - f.close() - -def backup_sql_check(): - logging.debug("Searching for backup file") - try: - hostoptions["backupfile"] - except: - logging.debug("Backup file var is empty") - return False - if os.path.exists(data_config.MOUNTPOINT+hostoptions["backupfile"]): - logging.debug("Backup file %s is present", data_config.MOUNTPOINT+hostoptions["backupfile"]) - return True - else: - logging.debug("Backup file %s is NOT present", data_config.MOUNTPOINT+hostoptions["backupfile"]) - return False - -def mdadm_find(PREFIX): - logging.debug("Searching for mdadm.conf") - if os.path.exists(PREFIX+"/etc/KnoppMyth-version"): - mdadmconf = "/etc/mdadm/mdadm.conf" - else: - mdadmconf = "/etc/mdadm.conf" - logging.debug("Using %s for mdadm.conf", mdadmconf) - return mdadmconf - -def mdadm_assemble_all(): - # read mdadm.conf and start the arrays - #ARRAY /dev/md5 uuid=19464854:03f71b1b:e0df2edd:246cc977 - logging.debug("Starting mdadm support") - mdadmconf_file = mdadm_find("/tmp") - cmd = "cdadm --assemble --scan -c /tmp/%s" %mdadmconf_file - runcmd(cmd) - mdadm_contents = '' - try: - f = open(mdadmconf_file, 'r') - mdadm_contents = f.readlines() - f.close() - except: - logging.debug(" Couldn't open mdadmconf file") - for line in mdadm_contents: - if line.startswith("ARRAY"): - logging.debug(" Found MD array: %s", line) - array = line.split()[1] - logging.info(" assembling array: %s", array) - cmd = "mdadm --assemble -c /tmp%s %s" %(mdadmconf_file, array) - runcmd(cmd) - time.sleep(2) - cmd = "fsck -p %s" %array - runcmd - -def copy_updates(): - try: - MVROOT = os.environ["MV_ROOT"] - except: - logging.debug("MVROOT was not defined, using the default value") - MVROOT = "/usr/MythVantage" - cp_and_log2(MVROOT+"/bin/", data_config.MOUNTPOINT+MVROOT+"/bin", "*.sh") - cp_and_log2(MVROOT+"/bin/", data_config.MOUNTPOINT+MVROOT+"/bin", "*.py") - -def timezone_to_db(timefile): - logging.info("importing timezone") - try: - f = open(timefile) - timezonecontents = f.readline().strip() - f.close() - except: - logging.debug("Couldn't open /tmp/etc/timezone, will not set the timezone") - return - update_db("HostTimeZone", timezonecontents); - tzsplit = timezonecontents.partition('/') - print tzsplit - if tzsplit[2] == '' : - update_db("HostTimeZoneRegion", tzsplit[0]) - else: - update_db("HostTimeZoneRegion", tzsplit[0]) - tztemp="HostTimeZoneRegion_%s" % tzsplit[0] - update_db(tztemp, tzsplit[2]) - - - -def cp_and_log(srcfile, destfile): - #return - if not os.path.exists(srcfile): - logging.info("%s is not present, skipping...", srcfile) - else: - cmd = ("rsync -arvp %s %s") %(srcfile, destfile) - runcmd(cmd) - -def cp_and_log2(srcfile, destfile, fileglob): - #return - logging.debug("cp_and_log2") - logging.debug("%s, %s, %s", srcfile, destfile, fileglob) - - if not os.path.exists(srcfile): - logging.info("%s is not present, skipping...", srcfile) - else: - if fileglob == '': - cmd = ("rsync -arvp %s %s") %(srcfile, destfile) - runcmd(cmd) - else: - fileglob = "*" - cmd = ("rsync -arvp %s/%s %s") %(srcfile, fileglob, destfile) - runcmd(cmd) - -def runcmd(cmd): - if data_config.NOOPDEBUG == "FALSE": - pass - else: - cmd = "echo "+cmd - logging.debug(" %s", cmd) - cmdout = commands.getstatusoutput(cmd) - logging.debug(" %s", cmdout) - return cmdout - -def mysqldb(cmd, inchroot): - if cmd == "start": - mycmd = " /etc/rc.d/mysqld start" - elif cmd == "stop": - mycmd = " /etc/rc.d/mysqld stop" - if inchroot == "chroot": - mycmd = " chroot /newboot %s" %mycmd - runcmd(mycmd) - - -def mount_bind_chroot(): - logging.debug("Mounting dev/proc/sysfs for chroot") - cmd = " mount --bind /dev %s" %data_config.MOUNTPOINT+"/dev" - runcmd(cmd) - cmd = " mount --bind /dev/pts %s" %data_config.MOUNTPOINT+"/dev/pts" - runcmd(cmd) - cmd = " mount --bind /proc %s" %data_config.MOUNTPOINT+"/proc" - runcmd(cmd) - cmd = " mount -t sysfs none %s" %data_config.MOUNTPOINT+"/sys" - runcmd(cmd) - - -def umount_bind_chroot(): - logging.debug("UnMounting dev/proc/sysfs for chroot") - cmd = " umount -l %s" %data_config.MOUNTPOINT+"/dev/pts" - runcmd(cmd) - cmd = " umount -l %s" %data_config.MOUNTPOINT+"/dev" - runcmd(cmd) - cmd = " umount -l %s" %data_config.MOUNTPOINT+"/proc" - runcmd(cmd) - cmd = " umount -l %s" %data_config.MOUNTPOINT+"/sys" - runcmd(cmd) - - -def blank_table(diskdevice): - logging.debug(" writing new parition table for %s", diskdevice) - logging.debug("parition table before:") - cmd = "fdisk -l %s" %diskdevice - runcmd(cmd) - - cmd = "echo w |fdisk %s" %diskdevice - runcmd(cmd) - - logging.debug("parition table after:") - cmd = "fdisk -l %s" %diskdevice - runcmd(cmd) - -def partitions_removeall(diskdevice, label): - logging.info("Removing all partitions for %s %s", label, diskdevice) - try: - device = parted.getDevice(diskdevice) - partdisk = parted.Disk(device) - partdisk.deleteAllPartitions() - if data_config.NOOPDEBUG == "FALSE": - partdisk.commit() - for partition in partdisk.partitions: - print "type: %s" %partition.type - except: - logging.debug(" Error reading parition table, attempting to write a blank one") - blank_table(diskdevice) - - -def create_partitions(diskdevice, size, ptype, startsector): - logging.debug("_____Create partitions______") - if size == "NO": - logging.info("Size is 0, skipping") - return "NO" - partlist = [] - newstart = 0 - totalused = 0 - device = parted.getDevice(diskdevice) - partdisk = parted.Disk(device) - for partition in partdisk.partitions: - if partition.type != parted.PARTITION_FREESPACE: - partlist.append((partition, - partition.path, - partition.getFlag(parted.PARTITION_BOOT), - partition.geometry.start, - partition.geometry.end, - partition.geometry.length, - partition.type, - partition.fileSystem)) - for slice in partlist: - (usedpartition, usedpath, usedbootable, usedstart, usedend, usedlength, usedtype, usedfs) = slice - #Start the new partition one after the end of last - newstart = usedend+1 - - if startsector == 0: - newstart = 0 - if size == "ALL": - logging.debug(" Using the rest of the disk %s", (device.length-newstart) ) - try: - geom = parted.Geometry(device=device, start=newstart, length=(device.length-newstart)) - except: - logging.info("An error occured, probably invalid parition size") - return - else: - # convert size in MB to a length on the device in sectors - length = (int(size) * (1024 * 1024)) / device.sectorSize - logging.debug("Size is %s", length) - try: - geom = parted.Geometry(device=device, start=newstart, length=length) - except: - logging.info("An error occured, probably invalid parition size") - error_out("invalid parition size") - - #collect device constraint - constraint = device.getConstraint() - # new partition - if ptype == "NORMAL": - newpart = parted.Partition(disk=partdisk, type=parted.PARTITION_NORMAL, geometry=geom) - elif ptype == "SWAP": - newpart = parted.Partition(disk=partdisk, type=parted.PARTITION_NORMAL, geometry=geom) - - #add the partition to the disk and commit changes - partdisk.addPartition(partition=newpart, constraint=constraint) - if data_config.NOOPDEBUG == "FALSE": - partdisk.commit() - logging.info("created partition %s of %dMB and added it to %s" % - (newpart.getDeviceNodeName(), newpart.getSize(), diskdevice)) - return newpart.getDeviceNodeName() - -def set_active_parition(diskdevice): - """ Set the bootable flag for this partition. """ - logging.debug(" Setting active parition") - device = parted.getDevice(diskdevice) - partdisk = parted.Disk(device) - try: - for partition in partdisk.partitions: - partition.setFlag(parted.PARTITION_BOOT) - partdisk.commit() - except: - logging.info(" Couldn't set the active partition") - logging.info(" Depending on your system this may not matter") - - -def partition_disk(): - global hostoptions - logging.info("Partitioning") - logging.debug("____start of partition_disk____") - rootdisk = hostoptions["rootdisk"] - datadisk = hostoptions["datadisk"] - label = "root" - partitions_removeall("/dev/"+rootdisk, label) - label = "data" - partitions_removeall("/dev/"+datadisk, label) - hostoptions["rootpartition"] = create_partitions("/dev/"+rootdisk, hostoptions["rootsize"], "NORMAL", 0) - set_active_parition("/dev/"+rootdisk) - hostoptions["swappartition"] = create_partitions("/dev/"+rootdisk, hostoptions["swapsize"], "SWAP", 1) - if datadisk != rootdisk: - hostoptions["datapartition"] = create_partitions("/dev/"+datadisk, hostoptions["datasize"], "NORMAL", 0) - else: - hostoptions["datapartition"] = create_partitions("/dev/"+datadisk, hostoptions["datasize"], "NORMAL", 1) - time.sleep(5) - -def fscmd(fstype): - fscmds = {"reiserfs":"mkreiserfs -q -l ROOT", "xfs": "mkfs -t xfs -f", "ext3": "mkfs.ext3", "jfs":"mkfs.jfs -q", "ext4":"mkfs.ext4", "Do_not_format":"noformat", "no_format":"noformat"} - try: - rc = fscmds[fstype] - except: - logging.critical(" %s is not a valid fs type, exiting now", fstype) - error_out("Error mvinstall during format") - return rc - - -def format_disk(install_type): - logging.info("______Starting Disk Format______") - rootfs = fscmd(hostoptions["rootfs"]) - datafs = fscmd(hostoptions["datafs"]) - - rootdisk = hostoptions["rootdisk"] - datadisk = hostoptions["datadisk"] - rootpartition = hostoptions["rootpartition"] - datapartition = hostoptions["datapartition"] - if install_type != "upgrade": - swapsize = hostoptions["swapsize"] - swappartition = hostoptions["swappartition"] - - logging.debug(" Format command for rootfs %s : %s ", rootfs, rootpartition) - if ( rootfs != "noformat"): - logging.info("Starting format of %s", rootpartition) - cmd = " %s /dev/%s" %( rootfs, rootpartition) - #os.system(cmd) - runcmd(cmd) - else: - logging.info("Will not format root partition: %s", rootpartition) - - logging.debug(" Format command for datafs %s : %s ", datafs, datapartition) - if (datafs != "noformat"): - logging.info("Starting format of %s", datapartition) - cmd = " %s /dev/%s" %( datafs, datapartition) - #os.system(cmd) - runcmd(cmd) - else: - logging.info("Will not format data partition: %s", datapartition) - - if install_type == "install": - if (hostoptions["swapsize"] != "NO"): - logging.info("Starting format for swap %s", swappartition) - cmd = " mkswap /dev/%s" % swappartition - #os.system(cmd) - runcmd(cmd) - else: - logging.debug(" Swap is set to NO, will not run mkswap") - - logging.debug("_____End of format______") - - -def mount_it(): - logging.info("______Mounting disk______") -# Create mount points - try: - mountpoint = data_config.MOUNTPOINT - mp = mountpoint - logging.info("Creating mountpoints %s", mp) - os.makedirs(mp) - except OSError: - logging.debug(" Could not create %s", mp) - -# Mount root - cmd = "mount /dev/%s %s" %(hostoptions["rootpartition"], mountpoint) - runcmd(cmd) - #logging.debug(cmd) - #cmdout=commands.getoutput(cmd) - #logging.debug(cmdout) -# Mount data -#make mountpoint after mounting / - try: - mountpoint = data_config.MOUNTPOINT - datapoint = data_config.DATAMOUNT - mp = mountpoint+datapoint - logging.info("Creating mountpoints %s", mp) - os.makedirs(mp) - except OSError: - logging.debug(" Could not create %s", mp) - - cmd = "mount /dev/%s %s" %(hostoptions["datapartition"], mp) - runcmd(cmd) - #logging.debug(cmd) - #cmdout=commands.getoutput(cmd) - #logging.debug(cmdout) - -def unmount_it(): - logging.info("______Unmounting disk______") - cmd = "umount %s" %(data_config.MOUNTPOINT+data_config.DATAMOUNT) - runcmd(cmd) - time.sleep(2) - - cmd = "swapoff /dev/%s" %(hostoptions["swappartition"]) - runcmd(cmd) - - cmd = "sync" - runcmd(cmd) - - cmd = "umount %s" %(data_config.MOUNTPOINT) - runcmd(cmd) - cmd = "sync" - runcmd(cmd) - - -def create_squashlist(): - logging.debug("Creating squashlist") - squashfile = data_config.SQUASHFILE - f = open(squashfile, 'w') - for i in data_config.SQUASHLIST: - f.write(i) - f.write("\n") - logging.debug(i) - f.close() - - -def copy_it(install_type): - logging.info("______Transferring to disk______") - logging.debug( install_type) - if ( install_type == "install"): - logging.info("Transferring system") - cmd = " unsquashfs -f -d %s /.livesys/medium/larch/system.sqf" %(data_config.MOUNTPOINT) - runcmd(cmd) - #logging.debug(cmd) - #cmdout=commands.getoutput(cmd) - - if ( install_type == "upgrade"): - logging.info("Upgrading system") - create_squashlist() - cmd = " unsquashfs -e %s -f -d %s /.livesys/medium/larch/system.sqf" %(data_config.SQUASHFILE, data_config.MOUNTPOINT) - runcmd(cmd) - #logging.debug(cmd) - #cmdout=commands.getoutput(cmd) -# Create the missing dir - i = ("sys", "proc", "dev", "tmp", "mnt", "media", "media/cdrom", "media/dvd", "var/log/mythtv") - mountpoint = data_config.MOUNTPOINT - for item in i: - try: - mp = mountpoint+"/"+item - logging.info("Creating mountpoints %s", mp) - os.makedirs(mp) - except OSError: - logging.debug(" __Could not create %s", mp) -# General fixup - cmd = "chmod 777 %s/tmp" %(data_config.MOUNTPOINT) - runcmd(cmd) - cmd = "mknod %s/dev/null c 1 5" %(data_config.MOUNTPOINT) - runcmd(cmd) - cmd = "mknod %s/dev/console c 5 1" %(data_config.MOUNTPOINT) - runcmd(cmd) - cmd = "chmod +s %s/usr/bin/Xorg" %(data_config.MOUNTPOINT) - runcmd(cmd) - cmd = "chmod +s %s/usr/bin/crontab" %(data_config.MOUNTPOINT) - runcmd(cmd) - cmd = "chmod +s %s/usr/bin/sudo" %(data_config.MOUNTPOINT) - runcmd(cmd) - cmd = "chmod +s %s/bin/mount" %(data_config.MOUNTPOINT) - runcmd(cmd) - logging.debug("__End of copy_it__") - -def create_fstab(extralines): - logging.debug("______Creating new fstab file_______") - logging.info("Creating new fstab file") - fstabfile = data_config.MOUNTPOINT+"/etc/fstab" - fstab_list = [] - f = open(fstabfile, 'w') - line = '''# \n''' - fstab_list.append(line) - line = '''none /dev/pts devpts defaults 0 0 \n''' - fstab_list.append(line) - line = '''none /dev/shm tmpfs defaults 0 0\n''' - fstab_list.append(line) - line = '''/dev/sr0 /media/cdrom auto ro,user,noauto,unhide 0 0\n''' - fstab_list.append(line) - line = '''UUID=ROOTUID / auto defaults,noatime 0 1\n''' - fstab_list.append(line) - line = '''UUID=DATAUID %s auto defaults,noatime 0 1\n''' %(data_config.DATAMOUNT) - fstab_list.append(line) - line = '''UUID=SWAPUID swap swap defaults 0 0 \n''' - fstab_list.append(line) - for vline in extralines: - fstab_list.append(vline) - for outline in fstab_list: - logging.debug(outline) - f.write(outline) - f.close() - -def find_uuid(partition): - logging.info("Finding the UUID for %s...", partition) - cmd = "blkid -s UUID /dev/%s" %partition - tmpuuid = runcmd(cmd)[1] - splituuid = tmpuuid.partition("=") - uuid = splituuid[2].replace('"', "") - logging.info("The uuid is %s", uuid) - return uuid.strip() - -def pick_out_vg(): - logging.info("Searching for Volume Groups in old fstab") - vglines = [] - f = open("/tmp/etc/fstab", 'r') - oldfscontents = f.readlines() - for line in oldfscontents: - if line.startswith("/dev/vg"): - vglines.append(line) - templine = line.split() - mdir = templine[1] - if not os.path.exists (mdir): - logging.debug("Creating dir %s for VG mount", mdir) - os.makedirs (mdir) -# Might need to os.chown to mythtv:users - else: - logging.debug("Directory %s for VG mount already present", mdir) - return vglines - -def fstab_it(install_type): - logging.info("______Checking fstab______") - kmvg = [] - fstabfile = data_config.MOUNTPOINT+"/etc/fstab" -# Check for knoppmyth install, if found create new - if install_type == "upgrade": - if os.path.exists("/tmp/etc/KnoppMyth-version"): - logging.debug(" KnoppMyth-Version found, creating new fstab") - kmvg = pick_out_vg() - create_fstab(kmvg) - elif os.path.exists("/tmp/etc/fstab"): - logging.debug(" Upgrade and not Knoppmyth, using old fstab") - cp_and_log("/tmp/etc/fstab", fstabfile) -# Catch all for creating new fstab - if not os.path.exists(data_config.MOUNTPOINT+"/etc"): - os.makedirs(data_config.MOUNTPOINT+"/etc") - if not os.path.exists(fstabfile): - create_fstab(kmvg) - - logging.info("____UUID check for %s", "swap") - swapuuid = find_uuid(hostoptions["swappartition"]) - - logging.info("____UUID check for %s", "data") - datauuid = find_uuid(hostoptions["datapartition"]) - - logging.info("____UUID check for %s", "root") - rootuuid = find_uuid(hostoptions["rootpartition"]) - - fstabfile = data_config.MOUNTPOINT+"/etc/fstab" - logging.info("Correcting UUID's in %s", fstabfile) - f = open(fstabfile, 'r') - oldfscontents = f.readlines() - newfstab = [] - f.close() - for line in oldfscontents: - if line.startswith("UUID"): - templine = line.split() - if ( templine[1] == "/"): - logging.debug(" Found Root fstab line:") - logging.debug( templine) - templine[0] = "UUID=%s" %(rootuuid) - newline = '' - for i in templine: - newline+=i - newline+=" " - newline+="\n" - logging.debug(" New fstab line:") - logging.debug( newline) - newfstab.append(newline) - - if ( templine[1] == data_config.DATAMOUNT): - logging.debug(" Found DATA mount") - logging.debug( templine) - templine[0] = "UUID=%s" %(datauuid) - newline = '' - for i in templine: - newline+=i - newline+=" " - newline+="\n" - logging.debug(" New fstab line:") - logging.debug( newline) - newfstab.append(newline) - - if ( templine[1] == "swap"): - if len(swapuuid) <= 5: - logging.debug(" swapp uuid is to small") - else: - logging.debug(" Found swap partition") - logging.debug( templine) - templine[0] = "UUID=%s" %(swapuuid) - newline = '' - for i in templine: - newline+=i - newline+=" " - newline+="\n" - logging.debug(" New fstab line:") - logging.debug( newline) - newfstab.append(newline) - else: - logging.debug(" Line didn't match, adding to newfstab:") - logging.debug( line) - newfstab.append(line) - logging.info("Writing out newfstab") - logging.debug("______This is the new fstab_____") - f = open(fstabfile, 'w') - for line in newfstab: - logging.debug(line) - f.write(line) - #f.write("\n") - f.close() - -def grub_it(): - logging.info("______Start of grub install______") - cmd = " grub-install --recheck --no-floppy --root-directory=%s \"(hd0)\" " % data_config.MOUNTPOINT - logging.info("Running grub-install") - runcmd(cmd) - rootuuid = find_uuid(hostoptions["rootpartition"]) - cmd = " mkinitcpio -g %s/boot/kernel26.img" % data_config.MOUNTPOINT - logging.info("Running mkinitcpio") - runcmd(cmd) - logging.info("Adding root uuid to grub menu") - grubfile = data_config.MOUNTPOINT+"/boot/grub/menu.lst" - try: - f = open(grubfile, 'r') - oldgrub = f.readlines() - newgrub = [] - f.close() - for line in oldgrub: - if line.startswith("kernel"): - templine = line.split() - logging.debug(" Found kernel Root grubline:") - logging.debug( templine) - templine[2] = "root=/dev/disk/by-uuid/%s" %(rootuuid) - newline = '' - for i in templine: - newline+=i - newline+=" " - newline+="\n" - logging.debug(" New grub menu.lst line:") - logging.debug( newline) - newgrub.append(newline) - else: - logging.debug("Line didn't match, adding to newgrub:") - logging.debug( line) - newgrub.append( line) - logging.info("Writing out new grub file") - logging.debug("______This is the new grub_____") - f = open(grubfile, 'w') - for line in newgrub: - logging.debug(line) - f.write(line) - f.close() - except: - logging.debug("Couldn't open grub file") - -def fix_permissions(): - logging.info("Fixing permissions") - SE = os.environ["TEMPLATES"]+"/settings/syssettings" - cmd = " chmod -R 755 %s" %(data_config.MOUNTPOINT+SE) - runcmd(cmd) - cmd = " chmod 775 %s" %(data_config.MOUNTPOINT+"/etc/systemconfig") - runcmd(cmd) - cmd = " chmod 755 %s" %(data_config.MOUNTPOINT+"/root") - runcmd(cmd) - cmd = " chown root:mythtv %s" %(data_config.MOUNTPOINT+"/etc/systemconfig") - runcmd(cmd) - cmd = " chown -R mythtv:mythtv %s" %(data_config.MOUNTPOINT+SE) - runcmd(cmd) - cmd = " chown -R mythtv:mythtv %s" %(data_config.MOUNTPOINT+"/var/log/mythtv") - runcmd(cmd) - -def apply_new_auth(): - logging.info("_____Applying Password updates_______") - passfile = "/root/myth_user_call.out" - try: - MVROOT = os.environ["MV_ROOT"] - except: - logging.debug("MVROOT was not defined, using the default value") - MVROOT = "/usr/MythVantage" - if data_config.NOOPDEBUG == "FALSE": - cmdprefix = "chroot " + data_config.MOUNTPOINT + " " + MVROOT+"/bin/myth_user_call -i " - else: - cmdprefix = "echo chroot " + data_config.MOUNTPOINT + " " + MVROOT+"/bin/myth_user_call -i " - try: - f = open(passfile, 'r') - passcmds = f.readlines() - f.close() - for cmd in passcmds: - execmd = cmdprefix+cmd -# Using os.system because runcmd fails - logging.debug(execmd) - os.system(execmd) - except: - logging.debug("Applying password updates failed, couldn't open %s", passfile) - logging.debug - -def add_to_blacklist(module): - rcfile = data_config.MOUNTPOINT + "/etc/rc.conf" - logging.debug(" Attempting to add %s to blacklist", module) - newline='' - try: - f = open(rcfile, 'r') - conflines = f.readlines() - f.close() - except: - logging.critical(" *Couldn't open %s for reading",rcfile) - return - - try: - f = open(rcfile, 'w') - except: - logging.critical(" *Couldn't open %s for reading",rcfile) - return - - for line in conflines: - newline = line - if re.match("MOD_BLACKLIST",line): - logging.debug(line) - try: - lastpar = line.rindex(')') - logging.debug(" found ) at %s", lastpar) - newline = line[:lastpar] +" !" + module + " " + line[lastpar:] - logging.debug(newline) - except: - logging.debug("Couldn't find ending )") - newline = line - f.write(newline) - f.close() - - -def add_to_modulelist(module): - rcfile = data_config.MOUNTPOINT + "/etc/rc.conf" - logging.debug(" Attempting to add %s to modulelist", module) - newline='' - try: - f = open(rcfile, 'r') - conflines = f.readlines() - f.close() - except: - logging.critical(" *Couldn't open %s for reading",rcfile) - return - - try: - f = open(rcfile, 'w') - except: - logging.critical(" *Couldn't open %s for reading",rcfile) - return - - for line in conflines: - newline = line - if re.match("MODULES=",line): - logging.debug(line) - try: - lastpar = line.rindex(')') - logging.debug(" found ) at %s", lastpar) - newline = line[:lastpar] +" " + module + " " + line[lastpar:] - logging.debug(newline) - except: - logging.debug("Couldn't find ending )") - newline = line - f.write(newline) - f.close() - - - -def special_hardware_check(): - logging.info("_____Applying special boot parameters_______") - try: - f = open('/proc/cmdline', 'r') - bootoptions = f.readlines() - f.close() - except: - logging.critical(" *Couldn't open /proc/cmdline") - return - bootoptions = bootoptions[0].split() - logging.debug(" Boot options: %s", bootoptions) - for item in bootoptions: - logging.debug(item) - if re.match("disablemodules",item) != None : - logging.debug(" Found disabledmodules") - modulelist = item.split("=")[1] - for module in modulelist.split(','): - add_to_blacklist(module) - - if re.match("modules",item) != None : - logging.debug(" Found modules") - modulelist = item.split("=")[1] - for module in modulelist.split(','): - add_to_modulelist(module) - - if re.match("type",item) != None : - logging.debug(" Found special hardware type") - try: - typefile = open(data_config.MOUNTPOINT + "/myth/.special_hardware_type", 'w') - typelist = item.split("=")[1] - # there should be only one special hardware type, but this will handle multiples, just in case - for type in typelist.split(','): - typefile.write(type) - typefile.write("\n") - typefile.close() - except: - logging.debug("Couldn't write to file: ", typefile) - if re.match("no_meth",item) != None : - cmd = " touch %s%s/.no_meth" %(data_config.MOUNTPOINT, data_config.MYTHHOME) - runcmd(cmd) - -def swapsearch(): -#currently unused! - partlist = [] - stddir = os.getcwd() - os.chdir("/sys/block") - partitionlist = glob.glob("*") - for item in partitionlist: - try: - newitem = item.strip().rpartition(" ")[2] - if (not newitem == '') and (not newitem.startswith("loop")): - path = "/dev/"+newitem.strip() - path = path.strip() - device = parted.getDevice(path) - (cylinders, heads, sectors) = device.biosGeometry - sizeInBytes = device.length * device.sectorSize - disk = parted.Disk(device) - for partition in disk.partitions: - if partition.type == parted.PARTITION_PROTECTED or \ - partition.type == parted.PARTITION_METADATA or \ - partition.type == parted.PARTITION_FREESPACE: - continue - - partlist.append((partition, - partition.path, - partition.getFlag(parted.PARTITION_BOOT), - partition.geometry.start, - partition.geometry.end, - partition.geometry.length, - partition.type, - partition.fileSystem)) - for slice in partlist: - (partition, path, bootable, start, end, length, type, fs) = slice - if partition.getFlag(parted.PARTITION_SWAP) or fs.type == "linux-swap": - print "found swap" - print path - except: - pass - os.chdir(stddir) - -def sane_settings(file): - #Remove some settings from file_name - removeline = ("HOSTrootfstype", "HOSTrootfstype", "HOSTdatafstype", "HOSTOSsize", "HostUseALLdata", "HOSTDATAsize", "HOSTuprootfstype", "HostUseSWAP", "HOSTSWAPsize") - logging.debug("__Running sane settings") - try: - f = open(file, 'r') - filecontents = f.readlines() - f.close() - except: - logging.debug(" Couldn't find file %s to sane", file) - try: - f = open(file, 'w') - for line in filecontents: - for item in removeline: - if line.startsize(line.strip()): - logging.debug(" Found a line to remove in %s, %s", file, line) - else: - f.write(line) - except: - logging.debug(" Couldn't open file %s for writing", file) - logging.debug(" __End sane settings") - -def restore_default_settings(): - try: - MVROOT = os.environ["MV_ROOT"] - except: - logging.debug(" MVROOT was not defined, using the default value") - MVROOT = "/usr/MythVantage" - logging.info("Saving syssettings") - cmd = "%s/bin/restore_default_settings.sh -c save -t syssettings -h %s -d localhost" %(MVROOT, data_config.MVHOSTNAME) - runcmd(cmd) - SE = os.environ["TEMPLATES"]+"/settings/syssettings/" - cp_and_log(SE, data_config.MOUNTPOINT+SE) - cp_and_log("/etc/mtab", data_config.MOUNTPOINT+"/etc/mtab") - copy_updates() - fix_permissions() - -def full_install(hostoptions): - logging.info("______Start of full install______") - try: - MVROOT = os.environ["MV_ROOT"] - except: - logging.debug(" MVROOT was not defined, using the default value") - MVROOT = "/usr/MythVantage" - - try: - os.remove("/tmp/.this_is_upgrade") - except OSError: - logging.debug(" File /tmp/.this_is_upgrade not present, couldn't delete it") - pass -# Partition disk - statusmsg = "Partitioning %s" %( hostoptions["rootdisk"]) - update_status(statusmsg) - progress(1) - if data_config.NOOPDEBUG == "FALSE": - partition_disk() - else: - logging.debug(" Debug mode, skipping partitioning step") - -# Format disk - statusmsg = "Preparing %s" %( hostoptions["rootdisk"]) - update_status(statusmsg) - progress(2) - format_disk("install") - - -# Mount partitions - statusmsg = "Mounting %s" %( hostoptions["rootdisk"]) - update_status(statusmsg) - progress(3) - mount_it() - -# Find number of bytes written to disk before starting copy. This is used -# to have a somewhat decent progress indication. - statgrab( hostoptions["rootdisk"]) - msg = "Creating %s" %(systemconfig["hostname"]) - update_status(msg) - -# Copy system to disk - copy_it("install") -# Remove old fstab so that a new one is created - fstabfile = data_config.MOUNTPOINT+"/etc/fstab" - try: - os.remove(fstabfile) - except OSError: - logging.debug(" ERROR: deleting %s", fstabfile) - fstab_it("full_install") -# Configure system - msg = "Configuring system" - update_status(msg) - progress(98) - grub_it() - special_hardware_check() -# Configuring the system - logging.info("______Configuring system________") - cp_and_log("/etc/systemconfig", data_config.MOUNTPOINT+"/etc/systemconfig") - cp_and_log("/root/xorg.conf.install", data_config.MOUNTPOINT+"/etc/X11/xorg.conf.install") - restore_default_settings() - #try: - #MVROOT=os.environ["MV_ROOT"] - #except: - #logging.debug(" MVROOT was not defined, using the default value") - #MVROOT="/usr/MythVantage" - #logging.info("Saving syssettings") - #cmd="%s/bin/restore_default_settings.sh -c save -t syssettings -h %s -d localhost" %(MVROOT, data_config.MVHOSTNAME) - #runcmd(cmd) - #SE=os.environ["TEMPLATES"]+"/settings/syssettings" - #cp_and_log(SE, data_config.MOUNTPOINT+SE) - #cp_and_log("/etc/mtab", data_config.MOUNTPOINT+"/etc/mtab") - #cp_and_log2(MVROOT+"/bin/", data_config.MOUNTPOINT+MVROOT+"/bin/", "*.sh") - #cp_and_log2(MVROOT+"/bin/", data_config.MOUNTPOINT+MVROOT+"/bin/", "*.py") - #fix_permissions() - mount_bind_chroot() - apply_new_auth() - umount_bind_chroot() - if ( systemconfig["SystemType"] == "Master_backend" or systemconfig["SystemType"] == "Standalone" ): -# This install will need a DB, so install it - logging.info("______Installing Database in CHROOT________") - mysqldb("stop", '') - mount_bind_chroot() - cmd = " chroot %s %s/bin/install_db_chroot.sh |tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT) - runcmd(cmd) - logging.info("Running systemconfig in chroot") - #cmd = " chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT) - cmd = "chroot %s %s/bin/systemconfig.sh all,this_is_install" %(data_config.MOUNTPOINT, MVROOT) - rc = runcmd(cmd)[0] - if rc != 0 : - error_out("Running systemconfig") - - mysqldb("stop", "chroot") - kill_dhcp_chroot() - logging.info("____End Database in CHROOT____") - mysqldb("start", '') - umount_bind_chroot() - else: - logging.info("______No database required, continuing configuration________") - mount_bind_chroot() - cmd = " chroot %s DISPLAY=127.0.0.1:0 %s/bin/MythVantage -t restore, default 1" %(data_config.MOUNTPOINT, MVROOT) - runcmd(cmd) -# Need to check for to touch /tmp/.dbsysfailed - cmd = " chroot %s %s/bin/restore_default_settings.sh -c restore -t syssettings " %(data_config.MOUNTPOINT, MVROOT) - runcmd(cmd) - if ( 'x' == '1' ): - logging.debug("touching /tmp/.dbsysfailed") - else: - #cmd = " chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT) - cmd = "chroot %s %s/bin/systemconfig.sh all,this_is_install" %(data_config.MOUNTPOINT, MVROOT) - rc = runcmd(cmd)[0] - if rc != 0 : - error_out("Running systemconfig") - cmd = "chroot %s %s/bin/restore_default_settings.sh -c ACCESSCONTROL " %(data_config.MOUNTPOINT, MVROOT) - runcmd(cmd) - umount_bind_chroot() - cmd = " touch %s%s/.configure" %(data_config.MOUNTPOINT, data_config.MYTHHOME) - runcmd(cmd) - cmd = " chmod 777 %s%s/.configure" %(data_config.MOUNTPOINT, data_config.MYTHHOME) - runcmd(cmd) - - msg = "Done" - update_status(msg) - cp_and_log("/tmp/mythvantage_install.log", data_config.MOUNTPOINT+"/var/log/mythvantage_install.log") - cp_and_log("/tmp/mv_debug.log", data_config.MOUNTPOINT+"/var/log/mv_debug.log") - unmount_it() - logging.debug("_____End of full install_____") - -def find_upgrade(): - logging.info("_____Start of find_upgrade_____") - global hostoptions - #try to mount first partition of disk - #copy old /etc/systemconfig to live, import settings into db - #umount drive. - #check for clean upgrade - if ( clean_upgrade() ): - logging.info("Clean upgrade requested, not using old data") - return - mount_it() - oldbackupfile = data_config.MOUNTPOINT+"/root/backup/"+data_config.BACKUPFILE - newbackupfile = "/tmp/"+data_config.BACKUPFILE - if os.path.exists(oldbackupfile): - logging.debug("Setting backup file to %s", newbackupfile) - hostoptions["backupfile"] = newbackupfile - cp_and_log(oldbackupfile, newbackupfile) - - srcfile = data_config.MOUNTPOINT+"/etc/systemconfig" - logging.info("Searching for systemconfig file %s", srcfile) - if os.path.exists(srcfile): - logging.info("Found systemconfig file %s", srcfile) - TEMPLATES = os.environ["TEMPLATES"]+"/settings/syssettings" - cp_and_log2(data_config.MOUNTPOINT+TEMPLATES, data_config.TEMP_TEMPLATES, '') - sane_settings("/tmp/templates/settings/syssettings/settings.txt") - cp_and_log2(data_config.TEMP_TEMPLATES, TEMPLATES, '') - cp_and_log(srcfile, "/etc/systemconfig") - cp_and_log(data_config.MOUNTPOINT+"/etc/", "/tmp/etc/") - cp_and_log(data_config.MOUNTPOINT+"/var/lib/alsa/", "/tmp/alsa") - cp_and_log(data_config.MOUNTPOINT+"/var/lib/oss/", "/tmp/oss") - cp_and_log("/tmp/etc/mdadm.conf", "/etc/mdadm.conf") - else: - logging.info("Could not find systemconfig file %s", srcfile) - cp_and_log(data_config.MOUNTPOINT+"/etc/", "/tmp/etc/") - cp_and_log(data_config.MOUNTPOINT+"/var/lib/alsa/", "/tmp/alsa") - cp_and_log("/tmp/etc/mdadm.conf", "/etc") - timezone_to_db("/tmp/etc/timezone") - unmount_it() - logging.debug("End of find_upgrade") - -def upgrade_mount_search(): - #Search for data/myth partition based on contents of fstab - logging.debug("______Start of upgrade_mount_search_____") - cmd = "umount %s%s" %(data_config.MOUNTPOINT, data_config.DATAMOUNT) - runcmd(cmd) - fstab_list = [] - fstab_data_mount = '' - try: - f = open("/tmp/etc/fstab", 'r') - oldfscontents = f.readlines() - f.close() - ## ['UUID=', '/myth', 'auto', 'defaults, noatime', '0', '1'] - #for line in oldfscontents: - #mountdir=line.split() - #if mountdir[1] == (data_config.DATAMOUNT): - #fstablist.append(mountdir) - except: - logging.debug(" Couldn't open /tmp/etc/fstab") - for line in oldfscontents: - if line.startswith("#"): - continue - mountdir=line.split() - try: - if mountdir[1] == (data_config.DATAMOUNT): - fstablist.append(mountdir) - except: - continue - #search fstab for data/myth mountpoint - for i in fstab_list: - if i[1] == data_config.DATAMOUNT: - fstab_data_mount = i[0] - break - - #start software raid support if needed - for i in fstab_list: - if i[0].startswith("/dev/md"): - logging.debug(" starting software raid support") - mdadm_assemble_all - - - if re.search("UUID", fstab_data_mount): - fstab_data_uuid = fstab_data_mount.split("=")[1] - cmd = "blkid -t UUID=%s" %fstab_data_uuid - retcode = call(cmd, shell=True) - if retcode != 0: - logging.debug(" Couldn't find uuid %s, starting md support", fstab_data_uuid) - mdadm_assemble_all - #hoping everything is up and running and data/myth will be available for mount - cmd = "mount -U %s %s" %(fstab_data_uuid, data_config.MOUNTPOINT) - runcmd(cmd) - cmd = "blkid -t UUID=%s|cut -d: -f1" %fstab_data_uuid - logging.debug(cmd) - datadisk = commands.getoutput(cmd) - cmd = "basename %s" %datadisk - datadisk = commands.getoutput(cmd) - else: - cmd = "mount %s %s" %(fstab_data_mount, data_config.MOUNTPOINT) - runcmd(cmd) - cmd = "basename %s" %fstab_data_mount - datadisk = commands.getoutput(cmd) - time.sleep(3) -# hostoptions["backupfile"]=data_config.BACKUPPATH+data_config.BACKUPFILE - if not backup_sql_check(): - newbackupfile = "/tmp/"+data_config.BACKUPFILE - if os.path.exists(newbackupfile): - logging.debug("Setting backup file to %s", newbackupfile) - cp_and_log(newbackupfile, data_config.MOUNTPOINT+newbackupfile) - hostoptions["backupfile"] = newbackupfile - else: - logging.info("Couldn't find any database to restore, upgrade will continue with a new database") - - - -def upgrade(hostoptions): - - try: - MVROOT = os.environ["MV_ROOT"] - except: - logging.debug("MVROOT was not defined, using the default value") - MVROOT = "/usr/MythVantage" - logging.info("______Start of upgrade______") - cmd = "touch /tmp/.this_is_upgrade" - runcmd(cmd) - if hostoptions["rootfs"] == "Do_not_format": - logging.info("Will not format root filesystem") - else: - statusmsg = "Preparing %s" %( hostoptions["rootdisk"]) - update_status(statusmsg) - progress(2) - format_disk("upgrade") - #sys.exit(2) - statusmsg = "Mounting %s" %( hostoptions["rootdisk"]) - update_status(statusmsg) - progress(3) - mount_it() - hostoptions["backupfile"] = data_config.BACKUPPATH+data_config.BACKUPFILE - statgrab( hostoptions["rootdisk"]) - msg = "Upgrading %s" %(systemconfig["hostname"]) - update_status(msg) - time.sleep(3) - copy_it("upgrade") - cmd = "rm -rf %s/etc.old" %data_config.MOUNTPOINT - runcmd(cmd) - cmd = "rm -rf %s/alsa.old" %data_config.MOUNTPOINT - runcmd(cmd) - - cp_and_log("/tmp/etc/", data_config.MOUNTPOINT+"/etc.old/") - cp_and_log("/tmp/alsa/", data_config.MOUNTPOINT+"/alsa.old/") - cp_and_log("/tmp/oss", data_config.MOUNTPOINT+"/var/lib/oss.old") - - srcfile = "%s/etc.old/ssh/" %(data_config.MOUNTPOINT) - destfile = "%s/etc/ssh/" %(data_config.MOUNTPOINT) - cp_and_log2(srcfile, destfile, '*.pub') - cp_and_log2(srcfile, destfile, '*.key') - cp_and_log2(srcfile, destfile, '*key') - - mdfile = mdadm_find("/tmp") - cp_and_log("/tmp"+mdfile, data_config.MOUNTPOINT+"/etc") - - srcfile = "%s/etc.old/asound.conf" %(data_config.MOUNTPOINT) - destfile = "%s/etc/asound.conf" %(data_config.MOUNTPOINT) - cp_and_log(srcfile, destfile) - - # R5.5 -> R6 - srcfile = "%s/alsa.old/asound.state" %(data_config.MOUNTPOINT) - destfile = "%s/etc/asound.state" %(data_config.MOUNTPOINT) - cp_and_log(srcfile, destfile) - # R6 -> R6 - srcfile = "%s/etc.old/asound.state" %(data_config.MOUNTPOINT) - destfile = "%s/etc/asound.state" %(data_config.MOUNTPOINT) - cp_and_log(srcfile, destfile) - - srcfile = "%s/etc.old/mplayer/mplayer.conf" %(data_config.MOUNTPOINT) - destfile = "%s/etc/mplayer/mplayer.conf" %(data_config.MOUNTPOINT) - cp_and_log(srcfile, destfile) - - if not os.path.exists("/tmp/etc/KnoppMyth-version"): - logging.debug(" standard upgrade, restoring auth files") - cp_and_log(data_config.MOUNTPOINT+"/etc.old/passwd", data_config.MOUNTPOINT+"/etc/passwd") - cp_and_log(data_config.MOUNTPOINT+"/etc.old/shadow", data_config.MOUNTPOINT+"/etc/shadow") - cp_and_log(data_config.MOUNTPOINT+"/etc.old/group", data_config.MOUNTPOINT+"/etc/group") - msg = "Configuring system" - - update_status(msg) - progress(98) - logging.info("______Configuring system________") - cp_and_log("/etc/systemconfig", data_config.MOUNTPOINT+"/etc/systemconfig") - if not backup_sql_check(): - upgrade_mount_search() - fstab_it("upgrade") - time.sleep(1) - grub_it() - time.sleep(1) - #needed to get around a bug with pacman - special_hardware_check() - cp_and_log("/root/xorg.conf.install", data_config.MOUNTPOINT+"/etc/X11/xorg.conf.install") - cp_and_log("/etc/mtab", data_config.MOUNTPOINT+"/etc/mtab") - if clean_upgrade() or os.path.exists("/tmp/etc/KnoppMyth-version"): - logging.debug("clean upgrade or knoppmyth upgrade detected, running restore settings") - restore_default_settings() - if clean_upgrade(): - file = "%s/%s/.kmupgrade" %(data_config.MOUNTPOINT, data_config.MYTHHOME) - cmd = "touch %s && chmod 777 %s" %(file, file) - runcmd(cmd) - copy_updates() - fix_permissions() - mount_bind_chroot() - logging.info("Running systemconfig in chroot") - #cmd = " chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT) - cmd = "chroot %s %s/bin/systemconfig.sh all,this_is_install" %(data_config.MOUNTPOINT, MVROOT) - rc = runcmd(cmd)[0] - if rc != 0 : - error_out("Running systemconfig") - mysqldb("stop", "") - if ( systemconfig["SystemType"] == "Master_backend" or systemconfig["SystemType"] == "Standalone" ): - if clean_upgrade() or not backup_sql_check(): - logging.info("Installing new database") - cmd = " chroot %s %s/bin/install_db_chroot.sh |tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT) - runcmd(cmd) - else: - logging.info("Restoring database") - cmd = " chroot %s %s/bin/restore_km_db_chroot.sh %s|tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT, hostoptions["backupfile"]) - runcmd(cmd) - - if os.path.exists("/tmp/etc/KnoppMyth-version"): - cmd = " chroot %s %s/bin/restore_default_settings.sh -c restore -t hostsettings " %(data_config.MOUNTPOINT, MVROOT) - runcmd(cmd) - logging.debug("Correcting permissions because of km->linhes upgrade") - cmd = " chown -R mythtv:mythtv %s" %(data_config.MOUNTPOINT+data_config.DATAMOUNT) - runcmd(cmd) - cmd = " chown -R root:root %s" %(data_config.MOUNTPOINT+data_config.DATAMOUNT+"/backup") - runcmd(cmd) - else: - cmd = " chroot %s %s/bin/restore_default_settings.sh -c restore -t syssettings " %(data_config.MOUNTPOINT, MVROOT) - runcmd(cmd) - - logging.info("Running systemconfig in chroot 2nd time") - #cmd = " chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT) - cmd = "chroot %s %s/bin/systemconfig.sh all,this_is_install" %(data_config.MOUNTPOINT, MVROOT) - rc = runcmd(cmd)[0] - if rc != 0 : - error_out("Running systemconfig") - #logging.info("Running systemconfig in chroot") - #cmd = " chroot %s %s/bin/systemconfig.sh advanced" %(data_config.MOUNTPOINT, MVROOT) - #runcmd(cmd) - mysqldb("stop", 'chroot') - apply_new_auth() - kill_dhcp_chroot() - umount_bind_chroot() - cp_and_log("/tmp/mythvantage_install.log", data_config.MOUNTPOINT+"/var/log/mythvantage_install.log") - cp_and_log("/tmp/mv_debug.log", data_config.MOUNTPOINT+"/var/log/mv_debug.log") - unmount_it() - msg = "Done" - update_status(msg) - mysqldb("start", '') - - - - -def main(argv): - global hostoptions - try: - opts, args = getopt.getopt(argv, 'c:h', ["help", "rootdisk=", "rootfs=", "rootsize=", "datafs=", "datasize=", "datadisk=", "swapsize=", "datapartition=" ] ) - except getopt.GetoptError, why: - print why - usage() - sys.exit(2) - hostoptions = {"op": 'null'} - for opt, arg in opts: - if opt in ("-h", "--help"): - usage() - sys.exit(0) - elif opt in ( "--rootdisk"): - hostoptions["rootdisk"] = arg - hostoptions["rootpartition"] = arg+str(1) - elif opt in ("--rootfs"): - hostoptions["rootfs"] = arg - elif opt in ("--rootsize"): - hostoptions["rootsize"] = arg - elif opt in ("--datafs"): - hostoptions["datafs"] = arg - elif opt in ("--datasize"): - hostoptions["datasize"] = arg - elif opt in ("--datadisk"): - hostoptions["datadisk"] = arg - elif opt in ("--datapartition"): - hostoptions["datapartition"] = arg - elif opt in ("--swapsize"): - hostoptions["swapsize"] = arg - - elif opt in ("-c"): - validop = ["full_install", "upgrade", "netboot", "find_upgrade"] - if arg not in validop: - logging.critical("-c %s is not a valid option", arg) - sys.exit(2) - else: - hostoptions["op"] = arg - try: - hostoptions["datadisk"] - except: - hostoptions["datadisk"] = hostoptions["rootdisk"] - hostoptions["datapartition"] = hostoptions["datadisk"]+str(3) - try: - hostoptions["datapartition"] - except: - hostoptions["datapartition"] = hostoptions["datadisk"]+str(3) - hostoptions["swappartition"] = hostoptions["rootdisk"] + str(2) - - - if ( hostoptions["op"] == "full_install" ) : - full_install(hostoptions) - elif (hostoptions["op"] == "upgrade" ) : - hostoptions["datafs"] = "no_format" - find_upgrade() - upgrade(hostoptions) - elif (hostoptions["op"] == "find_upgrade" ) : - find_upgrade() - return hostoptions - - -#____________________________________________setup the logging______________________________________________________ -LOG_FILENAME = '/tmp/mv_status.log' -DEBUGLOG = '/tmp/mv_debug.log' -logging.basicConfig(level=logging.DEBUG, - format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', - datefmt='%m-%d %H:%M', - filename=DEBUGLOG, - filemode='a') -# define a Handler which writes INFO messages or higher to the sys.stderr -console = logging.StreamHandler() -console.setLevel(logging.INFO) -# set a format which is simpler for console use -#formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s') -formatter = logging.Formatter("%(message)s") -# tell the handler to use this format -console.setFormatter(formatter) -# add the handler to the root logger -logging.getLogger('').addHandler(console) - -#infoformatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") -infoformatter = logging.Formatter("%(message)s") -infofile = logging.FileHandler(LOG_FILENAME, 'w') -infofile.setFormatter(infoformatter) -infofile.setLevel(logging.INFO) -logging.getLogger('').addHandler(infofile) - -#Read in systemconfig -global systemconfig -systemconfig = {} -file_name = "/etc/systemconfig" -try: - config_file = open(file_name) -except: - logging.debug("%s could not be opened", file_name) - config_file = '' - -for line in config_file: - line = line.strip() - if line and line[0] is not "#" and line[-1] is not "=": - var, val = line.rsplit("=", 1) - val = val.strip('"') - systemconfig[var.strip()] = val.strip() - - -if __name__ == "__main__": - config_file = "mv_config" - data_config = __import__(config_file, globals(), locals(), []) - logging.debug("___________START OF DEBUG_________________________") - cmdoptions = main(sys.argv[1:]) - logging.debug("______cmd line options______") - for i in cmdoptions.items(): - logging.debug (i) - logging.debug("______systemconfig______") - for i in systemconfig.items(): - logging.debug(i) - logging.debug("______hostoptions______") - for i in hostoptions.items(): - logging.debug(i) - pass - diff --git a/abs/core-testing/LinHES-config/mv_ir.py b/abs/core-testing/LinHES-config/mv_ir.py deleted file mode 100755 index a5e3f3b..0000000 --- a/abs/core-testing/LinHES-config/mv_ir.py +++ /dev/null @@ -1,343 +0,0 @@ -# -*- coding: utf-8 -*- -import logging, mv_common -import os, re , glob -from time import time, localtime, strftime -import time -import pwd - -def setup_lirc_links(mythhome): - logging.debug(" Creating links for lirc") - try: - mythuid = pwd.getpwnam('mythtv')[2] - mythgid = pwd.getpwnam('mythtv')[3] - except: - logging.critical("* mythuid not found") - mythuid = '1000' - mythgid = '1000' - if not os.path.exists(mythhome+"/.mythtv"): - logging.debug(" Creating %s/.mythtv",mythhome) - try: - os.mkdir(mythhome+"/.mythtv") - except: - logging.debug(" Couldn't create .mythtv ") - return - try: - os.chown(mythhome+"/.mythtv", mythuid, mythgid) - logging.debug("* Couldn't chown of %s", mythhome) - except: - cmd = ''' chown -R mythtv %s/.mythtv''' %mythhome - mv_common.runcmd(cmd) - cmd = ''' chgrp -R mythtv %s/.mythtv''' %mythhome - mv_common.runcmd(cmd) - pass - - if os.path.exists("/etc/lircrc"): - if not os.path.exists(mythhome+"/.mythtv/lircrc"): - logging.debug(" Creating symlink for myth lircrc") - os.symlink("/etc/lircrc",mythhome+"/.mythtv/lircrc") - else: - logging.debug(" %s/lircrc already present",mythhome) - - if not os.path.exists(mythhome+"/.lircrc"): - logging.debug(" Creating symlink for lircrc") - os.symlink("/etc/lircrc",mythhome+"/.lircrc") - else: - logging.debug(" %s/.lircrc already present",mythhome) - else: - logging.debug(" /etc/lircrc does not exisit, can not link it") - -def scrub_modules(filename,module): - logging.debug(" scrubbing %s from %s",module,filename) - cmd = '''sed -i -e '/.*#%s/d' %s''' %(module,filename) - mv_common.runcmd(cmd) - -def add_module(filename,module): - logging.debug(" adding %s to %s",module,filename) - cmd = ''' echo "%s" >> %s ''' %(module,filename) - mv_common.runcmd(cmd) - -def unload_all_lirc(): - logging.debug(" Unloading all lirc modules") - cmd = "sv stop lircd" - mv_common.runcmd(cmd) - cmd = "killall -9 lircd" - mv_common.runcmd(cmd) - cmd = '''modprobe -r $(lsmod |grep ^lirc |awk '{print $1}') ''' - mv_common.runcmd(cmd) - - - -def include_file( incfile,filename): - logging.debug(" including %s within %s",filename,incfile) - try: - f = open( incfile, 'a') - except: - logging.debug(" Couldn't open %s for writing",incfile) - return - line = '''include "%s" ''' %filename - logging.debug(" %s",line) - f.write(line) - f.write("\n") - f.close() - -def setup_ir_remote(Remotetype,templates): - logging.debug(" Setup of remote type %s",Remotetype) - if Remotetype == "no_remote": - mv_common.remove_service("lircd") - elif Remotetype == "tinker": - pass - else: - currenttime = strftime("%b-%d-%Y-%H:%M:%S", localtime()) - cmd = "mv /etc/lircd.conf /etc/lircd.conf-%s" %currenttime - mv_common.runcmd(cmd) - cmd = "mv /etc/lircrc /etc/lircrc-%s" %currenttime - mv_common.runcmd(cmd) - files = templates + "/remotes/" + Remotetype + "/lircd*" - logging.debug(" Using %s",files) - for filename in glob.glob(files): - # Ignore subfolders - if os.path.isdir (filename): - logging.debug(" %s is a dir, skipping",filename) - continue - include_file("/etc/lircd.conf",filename) - files = templates + "/remotes/" + Remotetype + "/lircrc*" - logging.debug(" Using %s",files) - for filename in glob.glob(files): - # Ignore subfolders - if os.path.isdir (filename): - logging.debug(" %s is a dir, skipping",filename) - continue - include_file("/etc/lircrc",filename) - cmd = "chmod 755 /etc/lircrc" - mv_common.runcmd(cmd) - mv_common.add_service("lircd") - - -def setup_ir_receiver(ReceiverType,TEMPLATES,HDHRlirc_device,myip): - logging.info(" Configuring receiver %s", ReceiverType) - if ReceiverType == "Serial": - scrub_modules("/etc/modules.mythvantage","lirc") - add_module("/etc/modules.mythvantage","lirc_serial #lirc") - cmd = "load-modules-mythvantage.sh" - mv_common.runcmd(cmd) - mv_common.remove_service("igdaemon") - mv_common.remove_service("tatir") - - elif ReceiverType == "Usb-imon": - scrub_modules("/etc/modules.mythvantage","lirc") - add_module("/etc/modules.mythvantage","lirc_imon #lirc") - cmd = "load-modules-mythvantage.sh" - mv_common.runcmd(cmd) - mv_common.remove_service("igdaemon") - mv_common.remove_service("tatir") - - elif ReceiverType == "Hauppauge": - scrub_modules("/etc/modules.mythvantage","lirc") - add_module("/etc/modules.mythvantage","lirc_i2c #lirc") - mv_common.cp_and_log(TEMPLATES+"/modules/lirc_i2c.conf" , - "/etc/modprobe.d/lirc_i2c.conf") - cmd = "rmmod lirc_i2c" - mv_common.runcmd(cmd) - cmd = "load-modules-mythvantage.sh" - mv_common.runcmd(cmd) - mv_common.remove_service("igdaemon") - mv_common.remove_service("tatir") - elif ReceiverType == "pvr150": - scrub_modules("/etc/modules.mythvantage","lirc") - add_module("/etc/modules.mythvantage","lirc_i2c #lirc") - mv_common.cp_and_log(TEMPLATES+"/modules/lirc_i2c.conf" , - "/etc/modprobe.d/lirc_i2c.conf") - cmd = "rmmod lirc_i2c" - mv_common.runcmd(cmd) - cmd = "load-modules-mythvantage.sh" - mv_common.runcmd(cmd) - mv_common.remove_service("igdaemon") - mv_common.remove_service("tatir") - - elif ReceiverType == "iguanaIR-usb": - scrub_modules("/etc/modules.mythvantage","lirc") - mv_common.add_service("igdaemon") - mv_common.remove_service("tatir") - - elif ReceiverType == "tatir": - scrub_modules("/etc/modules.mythvantage","lirc") - mv_common.add_service("tatir") - mv_common.remove_service("igdaemon") - elif ReceiverType == "SiliconDust_HDHR": - mv_common.remove_service("igdaemon") - mv_common.remove_service("tatir") - cmd = '''hdhomerun_config %s set /ir/target %s:5000 store''' %(HDHRlirc_device,myip) - print cmd - mv_common.runcmd(cmd) - - else: - logging.debug(" didn't match receiver, using genric case") - scrub_modules("/etc/modules.mythvantage","lirc") - mv_common.remove_service("igdaemon") - mv_common.remove_service("tatir") - -def setup_blaster_proto(HostBlasterType,Hostnumblaster,TEMPLATES,systemconfig): - logging.debug(" Start of setup_blaster_proto") - logging.debug(" HostBlasterType: %s", HostBlasterType) - logging.debug(" Hostnumblaster: %s" , Hostnumblaster) - if not HostBlasterType == "pvr150" and not HostBlasterType == "None": - for i in range(int(Hostnumblaster)): - try: - proto = systemconfig["HostTransmitproto_"+str(i+1)] - logging.debug(" proto: %s",proto) - except: - logging.info(" unkown proto for %s",i+1) - continue - template=TEMPLATES+"/transmit/%s/lircd.conf" %proto - if os.path.exists(template): - logging.debug(" include blaster template: %s",proto) - include_file("/etc/lircd.conf",template) - else: - logging.debug(" template: %s is not present",template) - logging.info("------NEED TO SETUP CHANGE_CHANNEL------") - - -def setup_blaster_transmiter(HostBlasterType): - logging.debug(" Start of setup_blaster_transmiter") - logging.info(" HostBlasterType : %s", HostBlasterType) - - if HostBlasterType == "Receiver": - logging.info(" Blaster is receiver, skipping module config for Blaster") - return - - if HostBlasterType == "no blaster": - scrub_modules("/etc/modules.mythvantage","blaster") - elif HostBlasterType == "Serial": - scrub_modules("/etc/modules.mythvantage","blaster") - add_module("/etc/modules/.mythvantage","lirc_serial #blaster") - cmd = "load-modules-mythvantage.sh" - mv_common.runcmd(cmd) - elif HostBlasterType == "pvr150": - scrub_modules("/etc/modules.mythvantage", "blaster") - scrub_modules("/etc/modules.mythvantage", "lirc") - add_module("/etc/modules.mythvantage", "lirc_pvr150 #blaster") - add_module("/etc/modules.mythvantage", "lirc_pvr150 #lirc") - cmd = "rmmod lirc_i2c" - mv_common.runcmd(cmd) - cmd = "load-modules-mythvantage.sh" - mv_common.runcmd(cmd) - else: - scrub_modules("/etc/modules.mythvantage","blaster") - -def setup_lcd(LCDtype, TEMPLATES, Remotetype): - logging.debug("____Start of setup_lcd____") - logging.debug(" LCDType: %s", LCDtype) - logging.debug(" Remotetype: %s", Remotetype) - if LCDtype == "tinker": - logging.info(" tinker mode detected") - return - - if LCDtype == "no_lcd": - logging.info(" Disabling LCD support") - cmd = "sv stop lcdd" - mv_common.runcmd(cmd) - #sometimes it doesn't want to die - cmd = "killall -9 LCDd" - mv_common.runcmd(cmd) - cmd = "load-modules-mythvantage.sh UNLOAD LCD" - mv_common.runcmd(cmd) - scrub_modules("/etc/modules.mythvantage", "LCD") - mv_common.remove_service("lcdd") - else: - lcdmodule="%s/LCD/%s/modules" %(TEMPLATES,LCDtype) - if os.path.exists(lcdmodule): - logging.debug(" Adding module for LCD") - scrub_modules("/etc/modules.mythvantage", "LCD") - cmd = "cat %s >> /etc/modules.mythvantage" %lcdmodule - mv_common.runcmd(cmd) - if Remotetype != "tinker": - lcdconf = "%s/LCD/%s/LCDd.conf" %(TEMPLATES,LCDtype) - lcdlirc = "%s/LCD/%s" %(TEMPLATES,LCDtype) - mv_common.pacinstall("lcdproc") - if os.path.exists(lcdconf): - logging.debug(" Copying in lcdconf template file: %s",lcdconf) - mv_common.cp_and_log(lcdconf, "/etc/LCDd.conf") - else: - logging.debug(" %s is not present, will not copy it") - - if os.path.exists(lcdlirc+"/lircrc"): - logging.debug(" LCD seems to support lirc") - #setup the lirc aspect of the lcd - #copied from setup_ir_remote - files = lcdlirc+"/lircd*" - logging.debug(" Using %s",files) - for filename in glob.glob(files): - # Ignore subfolders - if os.path.isdir (filename): - logging.debug(" %s is a dir, skipping",filename) - continue - include_file("/etc/lircd.conf",filename) - files = lcdlirc+"/lircrc*" - logging.debug(" Using %s",files) - for filename in glob.glob(files): - # Ignore subfolders - if os.path.isdir (filename): - logging.debug(" %s is a dir, skipping",filename) - continue - include_file("/etc/lircrc",filename) - cmd = "chmod 755 /etc/lircrc" - mv_common.runcmd(cmd) - - mv_common.add_service("lcdd") - mv_common.restart_service("lcdd") - logging.debug("__End of setup_lcd") - -def setup_ir(systemconfig, data_config): - rc = [ False , False ] - if mv_common.read_config(mv_common.module_config,"ir") == False : - logging.info("____Skipping of IR, config disabled____") - return rc - - logging.info("____Start of IR____") - if systemconfig["Remotetype"] == "tinker": - logging.info(" Tinker mode detected") - else: - if not systemconfig["HostBlasterType"]: - HostBlasterType = "unknown" - Hostnumblaster = "0" - else: - HostBlasterType = systemconfig["HostBlasterType"] - Hostnumblaster = systemconfig["Hostnumblaster"] - - if systemconfig["HostBlasterType"] == "pvr150": - remotetype = "hauppauge-blaster" - logging.debug(" pvr150 blaster selected, setting remote to hauppauge-blaster") - else: - remotetype = systemconfig["Remotetype"] - - setup_ir_remote(remotetype,systemconfig["TEMPLATES"]) - setup_lirc_links(data_config.MYTHHOME) - - if systemconfig["ReceiverType"]: - setup_ir_receiver(systemconfig["ReceiverType"], - systemconfig["TEMPLATES"], - systemconfig["HDHRlirc_device"], - systemconfig["mythip"]) - else: - setup_ir_receiver("unknown", systemconfig["TEMPLATES"],'','127.0.0.1') - unload_all_lirc() - setup_blaster_proto(HostBlasterType, - Hostnumblaster, - systemconfig["TEMPLATES"], - systemconfig) - setup_blaster_transmiter(HostBlasterType) - cmd = "load-modules-mythvantage.sh" - mv_common.runcmd(cmd) - time.sleep(2) - mv_common.udev_trigger() - cmd="sv start lircd" - mv_common.runcmd(cmd) - rc = [ True , True ] - if systemconfig["LCDtype"]: - setup_lcd(systemconfig["LCDtype"], - systemconfig["TEMPLATES"], - systemconfig["Remotetype"]) - else: - logging.debug(" LCD not defined") - logging.info("__End IR\n") - return rc \ No newline at end of file diff --git a/abs/core-testing/LinHES-config/mv_misc.py b/abs/core-testing/LinHES-config/mv_misc.py deleted file mode 100755 index 9ea9c95..0000000 --- a/abs/core-testing/LinHES-config/mv_misc.py +++ /dev/null @@ -1,180 +0,0 @@ -# -*- coding: utf-8 -*- -import logging, mv_common -import os, re -from urllib2 import Request, urlopen, URLError, HTTPError - -config_file = "mv_config" -data_config = __import__(config_file, globals(), locals(), []) - -def setup_zip(MVROOT,zipcode): - logging.debug("____Setting up the zipcode____") - - if zipcode: - cmd="%s/bin/restore_default_settings.sh -c ZIP -c %s" %(MVROOT,zipcode) - mv_common.runcmd(cmd) - #Let's also speed things up for those in North America - cmd="mkdir /usr/bin/perlbin/vendor/tv_grabbers_non_na" - mv_common.runcmd(cmd) - cmd="mv /usr/bin/perlbin/vendor/tv_grab_* /usr/bin/perlbin/vendor/tv_grabbers_non_na" - mv_common.runcmd(cmd) - cmd="mv /usr/bin/perlbin/vendor/tv_grabbers_non_na/tv_grab_na* /usr/bin/perlbin/vendor/" - mv_common.runcmd(cmd) - else: - logging.debug(" Zipcode is not set") - - logging.debug("__End of zipcode\n") - -def setup_tz(timezone,TEMPLATES): - logging.info("____Setting up the timezone____") - - if not timezone: - timezone="unknown" - logging.info(" Setting timezone to %s",timezone) - mv_common.remove_file("/etc/localtime") - #try: - #logging.debug(" Removing /etc/localtime") - #os.remove("/etc/localtime") - #except: - #logging.debug(" Couldn't remove /etc/localtime") - #pass - - srclink="/usr/share/zoneinfo/%s" %timezone - logging.debug(" symlinking %s to /etc/localtime",srclink) - try: - os.symlink(srclink,"/etc/localtime") - except: - logging.critical(" Couldn't make symlink for /etc/localtime") - cmd = '''sed -e "s/^TIMEZONE=.*$/TIMEZONE=\\"%s\\" /" /etc/rc.conf > $TEMPLATES/rc.conf''' %re.escape(timezone) - mv_common.runcmd(cmd) - - if os.path.exists("/etc/php/php.ini"): - logging.info(" Changing timezone for php") - cmd = '''sed -i "s/^.*date.timezone.*$/date.timezone=%s/" ${BASE}/etc/php/php.ini''' %re.escape(timezone) - mv_common.runcmd(cmd) - - mv_common.cp_and_log(TEMPLATES+"/rc.conf","/etc/rc.conf") - logging.info("__End of timezone\n") - -def setup_nfs(systemconfig): - nfslist=[] - logging.info("____Start of setup_nfs____") - scrubnfs(systemconfig["TEMPLATES"]) - - if systemconfig["HaveCentralNFS"] == "yes": - logging.debug(" Using a Central NFS server") - if systemconfig["NFSserver"] == "file:nfsmap": - #if it's a file check for it, failure results in downloading attempt from MBE - nfsmap_file=data_config.MYTHHOME+"/templates/nfsmap" - if not os.path.exists(nfsmap_file): - logging.debug(" Couldn't find local %s",nfsmap_file) - logging.info(" Trying to download nfsmap from MBE") - nfsmap_file = download_nfsmap(systemconfig["dbhost"]) - nfslist = process_nfsmap_file(nfsmap_file) - # if it's an ip parse ip and download file - elif re.search(systemconfig["NFSserver"],":nfsmap"): - ip=systemconfig["NFSserver"].split(":")[0] - nfsmap_file = download_nfsmap(ip) - nfslist = process_nfsmap_file(nfsmap_file) - #else treat it as a single mount point - else: - item = (systemconfig["NFSserver"] , systemconfig["NFSmount"]) - nfslist.append(item) - else: - #if standalone or slave try to use MBE - if systemconfig["SystemType"] == "Frontend_only" or systemconfig["SystemType"] == "Slave_Backend": - item = (systemconfig["dbhost"] , data_config.DATAMOUNT) - nfslist.append(item) - setup_nfs_fstab(nfslist) - logging.info("__End of nfs\n") - -def setup_sleep(systemconfig): - logging.debug("____Setting up sleep____") - autoshutdown = systemconfig["AutoShutdown"] - stime1 = systemconfig["Shutdowntime"] - stime2 = systemconfig["Shutdowntime2"] - cstime1='' - - if autoshutdown == "1" : - if not stime1 == "-1" : - cstime1 = stime1 - cshutdown = cstime1 - if not stime2 == "-1" : - if cstime1 : - cshutdown = "%s,%s" %(cstime1,stime2) - else: - cshutdown = stime2 - logging.debug(" Shutdown time at %s",cshutdown) - cmd='''sed -e "s/HOUR/%s/g" %s/cron.template | crontab - -u mythtv''' %(cshutdown,systemconfig["TEMPLATES"]) - mv_common.runcmd(cmd) - else: - logging.info(" Shutdown not enabled") - cmd='''sed -e "/00 HOUR.*/d" %s/cron.template | crontab - -u mythtv''' %systemconfig["TEMPLATES"] - mv_common.runcmd(cmd) - - logging.debug("__End of sleep\n") - - -def process_nfsmap_file(mapfile): - logging.debug(" processing nfsmap file %s",mapfile) - nfslist = [] - try: - f = open(mapfile,"r") - for line in f.readlines(): - if line.startswith("#"): - continue - item = line.split() - if len(item) <= 1 : - continue - logging.debug(" %s",item) - nfslist.append(item) - except : - logging.critical("Couldn't read file %s, or some other error",mapfile) - return nfslist - -def scrubnfs(templates): - logging.info(" Scrubbing nfs") - mv_common.cp_and_log("/etc/fstab",templates+"/fstab.conf.template") - #used this sed cmd because it's clean and took me forever to figure out =) - cmd='''sed '/^#STARTSCRUB.*$/,/^#ENDSCRUB.*$/d' %s/fstab.conf.template > /etc/fstab''' %templates - mv_common.runcmd(cmd) - -def download_nfsmap(ip): - nfsmap_file="/tmp/nfsmap" - myurl="http://%s:1337/templates/nfsmap" %ip - req = Request(myurl) - try: - f = urlopen(req) - logging.info(" downloading %s", myurl) - local_file = open(nfsmap_file, "w") - #Write to our local file - local_file.write(f.read()) - local_file.close() - #handle errors - except HTTPError, e: - logging.info(" File download failed") - logging.debug(" %s", myurl) - logging.debug(" HTTP Error: %s", e.code) - except URLError, e: - logging.info(" File download failed") - logging.debug(" %s",myurl) - logging.debug(" URL Error: %s ", e.reason) - - return nfsmap_file - -def setup_nfs_fstab(nfslist): - logging.info(" Adding nfs paths to fstab") - try: - f = open('/etc/fstab', 'a') - line = "#STARTSCRUB --------------anything in this block will be scrubbed\n" - f.write(line) - for s, m in nfslist: - line = "%s %s nfs \n" %(s,m) - logging.debug(" %s",line) - f.write(line) - line = "#ENDSCRUB\n" - f.write(line) - f.close() - except: - logging.critical(" *Couldn't open /etc/fstab for writing") - logging.debug(" Done adding nfs paths to fstab") - diff --git a/abs/core-testing/LinHES-config/mv_network.py b/abs/core-testing/LinHES-config/mv_network.py deleted file mode 100755 index f256785..0000000 --- a/abs/core-testing/LinHES-config/mv_network.py +++ /dev/null @@ -1,510 +0,0 @@ -# -*- coding: utf-8 -*- -import sys , os, commands , glob, time, re -import logging -import mv_common -import socket, fcntl, struct, array -import netifaces, iplib -global etcnetdir -etcnetdir = "/etc/net/ifaces" - -def setup_MYTH_DHCP(systemconfig): - default_interface = systemconfig["default_interface"] - try: - defaultdhcp = systemconfig["HostUSEDHCP"+default_interface] - except: - logging.critical(" *Error occured finding default dhcp") - defaultdhcp = "0" - logging.debug(" Using %s as dhcp value for %s", defaultdhcp, default_interface) - return defaultdhcp - -def all_interfaces(): - max_possible = 128 # arbitrary. raise if needed. - bytes = max_possible * 32 - s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - names = array.array('B', '\0' * bytes) - outbytes = struct.unpack('iL', fcntl.ioctl( - s.fileno(), - 0x8912, # SIOCGIFCONF - struct.pack('iL', bytes, names.buffer_info()[0]) - ))[0] - namestr = names.tostring() - return [namestr[i:i+32].split('\0', 1)[0] for i in range(0, outbytes, 32)] - -def get_ip(ifname): - logging.debug(" Finding ip address for %s", ifname) - all_if = all_interfaces() - logging.debug(" found interfaces:%s", all_if) - if ifname in all_if : - logging.debug(" Found %s in all_interfaces", ifname) - else: - logging.critical("* Couldn't find %s in list", ifname) - ifname = all_if[0] - logging.critical("* Using %s for interface name", ifname) - - - s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - return socket.inet_ntoa(fcntl.ioctl( - s.fileno(), - 0x8915, # SIOCGIFADDR - struct.pack('256s', ifname[:15]) - )[20:24]) - -def get_default_route(iface): - rcroute = "127.0.0.1" - f = open ('/proc/net/route', 'r') - for line in f: - words = string.split (line) - netiface = words[0] - route = words[2] - flags = words[3] - try: - if ( netiface == iface ) and ( flags == "0003") : - route = iplib.IPv4Address(route, notation="hex") - t = str(route.get_dot()) - s = t.split(".") - rcroute = s[3] + "." + s[2] + "." + s[1] + "." + s[0] - break - except ValueError: - pass - return rcroute - -def setup_MYTH_IP(systemconfig): - default_interface = systemconfig["default_interface"] - #check for dhcp in use - if setup_MYTH_DHCP(systemconfig) == "0": - logging.debug(" dhcp is in use, finding dhcp ip") - defaultip = get_ip(default_interface) - else: - try: - defaultip = systemconfig["Hostip"+default_interface] - except: - logging.debug(" Error occured finding the defaultip") - defaultip = "127.0.0.1" - logging.debug(" Using %s as default ip", defaultip) - return defaultip - - -def setup_MYTH_GW(systemconfig): - default_interface = systemconfig["default_interface"] - #check for dhcp in use - if setup_MYTH_DHCP(systemconfig) == "0": - logging.debug(" dhcp is in use, finding dhcp ip") - defaultgw = get_default_route(default_interface) - else: - try: - defaultgw = systemconfig["Hostgw"+default_interface] - except: - logging.debug(" Error occured finding the defaultgw") - defaultgw = "127.0.0.1" - logging.debug(" Using %s as default gw", defaultgw) - return defaultgw - - -def setup_MTYH_DNS(): - returndns = "127.0.0.1" - try: - f = open ('/etc/resolv.conf', 'r') - for line in f: - if line.startswith("nameserver"): - print line - returndns = line.split()[1] - break - except: - logging.debug(" Couldn't open /etc/resolv.conf for myth_dns") - logging.debug(" using %s for myth_dns", returndns) - return returndns - - - - - -def flush(netdev): - logging.debug(" Flushing %s",netdev) - cmd = '''ip address flush dev %s''' %netdev - mv_common.runcmd(cmd) - -def kill_dhcp(basedir): - logging.debug(" _Start of kill_dhcp") - logging.debug(" Killing off dhcpd") - stddir = os.getcwd() - piddir = ("%s/var/run/") %basedir - try: - os.chdir(piddir) - for FILE in glob.glob("dhcpcd-*.pid"): - f = open(FILE,'r') - pid = f.readline() - f.close - cmd = "kill -9 %s" %pid - mv_common.runcmd(cmd) - mv_common.remove_file(FILE) - os.chdir(stddir) - except: - pass - -def setup_nameserver(dns): - logging.info(" Adding %s for DNS", dns) - cmd = '''grep -q %s /etc/resolv.conf''' %dns - status = mv_common.runcmd(cmd) - if not status == 0 : - cmd = ''' echo "nameserver %s" >> /etc/resolv.conf ''' %dns - mv_common.runcmd(cmd) - - - -def setup_hostname(systemconfig): - logging.debug(" _Start of setup_hostname") - try: - hostname = systemconfig["hostname"] - except: - logging.critical(" *Hostname could not be set") - logging.info(" Using default value of me") - hostname = "diamonds" - logging.info(" Setting the hostname to %s", hostname) - cmd = ''' echo %s > /etc/hostname ''' %hostname - mv_common.runcmd(cmd) - cmd = "cat /etc/hosts | grep -v 127.0.0.1 | grep -v %s > /tmp/hosts" %hostname - mv_common.runcmd(cmd) - if systemconfig["mythdhcp"] == "1" : - logging.debug(" not using dhcp") - cmd = ''' echo 127.0.0.1 localhost > /etc/hosts ''' - mv_common.runcmd(cmd) - cmd = ''' echo %s %s >> /etc/hosts ''' %(systemconfig["mythip"], systemconfig["hostname"]) - mv_common.runcmd(cmd) - else: - cmd = ''' echo 127.0.0.1 %s localhost > /etc/hosts ''' %systemconfig["hostname"] - mv_common.runcmd(cmd) - cmd = '''cat /tmp/hosts >> /etc/hosts ''' - mv_common.runcmd(cmd) - - -def write_wpafile(line,netdev): - logging.debug(" writing out wpa_supplicant.conf file") - logging.debug(line) - wpafile = etcnetdir+"/"+netdev+"/wpa_supplicant.conf" - try: - f = open(wpafile,'w') - f.write(line) - f.close() - except: - logging.debug(" Couldn't write to %s",wpafile) - -def setup_wpa(netinfo,netdev): - logging.info(" %s will use wpa for encryption",netdev) - line = ''' -#This file was automaticly generated, any changes may be lost -ctrl_interface=/var/run/wpa_supplicant -network={ - ssid="%s" - # Preshared key as an ASCII passphrase - psk="%s" - scan_ssid=1 - key_mgmt=WPA-EAP WPA-PSK NONE - pairwise=CCMP TKIP - proto=WPA RSN -}''' %(netinfo["ESSID"],netinfo["KEY"]) - write_wpafile(line,netdev) - -def setup_wep(netinfo,netdev): - logging.info(" %s will use wep for encryption",netdev) - logging.debug(" When a packet comes along, you must wep it") - line=''' -#This file was automaticly generated, any changes may be lost -ctrl_interface=/var/run/wpa_supplicant -network={ - ssid="%s" - key_mgmt=NONE - wep_key0=%s - wep_tx_keyidx=0 - scan_ssid=1 - auth_alg=SHARED -} -''' %(netinfo["ESSID"],netinfo["KEY"]) - write_wpafile(line,netdev) - - -def setup_none(netinfo,netdev): - logging.info(" %s will not use encryption",netdev) - line = ''' -#This file was automaticly generated, any changes may be lost -ctrl_interface=/var/run/wpa_supplicant -network={ - ssid="%s" - key_mgmt=NONE -} -''' %netinfo["ESSID"] - write_wpafile(line,netdev) - -def setup_interface(netdev,systemconfig): - logging.debug(" _Start of setup_interface for %s",netdev) - nettrans = {'Hostip':'ip', - 'Hostnetmask':'netmask', - 'HostActive':'isactive', - 'HostDNS':'dns', - 'HostUSEDHCP':'UseDHCP', - 'HostGW':'GW', - 'HostMTU':'mtu', - 'HOST_iswireless':"wireless", - 'HostESSID':'ESSID', - 'HostKey':'KEY', - 'HostUseEncryption':'ENCRYPT'} - netinfo = {} - #populate the netinfo dict - for netitem in nettrans: - if systemconfig[netitem+netdev]: - netinfo[nettrans[netitem]] = systemconfig[netitem+netdev] - else: - netinfo[nettrans[netitem]] = False - logging.debug(" %s:%s",netitem,netinfo[nettrans[netitem]]) - logging.info(" %s wireless: %s", netdev,netinfo["wireless"]) - try: - os.makedirs(etcnetdir) - except: - logging.debug(" Could not create %s",etcnetdir) - - optionfile=etcnetdir+"/"+netdev+"/options" - if not os.path.exists(optionfile): - try: - os.makedirs(etcnetdir+"/"+netdev) - except: - pass - mv_common.cp_and_log(systemconfig["TEMPLATES"]+"/etcnet/eth/options", optionfile) - - if netinfo["isactive"] == "1" : - change_iface_state(netdev,"enabled") - else: - change_iface_state(netdev,"disabled") - - if netinfo["wireless"] == "1" : - - logging.info(" Enabling wireless extensions") - cmd = ''' sed -i -e 's/^CONFIG_WIRELESS=.*$/CONFIG_WIRLESS=yes/g' %s/%s/options''' %(etcnetdir,netdev) - mv_common.runcmd(cmd) - if netinfo["ENCRYPT"] == "WEP": - setup_wep(netinfo,netdev) - elif netinfo["ENCRYPT"] == "WPA": - setup_wpa(netinfo,netdev) - elif netinfo["ENCRYPT"] == "none": - setup_none(netinfo,netdev) - - else: - logging.info(" Disabling wireless extensions") - cmd = '''sed -i -e 's/^CONFIG_WIRLESS=.*$/CONFIG_WIRLESS=no/g' %s/%s/options''' %(etcnetdir, netdev) - mv_common.runcmd(cmd) - #try: - wpafile=etcnetdir+"/"+netdev+"/wpa_supplicant.conf" - #os.remove(wpafile) - mv_common.remove_file(wpafile) - #except: - #logging.debug(" Couldn't remove %s",wpafile) - - if netinfo["UseDHCP"] == "0" : - logging.info(" Enabling DHCP support") - cmd = ''' sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=dhcp/g' %s/%s/options''' %(etcnetdir, netdev) - mv_common.runcmd(cmd) - else: - logging.info(" Using static ip address of %s",netinfo["ip"]) - cmd = ''' sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=static/g' %s/%s/options''' %(etcnetdir, netdev) - mv_common.runcmd(cmd) - cmd = '''echo "default via %s" > %s/%s/ipv4route''' %(netinfo["GW"], etcnetdir, netdev) - mv_common.runcmd(cmd) - cmd = '''echo "%s%s" > %s/%s/ipv4address ''' %(netinfo["ip"], netinfo["netmask"].split()[0], etcnetdir, netdev) - mv_common.runcmd(cmd) - setup_nameserver(netinfo["dns"]) - - if netinfo["mtu"] : - logging.info(" Setting mtu to %s", netinfo["mtu"]) - cmd = '''sed -i '/^mtu.*$/d' %s/%s/iplink''' %(etcnetdir,netdev) - mv_common.runcmd(cmd) - cmd = ''' echo "mtu %s" >> %s/%s/iplink''' %(netinfo["mtu"], etcnetdir,netdev) - mv_common.runcmd(cmd) - else: - logging.info(" Using default mtu value") - cmd = '''sed -i '/^mtu.*$/d' %s/%s/iplink''' %(etcnetdir,netdev) - mv_common.runcmd(cmd) - - -def change_iface_state(netdev, state): - if state == "enabled": - logging.info(" Activating %s", netdev) - cmd = '''sed -i -e 's/^ONBOOT=.*$/ONBOOT=yes/g' %s/%s/options''' %(etcnetdir,netdev) - mv_common.runcmd(cmd) - cmd = '''sed -i -e 's/^DISABLED=.*$/DISABLED=no/g' %s/%s/options ''' %(etcnetdir,netdev) - mv_common.runcmd(cmd) - else: - logging.info(" Disabling %s", netdev) - cmd = '''sed -i -e 's/^ONBOOT=.*$/ONBOOT=no/g' %s/%s/options''' %(etcnetdir,netdev) - mv_common.runcmd(cmd) - cmd = '''sed -i -e 's/^DISABLED=.*$/DISABLED=yes/g' %s/%s/options ''' %(etcnetdir,netdev) - mv_common.runcmd(cmd) - cmd = "/sbin/ifconfig %s down" %netdev - mv_common.runcmd(cmd) - cmd = "ip address flush %s" %netdev - mv_common.runcmd(cmd) - -def devcheck(netdev): - cmd = ''' /sbin/ifconfig %s''' %netdev - rc = mv_common.runcmd(cmd) - if rc == 0 : - return True - else: - return False - -def udev_rules(netdev): - filename = "/etc/udev/rules.d/net.rules" - if devcheck(netdev): - logging.info(" Finding macaddress for %s",netdev) - try: - macaddress = netifaces.ifaddresses(netdev)[netifaces.AF_LINK][0]['addr'] - logging.debug(" Macaddress: %s",macaddress) - except: - logging.debug(" Couldn't find mac address for %s",netdev) - return - try: - f = open(filename,'a') - except: - logging.debug(" Couldn't open %s for writing", filename) - return - if netdev.startswith('eth'): - line = '''KERNEL=="eth*", SYSFS{address}=="%s", NAME="%s"''' % ( macaddress , netdev) - elif netdev.startswith('wlan'): - line = '''KERNEL=="wlan*", SYSFS{address}=="%s", NAME="%s"'''% ( macaddress , netdev) - elif netdev.startswith('ath'): - line = '''KERNEL=="ath*", SYSFS{address}=="%s", NAME="%s"''' % ( macaddress , netdev) - logging.debug(" adding to net.rules ") - logging.debug(" %s",line) - f.write(line) - f.write("\n") - f.close() - -def find_active(systemconfig,this_is_install): - interfacelist=('eth0', 'eth1', 'wlan0', 'wlan1', 'ath0') - logging.debug(" _Start of find_active") - - if systemconfig["mythdhcp"] == "1": - mv_common.remove_file("/etc/resolv.conf") - cmd = ''' echo search lan > /etc/resolv.conf ''' - mv_common.runcmd(cmd) - cmd = ''' echo nameserver 127.0.0.1 >> /etc/resolv.conf ''' - mv_common.runcmd(cmd) - - for netdev in interfacelist: - if this_is_install: - udev_rules(netdev) - currentnet = "HostActive" + netdev - try: - systemconfig[currentnet] - except: - logging.debug(" %s is not defined",currentnet) - change_iface_state(netdev, "disabled") - continue - if systemconfig[currentnet] == "1" : - #check if device is present - if devcheck(netdev) : - setup_interface(netdev,systemconfig) - else: - logging.debug(" Interface %s not found in config", netdev) - #change_iface_state(netdev, "disabled") - else: - change_iface_state(netdev, "disabled") - -def vnc_netboot_check(): - logging.debug(" Start of VNC/NETBOOT check") - vnc = False - netboot = False - try: - f = open('/proc/cmdline', 'r') - bootoptions = f.readlines() - f.close() - except: - logging.critical(" *Couldn't open /proc/cmdline") - logging.debug(" Assuming it's ok to fiddle with the network") - return True - bootoptions = bootoptions[0] - if re.match("vnc",bootoptions) != None : - logging.debug(" Found VNC option") - vnc = True - if re.match("nfsroot",bootoptions) != None : - logging.debug(" Found netboot option") - netboot = True - - return (vnc or netboot) - -def start_network(): - if not vnc_netboot_check(): - logging.info(" Restarting network") - cmd ="/etc/net/scripts/network.init reload" - mv_common.runcmd(cmd) - cmd ="/etc/net/scripts/network.init restart" - mv_common.runcmd(cmd) - else: - logging.info(" Will not restart network due to netboot/vnc") - - -def stop_network(): - if not vnc_netboot_check(): - logging.info(" Stopping network") - cmd ="/etc/net/scripts/network.init stop" - mv_common.runcmd(cmd) - kill_dhcp("") - interfacelist=('eth0', 'eth1', 'wlan0', 'wlan1', 'ath0') - for i in interfacelist: - flush(i) - else: - logging.info(" Will not stop network due to netboot/vnc") - pass - -def hostname_change_check(systemconfig): - restartfe = False - logging.debug(" _Start of hostname_change_check") - oldhostname = socket.gethostname() - #oldhostname = "crap" - newhostname = systemconfig["hostname"] - mv_root = systemconfig["MVROOT"] - logging.debug(" Old hostname: %s", oldhostname) - logging.debug(" New hostname: %s", newhostname) - if oldhostname != newhostname : - logging.info(" Changing hostname in database to match new hostname") - cmd ="%s/bin/restore_default_settings.sh -cuhostname -o -h%s" %(mv_root, oldhostname) - mv_common.runcmd(cmd) - logging.info(" Changing hostname to %s", newhostname) - cmd = "hostname %s" %newhostname - mv_common.runcmd(cmd) - if systemconfig["SystemType"] != "Frontend_only" : - logging.info(" Restarting backend") - mv_common.stop_service("mythbackend") - mv_common.start_service("mythbackend") - restartfe = True - else: - logging.debug(" old and new hostnames matched, leaving things along") - logging.debug(" __End of hostname_change_check") - return restartfe - - - -def setup_network (systemconfig,this_is_install): - if mv_common.read_config(mv_common.module_config,"network") == False : - logging.info("____Skipping of network, config disabled____") - return False - logging.info("____Start of network____") - logging.info(" Setting up the network") - restartfe = hostname_change_check(systemconfig) - setup_hostname(systemconfig) - find_active(systemconfig,this_is_install) - start_network() - logging.info("__End of network\n") - return restartfe - - - -##this is used by the install process to start the network -def install_network_setup(systemconfig): - logging.info("____Start of network_install____") - logging.info(" Setting up the network") - #setup_MYTH_vars - setup_hostname(systemconfig) - stop_network() - find_active(systemconfig) - start_network() - logging.info("__End of network install \n") - - diff --git a/abs/core-testing/LinHES-config/mv_screensaver.py b/abs/core-testing/LinHES-config/mv_screensaver.py deleted file mode 100755 index 4068832..0000000 --- a/abs/core-testing/LinHES-config/mv_screensaver.py +++ /dev/null @@ -1,202 +0,0 @@ -# -*- coding: utf-8 -*- -import logging, mv_common -import re -import os - - -def mplayer_saver_check (cmd,templatefile): - logging.debug(" Checking for heartbeat command in mplayer.conf") - mplayerconf = "/etc/mplayer/mplayer.conf" - if not os.path.exists(mplayerconf): - logging.debug(" copying in mplayer template file") - mv_common.cp_and_log(templatefile, mplayerconf) - - try: - f = open(mplayerconf, 'r') - mplayerconf_contents = f.readlines() - f.close() - except: - logging.debug(" Couldn't open %s for reading",mplayerconf) - mplayerconf_contents = "#\n" - - try: - f = open(mplayerconf, 'w') - except: - logging.debug(" Couldn't open %s for writing",mplayerconf) - return - - for line in mplayerconf_contents: - if re.match("^.*stop-xscreensaver",line): - continue - elif re.match("^.*heartbeat-cmd",line): - continue - else: - f.write(line) - - f.write("stop-xscreensaver = 0\n") - line='''heartbeat-cmd="%s"\n''' %cmd - f.write(line) - f.close() - - -def killxscreensaver(): - logging.info(" Stopping xscreensaver") - cmd="xscreensaver-command --exit " - mv_common.runcmd(cmd) - cmd="killall xscreensaver " - mv_common.runcmd(cmd) - -def killgscreensaver(): - logging.info(" Stopping gnome-screensaver") - cmd="gnome-screensaver-command --exit " - mv_common.runcmd(cmd) - cmd="killall gnome-screensaver " - mv_common.runcmd(cmd) - - -def setup_x_screensaver(idle,theme,screenconfigfile,templatefile): - logging.info(" Configuring X screensaver") - killgscreensaver() - logging.debug(" Why can't xscreensaver have a nice configuration !") - - if not os.path.exists(screenconfigfile): - logging.debug(" copying in new template file") - mv_common.cp_and_log(templatefile,screenconfigfile) - - try: - f = open(screenconfigfile, 'r') - screenconfigcontents=f.readlines() - f.close() - except: - logging.info("Couldn't open %s for reading",screenconfigfile) - return - try: - f = open(screenconfigfile, 'w') - except: - logging.info("Couldn't open %s for writing",screenconfigfile) - return - - startline=0 - foundline=0 - - for k, line in enumerate(screenconfigcontents): - if re.match("programs:",line): - startline = k - if re.search(theme,line): - foundline = k - themenumber=foundline-startline-2 - - for line in screenconfigcontents: - if re.match("selected.*$",line): - continue - - if re.match("timeout",line): - logging.info(" Setting idletime to %s",idle) - outline = "timeout: 0:%s:00 \n" %idle - f.write(outline) - elif re.match("mode",line): - if theme == "Random": - logging.info(" Setting theme to %s", "Random") - outline = "mode: random \n" - f.write(outline) - outline = "selected: -1 \n" - f.write(outline) - continue - - elif theme == "Blank": - logging.info(" Setting theme to %s", "blank") - outline = "mode: blank \n" - f.write(outline) - outline = "selected: -1 \n" - f.write(outline) - continue - - else: - logging.info(" Setting theme to %s", theme) - outline = "mode: one\n" - f.write(outline) - logging.debug(" Theme number is %s",themenumber) - outline = "selected: %s\n" %themenumber - f.write(outline) - continue - - else: - outline = line - f.write(outline) - f.close() - logging.debug("__End of xscreensaver") - -def setup_gnome_screensaver(theme,idletime): - logging.info(" Configuring gnome screensaver") - - logging.info(" Disabling lock screen") - cmd='''gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory --type bool --set /apps/gnome-screensaver/lock_enabled false''' - mv_common.runcmd(cmd) - - logging.info(" Setting idletime to %s",idletime) - cmd='''gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory --type int -s "/apps/gnome-screensaver/idle_delay" %s''' %idletime - mv_common.runcmd(cmd) - - logging.info(" Setting mode to single") - cmd='''gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory --type string -s "/apps/gnome-screensaver/mode" single''' - mv_common.runcmd(cmd) - - if theme == "Random": - logging.info(" setting theme to random") - cmd='''gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory --type string -s "/apps/gnome-screensaver/mode" random''' - mv_common.runcmd(cmd) - - elif theme == "Blank": - logging.info(" setting theme to blank") - cmd='''gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory --type string -s "/apps/gnome-screensaver/themes" blank''' - mv_common.runcmd(cmd) - - else: - logging.info(" setting theme to %s",theme) - cmd='''gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory --set --type list --list-type=string /apps/gnome-screensaver/themes [screensavers-%s]''' %theme - mv_common.runcmd(cmd) - - killxscreensaver() - logging.info("__End gnome screensaver") - - - - -def setup_screensaver (systemconfig,data_config): - if mv_common.read_config(mv_common.module_config,"screensaver") == False : - logging.info("____Skipping of Screensaver, config disabled____") - return - logging.info("____Start of screensaver configuration____") - screensavertype = systemconfig["Screensavertype"] - theme = systemconfig["Screensavertheme"] - idletime = systemconfig["Screensaveridle"] - configfile = data_config.MYTHHOME+"/.xscreensaver" - templatefile = systemconfig["TEMPLATES"]+"/xscreensaver.template" - mtemplate = systemconfig["TEMPLATES"]+"/mplayer.conf.template" - - if screensavertype == "xscreensaver": - mv_common.pacinstall("xscreensaver") - mv_common.pacremove("gnome-screensaver") - setup_x_screensaver(idletime, theme, configfile, templatefile) - mplayer_saver_check("/usr/bin/xscreensaver-command -deactivate &",mtemplate) - - elif screensavertype == "gscreensaver": - mv_common.pacinstall("xscreensaver") - mv_common.pacinstall("gnome-screensaver") - setup_gnome_screensaver(theme,idletime) - mplayer_saver_check("/usr/bin/gnome-screensaver-command -p &",mtemplate) - - elif screensavertype == "none": - mv_common.pacremove("xscreensaver") - mv_common.pacremove("gnome-screensaver") - killgscreensaver() - killxscreensaver() - - elif screensavertype == "tinker" : - logging.debug(" screensaver tinker mode detected") - else: - logging.debug(" Unknown screensaver") - logging.info("__End of screensaver\n") - - - diff --git a/abs/core-testing/LinHES-config/mv_smolt.py b/abs/core-testing/LinHES-config/mv_smolt.py deleted file mode 100755 index cfc697e..0000000 --- a/abs/core-testing/LinHES-config/mv_smolt.py +++ /dev/null @@ -1,62 +0,0 @@ -# -*- coding: utf-8 -*- -import logging -import mv_common - -def read_release(stype): - if stype == "LinHES": - rfile = "/etc/LinHES-release" - else: - rfile = "/etc/MythVantage-release" - - try: - f= open(rfile,'r') - releasename = f.readlines()[0] - f.close() - except: - logging.debug(" Couldn't open %s",rfile) - releasename = "unknown" - - return releasename - - -def setup_smolt_type(SystemType,Remotetype,RunFrontend,mythhome,stype): - if mv_common.read_config(mv_common.module_config,"smolt") == False : - logging.info("____Skipping of smolt, config disabled____") - return - logging.debug("____Start of setup_smolt_type____") - releasename = read_release(stype) - - if SystemType == "Standalone": - smoltsystem = 6 - MVRELEASE="%s (Standalone)" %releasename - elif SystemType == "Master_backend": - if RunFrontend == "1": - smoltsystem = 2 - MVRELEASE="%s (MBE with Frontend)" %releasename - else: - smoltsystem=1 - MVRELEASE="%s (MBE)" %releasename - elif SystemType == "Slave_backend": - if RunFrontend == "1" : - smoltsystem = 4 - MVRELEASE="%s (SLAVE with Frontend)" %releasename - else: - smoltsystem = 5 - MVRELEASE="%s (SLAVE)" %releasename - elif SystemType == "Frontend_only": - smoltsystem = 3 - MVRELEASE="%s ( Frontend only)" %releasename - - logging.debug(" smolt type is %s : %s", MVRELEASE,smoltsystem) - smoltfile = mythhome+"/.mythtv/smolt.info" - cmd = ''' echo "%s" > /etc/os_myth_release ''' %MVRELEASE - mv_common.runcmd(cmd) - - cmd = '''echo "systemtype=%s" > %s''' %(smoltsystem,smoltfile) - mv_common.runcmd(cmd) - - cmd = '''echo "remote=%s" >> %s ''' %(Remotetype,smoltfile) - mv_common.runcmd(cmd) - - logging.debug("__End of setup_smolt_type") - diff --git a/abs/core-testing/LinHES-config/mv_software.py b/abs/core-testing/LinHES-config/mv_software.py deleted file mode 100755 index c0f5a5b..0000000 --- a/abs/core-testing/LinHES-config/mv_software.py +++ /dev/null @@ -1,65 +0,0 @@ -# -*- coding: utf-8 -*- -import logging, mv_common -import os, re - -def setup_software(systemconfig, data_config): - if mv_common.read_config(mv_common.module_config,"software") == False : - logging.info("____Skipping of software, config disabled____") - return - - logging.info("____Start of Software install____") - postfix='' - if data_config.SYSTEMTYPE == "MythVantage": - #look for the installed prefix - cmd="pacman -Q mythtv-release-fixes" - rc = mv_common.runcmd(cmd) - if rc == 0: - postfix = "-release-fixes" - else: - postfix = "-svn" -#This section is for MythVantage OS, not LINHES - default_disabled = ("mythphone", "mytharchive", "mythbrowser", "mythnews", - "mythgame", "mythflix", "mythweather", - "mythzoneminder","mythnetvision" ) - - default_installed=("mythcontrols", "mythgallery", "mythmovies", - "mythmusic", "mythsmolt", "mythvideo") - other_pkg=("miro", "mednafen", "romdb", "xine", "dvdcss", "webmin" , "fuppes", "foldingathome", "mythappletrailers", "mythstream", "mupen64") - else: - default_disabled = ("mythphone", "mytharchive", "mythbrowser", "mythnews", - "mythgame", "mythflix", "mythweather", - "mythappletrailers", "mythstream", "mythvodka", - "mythzoneminder","mythnetvision" ) - - default_installed=("mythcontrols", "mythgallery", "mythmovies", - "mythmusic", "mythsmolt", "mythvideo") - other_pkg=("miro", "mednafen", "romdb", "xine", "dvdcss", "webmin" , "fuppes", "foldingathome","mupen64") - - for pkg in default_disabled: - pkgname=pkg+postfix - try: - if systemconfig[pkg] == "1": - mv_common.pacinstall(pkgname) - else: - mv_common.pacremove(pkgname) - except: - logging.debug(" ERROR-- %s is not defined", pkg) - - for pkg in default_installed: - try: - if systemconfig[pkg] == "0": - mv_common.pacremove(pkgname) - else: - mv_common.pacinstall(pkgname) - except: - logging.debug(" ERROR-- %s is not defined", pkg) - - for pkg in other_pkg: - try: - if systemconfig[pkg] == "1": - mv_common.pacinstall(pkg) - elif systemconfig[pkg] == "0": - mv_common.pacremove(pkg) - except: - logging.debug(" ERROR-- %s is not defined", pkg) - logging.info("__End Software\n ") diff --git a/abs/core-testing/LinHES-config/mv_webuser.py b/abs/core-testing/LinHES-config/mv_webuser.py deleted file mode 100755 index 3e383f2..0000000 --- a/abs/core-testing/LinHES-config/mv_webuser.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -import logging, mv_common -#import os - -def setup_web_auth(UseMythWEB_auth): - if mv_common.read_config(mv_common.module_config,"webuser") == False : - logging.info("____Skipping of webuser, config disabled____") - return - - logging.info("____Start of setup_web_auth____") - if UseMythWEB_auth == str(1): - #enable auth - logging.info(" Enabling authorization for mythweb") - cmd='''sed -i "s/^.*include.*auth-inc.conf.*$/include \\"\/etc\/lighttpd\/auth-inc.conf\\"/g" /etc/lighttpd/lighttpd.conf''' - mv_common.runcmd(cmd) - else: - #disable auth - logging.info(" Disabling authorization for mythweb") - cmd='''sed -i "s/^.*include.*auth-inc.conf.*$/#include \\"\/etc\/lighttpd\/auth-inc.conf\\"/g" /etc/lighttpd/lighttpd.conf''' - mv_common.runcmd(cmd) - logging.debug("Restarting lighttpd") - cmd="sudo sv restart lighttpd" - mv_common.runcmd(cmd) - logging.info("__End of webauth\n") - diff --git a/abs/core-testing/LinHES-config/myth_user_call b/abs/core-testing/LinHES-config/myth_user_call deleted file mode 100644 index 0914b03..0000000 --- a/abs/core-testing/LinHES-config/myth_user_call +++ /dev/null @@ -1,174 +0,0 @@ -#!/bin/bash -#Wrapper script to manage USERNAME accounts + web security -# myth_USERNAME_all -c add -u USERNAME -# myth_USERNAME_all -c delete -u USERNAME -# myth_USERNAME_all -c pass -u USERNAME -p pass -# myth_USERNAME_all -c web -u USERNAME -p pass - -INIT_CHECK=TRUE -FULL_CALL="$@" -function CHROOT_CHECK { - INIT=`ps -p 1 -o comm=` - if [ x$INIT = xrunit ] - then - CHROOT_NEEDED=FALSE - else - CHROOT_NEEDED=TRUE - fi -} - -function store_commands () { - echo "$FULL_CALL" >> /root/myth_user_call.out - chmod 600 /root/myth_user_call.out -} - - -function add_user() { - if [ $CHROOT_NEEDED = TRUE ] - then - echo "calling myth_call_user in chroot to add user" - store_commands - else - echo "adding user $USERNAME" - useradd -m -s /bin/bash $USERNAME -G audio,video,optical,storage,users - usermod -a -G mythtv $USERNAME - - fi - -} - - -function del_user() { - if [ $CHROOT_NEEDED = TRUE ] - then - echo "calling myth_call_user in chroot to delete user" - store_commands - else - echo "removing user $USERNAME" - userdel $USERNAME - fi - -} - - -function pass_change() { - if [ $CHROOT_NEEDED = TRUE ] - then - echo "calling myth_call_user in chroot to change password" - store_commands - else - echo "changing password for $USERNAME" - echo $USERNAME:$PASSWORD | chpasswd - fi - -} - - -function web_security { - - grep -q ${USERNAME}: /etc/lighttpd/lighttpd.user - if [ $? = 0 ] - then - #delete user - sed -i "/${USERNAME}\:/d" /etc/lighttpd/lighttpd.user - fi - echo "${USERNAME}:${PASSWORD}" >> /etc/lighttpd/lighttpd.user - -} - -function ARG_ERR() { - if [ x$OPTARG = "x" ] - then - echo "$SWITCH NEEDS AND ARG" - exit 11 - fi -} - - -function print_help { - - echo "Valid options are:" - echo " -c (add|delete|pass|web)" - echo " -u USERNAMEname" - echo " -p password" - exit 1 -} - -if [ $# -eq 0 ] -then - print_help -fi - -declare -r OPTSTRING="c:u:p:i" -while getopts "$OPTSTRING" SWITCH -do - case $SWITCH in - - c) ARG_ERR - OPERATION=$OPTARG - ;; - u) ARG_ERR - USERNAME=$OPTARG - ;; - p) ARG_ERR - PASSWORD=$OPTARG - ;; - i) INIT_CHECK=FALSE - - esac -done - -if [ $INIT_CHECK = TRUE ] -then - CHROOT_CHECK -else - CHROOT_NEEDED=FALSE -fi - -case $OPERATION in - add) - if [ x$USERNAME = x ] - then - print_help - fi - add_user - ;; - delete) - if [ x$USERNAME = x ] - then - print_help - fi - del_user - ;; - pass) - if [ x$USERNAME = x ] - then - print_help - fi - - if [ x$PASSWORD = x ] - then - print_help - fi - pass_change - ;; - - web) - if [ x$USERNAME = x ] - then - print_help - fi - - - if [ x$PASSWORD = x ] - then - print_help - fi - echo "adding webUSERNAME $USERNAME with pass $PASSWORD" - web_security - ;; - *) print_help - ;; -esac - - diff --git a/abs/core-testing/LinHES-config/myth_user_call.py b/abs/core-testing/LinHES-config/myth_user_call.py deleted file mode 100755 index 63915a4..0000000 --- a/abs/core-testing/LinHES-config/myth_user_call.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -#Wrapper script to manage USERNAME accounts + web security -# myth_USERNAME_all -c add -u USERNAME -# myth_USERNAME_all -c delete -u USERNAME -# myth_USERNAME_all -c pass -u USERNAME -p pass -# myth_USERNAME_all -c web -u USERNAME -p pass - -import pexpect, sys, time -import os, re, getopt -import mv_common - - - - -def chroot_check(): - if not INIT_CHECK : - return False - cmd = '''ps -p 1 -o comm=''' - init = mv_common.runcmd_output(cmd).strip() - if init == "runit": - return False - else: - return True - - -def store_commands(full_call): - file_name = "/root/myth_user_call.out" - try: - f = open(file_name,'a') - except: - print "%s could not be opened" % file_name - sys.exit(1) - f.write(full_call) - f.write("\n") - f.close() - try: - os.chmod(600,file_name) - except: - pass - - -def add_user(username,full_call): - if chroot_check() : - print "calling myth_call_user in chroot to add user" - store_commands(full_call) - else: - print "Adding user %s" %username - cmd = '''useradd -m -s /bin/bash %s -G audio,video,optical,storage,users''' %username - mv_common.runcmd(cmd) - cmd = ''' usermod -a -G mythtv %s ''' %username - - -def del_user(username,full_call): - if chroot_check() : - print "calling myth_call_user in chroot to del user" - store_commands(full_call) - else: - print "Removing user %s" %username - cmd = '''userdel %s ''' %username - mv_common.runcmd(cmd) - - -def pass_change(username,password,full_call) : - if chroot_check() : - print "calling myth_call_user in chroot to change password" - store_commands(full_call) - else: - print "changing password for %s" %username - passwd = pexpect.spawn("/usr/bin/passwd %s" % username) - - for repeat in (1, 2): - passwd.expect("password: ") - passwd.sendline(password) - time.sleep(0.1) - -def web_security(username,password) : - file_name = "/etc/lighttpd/lighttpd.user" - file_contents = '' - if os.path.exists(file_name): - try: - f = open(file_name,'r') - file_contents = f.readlines() - except: - print " couldn't read %s" % file_name - try: - f = open(file_name,'w') - except: - print "%s could not be opened for writing" % file_name - return - - for line in file_contents: - if not re.search(username, line): - f.write(line) - line = "%s:%s" %(username, password) - f.write(line) - f.write("\n") - f.close() - - -def usage (): - print "Valid options are:" - print " -c (add|delete|pass|web)" - print " -u USERNAME" - print " -p password" - sys.exit(0) - -def main(argv): - global INIT_CHECK - full_call = "" - INIT_CHECK = True - try: - opts, args = getopt.getopt(argv, 'c:u:p:ih' ) - except getopt.GetoptError, why: - print why - usage() - print "exception happened" - sys.exit(2) - - for opt, arg in opts: - if opt in ("-h", "--help"): - usage() - sys.exit(0) - elif opt in ("-c") : - module = arg - full_call += ''' -c %s ''' %re.escape(arg) - elif opt in ("-u") : - username = arg - full_call += ''' -u %s ''' %re.escape(arg) - elif opt in ("-p") : - password = arg - full_call += ''' -p %s ''' %re.escape(arg) - elif opt in ("-i") : - INIT_CHECK = False - full_call += ''' -i ''' - try: - username - except: - usage() - - if module == "add": - add_user(username,full_call) - elif module == "delete": - del_user(username,full_call) - elif module == "pass": - try: - password - except: - print "needs a password" - usage() - pass_change(username,password,full_call) - elif module == "web": - web_security(username,password) - else: - usage() - -if __name__ == "__main__": - main(sys.argv[1:]) - diff --git a/abs/core-testing/LinHES-config/mythvantage.cfg b/abs/core-testing/LinHES-config/mythvantage.cfg deleted file mode 100644 index eaa4865..0000000 --- a/abs/core-testing/LinHES-config/mythvantage.cfg +++ /dev/null @@ -1,21 +0,0 @@ -[mythvantage] -#change any of the following to False or True -# True will allow systemconfig to run that module -# False will skip the module -misc = True -sleep = True -hostype = True -advanced = True -audio = True -network = True -xorg = True -webuser = True -restartfe = True -reloadfe = True -ddns = True -screensaver = True -ir = True -user = True -software = True -smolt = True - diff --git a/abs/core-testing/LinHES-config/networkconfig.sh b/abs/core-testing/LinHES-config/networkconfig.sh deleted file mode 100644 index 770aa98..0000000 --- a/abs/core-testing/LinHES-config/networkconfig.sh +++ /dev/null @@ -1,341 +0,0 @@ -#!/bin/bash -#. /etc/profile -#. /etc/systemconfig -#BASE=/tmp -ETCNETDIR=$BASE/etc/net/ifaces - - - -function kill_dhcp () -{ -#for i in ${BASE}/etc/dhcpc/dhcpcd-*.pid -for i in ${BASE}/var/run/dhcpcd-*.pid -do - if [ -f ${i} ] - then - pid=`cat ${i}` - kill -9 $pid - rm -f ${i} - fi - if [ x$1 = xflush ] - then - for ifdev in eth0 wlan0 eth1 wlan1 - do - echo ${i} |grep $ifdev - status=$? - if [ $status = 1 ] - then - ip address flush $ifdev - fi - done - fi - -done - -} - -function kill_dhcp_chroot () -{ -#for i in ${BASE}/etc/dhcpc/dhcpcd-*.pid -for i in ${mountpoint}/var/run/dhcpcd-*.pid -do - if [ -f ${i} ] - then - pid=`cat ${i}` - kill -9 $pid - rm -f ${i} - fi -done - -} - - - -function setup_nameserver(){ -grep -q $1 ${BASE}/etc/resolv.conf -status=$? -if [ ! $status = 0 ] -then - echo "nameserver $1" >> ${BASE}/etc/resolv.conf -fi - -} - -function change_iface_state () { - if [ x$2 = xenabled ] - then - echo "setting $1 to active" - sed -i -e 's/^ONBOOT=.*$/ONBOOT=yes/g' $ETCNETDIR/$1/options - sed -i -e 's/^DISABLED=.*$/DISABLED=no/g' $ETCNETDIR/$1/options - else - echo "setting $1 to inactive" - if [ -e $ETCNETDIR/$1/options ] - then - sed -i -e 's/^ONBOOT=.*$/ONBOOT=no/g' $ETCNETDIR/$1/options - sed -i -e 's/^DISABLED=.*$/DISABLED=yes/g' $ETCNETDIR/$1/options - fi - /sbin/ifconfig $1 down - ip address flush $1 - fi - -} - -function setup_interfaces() { - local IS_WIRELESS - local ip - local netmask - local isactive - local dns - local UseDHCP - local GW - local ESSID - local KEY - local ENCRYPT - local TEMPNET - local MTU - IS_WIRELESS=false - - #local ip - TEMPNET="Hostip"$1 - echo $TEMPNET - eval ip=\$${TEMPNET} - - TEMPNET=Hostnetmask$1 - eval netmask=\$${TEMPNET} - netmask=`echo "$netmask" | cut -d " " -f1` - - TEMPNET=HostActive$1 - eval isactive=\$${TEMPNET} - - TEMPNET=HostDNS$1 - eval dns=\$${TEMPNET} - - TEMPNET="HostUSEDHCP"$1 - eval UseDHCP=\$${TEMPNET} - - TEMPNET=HostGW$1 - eval GW=\$${TEMPNET} - - TEMPNET=HOST_iswireless$1 - eval wireless=\$${TEMPNET} - - TEMPNET=HostMTU$1 - eval MTU=\$${TEMPNET} - - - - if [ x$wireless = x1 ] - then - IS_WIRELESS=TRUE - TEMPNET=HostESSID$1 - eval ESSID=\$${TEMPNET} - - TEMPNET="HostKey"$1 - eval KEY=\$${TEMPNET} - - TEMPNET=HostUseEncryption$1 - eval ENCRYPT=\$${TEMPNET} - fi - - - echo "Setup $1 in progress, wireless: $IS_WIRELESS" - - if [ ! -d $ETCNETDIR/$1 ] - then - mkdir -p $ETCNETDIR/$1 - fi - - if [ ! -f $ETCNETDIR/$1/options ] - then - cp -f $TEMPLATES/etcnet/eth/options $ETCNETDIR/$1/options - fi - - if [ x$isactive = x1 ] - then - change_iface_state $1 enabled - #echo "setting $1 to active" - #sed -i -e 's/^ONBOOT=.*$/ONBOOT=yes/g' $ETCNETDIR/$1/options - #sed -i -e 's/^DISABLED=.*$/DISABLED=no/g' $ETCNETDIR/$1/options - else - change_iface_state $1 disabled - #echo "setting $1 to inactive" - #sed -i -e 's/^ONBOOT=.*$/ONBOOT=no/g' $ETCNETDIR/$1/options - #sed -i -e 's/^DISABLED=.*$/DISABLED=yes/g' $ETCNETDIR/$1/options - fi - - if [ x$IS_WIRELESS = xTRUE ] - then - echo "setting $1 wireless" - sed -i -e 's/^CONFIG_WIRELESS=.*$/CONFIG_WIRLESS=yes/g' $ETCNETDIR/$1/options - #set the key and essid - echo "essid $ESSID" > $ETCNETDIR/$1/iwconfig - if [ x$ENCRYPT = x1 ] - then - echo "key $KEY" >> $ETCNETDIR/$1/iwconfig - fi - - else - echo "disabling wireless" - sed -i -e 's/^CONFIG_WIRLESS=.*$/CONFIG_WIRLESS=no/g' $ETCNETDIR/$1/options - fi - - if [ x$UseDHCP = x0 ] - then - echo using dhcp - sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=dhcp/g' $ETCNETDIR/$1/options - - else - echo "using static ip" - sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=static/g' $ETCNETDIR/$1/options - echo "default via $GW" > $ETCNETDIR/$1/ipv4route - echo "$ip$netmask" > $ETCNETDIR/$1/ipv4address - setup_nameserver $dns - fi - - if [ x$MTU = x ] - then - echo "MTU is blank, card will use default values" - sed -i '/^mtu.*$/d' /etc/net/ifaces/$1/iplink - else - echo "setting mtu for $1 to $MTU" - sed -i '/^mtu.*$/d' /etc/net/ifaces/$1/iplink - echo "mtu $MTU " >> /etc/net/ifaces/$1/iplink - fi -} - - -function find_active () { -#HostActiveeth1="1" -rm -f ${BASE}/etc/resolv.conf -if [ x$MYTHDHCP = x1 ] - then - #add 127.0.0.1 to /etc/resolv.conf - echo "search lan" > ${BASE}/etc/resolv.conf - echo "nameserver 127.0.0.1" >> ${BASE}/etc/resolv.conf - fi - -for i in eth0 eth1 wlan0 wlan1 -do - CURRENTIF="HostActive"$i - eval IFSTATE=\$${CURRENTIF} - echo $IFSTATE "---" - echo $i - if [ x$IFSTATE = x1 ] - then - setup_interfaces $i - else - change_iface_state $i disabled - fi -done - -} - -function setup_hostname { -#set the hostname -if [ ! x$hostname = x ] -then - echo $hostname > ${BASE}/etc/hostname - cat $BASE/etc/hosts |grep -v 127.0.0.1|grep -v $hostname > /tmp/hosts - #cat $BASE/etc/hosts |grep -v 127.0.0.1|grep -v $hostname | grep -v $ip > /tmp/hosts - - if [ x$MYTHDHCP = x1 ] - then - echo "127.0.0.1 localhost " > ${BASE}/etc/hosts - echo "$MYTHIP $hostname " >> ${BASE}/etc/hosts - else - echo "127.0.0.1 $hostname localhost " > ${BASE}/etc/hosts - fi - cat /tmp/hosts >> ${BASE}/etc/hosts -fi - -kill_dhcp -} - -function vnc_check() { - CMDLINE=$(cat /proc/cmdline) - echo $CMDLINE |grep -q vnc - USEVNC=$? - echo $CMDLINE |grep -q nfsroot - NETBOOT=$? - echo $USEVNC - if [ ! x$USEVNC = x0 ] - then - echo "not using vnc" - if [ ! x$NETBOOT = x0 ] - then - echo "not using netboot" - else - echo "using netboot" - USEVNC=0 - fi - - else - echo " using vnc" - fi -} - -function setup_MYTH_vars { - TEMPMYTH="Hostip"$default_interface - #echo $TEMPMYTH - eval MYTHIP=\$${TEMPMYTH} - - TEMPMYTH="HostUSEDHCP"$default_interface - eval MYTHDHCP=\$${TEMPMYTH} - - - -} - - - - -function start_network { -if [ ! $USEVNC = 0 ] -then - /etc/net/scripts/network.init reload - /etc/net/scripts/network.init restart -else - echo "VNC/NETBOOT in use, will NOT restart network" -fi - -} - -function setup_network { - setup_MYTH_vars - setup_hostname - find_active -} - - -function stop_network { -if [ ! $USEVNC = 0 ] -then - echo "stopping the network" - kill_dhcp flush - ip address flush dev eth0 2>&1 >/dev/null - ip address flush dev eth1 2>&1 >/dev/null - ip address flush dev wlan0 2>&1 >/dev/null - ip address flush dev wlan1 2>&1 >/dev/null -else - echo "VNC/NETBOOT in use, will NOT restart network" -fi - -} - - -#this is used by the install process to start the network -function install_network_setup { - setup_MYTH_vars - setup_hostname - stop_network - find_active - start_network - -} - - - - - - - diff --git a/abs/core-testing/LinHES-config/remove_service.sh b/abs/core-testing/LinHES-config/remove_service.sh deleted file mode 100755 index 6cc4b4f..0000000 --- a/abs/core-testing/LinHES-config/remove_service.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -SERVICE_DIR=/var/service -SCRIPT_DIR=/etc/sv -if [ -e $SERVICE_DIR/$1 ] -then - echo "removing" - rm $SERVICE_DIR/$1 -fi diff --git a/abs/core-testing/LinHES-config/restore_default_settings.sh b/abs/core-testing/LinHES-config/restore_default_settings.sh deleted file mode 100755 index ffd4b0d..0000000 --- a/abs/core-testing/LinHES-config/restore_default_settings.sh +++ /dev/null @@ -1,374 +0,0 @@ -#!/bin/bash -. /etc/profile -. /etc/systemconfig -shopt -s -o nounset -echo $@ >> /tmp/restore.out -#TEMPLATES="/usr/share/templates/settings" -TEMPLATES="$TEMPLATES/settings" -TABLES="settings keybindings jumppoints" -MYTHDBUSER=mythtv -MYTHTVPASSWD=mythtv -declare -r OPTSTRING="c:e:t:d:h:s:a:z:Ho" -Thistemplate="" -declare -i OVERRIDE=0 -declare -i EVERYTHING=0 - - -function CMD_DEFINE () { - #add override check - if [ x$Thistemplate = xsyssettings -a $OVERRIDE -eq 1 ] - then - MYSQLCMD="mysql --local-infile -s -u$MYTHDBUSER -p$MYTHTVPASSWD -h$ovdbhost mythconverg -B --exec" - MYSQLCMD_C="mysql -u$MYTHDBUSER -p$MYTHTVPASSWD -h$ovdbhost mythconverg -B --exec" - MYSQLCMD_UPDATE_HOST="UPDATE settings set data='$oldhostname' where value='HostMyhostname' and hostname=\"$hostname\";" - else - MYSQLCMD="mysql --local-infile -s -u$MYTHDBUSER -p$MYTHTVPASSWD -h$dbhost mythconverg -B --exec" - MYSQLCMD_C="mysql -u$MYTHDBUSER -p$MYTHTVPASSWD -h$dbhost mythconverg -B --exec" - MYSQLCMD_UPDATE_HOST="select hostname from settings;" - fi -} - -function SQL_DEFINE () { - thostname=`echo ${hostname}|tr -C [:alpha:] _` - echo "Using $thostname for temp table postfix" - - #$1 is the table name - if [ $1 = "settings" ] - then - ALTERSQL="Alter table temp_${1}_${thostname} add unique ( value )" - else - ALTERSQL=";" - fi - - CREATESQL="create table temp_${1}_${thostname} like $1;" - COPY_TMP_SQL="replace into temp_${1}_${thostname} (select * from $1 where hostname=\"$hostname\");" - INSERTSQL="LOAD DATA local INFILE '/tmp/$1.txt' REPLACE INTO TABLE temp_${1}_${thostname} FIELDS TERMINATED BY '\t';" - #INSERTSQL="LOAD DATA local INFILE '$TEMPLATES/$Thistemplate/$1.txt' REPLACE INTO TABLE temp_${1}_${hostname} FIELDS TERMINATED BY '\t';" - DROPSQL="delete from $1 where hostname=\"$hostname\";" - COPY_BCK_SQL="replace into $1 (select * from temp_${1}_${thostname} where hostname=\"$hostname\");" - DROP_TABLE="Drop table temp_${1}_${thostname}" -} - -function ARG_ERR() { - if [ x$OPTARG = "x" ] - then - echo "$SWITCH NEEDS AND ARG" - exit 11 - fi -} - -function ALSADEVICE () { -#ALSA:hw:1,4 - if [ x$Audiotype = xALSA ] - then - SoundDevice=ALSA:$SoundDevice - MixerDevice="ALSA:default" - else - MixerDevice="/dev/mixer" - fi - -} - - - -if [ $# -eq 0 ] -then - echo "Valid options are:" - echo " -c (save|restore|load|uhostname|BECONFIG|ZIP|ACCESSCONTROL)" - echo " -t (syssettings|hostsettings)" - echo " -d databasename" - echo " -h hostname" - echo " -s systemtype (master|slave|standalone|frontendonly)" - echo " -a ipaddress" - echo " -z zipcode" - echo " -o override (only used upgrade installs)" - exit 1 -fi - - - - -while getopts "$OPTSTRING" SWITCH -do - case $SWITCH in - # \?) echo "unkown option" - # exit 11 ;; - c) echo "$SWITCH" "$OPTARG" - ARG_ERR - OPERATION=$OPTARG - ;; - t) echo "$SWITCH" "$OPTARG" - ARG_ERR - Thistemplate=$OPTARG - - if [ x$Thistemplate = x"syssettings" ] - then - echo "template is syssettings" - loadhost=false - elif [ x$Thistemplate = x"hostsettings" ] - then - echo "template is hostsettings" - Thistemplate=syssettings - loadhost=true - else - echo "invalid template name" - exit 1 - fi - ;; - d) echo "$SWITCH" "$OPTARG" - ARG_ERR - if [ $OVERRIDE = 1 ] - then - ovdbhost=$OPTARG - else - dbhost=$OPTARG - fi - ;; - h) echo "$SWITCH" "$OPTARG" - ARG_ERR - if [ $OVERRIDE = 1 ] - then - oldhostname=$hostname - hostname=$OPTARG - else - hostname=$OPTARG - fi - - ;; - s) echo "$SWITCH" "$OPTARG" - ARG_ERR - SYSTEMTYPE=$OPTARG - ;; - a) echo "$SWITCH" "$OPTARG" - ARG_ERR - IP_ADDRESS=$OPTARG - ;; - z) echo "$SWITCH" "$OPTARG" - ARG_ERR - ZIPCODE=$OPTARG - ;; - o) OVERRIDE=1 - ;; - - esac -done - -echo $OVERRIDE - -#setup the Mysql commands -CMD_DEFINE - -$MYSQLCMD_C "show tables" > /dev/null -status=$? -if [ $status = 1 ] -then - echo "$@ failed" - echo "$@ failed" >> /tmp/restore.out - exit 1 -fi - - - - - - - -case $OPERATION in - - restore) - #used to restore settings from syssettings - if [ -d $TEMPLATES/$Thistemplate ] - then - cd $TEMPLATES/$Thistemplate - if [ $loadhost = false ] - then - for i in $TABLES - do - SQL_DEFINE $i - sed -e "s/REPLACEME/$hostname/g" $i.txt > /tmp/$i.txt - #echo $MYSQLCMD "$SELECTSQL" - echo $i - $MYSQLCMD "$CREATESQL" - $MYSQLCMD "$ALTERSQL" - $MYSQLCMD "$COPY_TMP_SQL" - $MYSQLCMD "$INSERTSQL" - $MYSQLCMD "$DROPSQL" - $MYSQLCMD "$COPY_BCK_SQL " - $MYSQLCMD "$DROP_TABLE " - #rm /tmp/$i.txt - done - fi - if [ $loadhost = true ] - then - #only load the settings table with values HOST - i=settings - SQL_DEFINE $i - sed -e "s/REPLACEME/$hostname/g" $i.txt > /tmp/$i.txt - echo $i - $MYSQLCMD "$CREATESQL" - $MYSQLCMD "$ALTERSQL" - $MYSQLCMD "$INSERTSQL" - $MYSQLCMD "$COPY_TMP_SQL" - $MYSQLCMD "$DROPSQL" - $MYSQLCMD "$COPY_BCK_SQL" - $MYSQLCMD "$DROP_TABLE " - fi - else - echo "couldn't find $TEMPLATES/$Thistemplate" - fi - ;; - - save) - if [ ! -d $TEMPLATES/$Thistemplate ] - then - mkdir -p $TEMPLATES/$Thistemplate - fi - - cd $TEMPLATES/$Thistemplate - for i in $TABLES - do - EXTRACLAUSE="" - case $i in - settings) - EXTRACLAUSE="and not (value like \"BackendServerIP\") and not (value like \"locale\") order by value" - SQL="select value,data,'REPLACEME' as hostname from $i where hostname=\"$hostname\" "$EXTRACLAUSE" ;" - # SQL="select * from $i where hostname=\"$hostname\" "$EXTRACLAUSE" ;" - $MYSQLCMD_C "$SQL" > $TEMPLATES/$Thistemplate/$i.txt - ;; - keybindings) - SQL="select context,action,description,keylist,'REPLACEME' as hostname from $i where hostname=\"$hostname\" "$EXTRACLAUSE" ;" - $MYSQLCMD_C "$SQL" > $TEMPLATES/$Thistemplate/$i.txt - ;; - jumppoints) - SQL="select destination,description,keylist,'REPLACEME' as hostname from $i where hostname=\"$hostname\" "$EXTRACLAUSE" ;" - $MYSQLCMD_C "$SQL" > $TEMPLATES/$Thistemplate/$i.txt - - ;; - esac - # sed -e "s/$hostname/REPLACEME/g" $i > $i.txt && rm $i - - done - ;; - - load) - - #will load both default_1 and default_2 unless either file is not found - for i in default_1 default_2 - do - if [ -f $TEMPLATES/$i/settings.txt ] - then - echo $i - for tablename in $TABLES - do - #create table - CREATESQL="create table IF NOT EXISTS ${tablename}_${i} like $tablename;" - $MYSQLCMD_C "$CREATESQL" - #truncate table - TRUNCATESQL="truncate ${tablename}_${i} " - $MYSQLCMD_C "$TRUNCATESQL" - #load table - INSERTSQL="LOAD DATA local INFILE '$TEMPLATES/$i/$tablename.txt' REPLACE INTO TABLE ${tablename}_${i} FIELDS TERMINATED BY '\t';" - $MYSQLCMD_C "$INSERTSQL" - #update_hostname - UPDATEHOSTNAMESQL="update ${tablename}_${i} set hostname='$i' ; " - $MYSQLCMD_C "$UPDATEHOSTNAMESQL" - done - else - - echo "couldn't find $TEMPLATES/$i/settings.txt template to load" - fi - CREATESQL="create table IF NOT EXISTS settings_user1 like settings;" - $MYSQLCMD_C "$CREATESQL" - CREATESQL="create table IF NOT EXISTS settings_user2 like settings;" - $MYSQLCMD_C "$CREATESQL" - CREATESQL="create table IF NOT EXISTS settings_user3 like settings;" - $MYSQLCMD_C "$CREATESQL" - - CREATESQL="create table IF NOT EXISTS keybindings_user1 like keybindings;" - $MYSQLCMD_C "$CREATESQL" - CREATESQL="create table IF NOT EXISTS keybindings_user2 like keybindings;" - $MYSQLCMD_C "$CREATESQL" - CREATESQL="create table IF NOT EXISTS keybindings_user3 like keybindings;" - $MYSQLCMD_C "$CREATESQL" - - CREATESQL="create table IF NOT EXISTS jumppoints_user1 like jumppoints;" - $MYSQLCMD_C "$CREATESQL" - CREATESQL="create table IF NOT EXISTS jumppoints_user2 like jumppoints;" - $MYSQLCMD_C "$CREATESQL" - CREATESQL="create table IF NOT EXISTS jumppoints_user3 like jumppoints;" - $MYSQLCMD_C "$CREATESQL" - - done -;; - - - - BECONFIG) - if [ $SYSTEMTYPE = "master" ] - then - $MYSQLCMD_C "UPDATE settings set data='${IP_ADDRESS}' where value='MasterServerIP';" - $MYSQLCMD_C "delete from settings where value='BackendServerIP' and hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='${IP_ADDRESS}' , value='BackendServerIP' , hostname=\"$hostname\";" - fi - - if [ $SYSTEMTYPE = "slave" ] - then - $MYSQLCMD_C "delete from settings where value='BackendServerIP' and hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='${IP_ADDRESS}' , value='BackendServerIP' , hostname=\"$hostname\";" - fi - ;; - ZIP) - $MYSQLCMD_C "delete from settings where value='locale' and hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='$ZIPCODE' , value='locale' , hostname=\"$hostname\";" - $MYSQLCMD_C "delete from settings where value='MythMovies.ZipCode' and hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='$ZIPCODE', value='MythMovies.ZipCode' , hostname=\"$hostname\";" - ;; - MUSICFRONT) - ALSADEVICE - $MYSQLCMD_C "delete from settings where value='AudioOutputDevice' and hostname=\"$hostname\";" - $MYSQLCMD_C "delete from settings where value='MixerDevice' and hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='$SoundDevice', value='AudioOutputDevice' , hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='$MixerDevice', value='MixerDevice' , hostname=\"$hostname\";" - #need to reload the settings. - systemconfig.sh reloadfe - ;; - MUSICMYTH) - ALSADEVICE - $MYSQLCMD_C "delete from settings where value='MusicAudioDevice' and hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='$SoundDevice', value='MusicAudioDevice' , hostname=\"$hostname\";" - ;; - uhostname) - #used when the hostname is changed. - TABLES="settings capturecard keybindings storagegroup recorded" - for i in $TABLES - do - USQL="update $i set hostname=\"$oldhostname\" where hostname=\"$hostname\" ;" - $MYSQLCMD_C "$USQL" - done - - ;; - USERJOBALLOW) - SQL="update settings set data='1' where value like 'JobAllowUserJob%' and hostname=\"$hostname\" ;" - $MYSQLCMD_C "$SQL" - ;; - - ACCESSCONTROL) - LIST="Hostaccessnetwork Hostaccesshostype HostaccesshostypeSystemtype Hostaccessmisc Hostaccesssleep Hostaccessadvanced HostaccessadvancedX Hostaccesssound" - - for i in $LIST - do - $MYSQLCMD_C "delete from settings where value=\"$i\" and hostname=\"$hostname\";" - $MYSQLCMD_C "REPLACE INTO settings set data='1', value=\"$i\" , hostname=\"$hostname\";" - done - SQL="update settings set data='0' where value='HostaccesshostypeSystemtype' and hostname=\"$hostname\" ;" - $MYSQLCMD_C "$SQL" - SQL="update settings set data='0' where value='Hostaccessuser' and hostname=\"$hostname\" ;" - $MYSQLCMD_C "$SQL" - ;; - esac - -#SELECT * INTO OUTFILE 'data.txt' -# FIELDS TERMINATED BY ',' -# FROM table2; - - diff --git a/abs/core-testing/LinHES-config/restore_km_db_chroot.sh b/abs/core-testing/LinHES-config/restore_km_db_chroot.sh deleted file mode 100644 index e72e8c2..0000000 --- a/abs/core-testing/LinHES-config/restore_km_db_chroot.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -. /etc/profile -. /etc/systemconfig -. $MV_ROOT/bin/install_functions.sh - -myhost=$hostname -hostname $myhost -mount -t proc none /proc -DBFILE=$1 - -if [ $SystemType = "Master_backend" -o $SystemType = "Standalone" ] - then - #restore database - pacman --noconfirm -Sf mysql - status=1 - mysqlstatus=1 - while [ ! $status = 0 ] - do - /etc/rc.d/mysqld stop - sleep 1 - /etc/rc.d/mysqld start - mysqlstatus=$? - if [ $mysqlstatus = 0 ] - then - mysql -e "show databases;" - showstatus=$? - if [ $showstatus = 0 ] - then - #load database - pacman --noconfirm -R mythdb-initial - pacman --noconfirm -S mythdb-initial - - if [ -f $DBFILE ] - then - echo "restoring old database" - gunzip -c $DBFILE > /tmp/mythconverg.sql - mysql mythconverg < /tmp/mythconverg.sql - update_db_settings HostServiceMythWEB "1" - echo 'UseMythWEB="1"' >> /etc/systemconfig - else - echo "Could not restore old database, mythconverg.sql is missing." - touch /tmp/.upgrade_db_failed - fi - - if [ -d /data/srv/mysql/mythconverg ] - then - status=0 - fi - fi - fi - done - rm -f /tmp/mythconverg.sql - else - exit 0 - fi - -#/etc/rc.d/mysqld stop -#umount /proc - - - diff --git a/abs/core-testing/LinHES-config/soundconfig.sh b/abs/core-testing/LinHES-config/soundconfig.sh deleted file mode 100755 index 75998d6..0000000 --- a/abs/core-testing/LinHES-config/soundconfig.sh +++ /dev/null @@ -1,254 +0,0 @@ -#!/bin/bash -. /etc/systemconfig -. /etc/profile -echo $@ >/tmp/audio.call -#set -x -BASE="" -. /etc/profile -#TEMPLATES="/usr/share/templates" -#TESTFILE="$TEMPLATES/audio/space_battle_A.wav" -TESTFILE="/usr/share/sounds/alsa/Front_Center.wav" -OSSinstalled="false" - -function testaudio () { - -ossplay -d$AUDIODEVICE $TESTFILE - -} - -function load_alsa() { - - remove_service.sh alsa-utils -# cd /lib/modules/2.6.21-STB - KER=`uname -r` - cd /lib/modules/$KER/kernel/ - tar -xvf /lib/modules/alsa-$KER.tar - pacman -Sf --noconfirm alsa-lib - - depmod -a - cd - - udevadm trigger - udevadm settle - udevadm trigger - - add_service.sh alsa-utils - sleep 4 - sv start alsa-utils -} - - -function unload_alsa () { -#kill $(lsof -t /dev/dsp* /dev/audio* /dev/mixer* /dev/snd/*) && modprobe -r $(lsmod |grep ^snd |awk '{print $1}') - sv stop alsa-utils - remove_service.sh alsa-utils - rm -rf /dev/adsp* - rm -rf /dev/snd/* - rm -rf /dev/audio - modprobe -r $(lsmod |grep ^snd |awk '{print $1}') -} - -function unload_oss { - sv stop oss - soundoff - rm -rf /dev/dsp* - rm -rf /dev/oss* - rm -rf /dev/sndstat - remove_service.sh oss -} - -function installOSS { - echo "installing oss" - pacman -Q oss 2>/dev/null - if [ ! $? = 0 ] - then - pacman --noconfirm -Sf oss - fi - add_service.sh oss - sleep 4 - sv start oss -} - - -function SYNCXINE { -echo "modify xine config file" - if [ -f /data/home/mythtv/.xine/config ] - then - cp -f /data/home/mythtv/.xine/config $TEMPLATES/xine.config - else - cp $TEMPLATES/xine.config.template $TEMPLATES/xine.config - fi - - if [ x$Audiotype = xOSS ] - then - DEVICENUMBER=`echo $SoundDevice|awk -F/ ' { print $3 } '|tr -d dsp ` - sed -e "s/^.*audio.driver.*$/audio.driver:oss/" \ - -e "s/^.audio.device.oss_device_name.*$/audio.device.oss_device_name:\/dev\/dsp/" \ - -e "s/^.audio.devic.oss_device_number.*$/audio.device.oss_device_number:$DEVICENUMER/" \ - -e "s/^.*audio.output.speaker_arrangement:.*$/Audio.output.speaker_arrangement:PassThrough/" \ - $TEMPLATES/xine.config > /data/home/mythtv/.xine/config - else - cp $TEMPLATES/xine.config /data/home/mythtv/.xine/config - fi - -} - -function SYNCMPLAYER { -echo "modify mplayer not implmented yet" -} - -function SYNCMYTHMUSIC { -echo "sync mythmusic" -$MV_ROOT/bin/restore_default_settings.sh -c MUSICMYTH -} - -function SYNCMYTHFRONTEND { -echo "sync mythfrontend" -$MV_ROOT/bin/restore_default_settings.sh -c MUSICFRONT -} - - -function checkOSSinstalled () { - ossinfo |grep Version |grep -q OSS >/dev/null - resultcode=$? - echo $resultcode - if [ $resultcode = 0 ] - then - OSSinstalled='true' - else - OSSinstalled='false' - fi -} - -function sound_config_system { - - if [ x$syncXine = x1 ] - then - SYNCXINE - fi - if [ x$syncMplayer = x1 ] - then - SYNCMPLAYER - fi - if [ x$syncMythMusic = x1 ] - then - SYNCMYTHMUSIC - fi - if [ x$syncMythFrontend = x1 ] - then - SYNCMYTHFRONTEND - fi - -} - -function loadsound (){ - checkOSSinstalled - if [ x$AUDIOTYPE = xOSS -o x$AUDIOTYPE = xoss ] - #then - # if [ $OSSinstalled = "false" ] - then - while [ $OSSinstalled = "false" ] - do - unload_alsa - rm /tmp/.alsatest - installOSS - installOSS - sleep 2 - checkOSSinstalled - done - # fi - else - touch /tmp/.alsatest - unload_oss - load_alsa - load_alsa - rm /tmp/.alsatest - - fi - -} - - - - -#####################MAIN PROGRAM########################## - -declare -r OPTSTRING="i:t:d:" - -if [ $# -eq 0 ] -then - echo "Valid options are:" - echo " -i (oss|alsa) oss or alsa subsystem " - echo " -t (test|real|LOAD) " - echo " -d device" - exit 1 -fi - - - - -while getopts "$OPTSTRING" SWITCH -do - case $SWITCH in - \?) echo "unkown option" - exit 11 ;; - i) echo "$SWITCH" "$OPTARG" - AUDIOTYPE="$OPTARG" - ;; - d) echo "$SWITCH" "$OPTARG" - AUDIODEVICE=$OPTARG - ;; - t) echo "$SWITCH" "$OPTARG" - SOUNDOPTYPE="$OPTARG" - if [ x"$OPTARG" = xtest ] - then - TEST=true - else - TEST=false - fi - - - ;; - - esac -done - - - - -case $SOUNDOPTYPE in - REAL|real ) - loadsound - sound_config_system - ;; - test|TEST) - echo $@ > /tmp/audio.test - #loadsound - if [ x$AUDIOTYPE = xOSS -o x$AUDIOTYPE = xoss ] - then - echo "testing OSS $AUDIODEVICE " - ossplay -d$AUDIODEVICE $TESTFILE - else - echo "testing ALSA $AUDIODEVICE " - aplay --device=$AUDIODEVICE $TESTFILE - fi - - ;; - - LOAD|load) - loadsound - ;; - esac - - -exit 0 - - - - - - - - - - - diff --git a/abs/core-testing/LinHES-config/startx b/abs/core-testing/LinHES-config/startx deleted file mode 100755 index 75ba06a..0000000 --- a/abs/core-testing/LinHES-config/startx +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -. /etc/profile - -export USER=root -export HOME=/root -#TEMPLATES=/usr/share/templates - -CMDLINE=$(cat /proc/cmdline) -TEMPVAR=${CMDLINE#*ip=} -IP=${TEMPVAR%% *} -echo $CMDLINE |grep -q vnc -USEVNC=$? - -if [ x$USEVNC = x1 ] -then - $MV_ROOT/bin/xconfig.sh - cat /etc/X11/xorg.conf | sed -e 's/dev\/mouse/dev\/psaux/g'> /root/xorg.conf.install - startx /root/live-install.sh -- -logverbose 6 -config /root/xorg.conf.install -allowMouseOpenFail - else - #VNC - pacman -Sf --noconfirm tightvnc - cd /root - mkdir .vnc - echo mythvantage |vncpasswd -f > /root/.vnc/passwd - chmod 500 /root/.vnc/passwd - rm /root/.vnc/xstartup - ln -s /root/live-install.sh /root/.vnc/xstartup - vncserver -fi diff --git a/abs/core-testing/LinHES-config/systemconfig.py b/abs/core-testing/LinHES-config/systemconfig.py deleted file mode 100755 index 2e07b2f..0000000 --- a/abs/core-testing/LinHES-config/systemconfig.py +++ /dev/null @@ -1,259 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -import sys, os, commands, glob, time -import getopt, re, MySQLdb -import logging -import mv_common , mv_network -import inspect -#____________________________________________setup the logging______________________________________________________ -LOG_FILENAME = '/tmp/systemconfig.log' -DEBUGLOG = '/tmp/systemconfig_debug.log' -logging.basicConfig(level=logging.DEBUG, - format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', - datefmt='%m-%d %H:%M', - filename=DEBUGLOG, - filemode='w') -# define a Handler which writes INFO messages or higher to the sys.stderr -console = logging.StreamHandler() -console.setLevel(logging.INFO) -# set a format which is simpler for console use -#formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s') -formatter = logging.Formatter("%(message)s") -# tell the handler to use this format -console.setFormatter(formatter) -# add the handler to the root logger -logging.getLogger('').addHandler(console) - -#infoformatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") -infoformatter = logging.Formatter("%(message)s") -infofile = logging.FileHandler(LOG_FILENAME, 'w') -infofile.setFormatter(infoformatter) -infofile.setLevel(logging.INFO) -logging.getLogger('').addHandler(infofile) - - -def usage(): - logging.info("tell people how to use this") - -def setup_x(systemconfig): - if mv_common.read_config(mv_common.module_config,"xorg") == False : - logging.info("____Skipping of Xorg, config disabled____") - else: - cmd = "%s/bin/xconfig.sh" %systemconfig["MVROOT"] - mv_common.runcmd(cmd) - -def main(argv): - try: - MVROOT = os.environ["MV_ROOT"] - except: - logging.debug("MVROOT was not defined, using the default value") - MVROOT = "/usr/MythVantage" - - global cmdmodule - global systemconfig - systemconfig["MVROOT"]=MVROOT - restartlcd = False - cmdmodule={"misc":False , "sleep":False , "hostype":False , "hostypec":False , "advanced":False , "audio":False , "network":False , "advancedX":False , "webuser":False , "restartfe":False , "reloadfe":False , "ddns":False , "screensaver":False , "ir":False , "this_is_install":False , "user":False, "software":False, "plugins":False, "smolt":False, "all":False, "dhcp_request":False } - try: - opts, args = getopt.getopt(argv, 'c:hm:d:', ["help","modules" ] ) - except getopt.GetoptError, why: - print why - usage() - print "exception happened" - sys.exit(2) - for opt, arg in opts: - if opt in ("-h", "--help"): - usage() - sys.exit(0) - elif opt in ("-m"): - for i in arg.split(","): - cmdmodule[i]=True - elif opt in ("-d"): - dhcp_dev = arg - - - if cmdmodule["this_is_install"] or cmdmodule["hostypec"]: - systemconfig["hostypec"] = True - cmdmodule["smolt"] = True - - systemconfig["mythip"] = mv_network.setup_MYTH_IP(systemconfig) - systemconfig["mythdhcp"] = mv_network.setup_MYTH_DHCP(systemconfig) - systemconfig["mythgw"] = mv_network.setup_MYTH_DHCP(systemconfig) - systemconfig["mythdns"] = mv_network.setup_MYTH_DHCP(systemconfig) - - if cmdmodule["all"]: - logging.info("*** WILL RUN ALL MODULES ***") - cmdmodule["hostype"] = True - cmdmodule["ir"]= True - cmdmodule["network"] = True - cmdmodule["audio"] = True - cmdmodule["misc"] = True - cmdmodule["sleep"] = True - cmdmodule["webuser"] = True - cmdmodule["ddns"] = True - cmdmodule["screensaver"] = True - cmdmodule["advanced"] = True - cmdmodule["software"] = True - cmdmodule["advancedX"] = True - cmdmodule["smolt"] = True - cmdmodule["user"] = True - - - if cmdmodule["hostype"]: - import mv_hostype - cmdmodule["advancedX"] = True - setup_x(systemconfig) - cmdmodule["ir"] = True - mv_hostype.hostypeprint(systemconfig) - cmdmodule["smolt"] = True - - if cmdmodule["network"]: - restartfe = mv_network.setup_network(systemconfig, cmdmodule["this_is_install"]) - if restartfe == True : - logging.debug(" Setting the frontend to restart due to network change") - cmdmodule["restartfe"] = True - - - - if cmdmodule["ir"] == True: - import mv_ir - restart = mv_ir.setup_ir(systemconfig,data_config) - restartfe = restart[0] - restartlcd = restart[1] - if restartfe == True : - logging.debug(" Setting the frontend to restart due to lirc change") - cmdmodule["restartfe"] = True - cmdmodule["smolt"] = True - - - if cmdmodule["audio"] == True: - if mv_common.read_config(mv_common.module_config,"audio") == False : - logging.info("____Skipping of Audio, config disabled____") - else: - logging.debug("______Start of Audio Configuration______") - if not systemconfig["Audiotype"] == "tinker": - cmd="%s/bin/soundconfig.sh -t real -i %s -d %s" %(MVROOT,systemconfig["Audiotype"],systemconfig["SoundDevice"]) - mv_common.runcmd(cmd) - else: - logging.debug(" Tinker mode(audio), not changing configuration") - logging.debug("__End of audio") - - if cmdmodule["misc"]: - if mv_common.read_config(mv_common.module_config,"misc") == False : - logging.info("____Skipping of misc, config disabled____") - else: - import mv_misc - mv_misc.setup_zip(MVROOT,systemconfig["zipcode"]) - mv_misc.setup_tz(systemconfig["timezone"],systemconfig["TEMPLATES"]) - mv_misc.setup_nfs(systemconfig) - - if cmdmodule["sleep"]: - if mv_common.read_config(mv_common.module_config,"sleep") == False : - logging.info("____Skipping of sleep, config disabled____") - else: - import mv_misc - mv_misc.setup_sleep(systemconfig) - - if cmdmodule["webuser"]: - import mv_webuser - mv_webuser.setup_web_auth(systemconfig["UseMythWEB_auth"]) - - if cmdmodule["ddns"]: - import mv_ddns - mv_ddns.setup_ddns(systemconfig) - - if cmdmodule["screensaver"]: - import mv_screensaver - mv_screensaver.setup_screensaver(systemconfig, data_config) - - if cmdmodule["advanced"]: - import mv_advanced - mv_advanced.setup_advanced(systemconfig, data_config) - - if cmdmodule["software"] or cmdmodule["plugins"]: - import mv_software - mv_software.setup_software(systemconfig, data_config) - - if cmdmodule["advancedX"]: - if mv_common.read_config(mv_common.module_config,"xorg") == False : - logging.info("____Skipping of advancedX, config disabled____") - else: - setup_x(systemconfig) - - if cmdmodule["restartfe"]: - mv_common.restartfe(restartlcd) - - if cmdmodule["reloadfe"]: - mv_common.reloadfe(systemconfig["dbhost"],restartlcd) - - if cmdmodule["smolt"]: - import mv_smolt - mv_smolt.setup_smolt_type(systemconfig["SystemType"], - systemconfig["Remotetype"], - systemconfig["RunFrontend"], - data_config.MYTHHOME, - data_config.SYSTEMTYPE) - - if cmdmodule["user"]: - logging.info("____Start of ssh user____") - if systemconfig["rootSSH"] == "1" : - logging.info(" Allowing ssh access for root") - cmd = '''sed -i "s/^.*PermitRootLogin.*$/PermitRootLogin yes/" /etc/ssh/sshd_config''' - mv_common.runcmd(cmd) - else: - logging.info(" Removing ssh access for root") - cmd = '''sed -i "s/^.*PermitRootLogin.*$/PermitRootLogin no/" /etc/ssh/sshd_config''' - mv_common.runcmd(cmd) - logging.info("__End of ssh user\n") - - if cmdmodule["dhcp_request"]: - cmd = '''dhcpcd -t4 -h' ' -Td %s > /tmp/mvnetwork.dhcpinfo ''' %dhcp_dev - mv_common.runcmd(cmd) - - -if __name__ == "__main__": - - config_file = "mv_config" - data_config = __import__(config_file, globals(), locals(), []) - #Read in systemconfig - global systemconfig - systemconfig = {"hostypec":False} - file_name = "/etc/systemconfig" - try: - config_file = open(file_name) - except: - logging.critical("%s could not be opened", file_name) - sys.exit(1) - - for line in config_file: - line = line.strip() - if line and line[0] is not "#" and line[-1] is not "=": - var, val = line.rsplit("=", 1) - val = val.strip('"') - systemconfig[var.strip()] = val.strip() - try: - systemconfig["TEMPLATES"] = os.environ["TEMPLATES"] - except: - logging.critical(" *TEMPLATES is not defined") - logging.critical(" *using default value") - systemconfig["TEMPLATES"] = "/usr/MythVantage/templates" - - logging.debug("______START OF DEBUG______") - main(sys.argv[1:]) - logging.debug("______cmd line options______") - for i in cmdmodule.items(): - logging.debug (i) - logging.debug("______systemconfig______") - for i in systemconfig.items(): - logging.debug(i) - #pass - - - - - - - - - - diff --git a/abs/core-testing/LinHES-config/systemconfig.sh b/abs/core-testing/LinHES-config/systemconfig.sh deleted file mode 100755 index 218f705..0000000 --- a/abs/core-testing/LinHES-config/systemconfig.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -################################################################### -#Script to configure your system based off the values in /etc/systemconfig -#Any changes made to config files will be removed when systemconfig.sh is run -# -#JM -echo $@ >/tmp/systemconfig.call -echo "----------------------start of systemconfig $@ ----------------------" -. /etc/profile -. $MV_ROOT/bin/networkconfig.sh -postfix=`cat ${BASE}/usr/local/share/mythtv/.releasetype` - -systemconfig.py -m $@ -rc=$? -echo "systemconfig.py exit code $rc" -exit $rc - - - diff --git a/abs/core-testing/LinHES-config/timezip.py b/abs/core-testing/LinHES-config/timezip.py deleted file mode 100755 index bf6b389..0000000 --- a/abs/core-testing/LinHES-config/timezip.py +++ /dev/null @@ -1,232 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# import MySQL module -#used to import the zipcode/timezone/nfs info fromMBE -import MySQLdb -import sys -import getopt -import socket - - -def usage(): - print " -h --help" - print " -d --installdb" - print " -m --masterdb" - print " -n --hostname of current machine" - -def printvars(): - print "masterdb: " + masterdb - print "installdb:" + installdb - print "hostname: " + thishostname - print "BEhostname:" + BEhostname - print "zipcode:" + zipcode - print "timezone:" + tz - print "timezone region:" + tz_region - print "timezone subregion:" + tz_subregion - print "nfsip:" + nfsip - print "nfstoggle:" + nfstoggle - print "nfsmount:" + nfsmount - print "hobbitclient:" + hobbitclient -# connect -def selectvars(): - - global BEhostname - global zipcode - global tz - global tz_region - global tz_subregion - global nfsip - global nfstoggle - global nfsmount - global hobbitclient - - db = MySQLdb.connect(host=masterdb, user="mythtv", passwd="mythtv", db="mythconverg") - # create a cursor - cursor = db.cursor() - # execute SQL statement - cursor.execute("select hostname from settings where value='BackendServerIP' and data=(%s)",(masterdb)) - result = cursor.fetchone() - try: - BEhostname=result[0] - except TypeError: - BEhostname="" - - cursor.execute("select data from settings where value='HostZipcode' and hostname=(%s)",(BEhostname)) - result = cursor.fetchone() - try: - zipcode = result[0] - except TypeError: - zipcode="" - - cursor.execute("select data from settings where value='HostCentralNFSIP' and hostname=(%s)",(BEhostname)) - result = cursor.fetchone() - try: - nfsip=result[0] - except TypeError: - nfsip="" - - cursor.execute("select data from settings where value='HostHaveCentralNFS' and hostname=(%s)",(BEhostname)) - result = cursor.fetchone() - try: - nfstoggle=result[0] - except TypeError: - nfstoggle="" - - cursor.execute("select data from settings where value='HostNFSmountpoint' and hostname=(%s)",(BEhostname)) - result = cursor.fetchone() - try: - nfsmount=result[0] - except TypeError: - nfsmount="" - - cursor.execute("select data from settings where value='HostTimeZone' and hostname=(%s)",(BEhostname)) - result = cursor.fetchone() - try: - tz=result[0] - except TypeError: - tz="" -########## - cursor.execute("select data from settings where value='HostTimeZoneRegion' and hostname=(%s)",(BEhostname)) - result = cursor.fetchone() - try: - tz_region=result[0] - except TypeError: - tz_region="" - tempsubregion="HostTimeZoneRegion_" + tz_region - - cursor.execute("select data from settings where value=%s and hostname=(%s)",(tempsubregion,BEhostname)) - result = cursor.fetchone() - try: - tz_subregion=result[0] - except TypeError: - tz_subregion="" -############### - if ( thishostname != BEhostname ): - cursor.execute("select data from settings where value='GlobalServiceHobbitserver'") - result = cursor.fetchone() - try: - hobbitclient=result[0] - except TypeError: - hobbitclient="1" - - - -def insertvars(): - - db = MySQLdb.connect(host=installdb, user="mythtv", passwd="mythtv", db="mythconverg") - cursor = db.cursor() -#inserting the zipcode - cursor.execute("select * from settings where value='HostZipcode' and hostname=(%s)",(thishostname)) - result = cursor.fetchone() - if ( zipcode!="" ): - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostZipcode',(%s),(%s))",(zipcode,thishostname)) - print "inserting zipcode" - else: - cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostZipcode'",(zipcode,thishostname)) - print "updating zipcode" - -#inserting the timezone - cursor.execute("select * from settings where value='HostTimeZone' and hostname=(%s)",(thishostname)) - result = cursor.fetchone() - if ( tz != ""): - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostTimeZone',(%s),(%s))",(tz,thishostname)) - print "inserting timezone" - else: - cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostTimeZone'",(tz,thishostname)) - print "updating timezone" - - cursor.execute("select * from settings where value='HostTimeZoneRegion' and hostname=(%s)",(thishostname)) - result = cursor.fetchone() - if ( tz != ""): - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostTimeZoneRegion',(%s),(%s))",(tz_region,thishostname)) - print "inserting timezone region" - else: - cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostTimeZoneRegion'",(tz_region,thishostname)) - print "updating timezone region" - - tempsubregion="HostTimeZoneRegion_" + tz_region - cursor.execute("select * from settings where value=%s and hostname=(%s)",(tempsubregion,thishostname)) - result = cursor.fetchone() - if ( tz != ""): - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ((%s),(%s),(%s))",(tempsubregion,tz_subregion,thishostname)) - print "inserting timezone subregion" - else: - cursor.execute("update settings set data=(%s) where hostname=(%s) and value=(%s)",(tempsubregion,tz_subregion,thishostname)) - print "updating timezone subregion" - - -#start of NFSIP - cursor.execute("select data from settings where value='HostCentralNFSIP' and hostname=(%s)",(thishostname)) - result = cursor.fetchone() - if ( nfsip != ""): - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostCentralNFSIP',(%s),(%s))",(nfsip,thishostname)) - print "inserting nfsip" - - if (nfstoggle != ""): - cursor.execute("select data from settings where value='HostHaveCentralNFS' and hostname=(%s)",(thishostname)) - result = cursor.fetchone() - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostHaveCentralNFS',(%s),(%s))",(nfstoggle,thishostname)) - print "inserting nfstoggle" - - if ( nfsmount !="") : - cursor.execute("select data from settings where value='HostNFSmountpoint' and hostname=(%s)",(thishostname)) - result = cursor.fetchone() - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostNFSmountpoint',(%s),(%s))",(nfsmount,thishostname)) - print "inserting nfsmountpoint" - -#hobbitclient - cursor.execute("select * from settings where value='HostServiceHobbitclient' and hostname=(%s)",(thishostname)) - result = cursor.fetchone() - if ( tz != ""): - if (result == None): - cursor.execute("INSERT INTO settings (value,data,hostname) VALUES ('HostServiceHobbitclient',(%s),(%s))",(hobbitclient,thishostname)) - print "inserting hobbitcleint" - else: - cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostServiceHobbitclient'",(hobbitclient,thishostname)) - print "updating hobbitclient" - - -def main(argv): - global masterdb - global installdb - global thishostname - thishostname="" - global BEhostname - global zipcode - global tz - global tz_region - global tz_subregion - - global nfsip - global hobbitclient - try: - opts, args = getopt.getopt(argv, "hm:d:n:", ["help", "masterdb=", "installdb=" , "hostname=" ] ) - except getopt.GetoptError: - sys.exit(2) - for opt, arg in opts: - if opt in ("-h", "--help"): - usage() - sys.exit() - elif opt in ( "-d" , "--installdb"): - installdb = arg - elif opt in ("-m", "--masterdb"): - masterdb = arg - elif opt in ("-n", "--hostname"): - thishostname = arg - - if ( thishostname == "" ): - thishostname = socket.gethostname() - - selectvars() - printvars() - insertvars() -if __name__ == "__main__": - main(sys.argv[1:]) - diff --git a/abs/core-testing/LinHES-config/xconfig.sh b/abs/core-testing/LinHES-config/xconfig.sh deleted file mode 100755 index 2fad821..0000000 --- a/abs/core-testing/LinHES-config/xconfig.sh +++ /dev/null @@ -1,363 +0,0 @@ -#!/bin/bash -#SET DISPLAYCARD to force a cardtype -#SET DISPLAYRES to force Xres, ENV takes precendent over cmdline -#displayres=cmdline -#NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel unichrome-dri xf86-video-unichrome xf86-video-mga xf86-video-savage xf86-video-trident" -NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel xf86-video-mga xf86-video-savage xf86-video-trident unichrome-dri xf86-video-openchrome" -BASE="" -. /etc/profile -NVIDIA_96XX="$TEMPLATES/xorg/96xx_supported.txt" -#TEMPLATES="/usr/share/templates" -MYTHHOME=$BASE/home/mythtv - -function Xvalues { - CMDLINE=$(cat /proc/cmdline) - echo "$CMDLINE" | grep -q forceXvesa - if [ $? = 0 ] - then - VGACARDTYPE=vesa - Xcardtype=$VGACARDTYPE - else - VGACARDTYPE=`lspci | grep -i vga | sort -r | head -n 1 | cut -d: -f3 | cut -d" " -f2` - VGAPCIID=`lspci | grep -i vga | sort -r | head -n 1 | cut -d" " -f1` - CARDID=`lspci -n | grep "$VGAPCIID" | grep 10de | cut -d" " -f3 | cut -d: -f2` - VENDORID=`lspci -n | grep "$VGAPCIID" | grep 10de | cut -d" " -f3 | cut -d: -f1` - fi - #force VGACARDTYPE - if [ ! x$DISPLAYCARD = x ] - then - VGACARDTYPE=$DISPLAYCARD - Xcardtype=$VGACARDTYPE - fi - echo "Will use $VGACARDTYPE" - currentmode=`cat "$BASE/etc/X11/xorg.conf" | grep Modes | awk -Fs '{ print $2 }'` -} - -function presetupX { - if [ -f /etc/sysconfig/IGNORE_X ] - then - echo "Will not run xconfig.sh due to presence of /etc/sysconfig/IGNORE_X" - return 1 - else - if [ "$XIgnoreConfig" = 1 ] - then - echo "Using User supplied X" - if [ -f "$MYTHHOME/templates/xorg.user" ] - then - cp -f "$MYTHHOME/templates/xorg.user" "$XORG_CONF" - else - echo "Didn't find the file" - echo "Copy your config file to $MYTHHOME/templates/xorg.user" > "$XORG_CONF" - fi - else - if [ "$XUseAdvanced" = 1 ] - then - setupAdvancedX - else - setupX - fi - fi - fi - -} - -function setupAdvancedX { - echo "#doing the advanced" > /tmp/options - Xcategory=`echo "$Xresadvanced" | cut -d_ -f1` - Xres=`echo "$Xresadvanced" | cut -d_ -f2` - echo "$Xcategory" - if [ "$Xcategory" = "nVidia Modeline" ] - then - Xres="" - if [ "$XnVidia1080p" = "1" ] - then - Xres="${Xres} \"1920x1080_60\"" - fi - if [ "$XnVidia1080i" = "1" ] - then - Xres="${Xres} \"1920x1080_60i\"" - fi - if [ "$XnVidia720p" = "1" ] - then - Xres="${Xres} \"1280x720_60\"" - fi - if [ "$XnVidia480p" = "1" ] - then - Xres="${Xres} \"720x480_60\"" - fi - ML="\t Modes ${Xres}" - else - - ML="\t Modes \"${Xres}\"" - fi -# echo $ML - case $Xcardtype in - NVIDIA|nVidia|nvidia) - case $Xconnection in - DVI) ConnectedMonitor=DFP ;; - vga) ConnectedMonitor=CRT;; - Auto) ConnectedMonitor=Auto;; - TV) ConnectedMonitor=TV - echo "Option \"TVStandard\" \"$XTVstandard\"" >>/tmp/options - echo "Option \"TVOutFormat\" \"$XTVconnection\"" >> /tmp/options - ;; - esac - if [ "$ConnectedMonitor" = Auto ] - then - echo "auto connection" - else - echo "Option \"ConnectedMonitor\" \"$ConnectedMonitor\"" >> /tmp/options - echo "Option \"FlatPanelProperties\" \"Scaling = centered, Dithering = enabled\"" >> /tmp/options - echo "Option \"DigitalVibrance\" \"0\"" >> /tmp/options - fi - - if [ "$XignoreEDID" = 1 ] - then - EDIDvalue=true - EDIDFREQ=false - DS=" DisplaySize $XDisplaysize" - HS=" HorizSync $XHsync" - VR=" VertRefresh $XVrefresh" - else - EDIDvalue=false - EDIDFREQ=true - DS="# Display size edid used " - HS="# Hsync edid used " - VR="# Vertrefresh edid used " - fi - echo "Option \"UseEdidFreqs\" \"$EDIDFREQ\"" >> /tmp/options - echo "Option \"IgnoreEDID\" \"$EDIDvalue\"" >> /tmp/options - - - sed -e "s/^.*Modes.*$/${ML}/" \ - -e "/INSERT MODELINE/r $TEMPLATES/xorg/modeline.$Xcategory" \ - -e "s/^.*DisplaySize.*$/ $DS/" \ - -e "s/^#.*HorizSync.*$/ $HS/g" \ - -e "s/^#.*VertRefresh.*$/ $VR/g" \ - -e "/INSERT HERE/r /tmp/options" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF" - ;; - - ati|ATI) - case $Xconnection in - DVI) ConnectedMonitor="tmds1,nocrt1,notv";; - VGA) ConnectedMonitor="crt1,notmds1,notv" ;; - TV) ConnectedMonitor="tv,nocrt1,notmds1" - echo "Option \"TVStandard\" \"$XTVstandard\"" >>/tmp/options - echo "Option \"TVFormat\" \"$XTVconnection\"" >> /tmp/options - ;; - esac - if [ "$XignoreEDID" = 1 ] - then - DS=" DisplaySize $XDisplaysize" - HS=" HorizSync $XHsync" - VR=" VertRefresh $XVrefresh" - else - DS="# Display size edid used " - HS="# Hsync edid used " - VR="# Vertrefresh edid used " - fi - - echo "Option \"ForceMonitors\" \"$ConnectedMonitor\"" >> /tmp/options - - sed -e "s/^.*Modes.*$/\t $ML/" \ - -e "/INSERT MODELINE/r $TEMPLATES/xorg/modeline.$Xcategory" \ - -e "s/^.*DisplaySize.*$/ $DS/" \ - -e "s/^#.*HorizSync.*$/ $HS/g" \ - -e "s/^#.*VertRefresh.*$/ $VR/g" \ - -e "/INSERT HERE/r /tmp/options" "$TEMPLATES/xorg/xorg.conf.ati" > "$XORG_CONF" - ;; - - via|VIA|Via|S3) - # Need to add appropriate Modules, Device and DRI sections - # See the http://www.mythtv.org/wiki/XvMC wiki page - echo "no via here" - ;; - - *) - echo "unknown card type" - ;; - esac -} - - -function setupX { - Xvalues - #echo "$currentmode ____ ${Xres}" - #if [ "${currentmode}" != \"${Xres}\" ] - if [ x = x ] - then - case $VGACARDTYPE in - nVidia) - if [ ${Xres} = Auto ] - then - sed -e "/^.*Modes.*$/d" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF" - else - sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF" - fi - if [ "$TESTMODE" != "test" ] - then - #nvidia check right here - grep -qi "$CARDID" "$NVIDIA_96XX" - if [ $? = 0 ] - then - #install 96xx drivers - echo "installing nvidia 96xx drivers" - pacman --noconfirm -Rd libgl > /dev/null 2>&1 - pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 - pacman --noconfirm -S nvidia-96xx nvidia-96xx-utils > /dev/null 2>&1 - else - #install latest drivers - echo "installing current nvidia drivers" - pacman --noconfirm -Rd libgl > /dev/null 2>&1 - pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 - pacman --noconfirm -S nvidia nvidia-utils > /dev/null 2>&1 - fi - fi - echo "/usr/lib/libXvMCNVIDIA_dynamic.so.1" > "$XVMC_CONFIG" - ;; - - # VMware) - # sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.vmware" > "$XORG_CONF" - # ;; - - VIA|S3) - # There are actually multiple options here - # xf86-video-openchrome - # xf86-video-unichrome - # There is also a seperate driver for the Unichrome Pro - if [ ${Xres} = Auto ] - then - sed -e "/^.*Modes.*$/d" "$TEMPLATES/xorg/xorg.conf.via" > "$XORG_CONF" - else - sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.via" > "$XORG_CONF" - fi - if [ "$TESTMODE" != "test" ] - then - if [ "$OPENCHROME" = "1" ] - then - pacman --noconfirm -R nvidia nvidia-utils > /dev/null 2>&1 - pacman --noconfirm -S libgl unichrome-dri xf86-video-openchrome > /dev/null 2>&1 - else - pacman --noconfirm -R nvidia nvidia-utils > /dev/null 2>&1 - pacman --noconfirm -S libgl unichrome-dri xf86-video-unichrome > /dev/null 2>&1 - fi - fi - # I'm making educated guesses here... - if lspci | grep "VGA" | grep -qi "Unichrome Pro" - then - if [ -f "/usr/lib/libchromeXvMCPro.so.1" ] - then - echo "/usr/lib/libchromeXvMCPro.so.1" > "$XVMC_CONFIG" - else - echo "/usr/lib/libviaXvMCPro.so.1" > "$XVMC_CONFIG" - fi - else - if [ -f "/usr/lib/libchromeXvMC.so.1" ] - then - echo "/usr/lib/libchromeXvMC.so.1" > "$XVMC_CONFIG" - else - echo "/usr/lib/libviaXvMC.so.1" > "$XVMC_CONFIG" - fi - fi - ;; - - Intel|intel) - if [ ${Xres} = Auto ] - then - sed -e "/^.*Modes.*$/d" "$TEMPLATES/xorg/xorg.conf.intel" > "$XORG_CONF" - else - sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.intel" > "$XORG_CONF" - fi - if [ "$TESTMODE" != "test" ] - then - pacman --noconfirm -R nvidia-utils > /dev/null 2>&1 - pacman --noconfirm -S libgl > /dev/null 2>&1 - fi - echo "/usr/lib/libIntelXvMC.so.1" > "$XVMC_CONFIG" - ;; - - vesa|InnoTek) - if [ ${Xres} = Auto ] - then - sed -e "/^.*Modes.*$/d" "$TEMPLATES/xorg/xorg.conf.vesa" > "$XORG_CONF" - else - sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.vesa" > "$XORG_CONF" - fi - ;; - - *) - XCONF=/root/xorg.conf.new - XCONFB=/etc/X11/xorg.conf.install - X -configure - if [ -f "$XCONF" ] - then - echo "Using $XCONF" - if [ ${Xres} = Auto ] - then - grep -v Modes "$XCONF" | sed -e 's/dev\/mouse/dev\/psaux/g'> "$XORG_CONF" - else - grep -v Modes "$XCONF" | sed -e "/Depth.*16/a Modes \"${Xres}\" " -e "/Depth.*24/a Modes \"${Xres}\"" -e 's/dev\/mouse/dev\/psaux/g'> "$XORG_CONF" - fi - elif [ -f "$XCONFB" ] - then - echo "Using $XCONFB" - if [ ${Xres} = Auto ] - then - sed -e "/^.*Modes.*$/d" "$XCONFB" > "$XORG_CONF" - else - sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$XCONFB" > "$XORG_CONF" - fi - else - echo "Xorg configuration failed" - fi - rm -f "$XCONF" 2>&1 > /dev/null - ;; - esac - fi - -} - -#MAIN -TESTMODE="$1" -if [ "$TESTMODE" = "test" ] -then - XORG_CONF="/tmp/xorg.conf.test" - XVMC_CONFIG="/tmp/XvMCConfig.test" - XUseAdvanced="1" - XIgnoreConfig="${2}" - Xcardtype="${3}" - XIgnoreEDID="${4}" - Xconnection="${5}" - XHsync="${6}" - XVrefresh="${7}" - Xresadvanced="${8}" - XTVstandard="${9}" - XTVconnection="${10}" - XDisplaysize="${11}" -else - if [ -f /etc/systemconfig ] - then - . /etc/systemconfig - else - Xres="800x600" - fi - CMDLINE=$(cat /proc/cmdline) - echo $CMDLINE | grep -q displayres - if [ $? = 0 ] - then - TEMPVAR=${CMDLINE#*displayres=} - DSR=${TEMPVAR%% *} - fi - if [ ! x$DSR = x ] - then - Xres=$DSR - fi - if [ ! x$DISPLAYRES = x ] - then - Xres=$DISPLAYRES - fi - - XORG_CONF="/etc/X11/xorg.conf" - XVMC_CONFIG="/etc/X11/XvMCConfig" -fi -presetupX diff --git a/abs/core-testing/LinHES-system/LinHES-profile.sh b/abs/core-testing/LinHES-system/LinHES-profile.sh deleted file mode 100644 index 830b819..0000000 --- a/abs/core-testing/LinHES-system/LinHES-profile.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -export LinHES_ROOT=/usr/LH -export PATH=$PATH:/usr/LH/bin \ No newline at end of file diff --git a/abs/core-testing/LinHES-system/LinHES-run b/abs/core-testing/LinHES-system/LinHES-run deleted file mode 100755 index d5a3a15..0000000 --- a/abs/core-testing/LinHES-system/LinHES-run +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/sh -function msg(){ - echo -e "$1" | osd_cat --pos=middle --align=center --offset=200 --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & -} - -. /etc/profile -. /etc/systemconfig -. /etc/unclutter.cfg || { - idle=1 - jitter=200 -} -. /etc/osd_cat.cfg || { - color=yellow - outline=2 - outlinecolour=black - shadow=0 - shadowcolour=black - font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*" -} -#keylaunch & -#/usr/bin/tilda & - -#move mouse to corner -xdotool mousemove 0 0 -/usr/X11R6/bin/unclutter -root -idle $idle -jitter $jitter -noevents & -if [ x"$Screensavertype" = "xgscreensaver" ] -then - gnome-screensaver & -elif [ x"$Screensavertype" = "xxscreensaver" ] -then - xscreensaver -no-splash & -fi - -/usr/bin/xvattr -a XV_COLORKEY -v 0 -mtd & -#/usr/bin/nvidia-settings -l -#/usr/bin/nvidia-settings -a InitialPixmapPlacement=2 - -if [ x$ShowTips = "x1" ] -then - msg "Alt+h for help" & -fi - -# Run any scripting that applies to special hardware. These brand-specific commands that run -# after Tweaker will, of course, override generic or hardware-specific settings. -SpecialHardwareCommands() { - special_hardware_file=/myth/.special_hardware_type - special_hardware=`cat $special_hardware_file` - - case $special_hardware in - dragon*) - sudo -E twk_audio.pl --implement digital - sudo -E twk_dragon.pl --implement all - ;; - ausdragon*) - ;; - *) - # there are no brand-specific commands for configuring whatever - # special hardware the user chose - ;; - esac -} - -#update apple trailers -if [[ x$RunFrontend = x1 && -f ~/.configure ]] -then - /usr/bin/php -q /usr/bin/myth_trailers_grabber > /home/mythtv/appletrailer.xml && /usr/bin/fix_aple_url.sh 2>/dev/null & -fi - - -if [ ! $SystemType = "Frontend_only" ] -then - if [ -f ~/.configure ] - then - # Run Tweaker, which applies generic and hardware-specific settings - if [ ! -f ~/.no_meth ] - then - sudo -E tweaker.pl - /bin/rm /tmp/fps # ??? clean up a temp file that will eventually be obsolete anyway - # Run any brand-specific commands, if necessary. - SpecialHardwareCommands - else - rm -f ~/.no_meth - fi - sudo pacman -R myth2ipod myt2xvid3 - sudo pacman -S --noconfirm myth2ipod myt2xvid3 - sudo sv stop mythbackend - cat /data/database/dvd_transcode_r6.sql | mysql -u root mythconverg - xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup - sudo sv start mythbackend - sudo chown -R mythtv.mythtv /home/mythtv - nice -n 19 mythfilldatabase --quiet & - msg "Guide data is being loaded. \n Until this completes\n some shows will appear as unknown \n in the program guide." - rm ~/.configure - fi -fi - - -if [ x"$UseMythWelcome" = "x1" ] -then - STARTCMD="/usr/bin/mythwelcome" -else - STARTCMD="/usr/bin/mythfrontend -d -l /var/log/mythtv/mythfrontend.log" -fi - -echo "=====================================================================" -echo "Starting $STARTCMD" -firstboot.sh & - -if [ -f /tmp/nomfe ] -then - exit 0 -else - if [ -f /tmp/debug ] - then - echo "using gbd/debug" - gdb /usr/bin/mythfrontend -x $MV_ROOT/mfegdbcommands.txt - mv gdb.txt gdb.txt.mythfrontend - sleep 10 - else - killall -9 irexec - /usr/bin/irexec -d - $STARTCMD 2>&1 - fi -fi - diff --git a/abs/core-testing/LinHES-system/LinHES-session b/abs/core-testing/LinHES-system/LinHES-session deleted file mode 100755 index 52924d2..0000000 --- a/abs/core-testing/LinHES-system/LinHES-session +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -. /etc/profile -. /etc/systemconfig - -xhost +local: -xhost +127.0.0.1 -xset -dpms s off -export MALLOC_CHECK_=0 -#start fluxbox -fluxbox > /var/log/fluxbox.log 2>&1 - - - diff --git a/abs/core-testing/LinHES-system/LinHES-start b/abs/core-testing/LinHES-system/LinHES-start deleted file mode 100755 index 3157a2e..0000000 --- a/abs/core-testing/LinHES-system/LinHES-start +++ /dev/null @@ -1,162 +0,0 @@ -#!/bin/sh -# $Xorg: startx.cpp,v 1.3 2000/08/17 19:54:29 cpqbld Exp $ -# -# This is just a sample implementation of a slightly less primitive -# interface than xinit. It looks for user .xinitrc and .xserverrc -# files, then system xinitrc and xserverrc files, else lets xinit choose -# its default. The system xinitrc should probably do things like check -# for .Xresources files and merge them in, startup up a window manager, -# and pop a clock and serveral xterms. -# -# Site administrators are STRONGLY urged to write nicer versions. -# -# $XFree86: xc/programs/xinit/startx.cpp,v 3.16tsi Exp $ -. /etc/profile - -unset DBUS_SESSION_BUS_ADDRESS -unset SESSION_MANAGER - -userclientrc=/etc/X11/Sessions/LinHES -userserverrc=$HOME/.xserverrc -sysclientrc=/usr/X11R6/lib/X11/xinit/xinitrc -sysserverrc=/usr/X11R6/lib/X11/xinit/xserverrc -defaultclient=/usr/X11R6/bin/xterm -defaultserver=/usr/X11R6/bin/X -defaultclientargs="" -defaultserverargs="" -clientargs="" -serverargs="" - - - - - - -if [ -f $userclientrc ]; then - defaultclientargs=$userclientrc -elif [ -f $sysclientrc ]; then - defaultclientargs=$sysclientrc -fi - - - - -if [ -f $userserverrc ]; then - defaultserverargs=$userserverrc -elif [ -f $sysserverrc ]; then - defaultserverargs=$sysserverrc -fi - -whoseargs="client" -while [ x"$1" != x ]; do - case "$1" in - # '' required to prevent cpp from treating "/*" as a C comment. - /''*|\./''*) - if [ "$whoseargs" = "client" ]; then - if [ x"$clientargs" = x ]; then - client="$1" - else - clientargs="$clientargs $1" - fi - else - if [ x"$serverargs" = x ]; then - server="$1" - else - serverargs="$serverargs $1" - fi - fi - ;; - --) - whoseargs="server" - ;; - *) - if [ "$whoseargs" = "client" ]; then - clientargs="$clientargs $1" - else - # display must be the FIRST server argument - if [ x"$serverargs" = x ] && \ - expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then - display="$1" - else - serverargs="$serverargs $1" - fi - fi - ;; - esac - shift -done - -# process client arguments -if [ x"$client" = x ]; then - # if no client arguments either, use rc file instead - if [ x"$clientargs" = x ]; then - client="$defaultclientargs" - else - client=$defaultclient - fi -fi - -# process server arguments -if [ x"$server" = x ]; then - # if no server arguments or display either, use rc file instead - if [ x"$serverargs" = x -a x"$display" = x ]; then - server="$defaultserverargs" - else - server=$defaultserver - fi -fi - -if [ x"$XAUTHORITY" = x ]; then - XAUTHORITY=$HOME/.Xauthority - export XAUTHORITY -fi - -removelist= - - -# set up default Xauth info for this machine -case `uname` in -Linux*) - if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then - hostname=`hostname -f` - else - hostname=`hostname` - fi - ;; -*) - hostname=`hostname` - ;; -esac - -authdisplay=${display:-:0} -mcookie=`mcookie` -for displayname in $authdisplay $hostname$authdisplay; do - if ! xauth list "$displayname" | grep "$displayname " >/dev/null 2>&1; then - xauth -q << EOF -add $displayname . $mcookie -EOF - removelist="$displayname $removelist" - fi -done - - -xinit $client $clientargs -- $server $display -logverbose 6 $serverargs - -if [ x"$removelist" != x ]; then - xauth remove $removelist -fi - - - - - -if command -v deallocvt > /dev/null 2>&1; then - deallocvt -fi - - - - - - - diff --git a/abs/core-testing/LinHES-system/LinHES.install b/abs/core-testing/LinHES-system/LinHES.install deleted file mode 100644 index 0f6689e..0000000 --- a/abs/core-testing/LinHES-system/LinHES.install +++ /dev/null @@ -1,98 +0,0 @@ -# This is a default template for a post-install scriptlet. You can -# remove any functions you don't need (and this header). - -# arg 1: the new package version -pre_install() { -/bin/true -} - -# arg 1: the new package version -post_install() { -MVDIR=/usr/LH/bin -# ln -s $MVDIR/backup_job /etc/cron.daily/backup_cron -# ln -s $MVDIR/update_system /etc/cron.daily/xupdate_system_cron -# ln -s $MVDIR/repo_sync.sh /etc/cron.daily/zrepo_sync.sh - if [ ! -e /etc/cron.daily/myth_mtc.sh ] - then - ln -s $MVDIR/myth_mtc.sh /etc/cron.daily/myth_mtc.sh - fi - -#LINE="mythtv ALL = NOPASSWD: /sbin/sv stop mythbackend" -LINE="mythtv ALL=(ALL) NOPASSWD: ALL" -LINE1="%wheel ALL=(ALL) NOPASSWD: ALL" - - -for i in "$LINE" "$LINE1" "$LINE2" "$LINE3" "$LINE4" "$LINE5" "$LINE7" "$LINE8" "$LINE9" "$LINE10" "$LINE11" "$LINE12" "$LINE13" "$LINE14" "$LINE15" "$LINE16" -do - cp /etc/sudoers /etc/sudoers.bak - grep -q "$i" /etc/sudoers - if [ $? != 0 ] - then - echo "$i" >> /etc/sudoers - visudo -cf /etc/sudoers - if [ ! $? = 0 ] - then - cp /etc/sudoers.bak /etc/sudoers - echo $i - echo "Error adding files" - exit 1 - fi - fi -done - -REALTIME="session required pam_limits.so" -grep -q "pam_limits.so" /etc/pam.d/su - if [ $? != 0 ] - then - echo "$REALTIME" >> /etc/pam.d/su - - fi - -# Update mythtv's fluxbox keys files to use the tvterm.sh script to get -# an xterm. Then signal fluxbox to re-read the keys file. - -sed -i.orig 's/^Mod1 x :.*xterm.*$/Mod1 x :ExecCommand tvterm.sh/g' \ - ~mythtv/.fluxbox/keys -pkill -HUP fluxbox - -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - if [ -e /etc/cron.daily/backup_cron ] - then - rm -f /etc/cron.daily/backup_cron - fi - if [ -e /etc/cron.daily/xupdate_system_cron ] - then - rm -f /etc/cron.daily/xupdate_system_cron - fi - - if [ -e /etc/cron.daily/myth_mtc.py ] - then - rm -f /etc/cron.daily/myth_mtc.py - fi - - -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - -op=$1 -shift -$op $* diff --git a/abs/core-testing/LinHES-system/PKGBUILD b/abs/core-testing/LinHES-system/PKGBUILD deleted file mode 100755 index 0e699f4..0000000 --- a/abs/core-testing/LinHES-system/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -pkgname=LinHES-system -pkgver=1.1 -pkgrel=32 -arch=('i686') -MVDIR=$startdir/pkg/usr/LH -BINDIR=$startdir/pkg/usr/bin -install=LinHES.install -pkgdesc="scripts and things related to having a automated system" -depends=(linhes-sounds xdotool) -backup=(etc/modprobe.d/alsa-base) -binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh LinHES-run firstboot.sh load-modules-mythvantage.sh unclutter-toggle.sh tvterm.sh myth_mtc.lr smolt.cron mythfrontend-start" - -source=(LinHES-session LinHES-profile.sh $binfiles alsa-base) - -build() { - cd $startdir/src - install -m755 -D LinHES-session $startdir/pkg/etc/X11/Sessions/LinHES - install -m755 -D LinHES-profile.sh $startdir/pkg/etc/profile.d/LinHES-profile.sh - ####### install to /usr/LH/bin - for i in $binfiles - do - item=$i - install -m755 -D $item $MVDIR/bin/$item - echo $item - done - - cd $startdir/bin - for i in * - do - item=$i - install -m755 -D $item $MVDIR/bin/$item - echo $item - done - - install -m755 -D $startdir/src/alsa-base $startdir/pkg/etc/modprobe.d/alsa-base - install -m755 -D $startdir/src/smolt.cron $startdir/pkg/etc/cron.weekly/smolt.cron - mkdir $startdir/pkg/etc/logrotate.d - cp $startdir/myth_mtc.lr $startdir/pkg/etc/logrotate.d -} - - -md5sums=('19934a456d0e112298b8aac3279f9a16' - '5881bdb43d578ec3a79d1f77ea58a3db' - 'a875ee97f86e46f34a741c2bc455f894' - 'cdcbc530224215f8fcf7ebcd93d7eb0b' - 'c60b6c66f498809a6e5ca18a8c97d336' - 'ccae1296ef248fa52ec3a7cb820a476e' - 'b58b59c05faeefd4acbbb7876215c875' - '18a884a73344ff6eb74f63b49745e0f5' - 'dc3eef2a624754e16805d72bbe488b67' - 'dc0be354ce77ba2b89868fc29b942c43' - '542e670e78d117657f93141e9689f54d' - 'f1870a9522c79e6b248fcbf81dec3280' - 'abe887472a170bd1a8e6da6a7b7e93e4' - '752488eb8bfb672ce0e4c924f7faf3d1' - 'eb879fee9603a05d5420d4ce8ed9e450') diff --git a/abs/core-testing/LinHES-system/alsa-base b/abs/core-testing/LinHES-system/alsa-base deleted file mode 100644 index bf99ac3..0000000 --- a/abs/core-testing/LinHES-system/alsa-base +++ /dev/null @@ -1,10 +0,0 @@ -# Prevent abnormal drivers from grabbing index 0 -options bt87x index=-2 -options cx88_alsa index=-2 -options saa7134-alsa index=-2 -options snd-atiixp-modem index=-2 -options snd-intel8x0m index=-2 -options snd-via82xx-modem index=-2 -options snd-usb-audio index=-2 -options snd-usb-usx2y index=-2 -options snd-usb-caiaq index=-2 diff --git a/abs/core-testing/LinHES-system/bin/backupcommon b/abs/core-testing/LinHES-system/bin/backupcommon deleted file mode 100644 index d112341..0000000 --- a/abs/core-testing/LinHES-system/bin/backupcommon +++ /dev/null @@ -1,382 +0,0 @@ -#!/bin/bash - -. /usr/LH/bin/library.sh || { - echo 1>&2 "Can not load common library!" - exit 1 -} - -# You need to be root at least via sudo for the backup utilities to work. -must_be_root - -#---------------------------------------------------------------------------- -DATABASE="mythconverg" -DATABASE_DIR="/data/srv/mysql/$DATABASE" -BACKUP_LIST="./root ./home ./etc - ./var/lib/alsa/asound.state" -RESTORE_LIST="./root ./home ./etc/mythtv/modules ./etc/lirc - ./etc/X11/xorg.conf ./etc/asound.conf ./etc/default/aumix - ./var/lib/alsa/asound.state ./etc/mplayer/mplayer.conf - ./etc/localtime ./etc/timezone ./etc/asound.state" -# Both BLACK_LIST and IGNORE_LIST need to have only one file per line -# They also can't have any extra whitespace... -# Files and directories we should refuse to restore -BLACK_LIST='./etc/fstab -./etc/modules -./proc -./dev -./lib -./var/lib -./myth -./myth/backup -./home/mythtv/.my.cnf -./root/.my.cnf -./home/mythtv/.Xauthority -./root/.Xauthority' -# Files we ignore as differences -IGNORE_LIST='./home/mythtv/.upgrade -./home/mythtv/.configure -./home/mythtv/.newcard -./home/mythtv/.xscreensaver -./home/mythtv/appletrailer.xml -./root/ati-driver-installer-8-01-x86.x86_64.run -./root/ati-driver-installer-8-3-x86.x86_64.run -./root/mythstreamweb.tar -./home/mythtv/.Xauthority -./root/.Xauthority' -BACKUP_DIR="/myth/backup" -BACKUP_EXTRAS="$BACKUP_DIR/backup.list" -RESTORE_EXTRAS="$BACKUP_DIR/restore.list" -BACKUP_TAR="$BACKUP_DIR/savedfiles.tar" -BACKUP_SQL="$BACKUP_DIR/$DATABASE.sql" -#DROP_SQL="/usr/local/share/knoppmyth/drop.sql" -UTIL_DIR="/usr/LH/bin" -# Do we really still need to update from myth-0.11 to myth-0.12 ? -UPDATE_SQL="/usr/share/mythtv/sql/0.11-to-0.12.sql" -UPDATE_FILES="$UTIL_DIR/restore_fixups.sh" -COMPRESSION=".gz" -SOUNDS="/usr/share/sounds" -SILENCE="$SOUNDS/half_second_of_silence.wav" -PLAYER="/usr/bin/aplay" -#---------------------------------------------------------------------------- -AWK=/bin/awk -BASH=/bin/bash -BUNZIP2=/bin/bunzip2 -BZIP2=/bin/bzip2 -CAT=/bin/cat -CHMOD=/bin/chmod -CHOWN=/bin/chown -EGREP=/bin/egrep -GREP=/bin/grep -GUNZIP=/bin/gunzip -GZIP=/bin/gzip -LS=/bin/ls -MV=/bin/mv -RM=/bin/rm -SED=/bin/sed -TAR=/bin/tar -TR=/bin/tr -DIFF=/usr/bin/diff -FIND=/usr/bin/find -MD5SUM=/usr/bin/md5sum -MYISAMCHK=/usr/bin/myisamchk -MYSQL=/usr/bin/mysql -MYSQLADMIN=/usr/bin/mysqladmin -MYSQLDUMP=/usr/bin/mysqldump -MYTHSHUTDOWN=/usr/bin/mythshutdown -SORT=/usr/bin/sort -WC=/usr/bin/wc -SV=/sbin/sv - -#---------------------------------------------------------------------------- - -require file+r+x $AWK $BASH $BUNZIP2 $BZIP2 $CAT $CHMOD $CHOWN $EGREP $GREP \ - $GUNZIP $GZIP $LS $MV $RM $SED $TAR $TR $DIFF $FIND $MD5SUM \ - $MYISAMCHK $MYSQL $MYSQLADMIN $MYSQLDUMP $MYTHSHUTDOWN \ - $SORT $WC $SV - -#require file+r "$DROP_SQL" - -require dir+r+w+x /tmp "$BACKUP_DIR" "$DATABASE_DIR" - -play_sound () { - ($PLAYER $SILENCE $SOUNDS/$1 >& /dev/null)& -} - -# Filter against an exclude list like the black list or the ignore list above -filter_list () { - $GREP -vxF "$*" | - $SORT -u -} - -# Some people just can't read or follow directions... :-/ -# This should track the directory names in the default backup list above -# We also use this to short circuit a certain incredibly dumb stunt -filter_redundant () { - filter_list "$($TR -s ' ' '\n' <<<"$BACKUP_LIST ./myth")" | - $EGREP -v '^\./(root|home|etc|myth)/' | - $SORT -u -} - -get_extras () { - # One entry per line, and normalize the prefix - $TR ' ' '\n' <"$1" | - $AWK '/^$/ {next} - /^\.\// {print $0 ; next} - /^\// {print "." $0 ; next} - { print "./" $0}' -} - -[ -f "$BACKUP_EXTRAS" ] && - BACKUP_LIST="$BACKUP_LIST $(get_extras $BACKUP_EXTRAS | - filter_redundant)" - -[ -f "$RESTORE_EXTRAS" ] && - RESTORE_LIST="$RESTORE_LIST $(get_extras $RESTORE_EXTRAS | - filter_list "$BLACK_LIST")" - -# Build tar exclusion parameters out of $BLACK_LIST -EXCLUSION="" -case $0 in -*restore) - for file in $BLACK_LIST ; do - EXCLUSION="$EXCLUSION --exclude $file " - done - ;; -*) - ;; -esac - -shrink () { - case "$COMPRESSION" in - .gz) - $GZIP -9 "$@" - ;; - .bz2) - $BZIP2 -9 "$@" - ;; - *) - ;; - esac -} - -expand () { - case "$*" in - *.gz) - $GUNZIP "$@" - ;; - *.bz2) - $BUNZIP2 "$@" - ;; - -c\ *) - $CAT $2 /dev/null - ;; - -t\ *) - return 0 - ;; - *) - echo 1>&2 "Error, unknown file type!" - return 1 - ;; - esac -} - -single_format () { - candidates=$($LS -1 "$1.gz" "$1.bz2" "$1" 2>/dev/null) - case $($WC -l <<<"$candidates") in - 1) return 0 # One is good! - ;; - 0) echo "Error, no $1 found!" - return 1 - ;; - *) echo "Warning, multiple formats for $1 found!" - echo "Candidates are: $candidates" - ;; - esac -} - -compression_type () { - for compression in .gz .bz2 "" ; do - if [ -f "$1$compression" ] ; then - echo "$compression" - return 0 - fi - done - return 1 -} - -backup_roller () { # Gets the rollover sequence to use. - prev_i=$1 ; shift - for i in "$@" ; do - for c in .gz .bz2 "" ; do - for f in $BACKUP_SQL $BACKUP_TAR ; do - $RM -f $f$c$prev_i - if [ -f "$f$c$i" ] ; then - echo "Moving $f$c$i to $f$c$prev_i" - $MV -f $f$c$i $f$c$prev_i - fi - done - done - prev_i="$i" - done -} - -# Given "subset A B" return true if is A a subset of B -subset () { - cnt=$($DIFF $1 $2 | $GREP '^<' | $WC -l) - [ "$cnt" -eq 0 ] && return 0 - $DIFF $1 $2 -} - -mysql_cmd () { - $MYSQL -u root $DATABASE -sBe "$*" -} - -mysql_stdin () { - $MYSQL -u root $DATABASE -sB -} - -check_files () { - OBJECT_LIST="$*" - LIVE_FILES=/tmp/live_files_$$ - SAVED_FILES=/tmp/saved_files_$$ - - echo "Checking for the existance of the backup tar file..." - single_format "$BACKUP_TAR" - c=$(compression_type "$BACKUP_TAR") || - { echo "Error, missing tar file - '$BACKUP_TAR$c'." ; return 1 ; } - echo "Using file $BACKUP_TAR$c" - echo "Backup tar file exists. Checking the compression..." - expand -t $BACKUP_TAR$c || - { echo "Error, bad compressed tarball - '$BACKUP_TAR$c'." ; return 1 ; } - echo "Compression looks OK. Checking backup tar file contents..." - - echo "Generating a list of the backup contents..." - { - expand -c $BACKUP_TAR$c | - $TAR tf - $OBJECT_LIST $EXCLUSION | - $SED '/\/$/s///' | - filter_list "$IGNORE_LIST" >$SAVED_FILES - } 2>&1 | $SED -e '/Error exit delayed from previous errors/d' - - echo "Generating a list of the directory contents..." - cd / - $FIND $OBJECT_LIST \( -type d -or -type f -or -type l \) -print | - filter_list "$IGNORE_LIST" >$LIVE_FILES - - echo "Comparing directory versus backup contents..." - case $0 in - *backup) # backup must contain everything selected from the directories - subset $LIVE_FILES $SAVED_FILES - ;; - *restore) # directories must contain everything selected from the backup - subset $SAVED_FILES $LIVE_FILES - ;; - *) - $DIFF $LIVE_FILES $SAVED_FILES - ;; - esac - FILE_STATUS=$? - $RM $LIVE_FILES $SAVED_FILES - if [ $FILE_STATUS -eq 0 ] ; then - echo "Live and saved file lists match." - else - echo "Warning, file lists are not identical!" - fi - return $FILE_STATUS -} - -has_records () { - filename="$1" - description="$2" - if [ $($WC -l < "$filename") -eq 0 ] ; then - echo "Warning, could not get record counts from $description!" - return 1 - fi - if [ $($AWK '{cnt+=$2} END {print cnt}' < "$filename") -eq 0 ] ; then - echo "Warning, total record count from $description is zero!" - return 1 - fi - return 0 -} - -check_tables () { - LIVE_TABLES=/tmp/live_tables_$$ - SAVED_TABLES=/tmp/saved_tables_$$ - - echo "Checking for the existance of the DB dump file..." - single_format "$BACKUP_SQL" - c=$(compression_type "$BACKUP_SQL") || - { echo "Error, missing DB dump - '$BACKUP_SQL$c'" ; return 1 ; } - echo "Using file $BACKUP_SQL$c" - echo "DB dump file exists. Checking the compression..." - expand -t $BACKUP_SQL$c || - { echo "Error, bad compressed DB dump - '$BACKUP_SQL$c'." ; return 1 ; } - echo "Compression looks OK. Checking DB dump contents..." - - echo "Generating a list of tables and record counts in the DB dump..." - expand -c "$BACKUP_SQL$c" | - $AWK '/CREATE TABLE/ { tbl = $3; gsub("`","",tbl); records[tbl] = 0; } \ - /INSERT INTO/ { tbl = $3; gsub("`","",tbl); \ - n = split(substr($0,index($0,"VALUES (")+7),vals,"\\),\\("); \ - records[tbl] += n; } \ - END { for (tbl in records) print tbl, records[tbl]; }' | - $SED 's/mythlog [0-9]*/mythlog 0/' | - $SORT >$SAVED_TABLES - has_records "$SAVED_TABLES" "DB dump" || return 1 - - echo "Generating a list of tables and record counts in the live DB..." - for tbl in $(mysql_cmd "show tables") ; do - mysql_cmd "select '$tbl', count(*) from $tbl" - done | - $TR -s '\t' ' ' | - $SED 's/mythlog [0-9]*/mythlog 0/' | - $SORT >$LIVE_TABLES - has_records "$LIVE_TABLES" "live DB" || return 1 - - echo "Comparing live versus saved tables..." - case $0 in - *restore) # database must include everything from the backup - subset $SAVED_TABLES $LIVE_TABLES - ;; - *) # backup must exactly match the database - $DIFF $LIVE_TABLES $SAVED_TABLES - ;; - esac - TABLE_STATUS=$? - $RM $LIVE_TABLES $SAVED_TABLES - if [ $TABLE_STATUS -eq 0 ] ; then - echo "Live and saved table lists match." - else - echo "Warning, table lists are not identical!" - fi - return $TABLE_STATUS -} - -check_files_and_tables () { - STATUS=0 - echo - check_files "$@" || STATUS=1 - echo - check_tables || STATUS=1 - echo - return $STATUS -} - -stop_mysqld () { $SV stop mysql ; } -start_mysqld () { - $SV start mysql - for t in 1 2 4 8 ; do - ready=$(mysql_cmd 'select 1 from dual' 2>/dev/null) - [ "$ready" = "1" ] && break - sleep "$t" - done - [ "$ready" != "1" ] && echo "Error, DB not available after 15 seconds!" -} - -stop_mythbackend () { $SV stop mythbackend ; } -start_mythbackend () { $SV start mythbackend ; } - -lock_myth () { $MYTHSHUTDOWN --lock ; } -unlock_myth () { $MYTHSHUTDOWN --unlock ; } - -true # Make sure that this shows success diff --git a/abs/core-testing/LinHES-system/bin/checkbackup b/abs/core-testing/LinHES-system/bin/checkbackup deleted file mode 100755 index b6d8587..0000000 --- a/abs/core-testing/LinHES-system/bin/checkbackup +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -#---------------------------------------------------------------------------- -. /usr/LH/bin/backupcommon || { - echo 1>&2 "Can not load common settings!" - exit 1 -} -#---------------------------------------------------------------------------- - -if check_files_and_tables $BACKUP_LIST ; then - echo "Backup passes all checks." - exit 0 -else - echo "The backup is bad or already out of date!" - exit 1 -fi diff --git a/abs/core-testing/LinHES-system/bin/checkrestore b/abs/core-testing/LinHES-system/bin/checkrestore deleted file mode 100755 index ef0360c..0000000 --- a/abs/core-testing/LinHES-system/bin/checkrestore +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -#---------------------------------------------------------------------------- -. /usr/LH/bin/backupcommon || { - echo 1>&2 "Can not load common settings!" - exit 1 -} -#---------------------------------------------------------------------------- - -if check_files_and_tables $RESTORE_LIST ; then - echo "Restore passes all checks." - exit 0 -else - echo "The restore failed or was already modified!" - exit 1 -fi diff --git a/abs/core-testing/LinHES-system/bin/library.sh b/abs/core-testing/LinHES-system/bin/library.sh deleted file mode 100755 index 2049de3..0000000 --- a/abs/core-testing/LinHES-system/bin/library.sh +++ /dev/null @@ -1,164 +0,0 @@ -msg () { # A status reporting function - [ "${VERBOSE:-0}" -gt 0 ] && echo "$*" -} - -error () { # An error reporting function - echo 1>&2 "$*" -} - -fatal () { # Report an error and exit with a failure code - error "$*" - exit 1 -} - -# The only non builtin this uses is tr... -require () { # Check prerequisites - e=0 - props="$1" ; shift - for obj in "$@" ; do - [ -z "$obj" ] && continue # Too late to do anything itelligent... - problems="" - for prop in $(/bin/tr '+,' ' ' <<<"$props") ; do - case "$prop" in - e|exists) # kind of useless... - [ -e "$obj" ] || problems="$problems, does not exist" ;; - f|file) - [ -f "$obj" ] || problems="$problems, is not a file" ;; - d|dir) - [ -d "$obj" ] || problems="$problems, is not a directory" ;; - l|symlink) - [ -L "$obj" ] || problems="$problems, is not a symlink" ;; - nosymlink) - [ -L "$obj" ] && problems="$problems, is a symlink" ;; - r|readable) - [ -r "$obj" ] || problems="$problems, is not readable" ;; - w|writable) - [ -w "$obj" ] || problems="$problems, is not writable" ;; - x|executable) - [ -x "$obj" ] || problems="$problems, is not executable" ;; - *) - fatal "Programmer error, unknown property: '$prop'" ;; - esac - done - if [ -n "$problems" ] ; then - error "Error: '$obj'$problems." - e=1 - fi - done - [ "$e" -ne 0 ] && fatal "Errors noted above are fatal." -} - -require file+r+x /bin/bash /bin/grep /bin/rm /bin/tr \ - /usr/bin/basename /usr/bin/env \ - /usr/bin/mysql /usr/bin/sort - -if [ -n "$DEBUG" ] ; then - for debug_opt in $(/bin/tr ',' ' ' <<<"$DEBUG") ; do - echo '============================================================' - echo "==== $debug_opt" - - # Note that the order you specifiy these debug options in matters. - # I recommend always listing log first. For example: - # export DEBUG=log,env,set,trace - case "$debug_opt" in - env) /usr/bin/env | /usr/bin/sort ;; - set) set ;; - trace) set -vx ;; - log) logfile="/tmp/$(/usr/bin/basename $0).$$.debug" - /bin/rm -f "$logfile" # Try to avoid privilege escalation bugs - echo "Redirecting stdout and stderr to '$logfile'" - exec >"$logfile" 2>&1 ;; - *) error "Unknown debug option '$debug_opt'" ;; - esac - done - echo '============================================================' -fi - -must_be_root () { # For things which must be run as root - [ $(/usr/bin/id -u) -ne 0 ] && fatal "You must run this script as root!" -} - -must_be_mythtv () { # For things which must be run as mythtv (su if possible) - case $(/usr/bin/id -nu) in - mythtv) ;; # Continue - root) /bin/su - mythtv -c "$0 $*" ; exit $? ;; - *) fatal "You must run this script at mythtv or root!" ;; - esac -} - -# Use a variable so you can override it. -DATABASE="mythconverg" - -mysql_cmd () { # Execute SQL from the command line - /usr/bin/mysql -u root "$DATABASE" -sBe "$*" -} - -mysql_stdin () { # Execute SQL from stdin - /usr/bin/mysql -u root "$DATABASE" -sB -} - -machine_clause () { # Helper function - if [ -z "$1" ] ; then - echo "(hostname = '' or hostname is null)" - else - echo "hostname = '$1'" - fi -} - -get_all_setting_names () { # List setting names - case "$#" in - 0) MACHINE_CLAUSE="" ;; - 1) MACHINE_CLAUSE="where $(machine_clause "$1")" ;; - *) fatal "Programmer error, get_all_names must be passed 0 or 1 args, got $#" ;; - esac - mysql_cmd "select distinct value from settings $MACHINE_CLAUSE order by value" -} - -get_all_setting_values () { # List settings - case "$#" in - 0) MACHINE_CLAUSE="" ;; - 1) MACHINE_CLAUSE="where $(machine_clause "$1")" ;; - *) fatal "Programmer error, get_all_values must be passed 0 or 1 args, got $#" ;; - esac - mysql_cmd "select value, data, hostname from settings $MACHINE_CLAUSE order by hostname, value, data" -} - -get_setting_value () { # Get the data for a setting (may return multiples!) - case "$#" in - 1) MACHINE_CLAUSE="" ;; - 2) MACHINE_CLAUSE="and $(machine_clause "$2")" ;; - *) fatal "Programmer error, get_value must be passed 1 or 2 args, got $#" ;; - esac - mysql_cmd "select data from settings where value = '$1' $MACHINE_CLAUSE" -} - -set_setting_value () { # Insert or update aome setting - case "$#" in - 2) RECORD_CNT=$(get_value "$1" | wc -l) ;; - 3) RECORD_CNT=$(get_value "$1" "$3" | wc -l) ;; - *) fatal "Programmer error, set_value must be passed 2 or 3 args, got $#" ;; - esac - MACHINE_CLAUSE="" - if [ "$RECORD_CNT" -eq 0 ] ; then - [ -n "$3" ] && MACHINE_CLAUSE=", $(machine_clause "$3")" - mysql_cmd "insert into settings set value = '$1', data = '$2' $MACHINE_CLAUSE" - else - [ "$#" -eq 3 ] && MACHINE_CLAUSE="and $(machine_clause "$3")" - mysql_cmd "update settings set data = '$2' where value = '$1' $MACHINE_CLAUSE" - fi -} - -delete_setting_value () { # Totally remove some setting - case "$#" in - 1) MACHINE_CLAUSE="" ;; - 2) MACHINE_CLAUSE="and $(machine_clause "$2")" ;; - *) fatal "Programmer error, get_value must be passed 1 or 2 args, got $#" ;; - esac - mysql_cmd "delete from settings where value = '$1' $MACHINE_CLAUSE" -} - -# Filter against a newline seperated exclude list -filter_list () { - /bin/grep -vxF "$*" | - /usr/bin/sort -u -} diff --git a/abs/core-testing/LinHES-system/bin/mythbackup b/abs/core-testing/LinHES-system/bin/mythbackup deleted file mode 100755 index 3b4edd4..0000000 --- a/abs/core-testing/LinHES-system/bin/mythbackup +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -#---------------------------------------------------------------------------- -. /usr/LH/bin/backupcommon || { - echo 1>&2 "Can not load common settings!" - exit 1 -} - -. /etc/osd_cat.cfg || { - color=yellow - outline=2 - outlinecolour=black - shadow=0 - shadowcolour=black - font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*" -} -#---------------------------------------------------------------------------- - -# Function to display status onscreen -osd() -# Arg_1 = display text Arg_2 = delay time Arg_3 = line num -{ - TEXT=$1 - killall -9 osd_cat - if [ $3 -gt 1 ]; then - for ((i=2; i <= $3 ; i++)) - do - TEXT="\n"$TEXT - done - fi - printf "$TEXT" | osd_cat --lines=6 --pos=middle --align=center --delay=$2 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & -} - -# Prevent mythshutdown from shutting down the system in the middle... -lock_myth - -# Play a sound to let you know I'm starting. -play_sound init.wav - -# Keep a chain of recent backups, -export DISPLAY=:0.0 -osd "Rolling over old backups..." 0 1 -echo "Starting rollover of old backups, this may take a while..." -[ -f "$BACKUP_SQL" ] && shrink $BACKUP_SQL -[ -f "$BACKUP_TAR" ] && shrink $BACKUP_TAR -backup_roller .19 .18 .17 .16 .15 .14 .13 .12 .11 .10 .9 .8 .7 .6 .5 .4 .3 .2 .1 '' -echo "Rollover completed." - -osd "Checking the database..." 0 2 -# Start with the database backup, first we make sure it's healthy, and -# then we can dump it. -# Doing this while the backend is active would be BAD. -stop_mythbackend - -# Stop, check, and fix $DATABASE db to ensure clean copy, then restart it. -stop_mysqld -cd $DATABASE_DIR -$MYISAMCHK -f *.MYI -start_mysqld - -osd "Backing up database..." 0 3 -# Dumps the $DATABASE database -$MYSQLDUMP -v -c -u root $DATABASE > $BACKUP_SQL -shrink $BACKUP_SQL - -osd "Backing up files..." 0 4 -# Now to backup the other files, no fooling around, grab everything in the -# list because you never know what you'll want, and we can always get clever -# about what to restore later... - -# gather all the things in the list into a nice tidy bundle -cd / -$TAR cvf $BACKUP_TAR $BACKUP_LIST 2>&1 | - $SED -e '/Error exit delayed from previous errors/d' -shrink $BACKUP_TAR - -# If you can't read this you've got no business restoring from it anyway. -$CHOWN root:root $BACKUP_TAR* $BACKUP_SQL* -$CHMOD go-rwx $BACKUP_TAR* $BACKUP_SQL* - -osd "Testing backup..." 0 5 -echo "Sanity checking your backup..." -play_sound testing.wav -# Play a sound to let you know the outcome. -if check_files_and_tables $BACKUP_LIST ; then - osd "Backup completed successfully." 5 6 - echo "Backup passes all checks." - COMPLETE_MSG="Last backup completed on `date '+%D @ %-I:%M %p'`" - play_sound complete.wav - STATUS=0 -else - osd "Backup FAILED." 5 6 - echo "The backup is bad or already out of date!" - COMPLETE_MSG="Last backup FAILED on `date '+%D @ %-I:%M %p'`" - play_sound fail.wav - STATUS=1 -fi - -# Add Last backup status to menu item -if grep "" /usr/share/mythtv/themes/defaultmenu/mythbackup.xml >/dev/null 2>&1 -then - sed -i "s_\.*\_description\>$COMPLETE_MSG\<\/description_" /usr/share/mythtv/themes/defaultmenu/mythbackup.xml -else - sed -i.orig " /NONE/ i\ \$COMPLETE_MSG\<\/description\>" /usr/share/mythtv/themes/defaultmenu/mythbackup.xml -fi - -# Now we can restart the backend. -start_mythbackend - -# Unlock the system again... -unlock_myth - -exit $STATUS diff --git a/abs/core-testing/LinHES-system/bin/mythrestore b/abs/core-testing/LinHES-system/bin/mythrestore deleted file mode 100755 index 447b0b8..0000000 --- a/abs/core-testing/LinHES-system/bin/mythrestore +++ /dev/null @@ -1,137 +0,0 @@ -#!/bin/bash - -#---------------------------------------------------------------------------- -. /usr/LH/bin/backupcommon || { - echo 1>&2 "Can not load common settings!" - exit 1 -} - -. /etc/osd_cat.cfg || { - color=yellow - outline=2 - outlinecolour=black - shadow=0 - shadowcolour=black - font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*" -} -#---------------------------------------------------------------------------- - -# Function to display status onscreen -osd() -# Arg_1 = display text Arg_2 = delay time Arg_3 = line num -{ - TEXT=$1 - killall -9 osd_cat - if [ $3 -gt 1 ]; then - for ((i=2; i <= $3 ; i++)) - do - TEXT="\n"$TEXT - done - fi - printf "$TEXT" | osd_cat --lines=6 --pos=middle --align=center --delay=$2 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & -} - -do_file_updates() { # A function because we need to do this in two places - echo "Doing any needed file updates..." - [ -n "$UPDATE_FILES" -a -f "$UPDATE_FILES" -a -x "$UPDATE_FILES" ] && - "$UPDATE_FILES" -} - -do_db_updates() { - # We need to redo this since we just restored the old settings... - lock_myth - # This is gross, but makes sure that the lock count has a sane value... - mysql_cmd "update settings set data = '1' where value = 'MythShutdownLock'" - - # Clean up ambiguous schema version settings... - for val in $(mysql_cmd "select distinct value from settings where value like '%SchemaVer'") ; do - # Find the numeric maximum version for this schema - max_ver=$(mysql_cmd "select max(0 + ifnull(data, 0)) from settings where value = '$val'") - # Wipe out all the existing ones - mysql_cmd "delete from settings where value = '$val'" - # Insert a nice clean unique one. - mysql_cmd "insert into settings set value = '$val', data = '$max_ver'" - done - - # This table causes problems with mythweb on upgrades... - mysql_cmd "update settings set data = '0' where value = 'WebDBSchemaVer'" - mysql_cmd "drop table mythweb_sessions" >/dev/null 2>&1 -} - -# Let's prevent mythshutdown from shutting down the system. -lock_myth - -# Play a sound to let you know I'm starting. -play_sound restore.wav -export DISPLAY=:0.0 - -# Doing this while the backend is active could be BAD. -stop_mythbackend - -# If the standard backup file exists we try to restore the files based -# on our restore list. -if compression=$(compression_type "$BACKUP_TAR") ; then - osd "Restoring files..." 0 1 - echo "Starting the restore of files..." - cd / - expand -c $BACKUP_TAR$compression | - $TAR xpvf - $RESTORE_LIST $EXCLUSION 2>&1 | - $SED -e '/Error exit delayed from previous errors/d' - echo "Completed the restore of files." -fi - -# If the db backup file exists start the DB restore and upgrade -if compression=$(compression_type "$BACKUP_SQL") ; then - echo "Starting the DB restore, this can take a while..." - echo "Clearing out the existing skeleton..." - #mysql_stdin < $DROP_SQL - osd "Recreating database..." 0 2 - echo "Recreating the db..." - sleep 1 - $MYSQLADMIN -u root create $DATABASE - osd "Restoring database..." 0 3 - echo "Restoring the data (long)..." - expand -c $BACKUP_SQL$compression | mysql_stdin - echo "Doing any needed db updates..." - [ -n "$UPDATE_SQL" -a -f "$UPDATE_SQL" ] && - mysql_stdin < $UPDATE_SQL - echo "Completed the DB restore." -fi - -osd "Testing restore..." 0 4 -echo "Sanity checking your restore..." -play_sound vr.wav -# Play a sound to let you know the outcome. -if check_files_and_tables $RESTORE_LIST ; then - osd "Restore completed successfully." 5 5 - echo "Restore passes all checks." - COMPLETE_MSG="Last restore completed on `date '+%D @ %-I:%M %p'`" - play_sound restored.wav - STATUS=0 -else - osd "Restore FAILED." 5 5 - echo "The restore failed or was already modified!" - COMPLETE_MSG="Last restore FAILED on `date '+%D @ %-I:%M %p'`" - play_sound rf.wav - STATUS=1 -fi - -# Add Last restore status to menu item -if grep "" /usr/share/mythtv/themes/defaultmenu/mythrestore.xml >/dev/null 2>&1 -then - sed -i "s_\.*\_description\>$COMPLETE_MSG\<\/description_" /usr/share/mythtv/themes/defaultmenu/mythrestore.xml -else - sed -i.orig " /NONE/ i\ \$COMPLETE_MSG\<\/description\>" /usr/share/mythtv/themes/defaultmenu/mythrestore.xml -fi - -# Make any updates _after_ we verify the backup... -do_db_updates -do_file_updates - -#post restore fixup for sshd -/usr/MythVantage/bin/systemconfig.py -m user - -# Now it's more or less safe to restart the backend. -start_mythbackend - -exit $STATUS diff --git a/abs/core-testing/LinHES-system/bin/rollback.sh b/abs/core-testing/LinHES-system/bin/rollback.sh deleted file mode 100755 index 12897da..0000000 --- a/abs/core-testing/LinHES-system/bin/rollback.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -#---------------------------------------------------------------------------- -. /usr/LH/bin/backupcommon || { - echo 1>&2 "Can not load common settings!" - exit 1 -} -#---------------------------------------------------------------------------- - -require file+r+x $MYTHSHUTDOWN - -# Prevent mythshutdown from shutting down the system in the middle... -lock_myth - -echo "Starting rollback of old backups" -backup_roller '' .1 .2 .3 .4 .5 .6 .7 .8 .9 .10 .11 .12 .13 .14 .15 .16 .17 .18 .19 -echo "Rollback completed." - -# Unlock the system again... -unlock_myth diff --git a/abs/core-testing/LinHES-system/firstboot.sh b/abs/core-testing/LinHES-system/firstboot.sh deleted file mode 100755 index 7e2f603..0000000 --- a/abs/core-testing/LinHES-system/firstboot.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -. ~/.configured -ATTEMPT=0 - -function try_smolt { - ((ATTEMPT=ATTEMPT+1)) - WID=`xdotool search "mythfrontend" | head -1` - xdotool windowfocus $WID - status=$? - if [ $status = 0 ] - then - sleep 2 - xdotool key "ctrl+alt+p" - xdotool key "ctrl+alt+p" - fb_status=0 - echo "FB=NO" > ~/.configured - fi - - if [ $ATTEMPT = 200 ] - then - fb_status=0 - fi - -} - - -if [ ! -e /tmp/debug ] -then - if [ ! -e /tmp/nomfe ] - then - if [ ! -e ~/.mythtv/pub-uuid ] - then - if [ x$FB != xNO ] - then - fb_status=4 - while [ $fb_status != 0 ] - do - try_smolt - if [ $fb_status != 0 ] - then - sleep 1 - fi - done - fi - fi - fi -fi - - - diff --git a/abs/core-testing/LinHES-system/load-modules-mythvantage.sh b/abs/core-testing/LinHES-system/load-modules-mythvantage.sh deleted file mode 100755 index 06c8a96..0000000 --- a/abs/core-testing/LinHES-system/load-modules-mythvantage.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -#/usr/bin/load-modules-mythvantage.sh UNLOAD LCD -export TERM=linux -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/systemconfig -case $1 in -UNLOAD|unload ) - MODULELIST=`grep /etc/modules.mythvantage $2` - for i in $MODULELIST - do - /sbin/rmmod $i - done - - ;; - - *) printhl " Loading MythVantage-modules" - #try to load the cx88 modules - if [ ! x$SystemType = xFrontend_only ] - then - /sbin/modprobe cx88-dvb 2>/dev/null - fi - - if [ -f /etc/modules.mythvantage ] - then - while read line - do - module=`echo $line |cut -d# -f1` - #this doesn't do anything on boot cause ttySX does not yet exisit - if [ x$module = xlirc_serial ] - then - if [ x$ReceiverType = xSerial ] - then - case $ReceiverSerialport in - ttyS0) FLAGS="io=0x3f8 irq=4";; - ttyS1) FLAGS="io=0x2f8 irq=3" ;; - ttyS2) FLAGS="io=0x3e8 irq=4" ;; - ttyS3) FLAGS="io=0x2f8 irq=3" ;; - esac - /usr/bin/setserial /dev/$ReceiverSerialport uart none 2>/dev/null - if [ $? = 0 ] - then - /sbin/modprobe lirc_serial $FLAGS 2>/dev/nulla - fi - elif [ x$HostBlasterType = xSerial ] - then - case $HostSerialPort_blasterlirc in - ttyS0) FLAGS="io=0x3f8 irq=4";; - ttyS1) FLAGS="io=0x2f8 irq=3" ;; - ttyS2) FLAGS="io=0x3e8 irq=4" ;; - ttyS3) FLAGS="io=0x2f8 irq=3" ;; - esac - /usr/bin/setserial /dev/$HostSerialPort_blasterlirc uart none 2>/dev/null - if [ $? = 0 ] - then - /sbin/modprobe lirc_serial $FLAGS 2>/dev/nulla - fi - fi - fi - /sbin/modprobe $module 2> /dev/null - done < /etc/modules.mythvantage - fi -esac - diff --git a/abs/core-testing/LinHES-system/myth_mtc.lr b/abs/core-testing/LinHES-system/myth_mtc.lr deleted file mode 100644 index 23f8711..0000000 --- a/abs/core-testing/LinHES-system/myth_mtc.lr +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/mythtv/myth_mtc.log { - copytruncate - daily - size 10M - missingok - rotate 7 - compress - notifempty -} diff --git a/abs/core-testing/LinHES-system/myth_mtc.py b/abs/core-testing/LinHES-system/myth_mtc.py deleted file mode 100755 index 5505b0a..0000000 --- a/abs/core-testing/LinHES-system/myth_mtc.py +++ /dev/null @@ -1,139 +0,0 @@ -#!/usr/bin/python - - -import sys,popen2 -import optparse -import re -import socket -import os -import datetime,time - - - -try: - from MythTV import MythTV - mythtv = MythTV() -except: - mythtv = None - -#print mythtv.db.getSetting( 'Theme', socket.gethostname()) - -def optimize(): - cursor = mythtv.db.cursor() - cursor.execute("SHOW tables") - result = cursor.fetchall() - ops=["REPAIR","OPTIMIZE","ANALYZE"] - for row in result: - ctable=row[0] - for op in ops: - print op,ctable - cmd= "%s table %s" %(op,ctable) - cursor.execute(cmd) - - -def upcoming_check(): - upcoming = mythtv.getUpcomingRecordings() - try: - show=str(upcoming[0]) - show=show.strip() - showtime=show.partition("(")[2].strip(")") - now=time.time() - rec_time=time.strptime( showtime ,"%Y-%m-%d %H:%M:%S" ) - r=time.mktime(rec_time) - time_diff= ( r - now ) / 60 - except: - time_diff=100 - show="No show" - if ( time_diff > 30) : - return True - else: - print show , "is upcoming in " , time_diff - return False - - -def schemalock_check(): - c = mythtv.db.cursor() - c.execute("select count(*) from schemalock") - results=c.fetchone() - schemalock=results[0] - if schemalock == 0: - return True - else: - print "schema is locked" - return False - -def job_check(): - c = mythtv.db.cursor() - c.execute("select count(*) from jobqueue where status = 4") - results=c.fetchone() - jobs= results[0] - if jobs == 0 : - return True - else: - print " jobs are running" - return False - - -def in_use(): - c = mythtv.db.cursor() - c.execute("select count(*) from inuseprograms") - results=c.fetchone() - prginuse=results[0] - if prginuse == 0 : - return True - else: - print "programs in use" - return False - -def mfd_check(): - ismfd=popen2.Popen3('/bin/ps cax|/bin/grep -v grep |/bin/grep mythfilldatabase') - ismfd.wait() - mfdIdle=ismfd.poll() - if mfdIdle == 0: - print "mythfilldatabase is running" - return False - else: - return True - - - -def idle_check(): - if ( upcoming_check() and schemalock_check() and job_check() and in_use() and mfd_check() ): - idle=True - print "Myth is idle" - else: - idle=False - print "Myth is NOT idle" - return idle - -def run_stuff(): - if idle_check(): - print "Running optimize" - optimize() - - print "Running backup" - os.system('/usr/LH/bin/backup_job') - - print "Running system_update" - os.system('/usr/LH/bin/update_system') - continue_loop=False - else: - continue_loop=True - return continue_loop - -#--------------------------------- -starttime=time.time() -ctin=True -while ctin: - ctin=run_stuff() - if ctin: - time.sleep(600) - current_time=time.time() - if (current_time - starttime) > 10800 : - ctin = False - print "time exceeded (3 hours)" - exit(1) - - - - diff --git a/abs/core-testing/LinHES-system/myth_mtc.sh b/abs/core-testing/LinHES-system/myth_mtc.sh deleted file mode 100755 index 487513b..0000000 --- a/abs/core-testing/LinHES-system/myth_mtc.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -. /etc/profile -logFile='/var/log/mythtv/myth_mtc.log' -date=`date +%Y-%m-%d` - -myth_mtc.py > $logFile 2>&1 -if [ $? = 0 ] -then - echo "Finished $date" >> $logFile -else - echo "Time Exceede $date" >> $logFile -fi diff --git a/abs/core-testing/LinHES-system/mythfrontend-start b/abs/core-testing/LinHES-system/mythfrontend-start deleted file mode 100755 index c92d024..0000000 --- a/abs/core-testing/LinHES-system/mythfrontend-start +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -PIDS=$(pidof mythfrontend) -P_array=( $PIDS ) -let "instances = ${#P_array[*]}" # Count elements. - -if [ $instances -gt 0 ]; -then - if [ $instances -eq 1 ]; then - diagtext="is already a MythFrontend" - else - diagtext="are already $instances MythFrontends" - fi - - question="There $diagtext running. Do you really want to start another one?" - mythvantage -q "${question}" - if [ $? = 16 ] - then - mythfrontend --logfile /var/log/mythtv/mythfrontend.log - fi -else - mythfrontend --logfile /var/log/mythtv/mythfrontend.log -fi diff --git a/abs/core-testing/LinHES-system/optimize_mythdb.py b/abs/core-testing/LinHES-system/optimize_mythdb.py deleted file mode 100755 index e7b35ed..0000000 --- a/abs/core-testing/LinHES-system/optimize_mythdb.py +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/python -# import MySQL module -import MySQLdb -import socket -import sys -db = MySQLdb.connect(host="localhost", user="mythtv", passwd="mythtv", db="mythconverg") -cursor = db.cursor() -cursor.execute("SHOW tables") -result = cursor.fetchall() -ops=["REPAIR","OPTIMIZE","ANALYZE"] -for row in result: - ctable=row[0] - for op in ops: - print op,ctable - cmd= "%s table %s" %(op,ctable) - cursor.execute(cmd) diff --git a/abs/core-testing/LinHES-system/smolt.cron b/abs/core-testing/LinHES-system/smolt.cron deleted file mode 100644 index f418df1..0000000 --- a/abs/core-testing/LinHES-system/smolt.cron +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -. /etc/profile -if [ -f /home/mythtv/.mythtv/MythSmolt/hw-uuid ] -then - cd /usr/share/mythtv/mythsmolt/scripts - touch /var/log/smolt.update - chown mythtv /var/log/smolt.update - random=$((RANDOM%2000)) - sleep $random - su mythtv -c "./sendProfile.py -a" > /var/log/smolt.update -fi diff --git a/abs/core-testing/LinHES-system/tvterm.sh b/abs/core-testing/LinHES-system/tvterm.sh deleted file mode 100755 index dfd116b..0000000 --- a/abs/core-testing/LinHES-system/tvterm.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# -# Create a terminal with a font that mostly fills the width of the screen. - -width=$(echo $(xdpyinfo | grep dimensions:) | cut -d' ' -f2 | cut -dx -f1) - -if [ -z "$width" ] ; then - width=1024 -fi - -if [ $width -ge 1920 ] ; then - fontsize=24 -elif [ $width -ge 1440 ] ; then - fontsize=21 -elif [ $width -ge 1280 ] ; then - fontsize=18 -elif [ $width -ge 1024 ] ; then - fontsize=14 -elif [ $width -ge 800 ] ; then - fontsize=11 -elif [ $width -ge 640 ] ; then - fontsize=8 -fi - -xterm -fa 'DejaVu Sans Mono' -fs $fontsize diff --git a/abs/core-testing/LinHES-system/unclutter-toggle.sh b/abs/core-testing/LinHES-system/unclutter-toggle.sh deleted file mode 100644 index aadce50..0000000 --- a/abs/core-testing/LinHES-system/unclutter-toggle.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -PIDUNC=`pidof unclutter` -jitter=200 -idle=1 -. /etc/unclutter.cfg -if [ -n "${PIDUNC}" ]; -then - killall -9 unclutter -else - /usr/X11R6/bin/unclutter -root -idle $idle -jitter $jitter -noevents & -fi diff --git a/abs/core-testing/LinHES-timezone/Makefile b/abs/core-testing/LinHES-timezone/Makefile deleted file mode 100644 index d543638..0000000 --- a/abs/core-testing/LinHES-timezone/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -all: linhes_timezone - -clean: - rm -Rf tables maps \ - WorldTZ.mdb WorldTZ.mfd WorldTZ.mas WorldTZ.mws WorldTZ_readme.txt map_data.txt \ - extract_map_data create_map_include linhes_timezone timezone_map.h - -#WorldTZ.mdb WorldTZ.mfd : WorldTZ_102.zip -# unzip WorldTZ_102.zip ; touch WorldTZ.mdb WorldTZ.mfd - -tables/AttrDesc : WorldTZ.mdb - mkdir -p tables - for table in $$(mdb-tables WorldTZ.mdb) ; do mdb-export WorldTZ.mdb $$table > tables/$$table ; done - sed -i 's/ //g' tables/AttrDesc # Fix TZ corruption. - echo 1254 >> tables/11001 # Add Central African Republic to the UTC+1 borders. - grep -v ^7867$$ tables/11017 > tables/11017.tmp ; mv tables/11017.tmp tables/11017 # Remove WA from UTC+9 - grep -v ^7866$$ tables/11017 > tables/11017.tmp ; mv tables/11017.tmp tables/11017 # Remove WA/SA border from UTC+9 - echo 7867 >> tables/11016 # Put WA in UTC+8 - -map_data.txt : extract_map_data WorldTZ.mfd - ./extract_map_data > map_data.txt - -extract_map_data : extract_map_data.c - cc --std=c99 -o extract_map_data -lm extract_map_data.c - -maps : map_data.txt tables/AttrDesc - mkdir maps - for zone in $$(cat tables/AttrDesc | grep 110 | grep -v 11000 | grep -v 11020 | cut -d ',' -f 1) ; \ - do \ - offset=$$(grep $$zone tables/AttrDesc | cut -d '"' -f 2 | sed 's/+//g' ) ; \ - echo $$offset >> maps/zones ; \ - boundary=boundary$$offset; \ - echo $$boundary ; \ - for section in $$(cat tables/$$zone) ; do grep "^$$section," map_data.txt >> maps/$$boundary ; done ; \ - done ; \ - for i in `cat tables/U8000 | grep -v ObjID | cut -d '"' -f 2 ` ; do \ - echo i=$$i ; \ - zone=$$(grep "^\\\"$$i\\\"," tables/U8000 | cut -d '"' -f 4) ; \ - echo zone=$$zone ; \ - tz_name=$$(grep "^\\\"$$i\\\"," tables/U7000 | cut -d '"' -f 4) ; \ - echo tz_name=$$tz_name ; \ - tz_lat=$$(grep "^$$i," tables/U5000 | cut -d ',' -f 2) ; \ - echo tz_lat=$$tz_lat ; \ - tz_lon=$$(grep "^$$i," tables/U6000 | cut -d ',' -f 2) ; \ - echo tz_lon=$$tz_lon ; \ - echo $$tz_lat $$tz_lon $$tz_name >> maps/places$$zone ; \ - done ;\ - for places in maps/places* ; do \ - sort -g -r $$places > $$places.sorted ; mv $$places.sorted $$places ; \ - done ; \ - sort -g maps/zones > maps/zones.sorted - cat Tux.csv >> maps/boundary14 - -./create_map_include : create_map_include.c maps - cc -lm --std=gnu99 -o ./create_map_include create_map_include.c - -timezone_map.h : ./create_map_include - ./create_map_include > timezone_map.h - -linhes_timezone : linhes_timezone.c timezone_map.h - cc --std=gnu99 -O3 -pthread -lXt -llirc_client -lm -o linhes_timezone linhes_timezone.c - diff --git a/abs/core-testing/LinHES-timezone/PKGBUILD b/abs/core-testing/LinHES-timezone/PKGBUILD deleted file mode 100644 index e819965..0000000 --- a/abs/core-testing/LinHES-timezone/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 23123 2009-01-03 02:43:02Z kevin $ -# Maintainer: Greg Frost -pkgname=LinHES-timezone -pkgver=1 -pkgrel=9 -pkgdesc="GUI timezone selector used by LinHES-config." -arch=i686 -depends=() -makedepends=(mdbtools) -source=(Makefile - Tux.csv - WorldTZ_102.zip - create_map_include.c - extract_map_data.c - linhes_timezone.c) - -build() { - cd ${srcdir} - make - MVDIR=$startdir/pkg/usr/MythVantage - mkdir -p $MVDIR/bin - install -m 0755 linhes_timezone $MVDIR/bin/timezone.bin -} - -md5sums=('53976e51e938c555f84b43c933339051' - '0710658b3b46cc659f56260c03b904ed' - '0d9e51af5f650dd329edce4531c42a58' - 'c01e2335603d8395004e32bae9060fde' - 'b20bd68272644f607fbfe7d50e7be42a') diff --git a/abs/core-testing/LinHES-timezone/Tux.csv b/abs/core-testing/LinHES-timezone/Tux.csv deleted file mode 100644 index c781230..0000000 --- a/abs/core-testing/LinHES-timezone/Tux.csv +++ /dev/null @@ -1,1268 +0,0 @@ -1,1,1,76.855404,-29.9543607 -1,1,1,76.92874033,-29.8978647 -1,1,1,77.039595,-29.7662397 -1,1,1,77.101748,-29.6618607 -1,1,1,77.20296833,-29.4918717 -1,1,1,77.21614533,-29.4420057 -1,1,1,77.22810267,-29.1836937 -1,1,1,77.24999233,-28.7108082 -1,1,1,77.136483,-28.4430318 -1,1,1,76.76400433,-28.0888536 -1,1,1,76.50763367,-27.8450787 -1,1,1,76.470453,-27.7418799 -1,1,1,76.61730033,-27.6816627 -1,1,1,76.75328567,-27.6258996 -1,1,1,76.92623267,-27.6951834 -1,1,1,77.235358,-27.9292605 -1,1,1,77.82467367,-28.3755045 -1,1,1,78.17055333,-28.453236 -1,1,1,79.450732,-28.4271351 -1,1,1,80.82728767,-28.3990692 -1,1,1,81.57573867,-28.269135 -1,1,1,82.33406533,-27.9265767 -1,1,1,82.82386233,-27.7053213 -1,1,1,83.14567633,-27.4522509 -1,1,1,83.55725167,-26.9646801 -1,1,1,83.84563667,-26.6230461 -1,1,1,83.978035,-26.5048983 -1,1,1,84.14106833,-26.4436992 -1,1,1,84.410816,-26.342442 -1,1,1,84.553379,-26.5419792 -1,1,1,84.54716033,-27.012081 -1,1,1,84.54428433,-27.2295078 -1,1,1,84.516651,-27.370002 -1,1,1,84.40524567,-27.7336173 -1,1,1,84.10637767,-28.7090871 -1,1,1,84.01263633,-29.2582017 -1,1,1,84.09731667,-29.5373907 -1,1,1,84.146749,-29.7003687 -1,1,1,84.30427033,-29.8236867 -1,1,1,84.447027,-29.8111707 -1,1,1,84.54704167,-29.8023987 -1,1,1,84.551579,-29.7957657 -1,1,1,84.576327,-29.6220807 -1,1,1,84.590433,-29.5230807 -1,1,1,84.646968,-29.1855807 -1,1,1,84.70196033,-28.872081 -1,1,1,84.75695233,-28.558581 -1,1,1,84.82448533,-28.153581 -1,1,1,84.852034,-27.972081 -1,1,1,84.92401,-27.4978746 -1,1,1,84.97764,-26.0267505 -1,1,1,84.98108467,-24.432081 -1,1,1,84.984057,-23.0559882 -1,1,1,84.98429267,-23.0514891 -1,1,1,85.064223,-22.8429828 -1,1,1,85.12628933,-22.681077 -1,1,1,85.182713,-22.5995196 -1,1,1,85.314223,-22.4816214 -1,1,1,85.515724,-22.3009764 -1,1,1,85.70807133,-22.2370386 -1,1,1,86.136654,-22.208238 -1,1,1,86.422576,-22.1890242 -1,1,1,86.46410867,-22.0055526 -1,1,1,86.55894167,-21.5866278 -1,1,1,86.83585067,-21.3499071 -1,1,1,87.38406533,-21.2191119 -1,1,1,87.560966,-21.1769061 -1,1,1,87.73832567,-21.1632777 -1,1,1,88.11739867,-21.1627617 -1,1,1,88.667827,-21.1620123 -1,1,1,88.81997067,-21.1929951 -1,1,1,89.31645833,-21.4069392 -1,1,1,89.538465,-21.5026053 -1,1,1,89.73406533,-21.5371119 -1,1,1,89.73406533,-21.4806105 -1,1,1,89.73406533,-21.4362687 -1,1,1,89.463923,-21.2078802 -1,1,1,89.245717,-21.0677427 -1,1,1,89.132385,-20.9949579 -1,1,1,88.93715033,-20.8976658 -1,1,1,88.811862,-20.8515381 -1,1,1,88.64378133,-20.7896553 -1,1,1,88.58136233,-20.7511659 -1,1,1,88.573754,-20.7047133 -1,1,1,88.568083,-20.6700873 -1,1,1,88.61667767,-20.46858 -1,1,1,88.68174267,-20.2569192 -1,1,1,88.87554667,-19.6264602 -1,1,1,88.94017267,-19.2255144 -1,1,1,88.94444667,-18.627081 -1,1,1,88.95149667,-17.6398806 -1,1,1,88.755679,-16.9871793 -1,1,1,88.12010267,-15.8793735 -1,1,1,87.53107533,-14.8527021 -1,1,1,86.906687,-14.0993799 -1,1,1,86.411835,-13.8183546 -1,1,1,86.27147167,-13.7386428 -1,1,1,86.100732,-13.6845003 -1,1,1,86.100732,-13.7197026 -1,1,1,86.100732,-13.7302218 -1,1,1,86.21937033,-13.8903102 -1,1,1,86.36437233,-14.0754549 -1,1,1,87.04365433,-14.9427879 -1,1,1,87.74921167,-16.0510407 -1,1,1,88.05093167,-16.7246151 -1,1,1,88.29283867,-17.2646601 -1,1,1,88.475271,-17.9958819 -1,1,1,88.534416,-18.6625104 -1,1,1,88.63134367,-19.7549865 -1,1,1,88.30012167,-20.6880249 -1,1,1,87.73406533,-20.9170656 -1,1,1,87.62101267,-20.9628093 -1,1,1,87.49374967,-20.9805066 -1,1,1,87.21739867,-20.9889129 -1,1,1,86.77804267,-21.0022779 -1,1,1,86.71652967,-20.9806425 -1,1,1,86.600911,-20.772081 -1,1,1,86.51775633,-20.622081 -1,1,1,86.49607367,-19.422081 -1,1,1,86.459138,-17.3779224 -1,1,1,86.35176733,-17.0298399 -1,1,1,85.16175567,-15.0963924 -1,1,1,84.79572233,-14.5016874 -1,1,1,84.72367033,-14.3450778 -1,1,1,84.567994,-13.8058203 -1,1,1,84.247566,-12.6958665 -1,1,1,83.93769367,-12.0451716 -1,1,1,83.44948267,-11.457081 -1,1,1,82.707034,-10.5627393 -1,1,1,82.610579,-10.192056 -1,1,1,82.90503633,-9.364743 -1,1,1,83.095287,-8.830212 -1,1,1,83.09175067,-8.5522572 -1,1,1,82.89236233,-8.3687127 -1,1,1,82.745919,-8.233905 -1,1,1,82.63204133,-8.1882813 -1,1,1,81.96194267,-7.9959492 -1,1,1,80.94620867,-7.7044128 -1,1,1,80.47644333,-7.4435208 -1,1,1,80.346353,-7.098705 -1,1,1,80.217653,-6.7575747 -1,1,1,80.31044067,-6.2076204 -1,1,1,80.54299267,-5.9332134 -1,1,1,80.709859,-5.7363147 -1,1,1,80.92306,-5.6518473 -1,1,1,81.249935,-5.6531328 -1,1,1,81.46517933,-5.6539794 -1,1,1,81.55348967,-5.6692146 -1,1,1,81.702253,-5.7311661 -1,1,1,81.93476967,-5.8279965 -1,1,1,82.11721033,-5.9709996 -1,1,1,82.210109,-6.1292406 -1,1,1,82.30952767,-6.2985879 -1,1,1,82.305878,-6.7035003 -1,1,1,82.20224167,-7.002081 -1,1,1,82.034794,-7.4845062 -1,1,1,82.03911733,-7.4326629 -1,1,1,82.158339,-7.5285348 -1,1,1,82.37780267,-7.7050164 -1,1,1,82.71869167,-7.7190024 -1,1,1,82.87032167,-7.5577458 -1,1,1,82.99996367,-7.419873 -1,1,1,83.039238,-7.2783555 -1,1,1,83.05783367,-6.882081 -1,1,1,83.078155,-6.4490289 -1,1,1,83.02605433,-6.1615194 -1,1,1,82.82885033,-5.6184666 -1,1,1,82.558491,-4.8739614 -1,1,1,82.28860033,-4.6589769 -1,1,1,81.47380867,-4.5390918 -1,1,1,80.86367067,-4.4493186 -1,1,1,80.531004,-4.5204525 -1,1,1,80.22387067,-4.8063654 -1,1,1,79.741864,-5.2550691 -1,1,1,79.50483867,-5.9726496 -1,1,1,79.60021367,-6.6944496 -1,1,1,79.652888,-7.0930872 -1,1,1,79.643091,-7.1093583 -1,1,1,79.392839,-7.0388766 -1,1,1,79.16874567,-6.9757623 -1,1,1,78.68066533,-6.9245205 -1,1,1,78.397751,-6.9344061 -1,1,1,78.09219233,-6.9450828 -1,1,1,78.06754467,-6.9213609 -1,1,1,78.066821,-6.6159078 -1,1,1,78.06386633,-5.3686707 -1,1,1,77.64740567,-4.6928508 -1,1,1,76.88406533,-4.6965666 -1,1,1,76.352924,-4.699152 -1,1,1,75.923553,-5.05956 -1,1,1,75.76358567,-5.637081 -1,1,1,75.70119133,-5.8623393 -1,1,1,75.71174367,-6.50646 -1,1,1,75.783982,-6.882081 -1,1,1,75.926123,-7.6211817 -1,1,1,76.238141,-7.9884852 -1,1,1,76.47843367,-7.699581 -1,1,1,76.57874333,-7.5789789 -1,1,1,76.66785,-7.4229411 -1,1,1,76.66603233,-7.3710708 -1,1,1,76.665281,-7.3496265 -1,1,1,76.591027,-7.3010112 -1,1,1,76.501024,-7.2630369 -1,1,1,76.40085433,-7.2207732 -1,1,1,76.310634,-7.1550414 -1,1,1,76.268421,-7.0935699 -1,1,1,76.08144633,-6.8212914 -1,1,1,75.98584067,-6.3342483 -1,1,1,76.06770867,-6.0710841 -1,1,1,76.17040333,-5.740974 -1,1,1,76.67391267,-5.5373964 -1,1,1,77.02102633,-5.6856411 -1,1,1,77.31483533,-5.8111203 -1,1,1,77.62551633,-6.3944817 -1,1,1,77.59250267,-6.758694 -1,1,1,77.566032,-7.0507236 -1,1,1,77.506503,-7.1408397 -1,1,1,77.211671,-7.3352052 -1,1,1,77.06815467,-7.4298174 -1,1,1,76.830732,-7.6036137 -1,1,1,76.68406533,-7.7214198 -1,1,1,76.53739867,-7.8392259 -1,1,1,76.35739867,-7.9744995 -1,1,1,76.28406533,-8.0220279 -1,1,1,75.90931267,-8.2649109 -1,1,1,75.70080967,-8.5503375 -1,1,1,75.70075833,-8.8205352 -1,1,1,75.70072467,-8.9979627 -1,1,1,75.78157233,-9.0923688 -1,1,1,76.03033933,-9.2053884 -1,1,1,76.22540433,-9.2940099 -1,1,1,76.40432967,-9.4502322 -1,1,1,76.590694,-9.6946422 -1,1,1,76.839235,-10.0205949 -1,1,1,77.13504633,-10.1231244 -1,1,1,77.81739867,-10.1198235 -1,1,1,78.64636833,-10.1158131 -1,1,1,79.38927067,-9.9577836 -1,1,1,80.78353167,-9.4888698 -1,1,1,81.53932767,-9.2346828 -1,1,1,81.75062,-9.1519146 -1,1,1,81.794837,-9.0927183 -1,1,1,81.915689,-8.930925 -1,1,1,82.06130433,-8.817081 -1,1,1,82.14739867,-8.817081 -1,1,1,82.26254533,-8.817081 -1,1,1,82.36739867,-8.9161275 -1,1,1,82.36739867,-9.024897 -1,1,1,82.36739867,-9.206961 -1,1,1,82.053905,-9.3560016 -1,1,1,80.96739867,-9.6904827 -1,1,1,80.64656533,-9.7892514 -1,1,1,80.15156567,-9.9691704 -1,1,1,79.86739867,-10.0903026 -1,1,1,79.29183033,-10.3356516 -1,1,1,79.13397767,-10.3870272 -1,1,1,78.75541833,-10.4522145 -1,1,1,78.44709567,-10.5053073 -1,1,1,77.72847233,-10.5112692 -1,1,1,77.33799367,-10.4639739 -1,1,1,77.01553533,-10.4249175 -1,1,1,76.82474667,-10.4463762 -1,1,1,76.840486,-10.5199308 -1,1,1,76.857139,-10.5977556 -1,1,1,77.59504167,-11.1194427 -1,1,1,77.76571833,-11.1740574 -1,1,1,78.00549033,-11.2507821 -1,1,1,78.47855267,-11.2641102 -1,1,1,78.78804667,-11.2028607 -1,1,1,79.25106733,-11.1112278 -1,1,1,80.71495133,-10.5459018 -1,1,1,81.438632,-10.1792517 -1,1,1,81.684003,-10.0549356 -1,1,1,81.819503,-10.0041243 -1,1,1,81.906403,-10.003842 -1,1,1,82.05345267,-10.0033644 -1,1,1,82.16739867,-10.0854555 -1,1,1,82.16739867,-10.191873 -1,1,1,82.16739867,-10.3062546 -1,1,1,81.92110233,-10.5003639 -1,1,1,81.64838133,-10.6009173 -1,1,1,81.174322,-10.7757051 -1,1,1,81.072904,-10.8235059 -1,1,1,80.600732,-11.0946978 -1,1,1,79.95183567,-11.4673914 -1,1,1,79.66962367,-11.6529351 -1,1,1,79.243827,-11.9868108 -1,1,1,78.786,-12.3458022 -1,1,1,78.65726133,-12.3943269 -1,1,1,78.150732,-12.3988248 -1,1,1,77.745759,-12.4024212 -1,1,1,77.62394067,-12.3660336 -1,1,1,77.35892667,-12.1623093 -1,1,1,77.152538,-12.0036525 -1,1,1,76.65945067,-11.4503094 -1,1,1,76.51906367,-11.2198146 -1,1,1,76.37376833,-10.9812612 -1,1,1,76.04734067,-10.647081 -1,1,1,75.95961667,-10.647081 -1,1,1,75.90277433,-10.647081 -1,1,1,75.897383,-10.6603773 -1,1,1,75.80147867,-11.037081 -1,1,1,75.73310833,-11.3056344 -1,1,1,75.487643,-11.8160808 -1,1,1,75.08803067,-12.5206992 -1,1,1,74.60510933,-13.3722126 -1,1,1,74.58443433,-13.4465865 -1,1,1,74.583096,-14.337081 -1,1,1,74.581978,-15.081264 -1,1,1,74.602826,-15.0165909 -1,1,1,74.2011,-15.522081 -1,1,1,73.70643267,-16.1445192 -1,1,1,72.94018733,-17.774859 -1,1,1,72.755877,-18.597081 -1,1,1,72.61772367,-19.2133944 -1,1,1,72.52044367,-20.2588974 -1,1,1,72.54652333,-20.847081 -1,1,1,72.56724433,-21.3144093 -1,1,1,72.54048367,-21.4544064 -1,1,1,72.41739867,-21.5225967 -1,1,1,72.29094533,-21.5926533 -1,1,1,72.13967633,-21.5202696 -1,1,1,71.83101133,-21.2420052 -1,1,1,71.34181367,-20.8009887 -1,1,1,71.18672967,-20.4366534 -1,1,1,71.19042133,-19.737081 -1,1,1,71.192773,-19.2915099 -1,1,1,71.23668333,-18.9518016 -1,1,1,71.33486267,-18.6196296 -1,1,1,71.41748833,-18.34008 -1,1,1,71.419239,-18.2595 -1,1,1,71.34239867,-18.2727102 -1,1,1,71.26374233,-18.2862324 -1,1,1,71.08480933,-18.6186462 -1,1,1,70.99736733,-18.9136938 -1,1,1,70.94423633,-19.0929687 -1,1,1,70.92262267,-19.2748251 -1,1,1,70.91020433,-19.647081 -1,1,1,70.89503933,-20.1016662 -1,1,1,70.90072433,-20.1702489 -1,1,1,70.97983433,-20.487081 -1,1,1,71.07909133,-20.8846017 -1,1,1,71.27018533,-21.2592948 -1,1,1,71.53267267,-21.571074 -1,1,1,71.93530067,-22.0493106 -1,1,1,73.97860667,-23.6830821 -1,1,1,75.340802,-24.6159495 -1,1,1,75.66534067,-24.8382021 -1,1,1,76.02974533,-25.1161581 -1,1,1,76.15059033,-25.2336294 -1,1,1,76.87062033,-25.9335582 -1,1,1,76.72979533,-26.5766649 -1,1,1,75.747889,-27.0726498 -1,1,1,75.59361933,-27.1505751 -1,1,1,75.46739867,-27.2193429 -1,1,1,75.46739867,-27.2254671 -1,1,1,75.46739867,-27.2315913 -1,1,1,75.59283967,-27.3885846 -1,1,1,75.74615667,-27.5743416 -1,1,1,76.310185,-28.2577107 -1,1,1,76.637808,-28.7580405 -1,1,1,76.751267,-29.1092967 -1,1,1,76.82604367,-29.3407977 -1,1,1,76.82189333,-29.6727987 -1,1,1,76.741545,-29.8869987 -1,1,1,76.70645533,-29.9805447 -1,1,1,76.68771767,-30.057081 -1,1,1,76.69990567,-30.057081 -1,1,1,76.71209333,-30.057081 -1,1,1,76.78206767,-30.010857 -1,1,1,76.855404,-29.9543607 -1,,,, -1,1,1,83.39948633,-9.0116883 -1,1,1,83.39948633,-9.7644165 -1,1,1,82.40413033,-9.9231924 -1,1,1,81.92041533,-10.1937858 -1,1,1,81.47003367,-10.5693795 -1,1,1,78.88129267,-11.626791 -1,1,1,78.19452267,-11.626791 -1,1,1,77.08985933,-11.4189588 -1,1,1,75.745382,-9.9346131 -1,1,1,75.57289233,-8.9516883 -1,1,1,75.57289233,-8.3789601 -1,1,1,76.384915,-7.9201842 -1,1,1,76.83529667,-7.5445908 -1,1,1,77.28567833,-7.1689971 -1,1,1,77.80775267,-6.8165856 -1,1,1,78.69452267,-6.9665856 -1,1,1,79.38129267,-6.9665856 -1,1,1,80.453367,-7.2589971 -1,1,1,80.90374867,-7.6345908 -1,1,1,81.80413033,-7.9051842 -1,1,1,83.39948633,-8.0789601 -1,1,1,83.39948633,-9.0116883 -1,,,, -1,1,1,65.25322551,-29.1342738 -1,1,1,66.27848633,-29.5533651 -1,1,1,68.66675,-30.084747 -1,1,1,69.50831067,-30.188865 -1,1,1,70.07025467,-30.400833 -1,1,1,73.78959533,-31.181817 -1,1,1,74.64648233,-31.181817 -1,1,1,75.916137,-30.354951 -1,1,1,76.12565833,-29.1327939 -1,1,1,75.768862,-27.8902383 -1,1,1,74.18628467,-25.5899535 -1,1,1,72.96332333,-22.5742398 -1,1,1,70.004886,-21.5368506 -1,1,1,69.70502533,-21.66834 -1,1,1,69.46355367,-22.0252677 -1,1,1,69.35664667,-22.0862301 -1,1,1,69.14370867,-22.2076554 -1,1,1,68.90653467,-22.476036 -1,1,1,68.755944,-22.8103248 -1,1,1,68.59962233,-23.1573357 -1,1,1,68.456656,-23.5826853 -1,1,1,68.28187143,-24.2029191 -1,1,1,67.93997497,-24.8220828 -1,1,1,66.54368527,-24.2653119 -1,1,1,65.58733593,-24.7126806 -1,1,1,65.23879317,-25.6663359 -1,1,1,65.83377103,-28.0102998 -1,1,1,65.25322551,-29.1342738 -1,,,, -1,1,1,92.80707967,-25.6089555 -1,1,1,93.447312,-26.0799999 -1,1,1,94.44908733,-26.4293025 -1,1,1,94.902563,-27.2116317 -1,1,1,94.04073333,-28.1395176 -1,1,1,93.29644233,-28.4666676 -1,1,1,92.202278,-28.9346199 -1,1,1,90.70235733,-29.576106 -1,1,1,89.76382233,-30.192921 -1,1,1,89.075979,-30.598998 -1,1,1,88.389209,-31.141311 -1,1,1,86.79820267,-31.457385 -1,1,1,86.07394933,-31.380675 -1,1,1,85.61789,-31.09584 -1,1,1,85.10331433,-27.8321808 -1,1,1,85.26955667,-26.7613737 -1,1,1,85.26955667,-26.1886455 -1,1,1,84.493746,-23.9073477 -1,1,1,85.73500267,-22.5149148 -1,1,1,86.93859867,-22.3087944 -1,1,1,87.974941,-23.2965903 -1,1,1,88.73703267,-23.9744832 -1,1,1,89.36738,-23.5917795 -1,1,1,90.36322833,-23.0082537 -1,1,1,91.116409,-22.8587616 -1,1,1,91.36382433,-22.8096543 -1,1,1,91.37498,-22.5768555 -1,1,1,91.88970533,-22.8199668 -1,1,1,92.13714233,-22.9368345 -1,1,1,92.27856133,-23.303886 -1,1,1,92.30609367,-23.6162919 -1,1,1,92.35042733,-24.1193412 -1,1,1,92.40536433,-25.1873916 -1,1,1,92.80707967,-25.6089555 -1,,,, -1,1,1,76.796339,-30.465903 -1,1,1,76.348262,-30.659355 -1,1,1,75.53406533,-31.274514 -1,1,1,75.071888,-31.623708 -1,1,1,74.86334667,-31.752909 -1,1,1,74.64112133,-31.827741 -1,1,1,74.45791933,-31.88943 -1,1,1,74.04635933,-31.925751 -1,1,1,73.850732,-31.897494 -1,1,1,73.43139467,-31.836921 -1,1,1,72.90028733,-31.675335 -1,1,1,71.660628,-31.231164 -1,1,1,70.25954733,-30.729156 -1,1,1,69.72204033,-30.585687 -1,1,1,68.21739867,-30.312117 -1,1,1,67.247373,-30.13575 -1,1,1,65.887164,-29.8360017 -1,1,1,65.621183,-29.7399897 -1,1,1,65.38106,-29.6533137 -1,1,1,65.131335,-29.4707157 -1,1,1,65.05505133,-29.3260347 -1,1,1,65.019468,-29.2585467 -1,1,1,65.000732,-29.1433707 -1,1,1,65.000732,-28.9921137 -1,1,1,65.000732,-28.7892867 -1,1,1,65.024892,-28.6968354 -1,1,1,65.19946033,-28.2316485 -1,1,1,65.51655333,-27.3866643 -1,1,1,65.531868,-27.0409599 -1,1,1,65.285382,-26.292081 -1,1,1,65.01223733,-25.4622072 -1,1,1,65.076128,-24.860463 -1,1,1,65.46956567,-24.5573715 -1,1,1,65.69200033,-24.3860154 -1,1,1,65.854067,-24.3571404 -1,1,1,66.59622667,-24.3566376 -1,1,1,67.317763,-24.3561486 -1,1,1,67.561471,-24.3227136 -1,1,1,67.840791,-24.1858911 -1,1,1,68.16241633,-24.0283458 -1,1,1,68.343495,-23.7879642 -1,1,1,68.556043,-23.2363968 -1,1,1,68.69392533,-22.8785889 -1,1,1,68.782491,-22.737081 -1,1,1,68.86855067,-22.737081 -1,1,1,68.94116133,-22.737081 -1,1,1,69.00043267,-22.8923652 -1,1,1,69.00023567,-23.082081 -1,1,1,69.000062,-23.2492884 -1,1,1,68.79049567,-23.9580537 -1,1,1,68.68674667,-24.1423191 -1,1,1,68.57587233,-24.3392385 -1,1,1,68.42646333,-24.4909803 -1,1,1,68.25375,-24.5820753 -1,1,1,67.93090367,-24.7523559 -1,1,1,67.30938033,-24.7989714 -1,1,1,66.627499,-24.7040478 -1,1,1,66.19182133,-24.6433974 -1,1,1,65.941701,-24.6560673 -1,1,1,65.77515233,-24.7472232 -1,1,1,65.52823067,-24.882369 -1,1,1,65.487836,-25.1859936 -1,1,1,65.66699233,-25.5602001 -1,1,1,66.01370067,-26.2843758 -1,1,1,66.08016167,-26.4377292 -1,1,1,66.15319633,-26.682081 -1,1,1,66.24046867,-26.9740665 -1,1,1,66.25429233,-27.2271084 -1,1,1,66.199556,-27.5306793 -1,1,1,66.14534667,-27.8313255 -1,1,1,66.04962,-28.0186785 -1,1,1,65.766527,-28.378188 -1,1,1,65.62077233,-28.5632871 -1,1,1,65.48698967,-28.7620893 -1,1,1,65.469232,-28.8199713 -1,1,1,65.41939033,-28.9824327 -1,1,1,65.49289333,-29.1072927 -1,1,1,65.69176233,-29.1979917 -1,1,1,65.86036133,-29.2748817 -1,1,1,68.26560033,-29.8337757 -1,1,1,69.96739867,-30.191496 -1,1,1,70.48989867,-30.301326 -1,1,1,71.442819,-30.511125 -1,1,1,72.084999,-30.657711 -1,1,1,72.72717933,-30.8043 -1,1,1,73.39467933,-30.939909 -1,1,1,73.56833233,-30.959067 -1,1,1,74.10169033,-31.017906 -1,1,1,74.60002667,-30.948642 -1,1,1,74.942352,-30.768087 -1,1,1,75.421196,-30.515529 -1,1,1,75.7536,-29.8888437 -1,1,1,75.79281367,-29.1647037 -1,1,1,75.81862433,-28.6880682 -1,1,1,75.70168733,-28.2612894 -1,1,1,75.392592,-27.7040352 -1,1,1,75.15765367,-27.2804757 -1,1,1,75.041572,-27.1140684 -1,1,1,73.91585533,-25.587081 -1,1,1,71.933664,-22.8983217 -1,1,1,71.07248333,-22.0019325 -1,1,1,70.34005433,-21.865086 -1,1,1,70.104947,-21.8211588 -1,1,1,69.94548167,-21.8455335 -1,1,1,69.63044533,-21.9735519 -1,1,1,69.325104,-22.097631 -1,1,1,69.221955,-22.1041212 -1,1,1,69.14895333,-22.0038483 -1,1,1,69.07888667,-21.9076065 -1,1,1,69.02299933,-21.3710013 -1,1,1,69.04253633,-20.982081 -1,1,1,69.06530533,-20.5288287 -1,1,1,69.16171833,-20.258697 -1,1,1,69.52972033,-19.617081 -1,1,1,70.256524,-18.3498906 -1,1,1,70.55372667,-17.7458586 -1,1,1,71.050097,-16.527081 -1,1,1,71.558985,-15.2775687 -1,1,1,71.76555233,-14.9332044 -1,1,1,72.57072267,-13.992081 -1,1,1,73.01040833,-13.4781546 -1,1,1,73.543055,-12.8023269 -1,1,1,73.91984733,-12.2802978 -1,1,1,74.06205267,-12.0832785 -1,1,1,74.339017,-11.719581 -1,1,1,74.53532367,-11.472081 -1,1,1,75.095885,-10.765335 -1,1,1,75.122056,-10.6978155 -1,1,1,75.06933133,-10.0943745 -1,1,1,74.98993067,-9.1856298 -1,1,1,74.858305,-6.138222 -1,1,1,74.855428,-5.142081 -1,1,1,74.85268733,-4.1930634 -1,1,1,74.85957767,-4.0511133 -1,1,1,74.92707167,-3.6661065 -1,1,1,75.064661,-2.88125388 -1,1,1,75.277857,-2.29223148 -1,1,1,75.60891567,-1.78229424 -1,1,1,75.738286,-1.58302263 -1,1,1,75.87990233,-1.42565259 -1,1,1,76.150732,-1.18020579 -1,1,1,76.69153767,-0.69008577 -1,1,1,77.15508567,-0.45480666 -1,1,1,77.94670067,-0.26864106 -1,1,1,78.591125,-0.11709054 -1,1,1,78.751945,-0.10202856 -1,1,1,79.71739867,-0.10280205 -1,1,1,80.70900433,-0.10359648 -1,1,1,81.027966,-0.13896987 -1,1,1,81.76739867,-0.33015063 -1,1,1,83.50098367,-0.77836998 -1,1,1,84.74342133,-1.85924034 -1,1,1,85.160579,-3.282081 -1,1,1,85.314403,-3.8067423 -1,1,1,85.398232,-4.4309859 -1,1,1,85.517117,-5.937081 -1,1,1,85.64418833,-7.5468843 -1,1,1,85.71925467,-8.1150543 -1,1,1,85.88871267,-8.7496575 -1,1,1,86.00464133,-9.1837986 -1,1,1,86.13991767,-9.466722 -1,1,1,86.62023733,-10.2796056 -1,1,1,87.58506,-11.9124522 -1,1,1,87.98585167,-12.4821192 -1,1,1,88.97777333,-13.6304991 -1,1,1,90.536213,-15.4347558 -1,1,1,91.29076767,-16.8701352 -1,1,1,91.736821,-18.8789994 -1,1,1,92.12084333,-20.6084994 -1,1,1,92.16712067,-21.2690301 -1,1,1,91.94616833,-21.867081 -1,1,1,91.81313733,-22.2271551 -1,1,1,91.683562,-22.4059821 -1,1,1,91.22644167,-22.8603741 -1,1,1,90.26557933,-23.8155024 -1,1,1,89.198029,-24.417081 -1,1,1,88.463939,-24.417081 -1,1,1,87.795843,-24.417081 -1,1,1,87.185413,-24.008061 -1,1,1,86.75108333,-23.2693782 -1,1,1,86.54532967,-22.8599499 -1,1,1,86.57205633,-22.5339264 -1,1,1,85.99003933,-22.6492446 -1,1,1,85.70750867,-22.7198535 -1,1,1,85.47464567,-23.028381 -1,1,1,85.402962,-23.427081 -1,1,1,85.35155233,-23.7130176 -1,1,1,85.36006567,-24.8049417 -1,1,1,85.41582633,-25.077081 -1,1,1,85.44118233,-25.200831 -1,1,1,85.51853233,-25.565331 -1,1,1,85.58771533,-25.887081 -1,1,1,85.707312,-26.4432891 -1,1,1,85.71350733,-26.5016112 -1,1,1,85.71359667,-27.072081 -1,1,1,85.713679,-27.5966244 -1,1,1,85.69992133,-27.7550832 -1,1,1,85.604202,-28.332081 -1,1,1,85.51454767,-28.8725187 -1,1,1,85.49699967,-29.0575047 -1,1,1,85.50733533,-29.3532267 -1,1,1,85.51924,-29.6938647 -1,1,1,85.52672533,-29.7271977 -1,1,1,85.639164,-29.9402847 -1,1,1,85.77529633,-30.198276 -1,1,1,86.07673267,-30.508464 -1,1,1,86.337871,-30.65928 -1,1,1,86.90982467,-30.989598 -1,1,1,87.710393,-31.01199 -1,1,1,88.38406533,-30.716508 -1,1,1,88.571673,-30.634221 -1,1,1,88.84837967,-30.456369 -1,1,1,89.31739867,-30.116616 -1,1,1,90.072681,-29.5694907 -1,1,1,90.63551867,-29.2172937 -1,1,1,91.06430733,-29.0234787 -1,1,1,91.22580833,-28.9504788 -1,1,1,91.61882233,-28.8150999 -1,1,1,91.937672,-28.7226366 -1,1,1,93.25075233,-28.3418562 -1,1,1,93.850785,-28.1128353 -1,1,1,94.18406533,-27.8652318 -1,1,1,94.57856733,-27.572145 -1,1,1,94.76987033,-27.2581653 -1,1,1,94.698758,-27.0204831 -1,1,1,94.61085767,-26.7266901 -1,1,1,94.23498767,-26.518434 -1,1,1,93.46378133,-26.3362263 -1,1,1,92.88192333,-26.1987549 -1,1,1,92.74431133,-26.1362328 -1,1,1,92.505086,-25.9006572 -1,1,1,92.29500633,-25.6937826 -1,1,1,92.133117,-25.39734 -1,1,1,92.01436767,-25.002081 -1,1,1,91.897648,-24.6135783 -1,1,1,91.88057467,-23.9867937 -1,1,1,91.98004567,-23.742081 -1,1,1,92.05058067,-23.5685544 -1,1,1,92.121032,-23.487081 -1,1,1,92.20054767,-23.487081 -1,1,1,92.29436433,-23.487081 -1,1,1,92.33985967,-23.6340603 -1,1,1,92.36769767,-24.027081 -1,1,1,92.398803,-24.46623 -1,1,1,92.47803633,-24.6961221 -1,1,1,92.69997733,-24.9911763 -1,1,1,93.01770233,-25.4135685 -1,1,1,93.354924,-25.6871316 -1,1,1,94.11739867,-26.1410259 -1,1,1,94.91470433,-26.6156547 -1,1,1,95.13260133,-26.8444662 -1,1,1,95.13260133,-27.207081 -1,1,1,95.13260133,-27.5510142 -1,1,1,94.96461067,-27.7196763 -1,1,1,94.09761067,-28.2462096 -1,1,1,93.38710167,-28.6777053 -1,1,1,93.11937333,-28.8140247 -1,1,1,92.519382,-29.0497977 -1,1,1,91.33510533,-29.5151727 -1,1,1,90.49736533,-30.028977 -1,1,1,89.59320367,-30.844485 -1,1,1,88.821454,-31.540563 -1,1,1,88.48255933,-31.725402 -1,1,1,87.793589,-31.826028 -1,1,1,87.48410267,-31.871226 -1,1,1,86.808151,-31.863612 -1,1,1,86.41027467,-31.81044 -1,1,1,85.570476,-31.698213 -1,1,1,85.11191633,-31.426899 -1,1,1,84.72885567,-30.815604 -1,1,1,84.48621667,-30.4284 -1,1,1,84.37251967,-30.339555 -1,1,1,84.078955,-30.307761 -1,1,1,83.95343267,-30.294168 -1,1,1,82.553232,-30.282828 -1,1,1,80.96739867,-30.282564 -1,1,1,78.35949067,-30.282126 -1,1,1,78.048197,-30.287202 -1,1,1,77.70857367,-30.335682 -1,1,1,76.796339,-30.465903 -1,1,1,76.855404,-29.9543607 -1,1,1,76.92874033,-29.8978647 -1,1,1,77.039595,-29.7662397 -1,1,1,77.101748,-29.6618607 -1,1,1,77.20296833,-29.4918717 -1,1,1,77.21614533,-29.4420057 -1,1,1,77.22810267,-29.1836937 -1,1,1,77.24999233,-28.7108082 -1,1,1,77.136483,-28.4430318 -1,1,1,76.76400433,-28.0888536 -1,1,1,76.50763367,-27.8450787 -1,1,1,76.470453,-27.7418799 -1,1,1,76.61730033,-27.6816627 -1,1,1,76.75328567,-27.6258996 -1,1,1,76.92623267,-27.6951834 -1,1,1,77.235358,-27.9292605 -1,1,1,77.82467367,-28.3755045 -1,1,1,78.17055333,-28.453236 -1,1,1,79.450732,-28.4271351 -1,1,1,80.82728767,-28.3990692 -1,1,1,81.57573867,-28.269135 -1,1,1,82.33406533,-27.9265767 -1,1,1,82.82386233,-27.7053213 -1,1,1,83.14567633,-27.4522509 -1,1,1,83.55725167,-26.9646801 -1,1,1,83.84563667,-26.6230461 -1,1,1,83.978035,-26.5048983 -1,1,1,84.14106833,-26.4436992 -1,1,1,84.410816,-26.342442 -1,1,1,84.553379,-26.5419792 -1,1,1,84.54716033,-27.012081 -1,1,1,84.54428433,-27.2295078 -1,1,1,84.516651,-27.370002 -1,1,1,84.40524567,-27.7336173 -1,1,1,84.10637767,-28.7090871 -1,1,1,84.01263633,-29.2582017 -1,1,1,84.09731667,-29.5373907 -1,1,1,84.146749,-29.7003687 -1,1,1,84.30427033,-29.8236867 -1,1,1,84.447027,-29.8111707 -1,1,1,84.54704167,-29.8023987 -1,1,1,84.551579,-29.7957657 -1,1,1,84.576327,-29.6220807 -1,1,1,84.590433,-29.5230807 -1,1,1,84.646968,-29.1855807 -1,1,1,84.70196033,-28.872081 -1,1,1,84.75695233,-28.558581 -1,1,1,84.82448533,-28.153581 -1,1,1,84.852034,-27.972081 -1,1,1,84.92401,-27.4978746 -1,1,1,84.97764,-26.0267505 -1,1,1,84.98108467,-24.432081 -1,1,1,84.984057,-23.0559882 -1,1,1,84.98429267,-23.0514891 -1,1,1,85.064223,-22.8429828 -1,1,1,85.12628933,-22.681077 -1,1,1,85.182713,-22.5995196 -1,1,1,85.314223,-22.4816214 -1,1,1,85.515724,-22.3009764 -1,1,1,85.70807133,-22.2370386 -1,1,1,86.136654,-22.208238 -1,1,1,86.422576,-22.1890242 -1,1,1,86.46410867,-22.0055526 -1,1,1,86.55894167,-21.5866278 -1,1,1,86.83585067,-21.3499071 -1,1,1,87.38406533,-21.2191119 -1,1,1,87.560966,-21.1769061 -1,1,1,87.73832567,-21.1632777 -1,1,1,88.11739867,-21.1627617 -1,1,1,88.667827,-21.1620123 -1,1,1,88.81997067,-21.1929951 -1,1,1,89.31645833,-21.4069392 -1,1,1,89.538465,-21.5026053 -1,1,1,89.73406533,-21.5371119 -1,1,1,89.73406533,-21.4806105 -1,1,1,89.73406533,-21.4362687 -1,1,1,89.463923,-21.2078802 -1,1,1,89.245717,-21.0677427 -1,1,1,89.132385,-20.9949579 -1,1,1,88.93715033,-20.8976658 -1,1,1,88.811862,-20.8515381 -1,1,1,88.64378133,-20.7896553 -1,1,1,88.58136233,-20.7511659 -1,1,1,88.573754,-20.7047133 -1,1,1,88.568083,-20.6700873 -1,1,1,88.61667767,-20.46858 -1,1,1,88.68174267,-20.2569192 -1,1,1,88.87554667,-19.6264602 -1,1,1,88.94017267,-19.2255144 -1,1,1,88.94444667,-18.627081 -1,1,1,88.95149667,-17.6398806 -1,1,1,88.755679,-16.9871793 -1,1,1,88.12010267,-15.8793735 -1,1,1,87.53107533,-14.8527021 -1,1,1,86.906687,-14.0993799 -1,1,1,86.411835,-13.8183546 -1,1,1,86.27147167,-13.7386428 -1,1,1,86.100732,-13.6845003 -1,1,1,86.100732,-13.7197026 -1,1,1,86.100732,-13.7302218 -1,1,1,86.21937033,-13.8903102 -1,1,1,86.36437233,-14.0754549 -1,1,1,87.04365433,-14.9427879 -1,1,1,87.74921167,-16.0510407 -1,1,1,88.05093167,-16.7246151 -1,1,1,88.29283867,-17.2646601 -1,1,1,88.475271,-17.9958819 -1,1,1,88.534416,-18.6625104 -1,1,1,88.63134367,-19.7549865 -1,1,1,88.30012167,-20.6880249 -1,1,1,87.73406533,-20.9170656 -1,1,1,87.62101267,-20.9628093 -1,1,1,87.49374967,-20.9805066 -1,1,1,87.21739867,-20.9889129 -1,1,1,86.77804267,-21.0022779 -1,1,1,86.71652967,-20.9806425 -1,1,1,86.600911,-20.772081 -1,1,1,86.51775633,-20.622081 -1,1,1,86.49607367,-19.422081 -1,1,1,86.459138,-17.3779224 -1,1,1,86.35176733,-17.0298399 -1,1,1,85.16175567,-15.0963924 -1,1,1,84.79572233,-14.5016874 -1,1,1,84.72367033,-14.3450778 -1,1,1,84.567994,-13.8058203 -1,1,1,84.247566,-12.6958665 -1,1,1,83.93769367,-12.0451716 -1,1,1,83.44948267,-11.457081 -1,1,1,82.707034,-10.5627393 -1,1,1,82.610579,-10.192056 -1,1,1,82.90503633,-9.364743 -1,1,1,83.095287,-8.830212 -1,1,1,83.09175067,-8.5522572 -1,1,1,82.89236233,-8.3687127 -1,1,1,82.745919,-8.233905 -1,1,1,82.63204133,-8.1882813 -1,1,1,81.96194267,-7.9959492 -1,1,1,80.94620867,-7.7044128 -1,1,1,80.47644333,-7.4435208 -1,1,1,80.346353,-7.098705 -1,1,1,80.217653,-6.7575747 -1,1,1,80.31044067,-6.2076204 -1,1,1,80.54299267,-5.9332134 -1,1,1,80.709859,-5.7363147 -1,1,1,80.92306,-5.6518473 -1,1,1,81.249935,-5.6531328 -1,1,1,81.46517933,-5.6539794 -1,1,1,81.55348967,-5.6692146 -1,1,1,81.702253,-5.7311661 -1,1,1,81.93476967,-5.8279965 -1,1,1,82.11721033,-5.9709996 -1,1,1,82.210109,-6.1292406 -1,1,1,82.30952767,-6.2985879 -1,1,1,82.305878,-6.7035003 -1,1,1,82.20224167,-7.002081 -1,1,1,82.034794,-7.4845062 -1,1,1,82.03911733,-7.4326629 -1,1,1,82.158339,-7.5285348 -1,1,1,82.37780267,-7.7050164 -1,1,1,82.71869167,-7.7190024 -1,1,1,82.87032167,-7.5577458 -1,1,1,82.99996367,-7.419873 -1,1,1,83.039238,-7.2783555 -1,1,1,83.05783367,-6.882081 -1,1,1,83.078155,-6.4490289 -1,1,1,83.02605433,-6.1615194 -1,1,1,82.82885033,-5.6184666 -1,1,1,82.558491,-4.8739614 -1,1,1,82.28860033,-4.6589769 -1,1,1,81.47380867,-4.5390918 -1,1,1,80.86367067,-4.4493186 -1,1,1,80.531004,-4.5204525 -1,1,1,80.22387067,-4.8063654 -1,1,1,79.741864,-5.2550691 -1,1,1,79.50483867,-5.9726496 -1,1,1,79.60021367,-6.6944496 -1,1,1,79.652888,-7.0930872 -1,1,1,79.643091,-7.1093583 -1,1,1,79.392839,-7.0388766 -1,1,1,79.16874567,-6.9757623 -1,1,1,78.68066533,-6.9245205 -1,1,1,78.397751,-6.9344061 -1,1,1,78.09219233,-6.9450828 -1,1,1,78.06754467,-6.9213609 -1,1,1,78.066821,-6.6159078 -1,1,1,78.06386633,-5.3686707 -1,1,1,77.64740567,-4.6928508 -1,1,1,76.88406533,-4.6965666 -1,1,1,76.352924,-4.699152 -1,1,1,75.923553,-5.05956 -1,1,1,75.76358567,-5.637081 -1,1,1,75.70119133,-5.8623393 -1,1,1,75.71174367,-6.50646 -1,1,1,75.783982,-6.882081 -1,1,1,75.926123,-7.6211817 -1,1,1,76.238141,-7.9884852 -1,1,1,76.47843367,-7.699581 -1,1,1,76.57874333,-7.5789789 -1,1,1,76.66785,-7.4229411 -1,1,1,76.66603233,-7.3710708 -1,1,1,76.665281,-7.3496265 -1,1,1,76.591027,-7.3010112 -1,1,1,76.501024,-7.2630369 -1,1,1,76.40085433,-7.2207732 -1,1,1,76.310634,-7.1550414 -1,1,1,76.268421,-7.0935699 -1,1,1,76.08144633,-6.8212914 -1,1,1,75.98584067,-6.3342483 -1,1,1,76.06770867,-6.0710841 -1,1,1,76.17040333,-5.740974 -1,1,1,76.67391267,-5.5373964 -1,1,1,77.02102633,-5.6856411 -1,1,1,77.31483533,-5.8111203 -1,1,1,77.62551633,-6.3944817 -1,1,1,77.59250267,-6.758694 -1,1,1,77.566032,-7.0507236 -1,1,1,77.506503,-7.1408397 -1,1,1,77.211671,-7.3352052 -1,1,1,77.06815467,-7.4298174 -1,1,1,76.830732,-7.6036137 -1,1,1,76.68406533,-7.7214198 -1,1,1,76.53739867,-7.8392259 -1,1,1,76.35739867,-7.9744995 -1,1,1,76.28406533,-8.0220279 -1,1,1,75.90931267,-8.2649109 -1,1,1,75.70080967,-8.5503375 -1,1,1,75.70075833,-8.8205352 -1,1,1,75.70072467,-8.9979627 -1,1,1,75.78157233,-9.0923688 -1,1,1,76.03033933,-9.2053884 -1,1,1,76.22540433,-9.2940099 -1,1,1,76.40432967,-9.4502322 -1,1,1,76.590694,-9.6946422 -1,1,1,76.839235,-10.0205949 -1,1,1,77.13504633,-10.1231244 -1,1,1,77.81739867,-10.1198235 -1,1,1,78.64636833,-10.1158131 -1,1,1,79.38927067,-9.9577836 -1,1,1,80.78353167,-9.4888698 -1,1,1,81.53932767,-9.2346828 -1,1,1,81.75062,-9.1519146 -1,1,1,81.794837,-9.0927183 -1,1,1,81.915689,-8.930925 -1,1,1,82.06130433,-8.817081 -1,1,1,82.14739867,-8.817081 -1,1,1,82.26254533,-8.817081 -1,1,1,82.36739867,-8.9161275 -1,1,1,82.36739867,-9.024897 -1,1,1,82.36739867,-9.206961 -1,1,1,82.053905,-9.3560016 -1,1,1,80.96739867,-9.6904827 -1,1,1,80.64656533,-9.7892514 -1,1,1,80.15156567,-9.9691704 -1,1,1,79.86739867,-10.0903026 -1,1,1,79.29183033,-10.3356516 -1,1,1,79.13397767,-10.3870272 -1,1,1,78.75541833,-10.4522145 -1,1,1,78.44709567,-10.5053073 -1,1,1,77.72847233,-10.5112692 -1,1,1,77.33799367,-10.4639739 -1,1,1,77.01553533,-10.4249175 -1,1,1,76.82474667,-10.4463762 -1,1,1,76.840486,-10.5199308 -1,1,1,76.857139,-10.5977556 -1,1,1,77.59504167,-11.1194427 -1,1,1,77.76571833,-11.1740574 -1,1,1,78.00549033,-11.2507821 -1,1,1,78.47855267,-11.2641102 -1,1,1,78.78804667,-11.2028607 -1,1,1,79.25106733,-11.1112278 -1,1,1,80.71495133,-10.5459018 -1,1,1,81.438632,-10.1792517 -1,1,1,81.684003,-10.0549356 -1,1,1,81.819503,-10.0041243 -1,1,1,81.906403,-10.003842 -1,1,1,82.05345267,-10.0033644 -1,1,1,82.16739867,-10.0854555 -1,1,1,82.16739867,-10.191873 -1,1,1,82.16739867,-10.3062546 -1,1,1,81.92110233,-10.5003639 -1,1,1,81.64838133,-10.6009173 -1,1,1,81.174322,-10.7757051 -1,1,1,81.072904,-10.8235059 -1,1,1,80.600732,-11.0946978 -1,1,1,79.95183567,-11.4673914 -1,1,1,79.66962367,-11.6529351 -1,1,1,79.243827,-11.9868108 -1,1,1,78.786,-12.3458022 -1,1,1,78.65726133,-12.3943269 -1,1,1,78.150732,-12.3988248 -1,1,1,77.745759,-12.4024212 -1,1,1,77.62394067,-12.3660336 -1,1,1,77.35892667,-12.1623093 -1,1,1,77.152538,-12.0036525 -1,1,1,76.65945067,-11.4503094 -1,1,1,76.51906367,-11.2198146 -1,1,1,76.37376833,-10.9812612 -1,1,1,76.04734067,-10.647081 -1,1,1,75.95961667,-10.647081 -1,1,1,75.90277433,-10.647081 -1,1,1,75.897383,-10.6603773 -1,1,1,75.80147867,-11.037081 -1,1,1,75.73310833,-11.3056344 -1,1,1,75.487643,-11.8160808 -1,1,1,75.08803067,-12.5206992 -1,1,1,74.60510933,-13.3722126 -1,1,1,74.58443433,-13.4465865 -1,1,1,74.583096,-14.337081 -1,1,1,74.581978,-15.081264 -1,1,1,74.602826,-15.0165909 -1,1,1,74.2011,-15.522081 -1,1,1,73.70643267,-16.1445192 -1,1,1,72.94018733,-17.774859 -1,1,1,72.755877,-18.597081 -1,1,1,72.61772367,-19.2133944 -1,1,1,72.52044367,-20.2588974 -1,1,1,72.54652333,-20.847081 -1,1,1,72.56724433,-21.3144093 -1,1,1,72.54048367,-21.4544064 -1,1,1,72.41739867,-21.5225967 -1,1,1,72.29094533,-21.5926533 -1,1,1,72.13967633,-21.5202696 -1,1,1,71.83101133,-21.2420052 -1,1,1,71.34181367,-20.8009887 -1,1,1,71.18672967,-20.4366534 -1,1,1,71.19042133,-19.737081 -1,1,1,71.192773,-19.2915099 -1,1,1,71.23668333,-18.9518016 -1,1,1,71.33486267,-18.6196296 -1,1,1,71.41748833,-18.34008 -1,1,1,71.419239,-18.2595 -1,1,1,71.34239867,-18.2727102 -1,1,1,71.26374233,-18.2862324 -1,1,1,71.08480933,-18.6186462 -1,1,1,70.99736733,-18.9136938 -1,1,1,70.94423633,-19.0929687 -1,1,1,70.92262267,-19.2748251 -1,1,1,70.91020433,-19.647081 -1,1,1,70.89503933,-20.1016662 -1,1,1,70.90072433,-20.1702489 -1,1,1,70.97983433,-20.487081 -1,1,1,71.07909133,-20.8846017 -1,1,1,71.27018533,-21.2592948 -1,1,1,71.53267267,-21.571074 -1,1,1,71.93530067,-22.0493106 -1,1,1,73.97860667,-23.6830821 -1,1,1,75.340802,-24.6159495 -1,1,1,75.66534067,-24.8382021 -1,1,1,76.02974533,-25.1161581 -1,1,1,76.15059033,-25.2336294 -1,1,1,76.87062033,-25.9335582 -1,1,1,76.72979533,-26.5766649 -1,1,1,75.747889,-27.0726498 -1,1,1,75.59361933,-27.1505751 -1,1,1,75.46739867,-27.2193429 -1,1,1,75.46739867,-27.2254671 -1,1,1,75.46739867,-27.2315913 -1,1,1,75.59283967,-27.3885846 -1,1,1,75.74615667,-27.5743416 -1,1,1,76.310185,-28.2577107 -1,1,1,76.637808,-28.7580405 -1,1,1,76.751267,-29.1092967 -1,1,1,76.82604367,-29.3407977 -1,1,1,76.82189333,-29.6727987 -1,1,1,76.741545,-29.8869987 -1,1,1,76.70645533,-29.9805447 -1,1,1,76.68771767,-30.057081 -1,1,1,76.69990567,-30.057081 -1,1,1,76.71209333,-30.057081 -1,1,1,76.78206767,-30.010857 -1,1,1,76.855404,-29.9543607 -1,,,, -1,1,1,85.290415,-10.8334548 -1,1,1,85.36160833,-10.7927157 -1,1,1,85.50007267,-10.4848917 -1,1,1,85.50040667,-10.3666173 -1,1,1,85.500662,-10.2759204 -1,1,1,85.478526,-10.2324843 -1,1,1,85.39720667,-10.1641173 -1,1,1,85.340268,-10.1162472 -1,1,1,85.27984133,-10.077081 -1,1,1,85.262925,-10.077081 -1,1,1,85.246009,-10.077081 -1,1,1,85.11634567,-10.0277019 -1,1,1,84.974784,-9.9673497 -1,1,1,84.799041,-9.892425 -1,1,1,84.647826,-9.7972656 -1,1,1,84.49806367,-9.6673497 -1,1,1,84.37742867,-9.5627019 -1,1,1,84.26146467,-9.477081 -1,1,1,84.24036533,-9.477081 -1,1,1,84.21926533,-9.477081 -1,1,1,84.19232333,-9.5117883 -1,1,1,84.18049367,-9.5542083 -1,1,1,84.14217333,-9.6916203 -1,1,1,84.197132,-9.9066513 -1,1,1,84.335091,-10.1590857 -1,1,1,84.45714,-10.3824081 -1,1,1,84.49935867,-10.4277102 -1,1,1,84.77542867,-10.6315857 -1,1,1,85.07218567,-10.8507381 -1,1,1,85.183772,-10.8944787 -1,1,1,85.290415,-10.8334548 -1,,,, -1,1,1,77.270649,-6.814581 -1,1,1,77.30945567,-6.7229346 -1,1,1,77.298465,-6.6524331 -1,1,1,77.198076,-6.3490548 -1,1,1,77.154151,-6.2163114 -1,1,1,77.09129033,-6.1048395 -1,1,1,77.023425,-6.0393435 -1,1,1,76.92537433,-5.9447151 -1,1,1,76.91113,-5.939976 -1,1,1,76.83406533,-5.976342 -1,1,1,76.722331,-6.0290682 -1,1,1,76.733311,-6.1492185 -1,1,1,76.86190933,-6.2810376 -1,1,1,76.95974833,-6.381327 -1,1,1,77.04309033,-6.5713101 -1,1,1,77.082804,-6.784581 -1,1,1,77.10899,-6.9252048 -1,1,1,77.216534,-6.9423804 -1,1,1,77.270649,-6.814581 -1,,,, -1,1,1,81.96808267,-6.7313394 -1,1,1,82.039352,-6.6540525 -1,1,1,81.98759733,-6.2825028 -1,1,1,81.88639,-6.1448616 -1,1,1,81.78243433,-6.0034824 -1,1,1,81.54429333,-5.8741299 -1,1,1,81.35206767,-5.8546299 -1,1,1,81.22751733,-5.8419951 -1,1,1,81.20177867,-5.8492653 -1,1,1,81.16760467,-5.9067345 -1,1,1,81.12082467,-5.9854026 -1,1,1,81.14187033,-6.007701 -1,1,1,81.30797467,-6.0554595 -1,1,1,81.51309667,-6.1144368 -1,1,1,81.70336233,-6.3687105 -1,1,1,81.75349233,-6.6508554 -1,1,1,81.77213333,-6.7557705 -1,1,1,81.78858,-6.777081 -1,1,1,81.85091067,-6.777081 -1,1,1,81.892156,-6.777081 -1,1,1,81.94488333,-6.7564971 -1,1,1,81.96808267,-6.7313394 -1,,,, -1,1,1,82.18867067,-2.69226408 -1,1,1,82.42852033,-2.54303718 -1,1,1,82.44815467,-2.53656918 -1,1,1,82.67797333,-2.53108368 -1,1,1,82.969619,-2.52412248 -1,1,1,83.03406567,-2.50201998 -1,1,1,83.03406567,-2.40895788 -1,1,1,83.03406567,-2.26396848 -1,1,1,82.47926467,-1.82264604 -1,1,1,82.24788167,-1.78357908 -1,1,1,82.01355667,-1.74401538 -1,1,1,81.93061167,-1.85779869 -1,1,1,81.88243467,-2.28489618 -1,1,1,81.86445467,-2.44429548 -1,1,1,81.83899,-2.51100348 -1,1,1,81.763478,-2.59652118 -1,1,1,81.65928367,-2.71452168 -1,1,1,81.64400533,-2.78374998 -1,1,1,81.70906533,-2.84307438 -1,1,1,81.776394,-2.90446758 -1,1,1,81.92036367,-2.85919668 -1,1,1,82.18867067,-2.69226408 -1,,,, -1,1,1,79.410085,-7.4872386 -1,1,1,79.21516133,-7.4259753 -1,1,1,79.067386,-7.3370922 -1,1,1,79.104668,-7.3035384 -1,1,1,79.113817,-7.2953043 -1,1,1,79.22542433,-7.2801747 -1,1,1,79.352684,-7.2699168 -1,1,1,79.65352067,-7.2456678 -1,1,1,79.76739867,-7.2828384 -1,1,1,79.76739867,-7.4052831 -1,1,1,79.76739867,-7.4632503 -1,1,1,79.744596,-7.5059535 -1,1,1,79.70292333,-7.5260256 -1,1,1,79.66746233,-7.5431061 -1,1,1,79.633712,-7.5560271 -1,1,1,79.62792333,-7.5547386 -1,1,1,79.62213467,-7.5534504 -1,1,1,79.52410733,-7.5230754 -1,1,1,79.410085,-7.4872386 -1,,,, -1,1,1,77.434187,-7.6172856 -1,1,1,77.32839967,-7.4393868 -1,1,1,77.521896,-7.287081 -1,1,1,77.85369433,-7.287081 -1,1,1,77.96906767,-7.287081 -1,1,1,78.07226967,-7.2999036 -1,1,1,78.08303167,-7.3155759 -1,1,1,78.10818933,-7.3522113 -1,1,1,77.994676,-7.407081 -1,1,1,77.89372733,-7.407081 -1,1,1,77.83444333,-7.407081 -1,1,1,77.799849,-7.4377419 -1,1,1,77.74986933,-7.534581 -1,1,1,77.695118,-7.6406658 -1,1,1,77.66624133,-7.663635 -1,1,1,77.57794667,-7.671333 -1,1,1,77.49767733,-7.6783314 -1,1,1,77.462659,-7.6651662 -1,1,1,77.434187,-7.6172856 -1,,,, -1,1,1,72.47012933,-15.8961972 -1,1,1,72.790484,-15.599523 -1,1,1,72.878587,-15.4512909 -1,1,1,72.86127833,-15.2380935 -1,1,1,72.84920067,-15.0893295 -1,1,1,72.78740767,-15.0385272 -1,1,1,72.65493467,-15.068451 -1,1,1,72.555839,-15.0908352 -1,1,1,72.50178867,-15.1788813 -1,1,1,72.41807067,-15.4542921 -1,1,1,72.37857533,-15.5842218 -1,1,1,72.32091667,-15.671697 -1,1,1,72.18322733,-15.8105769 -1,1,1,71.99868567,-15.9967149 -1,1,1,71.96803533,-16.065654 -1,1,1,72.040732,-16.131081 -1,1,1,72.11698533,-16.199709 -1,1,1,72.17905267,-16.165758 -1,1,1,72.47012933,-15.8961972 diff --git a/abs/core-testing/LinHES-timezone/WorldTZ_102.zip b/abs/core-testing/LinHES-timezone/WorldTZ_102.zip deleted file mode 100644 index 3112bd4..0000000 Binary files a/abs/core-testing/LinHES-timezone/WorldTZ_102.zip and /dev/null differ diff --git a/abs/core-testing/LinHES-timezone/create_map_include.c b/abs/core-testing/LinHES-timezone/create_map_include.c deleted file mode 100644 index dbdbb52..0000000 --- a/abs/core-testing/LinHES-timezone/create_map_include.c +++ /dev/null @@ -1,186 +0,0 @@ -#include -#include -#include -#include -#include - -int main () -{ - char line_in[100]; - FILE *zones; - FILE *boundary; - char boundary_name[100]; - zones = fopen ("maps/zones.sorted", "r"); - int zone_num = 0; - - printf ("typedef struct {double x;double y;double z;} vect_type;\n"); - while (!feof (zones)) - { - char coords[100]; - int points_in_vector = 0; - if (fgets (line_in, sizeof (line_in), zones)) - { - //Strip the newline off the end. - line_in[strlen(line_in) - 1] = 0; - - sprintf (boundary_name, "maps/boundary%s", line_in); - -//printf ("%s<\n", boundary_name); - - boundary = fopen (boundary_name, "r"); - - if (!boundary) - { - fprintf (stderr, "%s ", boundary_name); - perror ("fopen"); - exit (1); - } - - printf ("vect_type boundary_%d[] = {\n", zone_num); - - while (!feof (boundary)) - { - int num_scanned; - int id,code,point; - double lon,lat,x,y,z; - - memset (coords, 0, sizeof (coords)); - fgets (coords, sizeof (coords), boundary); -//printf ("scanning %s\n", coords); - - num_scanned = sscanf (coords, "%d,%d,%d,%lf,%lf", &id,&code,&point,&lon,&lat); - -//printf ("num scanned%d\n", num_scanned); - - if (num_scanned <= 0) - { - // EOF coming. - } - else if (num_scanned == 5) - { - lon *= M_PI / 180.0; - lat *= M_PI / 180.0; - - x = cos (lon) * cos (lat); - y = sin (lon) * cos (lat); - z = sin (lat); - - points_in_vector++; - printf ("{%.5lf, %.5lf, %.5lf},\n", x, y, z); - } - else - { -//printf ("points in = %d\n", points_in_vector); - - // If there was only a single point in the vector duplicate it. - // This will allow ust to use xdrawlines to draw it. - if (points_in_vector == 1) - printf ("{%.5lf, %.5lf, %.5lf},\n", x, y, z); - - //Print an end vector delimiter. - printf ("{-10.0,-10.0,-10.0},\n"); - points_in_vector = 0; - } - } - printf ("};\n"); - - printf ("#define num_boundary_points_%d XtNumber (boundary_%d)\n", zone_num, zone_num); - fclose (boundary); - zone_num++; - } - } - - fclose (zones); - - - printf ("typedef struct {\n" - " char *zonename;\n" - " vect_type v;\n" - "} place_info_type;\n"); - - zones = fopen ("maps/zones.sorted", "r"); - zone_num = 0; - - while (!feof (zones)) - { - FILE *places; - char place_name[100]; - - if (fgets (line_in, sizeof (line_in), zones)) - { - char place_info[100]; - double lat,lon; - char zonename[100]; - - //Strip the newline off the end. - line_in[strlen(line_in) - 1] = 0; - - printf ("#define zone_offset_%d \"%s%s\"\n", zone_num, (line_in[0] == '-') ? "" : "+", line_in); - - sprintf (place_name, "maps/places%s", line_in); - -//printf ("%s<\n", place_name); - - places = fopen (place_name, "r"); - - if (!places) - { - fprintf (stderr, "%s ", place_name); - perror ("fopen"); - exit (1); - } - - printf ("place_info_type places_%d[] =\n{\n", zone_num); - - memset (place_info, 0, sizeof (place_info)); - - while (fgets (place_info, sizeof (place_info), places)) - { -//printf (place_info); - - if (sscanf (place_info, "%lf %lf %s", &lat, &lon, zonename) == 3) - { - lat *= M_PI / 180.0; - lon *= M_PI / 180.0; - - printf (" {\"%s\", {%.5lf, %.5lf, %.5lf}},\n", zonename, - - cos (lon) * cos (lat), - sin (lon) * cos (lat), - sin (lat) - ); - } - } - printf ("};\n"); - - printf ("#define num_places_%d XtNumber (places_%d)\n", zone_num, zone_num); - zone_num++; - } - } - - printf ("#define NUM_ZONES %d\n", zone_num); - - printf ("struct {\n" - " char *offset;\n" - " int num_boundary_points;\n" - " vect_type *boundary_points;\n" - " int num_places;\n" - " place_info_type *place_info;\n" - "} zone_data[] =\n" - "{\n"); - - for (int zone = 0; zone < zone_num; zone++) - { - printf (" {\n" - " zone_offset_%d,\n" - " num_boundary_points_%d,\n" - " boundary_%d,\n" - " num_places_%d,\n" - " places_%d\n" - " },\n", zone, zone, zone, zone, zone); - } - - printf ("};\n"); - - exit (0); -} diff --git a/abs/core-testing/LinHES-timezone/extract_map_data.c b/abs/core-testing/LinHES-timezone/extract_map_data.c deleted file mode 100644 index 8fd8e52..0000000 --- a/abs/core-testing/LinHES-timezone/extract_map_data.c +++ /dev/null @@ -1,188 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - -int main () -{ - int fd; - int num_vectors; - int limits[4]; - double MAP_PIXEL_WIDTH = 1000; - - typedef struct - { - int id; - int code; - int limits[4]; - int num_points; - int offset; - } vector_info; - - vector_info *vector; - int i; - - fd = open ("WorldTZ.mfd", O_RDONLY); - - if (fd == -1) - { - perror ("open"); - abort (); - } - - read (fd, &num_vectors, 4); - read (fd, limits, sizeof (limits)); - - vector = calloc (num_vectors, sizeof (vector_info)); - - read (fd, vector, sizeof (vector_info) * num_vectors); - -#if 0 - for (i = 0; i < num_vectors; i++) - { - printf ("list%d %d %d %d %d %d %d %d %d\n", - i, - vector[i].id, - vector[i].code, - vector[i].limits[0], - vector[i].limits[2], - vector[i].limits[3], - vector[i].limits[4], - vector[i].num_points, - vector[i].offset); - } -#endif - - for (i = 0; i < num_vectors; i++) - { - typedef struct - { - int lon; - int lat; - } point_type; - - int j; - - point_type *point = NULL; - - point = realloc (point, vector[i].num_points * sizeof (point_type)); - read (fd, point, vector[i].num_points * sizeof (point_type)); - - /* Map the points onto an 800x400 pixel area */ - - for (j = 0; j < vector[i].num_points; j++) - { - if (point[j].lon > -2000000) - { - point[j].lon = lrint (point[j].lon * MAP_PIXEL_WIDTH / 3600000); - point[j].lat = lrint (point[j].lat * MAP_PIXEL_WIDTH / 3600000); - } - } - - /* Remove consecutive points that are now the same. */ - - for (j = 0; j < vector[i].num_points - 1; j++) - { - if ((point[j].lon == point[j+1].lon) && - (point[j].lat == point[j+1].lat)) - { - for (int k = j + 1; k < vector[i].num_points - 1; k++) - { - point[k].lat = point[k+1].lat; - point[k].lon = point[k+1].lon; - } - - vector[i].num_points--; - j--; - } - } - - // Lop off any small corners one style at a time - //(so that aligning borders match) to make them diagonals. - - for (int lop = 0; lop < 8; lop++) - { - int dx1c[8] = {-1, 1,-1, 1, 0, 0, 0, 0,}; - int dx2c[8] = { 0, 0, 0, 0,-1, 1,-1, 1,}; - int dy1c[8] = { 0, 0, 0, 0,-1,-1, 1, 1,}; - int dy2c[8] = {-1,-1, 1, 1, 0, 0, 0, 0,}; - - for (j = 0; j < vector[i].num_points - 2; j++) - { - int dx1,dx2,dy1,dy2; - dx1 = point[j+0].lon - point[j+1].lon; - dx2 = point[j+1].lon - point[j+2].lon; - dy1 = point[j+0].lat - point[j+1].lat; - dy2 = point[j+1].lat - point[j+2].lat; - - if ((dx1 == dx1c[lop]) && (dy1 == dy1c[lop]) && - (dx2 == dx2c[lop]) && (dy2 == dy2c[lop])) - { - for (int k = j + 1; k < vector[i].num_points - 1; k++) - { - point[k].lat = point[k+1].lat; - point[k].lon = point[k+1].lon; - } - - vector[i].num_points--; - j--; - } - } - } - - /* Now weed out points where there are a number of points on the same line. */ - - for (j = 0; j < vector[i].num_points - 2; j++) - { - int dx1,dx2,dy1,dy2; - int same_dir = 0; - dx1 = point[j+0].lon - point[j+1].lon; - dx2 = point[j+1].lon - point[j+2].lon; - dy1 = point[j+0].lat - point[j+1].lat; - dy2 = point[j+1].lat - point[j+2].lat; - - if ((dx1 == 0) && (dx2 == 0) && (dy1 * dy2 >= 0)) - same_dir = 1; - if ((dy1 == 0) && (dy2 == 0) && (dx1 * dx2 >= 0)) - same_dir = 1; - - if ((dx1 != 0) && (dx2 != 0)) - { - if ((dy1 * dx2) == (dy2 * dx1) && ((dx1 * dx2) > 0)) - same_dir = 1; - } - - if (same_dir) - { - for (int k = j + 1; k < vector[i].num_points - 1; k++) - { - point[k].lat = point[k+1].lat; - point[k].lon = point[k+1].lon; - } - - vector[i].num_points--; - j--; - } - } - - for (j = 0; j < vector[i].num_points; j++) - { - if (point[j].lon == -2147483648) - { - printf ("%d,\n", vector[i].id); - } - else - { - printf ("%d,%d,%d,%.2lf,%.2lf\n", - vector[i].id, vector[i].code, j, - point[j].lon * 360.0 / MAP_PIXEL_WIDTH, - point[j].lat * 360.0 / MAP_PIXEL_WIDTH); - } - } - - printf ("%d,\n", vector[i].id); - } -} diff --git a/abs/core-testing/LinHES-timezone/linhes_timezone.c b/abs/core-testing/LinHES-timezone/linhes_timezone.c deleted file mode 100644 index d7a56d2..0000000 --- a/abs/core-testing/LinHES-timezone/linhes_timezone.c +++ /dev/null @@ -1,1120 +0,0 @@ -#include -#include -#include -#include -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include - -#include "timezone_map.h" - -Display *display; -Window window; -GC gc; -int screen; -int selected_zone; -int selected_place; -Pixmap pixmap; -XColor ocean; -XColor land[8]; -XColor border; -XColor selected_border; -XColor selected_land; -XColor name_colour; -XColor location_dot; -XColor lat_lon; -XColor tux_yellow; -Dimension screen_width = 1920; -Dimension screen_height = 1080; -Dimension width = 1920; -Dimension height = 1080; -Position x = 0; -Position y = 0; -XFontStruct *font; -XPoint xpoints[1000]; -int radius; -double aspect_correction = 1; - -double target_lat; -double target_lon; - -double displayed_lat; -double displayed_lon; - -double lon_rotate[2] = {1, 0}; -double lat_rotate[2] = {1, 0}; - -double acceleration = 0.01; -char input_keys[200]; - -int guessing_timezone = FALSE; -time_t guess_timeout = 0; -int guess_failed = FALSE; -time_t guess_failed_timeout = 0; -int show_information = FALSE; -int info_displayed = FALSE; - -void select_place (int place) -{ - target_lon = atan2 (zone_data[selected_zone].place_info[place].v.y, - zone_data[selected_zone].place_info[place].v.x); - target_lat = acos (zone_data[selected_zone].place_info[place].v.z /2); - - selected_place = place; -} - -void default_zone (char *arg_zone) -{ - int found_zone = FALSE; - - for (int zone = 0; zone < NUM_ZONES; zone++) - { - for (int place = 0; place < zone_data[zone].num_places; place++) - { - if (strstr (zone_data[zone].place_info[place].zonename, - arg_zone[0] ? arg_zone : "Los_Angeles")) - { - selected_zone = zone; - select_place (place); - found_zone = TRUE; - } - } - } - - if (!found_zone) - { - default_zone (""); - } -} - -int translate_point (vect_type *v, XPoint *p) -{ - vect_type v2; - vect_type v3; - - v2.x = v->x * lon_rotate[0] + v->y * lon_rotate[1]; - v2.y = v->x * -1.0 * lon_rotate[1] + v->y * lon_rotate[0]; - v2.z = v->z; - - v3.x = v2.x * lat_rotate[0] + v2.z * lat_rotate[1]; - v3.y = v2.y * radius; - v3.z = v2.x * -1.0 * lat_rotate[1] + v2.z * lat_rotate[0]; - - - // If the point is behind the face of the globe, project it to the edge. - if (v3.x < 0) - { - p->x = width /2 + radius * sin (atan2 (v3.y,v3.z)) * aspect_correction; - p->y = height/2 - radius * cos (atan2 (v3.y,v3.z)); - } - else - { - p->x = width /2 + lrint (v3.y) * aspect_correction; - p->y = height/2 - lrint (v3.z); - } - - // Return a value indicating if it is on the front of the world. - return (v3.x >= 0); -} - -void draw_zone ( - Drawable d, - int zone, - int fill, - int selected) -{ - int boundary = 0; - int num_points = 0; - int all_on_back = 1; - - if (selected && fill) - XSetForeground (display, gc, selected_land.pixel); - - while (boundary < zone_data[zone].num_boundary_points) - { - if (zone_data[zone].boundary_points[boundary].x < -9) - { - - if ((num_points > 1) && !all_on_back) - { - if (fill) - { - if (!selected) - { - if (zone == NUM_ZONES - 1) - { - if (boundary < 380) - XSetForeground (display, gc, WhitePixel (display, screen)); - else if (boundary < 470) - XSetForeground (display, gc, tux_yellow.pixel); - else if (boundary < 1120) - XSetForeground (display, gc, BlackPixel (display, screen)); - else - XSetForeground (display, gc, WhitePixel (display, screen)); - } - else - { - XSetForeground (display, gc, - land[boundary % XtNumber (land)].pixel); - } - } - - XFillPolygon ( - display, d, gc, - xpoints, - num_points, Complex, CoordModeOrigin); - } - else - XDrawLines ( - display, d, gc, - xpoints, - num_points, CoordModeOrigin); - } - - boundary++; - num_points = 0; - all_on_back = 1; - } - else - { - if (translate_point (&zone_data[zone].boundary_points[boundary], - &xpoints[num_points])) - all_on_back = 0; - - num_points++; - boundary++; - } - } -} - -void draw_string (int x, int y, const char*s, unsigned long colour) -{ - XSetForeground (display, gc, BlackPixel (display, screen)); - for (int x_pos = x - 3; x_pos <= x + 3; x_pos++) - for (int y_pos = y - 3; y_pos <= y + 3; y_pos++) - XDrawString (display, pixmap, gc, x_pos, y_pos, s, strlen (s)); - - XSetForeground (display, gc, colour); - XDrawString (display, pixmap, gc, x, y, s, strlen (s)); -} - -void draw_point (XPoint p, char *s) -{ - int text_width; - - int dot_size = ceil (sqrt (height) / 6.0); - - if (s) - dot_size += 2; - - XSetForeground (display, gc, - s ? WhitePixel (display, screen) : location_dot.pixel); - XFillRectangle (display, pixmap, gc, - p.x - dot_size / 2, p.y - dot_size / 2, dot_size, dot_size); - - XSetForeground (display, gc, BlackPixel (display, screen)); - XSetLineAttributes (display, gc, 2, LineSolid, CapRound, JoinRound); - XDrawRectangle (display, pixmap, gc, - p.x - dot_size / 2, p.y - dot_size / 2, dot_size, dot_size); - - if (s) - { - int text_x; - int text_y; - - text_width = XTextWidth (font, s, strlen (s)); - - if (p.x + text_width + 30 > width) - { - text_x = p.x - text_width - 6; - text_y = p.y + 10; - } - else - { - text_x = p.x + 6; - text_y = p.y + 10; - } - - draw_string (text_x, text_y, s, name_colour.pixel); - } -} - -void redraw_map () -{ - XPoint selected_point; - char selected_name[100]; - - lon_rotate[0] = cos (displayed_lon); - lon_rotate[1] = sin (displayed_lon); - - lat_rotate[1] = cos (displayed_lat) * radius; - lat_rotate[0] = sin (displayed_lat) * radius; - - /* Draw the map into the pixmap. */ - - XSetForeground (display, gc, BlackPixel (display, screen)); - XFillRectangle (display, pixmap, gc, 0, 0, width, height); - - XSetForeground (display, gc, ocean.pixel); - XFillArc (display, pixmap, gc, - width / 2 - radius * aspect_correction, height / 2 - radius, - radius * 2 * aspect_correction, radius * 2, 0, 360 * 64); - - XSetForeground (display, gc, lat_lon.pixel); - XSetLineAttributes (display, gc, 2, LineSolid, CapRound, JoinRound); - - for (int lon = 0; lon < 24; lon++) - for (int lat = 0; lat < 12 * 3; lat++) - { - XPoint line[2]; - vect_type v; - v.x = cos (lon * 15 * M_PI / 180) * cos ((90 - lat * 5) * M_PI / 180); - v.y = sin (lon * 15 * M_PI / 180) * cos ((90 - lat * 5) * M_PI / 180); - v.z = sin ((90 - lat * 5) / 180.0 * M_PI); - line[0] = line[1]; - if (translate_point (&v, &line[1]) && (lat > 0)) - XDrawLines (display, pixmap, gc, line, 2, CoordModeOrigin); - } - - for (int lat = 0; lat < 12; lat++) - for (int lon = 0; lon <= 24 * 3; lon++) - { - XPoint line[2]; - vect_type v; - v.x = cos (lon * 5 * M_PI / 180) * cos ((90 - lat * 15) * M_PI / 180); - v.y = sin (lon * 5 * M_PI / 180) * cos ((90 - lat * 15) * M_PI / 180); - v.z = sin ((90 - lat * 15) / 180.0 * M_PI); - line[0] = line[1]; - if (translate_point (&v, &line[1]) && (lon > 0)) - XDrawLines (display, pixmap, gc, line, 2, CoordModeOrigin); - } - - for (int zone = 0; zone < NUM_ZONES; zone++) - draw_zone (pixmap, zone, 1, 0); - - XSetLineAttributes (display, gc, 2, LineSolid, CapRound, JoinRound); - XSetForeground (display, gc, border.pixel); - for (int zone = 0; zone < NUM_ZONES - 1; zone++) - draw_zone (pixmap, zone, 0, 0); - - if (show_information) - { - info_displayed = TRUE; - char *s[4] = {"Left/Right: Change Offset", - "Up/Down: Change Location", - "Enter: Select Location", - "Esc: Abort"}; - int num = XtNumber(s); - for (int i = 0; i < num; i++) - { - int text_width = XTextWidth (font, s[i], strlen (s[i])); - draw_string (width/2 - text_width/2, - height/2 + (-2 + i) * (font->ascent + font->descent), - s[i], name_colour.pixel); - } - } - else if (guessing_timezone || (info_displayed = FALSE)) - { - char *s = "Guessing Timezone"; - int text_width = XTextWidth (font, s, strlen (s)); - draw_string (width/2 - text_width/2, height/2, s, name_colour.pixel); - } - else if (guess_failed) - { - char *s = "Unable to Guess Timezone"; - char *s2 = "Please Select Timezone Manually"; - int text_width = XTextWidth (font, s, strlen (s)); - draw_string (width/2 - text_width/2, height/2, s, name_colour.pixel); - text_width = XTextWidth (font, s2, strlen (s2)); - draw_string (width/2 - text_width/2, - height/2 + font->ascent + font->descent, - s2, name_colour.pixel); - } - else - { - draw_zone (pixmap, selected_zone, 1, 1); - XSetForeground (display, gc, selected_border.pixel); - draw_zone (pixmap, selected_zone, 0, 1); - - for (int place = 0; place < zone_data[selected_zone].num_places; place++) - { - XPoint point; - - translate_point (&zone_data[selected_zone].place_info[place].v, &point); - - draw_point (point, NULL); - - if ((place == selected_place) && (!guessing_timezone)) - { - char *underscore; - selected_point = point; - strcpy (selected_name, strchr (zone_data[selected_zone].place_info[place].zonename, '/') + 1); - while (underscore = strchr (selected_name, '_')) - underscore[0] = ' '; - } - } - - draw_point (selected_point, selected_name); - - { - char zone_offset[100]; - sprintf (zone_offset, "UTC%s", zone_data[selected_zone].offset); - draw_string ( - ((width * 0.95 - XTextWidth (font, "UTC+88", strlen ("UTC+88"))) + - ((width / 2) + radius / sqrt (2))) / 2, - ((lrint (height * 0.05) + font->ascent) + - (height / 2 - radius / sqrt (2))) / 2, - zone_offset, name_colour.pixel); - } - } - - if (!guessing_timezone && !guess_failed) - { - const char *title = "Select Your Time Zone"; - const char *help = "Help = i"; - - draw_string (width / 2 - XTextWidth (font, title, strlen (title)) / 2, - ((lrint (height * 0.05) + font->ascent) + - (height / 2 - radius / sqrt (2))) / 2, - title, WhitePixel (display,screen)); - - draw_string (width * 0.05, height * 0.95 - font->descent - font->ascent, - help, name_colour.pixel); - } - - XCopyArea (display, pixmap, window, gc, 0, 0, width, height, 0, 0); -} - -int nearest_z (double near_z) -{ - double min_delta = - fabs (near_z - zone_data[selected_zone].place_info[0].v.z); - int min_delta_place = 0; - - for (int place = 1; place < zone_data[selected_zone].num_places; place++) - { - double delta = - fabs (near_z - zone_data[selected_zone].place_info[place].v.z); - - if (delta < min_delta) - { - min_delta_place = place; - min_delta = delta; - } - } - - return min_delta_place; -} - -void handle_key (char key) -{ - double selected_z; - - selected_z = zone_data[selected_zone].place_info[selected_place].v.z; - - if (show_information) - { - show_information = FALSE; - return; - } - - switch (key) - { - case 'U': - select_place ((selected_place + - zone_data[selected_zone].num_places - 1) % - zone_data[selected_zone].num_places); - break; - - case 'D': - select_place ((selected_place + 1) % - zone_data[selected_zone].num_places); - break; - - case 'L': - selected_zone = (selected_zone + NUM_ZONES - 1) % NUM_ZONES; - select_place (nearest_z (selected_z)); - break; - - case 'R': - selected_zone = (selected_zone + 1) % NUM_ZONES; - select_place (nearest_z (selected_z)); - break; - - case 'I': - show_information = !show_information; - break; - - case 'X': - printf ("%s\n", zone_data[selected_zone].place_info[selected_place].zonename); - exit (0); - - case 'E': - exit(1); - } -} - -void handle_event (XEvent *xevent) -{ - switch (xevent->type) - { - case Expose: - redraw_map (); - break; - - case KeyPress: - switch (XLookupKeysym (&xevent->xkey, 0)) - { - case XK_Up: - handle_key ('U'); - break; - - case XK_Down: - handle_key ('D'); - break; - - case XK_Left: - handle_key ('L'); - break; - - case XK_Right: - handle_key ('R'); - break; - - case XK_Return: - handle_key ('X'); - break; - - case XK_Escape: - handle_key ('E'); - break; - - case XK_I: - case XK_i: - handle_key ('I'); - break; - } - - break; - } -} - -Bool event_predicate (Display *display, XEvent *xevent, XPointer unused) -{ - return (xevent->type == KeyPress) || (xevent->type == Expose); -} - -void next_view () -{ - static double step_size = 0.01; - double error_total; - double lat_error = target_lat - displayed_lat; - double lon_error = target_lon - displayed_lon; - - if (guessing_timezone) - { - displayed_lon += 1 / 180.0 * M_PI; - } - else - { - lat_error = atan2 (sin (lat_error), cos( lat_error)); - lon_error = atan2 (sin (lon_error), cos (lon_error)); - - error_total = sqrt (lat_error * lat_error + lon_error * lon_error); - - if (error_total < acceleration) - { - displayed_lat = target_lat; - displayed_lon = target_lon; - } - else - { - if (error_total > (step_size + acceleration) * - (step_size + acceleration) / acceleration / 2) - step_size += acceleration; - else - step_size -= acceleration; - - if (step_size < acceleration) - step_size = acceleration; - - displayed_lat += step_size * (lat_error / error_total); - displayed_lon += step_size * (lon_error / error_total); - } - } -} - -void *lirc_thread (void *unused) -{ - int lirc_fd; - struct lirc_config *lirc_config; - char *lirc_code; - - if ((lirc_fd = lirc_init ("mythtv",0)) == -1) - fprintf (stderr,"Error initialising lirc\n"); - else - { - int readc_status; - - if (readc_status = lirc_readconfig (NULL, &lirc_config, NULL)) - { - fprintf (stderr,"Error loading lirc config file %d %p\n", readc_status, lirc_config); - } - } - - while ((lirc_nextcode (&lirc_code) == 0) && (lirc_code != NULL)) - { - char *action; - - while ((lirc_code2char (lirc_config, lirc_code, &action) == 0) && - (action != NULL)) - { - if (strcasecmp (action, "down") == 0) - strcat (input_keys, "D"); - - if (strcasecmp (action, "up") == 0) - strcat (input_keys, "U"); - - if (strcasecmp (action, "left") == 0) - strcat (input_keys, "L"); - - if (strcasecmp (action, "right") == 0) - strcat (input_keys, "R"); - - if (strcasecmp (action, "return") == 0) - strcat (input_keys, "X"); - - if (strcasecmp (action, "Esc") == 0) - strcat (input_keys, "E"); - } - - free (lirc_code); - lirc_code = NULL; - } -} - -void get_value (FILE *input, char*output, int out_len) -{ - const char *value_pattern = "value=\""; - char *value; - - output[0] = 0; - fgets (output, out_len, input); - - if (value = strcasestr (output, value_pattern)) - { - memmove (output, value + strlen (value_pattern), - strlen (value + strlen (value_pattern)) + 1); - } - - if (value = strchr (output, '"')) - value[0] = 0; -} - -void *timezone_guess (void *unused) -{ - const double invalid = 99999; - FILE *guess_data; - char line_in[1000]; - double guess_latitude = invalid; - double guess_longitude = invalid; - char guess_zone[1000] = {0}; - char *timezone_info_command; - - if (getenv ("FAKE_GEOBYTES")) - { - timezone_info_command = - "sleep 2 ; " - "echo Latitude ; " - "echo \" /dev/null |" - "grep \"^ res_name = appname; - classHint->res_class = "MoonRoot"; - } - - XSetClassHint (display, window, classHint); - XFree (classHint); - - typedef struct - { - CARD32 flags; - CARD32 functions; - CARD32 decorations; - INT32 input_mode; - CARD32 status; - } MotifWmHints, MwmHints; - - #define MWM_HINTS_DECORATIONS (1L << 1) - - - Atom XA_MOTIF_WM_HINTS = XInternAtom (display, "_MOTIF_WM_HINTS", False); - MotifWmHints mwm_hints; - - mwm_hints.flags = MWM_HINTS_DECORATIONS; - mwm_hints.decorations = 0; - - XChangeProperty ( - display, window, - XA_MOTIF_WM_HINTS, XA_MOTIF_WM_HINTS, - 32, PropModeReplace, - (char *) &mwm_hints, 5); -} - -void set_window_position (int x, int y) -{ - XSizeHints hints; - - hints.flags = USPosition | PPosition; - hints.x = x; - hints.y = y; - - XSetWMNormalHints(display, window, &hints); -} - -int main (int argc, char *argv[]) -{ - XEvent xevent; - Colormap cmap; - XColor color, colorrgb; - pthread_t tid; - int opt; - int arg_width = -1; - int arg_height = -1; - char arg_zone[100] = {0}; - - if (getenv ("ACCEL")) - acceleration = atof (getenv ("ACCEL")); - - while ((opt = getopt (argc, argv, "z:w:h:a:")) != -1) - { - switch (opt) - { - case 'z': - strncpy (arg_zone, optarg, sizeof (arg_zone) - 1); - - if (strcasecmp (arg_zone, "guess") == 0) - { - guessing_timezone = TRUE; - arg_zone[0]=0; - } - - break; - - case 'w': - arg_width = atoi (optarg); - break; - - case 'h': - arg_height = atoi (optarg); - break; - - case 'a': - acceleration = atof (optarg); - break; - - case '?': - printf ("usage: %s [-a accelleration] [-z timezone] " - "[-w width] [-h height]\n" - "e.g. linhes_timezone -w 1920 -h 1090 -z Australia/Adelaide\n" - "specify a timezone of 'guess' to determine the initial " - "timezone from\n" - "your ip address using geocache.\n", - argv[0]); - exit (0); - break; - } - } - - pthread_create (&tid, NULL, lirc_thread, NULL); - - /* Connect to the X server. */ - - display = XOpenDisplay (""); - - if (display == NULL) - { - fprintf (stderr, "cannot connect to server\n"); - exit (EXIT_FAILURE); - } - - /* Get default screen. */ - - screen = DefaultScreen (display); - screen_width = XWidthOfScreen (DefaultScreenOfDisplay (display)); - screen_height = XHeightOfScreen (DefaultScreenOfDisplay (display)); - - if ((arg_width <= 0) && (arg_height > 0)) - arg_width == arg_height; - - if (arg_width > 0) - { - width = arg_width; - - if (arg_height <= 0) - height = width; - else - height = arg_height; - - x = (screen_width - width) / 2; - y = (screen_height - height) / 2; - } - else - { - width = screen_width; - height = screen_height; - x = 0; - y = 0; - } - - if (width < height) - radius = width; - else - radius = height; - - radius = 0.96 * radius / 2; - - if ((screen_height == 0) || - (XWidthMMOfScreen (DefaultScreenOfDisplay (display)) == 0)) - aspect_correction = 1; - else - aspect_correction = - sqrt (screen_width * - XHeightMMOfScreen (DefaultScreenOfDisplay (display)) * 1.0 / - screen_height / - XWidthMMOfScreen (DefaultScreenOfDisplay (display))); - - // Protect against very wierd aspect corrections from bogus - // screen dimensions. - if ((aspect_correction < 0.5) || (aspect_correction > 2)) - aspect_correction = 1; - - window = XCreateSimpleWindow (display, - DefaultRootWindow(display), x, y, width, height, 0, - land[0].pixel, ocean.pixel); - - remove_titlebar_and_borders (); - set_window_position (x, y); - - if (!window) - { - fprintf (stderr, "cannot open window\n"); - exit (EXIT_FAILURE); - } - - /* set graphics context of rectangle to red */ - gc= XCreateGC (display, window, 0, 0); - cmap = DefaultColormap (display, screen); - - // Load the font. - - font = XLoadQueryFont (display, (width > 800) ? - "-*-lucida-bold-r-*-*-34-*-*-*-*-*-*-*" : - "-*-lucida-bold-r-*-*-20-*-*-*-*-*-*-*"); - if (!font) - fprintf (stderr,"error loading font\n"); - - XSetFont (display, gc, font->fid); - - pixmap = - XCreatePixmap (display, window, width, height, - DefaultDepth (display, DefaultScreen (display))); - - ocean.flags = DoRed | DoGreen | DoBlue; - ocean.red = 40 * 256; - ocean.green = 41 * 256; - ocean.blue = 72 * 256; - if (XAllocColor (display, cmap, &ocean) == 0) - printf ("Cant allocate color\n"); - - lat_lon.flags = DoRed | DoGreen | DoBlue; - lat_lon.red = 0 * 256; - lat_lon.green = 0 * 256; - lat_lon.blue = 86 * 256; - if (XAllocColor (display, cmap, &lat_lon) == 0) - printf ("Cant allocate color\n"); - - tux_yellow.flags = DoRed | DoGreen | DoBlue; - tux_yellow.red = 248 * 256; - tux_yellow.green = 191 * 256; - tux_yellow.blue = 17 * 256; - if (XAllocColor (display, cmap, &tux_yellow) == 0) - printf ("Cant allocate color\n"); - - for (int land_col = 0; land_col < XtNumber (land); land_col++) - { - land[land_col].flags = DoRed | DoGreen | DoBlue; - land[land_col].red = (120 + 9 * land_col) * 256; - land[land_col].green = (40 + 3 * land_col) * 256; - land[land_col].blue = 0 * 256; - if (XAllocColor (display, cmap, &land[land_col]) == 0) - printf ("Cant allocate color\n"); - } - - selected_land.flags = DoRed | DoGreen | DoBlue; - selected_land.red = 3 * 256; - selected_land.green = 40 * 256; - selected_land.blue = 13 * 256; - if (XAllocColor (display, cmap, &selected_land) == 0) - printf ("Cant allocate color\n"); - - border.flags = DoRed | DoGreen | DoBlue; - border.red = 0 * 256; - border.green = 0 * 256; - border.blue = 0 * 256; - if (XAllocColor (display, cmap, &border) == 0) - printf ("Cant allocate color\n"); - - selected_border.flags = DoRed | DoGreen | DoBlue; - selected_border.red = 80 * 256; - selected_border.green = 255 * 256; - selected_border.blue = 80 * 256; - if (XAllocColor (display, cmap, &selected_border) == 0) - printf ("Cant allocate color\n"); - - name_colour.flags = DoRed | DoGreen | DoBlue; - name_colour.red = 255 * 256; - name_colour.green = 255 * 256; - name_colour.blue = 0 * 256; - if (XAllocColor (display, cmap, &name_colour) == 0) - printf ("Cant allocate color\n"); - - location_dot.flags = DoRed | DoGreen | DoBlue; - location_dot.red = 255 * 256; - location_dot.green = 55 * 256; - location_dot.blue = 200 * 256; - if (XAllocColor (display, cmap, &location_dot) == 0) - printf ("Cant allocate color\n"); - - // Find the selected timezone (or LA if a timezone was not selected) and - // make that the selected zone and place. - - default_zone (arg_zone); - - if (guessing_timezone) - { - pthread_create (&tid, NULL, timezone_guess, NULL); - guess_timeout = time (NULL) + 10; - displayed_lat = M_PI/2; - displayed_lon = 0; - } - else - { - displayed_lat = target_lat; - displayed_lon = target_lon; - } - - /* ask for exposure event and keyboard events */ - XSelectInput(display, window, KeymapNotify | ExposureMask); - - /* pop this window up on the screen */ - XMapRaised (display, window); - - redraw_map (); - - while (1) - { - if (guessing_timezone && (time (NULL) > guess_timeout)) - { - guessing_timezone = FALSE; - guess_failed_timeout = time (NULL) + 3; - guess_failed = TRUE; - } - - if ((displayed_lat != target_lat) || (displayed_lon != target_lon) || - guessing_timezone || guess_failed || - (info_displayed ^ show_information)) - { - if (guess_failed && (time (NULL) > guess_failed_timeout)) - { - guess_failed = FALSE; - } - - next_view (); - redraw_map (); - } - else - { - usleep (1000); - } - - while (strlen (input_keys)) - { - handle_key (input_keys[0]); - memmove (&input_keys[0], &input_keys[1], strlen (input_keys)); - } - - // If there is an event pending, go on to process it. - - if (XCheckIfEvent (display, &xevent, event_predicate, NULL)) - handle_event (&xevent); - } - - return 0; -} diff --git a/abs/core-testing/a b/abs/core-testing/a deleted file mode 100644 index 16b14f5..0000000 --- a/abs/core-testing/a +++ /dev/null @@ -1 +0,0 @@ -test file diff --git a/abs/core-testing/a52dec/PKGBUILD b/abs/core-testing/a52dec/PKGBUILD deleted file mode 100644 index cba41ae..0000000 --- a/abs/core-testing/a52dec/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 5601 2008-07-18 22:06:17Z jgc $ -# Maintainer: Thomas Baechler -# contributor: Sarah Hay - -pkgname=a52dec -pkgver=0.7.4 -pkgrel=4 -pkgdesc="liba52 is a free library for decoding ATSC A/52 streams." -arch=('i686' 'x86_64') -license=('GPL2') -depends=('glibc') -options=(!libtool) -source=(http://liba52.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz - a52dec-0.7.4-build.patch) -url="http://liba52.sourceforge.net/" -md5sums=('caa9f5bc44232dc8aeea773fea56be80' 'fa16f224a7dceb7613824380abef0052') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/a52dec-0.7.4-build.patch || return 1 - ./bootstrap || return 1 - ./configure --prefix=/usr --enable-shared || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - install -m644 liba52/a52_internal.h $startdir/pkg/usr/include/a52dec/ || return 1 -} diff --git a/abs/core-testing/a52dec/a52dec-0.7.4-build.patch b/abs/core-testing/a52dec/a52dec-0.7.4-build.patch deleted file mode 100644 index f3a29f3..0000000 --- a/abs/core-testing/a52dec/a52dec-0.7.4-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur a52dec-0.7.4.orig/liba52/Makefile.am a52dec-0.7.4/liba52/Makefile.am ---- a52dec-0.7.4.orig/liba52/Makefile.am 2002-01-27 20:36:48.000000000 -0800 -+++ a52dec-0.7.4/liba52/Makefile.am 2004-11-05 01:10:21.317401872 -0800 -@@ -1,4 +1,3 @@ --CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@ - - lib_LTLIBRARIES = liba52.la - -diff -Naur a52dec-0.7.4.orig/liba52/configure.incl a52dec-0.7.4/liba52/configure.incl ---- a52dec-0.7.4.orig/liba52/configure.incl 2002-01-27 20:36:48.000000000 -0800 -+++ a52dec-0.7.4/liba52/configure.incl 2004-11-05 01:11:38.172672216 -0800 -@@ -2,7 +2,6 @@ - AC_SUBST([LIBA52_LIBS]) - - dnl avoid -fPIC when possible --LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic" - - AC_ARG_ENABLE([double], - [ --enable-double use double-precision samples]) -diff -Naur a52dec-0.7.4.orig/src/Makefile.am a52dec-0.7.4/src/Makefile.am ---- a52dec-0.7.4.orig/src/Makefile.am 2002-06-22 18:51:57.000000000 -0700 -+++ a52dec-0.7.4/src/Makefile.am 2004-11-05 01:10:21.320401375 -0800 -@@ -1,4 +1,3 @@ --CFLAGS = @A52DEC_CFLAGS@ - - bin_PROGRAMS = a52dec extract_a52 - a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c diff --git a/abs/core-testing/aalib/PKGBUILD b/abs/core-testing/aalib/PKGBUILD deleted file mode 100644 index 0ae5b05..0000000 --- a/abs/core-testing/aalib/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 9082 2008-08-17 03:29:36Z allan $ -# Maintainer: arjan -# Contributor: Tom Newsom -# -pkgname=aalib -pkgver=1.4rc5 -pkgrel=6 -pkgdesc="AAlib is a portable ASCII art GFX library" -arch=('i686' 'x86_64') -url="http://aa-project.sourceforge.net/aalib/" -license=('LGPL') -depends=('glibc' 'ncurses' 'gpm>=1.20.4' 'libx11') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/aa-project/$pkgname-$pkgver.tar.gz - aclocal-fixes.patch) -md5sums=('9801095c42bba12edebd1902bcf0a990' '863a96a6689aa7ee073ca448bc2f133d') - -build() { - cd $startdir/src/$pkgname-1.4.0 - patch -Np0 -i ${startdir}/src/aclocal-fixes.patch || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info - make || return 1 - make DESTDIR=$startdir/pkg install - rm ${pkgdir}/usr/share/info/dir -} diff --git a/abs/core-testing/aalib/aclocal-fixes.patch b/abs/core-testing/aalib/aclocal-fixes.patch deleted file mode 100644 index 3f1919a..0000000 --- a/abs/core-testing/aalib/aclocal-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- aalib.m4.orig 2006-03-05 13:58:21.000000000 +0000 -+++ aalib.m4 2006-03-05 13:58:32.000000000 +0000 -@@ -9,7 +9,7 @@ - dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) - dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS - dnl --AC_DEFUN(AM_PATH_AALIB, -+AC_DEFUN([AM_PATH_AALIB], - [dnl - dnl Get the cflags and libraries from the aalib-config script - dnl diff --git a/abs/core-testing/acl/PKGBUILD b/abs/core-testing/acl/PKGBUILD deleted file mode 100644 index 099eb04..0000000 --- a/abs/core-testing/acl/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Tobias Powalowski -pkgname=acl -pkgver=2.2.47 -pkgrel=10 -pkgdesc="Library for filesystem ACL support" -arch=(i686 x86_64) -url="http://oss.sgi.com/projects/xfs/" -license=('LGPL') -groups=('base') -depends=('attr>=2.4.41') -replaces=('xfsacl') -provides=('xfsacl') -conflicts=('xfsacl') -options=('!libtool') -source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_${pkgver}-1.tar.gz) -md5sums=('a11e4571a54a0b1ae83010d1e68a64c2') - -build() { - cd $startdir/src/acl-$pkgver - autoconf - ./configure --prefix=$startdir/pkg/usr - make || return 1 - make prefix=$startdir/pkg/usr/ install install-lib install-dev - - # tidy up - cd $startdir/pkg - - mkdir -v lib - mv -v usr/lib/libacl.so* lib/ - ln -sv ../../lib/libacl.so.1 usr/lib/libacl.so - - mv -v usr/libexec/libacl.{a,la} usr/lib/ - rm -rf $startdir/pkg/usr/libexec -} diff --git a/abs/core-testing/acpid/Makefile b/abs/core-testing/acpid/Makefile deleted file mode 100644 index a5fe385..0000000 --- a/abs/core-testing/acpid/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# Makefile for ACPI daemon - -# update these numbers for new releases -VERSION = 1.0.6 - -INSTPREFIX = -BINDIR = $(INSTPREFIX)/usr/bin -SBINDIR = $(INSTPREFIX)/usr/sbin -MAN8DIR = $(INSTPREFIX)/usr/share/man/man8 - -SBIN_PROGS = acpid -BIN_PROGS = acpi_listen -PROGS = $(SBIN_PROGS) $(BIN_PROGS) - -acpid_SRCS = acpid.c event.c ud_socket.c -acpid_OBJS = $(acpid_SRCS:.c=.o) - -acpi_listen_SRCS = acpi_listen.c ud_socket.c -acpi_listen_OBJS = $(acpi_listen_SRCS:.c=.o) - -MAN8 = acpid.8 acpi_listen.8 -MAN8GZ = $(MAN8:.8=.8.gz) - -CFLAGS = -Wall -Werror -g $(DEFS) -D_GNU_SOURCE -DEFS = -DVERSION="\"$(VERSION)\"" - -all: $(PROGS) - -acpid: $(acpid_OBJS) - -acpi_listen: $(acpi_listen_OBJS) - -man: $(MAN8) - for a in $^; do gzip -f -9 -c $$a > $$a.gz; done - -install: $(PROGS) man - mkdir -p $(SBINDIR) - mkdir -p $(BINDIR) - install -m 750 acpid $(SBINDIR) - install -m 755 acpi_listen $(BINDIR) - mkdir -p $(MAN8DIR) - install -m 644 $(MAN8GZ) $(MAN8DIR) - -DISTTMP=/tmp -dist: - rm -rf $(DISTTMP)/acpid-$(VERSION) - mkdir -p $(DISTTMP)/acpid-$(VERSION) - cp -a * $(DISTTMP)/acpid-$(VERSION) - find $(DISTTMP)/acpid-$(VERSION) -type d -name CVS | xargs rm -rf - make -C $(DISTTMP)/acpid-$(VERSION) clean - tar -C $(DISTTMP) -zcvf acpid-$(VERSION).tar.gz acpid-$(VERSION) - rm -rf $(DISTTMP)/acpid-$(VERSION) - -clean: - $(RM) $(PROGS) $(MAN8GZ) *.o - diff --git a/abs/core-testing/acpid/PKGBUILD b/abs/core-testing/acpid/PKGBUILD deleted file mode 100644 index 5b9d033..0000000 --- a/abs/core-testing/acpid/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 20369 2008-12-03 02:03:14Z thayer $ -# Contributor: Manolis Tzanidakis -# Contributor: Judd Vinet -# Maintainer: Thayer Williams - -pkgname=acpid -pkgver=1.0.8 -pkgrel=2 -pkgdesc="A daemon for delivering ACPI power management events" -url="http://acpid.sourceforge.net" -license=('GPL2') -arch=('i686' 'x86_64') -depends=(glibc) -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - acpid - anything - handler.sh) -backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything') - -build() { - cd $srcdir/$pkgname-$pkgver - /usr/bin/make || return 1 - /bin/install -d -m0755 $pkgdir/usr/bin || return 1 - /usr/bin/make INSTPREFIX=$pkgdir \ - MAN8DIR=$pkgdir/usr/share/man/man8 install || return 1 - - # install our supplementary scripts - /bin/install -D -m0755 $srcdir/acpid $pkgdir/etc/rc.d/acpid || return 1 - /bin/install -D -m0644 $srcdir/anything $pkgdir/etc/acpi/events/anything || return 1 - /bin/install -D -m0755 $srcdir/handler.sh $pkgdir/etc/acpi/handler.sh || return 1 - - # set world readable bit on the acpid binary - /bin/chmod 755 $pkgdir/usr/sbin/acpid || return 1 -} diff --git a/abs/core-testing/acpid/__changelog b/abs/core-testing/acpid/__changelog deleted file mode 100644 index 1de4ec0..0000000 --- a/abs/core-testing/acpid/__changelog +++ /dev/null @@ -1,2 +0,0 @@ -Modify handler.sh to use runit-init. - diff --git a/abs/core-testing/acpid/acpid b/abs/core-testing/acpid/acpid deleted file mode 100644 index 585944f..0000000 --- a/abs/core-testing/acpid/acpid +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/acpid` -case "$1" in - start) - stat_busy "Starting acpid" - [ -z "$PID" ] && /usr/sbin/acpid - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon acpid - stat_done - fi - ;; - stop) - stat_busy "Stopping acpid" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon acpid - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/core-testing/acpid/acpid-1.0.4-gcc4.patch b/abs/core-testing/acpid/acpid-1.0.4-gcc4.patch deleted file mode 100644 index b56901d..0000000 --- a/abs/core-testing/acpid/acpid-1.0.4-gcc4.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- acpid-1.0.4/ud_socket.c 2005-04-26 10:26:29.000000000 +0000 -+++ acpid-1.0.4.az/ud_socket.c 2005-04-26 10:27:09.000000000 +0000 -@@ -60,7 +60,7 @@ - struct sockaddr_un cliaddr; - int len = sizeof(struct sockaddr_un); - -- newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len); -+ newsock = accept(listenfd, (struct sockaddr *)&cliaddr, (socklen_t *)&len); - if (newsock < 0) { - if (errno == EINTR) { - continue; /* signal */ -@@ -71,7 +71,7 @@ - - if (cred) { - len = sizeof(struct ucred); -- getsockopt(newsock, SOL_SOCKET, SO_PEERCRED,cred,&len); -+ getsockopt(newsock, SOL_SOCKET, SO_PEERCRED,cred,(socklen_t *)&len); - } - - return newsock; diff --git a/abs/core-testing/acpid/anything b/abs/core-testing/acpid/anything deleted file mode 100644 index d182898..0000000 --- a/abs/core-testing/acpid/anything +++ /dev/null @@ -1,3 +0,0 @@ -# Pass all events to our one handler script -event=.* -action=/etc/acpi/handler.sh %e diff --git a/abs/core-testing/acpid/default b/abs/core-testing/acpid/default deleted file mode 100644 index 93944aa..0000000 --- a/abs/core-testing/acpid/default +++ /dev/null @@ -1,20 +0,0 @@ -# This is the ACPID default configuration, it takes all -# events and passes them to /etc/acpi/default.sh for further -# processing. - -# event keeps a regular expression matching the event. To get -# power events only, just use something like "event=button power.*" -# to catch it. -# action keeps the command to be executed after an event occurs -#This halts the computer when the Power button is pressed. - -event=button power.* -#action=/sbin/shutdown -h now -action=/usr/local/sbin/shutdown.sh - -# Optionally you can specify the placeholder %e. It will pass -# through the whole kernel event message to the program you've -# specified. - -event=.* -action=/etc/acpi/acpi_handler.sh %e diff --git a/abs/core-testing/acpid/handler.sh b/abs/core-testing/acpid/handler.sh deleted file mode 100755 index f6b0f9b..0000000 --- a/abs/core-testing/acpid/handler.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# Default acpi script that takes an entry for all actions - -# NOTE: This is a 2.6-centric script. If you use 2.4.x, you'll have to -# modify it to not use /sys - -minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq` -maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq` -setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed" - -set $* - -case "$1" in - button/power) - #echo "PowerButton pressed!">/dev/tty5 - case "$2" in - PWRF) logger "PowerButton pressed: $2" - /sbin/runit-init 0 - /sbin/poweroff - ;; - *) logger "ACPI action undefined: $2" ;; - esac - ;; - button/sleep) - case "$2" in - SLPB) echo -n mem >/sys/power/state ;; - *) logger "ACPI action undefined: $2" ;; - esac - ;; - ac_adapter) - case "$2" in - AC) - case "$4" in - 00000000) - echo -n $minspeed >$setspeed - #/etc/laptop-mode/laptop-mode start - ;; - 00000001) - echo -n $maxspeed >$setspeed - #/etc/laptop-mode/laptop-mode stop - ;; - esac - ;; - *) logger "ACPI action undefined: $2" ;; - esac - ;; - battery) - case "$2" in - BAT0) - case "$4" in - 00000000) #echo "offline" >/dev/tty5 - ;; - 00000001) #echo "online" >/dev/tty5 - ;; - esac - ;; - CPU0) - ;; - *) logger "ACPI action undefined: $2" ;; - esac - ;; - button/lid) - #echo "LID switched!">/dev/tty5 - ;; - *) - logger "ACPI group/action undefined: $1 / $2" - ;; -esac diff --git a/abs/core-testing/alsa-lib/PKGBUILD b/abs/core-testing/alsa-lib/PKGBUILD deleted file mode 100644 index 9ba2945..0000000 --- a/abs/core-testing/alsa-lib/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 79040 2010-04-30 05:28:10Z tpowa $ -# Maintainer: judd - -pkgname=alsa-lib -pkgver=1.0.23 -pkgrel=1 -pkgdesc="An alternative implementation of Linux sound support" -arch=('i686' 'x86_64') -url="http://www.alsa-project.org" -depends=('glibc') -optdepends=('python') -makedepends=('python') -license=('GPL') -options=(!libtool) -source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2) - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir install -} -md5sums=('f48b50421d8a69d2d806d9c47e534f0d') diff --git a/abs/core-testing/alsa-oss/PKGBUILD b/abs/core-testing/alsa-oss/PKGBUILD deleted file mode 100644 index 66f7030..0000000 --- a/abs/core-testing/alsa-oss/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 13736 2008-09-28 09:04:09Z tpowa $ -# Maintainer: judd -pkgname=alsa-oss -pkgver=1.0.17 -pkgrel=1 -pkgdesc="OSS compatibility library" -arch=(i686 x86_64) -license=('GPL') -url="http://www.alsa-project.org" -options=(!libtool) -depends=('glibc' 'alsa-lib>=1.0.17a') -source=(ftp://ftp.alsa-project.org/pub/oss-lib/$pkgname-$pkgver.tar.bz2) - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install -} -md5sums=('1b1850c2fc91476a73d50f537cbd402f') diff --git a/abs/core-testing/alsa-utils/PKGBUILD b/abs/core-testing/alsa-utils/PKGBUILD deleted file mode 100644 index 2f6e163..0000000 --- a/abs/core-testing/alsa-utils/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 79271 2010-05-02 14:42:00Z tpowa $ -# Maintainer: judd -pkgname=alsa-utils -pkgver=1.0.23 -pkgrel=2 -pkgdesc="An alternative implementation of Linux sound support" -arch=('i686' 'x86_64') -url="http://www.alsa-project.org" -#can not use >=$pkgver due to use of letters in alsa-lib update versioning -depends=("alsa-lib>1.0.22.99" 'dialog' 'pciutils' 'ncurses') -makedepends=('xmlto' 'docbook-xsl') -license=('GPL') -source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 - alsa - alsaconf.patch - alsa.conf.d) -backup=(etc/conf.d/alsa) - -build() { - cd $startdir/src/$pkgname-${pkgver} - patch -Np1 -i ../alsaconf.patch || return 1 - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install - install -D -m755 ../alsa $startdir/pkg/etc/rc.d/alsa - install -D -m644 ../alsa.conf.d $startdir/pkg/etc/conf.d/alsa -} -md5sums=('cb0cf46029ac9549cf3a31bff6a4f4e1' - '3ef812cae83053d01cd560284efad71f' - '62ebef77d5617d0036012cc541dcf23c' - '93089f0d8872078939f76dd2acaebc2b') diff --git a/abs/core-testing/alsa-utils/alsa b/abs/core-testing/alsa-utils/alsa deleted file mode 100755 index 08f76af..0000000 --- a/abs/core-testing/alsa-utils/alsa +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/conf.d/alsa -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Restoring ALSA Levels" - /usr/sbin/alsactl $ALSA_ARGS restore - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - add_daemon alsa - fi - - POWERSAVE=${POWERSAVE:-0} - if [ -e /sys/module/snd_ac97_codec/parameters/power_save \ - -a $POWERSAVE -ne 0 ]; then - echo $POWERSAVE > /sys/module/snd_ac97_codec/parameters/power_save - [ -c /dev/dsp ] && echo 1 > /dev/dsp - fi - - if [ -e /sys/module/snd_hda_intel/parameters/power_save \ - -a $POWERSAVE -ne 0 ]; then - echo $POWERSAVE > /sys/module/snd_hda_intel/parameters/power_save - [ -c /dev/dsp ] && echo 1 > /dev/dsp - fi - ;; - stop) - SAVE_VOLUME=${SAVE_VOLUME:-yes} - if [ "$SAVE_VOLUME" == "yes" ]; then - stat_busy "Saving ALSA Levels" - /usr/sbin/alsactl $ALSA_ARGS store - else - stat_busy "Stopping ALSA" - fi - if [ "$MUTE_VOLUME" == "yes" ]; then - /usr/bin/amixer -q set Master 0 mute - fi - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - rm_daemon alsa - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/abs/core-testing/alsa-utils/alsa.conf.d b/abs/core-testing/alsa-utils/alsa.conf.d deleted file mode 100644 index 2c4a92e..0000000 --- a/abs/core-testing/alsa-utils/alsa.conf.d +++ /dev/null @@ -1,15 +0,0 @@ -# Arguments for alsactl -# example: ALSA_ARGS="--file /var/run/alsa-state" -ALSA_ARGS="" - -# Enables powersaving mode for AC97 and hda_intel audio chips. -# Set to 1 to enable powersaving. -# Set to 0 to disable powersaving (default). -POWERSAVE=0 - -# Whether to save volume levels when stopped ("yes" or "no"). -SAVE_VOLUME="yes" - -# Whether to mute the master volume when stopped ("yes" or "no"). -# Useful for bad audio cards which make a noise on system poweroff. -MUTE_VOLUME="no" diff --git a/abs/core-testing/alsa-utils/alsaconf.patch b/abs/core-testing/alsa-utils/alsaconf.patch deleted file mode 100644 index ec79fe9..0000000 --- a/abs/core-testing/alsa-utils/alsaconf.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in alsa-utils-1.0.9a/alsaconf/alsaconf.in ---- alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in 2005-03-24 00:24:52.000000000 -0800 -+++ alsa-utils-1.0.9a/alsaconf/alsaconf.in 2005-07-18 09:25:02.000000000 -0700 -@@ -58,6 +58,8 @@ - distribution="redhat" - elif test -f /etc/fedora-release && grep -q "Fedora" /etc/fedora-release; then - distribution="fedora" -+elif test -f /etc/arch-release && grep -q "Arch" /etc/arch-release; then -+ distribution="arch" - elif [ -f /etc/slackware-version -o -f /etc/slamd64-version ]; then - distribution="slackware" - else -@@ -382,6 +384,8 @@ - rcalsasound=/etc/rc.d/init.d/alsasound - elif [ -x /etc/init.d/alsa ]; then - rcalsasound=/etc/init.d/alsa -+elif [ -x /etc/rc.d/alsa ]; then -+ rcalsasound=/etc/rc.d/alsa - else - rcalsasound=rcalsasound - fi ---- alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in 2010-01-03 19:44:08.000000000 +0100 -+++ alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in 2010-01-03 19:44:08.000000000 +0100 -@@ -315,7 +315,7 @@ - 3.[789]*) - ;; - *) -- cfgout="/etc/modprobe.d/sound" -+ cfgout="/etc/modprobe.d/sound.conf" - cfgoldout="" - ;; - esac diff --git a/abs/core-testing/apache/PKGBUILD b/abs/core-testing/apache/PKGBUILD deleted file mode 100644 index 6e570f1..0000000 --- a/abs/core-testing/apache/PKGBUILD +++ /dev/null @@ -1,139 +0,0 @@ -# $Id: PKGBUILD 87621 2010-08-17 13:13:14Z jgc $ -# Maintainer: Jan de Groot -# Contributor: Andrea Scarpino -# Contributor: Pierre Schmitz - -pkgname=apache -pkgver=2.2.16 -pkgrel=2 -pkgdesc='A high performance Unix-based HTTP server' -arch=('i686' 'x86_64') -options=('!libtool') -url='http://www.apache.org/dist/httpd' -license=('APACHE') -backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf - etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf - etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf - etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf - etc/logrotate.d/httpd) -depends=('openssl' 'zlib' 'apr-util' 'pcre') -optdepends=('lynx: apachectl status') -_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02 -source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 - ${_itkurl}/02-rename-prefork-to-itk.patch - ${_itkurl}/03-add-mpm-to-build-system.patch - ${_itkurl}/04-correct-output-makefile-location.patch - ${_itkurl}/05-add-copyright.patch - ${_itkurl}/06-hook-just-after-merging-perdir-config.patch - ${_itkurl}/07-base-functionality.patch - ${_itkurl}/08-max-clients-per-vhost.patch - ${_itkurl}/09-capabilities.patch - ${_itkurl}/10-nice.patch - apachectl-confd.patch - apache.conf.d - httpd.logrotate - httpd - arch.layout) -md5sums=('c8ff2a07c884300bc7766a2e7f662d33' - 'db42cfcc18ae1c32aaaff2347e35b79d' - '131408ad4dc7b18547b4e062e7e495ab' - 'ee488f391054d528547c3a372faa2aa7' - 'b202944761b2f0516196488b12504236' - '78fa15f8ca3a284b7d71f942e24e47fb' - 'd33e39350e987721d50e6fb8e164ab6b' - '9f7a8935f9cabc7b46d0052906634cef' - '1b28e3363e1b0d05b738a21e7ddd264f' - 'd9667fcd2ffecc63e446edd4d6666731' - '4ac64df6e019edbe137017cba1ff2f51' - '08b3c875f6260644f2f52b4056d656b0' - '6382331e9700ed9e8cc78ea51887b537' - 'c7e300a287ef7e2e066ac7639536f87e' - '3d659d41276ba3bfcb20c231eb254e0c') - -build() { - cd "${srcdir}/httpd-${pkgver}" - - patch -Np0 -i "${srcdir}/apachectl-confd.patch" - - # set default user - sed -e 's#User daemon#User http#' \ - -e 's#Group daemon#Group http#' \ - -i docs/conf/httpd.conf.in - - cat "${srcdir}/arch.layout" >> config.layout - - for mpm in prefork worker itk; do - if [ "${mpm}" = "itk" ]; then - mkdir -p server/mpm/experimental/itk - cp -r server/mpm/prefork/* server/mpm/experimental/itk/ - mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c - - patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch" - patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch" - patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch" - patch -Np1 -i "${srcdir}/05-add-copyright.patch" - patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch" - patch -Np1 -i "${srcdir}/07-base-functionality.patch" - patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch" - patch -Np1 -i "${srcdir}/09-capabilities.patch" - patch -Np1 -i "${srcdir}/10-nice.patch" - - autoconf - fi - mkdir build-${mpm} - pushd build-${mpm} - ../configure --enable-layout=Arch \ - --enable-modules=all \ - --enable-mods-shared=all \ - --enable-so \ - --enable-suexec \ - --with-suexec-caller=http \ - --with-suexec-docroot=/srv/http \ - --with-suexec-logfile=/var/log/httpd/suexec.log \ - --with-suexec-bin=/usr/sbin/suexec \ - --with-suexec-uidmin=99 --with-suexec-gidmin=99 \ - --enable-ldap --enable-authnz-ldap \ - --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \ - --enable-ssl --with-ssl \ - --enable-deflate --enable-cgid \ - --enable-proxy --enable-proxy-connect \ - --enable-proxy-http --enable-proxy-ftp \ - --enable-dbd \ - --with-apr=/usr/bin/apr-1-config \ - --with-apr-util=/usr/bin/apu-1-config \ - --with-pcre=/usr \ - --with-mpm=${mpm} - make - if [ "${mpm}" = "prefork" ]; then - make DESTDIR="${pkgdir}" install - else - install -m755 httpd "${pkgdir}/usr/sbin/httpd.${mpm}" - fi - popd - done - - install -D -m755 "${srcdir}/httpd" "${pkgdir}/etc/rc.d/httpd" - install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd" - install -D -m644 "${srcdir}/apache.conf.d" "${pkgdir}/etc/conf.d/apache" - - # symlinks for /etc/httpd - ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs" - ln -fs /var/run/httpd "${pkgdir}/etc/httpd/run" - ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules" - ln -fs /usr/lib/httpd/build "${pkgdir}/etc/httpd/build" - - # set sane defaults - sed -e 's#/usr/lib/httpd/modules/#modules/#' \ - -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \ - -i "${pkgdir}/etc/httpd/conf/httpd.conf" - - # cleanup - rm -rf "${pkgdir}/usr/share/httpd/manual" - rm -rf "${pkgdir}/etc/httpd/conf/original" - rm -rf "${pkgdir}/srv/" - rm -rf "${pkgdir}/usr/bin" -} diff --git a/abs/core-testing/apache/apache.conf.d b/abs/core-testing/apache/apache.conf.d deleted file mode 100644 index c6d0ebf..0000000 --- a/abs/core-testing/apache/apache.conf.d +++ /dev/null @@ -1,15 +0,0 @@ -# Configuration file for the httpd service. - -# -# The default processing model (MPM) is the process-based -# 'prefork' model. A thread-based model, 'worker', is also -# available, but does not work with some modules (such as PHP). -# The service must be stopped before changing this variable. -# -#HTTPD=/usr/sbin/httpd.worker - -# -# To pass additional options (for instance, -D definitions) to the -# httpd binary at startup, set OPTIONS here. -# -#OPTIONS= diff --git a/abs/core-testing/apache/apachectl-confd.patch b/abs/core-testing/apache/apachectl-confd.patch deleted file mode 100644 index d0f4b69..0000000 --- a/abs/core-testing/apache/apachectl-confd.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- support/apachectl.in.orig 2010-03-06 18:09:11.000000000 +0100 -+++ support/apachectl.in 2010-03-06 18:12:31.000000000 +0100 -@@ -56,6 +56,12 @@ - # the URL to your server's mod_status status page. If you do not - # have one, then status and fullstatus will not work. - STATUSURL="http://localhost:@PORT@/server-status" -+ -+# Source /etc/conf.d/apache for $HTTPD setting, etc. -+if [ -r /etc/conf.d/apache ]; then -+ . /etc/conf.d/apache -+fi -+ - # - # Set this variable to a command that increases the maximum - # number of file descriptors allowed per child process. This is diff --git a/abs/core-testing/apache/arch.layout b/abs/core-testing/apache/arch.layout deleted file mode 100644 index ab59db8..0000000 --- a/abs/core-testing/apache/arch.layout +++ /dev/null @@ -1,22 +0,0 @@ - - prefix: /etc/httpd - exec_prefix: /usr - bindir: /usr/bin - sbindir: /usr/sbin - libdir: /usr/lib/httpd - libexecdir: /usr/lib/httpd/modules - mandir: /usr/share/man - sysconfdir: /etc/httpd/conf - datadir: /usr/share/httpd - installbuilddir: /usr/lib/httpd/build - errordir: /usr/share/httpd/error - iconsdir: /usr/share/httpd/icons - htdocsdir: /srv/http - manualdir: /usr/share/httpd/manual - cgidir: /srv/http/cgi-bin - includedir: /usr/include/httpd - localstatedir: /var - runtimedir: /var/run/httpd - logfiledir: /var/log/httpd - proxycachedir: /var/cache/httpd - \ No newline at end of file diff --git a/abs/core-testing/apache/httpd b/abs/core-testing/apache/httpd deleted file mode 100755 index 6fa9c3c..0000000 --- a/abs/core-testing/apache/httpd +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -daemon_name=httpd - -. /etc/rc.conf -. /etc/rc.d/functions - -APACHECTL=/usr/sbin/apachectl - -case "$1" in - start) - stat_busy "Starting Apache Web Server" - [ ! -d /var/run/httpd ] && install -d /var/run/httpd - if $APACHECTL start >/dev/null ; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Apache Web Server" - if $APACHECTL stop >/dev/null ; then - rm_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - reload) - stat_busy "Reloading Apache Web Server" - if $APACHECTL graceful >/dev/null ; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - restart) - stat_busy "Restarting Apache Web Server" - if $APACHECTL restart >/dev/null ; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - status) - stat_busy "Checking Apache Web Server status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|reload|restart|status}" -esac - -exit 0 diff --git a/abs/core-testing/apache/httpd.logrotate b/abs/core-testing/apache/httpd.logrotate deleted file mode 100644 index a723d20..0000000 --- a/abs/core-testing/apache/httpd.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/httpd/*log { - missingok - postrotate - /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true - endscript -} diff --git a/abs/core-testing/apr-util/PKGBUILD b/abs/core-testing/apr-util/PKGBUILD deleted file mode 100644 index b44720c..0000000 --- a/abs/core-testing/apr-util/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 72241 2010-03-13 20:27:07Z jgc $ -# Maintainer: Jan de Groot -# Maintainer: Pierre Schmitz - -pkgname=apr-util -pkgver=1.3.9 -pkgrel=4 -pkgdesc="The Apache Portable Runtime" -arch=('i686' 'x86_64') -url="http://apr.apache.org/" -depends=('apr>=1.4.2' 'gdbm' 'expat' 'db>=4.8' 'libldap' 'unixodbc') -options=('!libtool') -license=('APACHE') -source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") -md5sums=('29dd557f7bd891fc2bfdffcfa081db59') - -build() { - cd "${srcdir}/apr-util-${pkgver}" - - ./configure --prefix=/usr --with-apr=/usr \ - --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \ - --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/abs/core-testing/apr/PKGBUILD b/abs/core-testing/apr/PKGBUILD deleted file mode 100644 index b0d3f4d..0000000 --- a/abs/core-testing/apr/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 72235 2010-03-13 20:22:25Z jgc $ -# Maintainer: Jan de Groot -# Contributor: Andrea Scarpino -# Contributor: Pierre Schmitz - -pkgname=apr -pkgver=1.4.2 -pkgrel=1 -pkgdesc="The Apache Portable Runtime" -arch=('i686' 'x86_64') -url="http://apr.apache.org/" -depends=('util-linux-ng>=2.16') -options=('!libtool') -license=('APACHE') -source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2) -md5sums=('4b00e8f70c067893d075577962656b35') - -build() { - cd "${srcdir}/apr-${pkgver}" - export apr_cv_epoll_create1=no - export apr_cv_dup3=no - export apr_cv_accept4=no - export apr_cv_sock_cloexec=no - - ./configure --prefix=/usr --includedir=/usr/include/apr-1 \ - --with-installbuilddir=/usr/share/apr-1/build \ - --enable-nonportable-atomics \ - --with-devrandom=/dev/urandom || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/abs/core-testing/aspell/PKGBUILD b/abs/core-testing/aspell/PKGBUILD deleted file mode 100644 index 8d584b9..0000000 --- a/abs/core-testing/aspell/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 19099 2008-11-14 21:50:10Z thayer $ -# Contributor: Jochem Kossen -# Contributor: dorphell -# Maintainer: Thayer Williams - -pkgname=aspell -pkgver=0.60.6 -_pkgmajorver=0.60 -pkgrel=4 -pkgdesc="A spell checker designed to eventually replace Ispell" -url="http://aspell.net/" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('gcc-libs' 'ncurses>=5.6-7') -optdepends=('perl: to import old dictionaries') -options=(!libtool) -install=aspell.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('bc80f0198773d5c05086522be67334eb') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - ln -s ${pkgname}-${_pkgmajorver} ${pkgdir}/usr/lib/${pkgname} || return 1 - - # cleanup info files - rm ${pkgdir}/usr/share/info/dir || return 1 - gzip ${pkgdir}/usr/share/info/* || return 1 -} diff --git a/abs/core-testing/aspell/aspell.install b/abs/core-testing/aspell/aspell.install deleted file mode 100644 index 2747f02..0000000 --- a/abs/core-testing/aspell/aspell.install +++ /dev/null @@ -1,23 +0,0 @@ -infodir=/usr/share/info -filelist=(aspell.info aspell-dev.info) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done - echo "==> aspell comes with no default dictionary" -} - -post_upgrade() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/core-testing/atk/PKGBUILD b/abs/core-testing/atk/PKGBUILD deleted file mode 100644 index 304d2c8..0000000 --- a/abs/core-testing/atk/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 74174 2010-03-30 17:11:38Z ibiru $ -# Maintainer: Jan de Groot -pkgname=atk -pkgver=1.30.0 -pkgrel=1 -pkgdesc="A library providing a set of interfaces for accessibility" -arch=(i686 x86_64) -license=('LGPL') -depends=('glib2>=2.24') -makedepends=('pkgconfig' 'gobject-introspection') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.30/${pkgname}-${pkgver}.tar.bz2) -url='http://www.gtk.org/' -sha256sums=('92b9b1213cafc68fe9c3806273b968c26423237d7b1f631dd83dc5270b8c268c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/abs/core-testing/atl1e/PKGBUILD b/abs/core-testing/atl1e/PKGBUILD deleted file mode 100644 index 64acdfe..0000000 --- a/abs/core-testing/atl1e/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $ -# Maintainer: Cecil Watson - -pkgname=atl1e -_kernver=2.6.28-LinHES -pkgver=1 -pkgrel=1 -pkgdesc="AR81 Family Linux wireless drivers" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://partner.atheros.com/Drivers.aspx" -depends=('kernel26') -makedepends=(kernel-headers) -install=atl1e.install -source=('ftp://ftp.knoppmyth.net/R6/sources/AR81Family-Linux-v1.0.1.9.tar.gz') - -build() { - cd $startdir/src/src/ - mkdir -p $pkgdir/lib/modules/$(uname -r)/kernel/drivers/net/atl1e - mkdir -p $pkgdir/usr/man/man/man7 - make KERNDIR=/lib/modules/$_kernver/build \ - INSTDIR=$startdir/pkg KERNELRELEASE=$_kernver || return 1 - make KERNDIR=/lib/modules/$_kernver/build \ - INSTDIR=$startdir/pkg/lib/modules/$(uname -r)/kernel/drivers/net/atl1e KERNELRELEASE=$_kernver install || return 1 - install -D -m 644 atl1e.7.gz $pkgdir/usr/man/man/man7/atl1e.7.gz -} -md5sums=('0d07d98e8941da5232768a154de183fa') diff --git a/abs/core-testing/atl1e/atl1e.install b/abs/core-testing/atl1e/atl1e.install deleted file mode 100644 index 7ae7ed0..0000000 --- a/abs/core-testing/atl1e/atl1e.install +++ /dev/null @@ -1,23 +0,0 @@ -# arg 1: the new package version -post_install() { - KERNEL_VERSION='2.6.28-LinHES' - depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - KERNEL_VERSION='2.6.28-LinHES' - depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 - -} - -# arg 1: the old package version -post_remove() { - KERNEL_VERSION='2.6.28-LinHES' - depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 -} - -op=$1 -shift -$op $* diff --git a/abs/core-testing/attr/PKGBUILD b/abs/core-testing/attr/PKGBUILD deleted file mode 100644 index 3100b24..0000000 --- a/abs/core-testing/attr/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Tobias Powalowski -pkgname=attr -pkgver=2.4.41 -pkgrel=10 -pkgdesc="Extended attribute support library for ACL support" -arch=(i686 x86_64) -url="http://oss.sgi.com/projects/xfs/" -license=('LGPL') -groups=('base') -depends=('glibc') -makedepends=('gettext') -replaces=('xfsattr') -provides=('xfsattr') -conflicts=('xfsattr') -options=('!libtool') -source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_${pkgver}-1.tar.gz) -md5sums=('867eb6e8863e39900382d77e2b538696') - -build() { - cd $startdir/src/attr-$pkgver - autoconf - ./configure --prefix=/usr - sed -i -e 's/man2//g' man/Makefile - make || return 1 - make prefix=${startdir}/pkg/usr install install-lib install-dev - - # tidy up - cd "${startdir}/pkg" - - mkdir -v lib - mv -v usr/lib/libattr.so* lib/ - ln -sv ../../lib/libattr.so.1 usr/lib/libattr.so - - mv -v usr/libexec/libattr.{a,la} usr/lib/ - rm -rvf usr/libexec -} diff --git a/abs/core-testing/audiofile/PKGBUILD b/abs/core-testing/audiofile/PKGBUILD deleted file mode 100644 index ca3fd82..0000000 --- a/abs/core-testing/audiofile/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: dorphell -pkgname=audiofile -pkgver=0.2.6 -pkgrel=3 -pkgdesc="Silicon Graphics Audio File Library" -url="http://www.68k.org/~michael/audiofile/" -arch=('i686') -depends=(glibc) -source=( http://altruistic.lbl.gov/mirrors/gnome/platform/2.7/2.7.2/sources/audiofile-0.2.6.tar.gz - aclocal-fixes.patch) -md5sums=(9c1049876cd51c0f1b12c2886cce4d42 a4c04c757d6b0a049c6fce6b64e9a17b) - -build() { - cd $startdir/src/$pkgname-$pkgver - patch -Np0 -i ${startdir}/src/aclocal-fixes.patch || return 1 - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install - find $startdir/pkg -name '*.la' -exec rm {} \; -} diff --git a/abs/core-testing/audiofile/aclocal-fixes.patch b/abs/core-testing/audiofile/aclocal-fixes.patch deleted file mode 100644 index ef4d258..0000000 --- a/abs/core-testing/audiofile/aclocal-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- audiofile.m4.orig 2006-03-05 13:06:01.000000000 +0000 -+++ audiofile.m4 2006-03-05 13:06:17.000000000 +0000 -@@ -9,7 +9,7 @@ - dnl AM_PATH_AUDIOFILE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) - dnl Test for Audio File Library, and define AUDIOFILE_CFLAGS and AUDIOFILE_LIBS. - dnl --AC_DEFUN(AM_PATH_AUDIOFILE, -+AC_DEFUN([AM_PATH_AUDIOFILE], - [dnl - dnl Get compiler flags and libraries from the audiofile-config script. - dnl diff --git a/abs/core-testing/aufs2-util/PKGBUILD b/abs/core-testing/aufs2-util/PKGBUILD deleted file mode 100644 index 0690bba..0000000 --- a/abs/core-testing/aufs2-util/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 80416 2010-05-17 08:02:02Z tpowa $ -# Contributor: Paul Mattal -# Maintainer: Paul Mattal -pkgname=aufs2-util -pkgver=20100517 -pkgrel=1 -pkgdesc="Another Unionfs Implementation that supports NFS branches" -arch=('i686' 'x86_64') -url="http://aufs.sourceforge.net/" -license=('GPL2') -depends=('glibc') -makedepends=('aufs2>=2.6.34_20100517' 'kernel26-headers') -replaces=('aufs-utils') -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz") - -build() { - cd $srcdir/$pkgname-$pkgver - make || return 1 -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install || return 1 -} -md5sums=('1541729832ead247953b09dd5cc40883') diff --git a/abs/core-testing/aufs2-util/create-tarball.sh b/abs/core-testing/aufs2-util/create-tarball.sh deleted file mode 100755 index dd59212..0000000 --- a/abs/core-testing/aufs2-util/create-tarball.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -GITSNAPSHOT=20100517 -# aufs2 (no -xx) for the latest -rc version. -git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git aufs2-util.git -cd aufs2-util.git -#git checkout origin/aufs2${AUFS2VERSION} -git checkout -cd .. -rm -rf aufs2-util-${GITSNAPSHOT} -cp -a aufs2-util.git aufs2-util-${GITSNAPSHOT} -tar -czf aufs2-util-${GITSNAPSHOT}.tar.gz --exclude=.git aufs2-util-${GITSNAPSHOT} diff --git a/abs/core-testing/aufs2/PKGBUILD b/abs/core-testing/aufs2/PKGBUILD deleted file mode 100644 index 21037ef..0000000 --- a/abs/core-testing/aufs2/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 80414 2010-05-17 07:59:57Z tpowa $ -# Maintainer: Paul Mattal - -pkgname=aufs2 -pkgver=2.6.34_20100517 -pkgrel=1 -#_kernver=${pkgver%_*}-ARCH -_kernver=2.6.34-LinHES -pkgdesc="Another Unionfs Implementation" -arch=('i686' 'x86_64') -url="http://aufs.sourceforge.net/" -license=('GPL2') -depends=('kernel26>=2.6.34' 'kernel26<2.6.35') -makedepends=('linux-api-headers>=2.6.34' 'linux-api-headers<2.6.35') -replaces=('aufs') -install=${pkgname}.install -source=("ftp://ftp.archlinux.org/other/aufs2/${pkgname}-${pkgver}.tar.gz") -options=('!makeflags') -md5sums=('271f07ac41e07cb7c30ff29bee8087fa') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's|CONFIG_AUFS_HNOTIFY =.*|CONFIG_AUFS_HNOTIFY = y|' \ - config.mk || return 1 - sed -i 's|CONFIG_AUFS_HFSNOTIFY =.*|CONFIG_AUFS_HFSNOTIFY = y|' \ - config.mk || return 1 - sed -i 's|CONFIG_AUFS_EXPORT =.*|CONFIG_AUFS_EXPORT = y|' \ - config.mk || return 1 - sed -i 's|CONFIG_AUFS_SHWH =.*|CONFIG_AUFS_SHWH = y|' \ - config.mk || return 1 - sed -i 's|CONFIG_AUFS_BDEV_LOOP =.*|CONFIG_AUFS_BDEV_LOOP = y|' \ - config.mk || return 1 - sed -i 's|CONFIG_AUFS_BR_RAMFS =.*|CONFIG_AUFS_BR_RAMFS = y|' \ - config.mk || return 1 - sed -i 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' \ - config.mk || return 1 - if [ "${CARCH}" = "x86_64" ]; then - inot64=" y" - else - inot64="" - fi - sed -i "s|CONFIG_AUFS_INO_T_64 =.*|CONFIG_AUFS_INO_T_64 =${inot64}|" \ - config.mk || return 1 - # build - make KDIR=/usr/src/linux-${_kernver} || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - install -D -m644 fs/aufs/aufs.ko \ - $pkgdir/lib/modules/${_kernver}/kernel/fs/aufs/aufs.ko || return 1 - # tweak the install script for the right kernel version - sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ - $startdir/$pkgname.install || return 1 - # install include files - install -D -m 644 include/linux/aufs_type.h $pkgdir/usr/src/linux-$_kernver/include/linux/aufs_type.h || return 1 -} -md5sums=('421c5ca3d4d917f92f7c0508a16f8177') diff --git a/abs/core-testing/aufs2/aufs2.install b/abs/core-testing/aufs2/aufs2.install deleted file mode 100644 index 0f4de97..0000000 --- a/abs/core-testing/aufs2/aufs2.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - KERNEL_VERSION=2.6.34-LinHES - depmod $KERNEL_VERSION -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/abs/core-testing/aufs2/create-tarball.sh b/abs/core-testing/aufs2/create-tarball.sh deleted file mode 100755 index c196c68..0000000 --- a/abs/core-testing/aufs2/create-tarball.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -AUFS2VERSION="-34" -KERNELVERSION=2.6.34 -GITSNAPSHOT=20100517 -# aufs2 (no -xx) for the latest -rc version. -git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2-standalone.git -cd aufs2-standalone.git -#git checkout origin/aufs2${AUFS2VERSION} -git checkout origin/aufs2 -#*** apply "aufs2-base.patch" and "aufs2-standalone.patch" to your kernel source files. -cd .. -rm -rf aufs2-${KERNELVERSIN}_${GITSNAPSHOT} -cp -a aufs2-standalone.git aufs2-${KERNELVERSION}_${GITSNAPSHOT} -tar -czf aufs2-${KERNELVERSION}_${GITSNAPSHOT}.tar.gz --exclude=.git aufs2-${KERNELVERSION}_${GITSNAPSHOT} diff --git a/abs/core-testing/aumix/PKGBUILD b/abs/core-testing/aumix/PKGBUILD deleted file mode 100644 index 09b525a..0000000 --- a/abs/core-testing/aumix/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# Contributor: Stefan Husmann - -pkgname=aumix -pkgver=2.8 -pkgrel=4 -pkgdesc="A color text mode sound mixer with GPM support" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.jpj.net/~trevor/aumix.html" -depends=('gpm') -conflicts=('aumix-gtk') -provides=('aumix-gtk') -source=(http://jpj.net/~trevor/aumix/aumix-$pkgver.tar.bz2 aumix.patch) -md5sums=('dc3fc7209752207c23e7c94ab886b340' 'a4dae53812a41b7576228c37856c701b') - -build() { - cd $startdir/src/$pkgname-$pkgver - patch -Np1 <../aumix.patch || return 1 - # we build without X/GTK support so we can avoid the dependencies. - # if you want GTK support, you can rebuild aumix from your ABS tree. - ./configure --prefix=/usr --without-alsa --without-gtk --without-gtk1 || return 1 - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 -} diff --git a/abs/core-testing/aumix/aumix.patch b/abs/core-testing/aumix/aumix.patch deleted file mode 100644 index 2cf645f..0000000 --- a/abs/core-testing/aumix/aumix.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -Nru aumix-2.7/Makefile.in aumix-2.7-new/Makefile.in ---- aumix-2.7/Makefile.in Tue Jun 27 07:51:42 2000 -+++ aumix-2.7-new/Makefile.in Fri Oct 5 18:29:37 2001 -@@ -102,7 +102,7 @@ - all: all-redirect - .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile -+ cd $(top_srcdir) - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ -@@ -114,7 +114,7 @@ - config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) -- cd $(srcdir) && $(AUTOCONF) -+ cd $(srcdir) - - config.h: stamp-h - @if test ! -f $@; then \ -@@ -132,7 +132,7 @@ - $(MAKE) $(srcdir)/stamp-h.in; \ - else :; fi - $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h -- cd $(top_srcdir) && $(AUTOHEADER) -+ cd $(top_srcdir) - @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null - - mostlyclean-hdr: -diff -Nru aumix-2.7/src/Makefile.in aumix-2.7-new/src/Makefile.in ---- aumix-2.7/src/Makefile.in Tue Jun 27 07:51:42 2000 -+++ aumix-2.7-new/src/Makefile.in Fri Oct 5 18:30:02 2001 -@@ -123,8 +123,6 @@ - all: all-redirect - .SUFFIXES: - .SUFFIXES: .S .c .o .s --$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - diff --git a/abs/core-testing/autoconf/PKGBUILD b/abs/core-testing/autoconf/PKGBUILD deleted file mode 100644 index 1ac8ed6..0000000 --- a/abs/core-testing/autoconf/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 12545 2008-09-15 12:33:36Z andyrtr $ -# Maintainer: Andreas Radke - -pkgname=autoconf -pkgver=2.66 -pkgrel=1 -pkgdesc="A GNU tool for automatically configuring source code" -arch=(i686 x86_64) -license=('GPL2' 'GPL3') -url="http://www.gnu.org/software/autoconf" -groups=('base-devel') -depends=('awk' 'm4' 'diffutils' 'bash') -install=autoconf.install -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - rm -f ${pkgdir}/usr/share/info/dir - # conflict with bintuils - rm -f ${pkgdir}/usr/share/info/standards.info -} -md5sums=('fb00d77cbc468994c55919298af1ff02') diff --git a/abs/core-testing/autoconf/autoconf.install b/abs/core-testing/autoconf/autoconf.install deleted file mode 100644 index 6440ec6..0000000 --- a/abs/core-testing/autoconf/autoconf.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(autoconf.info) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/core-testing/automake/PKGBUILD b/abs/core-testing/automake/PKGBUILD deleted file mode 100644 index 0b3a6f2..0000000 --- a/abs/core-testing/automake/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 19545 2008-11-26 18:00:03Z andyrtr $ -# Contributor: judd -# Maintainer: Andreas Radke - -pkgname=automake -pkgver=1.11.1 -pkgrel=1 -pkgdesc="A GNU tool for automatically creating Makefiles" -arch=(i686 x86_64) -license=('GPL') -url="http://www.gnu.org/software/automake" -groups=('base-devel') -depends=('perl' 'bash' 'texinfo' 'autoconf>=2.60') -install=automake.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - - rm -f ${pkgdir}/usr/share/info/dir -} -md5sums=('4ee7f0ff5f0e467d58b6bd5da96b1c74') diff --git a/abs/core-testing/automake/automake.install b/abs/core-testing/automake/automake.install deleted file mode 100644 index a1030e5..0000000 --- a/abs/core-testing/automake/automake.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(automake.info automake.info-1 automake.info-2) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/core-testing/avahi/ChangeLog b/abs/core-testing/avahi/ChangeLog deleted file mode 100644 index 57984a3..0000000 --- a/abs/core-testing/avahi/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ - -2009-04-23 Douglas Soares de Andrade - - * Updated for i686: 0.6.25 - -2009-03-21 Eric Belanger - - * Added optdepends for avahi-discover (close FS#11250) - -2009-01-04 Douglas Soares de Andrade - - * Updated for i686: 0.6.24 - -2008-07-22 Douglas Soares de Andrade - - * Updated for i686: 0.6.23 - diff --git a/abs/core-testing/avahi/PKGBUILD b/abs/core-testing/avahi/PKGBUILD deleted file mode 100644 index f3d15bf..0000000 --- a/abs/core-testing/avahi/PKGBUILD +++ /dev/null @@ -1,71 +0,0 @@ -# $Id: PKGBUILD 70504 2010-02-27 03:24:54Z dgriffiths $ -# Contributor: Douglas Soares de Andrade - -pkgname=avahi -pkgver=0.6.25 -pkgrel=3 -pkgdesc="A multicast/unicast DNS-SD framework" -arch=('i686' 'x86_64') -url="http://www.avahi.org/" -license=('LGPL') -depends=('dbus>=1.1.20-1' 'libcap>=2.16' 'libdaemon>=0.11' 'gdbm' 'glib2' 'expat') -optdepends=('qt3: Qt3 UI support' - 'libglade: avahi-discover-standalone' - 'nss-mdns: NSS support for mDNS' - 'pygtk: avahi-discover' - 'dbus-python: avahi-discover') -makedepends=('mono' 'pygtk' 'gtk-sharp-2' 'dbus-python' 'qt3' 'libglade' 'intltool') -backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service) -install=avahi.install -conflicts=('howl' 'mdnsresponder') -provides=('howl' 'mdnsresponder') -replaces=('howl' 'mdnsresponder') -options=('!libtool') -source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz gnome-nettool.png avahi-daemon-dbus.patch) - -build() { - [ -z "${QTDIR}" ] && . /etc/profile.d/qt3.sh - export MONO_SHARED_DIR=${srcdir}/.wabi - mkdir -p ${MONO_SHARED_DIR} - - cd ${srcdir}/${pkgname}-${pkgver} - - sed -i 's|Requires.private|Requires|' avahi-qt3.pc.in - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-qt4 \ - --disable-monodoc \ - --disable-doxygen-doc \ - --disable-xmltoman \ - --enable-compat-libdns_sd \ - --enable-compat-howl \ - --with-distro=archlinux \ - --with-avahi-priv-access-group=network \ - --enable-autoipd \ - --with-autoipd-user=avahi \ - --with-autoipd-group=avahi - - make || return 1 - make DESTDIR=${pkgdir} install - - rm -rf ${MONO_SHARED_DIR} - - sed -i -e 's/netdev/network/g' ${pkgdir}/etc/dbus-1/system.d/avahi-dbus.conf - - # howl and mdnsresponder compatability - cd ${pkgdir}/usr/include - ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h - ln -s avahi-compat-howl howl - cd ${pkgdir}/usr/lib/pkgconfig - ln -s avahi-compat-howl.pc howl.pc - mkdir -p ${pkgdir}/usr/share/pixmaps - install -m 644 ${srcdir}/gnome-nettool.png ${pkgdir}/usr/share/pixmaps/gnome-nettool.png - - cd ${pkgdir} - patch -p0 < ${srcdir}/avahi-daemon-dbus.patch || return 1 -} -md5sums=('a83155a6e29e3988f07e5eea3287b21e' - '42c2905307c7a5dc6ac4b75f4c3d65a3' - '0e1f5900b56fcfa1bffddb4f233f539f') diff --git a/abs/core-testing/avahi/avahi-daemon-dbus.patch b/abs/core-testing/avahi/avahi-daemon-dbus.patch deleted file mode 100644 index fe82f41..0000000 --- a/abs/core-testing/avahi/avahi-daemon-dbus.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- etc/rc.d/avahi-daemon 2010-02-26 21:10:30.000000000 -0600 -+++ etc/rc.d/avahi-daemon 2010-02-26 21:09:44.000000000 -0600 -@@ -35,8 +35,11 @@ - - case "$1" in - start) -- stat_busy "Starting $DESC" -- $DAEMON -D > /dev/null 2>&1 -+ if ck_daemon dbus; then -+ /etc/rc.d/dbus start -+ fi -+ stat_busy "Starting $DESC" -+ modprobe capability > /dev/null 2>&1 ; $DAEMON -D > /dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else diff --git a/abs/core-testing/avahi/avahi.install b/abs/core-testing/avahi/avahi.install deleted file mode 100644 index f0beca8..0000000 --- a/abs/core-testing/avahi/avahi.install +++ /dev/null @@ -1,42 +0,0 @@ -post_install() { - echo -n "adding avahi system group... " - groupadd -g 84 avahi && echo "done." - echo -n "adding avahi system user... " - useradd -c "Avahi daemon" -u 84 -d / -g avahi -s /bin/false avahi \ - && echo "done." - passwd -l avahi &>/dev/null - - post_upgrade - cat << 'EOM' -==> The following daemons may be added to DAEMONS in /etc/rc.conf: - -> avahi-daemon - the mdns responder, you probably want this. - dbus needs to be running when you start it. - -> avahi-dnsconfd - daemon used for peer-to-peer automatic dns - configuration on dhcp-less networks. - -==> To use some of the client applications you will have to install python. - -> In addition, pygtk is required for the graphical ones and - twisted-web for avahi-bookmarks. - -EOM -} - -post_upgrade() { - true -} - -pre_remove() { - # pre_remove gets called whenever post_remove is defined. - true -} - -post_remove() { - # post_remove doesn't start at a newline like the other post_* functions, - # so we'll have to make one for ourselves. - echo -n -e "\nremoving avahi system user... " - userdel avahi && echo "done." -} - -op=$1 -shift -$op $* diff --git a/abs/core-testing/avahi/gnome-nettool.png b/abs/core-testing/avahi/gnome-nettool.png deleted file mode 100644 index 227d067..0000000 Binary files a/abs/core-testing/avahi/gnome-nettool.png and /dev/null differ diff --git a/abs/core-testing/b43-fwcutter/PKGBUILD b/abs/core-testing/b43-fwcutter/PKGBUILD deleted file mode 100644 index a1f73b8..0000000 --- a/abs/core-testing/b43-fwcutter/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Thomas Baechler - -pkgname=b43-fwcutter -pkgver=011 -pkgrel=1 -pkgdesc="firmware extractor for the bcm43xx kernel module" -url="http://linuxwireless.org/en/users/Drivers/b43" -depends=('glibc') -license=('GPL') -arch=('i686' 'x86_64') -source=(http://bu3sch.de/b43/fwcutter/${pkgname}-${pkgver}.tar.bz2) -md5sums=('3db2f4de85a459451f5b391cf67a8d44') - -build() -{ - cd $startdir/src/$pkgname-$pkgver - make || return 1 - install -D -m755 b43-fwcutter $startdir/pkg/usr/bin/b43-fwcutter || return 1 - install -D -m644 b43-fwcutter.1 $startdir/pkg/usr/share/man/man1/b43-fwcutter.1 || return 1 -} diff --git a/abs/core-testing/base.list b/abs/core-testing/base.list deleted file mode 100755 index 004186f..0000000 --- a/abs/core-testing/base.list +++ /dev/null @@ -1,98 +0,0 @@ -base acl -base attr -base bash -base binutils -base bzip2 -base ca-certificates -base coreutils -base cpio -base cracklib -base cryptsetup -base dash -base db -base dcron -base device-mapper -base dhcpcd -base dialog -base dmapi -base e2fsprogs -base file -base filesystem -base findutils -base gawk -base gcc-libs -base gdbm -base gen-init-cpio -base gettext -base glibc -base grep -base groff -base grub -base gzip -base hdparm -base hwdetect -base initscripts -base iputils -base jfsutils -base kbd -base kernel-headers -base kernel26 -base klibc -base klibc-extras -base klibc-kbd -base klibc-module-init-tools -base klibc-udev -base less -base libarchive -base libdownload -base libgcrypt -base libgpg-error -base libpcap -base libusb -base licenses -base logrotate -base lvm2 -base lzo2 -base mailx -base man -base man-pages -base mdadm -base mkinitcpio -base mlocate -base module-init-tools -base nano -base ncurses -base net-tools -base openssl -base pacman -base pam -base pciutils -base pcmciautils -base pcre -base perl -base popt -base ppp -base procinfo -base procps -base psmisc -base readline -base reiserfsprogs -base rp-pppoe -base sdparm -base sed -base shadow -base sysfsutils -base syslog-ng -base sysvinit -base tar -base tcp_wrappers -base tzdata -base udev -base usbutils -base util-linux-ng -base vi -base wget -base which -base wpa_supplicant -base xfsprogs -base zlib diff --git a/abs/core-testing/bash/PKGBUILD b/abs/core-testing/bash/PKGBUILD deleted file mode 100644 index 96c24a1..0000000 --- a/abs/core-testing/bash/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 82719 2010-06-16 04:44:35Z allan $ -# Maintainer: Aaron Griffin - -pkgname=bash -_patchlevel=007 #prepare for some patches -pkgver=4.1.$_patchlevel -pkgrel=1 -pkgdesc="The GNU Bourne Again shell" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnu.org/software/bash/bash.html" -groups=('base') -backup=(etc/profile.bash etc/skel/.bashrc etc/skel/.bash_profile) -depends=('readline>=6.1' 'glibc') -makedepends=(gzip) -provides=('sh') -install=bash.install -source=(http://ftp.gnu.org/gnu/bash/bash-4.1.tar.gz - profile.bash - bashrc - enable-system-config-files.patch - system.bashrc) -if [ $_patchlevel -gt 000 ]; then - for (( p=1; p<=$_patchlevel; p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-$(printf "%03d" $p)) - done -fi - -build() { - cd ${srcdir}/${pkgname}-4.1 - for p in ../bash41-*; do - [ -e "$p" ] || continue - msg "applying patch ${p}" - patch -Np0 -i ${p} || return 1 - done - - patch -Np0 -i $srcdir/enable-system-config-files.patch || return 1 - - ./configure --prefix=/usr --with-curses --enable-readline \ - --without-bash-malloc --with-installed-readline \ - --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info - make || return 1 - make DESTDIR=${pkgdir} install - - install -D -m644 ${srcdir}/profile.bash ${pkgdir}/etc/profile.bash || return 1 - install -D -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc || return 1 - - # for now, bash is our default /bin/sh - cd ${pkgdir}/bin - ln -s bash sh - - mkdir -p ${pkgdir}/etc/skel/ - install -D -m644 ${srcdir}/bashrc ${pkgdir}/etc/skel/.bashrc - echo ". \$HOME/.bashrc" >${pkgdir}/etc/skel/.bash_profile -} - -md5sums=('9800d8724815fd84994d9be65ab5e7b8' - '17f20ec69535a2f50f2112a8c700630d' - '3d2837e84645eac9bde399b58014bafa' - '51725defa4c2dec49c1bc15883e0bee2' - '196697769f1667a8a1aed608811129c6' - '582dea5671b557f783e18629c2f77b68' - '118d465095d4a4706eb1d34696a2666a' - '120f7cf039a40d35fe375e59d6f17adc' - '336ee037fc2cc1e2350b05097fbdc87c' - '9471e666797f0b03eb2175ed752a9550' - 'fb80ccd58cb1e34940f3adf4ce6e4a1e' - '192a8b161d419a1d0d211169f1d1046e') - diff --git a/abs/core-testing/bash/bash.install b/abs/core-testing/bash/bash.install deleted file mode 100644 index 5c3c435..0000000 --- a/abs/core-testing/bash/bash.install +++ /dev/null @@ -1,21 +0,0 @@ -info_dir=/usr/share/info -info_files=(bash.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} -# vim:set ts=2 sw=2 et: diff --git a/abs/core-testing/bash/bashrc b/abs/core-testing/bash/bashrc deleted file mode 100644 index 0963431..0000000 --- a/abs/core-testing/bash/bashrc +++ /dev/null @@ -1,6 +0,0 @@ - -# Check for an interactive session -[ -z "$PS1" ] && return - -alias ls='ls --color=auto' -PS1='[\u@\h \W]\$ ' diff --git a/abs/core-testing/bash/enable-system-config-files.patch b/abs/core-testing/bash/enable-system-config-files.patch deleted file mode 100644 index 5295355..0000000 --- a/abs/core-testing/bash/enable-system-config-files.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/bash-4.0/config-top.h 2009-01-04 11:32:23.000000000 -0800 -+++ config-top.h 2009-08-25 08:41:08.000000000 -0700 -@@ -75,10 +75,10 @@ - #define KSH_COMPATIBLE_SELECT - - /* System-wide .bashrc file for interactive shells. */ --/* #define SYS_BASHRC "/etc/bash.bashrc" */ -+#define SYS_BASHRC "/etc/bash.bashrc" - - /* System-wide .bash_logout for login shells. */ --/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ -+#define SYS_BASH_LOGOUT "/etc/bash.bash_logout" - - /* Define this to make non-interactive shells begun with argv[0][0] == '-' - run the startup files when not in posix mode. */ diff --git a/abs/core-testing/bash/profile.bash b/abs/core-testing/bash/profile.bash deleted file mode 100644 index d28f069..0000000 --- a/abs/core-testing/bash/profile.bash +++ /dev/null @@ -1,11 +0,0 @@ -# -# /etc/profile.bash -# Global settings for bash shells -# - -#In the future we may want to add more ulimit entries here, -# in the offchance that /etc/security/limits.conf is skipped -ulimit -Sc 0 #Don't create core files - -# Source our global bashrc file, to remove duplication of effort -[ -r /etc/bash.bashrc ] && . /etc/bash.bashrc diff --git a/abs/core-testing/bash/system.bashrc b/abs/core-testing/bash/system.bashrc deleted file mode 100644 index 5430d6b..0000000 --- a/abs/core-testing/bash/system.bashrc +++ /dev/null @@ -1,31 +0,0 @@ -# -# /etc/bash.bashrc -# -# This file is the systemwide bashrc file. While most of the -# environment is preserved when running an interactive shell -# the PS[1-4] variables, aliases and functions are reset. -# -# When running a non-login shell, apply the following settings: -# - Prompt defaults (PS[1-4], PROMPT_COMMAND) -# - bash_completion if it exists -# - source /etc/bash.bashrc.local - -PS1='[\u@\h \W]\$ ' -PS2='> ' -PS3='> ' -PS4='+ ' - -export PS1 PS2 PS3 PS4 - -if test "$TERM" = "xterm" -o \ - "$TERM" = "xterm-color" -o \ - "$TERM" = "xterm-256color" -o \ - "$TERM" = "rxvt" -o \ - "$TERM" = "rxvt-unicode" -o \ - "$TERM" = "xterm-xfree86"; then - PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"' - export PROMPT_COMMAND -fi - -[ -r /etc/bash_completion ] && . /etc/bash_completion -[ -r /etc/bash.bashrc.local ] && . /etc/bash.bashrc.local diff --git a/abs/core-testing/bc/PKGBUILD b/abs/core-testing/bc/PKGBUILD deleted file mode 100644 index 1ecefa1..0000000 --- a/abs/core-testing/bc/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 58247 2009-11-06 14:41:31Z eric $ -# Maintainer: dorphell - -pkgname=bc -pkgver=1.06 -pkgrel=7 -pkgdesc="An arbitrary precision calculator language" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/bc/" -license=('GPL') -depends=('readline') -replaces=('bc-readline') -conflicts=('bc-readline') -install=bc.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz - build-fix.patch bc-1.06-info-dir-entry.patch) -md5sums=('d44b5dddebd8a7a7309aea6c36fda117' 'fc7ecbd9e55ef04c6d3a495692626116'\ - 'b6fe9869830aca0d34badf810fe0cfb3') -sha1sums=('c8f258a7355b40a485007c40865480349c157292' '3af67c59e2232b9329ff0c1cf49d1a8a1cf87cd7'\ - 'c15c2a301ba80cf4d3c03a6e164f4e57fa86e4a2') - -build() { - CFLAGS="$CFLAGS -O3" - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/build-fix.patch" || return 1 - patch -p1 -i "${srcdir}/bc-1.06-info-dir-entry.patch" || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man \ - --infodir=/usr/share/info --with-readline || return 1 - make LEX="flex -I" || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/abs/core-testing/bc/bc-1.06-info-dir-entry.patch b/abs/core-testing/bc/bc-1.06-info-dir-entry.patch deleted file mode 100644 index 8c1344c..0000000 --- a/abs/core-testing/bc/bc-1.06-info-dir-entry.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bc-1.06/doc/bc.info.info-dir-entry 2000-10-03 20:36:31.000000000 +0200 -+++ bc-1.06/doc/bc.info 2003-01-06 14:07:40.000000000 +0100 -@@ -1,5 +1,8 @@ - This is bc.info, produced by makeinfo version 4.0 from bc.texi. - -+START-INFO-DIR-ENTRY -+* bc: (bc). Arbritrary precision calculator language. -+END-INFO-DIR-ENTRY -  - File: bc.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) - diff --git a/abs/core-testing/bc/bc.install b/abs/core-testing/bc/bc.install deleted file mode 100644 index e1e2eaa..0000000 --- a/abs/core-testing/bc/bc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(bc.info.gz dc.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/abs/core-testing/bc/build-fix.patch b/abs/core-testing/bc/build-fix.patch deleted file mode 100644 index 98a4082..0000000 --- a/abs/core-testing/bc/build-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -wbBur bc-1.06/bc/scan.l bc-1.06.my/bc/scan.l ---- bc-1.06/bc/scan.l 2000-09-13 22:25:47 +0400 -+++ bc-1.06.my/bc/scan.l 2006-12-25 12:39:34 +0300 -@@ -143,7 +143,9 @@ - - /* Definitions for readline access. */ - extern FILE *rl_instream; -+#if 0 - _PROTOTYPE(char *readline, (char *)); -+#endif - - /* rl_input puts upto MAX characters into BUF with the number put in - BUF placed in *RESULT. If the yy input file is the same as diff --git a/abs/core-testing/bigreqsproto/PKGBUILD b/abs/core-testing/bigreqsproto/PKGBUILD deleted file mode 100644 index 2b2bc95..0000000 --- a/abs/core-testing/bigreqsproto/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -#Maintainer: Jan de Groot - -pkgname=bigreqsproto -pkgver=1.0.2 -pkgrel=1 -pkgdesc="X11 Big Requests extension wire protocol" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -md5sums=('95c29d9d10bf2868996c0c47a3b9a8dc') -sha1sums=('8f6c112f607a137dce5d8958753c770ac3f06c14') - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 -} - diff --git a/abs/core-testing/binutils/PKGBUILD b/abs/core-testing/binutils/PKGBUILD deleted file mode 100644 index 0ec1438..0000000 --- a/abs/core-testing/binutils/PKGBUILD +++ /dev/null @@ -1,74 +0,0 @@ -# $Id: PKGBUILD 80784 2010-05-22 08:05:08Z allan $ -# Maintainer: Allan McRae - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=binutils -pkgver=2.20.1 -pkgrel=3 -_date=20100521 -pkgdesc="A set of programs to assemble and manipulate binary and object files" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -groups=('base') -depends=('glibc>=2.12-1' 'zlib') -options=('!libtool' '!distcc' '!ccache') -install=binutils.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -md5sums=('67053ffd8582e646e171fccd55b2f0f6') - -mksource() { - mkdir ${pkgname}-${_date} - cd ${pkgname}-${_date} - export _TAG=binutils-2_20-branch - export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src' - cvs -z9 co -r $_TAG binutils || return 1 - cd src && tar -cvjf ../../binutils-${pkgver}_${_date}.tar.bz2 * -} - -build() { - cd ${srcdir} - mkdir build && cd build - - CC="gcc -L`pwd`/bfd/.libs/" - if [ "${CARCH}" = "x86_64" ]; then - ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-64-bit-bfd --disable-multilib - else - ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared - fi - # fix man files install path - sed -i -e "s:mandir \= \/usr\/share:mandir \= ${pkgdir}\/usr\/share:" ${srcdir}/build/Makefile || return 1 - # fix info files install path - sed -i -e "s:infodir \= \/usr\/share:infodir \= ${pkgdir}\/usr\/share:" ${srcdir}/build/Makefile || return 1 - - # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. - make configure-host || return 1 - - make tooldir=${pkgdir}/usr || return 1 -} - -package() { - cd ${srcdir}/build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - install -m644 ${srcdir}/include/libiberty.h ${pkgdir}/usr/include - - # Rebuild libiberty.a with -fPIC - make -C libiberty clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty - install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib - - # Rebuild libbfd.a with -fPIC - make -C bfd clean - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd - install -m644 bfd/libbfd.a ${pkgdir}/usr/lib - - rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - - # Remove these symlinks, with binutils prereleases they are not ABI stable. - # Programs should compile static to the .a file. - rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so - echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so - echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so -} diff --git a/abs/core-testing/binutils/binutils.install b/abs/core-testing/binutils/binutils.install deleted file mode 100644 index 51781e7..0000000 --- a/abs/core-testing/binutils/binutils.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=/usr/share/info -filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/abs/core-testing/bison/ChangeLog b/abs/core-testing/bison/ChangeLog deleted file mode 100644 index 20cc7f9..0000000 --- a/abs/core-testing/bison/ChangeLog +++ /dev/null @@ -1,11 +0,0 @@ -2008-12-11 Eric Belanger - - * bison 2.4.1-1 - * Upstream update - -2008-11-08 Eric Belanger - - * bison 2.4-1 - * Upstream update - * Added info file support - * Added ChangeLog diff --git a/abs/core-testing/bison/PKGBUILD b/abs/core-testing/bison/PKGBUILD deleted file mode 100644 index 3172db7..0000000 --- a/abs/core-testing/bison/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 21374 2008-12-12 10:34:44Z eric $ -# Maintainer: Eric Belanger - -pkgname=bison -pkgver=2.4.1 -pkgrel=1 -pkgdesc="The GNU general-purpose parser generator" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnu.org/software/bison/bison.html" -depends=('glibc' 'm4' 'texinfo') -groups=('base-devel') -install=bison.install -source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.gz) -md5sums=('c58aa1da418dc9704070872489e89bf5') -sha1sums=('ecc4139bbd45b73f42f2b04482d77c16534fea28') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --datadir=/usr/share || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - rm ${pkgdir}/usr/share/info/dir || return 1 - gzip ${pkgdir}/usr/share/info/* || return 1 -} diff --git a/abs/core-testing/bison/bison.install b/abs/core-testing/bison/bison.install deleted file mode 100644 index b0cdfe9..0000000 --- a/abs/core-testing/bison/bison.install +++ /dev/null @@ -1,18 +0,0 @@ -infodir=/usr/share/info -filelist=(bison.info.gz) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/abs/core-testing/bzip2/PKGBUILD b/abs/core-testing/bzip2/PKGBUILD deleted file mode 100644 index bd3b1c2..0000000 --- a/abs/core-testing/bzip2/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 7561 2008-08-02 22:14:50Z jgc $ -# Maintainer: Judd - -pkgname=bzip2 -pkgver=1.0.5 -pkgrel=12 -pkgdesc="A high-quality data compression program" -arch=(i686 x86_64) -license=('custom') -url="http://sources.redhat.com/bzip2" -groups=('base') -depends=('glibc') -source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz) - -build() { - cd $startdir/src/$pkgname-$pkgver - mkdir -p $startdir/pkg/bin $startdir/pkg/usr/share/man/man1 - mkdir -p $startdir/pkg/usr/include $startdir/pkg/usr/lib - mkdir -p $startdir/pkg/lib - # add large-file support - sed -e 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' -i ./Makefile-libbz2_so - make -f Makefile-libbz2_so || return 1 - make bzip2recover libbz2.a || return 1 - ln -s libbz2.so.1.0.4 libbz2.so - ln -s libbz2.so.1.0.4 libbz2.so.1 - cp bzip2-shared $startdir/pkg/bin/bzip2 - cp bzip2recover $startdir/pkg/bin - cp bzip2.1 $startdir/pkg/usr/share/man/man1 - mkdir -p $startdir/pkg/usr/include - cp bzlib.h $startdir/pkg/usr/include - cp -a libbz2.so* $startdir/pkg/lib - rm -f $startdir/pkg/usr/lib/libbz2.a - cp libbz2.a $startdir/pkg/usr/lib - cd $startdir/pkg/usr/lib - ln -sf ../../lib/libbz2.so - cd $startdir/pkg/bin - ln -sf bzip2 bunzip2 - ln -sf bzip2 bzcat - cd $startdir/pkg/usr/share/man/man1 - ln -sf bzip2.1 bunzip2.1 - ln -sf bzip2.1 bzcat.1 - ln -sf bzip2.1 bzip2recover.1 - - mkdir -p ${startdir}/pkg/usr/share/licenses/${pkgname} - install -m644 ${startdir}/src/${pkgname}-${pkgver}/LICENSE ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE -} -md5sums=('3c15a0c8d1d3ee1c46a1634d00617b1a') diff --git a/abs/core-testing/ca-certificates/PKGBUILD b/abs/core-testing/ca-certificates/PKGBUILD deleted file mode 100644 index 35b08ca..0000000 --- a/abs/core-testing/ca-certificates/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 15695 2008-10-17 11:18:31Z pierre $ -# Maintainer: Pierre Schmitz - -pkgname=ca-certificates -pkgver=20080809 -pkgrel=30 -pkgdesc='Common CA certificates' -arch=('i686' 'x86_64') -url='http://packages.qa.debian.org/c/ca-certificates.html' -license=('MPL' 'GPL') -source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz") -depends=('bash' 'run-parts' 'openssl' 'findutils' 'coreutils' 'sed') -makedepends=('ruby') -install=ca-certificates.install -backup=('etc/ca-certificates.conf') -md5sums=('c155f5059006b94ad0aea7018161ab37') - -build() { - cd $srcdir/$pkgname - - install -d -m755 $pkgdir/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates}} - install -D -m644 sbin/update-ca-certificates.8 $pkgdir/usr/share/man/man8/update-ca-certificates.8 - make - make install DESTDIR=$pkgdir - - ( - echo "# Automatically generated by ${pkgname}-${pkgver}-${pkgrel}" - echo "# " - cd $pkgdir/usr/share/ca-certificates - find . -name '*.crt' | sort | cut -b3- - ) > $pkgdir/etc/ca-certificates.conf -} diff --git a/abs/core-testing/ca-certificates/ca-certificates.install b/abs/core-testing/ca-certificates/ca-certificates.install deleted file mode 100644 index bd3cf6d..0000000 --- a/abs/core-testing/ca-certificates/ca-certificates.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - usr/sbin/update-ca-certificates --fresh &> /dev/null -} - -post_upgrade() { - post_install -} diff --git a/abs/core-testing/cairo/PKGBUILD b/abs/core-testing/cairo/PKGBUILD deleted file mode 100644 index 2ea6c60..0000000 --- a/abs/core-testing/cairo/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 71210 2010-03-05 15:30:02Z jgc $ -# Maintainer: Jan de Groot -# Contributor: Brice Carpentier - -pkgname=cairo -pkgver=1.8.10 -pkgrel=1 -pkgdesc="Cairo vector graphics library" -arch=(i686 x86_64) -license=('LGPL' 'MPL') -url="http://cairographics.org/" -depends=('libpng>=1.4.0' 'libxrender' 'fontconfig>=2.8.0' 'pixman>=0.16.6' 'xcb-util>=0.3.6') -makedepends=('pkgconfig' 'gtk-doc') -options=('!libtool') -source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz) -sha1sums=('fd5e8ca82ff0e8542ea4c51612cad387f2a49df3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's/libpng13/libpng14/g' configure || return 1 - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --enable-xcb --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/abs/core-testing/catalyst/PKGBUILD b/abs/core-testing/catalyst/PKGBUILD deleted file mode 100644 index c9f315e..0000000 --- a/abs/core-testing/catalyst/PKGBUILD +++ /dev/null @@ -1,153 +0,0 @@ -# Maintainer: Vi0L0 -# Contributor: Eduardo "kensai" Romero -# Contributor: Anssi Hannula -# Contributor: Stefan Bühler -# Contributor: baghera -# Contributor: Arlekino - -_kernver=`uname -r` - -pkgname=catalyst -pkgver=10.1 -pkgrel=5 -pkgdesc="AMD/ATI drivers for Radeon brand cards. Stock kernel" -arch=('i686' 'x86_64') -url="http://www.ati.amd.com" -license=('custom') -depends=('xorg-server<1.7.0' 'kernel26>=2.6.28' 'kernel26<2.6.34' 'kernel-headers' 'netkit-bsd-finger' 'libstdc++5' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs') - -conflicts=('catalyst' 'catalyst-utils' 'nvidia' 'libgl' 'catalyst-leaked' 'xf86-input-evdev>2.2.5-1' 'xf86-input-keyboard>1.3.2-2' 'xf86-input-mouse>1.4.0-2' 'xf86-input-synaptics>1.1.3-1' 'xf86-video-vesa>2.2.0-1' 'xf86-video-ati' 'xf86-video-radeonhd' 'ati-dri') -provides=('catalyst' 'libgl') -install=catalyst.install -source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run - catalyst.sh amdcccle.desktop atieventsd.sh fglrx-2.6.33.patch) -md5sums=('1edfe45ddf9d9315dec80ff3cc848ca3' - 'bdafe749e046bfddee2d1c5e90eabd83' - '4efa8414a8fe9eeb50da38b5522ef81d' - 'f729bf913613f49b0b9759c246058a87' - 'c5eb5571782fed5232461f59a789fb08') - -build() { -/bin/sh ./ati-driver-installer-${pkgver/./-}-x86.x86_64.run --extract archive_files - -##Build kernel modules - -if [ "${CARCH}" = "x86_64" ]; then -BUILDARCH=x86_64 -_archdir=x86_64 -fi -if [ "${CARCH}" = "i686" ]; then -BUILDARCH=i386 -_archdir=x86 -fi - -##patching for kernel 2.6.33 or 2.6.34 support -if [ `uname -r |grep -c "2.6.33"` != 0 ] || [ `uname -r |grep -c "2.6.34"` != 0 ]; then -cd "${srcdir}/archive_files/" -patch -Np1 -i ../fglrx-2.6.33.patch || return 1 -fi - -cd "${srcdir}/archive_files/common/lib/modules/fglrx/build_mod" -cp "${srcdir}/archive_files/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4" . || return 1 -cp 2.6.x/Makefile . || return 1 - -make -C /lib/modules/${_kernver}/build SUBDIRS="`pwd`" ARCH=${BUILDARCH} modules || return 1 - -install -m755 -d "${pkgdir}/lib/modules/${_kernver}/video/" -install -m644 fglrx.ko "${pkgdir}/lib/modules/${_kernver}/video/" || return 1 -install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - -sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" $startdir/*.install - -##Install catalyst utilities - -# Create directories -install -m755 -d "${pkgdir}/etc/ati" -install -m755 -d "${pkgdir}/etc/rc.d" -install -m755 -d "${pkgdir}/etc/profile.d" -install -m755 -d "${pkgdir}/etc/acpi/events" - -install -m755 -d "${pkgdir}/usr/lib/xorg/modules/dri" -install -m755 -d "${pkgdir}/usr/lib/xorg/modules/drivers" -install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" -install -m755 -d "${pkgdir}/usr/lib/xorg/modules/linux" - -install -m755 -d "${pkgdir}/usr/bin" -install -m755 -d "${pkgdir}/usr/sbin" - -install -m755 -d "${pkgdir}/usr/include/X11/extensions" -install -m755 -d "${pkgdir}/usr/include/GL" - -install -m755 -d "${pkgdir}/usr/share/applications" -install -m755 -d "${pkgdir}/usr/share/ati/amdcccle" -install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" -install -m755 -d "${pkgdir}/usr/share/man/man8" -install -m755 -d "${pkgdir}/usr/share/pixmaps" - -# X driver installation -if [ "${CARCH}" = "i686" ]; then -cd "${srcdir}/archive_files/x740/usr/X11R6/lib/modules" || return 1 -elif [ "${CARCH}" = "x86_64" ]; then -cd "${srcdir}/archive_files/x740_64a/usr/X11R6/lib64/modules" || return 1 -fi - -install -m644 *.a "${pkgdir}/usr/lib/xorg/modules/" || return 1 -install -m755 *.so "${pkgdir}/usr/lib/xorg/modules/" || return 1 -install -m755 drivers/*.so "${pkgdir}/usr/lib/xorg/modules/drivers/" || return 1 -install -m755 linux/*.so "${pkgdir}/usr/lib/xorg/modules/linux/" || return 1 -install -m755 extensions/libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/" || return 1 -#install -m755 extensions/libdri.so "${pkgdir}/usr/lib/xorg/modules/extensions/libdri.ati" || return 1 - -# Controlcenter / library installation -if [ "${CARCH}" = "i686" ]; then -cd "${srcdir}/archive_files/arch/x86/usr" || return 1 -_lib=lib -elif [ "${CARCH}" = "x86_64" ]; then -cd "${srcdir}/archive_files/arch/x86_64/usr" || return 1 -_lib=lib64 -fi - -install -m755 X11R6/bin/* "${pkgdir}/usr/bin/" || return 1 -install -m755 sbin/* "${pkgdir}/usr/sbin/" || return 1 -install -m755 X11R6/${_lib}/*.so* "${pkgdir}/usr/lib/" || return 1 -install -m644 X11R6/${_lib}/*.a "${pkgdir}/usr/lib/" || return 1 # really needed? -install -m644 X11R6/${_lib}/*.cap "${pkgdir}/usr/lib/" || return 1 -install -m755 X11R6/${_lib}/modules/dri/*.so "${pkgdir}/usr/lib/xorg/modules/dri/" || return 1 -install -m755 ${_lib}/*.so* "${pkgdir}/usr/lib/" || return 1 - -ln -sf /usr/lib/xorg/modules/dri ${pkgdir}/usr/lib/dri -ln -sf libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/libfglrx_dm.so.1" -ln -sf libfglrx_pp.so.1.0 "${pkgdir}/usr/lib/libfglrx_pp.so.1" -ln -sf libfglrx_tvout.so.1.0 "${pkgdir}/usr/lib/libfglrx_tvout.so.1" -ln -sf libfglrx_gamma.so.1.0 "${pkgdir}/usr/lib/libfglrx_gamma.so.1" -ln -sf libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1" -ln -sf libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so" - -cd "${srcdir}"/archive_files/common -install -m644 etc/ati/* "${pkgdir}/etc/ati/" || return 1 -chmod 755 "${pkgdir}/etc/ati/authatieventsd.sh" || return 1 - -install -m644 usr/X11R6/include/X11/extensions/*.h "${pkgdir}/usr/include/X11/extensions/" || return 1 -install -m644 usr/X11R6/bin/amdupdaterandrconfig "${pkgdir}/usr/bin/" || return 1 -install -m644 usr/include/GL/*.h "${pkgdir}/usr/include/GL/" || return 1 -install -m755 usr/sbin/*.sh "${pkgdir}/usr/sbin/" || return 1 -install -m644 usr/share/ati/amdcccle/* "${pkgdir}/usr/share/ati/amdcccle/" || return 1 # ? what are these files for? -# install -m644 usr/share/gnome/apps/amdcccle.desktop "${pkgdir}/usr/share/applications/" || return 1 -install -m644 usr/share/icons/*.xpm "${pkgdir}/usr/share/pixmaps/" || return 1 -install -m644 usr/share/man/man8/*.8 "${pkgdir}/usr/share/man/man8/" || return 1 -install -m644 "${srcdir}/amdcccle.desktop" "${pkgdir}/usr/share/applications/" || return 1 - -# ACPI example files -install -m755 usr/share/doc/fglrx/examples/etc/acpi/*.sh "${pkgdir}/etc/acpi/" || return 1 -sed -i -e 's/usr\/X11R6/usr/g' "${pkgdir}/etc/acpi/ati-powermode.sh" || return 1 -install -m644 usr/share/doc/fglrx/examples/etc/acpi/events/* "${pkgdir}/etc/acpi/events/" || return 1 - -# Add ATI Events Daemon launcher -install -m755 "${srcdir}/atieventsd.sh" "${pkgdir}/etc/rc.d/atieventsd" || return 1 - -# thanks to cerebral, we dont need that damned symlink -install -m755 "${srcdir}/catalyst.sh" "${pkgdir}/etc/profile.d/" || return 1 - -# License -install -m644 "${srcdir}/archive_files/ATI_LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 -} diff --git a/abs/core-testing/catalyst/amdcccle.desktop b/abs/core-testing/catalyst/amdcccle.desktop deleted file mode 100644 index ba2ed4a..0000000 --- a/abs/core-testing/catalyst/amdcccle.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=ATI Catalyst Control Center -Comment=ATI graphics adapter settings -Name[de]=ATI Catalyst Control Center -Comment[de]=ATI grafics adapter settings -Icon=ccc_large -MiniIcon=ccc_small -Exec=amdcccle -Type=Application -Terminal=false -Categories=Settings;DesktopSettings; diff --git a/abs/core-testing/catalyst/atieventsd.sh b/abs/core-testing/catalyst/atieventsd.sh deleted file mode 100644 index 16bd9a4..0000000 --- a/abs/core-testing/catalyst/atieventsd.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -ATID_PID=`pidof -o %PPID /usr/sbin/atieventsd` - -case "$1" in - start) - rc=0 - stat_busy "Starting ATI Events Daemon" - [ -z "$ATID_PID" ] && /usr/sbin/atieventsd - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - else - add_daemon atieventsd - stat_done - fi - ;; - stop) - rc=0 - stat_busy "Stopping ATI Events Daemon" - kill $ATID_PID &>/dev/null - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - else - rm_daemon atieventsd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/core-testing/catalyst/catalyst.install b/abs/core-testing/catalyst/catalyst.install deleted file mode 100644 index 11bf0a7..0000000 --- a/abs/core-testing/catalyst/catalyst.install +++ /dev/null @@ -1,34 +0,0 @@ -KERNEL_VERSION=2.6.28-LinHES - -pre_install() { - if [ ! -e /usr/lib/xorg/modules/extensions/libdri.so ]; then - ln -sf /usr/lib/xorg/modules/extensions/libdri.xorg /usr/lib/xorg/modules/extensions/libdri.so - fi -} - -post_install() { - depmod $KERNEL_VERSION - if [ ! -e /usr/lib/xorg/modules/extensions/libdri.so ]; then - ln -sf /usr/lib/xorg/modules/extensions/libdri.xorg /usr/lib/xorg/modules/extensions/libdri.so - fi - echo "--------------------------------------------------------------" - echo "You can use the tool 'aticonfig' to generate an xorg.conf file." - echo "Remember to add fglrx to the MODULES list in /etc/rc.conf." - echo "--------------------------------------------------------------" -} - -post_upgrade() { - depmod $KERNEL_VERSION - if [ ! -e /usr/lib/xorg/modules/extensions/libdri.so ]; then - ln -sf /usr/lib/xorg/modules/extensions/libdri.xorg /usr/lib/xorg/modules/extensions/libdri.so - fi -} - -post_remove() { - depmod $KERNEL_VERSION - # If the symlink is dead, remove it - if [ ! -e /usr/lib/xorg/modules/extensions/libdri.so ]; then - ln -sf /usr/lib/xorg/modules/extensions/libdri.xorg /usr/lib/xorg/modules/extensions/libdri.so - fi - echo "NOTE: Don't forget to recover your original xorg.conf file." -} diff --git a/abs/core-testing/catalyst/catalyst.sh b/abs/core-testing/catalyst/catalyst.sh deleted file mode 100644 index 7aedd4f..0000000 --- a/abs/core-testing/catalyst/catalyst.sh +++ /dev/null @@ -1,11 +0,0 @@ -if [ $LIBGL_DRIVERS_PATH ] -then - if ! set | grep LIBGL_DRIVERS_PATH | grep /usr/lib/xorg/modules/dri/ > /dev/null - then - LIBGL_DRIVERS_PATH=$LIBGL_DRIVERS_PATH:/usr/lib/xorg/modules/dri/ - export LIBGL_DRIVERS_PATH - fi -else - LIBGL_DRIVERS_PATH=/usr/lib/xorg/modules/dri/ - export LIBGL_DRIVERS_PATH -fi diff --git a/abs/core-testing/catalyst/fglrx-2.6.33.patch b/abs/core-testing/catalyst/fglrx-2.6.33.patch deleted file mode 100644 index 7ba9ecd..0000000 --- a/abs/core-testing/catalyst/fglrx-2.6.33.patch +++ /dev/null @@ -1,228 +0,0 @@ -Index: ati10.1/common/lib/modules/fglrx/build_mod/drmP.h -=================================================================== ---- ati10.1/common/lib/modules/fglrx/build_mod/drmP.h -+++ ati10.1/common/lib/modules/fglrx/build_mod/drmP.h 2010-01-28 19:57:07.562644291 +0200 -@@ -42,7 +42,12 @@ - * can build the DRM (part of PI DRI). 4/21/2000 S + B */ - #include - #endif /* __alpha__ */ -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+#include -+#else - #include -+#endif - #include - #include - #include -@@ -51,7 +56,6 @@ - #include - #include - #include --#include - #include - #include /* For (un)lock_kernel */ - #include -Index: ati10.1/common/lib/modules/fglrx/build_mod/firegl_public.c -=================================================================== ---- ati10.1/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ ati10.1/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-01-29 14:21:58.687999115 +0200 -@@ -28,7 +28,11 @@ - #error Kernel versions older than 2.6.0 are no longer supported by this module. - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+#include -+#else - #include -+#endif - - #if !defined(CONFIG_X86) - #if !defined(CONFIG_X86_PC) -@@ -163,8 +167,12 @@ - - // For 2.6.18 or higher, the UTS_RELEASE is defined in the linux/utsrelease.h. - #ifndef UTS_RELEASE -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+#include -+#else - #include - #endif -+#endif - - #if defined(__i386__) - #ifndef do_div -@@ -1472,7 +1472,16 @@ - #ifndef __HAVE_ARCH_CMPXCHG - return __fgl_cmpxchg(ptr,old,new,size); - #else -- return __cmpxchg(ptr,old,new,size); -+ switch (size) { -+ case 1: { volatile u8 *_ptr = ptr; return cmpxchg(_ptr, old, new); } -+ case 2: { volatile u16 *_ptr = ptr; return cmpxchg(_ptr, old, new); } -+ case 4: { volatile u32 *_ptr = ptr; return cmpxchg(_ptr, old, new); } -+#ifdef __x86_64__ -+ case 8: { volatile u64 *_ptr = ptr; return cmpxchg(_ptr, old, new); } -+#endif -+ default: -+ return old; -+ } - #endif - } - - -Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c -=================================================================== ---- ati10.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c -+++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2010-01-28 19:57:17.897225045 +0200 -@@ -15,7 +15,11 @@ - ****************************************************************************/ - - #include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+#include -+#else - #include -+#endif - #include - - #include "kcl_config.h" -Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_agp.c -=================================================================== ---- ati10.1/common/lib/modules/fglrx/build_mod/kcl_agp.c -+++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_agp.c 2010-01-28 19:57:26.104892082 +0200 -@@ -31,7 +31,11 @@ - */ - - #include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+#include -+#else - #include -+#endif - #include - #include - #include -Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_io.c -=================================================================== ---- ati10.1/common/lib/modules/fglrx/build_mod/kcl_io.c -+++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_io.c 2010-01-28 19:57:34.337558105 +0200 -@@ -37,7 +37,11 @@ - */ - - #include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+#include -+#else - #include -+#endif - #include - #include - #include -Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_osconfig.h -=================================================================== ---- ati10.1/common/lib/modules/fglrx/build_mod/kcl_osconfig.h -+++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_osconfig.h 2010-01-28 19:57:43.599182385 +0200 -@@ -20,7 +20,11 @@ - #define KCL_OSCONFIG_H - - #include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+#include -+#else - #include -+#endif - - // Choose modern way to call 32-on-64 IOCTLs if configured in the kernel - #if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) -Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_pci.c -=================================================================== ---- ati10.1/common/lib/modules/fglrx/build_mod/kcl_pci.c -+++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_pci.c 2010-01-28 19:57:51.295870149 +0200 -@@ -31,7 +31,11 @@ - */ - - #include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+#include -+#else - #include -+#endif - #include - - #include "kcl_config.h" -Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_str.c -=================================================================== ---- ati10.1/common/lib/modules/fglrx/build_mod/kcl_str.c -+++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_str.c 2010-01-28 19:57:59.728528058 +0200 -@@ -30,7 +30,12 @@ - * - */ - -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+#include -+#else - #include -+#endif - #include - #include - -Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_wait.c -=================================================================== ---- ati10.1/common/lib/modules/fglrx/build_mod/kcl_wait.c -+++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_wait.c 2010-01-28 19:58:08.936154527 +0200 -@@ -31,7 +31,11 @@ - */ - - #include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+#include -+#else - #include -+#endif - #include - #include - #include -Index: ati10.1/common/lib/modules/fglrx/build_mod/make.sh -=================================================================== ---- ati10.1/common/lib/modules/fglrx/build_mod/make.sh -+++ ati10.1/common/lib/modules/fglrx/build_mod/make.sh 2010-01-28 19:55:10.849378991 +0200 -@@ -218,8 +218,15 @@ - # UTS-define is in external version-*.h files, i.e. linux-2.2.14-5.0-RedHat does this flaw - kernel_release=`cat $linuxincludes/linux/version-*.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` - else -- # For 2.6.18 or higher, UTS-define is defined in utsrelease.h. -- kernel_release=`cat $linuxincludes/linux/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` -+ UTS_REL_COUNT=`cat $linuxincludes/generated/utsrelease.h 2>/dev/null | grep UTS_RELEASE -c` -+ -+ if [ $UTS_REL_COUNT -gt 0 ]; then -+ # 2.6.33+ -+ kernel_release=`cat $linuxincludes/generated/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` -+ else -+ # For 2.6.18 to 2.6.32, UTS-define is defined in utsrelease.h. -+ kernel_release=`cat $linuxincludes/linux/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` -+ fi - fi - fi - fi -@@ -302,7 +309,8 @@ - # 3 - # linux/autoconf.h may contain this: #define CONFIG_SMP 1 - --src_file=$linuxincludes/linux/autoconf.h -+src_file=$linuxincludes/generated/autoconf.h -+[ -e $src_file ] || src_file=$linuxincludes/linux/autoconf.h - - if [ ! -e $src_file ]; then - echo "Warning:" >> $logfile -@@ -355,7 +363,8 @@ - MODVERSIONS=0 - - # linux/autoconf.h may contain this: #define CONFIG_MODVERSIONS 1 --src_file=$linuxincludes/linux/autoconf.h -+src_file=$linuxincludes/generated/autoconf.h -+[ -e $src_file ] || src_file=$linuxincludes/linux/autoconf.h - if [ ! -e $src_file ]; - then - echo "Warning:" >> $logfile diff --git a/abs/core-testing/cdparanoia/ChangeLog b/abs/core-testing/cdparanoia/ChangeLog deleted file mode 100644 index f1873ff..0000000 --- a/abs/core-testing/cdparanoia/ChangeLog +++ /dev/null @@ -1,18 +0,0 @@ -2008-08-07 Alexander Fehr - - * cdparanoia-10.1-1: - New upstream release. - Changed license to GPL. - Added !makeflags option. - -2008-07-07 Alexander Fehr - - * cdparanoia-10.0-1: - New upstream release. - New maintainer. - Added arch variable. - Changed license to GPL3. - Fixed man page location. - Removed cdparanoia.patch. - Removed gcc34.patch. - Added ChangeLog. diff --git a/abs/core-testing/cdparanoia/PKGBUILD b/abs/core-testing/cdparanoia/PKGBUILD deleted file mode 100644 index 0e60bd4..0000000 --- a/abs/core-testing/cdparanoia/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 13080 2008-09-25 21:49:25Z pierre $ -# Maintainer: Alexander Fehr - -pkgname=cdparanoia -pkgver=10.2 -pkgrel=2 -pkgdesc="Compact Disc Digital Audio extraction tool" -arch=('i686' 'x86_64') -url="http://www.xiph.org/paranoia/" -license=('GPL') -depends=('glibc') -options=('!makeflags') -source=(http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz gcc.patch) - -build() { - cd "$srcdir/cdparanoia-III-$pkgver" - patch -p0 -i ${srcdir}/gcc.patch || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make prefix="$pkgdir/usr" MANDIR="$pkgdir/usr/share/man" install || return 1 -} diff --git a/abs/core-testing/cdparanoia/gcc.patch b/abs/core-testing/cdparanoia/gcc.patch deleted file mode 100644 index b157353..0000000 --- a/abs/core-testing/cdparanoia/gcc.patch +++ /dev/null @@ -1,582 +0,0 @@ -Index: interface/test_interface.c -=================================================================== ---- interface/test_interface.c (Revision 15337) -+++ interface/test_interface.c (Revision 15340) -@@ -66,9 +66,9 @@ - if(!fd)fd=fdopen(d->cdda_fd,"r"); - - if(beginprivate->last_milliseconds=20; -+ d->private_data->last_milliseconds=20; - else -- d->private->last_milliseconds=sectors; -+ d->private_data->last_milliseconds=sectors; - - #ifdef CDDA_TEST_UNDERRUN - sectors-=1; -Index: interface/cdda_interface.h -=================================================================== ---- interface/cdda_interface.h (Revision 15337) -+++ interface/cdda_interface.h (Revision 15340) -@@ -84,7 +84,7 @@ - int is_atapi; - int is_mmc; - -- cdda_private_data_t *private; -+ cdda_private_data_t *private_data; - void *reserved; - unsigned char inqbytes[4]; - -Index: interface/interface.c -=================================================================== ---- interface/interface.c (Revision 15337) -+++ interface/interface.c (Revision 15340) -@@ -39,9 +39,9 @@ - if(d->drive_model)free(d->drive_model); - if(d->cdda_fd!=-1)close(d->cdda_fd); - if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd); -- if(d->private){ -- if(d->private->sg_hd)free(d->private->sg_hd); -- free(d->private); -+ if(d->private_data){ -+ if(d->private_data->sg_hd)free(d->private_data->sg_hd); -+ free(d->private_data); - } - - free(d); -@@ -127,7 +127,7 @@ - } - } - } -- if(ms)*ms=d->private->last_milliseconds; -+ if(ms)*ms=d->private_data->last_milliseconds; - return(sectors); - } - -Index: interface/scsi_interface.c -=================================================================== ---- interface/scsi_interface.c (Revision 15337) -+++ interface/scsi_interface.c (Revision 15340) -@@ -15,13 +15,13 @@ - static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ - struct timespec tv1; - struct timespec tv2; -- int ret1=clock_gettime(d->private->clock,&tv1); -+ int ret1=clock_gettime(d->private_data->clock,&tv1); - int ret2=ioctl(fd, command,arg); -- int ret3=clock_gettime(d->private->clock,&tv2); -+ int ret3=clock_gettime(d->private_data->clock,&tv2); - if(ret1<0 || ret3<0){ -- d->private->last_milliseconds=-1; -+ d->private_data->last_milliseconds=-1; - }else{ -- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; -+ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; - } - return ret2; - } -@@ -96,7 +96,7 @@ - static void clear_garbage(cdrom_drive *d){ - fd_set fdset; - struct timeval tv; -- struct sg_header *sg_hd=d->private->sg_hd; -+ struct sg_header *sg_hd=d->private_data->sg_hd; - int flag=0; - - /* clear out any possibly preexisting garbage */ -@@ -185,7 +185,7 @@ - struct timespec tv2; - int tret1,tret2; - int status = 0; -- struct sg_header *sg_hd=d->private->sg_hd; -+ struct sg_header *sg_hd=d->private_data->sg_hd; - long writebytes=SG_OFF+cmd_len+in_size; - - /* generic scsi device services */ -@@ -195,7 +195,7 @@ - - memset(sg_hd,0,sizeof(sg_hd)); - memset(sense_buffer,0,SG_MAX_SENSE); -- memcpy(d->private->sg_buffer,cmd,cmd_len+in_size); -+ memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size); - sg_hd->twelve_byte = cmd_len == 12; - sg_hd->result = 0; - sg_hd->reply_len = SG_OFF + out_size; -@@ -209,7 +209,7 @@ - tell if the command failed. Scared yet? */ - - if(bytecheck && out_size>in_size){ -- memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); -+ memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); - /* the size does not remove cmd_len due to the way the kernel - driver copies buffers */ - writebytes+=(out_size-in_size); -@@ -243,7 +243,7 @@ - } - - sigprocmask (SIG_BLOCK, &(d->sigset), NULL ); -- tret1=clock_gettime(d->private->clock,&tv1); -+ tret1=clock_gettime(d->private_data->clock,&tv1); - errno=0; - status = write(d->cdda_fd, sg_hd, writebytes ); - -@@ -289,7 +289,7 @@ - } - } - -- tret2=clock_gettime(d->private->clock,&tv2); -+ tret2=clock_gettime(d->private_data->clock,&tv2); - errno=0; - status = read(d->cdda_fd, sg_hd, SG_OFF + out_size); - sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL ); -@@ -313,7 +313,7 @@ - if(bytecheck && in_size+cmd_lenprivate->sg_buffer[i]!=bytefill){ -+ if(d->private_data->sg_buffer[i]!=bytefill){ - flag=1; - break; - } -@@ -326,9 +326,9 @@ - - errno=0; - if(tret1<0 || tret2<0){ -- d->private->last_milliseconds=-1; -+ d->private_data->last_milliseconds=-1; - }else{ -- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; -+ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; - } - return(0); - } -@@ -347,7 +347,7 @@ - - memset(&hdr,0,sizeof(hdr)); - memset(sense,0,sizeof(sense)); -- memcpy(d->private->sg_buffer,cmd+cmd_len,in_size); -+ memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size); - - hdr.cmdp = cmd; - hdr.cmd_len = cmd_len; -@@ -355,7 +355,7 @@ - hdr.mx_sb_len = SG_MAX_SENSE; - hdr.timeout = 50000; - hdr.interface_id = 'S'; -- hdr.dxferp = d->private->sg_buffer; -+ hdr.dxferp = d->private_data->sg_buffer; - hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */ - - /* scary buffer fill hack */ -@@ -400,7 +400,7 @@ - if(bytecheck && in_sizeprivate->sg_buffer[i]!=bytefill){ -+ if(d->private_data->sg_buffer[i]!=bytefill){ - flag=1; - break; - } -@@ -412,7 +412,7 @@ - } - - /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */ -- /* d->private->last_milliseconds = hdr.duration; */ -+ /* d->private_data->last_milliseconds = hdr.duration; */ - - errno = 0; - return 0; -@@ -445,9 +445,9 @@ - - handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense); - -- key = d->private->sg_buffer[2] & 0xf; -- ASC = d->private->sg_buffer[12]; -- ASCQ = d->private->sg_buffer[13]; -+ key = d->private_data->sg_buffer[2] & 0xf; -+ ASC = d->private_data->sg_buffer[12]; -+ ASCQ = d->private_data->sg_buffer[13]; - - if(key == 2 && ASC == 4 && ASCQ == 1) return 0; - return 1; -@@ -492,7 +492,7 @@ - if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1); - - { -- unsigned char *b=d->private->sg_buffer; -+ unsigned char *b=d->private_data->sg_buffer; - if(b[0])return(1); /* Handles only up to 256 bytes */ - if(b[6])return(1); /* Handles only up to 256 bytes */ - -@@ -604,8 +604,8 @@ - static unsigned int get_orig_sectorsize(cdrom_drive *d){ - if(mode_sense(d,12,0x01))return(-1); - -- d->orgdens = d->private->sg_buffer[4]; -- return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]); -+ d->orgdens = d->private_data->sg_buffer[4]; -+ return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]); - } - - /* switch CDROM scsi drives to given sector size */ -@@ -664,8 +664,8 @@ - return(-4); - } - -- first=d->private->sg_buffer[2]; -- last=d->private->sg_buffer[3]; -+ first=d->private_data->sg_buffer[2]; -+ last=d->private_data->sg_buffer[3]; - tracks=last-first+1; - - if (last > MAXTRK || first > MAXTRK || last<0 || first<0) { -@@ -683,7 +683,7 @@ - return(-5); - } - { -- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); -+ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); - - d->disc_toc[i-first].bFlags=toc->bFlags; - d->disc_toc[i-first].bTrack=i; -@@ -704,7 +704,7 @@ - return(-2); - } - { -- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); -+ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); - - d->disc_toc[i-first].bFlags=toc->bFlags; - d->disc_toc[i-first].bTrack=0xAA; -@@ -738,7 +738,7 @@ - } - - /* copy to our structure and convert start sector */ -- tracks = d->private->sg_buffer[1]; -+ tracks = d->private_data->sg_buffer[1]; - if (tracks > MAXTRK) { - cderror(d,"003: CDROM reporting illegal number of tracks\n"); - return(-3); -@@ -754,33 +754,33 @@ - return(-5); - } - -- d->disc_toc[i].bFlags = d->private->sg_buffer[10]; -+ d->disc_toc[i].bFlags = d->private_data->sg_buffer[10]; - d->disc_toc[i].bTrack = i + 1; - - d->disc_toc[i].dwStartSector= d->adjust_ssize * -- (((signed char)(d->private->sg_buffer[2])<<24) | -- (d->private->sg_buffer[3]<<16)| -- (d->private->sg_buffer[4]<<8)| -- (d->private->sg_buffer[5])); -+ (((signed char)(d->private_data->sg_buffer[2])<<24) | -+ (d->private_data->sg_buffer[3]<<16)| -+ (d->private_data->sg_buffer[4]<<8)| -+ (d->private_data->sg_buffer[5])); - } - - d->disc_toc[i].bFlags = 0; - d->disc_toc[i].bTrack = i + 1; -- memcpy (&foo, d->private->sg_buffer+2, 4); -- memcpy (&bar, d->private->sg_buffer+6, 4); -+ memcpy (&foo, d->private_data->sg_buffer+2, 4); -+ memcpy (&bar, d->private_data->sg_buffer+6, 4); - d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) + - be32_to_cpu(bar)); - - d->disc_toc[i].dwStartSector= d->adjust_ssize * -- ((((signed char)(d->private->sg_buffer[2])<<24) | -- (d->private->sg_buffer[3]<<16)| -- (d->private->sg_buffer[4]<<8)| -- (d->private->sg_buffer[5]))+ -+ ((((signed char)(d->private_data->sg_buffer[2])<<24) | -+ (d->private_data->sg_buffer[3]<<16)| -+ (d->private_data->sg_buffer[4]<<8)| -+ (d->private_data->sg_buffer[5]))+ - -- ((((signed char)(d->private->sg_buffer[6])<<24) | -- (d->private->sg_buffer[7]<<16)| -- (d->private->sg_buffer[8]<<8)| -- (d->private->sg_buffer[9])))); -+ ((((signed char)(d->private_data->sg_buffer[6])<<24) | -+ (d->private_data->sg_buffer[7]<<16)| -+ (d->private_data->sg_buffer[8]<<8)| -+ (d->private_data->sg_buffer[9])))); - - - d->cd_extra = FixupTOC(d,tracks+1); -@@ -817,7 +817,7 @@ - cmd[8] = sectors; - if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) - return(ret); -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); - return(0); - } - -@@ -836,7 +836,7 @@ - cmd[9] = sectors; - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) - return(ret); -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); - return(0); - } - -@@ -854,7 +854,7 @@ - cmd[8] = sectors; - if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) - return(ret); -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); - return(0); - } - -@@ -872,7 +872,7 @@ - cmd[9] = sectors; - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) - return(ret); -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); - return(0); - } - -@@ -890,7 +890,7 @@ - cmd[8] = sectors; - if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) - return(ret); -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); - return(0); - } - -@@ -908,7 +908,7 @@ - cmd[9] = sectors; - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) - return(ret); -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); - return(0); - } - -@@ -922,7 +922,7 @@ - cmd[8] = sectors; - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) - return(ret); -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); - return(0); - } - -@@ -936,7 +936,7 @@ - cmd[8] = sectors; - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) - return(ret); -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); - return(0); - } - -@@ -950,7 +950,7 @@ - cmd[8] = sectors; - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) - return(ret); -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); - return(0); - } - -@@ -964,7 +964,7 @@ - cmd[8] = sectors; - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) - return(ret); -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); - return(0); - } - -@@ -978,7 +978,7 @@ - cmd[8] = sectors; - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) - return(ret); -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); - return(0); - } - -@@ -992,7 +992,7 @@ - cmd[8] = sectors; - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) - return(ret); -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); - return(0); - } - -@@ -1026,7 +1026,7 @@ - - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) - return(ret); -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); - return(0); - } - -@@ -1039,7 +1039,7 @@ - - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) - return(ret); -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); - return(0); - } - -@@ -1052,7 +1052,7 @@ - - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) - return(ret); -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); - return(0); - } - -@@ -1275,7 +1275,7 @@ - static int count_2352_bytes(cdrom_drive *d){ - long i; - for(i=2351;i>=0;i--) -- if(d->private->sg_buffer[i]!=(unsigned char)'\177') -+ if(d->private_data->sg_buffer[i]!=(unsigned char)'\177') - return(((i+3)>>2)<<2); - - return(0); -@@ -1284,7 +1284,7 @@ - static int verify_nonzero(cdrom_drive *d){ - long i,flag=0; - for(i=0;i<2352;i++) -- if(d->private->sg_buffer[i]!=0){ -+ if(d->private_data->sg_buffer[i]!=0){ - flag=1; - break; - } -@@ -1621,7 +1621,7 @@ - d->is_mmc=0; - if(mode_sense(d,22,0x2A)==0){ - -- b=d->private->sg_buffer; -+ b=d->private_data->sg_buffer; - b+=b[3]+4; - - if((b[0]&0x3F)==0x2A){ -@@ -1669,7 +1669,7 @@ - cderror(d,"008: Unable to identify CDROM model\n"); - return(NULL); - } -- return (d->private->sg_buffer); -+ return (d->private_data->sg_buffer); - } - - int scsi_init_drive(cdrom_drive *d){ -@@ -1725,8 +1725,8 @@ - check_cache(d); - - d->error_retry=1; -- d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); -- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; -+ d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); -+ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; - d->report_all=1; - return(0); - } -Index: interface/cooked_interface.c -=================================================================== ---- interface/cooked_interface.c (Revision 15337) -+++ interface/cooked_interface.c (Revision 15340) -@@ -13,13 +13,13 @@ - static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ - struct timespec tv1; - struct timespec tv2; -- int ret1=clock_gettime(d->private->clock,&tv1); -+ int ret1=clock_gettime(d->private_data->clock,&tv1); - int ret2=ioctl(fd, command,arg); -- int ret3=clock_gettime(d->private->clock,&tv2); -+ int ret3=clock_gettime(d->private_data->clock,&tv2); - if(ret1<0 || ret3<0){ -- d->private->last_milliseconds=-1; -+ d->private_data->last_milliseconds=-1; - }else{ -- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; -+ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; - } - return ret2; - } -Index: interface/scan_devices.c -=================================================================== ---- interface/scan_devices.c (Revision 15337) -+++ interface/scan_devices.c (Revision 15340) -@@ -264,11 +264,11 @@ - d->interface=COOKED_IOCTL; - d->bigendianp=-1; /* We don't know yet... */ - d->nsectors=-1; -- d->private=calloc(1,sizeof(*d->private)); -+ d->private_data=calloc(1,sizeof(*d->private_data)); - { - /* goddamnit */ - struct timespec tv; -- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); -+ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); - } - idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description); - return(d); -@@ -674,15 +674,15 @@ - d->bigendianp=-1; /* We don't know yet... */ - d->nsectors=-1; - d->messagedest = messagedest; -- d->private=calloc(1,sizeof(*d->private)); -+ d->private_data=calloc(1,sizeof(*d->private_data)); - { - /* goddamnit */ - struct timespec tv; -- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); -+ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); - } - if(use_sgio){ - d->interface=SGIO_SCSI; -- d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); -+ d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); - g_fd=d->cdda_fd=dup(d->ioctl_fd); - }else{ - version=verify_SG_version(d,messagedest,messages); -@@ -696,8 +696,8 @@ - } - - /* malloc our big buffer for scsi commands */ -- d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE); -- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; -+ d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE); -+ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; - } - - { -@@ -772,9 +772,9 @@ - if(i_fd!=-1)close(i_fd); - if(g_fd!=-1)close(g_fd); - if(d){ -- if(d->private){ -- if(d->private->sg_hd)free(d->private->sg_hd); -- free(d->private); -+ if(d->private_data){ -+ if(d->private_data->sg_hd)free(d->private_data->sg_hd); -+ free(d->private_data); - } - free(d); - } -@@ -821,7 +821,7 @@ - d->interface=TEST_INTERFACE; - d->bigendianp=-1; /* We don't know yet... */ - d->nsectors=-1; -- d->private=calloc(1,sizeof(*d->private)); -+ d->private_data=calloc(1,sizeof(*d->private_data)); - d->drive_model=copystring("File based test interface"); - idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model); - diff --git a/abs/core-testing/cdrdao/PKGBUILD b/abs/core-testing/cdrdao/PKGBUILD deleted file mode 100644 index ff79afd..0000000 --- a/abs/core-testing/cdrdao/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: dorphell -pkgname=cdrdao -pkgver=1.2.2 -pkgrel=2 -pkgdesc="Records audio/data CD-Rs in disk-at-once (DAO) mode" -arch=(i686 x86_64) -license=('GPL') -url="http://cdrdao.sourceforge.net/" -depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 \ - cdrdao-1.2.2-gcc43.patch) -md5sums=('f0cbf36907406cb4f4c568f9e6669a34' '828963048850fe9e540c2b29ee987fd7') - -build() { - cd $startdir/src/$pkgname-$pkgver - patch -Np1 -i $startdir/src/cdrdao-1.2.2-gcc43.patch - ./configure --prefix=/usr --with-lame - make || return 1 - make DESTDIR=$startdir/pkg install -} diff --git a/abs/core-testing/cdrdao/cdrdao-1.2.2-gcc43.patch b/abs/core-testing/cdrdao/cdrdao-1.2.2-gcc43.patch deleted file mode 100644 index f6707a9..0000000 --- a/abs/core-testing/cdrdao/cdrdao-1.2.2-gcc43.patch +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 09-gcc-3.4.dpatch by Matthias Klose -## -## DP: Fix build failures with g++-4.3 (Closes: #455309). - -@DPATCH@ - -diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatConverter.cc cdrdao-1.2.2/trackdb/FormatConverter.cc ---- cdrdao-1.2.2.orig/trackdb/FormatConverter.cc 2005-05-10 00:55:28.000000000 +0000 -+++ cdrdao-1.2.2/trackdb/FormatConverter.cc 2008-03-07 11:14:07.000000000 +0000 -@@ -22,6 +22,7 @@ - #include - #endif - #include -+#include - - #include "config.h" - #include "util.h" -diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatOgg.cc cdrdao-1.2.2/trackdb/FormatOgg.cc ---- cdrdao-1.2.2.orig/trackdb/FormatOgg.cc 2005-04-22 02:01:46.000000000 +0000 -+++ cdrdao-1.2.2/trackdb/FormatOgg.cc 2008-03-07 11:14:07.000000000 +0000 -@@ -18,6 +18,7 @@ - */ - - #include -+#include - - #include "util.h" - #include "FormatOgg.h" -diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatMp3.cc cdrdao-1.2.2/trackdb/FormatMp3.cc ---- cdrdao-1.2.2.orig/trackdb/FormatMp3.cc 2005-09-24 20:28:43.000000000 +0000 -+++ cdrdao-1.2.2/trackdb/FormatMp3.cc 2008-03-07 11.14.07.000000000 +0000 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -Naurp cdrdao-1.2.2.orig/trackdb/TempFileManager.cc cdrdao-1.2.2/trackdb/TempFileManager.cc ---- cdrdao-1.2.2.orig/trackdb/TempFileManager.cc 2005-04-22 02:01:46.000000000 +0000 -+++ cdrdao-1.2.2/trackdb/TempFileManager.cc 2008-03-07 11:14:07.000000000 +0000 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #define DEFAULT_TEMP_PATH "/tmp/" - -diff -Naurp cdrdao-1.2.2.orig/xdao/AudioCDProject.cc cdrdao-1.2.2/xdao/AudioCDProject.cc ---- cdrdao-1.2.2.orig/xdao/AudioCDProject.cc 2006-09-18 10:42:26.000000000 +0000 -+++ cdrdao-1.2.2/xdao/AudioCDProject.cc 2008-03-07 11:15:26.000000000 +0000 -@@ -18,6 +18,7 @@ - */ - - #include -+#include - #include - #include - -diff -Naurp cdrdao-1.2.2.orig/xdao/TextEdit.cc cdrdao-1.2.2/xdao/TextEdit.cc ---- cdrdao-1.2.2.orig/xdao/TextEdit.cc 2004-02-12 01:13:32.000000000 +0000 -+++ cdrdao-1.2.2/xdao/TextEdit.cc 2008-03-07 11:14:07.000000000 +0000 -@@ -21,6 +21,7 @@ - - #include - #include -+#include - - TextEdit::TextEdit(const char *sample) : Gtk::Entry() - { diff --git a/abs/core-testing/cdrdao/gcc4.patch b/abs/core-testing/cdrdao/gcc4.patch deleted file mode 100644 index 8fc84b7..0000000 --- a/abs/core-testing/cdrdao/gcc4.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- cdrdao-1.2.0/trackdb/FormatConverter.h 2005-06-30 13:35:59.000000000 +0200 -+++ cdrdao-1.2.0.az/trackdb/FormatConverter.h 2005-06-30 13:34:18.000000000 +0200 -@@ -95,7 +95,7 @@ - - // Convert all files contained in a given Toc object, and update the - // Toc accordingly. This is a big time blocking call. -- FormatSupport::Status convert(Toc* toc); -+ FormatSupport::Status convert(class Toc* toc); - - // Dynamic allocator. - FormatSupport* newConverter(const char* src); ---- cdrdao-1.2.0/trackdb/CueParser.cc 2005-06-30 13:36:09.000000000 +0200 -+++ cdrdao-1.2.0.az/trackdb/CueParser.cc 2005-06-30 13:36:22.000000000 +0200 -@@ -23,7 +23,7 @@ - - #include "Cue2Toc.h" - --extern Toc *parseToc(const char* tocBuffer, const char *filename); -+extern class Toc *parseToc(const char* tocBuffer, const char *filename); - - Toc *parseCue(FILE *fp, const char *filename) - { - diff --git a/abs/core-testing/cdrkit/ChangeLog b/abs/core-testing/cdrkit/ChangeLog deleted file mode 100644 index b09c057..0000000 --- a/abs/core-testing/cdrkit/ChangeLog +++ /dev/null @@ -1,10 +0,0 @@ -2008-07-14 Alexander Fehr - - * cdrkit-1.1.8-1: - New upstream release. - New maintainer. - Changed license to GPL2. - Added dependency on bzip2. - Removed replaces cdrtools. - Cleaned up cdrtools compatibility symlinks. - Added ChangeLog. diff --git a/abs/core-testing/cdrkit/PKGBUILD b/abs/core-testing/cdrkit/PKGBUILD deleted file mode 100644 index 6de7150..0000000 --- a/abs/core-testing/cdrkit/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 5822 2008-07-21 11:34:04Z alexanderf $ -# Maintainer: Alexander Fehr - -pkgname=cdrkit -pkgver=1.1.8 -pkgrel=2 -pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction" -arch=('i686' 'x86_64') -url="http://cdrkit.org/" -license=('GPL2') -depends=('libcap' 'file' 'bzip2') -makedepends=('cmake') -provides=('cdrtools') -conflicts=('cdrtools') -source=(http://cdrkit.org/releases/cdrkit-$pkgver.tar.gz) -md5sums=('97a9ea4e1bf59beb12aca649958d8c6c') - -build() { - cd "$srcdir/cdrkit-$pkgver" - - make || return 1 - make PREFIX="$pkgdir/usr" install || return 1 - - # Make symlinks for cdrtools compatibility - cd "$pkgdir/usr/bin" - ln -s wodim cdrecord || return 1 - ln -s readom readcd || return 1 - ln -s genisoimage mkisofs || return 1 - ln -s genisoimage mkhybrid || return 1 - ln -s icedax cdda2wav || return 1 - - cd "$pkgdir/usr/share/man/man1" - ln -s wodim.1 cdrecord.1 || return 1 - ln -s readom.1 readcd.1 || return 1 - ln -s genisoimage.1 mkisofs.1 || return 1 - ln -s genisoimage.1 mkhybrid.1 || return 1 - ln -s icedax.1 cdda2wav.1 || return 1 -} diff --git a/abs/core-testing/cloog-ppl/PKGBUILD b/abs/core-testing/cloog-ppl/PKGBUILD deleted file mode 100644 index 56af019..0000000 --- a/abs/core-testing/cloog-ppl/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 87235 2010-08-11 12:10:19Z allan $ -# Maintainer: Allan McRae -# Contributor: ezzetabi - -pkgname=cloog-ppl -pkgver=0.15.9 -pkgrel=2 -pkgdesc="Library that generates loops for scanning polyhedra" -arch=('i686' 'x86_64') -url="http://www.cloog.org/" -license=('GPL') -depends=('ppl>=0.11') -options=('!libtool') -source=(ftp://gcc.gnu.org/pub/gcc/infrastructure/${pkgname}-${pkgver}.tar.gz) -md5sums=('806e001d1b1a6b130069ff6274900af5') - -build() { - cd $srcdir/$pkgname-$pkgver - - # "Add" ppl-0.11 compatibility - sed -i "/ppl_minor_version=/s#10#11#" configure - - ./configure --prefix=/usr --infodir=/usr/share/info \ - --with-bits=gmp --with-ppl=/usr - make - make check -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir/ install -} diff --git a/abs/core-testing/cmake/PKGBUILD b/abs/core-testing/cmake/PKGBUILD deleted file mode 100644 index 60e7f35..0000000 --- a/abs/core-testing/cmake/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 27686 2009-02-24 20:21:28Z pierre $ -# Maintainer: Pierre Schmitz -# Contributor: damir -# Contributor: Konstantinos Pachnis - -pkgname=cmake -pkgver=2.6.3 -pkgrel=1 -pkgdesc="CMake is a cross-platform open-source make system" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.cmake.org" -depends=('expat' 'xmlrpc-c') -makedepends=('qt') -optdepends=('qt: cmake-gui') -source=("http://www.cmake.org/files/v2.6/$pkgname-$pkgver.tar.gz") -md5sums=('5ba47a94ce276f326abca1fd72a7e7c6') - -build() { - cd $srcdir/$pkgname-$pkgver - ./bootstrap --prefix=/usr \ - --mandir=/share/man \ - --docdir=/share/doc/cmake \ - --system-libs \ - --qt-gui - make || return 1 - make DESTDIR=$pkgdir install - - install -D -m644 Docs/cmake-indent.vim $pkgdir/usr/share/vim/indent/cmake-indent.vim - install -D -m644 Docs/cmake-syntax.vim $pkgdir/usr/share/vim/syntax/cmake-syntax.vim - install -D -m644 Docs/cmake-mode.el $pkgdir/usr/share/emacs/site-lisp/cmake-mode.el - install -D -m644 Copyright.txt $pkgdir/usr/share/licenses/$pkgname/Copyright.txt -} diff --git a/abs/core-testing/compositeproto/PKGBUILD b/abs/core-testing/compositeproto/PKGBUILD deleted file mode 100644 index 5ccaa8f..0000000 --- a/abs/core-testing/compositeproto/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Alexander Baldeck -# Contributor: Jan de Groot -pkgname=compositeproto -pkgver=0.4 -pkgrel=1 -pkgdesc="X11 Composite extension wire protocol" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -depends=(fixesproto) -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 -} - -md5sums=('6281344d656d4e0c8e9db4918efe3d1d') diff --git a/abs/core-testing/coreutils/PKGBUILD b/abs/core-testing/coreutils/PKGBUILD deleted file mode 100644 index 2c6fab9..0000000 --- a/abs/core-testing/coreutils/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# $Id: PKGBUILD 82551 2010-06-13 12:07:11Z allan $ -# Maintainer: Allan McRae -# Contributor: judd - -pkgname=coreutils -pkgver=8.5 -pkgrel=2 -pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" -arch=('i686' 'x86_64') -license=('GPL3') -url="http://www.gnu.org/software/coreutils" -groups=('base') -depends=('glibc' 'shadow' 'pam' 'acl' 'gmp>=5.0' 'libcap') -replaces=('mktemp') -backup=('etc/pam.d/su') -install=${pkgname}.install -options=('!emptydirs') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz - coreutils-uname.patch - coreutils-pam.patch - su.pam) -md5sums=('55170ed640e300f5b81640c6f4641513' - 'c4fcca138b6abf6d443d48a6f0cd8833' - 'aad79a2aa6d566c375d7bdd1b0767278' - 'fa85e5cce5d723275b14365ba71a8aad') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # added su wheel group pam patch (from fedora cvs) - patch -Np1 -i ${srcdir}/coreutils-pam.patch - - # linux specific uname improvement (from gentoo portage) - patch -Np1 -i ${srcdir}/coreutils-uname.patch - - autoreconf -v - ./configure --prefix=/usr \ - --enable-install-program=su \ - --enable-no-install-program=groups,hostname,kill,uptime \ - --enable-pam ac_cv_func_openat=no - make - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - cd ${pkgdir}/usr/bin - install -dm755 ${pkgdir}/{bin,usr/sbin} - - # binaries required by FHS - _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \ - mkdir mknod mv pwd rm rmdir stty su sync true uname" - mv ${_fhs} ${pkgdir}/bin - ls -lha ${pkgdir}/bin/su - chmod -v 4555 ${pkgdir}/bin/su - - # binaries required by various Arch scripts - _bin="cut dir dircolors du install mkfifo readlink shred \ - sleep touch tr vdir" - mv ${_bin} ${pkgdir}/bin - ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep - - mv chroot ${pkgdir}/usr/sbin - install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su -} diff --git a/abs/core-testing/coreutils/coreutils-8.5-2-i686.pkg.tar.gz b/abs/core-testing/coreutils/coreutils-8.5-2-i686.pkg.tar.gz deleted file mode 120000 index 3eef1a4..0000000 --- a/abs/core-testing/coreutils/coreutils-8.5-2-i686.pkg.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/packages/coreutils-8.5-2-i686.pkg.tar.gz \ No newline at end of file diff --git a/abs/core-testing/coreutils/coreutils-pam.patch b/abs/core-testing/coreutils/coreutils-pam.patch deleted file mode 100644 index e61908f..0000000 --- a/abs/core-testing/coreutils/coreutils-pam.patch +++ /dev/null @@ -1,428 +0,0 @@ -diff -urNp coreutils-8.4-orig/configure.ac coreutils-8.4/configure.ac ---- coreutils-8.4-orig/configure.ac 2010-01-11 18:20:42.000000000 +0100 -+++ coreutils-8.4/configure.ac 2010-02-12 10:17:46.000000000 +0100 -@@ -126,6 +126,13 @@ if test "$gl_gcc_warnings" = yes; then - AC_SUBST([GNULIB_WARN_CFLAGS]) - fi - -+dnl Give the chance to enable PAM -+AC_ARG_ENABLE(pam, dnl -+[ --enable-pam Enable use of the PAM libraries], -+[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM]) -+LIB_PAM="-ldl -lpam -lpam_misc" -+AC_SUBST(LIB_PAM)]) -+ - AC_FUNC_FORK - - optional_bin_progs= -diff -urNp coreutils-8.4-orig/doc/coreutils.texi coreutils-8.4/doc/coreutils.texi ---- coreutils-8.4-orig/doc/coreutils.texi 2010-01-03 18:06:20.000000000 +0100 -+++ coreutils-8.4/doc/coreutils.texi 2010-02-12 10:17:46.000000000 +0100 -@@ -15081,8 +15081,11 @@ to certain shells, etc.). - @findex syslog - @command{su} can optionally be compiled to use @code{syslog} to report - failed, and optionally successful, @command{su} attempts. (If the system --supports @code{syslog}.) However, GNU @command{su} does not check if the --user is a member of the @code{wheel} group; see below. -+supports @code{syslog}.) -+ -+This version of @command{su} has support for using PAM for -+authentication. You can edit @file{/etc/pam.d/su} to customize its -+behaviour. - - The program accepts the following options. Also see @ref{Common options}. - -@@ -15124,6 +15127,8 @@ environment variables except @env{TERM}, - @env{PATH} to a compiled-in default value. Change to @var{user}'s home - directory. Prepend @samp{-} to the shell's name, intended to make it - read its login startup file(s). -+Additionaly @env{DISPLAY} and @env{XAUTHORITY} environment variables -+are preserved as well for PAM functionality. - - @item -m - @itemx -p -@@ -15163,33 +15168,6 @@ Exit status: - the exit status of the subshell otherwise - @end display - --@cindex wheel group, not supported --@cindex group wheel, not supported --@cindex fascism --@subsection Why GNU @command{su} does not support the @samp{wheel} group -- --(This section is by Richard Stallman.) -- --@cindex Twenex --@cindex MIT AI lab --Sometimes a few of the users try to hold total power over all the --rest. For example, in 1984, a few users at the MIT AI lab decided to --seize power by changing the operator password on the Twenex system and --keeping it secret from everyone else. (I was able to thwart this coup --and give power back to the users by patching the kernel, but I --wouldn't know how to do that in Unix.) -- --However, occasionally the rulers do tell someone. Under the usual --@command{su} mechanism, once someone learns the root password who --sympathizes with the ordinary users, he or she can tell the rest. The --``wheel group'' feature would make this impossible, and thus cement the --power of the rulers. -- --I'm on the side of the masses, not that of the rulers. If you are --used to supporting the bosses and sysadmins in whatever they do, you --might find this idea strange at first. -- -- - @node timeout invocation - @section @command{timeout}: Run a command with a time limit - -diff -urNp coreutils-8.4-orig/src/Makefile.am coreutils-8.4/src/Makefile.am ---- coreutils-8.4-orig/src/Makefile.am 2010-01-03 18:06:20.000000000 +0100 -+++ coreutils-8.4/src/Makefile.am 2010-02-12 10:17:46.000000000 +0100 -@@ -361,7 +361,7 @@ factor_LDADD += $(LIB_GMP) - uptime_LDADD += $(GETLOADAVG_LIBS) - - # for crypt --su_LDADD += $(LIB_CRYPT) -+su_LDADD += $(LIB_CRYPT) @LIB_PAM@ - - # for various ACL functions - copy_LDADD += $(LIB_ACL) -diff -urNp coreutils-8.4-orig/src/su.c coreutils-8.4/src/su.c ---- coreutils-8.4-orig/src/su.c 2010-02-12 10:15:15.000000000 +0100 -+++ coreutils-8.4/src/su.c 2010-02-12 10:24:29.000000000 +0100 -@@ -37,6 +37,16 @@ - restricts who can su to UID 0 accounts. RMS considers that to - be fascist. - -+#ifdef USE_PAM -+ -+ Actually, with PAM, su has nothing to do with whether or not a -+ wheel group is enforced by su. RMS tries to restrict your access -+ to a su which implements the wheel group, but PAM considers that -+ to be fascist, and gives the user/sysadmin the opportunity to -+ enforce a wheel group by proper editing of /etc/pam.conf -+ -+#endif -+ - Compile-time options: - -DSYSLOG_SUCCESS Log successful su's (by default, to root) with syslog. - -DSYSLOG_FAILURE Log failed su's (by default, to root) with syslog. -@@ -53,6 +63,15 @@ - #include - #include - -+#ifdef USE_PAM -+# include -+# include -+# include -+# include -+# include -+# include -+#endif /* USE_PAM */ -+ - #include "system.h" - #include "getpass.h" - -@@ -120,10 +139,17 @@ - /* The user to become if none is specified. */ - #define DEFAULT_USER "root" - -+#ifndef USE_PAM - char *crypt (char const *key, char const *salt); -+#endif - --static void run_shell (char const *, char const *, char **, size_t) -+static void run_shell (char const *, char const *, char **, size_t, -+ const struct passwd *) -+#ifdef USE_PAM -+ ; -+#else - ATTRIBUTE_NORETURN; -+#endif - - /* If true, pass the `-f' option to the subshell. */ - static bool fast_startup; -@@ -209,7 +235,26 @@ log_su (struct passwd const *pw, bool su - } - #endif - -+#ifdef USE_PAM -+static pam_handle_t *pamh = NULL; -+static int retval; -+static struct pam_conv conv = { -+ misc_conv, -+ NULL -+}; -+ -+#define PAM_BAIL_P if (retval) { \ -+ pam_end(pamh, PAM_SUCCESS); \ -+ return 0; \ -+} -+#define PAM_BAIL_P_VOID if (retval) { \ -+ pam_end(pamh, PAM_SUCCESS); \ -+return; \ -+} -+#endif -+ - /* Ask the user for a password. -+ If PAM is in use, let PAM ask for the password if necessary. - Return true if the user gives the correct password for entry PW, - false if not. Return true without asking for a password if run by UID 0 - or if PW has an empty password. */ -@@ -217,6 +262,44 @@ log_su (struct passwd const *pw, bool su - static bool - correct_password (const struct passwd *pw) - { -+#ifdef USE_PAM -+ struct passwd *caller; -+ char *tty_name, *ttyn; -+ retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh); -+ PAM_BAIL_P; -+ -+ if (getuid() != 0 && !isatty(0)) { -+ fprintf(stderr, "standard in must be a tty\n"); -+ exit(1); -+ } -+ -+ caller = getpwuid(getuid()); -+ if(caller != NULL && caller->pw_name != NULL) { -+ retval = pam_set_item(pamh, PAM_RUSER, caller->pw_name); -+ PAM_BAIL_P; -+ } -+ -+ ttyn = ttyname(0); -+ if (ttyn) { -+ if (strncmp(ttyn, "/dev/", 5) == 0) -+ tty_name = ttyn+5; -+ else -+ tty_name = ttyn; -+ retval = pam_set_item(pamh, PAM_TTY, tty_name); -+ PAM_BAIL_P; -+ } -+ retval = pam_authenticate(pamh, 0); -+ PAM_BAIL_P; -+ retval = pam_acct_mgmt(pamh, 0); -+ if (retval == PAM_NEW_AUTHTOK_REQD) { -+ /* password has expired. Offer option to change it. */ -+ retval = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); -+ PAM_BAIL_P; -+ } -+ PAM_BAIL_P; -+ /* must be authenticated if this point was reached */ -+ return 1; -+#else /* !USE_PAM */ - char *unencrypted, *encrypted, *correct; - #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP - /* Shadow passwd stuff for SVR3 and maybe other systems. */ -@@ -241,6 +324,7 @@ correct_password (const struct passwd *p - encrypted = crypt (unencrypted, correct); - memset (unencrypted, 0, strlen (unencrypted)); - return STREQ (encrypted, correct); -+#endif /* !USE_PAM */ - } - - /* Update `environ' for the new shell based on PW, with SHELL being -@@ -254,12 +338,18 @@ modify_environment (const struct passwd - /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH. - Unset all other environment variables. */ - char const *term = getenv ("TERM"); -+ char const *display = getenv ("DISPLAY"); -+ char const *xauthority = getenv ("XAUTHORITY"); - if (term) - term = xstrdup (term); - environ = xmalloc ((6 + !!term) * sizeof (char *)); - environ[0] = NULL; - if (term) - xsetenv ("TERM", term); -+ if (display) -+ xsetenv ("DISPLAY", display); -+ if (xauthority) -+ xsetenv ("XAUTHORITY", xauthority); - xsetenv ("HOME", pw->pw_dir); - xsetenv ("SHELL", shell); - xsetenv ("USER", pw->pw_name); -@@ -292,8 +382,13 @@ change_identity (const struct passwd *pw - { - #ifdef HAVE_INITGROUPS - errno = 0; -- if (initgroups (pw->pw_name, pw->pw_gid) == -1) -+ if (initgroups (pw->pw_name, pw->pw_gid) == -1) { -+#ifdef USE_PAM -+ pam_close_session(pamh, 0); -+ pam_end(pamh, PAM_ABORT); -+#endif - error (EXIT_CANCELED, errno, _("cannot set groups")); -+ } - endgrent (); - #endif - if (setgid (pw->pw_gid)) -@@ -302,6 +397,31 @@ change_identity (const struct passwd *pw - error (EXIT_CANCELED, errno, _("cannot set user id")); - } - -+#ifdef USE_PAM -+static int caught=0; -+/* Signal handler for parent process later */ -+static void su_catch_sig(int sig) -+{ -+ ++caught; -+} -+ -+int -+pam_copyenv (pam_handle_t *pamh) -+{ -+ char **env; -+ -+ env = pam_getenvlist(pamh); -+ if(env) { -+ while(*env) { -+ if (putenv (*env)) -+ xalloc_die (); -+ env++; -+ } -+ } -+ return(0); -+} -+#endif -+ - /* Run SHELL, or DEFAULT_SHELL if SHELL is empty. - If COMMAND is nonzero, pass it to the shell with the -c option. - Pass ADDITIONAL_ARGS to the shell as more arguments; there -@@ -309,17 +429,49 @@ change_identity (const struct passwd *pw - - static void - run_shell (char const *shell, char const *command, char **additional_args, -- size_t n_additional_args) -+ size_t n_additional_args, const struct passwd *pw) - { - size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1; - char const **args = xnmalloc (n_args, sizeof *args); - size_t argno = 1; -+#ifdef USE_PAM -+ int child; -+ sigset_t ourset; -+ int status; -+ -+ retval = pam_open_session(pamh,0); -+ if (retval != PAM_SUCCESS) { -+ fprintf (stderr, "could not open session\n"); -+ exit (1); -+ } -+ -+/* do this at the last possible moment, because environment variables may -+ be passed even in the session phase -+*/ -+ if(pam_copyenv(pamh) != PAM_SUCCESS) -+ fprintf (stderr, "error copying PAM environment\n"); -+ -+ /* Credentials should be set in the parent */ -+ if (pam_setcred(pamh, PAM_ESTABLISH_CRED) != PAM_SUCCESS) { -+ pam_close_session(pamh, 0); -+ fprintf(stderr, "could not set PAM credentials\n"); -+ exit(1); -+ } -+ -+ child = fork(); -+ if (child == 0) { /* child shell */ -+ change_identity (pw); -+ pam_end(pamh, 0); -+#endif - - if (simulate_login) - { - char *arg0; - char *shell_basename; - -+ if(chdir(pw->pw_dir)) -+ error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); -+ - shell_basename = last_component (shell); - arg0 = xmalloc (strlen (shell_basename) + 2); - arg0[0] = '-'; -@@ -344,6 +496,67 @@ run_shell (char const *shell, char const - error (0, errno, "%s", shell); - exit (exit_status); - } -+#ifdef USE_PAM -+ } else if (child == -1) { -+ fprintf(stderr, "can not fork user shell: %s", strerror(errno)); -+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); -+ pam_close_session(pamh, 0); -+ pam_end(pamh, PAM_ABORT); -+ exit(1); -+ } -+ /* parent only */ -+ sigfillset(&ourset); -+ if (sigprocmask(SIG_BLOCK, &ourset, NULL)) { -+ fprintf(stderr, "%s: signal malfunction\n", PROGRAM_NAME); -+ caught = 1; -+ } -+ if (!caught) { -+ struct sigaction action; -+ action.sa_handler = su_catch_sig; -+ sigemptyset(&action.sa_mask); -+ action.sa_flags = 0; -+ sigemptyset(&ourset); -+ if (sigaddset(&ourset, SIGTERM) -+ || sigaddset(&ourset, SIGALRM) -+ || sigaction(SIGTERM, &action, NULL) -+ || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) { -+ fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME); -+ caught = 1; -+ } -+ } -+ if (!caught) { -+ do { -+ int pid; -+ -+ pid = waitpid(-1, &status, WUNTRACED); -+ -+ if (((pid_t)-1 != pid) && (0 != WIFSTOPPED (status))) { -+ kill(getpid(), WSTOPSIG(status)); -+ /* once we get here, we must have resumed */ -+ kill(pid, SIGCONT); -+ } -+ } while (0 != WIFSTOPPED(status)); -+ } -+ -+ if (caught) { -+ fprintf(stderr, "\nSession terminated, killing shell..."); -+ kill (child, SIGTERM); -+ } -+ /* Not checking retval on this because we need to call close session */ -+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); -+ retval = pam_close_session(pamh, 0); -+ PAM_BAIL_P_VOID; -+ retval = pam_end(pamh, PAM_SUCCESS); -+ PAM_BAIL_P_VOID; -+ if (caught) { -+ sleep(2); -+ kill(child, SIGKILL); -+ fprintf(stderr, " ...killed.\n"); -+ exit(-1); -+ } -+ exit ((0 != WIFEXITED (status)) ? WEXITSTATUS (status) -+ : WTERMSIG (status) + 128); -+#endif /* USE_PAM */ - } - - /* Return true if SHELL is a restricted shell (one not returned by -@@ -511,9 +724,9 @@ main (int argc, char **argv) - shell = xstrdup (shell ? shell : pw->pw_shell); - modify_environment (pw, shell); - -+#ifndef USE_PAM - change_identity (pw); -- if (simulate_login && chdir (pw->pw_dir) != 0) -- error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); -+#endif - - /* error() flushes stderr, but does not check for write failure. - Normally, we would catch this via our atexit() hook of -@@ -523,5 +736,5 @@ main (int argc, char **argv) - if (ferror (stderr)) - exit (EXIT_CANCELED); - -- run_shell (shell, command, argv + optind, MAX (0, argc - optind)); -+ run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw); - } diff --git a/abs/core-testing/coreutils/coreutils-uname.patch b/abs/core-testing/coreutils/coreutils-uname.patch deleted file mode 100644 index b458abe..0000000 --- a/abs/core-testing/coreutils/coreutils-uname.patch +++ /dev/null @@ -1,173 +0,0 @@ -On linux platforms, grok /proc/cpuinfo for the CPU/vendor info. - -Prob not suitable for upstream seeing as how it's 100% linux-specific -http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html - -Patch originally by Carlos E. Gorges , but -heavily reworked to suck less. - -To add support for additional platforms, check out the show_cpuinfo() -func in the linux/arch// source tree of the kernel. - ---- coreutils/src/uname.c -+++ coreutils/src/uname.c -@@ -50,6 +50,11 @@ - # include - #endif - -+#if defined(__linux__) -+# define USE_PROCINFO -+# define UNAME_HARDWARE_PLATFORM -+#endif -+ - #include "system.h" - #include "error.h" - #include "quote.h" -@@ -138,6 +143,117 @@ - exit (status); - } - -+#if defined(USE_PROCINFO) -+ -+# if defined(__s390__) || defined(__s390x__) -+# define CPUINFO_FILE "/proc/sysinfo" -+# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c" -+# else -+# define CPUINFO_FILE "/proc/cpuinfo" -+# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c" -+# endif -+ -+# define PROCINFO_PROCESSOR 0 -+# define PROCINFO_HARDWARE_PLATFORM 1 -+ -+static void __eat_cpuinfo_space(char *buf) -+{ -+ /* first eat trailing space */ -+ char *tmp = buf + strlen(buf) - 1; -+ while (tmp > buf && isspace(*tmp)) -+ *tmp-- = '\0'; -+ /* then eat leading space */ -+ tmp = buf; -+ while (*tmp && isspace(*tmp)) -+ tmp++; -+ if (tmp != buf) -+ memmove(buf, tmp, strlen(tmp)+1); -+ /* finally collapse whitespace */ -+ tmp = buf; -+ while (tmp[0] && tmp[1]) { -+ if (isspace(tmp[0]) && isspace(tmp[1])) { -+ memmove(tmp, tmp+1, strlen(tmp)); -+ continue; -+ } -+ ++tmp; -+ } -+} -+ -+static int __linux_procinfo(int x, char *fstr, size_t s) -+{ -+ FILE *fp; -+ -+ char *procinfo_keys[] = { -+ /* --processor --hardware-platform */ -+ #if defined(__alpha__) -+ "cpu model", "system type" -+ #elif defined(__arm__) -+ "Processor", "Hardware" -+ #elif defined(__avr32__) -+ "processor", "cpu family" -+ #elif defined(__bfin__) -+ "CPU", "BOARD Name" -+ #elif defined(__cris__) -+ "cpu", "cpu model" -+ #elif defined(__frv__) -+ "CPU-Core", "System" -+ #elif defined(__i386__) || defined(__x86_64__) -+ "model name", "vendor_id" -+ #elif defined(__ia64__) -+ "family", "vendor" -+ #elif defined(__hppa__) -+ "cpu", "model" -+ #elif defined(__m68k__) -+ "CPU", "MMU" -+ #elif defined(__mips__) -+ "cpu model", "system type" -+ #elif defined(__powerpc__) || defined(__powerpc64__) -+ "cpu", "machine" -+ #elif defined(__s390__) || defined(__s390x__) -+ "Type", "Manufacturer" -+ #elif defined(__sh__) -+ "cpu type", "machine" -+ #elif defined(sparc) || defined(__sparc__) -+ "type", "cpu" -+ #elif defined(__vax__) -+ "cpu type", "cpu" -+ #else -+ "unknown", "unknown" -+ #endif -+ }; -+ -+ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) { -+ char key[65], value[257], eol, *ret = NULL; -+ -+ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { -+ __eat_cpuinfo_space(key); -+ if (!strcmp(key, procinfo_keys[x])) { -+ __eat_cpuinfo_space(value); -+ ret = value; -+ break; -+ } -+ if (eol != '\n') { -+ /* we need two fscanf's here in case the previous -+ * length limit caused us to read right up to the -+ * newline ... doing "%*[^\n]\n" wont eat the newline -+ */ -+ fscanf(fp, "%*[^\n]"); -+ fscanf(fp, "\n"); -+ } -+ } -+ fclose(fp); -+ -+ if (ret) { -+ strncpy(fstr, ret, s); -+ return 0; -+ } -+ } -+ -+ return -1; -+} -+ -+#endif -+ - /* Print ELEMENT, preceded by a space if something has already been - printed. */ - -@@ -250,10 +344,14 @@ main (int argc, char **argv) - if (toprint & PRINT_PROCESSOR) - { - char const *element = unknown; --#if HAVE_SYSINFO && defined SI_ARCHITECTURE -+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) - { - static char processor[257]; -+#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) -+#else - if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) -+#endif - element = processor; - } - #endif -@@ -306,9 +404,13 @@ main (int argc, char **argv) - if (element == unknown) - { - static char hardware_platform[257]; -+#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) -+#else - size_t s = sizeof hardware_platform; - static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; - if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) -+#endif - element = hardware_platform; - } - #endif diff --git a/abs/core-testing/coreutils/coreutils.install b/abs/core-testing/coreutils/coreutils.install deleted file mode 100644 index dff2dc5..0000000 --- a/abs/core-testing/coreutils/coreutils.install +++ /dev/null @@ -1,21 +0,0 @@ -infodir=/usr/share/info -filelist=(coreutils.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/abs/core-testing/coreutils/su.pam b/abs/core-testing/coreutils/su.pam deleted file mode 100644 index cf15f40..0000000 --- a/abs/core-testing/coreutils/su.pam +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -# Uncomment the following line to implicitly trust users in the "wheel" group. -#auth sufficient pam_wheel.so trust use_uid -# Uncomment the following line to require a user to be in the "wheel" group. -#auth required pam_wheel.so use_uid -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so diff --git a/abs/core-testing/cpio/PKGBUILD b/abs/core-testing/cpio/PKGBUILD deleted file mode 100644 index 9d1bbff..0000000 --- a/abs/core-testing/cpio/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: judd -pkgname=cpio -pkgver=2.9 -pkgrel=12 -pkgdesc="A tool to copy files into or out of a cpio or tar archive" -arch=(i686 x86_64) -license=('GPL') -url="http://www.gnu.org/software/cpio" -groups=('base') -depends=('glibc') -source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz \ - cpio-2.9-gcc43.patch) -md5sums=('2bb997a33555d4dc79d45d0cdf02cedd' '214864365e72328f5a4fd822bba55d74') - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - patch -Np1 -i $startdir/src/cpio-2.9-gcc43.patch - ./configure --prefix=/usr --mandir=/usr/man - make || return 1 - make DESTDIR=${startdir}/pkg install - rm -f ${startdir}/pkg/usr/bin/mt ${startdir}/pkg/usr/man/man1/mt.1 - mv ${startdir}/pkg/usr/bin ${startdir}/pkg/bin - rm -rf ${startdir}/pkg/usr/libexec -} diff --git a/abs/core-testing/cpio/cpio-2.9-gcc43.patch b/abs/core-testing/cpio/cpio-2.9-gcc43.patch deleted file mode 100644 index da9004a..0000000 --- a/abs/core-testing/cpio/cpio-2.9-gcc43.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- tar-1.19/lib/argp-fmtstream.h.gcc43 2007-09-28 15:11:36.000000000 +0200 -+++ tar-1.19/lib/argp-fmtstream.h 2008-02-13 16:56:58.000000000 +0100 -@@ -198,7 +198,11 @@ extern int __argp_fmtstream_ensure (argp - #endif - - #ifndef ARGP_FS_EI --#define ARGP_FS_EI extern inline -+# ifdef __GNUC_STDC_INLINE__ -+# define ARGP_FS_EI extern inline __attribute__((__gnu_inline__)) -+# else -+# define ARGP_FS_EI extern inline -+# endif - #endif - - ARGP_FS_EI size_t -diff -up tar-1.19/lib/argp.h.gcc43 tar-1.19/lib/argp.h ---- tar-1.19/lib/argp.h.gcc43 2007-09-28 15:11:36.000000000 +0200 -+++ tar-1.19/lib/argp.h 2008-02-13 16:55:36.000000000 +0100 -@@ -580,7 +580,11 @@ extern void *__argp_input (const struct - # endif - - # ifndef ARGP_EI --# define ARGP_EI extern __inline__ -+# if defined __GNUC_STDC_INLINE__ -+# define ARGP_EI extern __inline__ __attribute__((__gnu_inline__)) -+# else -+# define ARGP_EI extern __inline__ -+# endif - # endif - - ARGP_EI void diff --git a/abs/core-testing/cracklib/PKGBUILD b/abs/core-testing/cracklib/PKGBUILD deleted file mode 100644 index 597e160..0000000 --- a/abs/core-testing/cracklib/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Judd Vinet -# Contributor: Federico Quagliata (quaqo) -pkgname=cracklib -pkgver=2.8.10 -pkgrel=14 -pkgdesc="Password Checking Library" -arch=(i686 x86_64) -license=('GPL') -url="http://sourceforge.net/projects/cracklib" -groups=('base') -depends=('glibc') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('555f7832b63ebc7fb70b0373500c2358') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - mkdir -p $startdir/pkg/usr/share/dict - make DESTDIR=$startdir/pkg install - cp dicts/cracklib-small $startdir/pkg/usr/share/dict - sh ./util/cracklib-format dicts/cracklib-small \ - | sh ./util/cracklib-packer $startdir/pkg/usr/share/cracklib/pw_dict -} diff --git a/abs/core-testing/cryptsetup/PKGBUILD b/abs/core-testing/cryptsetup/PKGBUILD deleted file mode 100644 index ff5f83f..0000000 --- a/abs/core-testing/cryptsetup/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Judd Vinet -pkgname=cryptsetup -pkgver=1.0.6 -pkgrel=10 -pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" -arch=(i686 x86_64) -license=('GPL') -url="http://luks.endorphin.org/dm-crypt" -groups=('base') -depends=('device-mapper' 'libgcrypt' 'popt' 'e2fsprogs') -options=('!libtool' '!emptydirs') -source=(http://luks.endorphin.org/source/cryptsetup-$pkgver.tar.bz2 - encrypt_hook - encrypt_install - luksOpen-status.patch) -md5sums=('00d452eb7a76e39f5749545d48934a10' - '40fee2419cd444cfb283c311f9555d2d' - '24b76e9cb938bc3c8dcff396cbab28c7' - 'd4be8d2059d5427c057be4de4e948887') - -build() { - cd $startdir/src/$pkgname-$pkgver - # suppress "Command successful" message on luksOpen - patch -p1 -i $startdir/src/luksOpen-status.patch - ./configure --prefix=/usr --disable-static - make || return 1 - make DESTDIR=$startdir/pkg install - # include a static cryptsetup binary for initrd setups - make clean - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --enable-static - make || return 1 - # include a static cryptsetup binary for initrd setups - install -D -m755 src/cryptsetup $startdir/pkg/sbin/cryptsetup.static || return 1 - # install hook - install -D -m644 $startdir/src/encrypt_hook $startdir/pkg/lib/initcpio/hooks/encrypt - install -D -m644 $startdir/src/encrypt_install $startdir/pkg/lib/initcpio/install/encrypt -} diff --git a/abs/core-testing/cryptsetup/cryptsetup-1.0.5-run_udevsettle.patch b/abs/core-testing/cryptsetup/cryptsetup-1.0.5-run_udevsettle.patch deleted file mode 100644 index 28f85e6..0000000 --- a/abs/core-testing/cryptsetup/cryptsetup-1.0.5-run_udevsettle.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: cryptsetup-1.0.5/lib/libdevmapper.c -=================================================================== ---- cryptsetup-1.0.5.orig/lib/libdevmapper.c -+++ cryptsetup-1.0.5/lib/libdevmapper.c -@@ -18,6 +18,13 @@ - - #define CRYPT_TARGET "crypt" - -+#define UDEVSETTLE "/sbin/udevsettle" -+ -+static void run_udevsettle(void) -+{ -+ system(UDEVSETTLE); -+} -+ - static void set_dm_error(int level, const char *file, int line, - const char *f, ...) - { -@@ -184,6 +191,9 @@ static int dm_create_device(int reload, - if (dmi.read_only) - options->flags |= CRYPT_FLAG_READONLY; - -+ /* run udevsettle to avoid problems with busy dm devices */ -+ run_udevsettle(); -+ - r = 0; - - out: - diff --git a/abs/core-testing/cryptsetup/encrypt_hook b/abs/core-testing/cryptsetup/encrypt_hook deleted file mode 100644 index 248f1f2..0000000 --- a/abs/core-testing/cryptsetup/encrypt_hook +++ /dev/null @@ -1,122 +0,0 @@ -# vim: set ft=sh: -# TODO this one needs some work to work with lots of different -# encryption schemes -run_hook () -{ - /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1 - if [ -e "/sys/class/misc/device-mapper" ]; then - if [ ! -c "/dev/mapper/control" ]; then - read dev_t < /sys/class/misc/device-mapper/dev - /bin/mknod "/dev/mapper/control" c $(/bin/replace "${dev_t}" ':') - fi - [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" - - # Get keyfile if specified - ckeyfile="/crypto_keyfile.bin" - if [ "x${cryptkey}" != "x" ]; then - set -- $(/bin/replace "${cryptkey}" ':'); ckdev=$1; ckarg1=$2; ckarg2=$3 - try=10 - echo "Waiting for ${ckdev} ..." - while [ ! -b ${ckdev} -a ${try} -gt 0 ]; do - sleep 1 - try=$((${try}-1)) - done - if [ -b ${ckdev} ]; then - case ${ckarg1} in - *[!0-9]*) - # Use a file on the device - # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path - mkdir /ckey - mount -r -t ${ckarg1} ${ckdev} /ckey - dd if=/ckey/${ckarg2} of=${ckeyfile} >/dev/null 2>&1 - umount /ckey - ;; - *) - # Read raw data from the block device - # ckarg1 is numeric: ckarg1=offset, ckarg2=length - dd if=${ckdev} of=${ckeyfile} bs=1 skip=${ckarg1} count=${ckarg2} >/dev/null 2>&1 - ;; - esac - fi - [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." - fi - - if [ -n "${cryptdevice}" ]; then - set -- $(/bin/replace "${cryptdevice}" ':'); cryptdev="$1"; cryptname="$2"; - else - cryptdev="${root}" - cryptname="root" - fi - - if /bin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then - dopassphrase=1 - # If keyfile exists, try to use that - if [ -f ${ckeyfile} ]; then - if eval /bin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; then - dopassphrase=0 - else - echo "Invalid keyfile. Reverting to passphrase." - fi - fi - # Ask for a passphrase - if [ ${dopassphrase} -gt 0 ]; then - echo "" - echo "A password is required to access the ${cryptname} volume:" - - #loop until we get a real password - while ! eval /bin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; do - sleep 2; - done - fi - if [ -e "/dev/mapper/${cryptname}" ]; then - if [ "${cryptname}" = "root" ]; then - export root="/dev/mapper/root" - fi - else - err "Password succeeded, but ${cryptname} creation failed, aborting..." - exit 1 - fi - elif [ "x${crypto}" != "x" ]; then - do_oldcrypto () - { - if [ $# -ne 5 ]; then - err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" - err "Non-LUKS decryption not attempted..." - return 1 - fi - exe="/bin/cryptsetup create ${cryptname} ${cryptdev}" - [ "x$(eval echo ${1})" != "x" ] && exe="${exe} --hash \"$(eval echo ${1})\"" - [ "x$(eval echo ${2})" != "x" ] && exe="${exe} --cipher \"$(eval echo ${2})\"" - [ "x$(eval echo ${3})" != "x" ] && exe="${exe} --key-size \"$(eval echo ${3})\"" - [ "x$(eval echo ${4})" != "x" ] && exe="${exe} --offset \"$(eval echo ${4})\"" - [ "x$(eval echo ${5})" != "x" ] && exe="${exe} --skip \"$(eval echo ${5})\"" - if [ -f ${ckeyfile} ]; then - exe="${exe} --key-file ${ckeyfile}" - else - exe="${exe} --verify-passphrase" - echo "" - echo "A password is required to access the ${cryptname} volume:" - fi - eval "${exe} ${CSQUIET}" - } - - msg "Non-LUKS encrypted device found..." - do_oldcrypto $(/bin/replace -q "${crypto}" ':') - - if [ $? -ne 0 ]; then - err "Non-LUKS device decryption failed. verify format: " - err " crypto=hash:cipher:keysize:offset:skip" - exit 1 - fi - if [ -e "/dev/mapper/${cryptname}" ]; then - if [ "${cryptname}" = "root" ]; then - export root="/dev/mapper/root" - fi - else - err "Password succeeded, but ${cryptname} creation failed, aborting..." - exit 1 - fi - fi - nuke ${ckeyfile} - fi -} diff --git a/abs/core-testing/cryptsetup/encrypt_install b/abs/core-testing/cryptsetup/encrypt_install deleted file mode 100644 index 28cfa3f..0000000 --- a/abs/core-testing/cryptsetup/encrypt_install +++ /dev/null @@ -1,22 +0,0 @@ -# vim: set ft=sh: - -install () -{ - if [ -z "${CRYPTO_MODULES}" ]; then - MODULES=" dm-crypt $(all_modules "/crypto/") " - else - MODULES=" dm-crypt ${CRYPTO_MODULES} " - fi - BINARIES="" - add_dir "/dev/mapper" - add_file "/sbin/cryptsetup.static" "/bin/cryptsetup" - FILES="" - SCRIPT="encrypt" -} - -help () -{ -cat< - -pkgbase="cups" -pkgname=('libcups' 'cups') -pkgver=1.4.4 -pkgrel=3 -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.cups.org/" -makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'heimdal>=1.3.1' 'gnutls>=2.8.3' 'poppler>=0.12.3' - 'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme') -source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 - cups-avahi.patch - http://www.cups.org/strfiles/3595/str3595.patch - cups cups.logrotate cups.pam) -#options=('!emptydirs') -md5sums=('8776403ad60fea9e85eab9c04d88560d' - 'fce500e3e6e244f5b77fe8eaad87e022' - '0dd7329fc956d63a72085553171d62a2' - '5c85b7d8d2ddd02c2c64955cebbf55ea' - 'f861b18f4446c43918c8643dcbbd7f6d' - '96f82c38f3f540b53f3e5144900acf17') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - # Avahi support in the dnssd backend. patch from Fedora - patch -Np1 -i ${srcdir}/cups-avahi.patch || return 1 - - # fix Brother HL-1440 failing with msg "Unable to write 8192 bytes to printer!" (http://bugs.archlinux.org/task/18167) - patch -Np0 -i ${srcdir}/str3595.patch || return 1 - - # Rebuild configure script for --enable-avahi. - aclocal -I config-scripts - autoconf -I config-scripts - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \ - --with-cups-user=daemon --with-cups-group=lp --enable-pam=yes \ - --disable-ldap --libdir=/usr/lib --enable-raw-printing \ - --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --disable-threads --enable-avahi\ - --with-php=/usr/bin/php-cgi --with-pdftops=pdftops --with-optim="$CFLAGS" - make || return 1 -} - -package_libcups() { -pkgdesc="The CUPS Printing System - client libraries and headers" -depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'heimdal>=1.3.1' 'avahi') - - cd ${srcdir}/${pkgbase}-${pkgver} - make BUILDROOT=${pkgdir} install-headers install-libs || return 1 - # put this into the libs pkg to make other software find the libs(no pkg-config file included) - mkdir -p ${pkgdir}/usr/bin - install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config -} - -package_cups() { -pkgdesc="The CUPS Printing System - deamon package" -install=cups.install -backup=(etc/cups/cupsd.conf - etc/cups/mime.convs - etc/cups/mime.types - etc/cups/snmp.conf - etc/cups/printers.conf - etc/cups/classes.conf - etc/cups/client.conf - etc/cups/subscriptions.conf - etc/dbus-1/system.d/cups.conf - etc/logrotate.d/cups - etc/pam.d/cups - etc/xinetd.d/cups-lpd) -depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb' 'dbus-core' 'hicolor-icon-theme') -optdepends=('php: for included phpcups.so module') - - cd ${srcdir}/${pkgbase}-${pkgver} - make BUILDROOT=${pkgdir} install-data install-exec || return 1 - - # this one we ship in the libcups pkg - rm -f ${pkgdir}/usr/bin/cups-config - - # kill the sysv stuff - rm -rf ${pkgdir}/etc/rc*.d - rm -rf ${pkgdir}/etc/init.d - install -D -m755 ../cups ${pkgdir}/etc/rc.d/cups - install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups - install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups - - # fix perms on /var/spool and /etc - chmod 755 ${pkgdir}/var/spool - chmod 755 ${pkgdir}/etc - - # serial backend needs to run as root (http://bugs.archlinux.org/task/20396) - chmod 700 ${pkgdir}/usr/lib/cups/backend/serial - - # install ssl directory where to store the certs, solves some samba issues - install -dm700 -g lp ${pkgdir}/etc/cups/ssl - install -dm511 -g lp ${pkgdir}/var/run/cups/certs - - # install some more configuration files that will get filled by cupsd - touch ${pkgdir}/etc/cups/printers.conf - touch ${pkgdir}/etc/cups/classes.conf - touch ${pkgdir}/etc/cups/client.conf - echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf - echo "ServerName /var/run/cups/cups.sock # alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf - touch ${pkgdir}/etc/cups/subscriptions.conf - chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,client.conf,subscriptions.conf} - - # fix .desktop file - sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop - - # compress some driver files, adopted from Fedora - find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f -} diff --git a/abs/core-testing/cups/cups b/abs/core-testing/cups/cups deleted file mode 100755 index 4afaf5a..0000000 --- a/abs/core-testing/cups/cups +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/cupsd` -case "$1" in - start) - stat_busy "Starting CUPS Daemon" - [ -z "$PID" ] && /usr/sbin/cupsd - if [ $? -gt 0 ]; then - stat_fail - else - echo $(pidof -o %PPID -x /usr/sbin/cupsd) > /var/run/cups.pid - add_daemon cups - stat_done - fi - ;; - stop) - stat_busy "Stopping CUPS Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/cups.pid - rm_daemon cups - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/core-testing/cups/cups-avahi.patch b/abs/core-testing/cups/cups-avahi.patch deleted file mode 100644 index 9783cd4..0000000 --- a/abs/core-testing/cups/cups-avahi.patch +++ /dev/null @@ -1,1088 +0,0 @@ -diff -up cups-1.4.0/backend/dnssd.c.avahi cups-1.4.0/backend/dnssd.c ---- cups-1.4.0/backend/dnssd.c.avahi 2009-08-07 23:27:12.000000000 +0100 -+++ cups-1.4.0/backend/dnssd.c 2009-09-04 14:57:04.730388833 +0100 -@@ -22,6 +22,7 @@ - * exec_backend() - Execute the backend that corresponds to the - * resolved service name. - * get_device() - Create or update a device. -+* find_device() - * query_callback() - Process query data. - * sigterm_handler() - Handle termination signals... - * unquote() - Unquote a name string. -@@ -33,7 +34,18 @@ - - #include "backend-private.h" - #include --#include -+#ifdef HAVE_DNSSD -+# include -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include -+# include -+# include -+# include -+# include -+# include -+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX -+#endif /* HAVE_AVAHI */ - - - /* -@@ -52,7 +64,12 @@ typedef enum - - typedef struct - { -+#ifdef HAVE_DNSSD - DNSServiceRef ref; /* Service reference for resolve */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ int resolved; /* Did we resolve the device? */ -+#endif /* HAVE_AVAHI */ - char *name, /* Service name */ - *domain, /* Domain name */ - *fullName, /* Full name */ -@@ -64,6 +81,20 @@ typedef struct - sent; /* Did we list the device? */ - } cups_device_t; - -+typedef struct -+{ -+ char key[256]; -+ char value[256]; -+ -+#ifdef HAVE_DNSSD -+ const uint8_t *data; -+ const uint8_t *datanext; -+ const uint8_t *dataend; -+#else /* HAVE_AVAHI */ -+ AvahiStringList *txt; -+#endif /* HAVE_DNSSD */ -+} cups_txt_records_t; -+ - - /* - * Local globals... -@@ -77,6 +108,7 @@ static int job_canceled = 0; - * Local functions... - */ - -+#ifdef HAVE_DNSSD - static void browse_callback(DNSServiceRef sdRef, - DNSServiceFlags flags, - uint32_t interfaceIndex, -@@ -92,12 +124,6 @@ static void browse_local_callback(DNSSe - const char *regtype, - const char *replyDomain, - void *context); --static int compare_devices(cups_device_t *a, cups_device_t *b); --static void exec_backend(char **argv); --static cups_device_t *get_device(cups_array_t *devices, -- const char *serviceName, -- const char *regtype, -- const char *replyDomain); - static void query_callback(DNSServiceRef sdRef, - DNSServiceFlags flags, - uint32_t interfaceIndex, -@@ -106,9 +132,111 @@ static void query_callback(DNSServiceRe - uint16_t rrclass, uint16_t rdlen, - const void *rdata, uint32_t ttl, - void *context); -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+static void avahi_client_callback (AvahiClient *client, -+ AvahiClientState state, -+ void *context); -+static void avahi_browse_callback (AvahiServiceBrowser *browser, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiBrowserEvent event, -+ const char *serviceName, -+ const char *regtype, -+ const char *replyDomain, -+ AvahiLookupResultFlags flags, -+ void *context); -+#endif /* HAVE_AVAHI */ -+ -+static cups_device_t * find_device (cups_array_t *devices, -+ cups_txt_records_t *txt, -+ cups_device_t *dkey); -+static int compare_devices(cups_device_t *a, cups_device_t *b); -+static void exec_backend(char **argv); -+static cups_device_t *get_device(cups_array_t *devices, -+ const char *serviceName, -+ const char *regtype, -+ const char *replyDomain); - static void sigterm_handler(int sig); - static void unquote(char *dst, const char *src, size_t dstsize); - -+#ifdef HAVE_AVAHI -+static AvahiSimplePoll *simple_poll = NULL; -+static int avahi_got_callback; -+#endif /* HAVE_AVAHI */ -+ -+ -+/* -+ * cups_txt_records_t access functions -+ */ -+static cups_txt_records_t * -+next_txt_record (cups_txt_records_t *txt) -+{ -+#ifdef HAVE_DNSSD -+ txt->data = txt->datanext; -+#else /* HAVE_AVAHI */ -+ txt->txt = avahi_string_list_get_next (txt->txt); -+ if (txt->txt == NULL) -+ return NULL; -+#endif /* HAVE_DNSSD */ -+ -+ return txt; -+} -+ -+static int -+parse_txt_record_pair (cups_txt_records_t *txt) -+{ -+#ifdef HAVE_DNSSD -+ uint8_t datalen; -+ uint8_t *data = txt->data; -+ char *ptr; -+ -+ /* -+ * Read a key/value pair starting with an 8-bit length. Since the -+ * length is 8 bits and the size of the key/value buffers is 256, we -+ * don't need to check for overflow... -+ */ -+ -+ datalen = *data++; -+ if (!datalen || (data + datalen) >= txt->dataend) -+ return NULL; -+ txt->datanext = data + datalen; -+ -+ for (ptr = txt->key; data < txt->datanext && *data != '='; data ++) -+ *ptr++ = *data; -+ *ptr = '\0'; -+ -+ if (data < txt->datanext && *data == '=') -+ { -+ data++; -+ -+ if (data < datanext) -+ memcpy (txt->value, data, txt->datanext - data); -+ value[txt->datanext - data] = '\0'; -+ } -+ else -+ return 1; -+#else /* HAVE_AVAHI */ -+ char *key, *value; -+ size_t len; -+ avahi_string_list_get_pair (txt->txt, &key, &value, &len); -+ if (len > sizeof (txt->value) - 1) -+ len = sizeof (txt->value) - 1; -+ -+ memcpy (txt->value, value, len); -+ txt->value[len] = '\0'; -+ len = strlen (key); -+ if (len > sizeof (txt->key) - 1) -+ len = sizeof (txt->key) - 1; -+ -+ memcpy (txt->key, key, len); -+ txt->key[len] = '\0'; -+ avahi_free (key); -+ avahi_free (value); -+#endif /* HAVE_AVAHI */ -+ -+ return 0; -+} - - /* - * 'main()' - Browse for printers. -@@ -119,6 +247,13 @@ main(int argc, /* I - Number of comm - char *argv[]) /* I - Command-line arguments */ - { - const char *name; /* Backend name */ -+ cups_array_t *devices; /* Device array */ -+ cups_device_t *device; /* Current device */ -+ char uriName[1024]; /* Unquoted fullName for URI */ -+#ifdef HAVE_DNSSD -+ int fd; /* Main file descriptor */ -+ fd_set input; /* Input set for select() */ -+ struct timeval timeout; /* Timeout for select() */ - DNSServiceRef main_ref, /* Main service reference */ - fax_ipp_ref, /* IPP fax service reference */ - ipp_ref, /* IPP service reference */ -@@ -130,12 +265,11 @@ main(int argc, /* I - Number of comm - pdl_datastream_ref, /* AppSocket service reference */ - printer_ref, /* LPD service reference */ - riousbprint_ref; /* Remote IO service reference */ -- int fd; /* Main file descriptor */ -- fd_set input; /* Input set for select() */ -- struct timeval timeout; /* Timeout for select() */ -- cups_array_t *devices; /* Device array */ -- cups_device_t *device; /* Current device */ -- char uriName[1024]; /* Unquoted fullName for URI */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ AvahiClient *client; -+ int error; -+#endif /* HAVE_AVAHI */ - #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) - struct sigaction action; /* Actions for POSIX signals */ - #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ -@@ -194,6 +328,49 @@ main(int argc, /* I - Number of comm - * Browse for different kinds of printers... - */ - -+#ifdef HAVE_AVAHI -+ if ((simple_poll = avahi_simple_poll_new ()) == NULL) -+ { -+ perror ("ERROR: Unable to create avahi simple poll object"); -+ return (1); -+ } -+ -+ client = avahi_client_new (avahi_simple_poll_get (simple_poll), -+ 0, avahi_client_callback, NULL, &error); -+ if (!client) -+ { -+ perror ("ERROR: Unable to create avahi client"); -+ return (1); -+ } -+ -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_fax-ipp._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_ipp._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_ipp-tls._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_pdl-datastream._tcp", -+ NULL, 0, -+ avahi_browse_callback, -+ devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_printer._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_riousbprint._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+#endif /* HAVE_AVAHI */ -+#ifdef HAVE_DNSSD - if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError) - { - perror("ERROR: Unable to create service connection"); -@@ -245,6 +422,7 @@ main(int argc, /* I - Number of comm - riousbprint_ref = main_ref; - DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0, - "_riousbprint._tcp", NULL, browse_callback, devices); -+#endif /* HAVE_DNSSD */ - - /* - * Loop until we are killed... -@@ -252,6 +430,9 @@ main(int argc, /* I - Number of comm - - while (!job_canceled) - { -+ int announce = 0; -+ -+#ifdef HAVE_DNSSD - FD_ZERO(&input); - FD_SET(fd, &input); - -@@ -271,11 +452,35 @@ main(int argc, /* I - Number of comm - } - else - { -+ announce = 1; -+ } -+#else /* HAVE_AVAHI */ -+ int r; -+ avahi_got_callback = 0; -+ r = avahi_simple_poll_iterate (simple_poll, 1); -+ if (r != 0 && r != EINTR) -+ { -+ /* -+ * We've been told to exit the loop. Perhaps the connection to -+ * avahi failed. -+ */ -+ -+ break; -+ } -+ -+ if (avahi_got_callback) -+ announce = 1; -+#endif /* HAVE_DNSSD */ -+ -+ if (announce) -+ { - /* - * Announce any devices we've found... - */ - -+#ifdef HAVE_DNSSD - DNSServiceErrorType status; /* DNS query status */ -+#endif /* HAVE_DNSSD */ - cups_device_t *best; /* Best matching device */ - char device_uri[1024]; /* Device URI */ - int count; /* Number of queries */ -@@ -285,6 +490,7 @@ main(int argc, /* I - Number of comm - best = NULL, count = 0; - device; - device = (cups_device_t *)cupsArrayNext(devices)) -+#ifdef HAVE_DNSSD - if (!device->ref && !device->sent) - { - /* -@@ -313,14 +519,23 @@ main(int argc, /* I - Number of comm - count ++; - } - } -- else if (!device->sent) -+ else -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ if (!device->resolved) -+ continue; -+ else -+#endif /* HAVE_AVAHI */ -+ if (!device->sent) - { -+#ifdef HAVE_DNSSD - /* - * Got the TXT records, now report the device... - */ - - DNSServiceRefDeallocate(device->ref); - device->ref = 0; -+#endif /* HAVE_DNSSD */ - - if (!best) - best = device; -@@ -372,6 +587,7 @@ main(int argc, /* I - Number of comm - * 'browse_callback()' - Browse devices. - */ - -+#ifdef HAVE_DNSSD - static void - browse_callback( - DNSServiceRef sdRef, /* I - Service reference */ -@@ -405,12 +621,14 @@ browse_callback( - - get_device((cups_array_t *)context, serviceName, regtype, replyDomain); - } -+#endif /* HAVE_DNSSD */ - - - /* - * 'browse_local_callback()' - Browse local devices. - */ - -+#ifdef HAVE_DNSSD - static void - browse_local_callback( - DNSServiceRef sdRef, /* I - Service reference */ -@@ -456,6 +674,7 @@ browse_local_callback( - device->fullName); - device->sent = 1; - } -+#endif /* HAVE_DNSSD */ - - - /* -@@ -528,6 +747,32 @@ exec_backend(char **argv) /* I - Comman - exit(CUPS_BACKEND_STOP); - } - -+static int -+device_type (const char *regtype) -+{ -+#ifdef HAVE_AVAHI -+ if (!strcmp(regtype, "_ipp._tcp") || -+ !strcmp(regtype, "_ipp-tls._tcp")) -+ return (CUPS_DEVICE_IPP); -+ else if (!strcmp(regtype, "_fax-ipp._tcp")) -+ return (CUPS_DEVICE_FAX_IPP); -+ else if (!strcmp(regtype, "_printer._tcp")) -+ return (CUPS_DEVICE_PDL_DATASTREAM); -+#else -+ if (!strcmp(regtype, "_ipp._tcp.") || -+ !strcmp(regtype, "_ipp-tls._tcp.")) -+ return (CUPS_DEVICE_IPP); -+ else if (!strcmp(regtype, "_fax-ipp._tcp.")) -+ return (CUPS_DEVICE_FAX_IPP); -+ else if (!strcmp(regtype, "_printer._tcp.")) -+ return (CUPS_DEVICE_PRINTER); -+ else if (!strcmp(regtype, "_pdl-datastream._tcp.")) -+ return (CUPS_DEVICE_PDL_DATASTREAM); -+#endif /* HAVE_AVAHI */ -+ -+ return (CUPS_DEVICE_RIOUSBPRINT); -+} -+ - - /* - * 'get_device()' - Create or update a device. -@@ -550,18 +795,7 @@ get_device(cups_array_t *devices, /* I - - */ - - key.name = (char *)serviceName; -- -- if (!strcmp(regtype, "_ipp._tcp.") || -- !strcmp(regtype, "_ipp-tls._tcp.")) -- key.type = CUPS_DEVICE_IPP; -- else if (!strcmp(regtype, "_fax-ipp._tcp.")) -- key.type = CUPS_DEVICE_FAX_IPP; -- else if (!strcmp(regtype, "_printer._tcp.")) -- key.type = CUPS_DEVICE_PRINTER; -- else if (!strcmp(regtype, "_pdl-datastream._tcp.")) -- key.type = CUPS_DEVICE_PDL_DATASTREAM; -- else -- key.type = CUPS_DEVICE_RIOUSBPRINT; -+ key.type = device_type (regtype); - - for (device = cupsArrayFind(devices, &key); - device; -@@ -581,8 +815,14 @@ get_device(cups_array_t *devices, /* I - - free(device->domain); - device->domain = strdup(replyDomain); - -+#ifdef HAVE_DNSSD - DNSServiceConstructFullName(fullName, device->name, regtype, - replyDomain); -+#else /* HAVE_AVAHI */ -+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, -+ serviceName, regtype, replyDomain); -+#endif /* HAVE_DNSSD */ -+ - free(device->fullName); - device->fullName = strdup(fullName); - } -@@ -602,6 +842,9 @@ get_device(cups_array_t *devices, /* I - - device->domain = strdup(replyDomain); - device->type = key.type; - device->priority = 50; -+#ifdef HAVE_AVAHI -+ device->resolved = 0; -+#endif /* HAVE_AVAHI */ - - cupsArrayAdd(devices, device); - -@@ -609,7 +852,13 @@ get_device(cups_array_t *devices, /* I - - * Set the "full name" of this service, which is used for queries... - */ - -+#ifdef HAVE_DNSSD - DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain); -+#else /* HAVE_AVAHI */ -+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, -+ serviceName, regtype, replyDomain); -+#endif /* HAVE_DNSSD */ -+ - device->fullName = strdup(fullName); - - return (device); -@@ -620,6 +869,7 @@ get_device(cups_array_t *devices, /* I - - * 'query_callback()' - Process query data. - */ - -+#ifdef HAVE_DNSSD - static void - query_callback( - DNSServiceRef sdRef, /* I - Service reference */ -@@ -639,7 +889,7 @@ query_callback( - *ptr; /* Pointer into string */ - cups_device_t dkey, /* Search key */ - *device; /* Device */ -- -+ cups_txt_records_t txt; - - fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, " - "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", " -@@ -673,84 +923,212 @@ query_callback( - if ((ptr = strstr(name, "._")) != NULL) - *ptr = '\0'; - -- if (strstr(fullName, "_ipp._tcp.") || -- strstr(fullName, "_ipp-tls._tcp.")) -- dkey.type = CUPS_DEVICE_IPP; -- else if (strstr(fullName, "_fax-ipp._tcp.")) -- dkey.type = CUPS_DEVICE_FAX_IPP; -- else if (strstr(fullName, "_printer._tcp.")) -- dkey.type = CUPS_DEVICE_PRINTER; -- else if (strstr(fullName, "_pdl-datastream._tcp.")) -- dkey.type = CUPS_DEVICE_PDL_DATASTREAM; -+ dkey.type = device_type (fullName); -+ -+ txt.data = rdata; -+ txt.dataend = rdata + rdlen; -+ device = find_device ((cups_array_t *) context, &txt, &dkey); -+ if (!device) -+ fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); -+} -+#endif /* HAVE_DNSSD */ -+ -+#ifdef HAVE_AVAHI -+static void -+avahi_client_callback(AvahiClient *client, -+ AvahiClientState state, -+ void *context) -+{ -+ /* -+ * If the connection drops, quit. -+ */ -+ -+ if (state == AVAHI_CLIENT_FAILURE) -+ { -+ fprintf (stderr, "ERROR: Avahi connection failed\n"); -+ avahi_simple_poll_quit (simple_poll); -+ } -+} -+ -+static void -+avahi_query_callback(AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ AvahiClient *client; -+ cups_device_t key, -+ *device; -+ char uqname[1024], -+ *ptr; -+ cups_txt_records_t txtr; -+ -+ client = avahi_service_resolver_get_client (resolver); -+ if (event != AVAHI_RESOLVER_FOUND) -+ { -+ if (event == AVAHI_RESOLVER_FAILURE) -+ { -+ fprintf (stderr, "ERROR: %s\n", -+ avahi_strerror (avahi_client_errno (client))); -+ } -+ -+ avahi_service_resolver_free (resolver); -+ return; -+ } -+ -+ /* -+ * Set search key for device. -+ */ -+ -+ key.name = uqname; -+ unquote (uqname, name, sizeof (uqname)); -+ if ((ptr = strstr(name, "._")) != NULL) -+ *ptr = '\0'; -+ -+ key.domain = (char *) domain; -+ key.type = device_type (type); -+ -+ /* -+ * Find the device and the the TXT information. -+ */ -+ -+ txtr.txt = txt; -+ device = find_device ((cups_array_t *) context, &txtr, &key); -+ if (device) -+ { -+ /* -+ * Let the main loop know to announce the device. -+ */ -+ -+ device->resolved = 1; -+ avahi_got_callback = 1; -+ } - else -- dkey.type = CUPS_DEVICE_RIOUSBPRINT; -+ fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name); -+ -+ avahi_service_resolver_free (resolver); -+} -+ -+static void -+avahi_browse_callback(AvahiServiceBrowser *browser, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiBrowserEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ AvahiClient *client = avahi_service_browser_get_client (browser); -+ -+ switch (event) -+ { -+ case AVAHI_BROWSER_FAILURE: -+ fprintf (stderr, "ERROR: %s\n", -+ avahi_strerror (avahi_client_errno (client))); -+ avahi_simple_poll_quit (simple_poll); -+ return; -+ -+ case AVAHI_BROWSER_NEW: -+ /* -+ * This object is new on the network. -+ */ -+ -+ if (flags & AVAHI_LOOKUP_RESULT_LOCAL) -+ { -+ /* -+ * This comes from the local machine so ignore it. -+ */ -+ -+ fprintf (stderr, "DEBUG: ignoring local service %s\n", name); -+ } -+ else -+ { -+ /* -+ * Create a device entry for it if it doesn't yet exist. -+ */ -+ -+ get_device ((cups_array_t *)context, name, type, domain); -+ -+ /* -+ * Now look for a TXT entry. -+ */ -+ -+ if (avahi_service_resolver_new (client, interface, protocol, -+ name, type, domain, -+ AVAHI_PROTO_UNSPEC, 0, -+ avahi_query_callback, context) == NULL) -+ { -+ fprintf (stderr, "ERROR: failed to resolve service %s: %s\n", -+ name, avahi_strerror (avahi_client_errno (client))); -+ } -+ } -+ -+ break; - -- for (device = cupsArrayFind(devices, &dkey); -+ case AVAHI_BROWSER_REMOVE: -+ case AVAHI_BROWSER_ALL_FOR_NOW: -+ case AVAHI_BROWSER_CACHE_EXHAUSTED: -+ break; -+ } -+} -+#endif /* HAVE_AVAHI */ -+ -+static cups_device_t * -+find_device (cups_array_t *devices, -+ cups_txt_records_t *txt, -+ cups_device_t *dkey) -+{ -+ cups_device_t *device; -+ char *ptr; -+ -+ for (device = cupsArrayFind(devices, dkey); - device; - device = cupsArrayNext(devices)) - { -- if (strcasecmp(device->name, dkey.name) || -- strcasecmp(device->domain, dkey.domain)) -+ if (strcasecmp(device->name, dkey->name) || -+ strcasecmp(device->domain, dkey->domain)) - { - device = NULL; - break; - } -- else if (device->type == dkey.type) -+ else if (device->type == dkey->type) - { - /* - * Found it, pull out the priority and make and model from the TXT - * record and save it... - */ - -- const uint8_t *data, /* Pointer into data */ -- *datanext, /* Next key/value pair */ -- *dataend; /* End of entire TXT record */ -- uint8_t datalen; /* Length of current key/value pair */ -- char key[256], /* Key string */ -- value[256], /* Value string */ -- make_and_model[512], -+ char make_and_model[512], - /* Manufacturer and model */ - model[256], /* Model */ -- device_id[2048];/* 1284 device ID */ -- -+ device_id[2048]; /* 1284 device ID */ - - device_id[0] = '\0'; - make_and_model[0] = '\0'; - - strcpy(model, "Unknown"); - -- for (data = rdata, dataend = data + rdlen; -- data < dataend; -- data = datanext) -+ for (;;) - { -- /* -- * Read a key/value pair starting with an 8-bit length. Since the -- * length is 8 bits and the size of the key/value buffers is 256, we -- * don't need to check for overflow... -- */ -- -- datalen = *data++; -- -- if (!datalen || (data + datalen) >= dataend) -- break; -- -- datanext = data + datalen; -+ char *key; -+ char *value; - -- for (ptr = key; data < datanext && *data != '='; data ++) -- *ptr++ = *data; -- *ptr = '\0'; -- -- if (data < datanext && *data == '=') -- { -- data ++; -- -- if (data < datanext) -- memcpy(value, data, datanext - data); -- value[datanext - data] = '\0'; -- } -- else -- continue; -+ if (parse_txt_record_pair (txt)) -+ goto next; - -+ key = txt->key; -+ value = txt->value; - if (!strncasecmp(key, "usb_", 4)) - { - /* -@@ -805,6 +1183,10 @@ query_callback( - if (device->type == CUPS_DEVICE_PRINTER) - device->sent = 1; - } -+ -+ next: -+ if (next_txt_record (txt) == NULL) -+ break; - } - - if (device->device_id) -@@ -854,11 +1236,9 @@ query_callback( - } - } - -- if (!device) -- fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); -+ return device; - } - -- - /* - * 'sigterm_handler()' - Handle termination signals... - */ -diff -up cups-1.4.0/config.h.in.avahi cups-1.4.0/config.h.in ---- cups-1.4.0/config.h.in.avahi 2009-06-10 16:51:21.000000000 +0100 -+++ cups-1.4.0/config.h.in 2009-09-04 14:57:04.733388405 +0100 -@@ -336,6 +336,13 @@ - - - /* -+ * Do we have Avahi for DNS Service Discovery? -+ */ -+ -+#undef HAVE_AVAHI -+ -+ -+/* - * Do we have ? - */ - -diff -up cups-1.4.0/config-scripts/cups-dnssd.m4.avahi cups-1.4.0/config-scripts/cups-dnssd.m4 ---- cups-1.4.0/config-scripts/cups-dnssd.m4.avahi 2009-02-10 17:05:35.000000000 +0000 -+++ cups-1.4.0/config-scripts/cups-dnssd.m4 2009-09-04 14:57:04.731388902 +0100 -@@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn - DNSSDLIBS="" - DNSSD_BACKEND="" - -+AC_ARG_ENABLE(avahi, [ --enable-avahi turn on DNS Service Discovery support, default=no], -+ [if test x$enable_avahi = xyes; then -+ AC_MSG_CHECKING(for Avahi) -+ if $PKGCONFIG --exists avahi-client; then -+ AC_MSG_RESULT(yes) -+ CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`" -+ DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" -+ DNSSD_BACKEND="dnssd" -+ AC_DEFINE(HAVE_AVAHI) -+ enable_dnssd=no -+ else -+ AC_MSG_RESULT(no) -+ fi -+ fi]) -+ - if test x$enable_dnssd != xno; then - AC_CHECK_HEADER(dns_sd.h, [ - case "$uname" in -diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c ---- cups-1.4.0/cups/http-support.c.avahi 2009-06-12 01:21:58.000000000 +0100 -+++ cups-1.4.0/cups/http-support.c 2009-09-04 14:57:04.736398674 +0100 -@@ -55,6 +55,11 @@ - # include - # include - #endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include -+# include -+# include -+#endif /* HAVE_AVAHI */ - - - /* -@@ -121,6 +126,24 @@ static void resolve_callback(DNSService - void *context); - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+static void avahi_resolve_uri_client_cb(AvahiClient *client, -+ AvahiClientState state, -+ void *simple_poll); -+static void avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context); -+#endif /* HAVE_AVAHI */ - - /* - * 'httpAssembleURI()' - Assemble a uniform resource identifier from its -@@ -1349,15 +1372,26 @@ _httpResolveURI( - - if (strstr(hostname, "._tcp")) - { -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ char *regtype, /* Pointer to type in hostname */ -+ *domain; /* Pointer to domain in hostname */ - #ifdef HAVE_DNSSD - DNSServiceRef ref, /* DNS-SD master service reference */ - domainref, /* DNS-SD service reference for domain */ - localref; /* DNS-SD service reference for .local */ - int domainsent = 0; /* Send the domain resolve? */ -- char *regtype, /* Pointer to type in hostname */ -- *domain; /* Pointer to domain in hostname */ - _http_uribuf_t uribuf; /* URI buffer */ - struct pollfd polldata; /* Polling data */ -+#else /* HAVE_AVAHI */ -+ AvahiSimplePoll *simple_poll; -+ AvahiClient *client; -+ int error; -+ struct -+ { -+ AvahiSimplePoll *poll; -+ _http_uribuf_t uribuf; -+ } user_data; -+#endif /* HAVE_DNSSD */ - - - if (logit) -@@ -1395,8 +1429,13 @@ _httpResolveURI( - if (domain) - *domain++ = '\0'; - -+#ifdef HAVE_DNSSD - uribuf.buffer = resolved_uri; - uribuf.bufsize = resolved_size; -+#else -+ user_data.uribuf.buffer = resolved_uri; -+ user_data.uribuf.bufsize = resolved_size; -+#endif - - resolved_uri[0] = '\0'; - -@@ -1411,6 +1450,7 @@ _httpResolveURI( - - uri = NULL; - -+#ifdef HAVE_DNSSD - if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError) - { - localref = ref; -@@ -1486,6 +1526,36 @@ _httpResolveURI( - - DNSServiceRefDeallocate(ref); - } -+#else /* HAVE_AVAHI */ -+ if ((simple_poll = avahi_simple_poll_new ()) != NULL) -+ { -+ if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll), -+ 0, avahi_resolve_uri_client_cb, -+ &simple_poll, &error)) != NULL) -+ { -+ user_data.poll = simple_poll; -+ if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, hostname, -+ regtype, domain, AVAHI_PROTO_UNSPEC, 0, -+ avahi_resolve_uri_resolver_cb, -+ &user_data) != NULL) -+ { -+ avahi_simple_poll_loop (simple_poll); -+ -+ /* -+ * Collect the result. -+ */ -+ -+ if (resolved_uri[0]) -+ uri = resolved_uri; -+ } -+ -+ avahi_client_free (client); -+ } -+ -+ avahi_simple_poll_free (simple_poll); -+ } -+#endif /* HAVE_DNSSD */ - - if (logit) - { -@@ -1497,13 +1567,13 @@ _httpResolveURI( - fputs("STATE: -connecting-to-device\n", stderr); - } - --#else -+#else /* HAVE_DNSSD || HAVE_AVAHI */ - /* - * No DNS-SD support... - */ - - uri = NULL; --#endif /* HAVE_DNSSD */ -+#endif /* HAVE_DNSSD || HAVE_AVAHI */ - - if (logit && !uri) - _cupsLangPuts(stderr, _("Unable to find printer!\n")); -@@ -1708,6 +1778,105 @@ resolve_callback( - } - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+static void -+avahi_resolve_uri_client_cb (AvahiClient *client, -+ AvahiClientState state, -+ void *simple_poll) -+{ -+ DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, " -+ "simple_poll=%p)\n", client, state, simple_poll)); -+ -+ /* -+ * If the connection drops, quit. -+ */ -+ -+ if (state == AVAHI_CLIENT_FAILURE) -+ avahi_simple_poll_quit (simple_poll); -+} -+ -+static void -+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ const char *scheme; /* URI scheme */ -+ char rp[256]; /* Remote printer */ -+ AvahiStringList *pair; -+ char *value; -+ size_t valueLen = 0; -+ char addr[AVAHI_ADDRESS_STR_MAX]; -+ struct -+ { -+ AvahiSimplePoll *poll; -+ _http_uribuf_t uribuf; -+ } *poll_uribuf = context; -+ -+ DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, " -+ "interface=%d, protocol=%d, event=%d, name=\"%s\", " -+ "type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, " -+ "port=%d, txt=%p, flags=%d, context=%p)\n", -+ resolver, interface, protocol, event, name, type, domain, -+ host_name, address, port, txt, flags, context)); -+ -+ if (event != AVAHI_RESOLVER_FOUND) -+ { -+ avahi_service_resolver_free (resolver); -+ avahi_simple_poll_quit (poll_uribuf->poll); -+ return; -+ } -+ -+ /* -+ * Figure out the scheme from the full name... -+ */ -+ -+ if (strstr(type, "_ipp.")) -+ scheme = "ipp"; -+ else if (strstr(type, "_printer.")) -+ scheme = "lpd"; -+ else if (strstr(type, "_pdl-datastream.")) -+ scheme = "socket"; -+ else -+ scheme = "riousbprint"; -+ -+ /* -+ * Extract the "remote printer key from the TXT record... -+ */ -+ -+ if ((pair = avahi_string_list_find (txt, "rp")) != NULL) -+ { -+ avahi_string_list_get_pair (pair, NULL, &value, &valueLen); -+ rp[0] = '/'; -+ memcpy (rp + 1, value, valueLen); -+ rp[valueLen + 1] = '\0'; -+ } -+ else -+ rp[0] = '\0'; -+ -+ /* -+ * Assemble the final device URI... -+ */ -+ -+ avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address); -+ httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer, -+ poll_uribuf->uribuf.bufsize, scheme, NULL, -+ addr, port, rp); -+ DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n", -+ poll_uribuf->uribuf.buffer)); -+ avahi_simple_poll_quit (poll_uribuf->poll); -+} -+#endif /* HAVE_AVAHI */ -+ - - /* - * End of "$Id: http-support.c 8705 2009-06-12 00:21:58Z mike $". diff --git a/abs/core-testing/cups/cups.install b/abs/core-testing/cups/cups.install deleted file mode 100644 index 97fda5a..0000000 --- a/abs/core-testing/cups/cups.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/abs/core-testing/cups/cups.logrotate b/abs/core-testing/cups/cups.logrotate deleted file mode 100644 index 9c49bbd..0000000 --- a/abs/core-testing/cups/cups.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/cups/*log { - missingok - notifempty - delaycompress - postrotate - /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/abs/core-testing/cups/cups.pam b/abs/core-testing/cups/cups.pam deleted file mode 100644 index 53724d1..0000000 --- a/abs/core-testing/cups/cups.pam +++ /dev/null @@ -1,3 +0,0 @@ -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so diff --git a/abs/core-testing/curl/ChangeLog b/abs/core-testing/curl/ChangeLog deleted file mode 100644 index abcd7af..0000000 --- a/abs/core-testing/curl/ChangeLog +++ /dev/null @@ -1,69 +0,0 @@ -2010-02-09 Eric Belanger - - * curl 7.20.0-1 - * Upstream update - -2009-11-04 Eric Belanger - - * curl 7.19.7-1 - * Upstream update - -2009-10-03 Robson Peixoto - - * curl 7.19.6-2 - * Compile with ca-path like Debian and Gentoo - -2009-08-12 Eric Belanger - - * curl 7.19.6-1 - * Upstream update - -2009-05-18 Eric Belanger - - * curl 7.19.5-1 - * Upstream update - -2009-03-03 Eric Belanger - - * curl 7.19.4-1 - * Upstream update - -2009-01-21 Eric Belanger - - * curl 7.19.3-1 - * Upstream update - -2008-11-14 Eric Belanger - - * curl 7.19.2-1 - * Upstream update - -2008-11-08 Eric Belanger - - * curl 7.19.1-1 - * Upstream update - -2008-09-20 Eric Belanger - - * curl 7.19.0-1 - * Upstream update - -2008-06-04 Eric Belanger - - * curl 7.18.2-1 - * Upstream update - * Switched to the CA Root Certificates provided by the ca-certificates package (close FS#10569) - * Removed bundled certificates - * Removed perl-libwww makedepends - -2008-04-30 Eric Belanger - - * curl 7.18.1-2 - * Added CA Root Certificates (close FS#10129) - * Added perl-libwww makedepends - -2008-03-31 Eric Belanger - - * curl 7.18.1-1 - * Upstream update - * Added ChangeLog diff --git a/abs/core-testing/curl/PKGBUILD b/abs/core-testing/curl/PKGBUILD deleted file mode 100644 index ba286a5..0000000 --- a/abs/core-testing/curl/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 87558 2010-08-16 20:27:57Z dgriffiths $ -# Contributor: Eric Belanger -# Contributor: Lucien Immink -# Maintainer: Daniel J Griffiths - -pkgname=curl -pkgver=7.21.1 -pkgrel=1 -pkgdesc="An URL retrival utility and library" -arch=('i686' 'x86_64') -url="http://curl.haxx.se" -license=('MIT') -depends=('zlib' 'openssl' 'bash' 'ca-certificates') -options=('!libtool') -source=("http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('eafde5b933bce1c1dca82d1054c8d967') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure \ - --with-random=/dev/urandom \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --disable-dependency-tracking \ - --enable-ipv6 \ - --disable-ldaps \ - --disable-ldap \ - --enable-manual \ - --enable-versioned-symbols \ - --with-ca-path=/etc/ssl/certs \ - --without-libidn || return 1 - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install || return 1 - install -Dm644 COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname}/COPYING || return 1 - install -Dm644 docs/libcurl/libcurl.m4 \ - ${pkgdir}/usr/share/aclocal/libcurl.m4 || return 1 -} diff --git a/abs/core-testing/curl/m4-typo.patch b/abs/core-testing/curl/m4-typo.patch deleted file mode 100644 index 2e46dff..0000000 --- a/abs/core-testing/curl/m4-typo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/docs/libcurl/libcurl.m4 b/docs/libcurl/libcurl.m4 -index ce8e476..50dc20d 100644 ---- a/docs/libcurl/libcurl.m4 -+++ b/docs/libcurl/libcurl.m4 -@@ -198,7 +198,7 @@ x=CURLOPT_VERBOSE; - - # We don't have --protocols, so just assume that all - # protocols are available -- _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP -+ _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP" - - if test x$libcurl_feature_SSL = xyes ; then - _libcurl_protocols="$_libcurl_protocols HTTPS" diff --git a/abs/core-testing/damageproto/PKGBUILD b/abs/core-testing/damageproto/PKGBUILD deleted file mode 100644 index 14f6122..0000000 --- a/abs/core-testing/damageproto/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 51004 2009-09-04 13:03:02Z jgc $ -#Maintainer: Jan de Groot - -pkgname=damageproto -pkgver=1.2.0 -pkgrel=1 -pkgdesc="X11 Damage extension wire protocol" -arch=(any) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('xproto' 'fixesproto') -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('ffe177a6ae2cf023d41e015aa6ece2b191cb8a8a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 -} diff --git a/abs/core-testing/dash/PKGBUILD b/abs/core-testing/dash/PKGBUILD deleted file mode 100644 index eccfe5c..0000000 --- a/abs/core-testing/dash/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Dan McGee - -pkgname=dash -pkgver=0.5.4 -pkgrel=13 -pkgdesc="A POSIX compliant shell that aims to be as small as possible" -arch=('i686' 'x86_64') -url="http://gondor.apana.org.au/~herbert/dash/" -license=('BSD') -groups=('base') -makedepends=('klibc>=1.5') -#provides=('sh') -source=("http://gondor.apana.org.au/~herbert/dash/files/dash-$pkgver.tar.gz") -md5sums=('bc457e490a589d2f87f2333616b67931') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man --exec-prefix="" CC=klcc LD=klcc LDFLAGS="-static" - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - - # license - install -m644 -D COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING - - #static dash is our default /bin/sh - #cd ${startdir}/pkg/bin - #ln -s dash sh -} diff --git a/abs/core-testing/db/PKGBUILD b/abs/core-testing/db/PKGBUILD deleted file mode 100644 index cc149a7..0000000 --- a/abs/core-testing/db/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 76949 2010-04-09 08:14:30Z allan $ -# Maintainer: Allan McRae -# Contributor: Andreas Radke - -pkgname=db -pkgver=4.8.26 -_basever=4.8.26 -pkgrel=2 -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') -install=db.install -source=(http://download-uk.oracle.com/berkeley-db/db-${_basever}.tar.gz) -md5sums=('3476bac9ec0f3c40729c8a404151d5e3') - -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 -} - -package() { - cd ${srcdir}/$pkgname-${_basever}/build_unix - make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/usr/docs - install -Dm644 ${srcdir}/${pkgname}-${_basever}/LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/abs/core-testing/db/db.install b/abs/core-testing/db/db.install deleted file mode 100644 index eeda804..0000000 --- a/abs/core-testing/db/db.install +++ /dev/null @@ -1,5 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 4.8)" -lt 0 ]; then - echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases." - fi -} diff --git a/abs/core-testing/db4.5/PKGBUILD b/abs/core-testing/db4.5/PKGBUILD deleted file mode 100644 index db87a0d..0000000 --- a/abs/core-testing/db4.5/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Jan de Groot -pkgname=db4.5 -pkgver=4.5.20 -pkgrel=2 -pkgdesc="The Berkeley DB embedded database system 4.5" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" -depends=('gcc-libs') -options=('!libtool' '!makeflags') -source=(http://download-uk.oracle.com/berkeley-db/db-${pkgver}.tar.gz - http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.1 - http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.2) -md5sums=('b0f1c777708cb8e9d37fb47e7ed3312d' - 'a571e239b9041d7990df287cbc59ad6f' - 'b7a7086a067ba116f5a8464362c9a9a7') - -build() { - cd ${startdir}/src/db-${pkgver}/ - patch -Np0 -i ${startdir}/src/patch.4.5.20.1 || return 1 - patch -Np0 -i ${startdir}/src/patch.4.5.20.2 || return 1 - - cd build_unix - ../dist/configure --prefix=/usr --enable-compat185 \ - --enable-shared --disable-static --enable-cxx - make LIBSO_LIBS=-lpthread || return 1 - make prefix=${startdir}/pkg/usr \ - includedir=${startdir}/pkg/usr/include/db4.5 install - - rm -rf ${startdir}/pkg/usr/docs - rm -f ${startdir}/pkg/usr/lib/libdb{,_cxx}.so - rm -f ${startdir}/pkg/usr/lib/libdb{,_cxx}-4.so - - cd ${startdir}/pkg/usr/bin - for i in *; do - mv $i db4.5_${i/db_/} - done - mkdir -p ${startdir}/pkg/usr/share/licenses/${pkgname} - install -m644 ${startdir}/src/db-${pkgver}/LICENSE ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/abs/core-testing/dbus-core/PKGBUILD b/abs/core-testing/dbus-core/PKGBUILD deleted file mode 100644 index b57829f..0000000 --- a/abs/core-testing/dbus-core/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 73272 2010-03-24 11:36:47Z jgc $ -# Maintainer: Jan de Groot -# Contributor: Link Dupont -# -pkgname=dbus-core -pkgver=1.2.24 -pkgrel=1 -pkgdesc="Freedesktop.org message bus system" -url="http://www.freedesktop.org/Software/dbus" -arch=(i686 x86_64) -license=('GPL' 'custom') -depends=('expat>=2.0.1' 'coreutils' 'filesystem') -conflicts=('dbus<1.2.3-2') -options=(!libtool) -install=dbus.install -source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz - dbus) -md5sums=('565346cecd9cfecf1463540c6086cc2c' - '08f93dd19cffd1b45ab05c1fd4efb560') - -build() { - cd "${srcdir}/dbus-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \ - --with-system-pid-file=/var/run/dbus.pid \ - --enable-inotify --disable-dnotify \ - --disable-verbose-mode --disable-static \ - --disable-tests --disable-asserts --without-x || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - rm -f "${pkgdir}/usr/bin/dbus-launch" - rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1" - - chown 81:81 "${pkgdir}/var/run/dbus" || return 1 - - install -m755 -d "${pkgdir}/etc/rc.d" || return 1 - install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/" || return 1 - - #Fix configuration file - sed -i -e 's|81|dbus|' "${pkgdir}/etc/dbus-1/system.conf" || return 1 - - #install .keep files so pacman doesn't delete empty dirs - touch "${pkgdir}/usr/share/dbus-1/services/.keep" || return 1 - touch "${pkgdir}/usr/share/dbus-1/system-services/.keep" || return 1 - touch "${pkgdir}/etc/dbus-1/session.d/.keep" || return 1 - touch "${pkgdir}/etc/dbus-1/system.d/.keep" || return 1 - - rmdir "${pkgdir}/usr/lib/dbus-1.0/dbus-1" || return 1 - - install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core" - install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/" || return 1 -} diff --git a/abs/core-testing/dbus-core/dbus b/abs/core-testing/dbus-core/dbus deleted file mode 100644 index 66b84ca..0000000 --- a/abs/core-testing/dbus-core/dbus +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting D-BUS system messagebus" - if [ ! -x /var/run/dbus ] ; then - install -m755 -g 81 -o 81 -d /var/run/dbus - fi - if [ -x /usr/bin/dbus-uuidgen ] ; then - /usr/bin/dbus-uuidgen --ensure - fi - - /usr/bin/dbus-daemon --system - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon dbus - stat_done - fi - ;; - stop) - stat_busy "Stopping D-BUS system messagebus" - [ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/dbus.pid - rm_daemon dbus - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading D-BUS configuration" - [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \ - --system --type=method_call \ - --dest=org.freedesktop.DBus \ - / org.freedesktop.DBus.ReloadConfig - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/abs/core-testing/dbus-core/dbus.install b/abs/core-testing/dbus-core/dbus.install deleted file mode 100644 index 44f4475..0000000 --- a/abs/core-testing/dbus-core/dbus.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() { - getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus - getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus - usr/bin/passwd -l dbus &>/dev/null - dbus-uuidgen --ensure -} - -post_upgrade() { - post_install - - #Make sure new rc script can shutdown running dbus - if [ -f var/run/dbus/pid ]; then - mv var/run/dbus/pid var/run/dbus.pid - fi -} - -post_remove() { - if getent passwd dbus >/dev/null; then - usr/sbin/userdel dbus - fi - if getent group dbus >/dev/null; then - usr/sbin/groupdel dbus - fi -} diff --git a/abs/core-testing/dbus-glib/PKGBUILD b/abs/core-testing/dbus-glib/PKGBUILD deleted file mode 100644 index 4723bfd..0000000 --- a/abs/core-testing/dbus-glib/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 79735 2010-05-06 13:03:33Z jgc $ -# Maintainer: Jan de Groot - -pkgname=dbus-glib -pkgver=0.86 -pkgrel=1 -pkgdesc="GLib bindings for DBUS" -arch=(i686 x86_64) -license=('GPL') -url="http://www.freedesktop.org/wiki/Software/DBusBindings" -depends=('dbus-core>=1.2.24' 'glib2>=2.24.1') -makedepends=('pkgconfig') -options=('!libtool' '!emptydirs') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('cd0ab148fb0c786fc88be49d19971f50') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --enable-static=no --enable-bash-completion=no || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/abs/core-testing/dbus-python/PKGBUILD b/abs/core-testing/dbus-python/PKGBUILD deleted file mode 100644 index 2ec5e43..0000000 --- a/abs/core-testing/dbus-python/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 75824 2010-04-04 12:03:46Z jgc $ -# Contributor: Jan de Groot - -pkgname=dbus-python -pkgver=0.83.1 -pkgrel=1 -pkgdesc="Python bindings for DBUS" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -url="http://www.freedesktop.org/wiki/Software/DBusBindings" -depends=('dbus-glib>=0.82' 'python>=2.6.5') -makedepends=('pkgconfig' 'docutils') -options=('!libtool') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('5fdf3970aa0c00020289de7ba8f3be18') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/abs/core-testing/dbus/30-dbus b/abs/core-testing/dbus/30-dbus deleted file mode 100644 index 603e92d..0000000 --- a/abs/core-testing/dbus/30-dbus +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# launches a session dbus instance - -dbuslaunch="`which dbus-launch 2>/dev/null`" -if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then - eval `$dbuslaunch --sh-syntax --exit-with-session` -fi - diff --git a/abs/core-testing/dbus/PKGBUILD b/abs/core-testing/dbus/PKGBUILD deleted file mode 100644 index 5759c51..0000000 --- a/abs/core-testing/dbus/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 73275 2010-03-24 11:40:17Z jgc $ -# Maintainer: Jan de Groot -# Contributor: Link Dupont -# -pkgname=dbus -pkgver=1.2.24 -pkgrel=1 -pkgdesc="Freedesktop.org message bus system" -url="http://www.freedesktop.org/Software/dbus" -arch=(i686 x86_64) -license=('GPL' 'custom') -depends=("dbus-core>=${pkgver}" 'libx11') -makedepends=('libsm' 'libice') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz - 30-dbus) -md5sums=('565346cecd9cfecf1463540c6086cc2c' - 'd14e59575f04e55d21a04907b6fd9f3c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \ - --with-system-pid-file=/var/run/dbus.pid \ - --disable-verbose-mode --disable-static \ - --enable-inotify --disable-dnotify \ - --disable-tests --disable-asserts || return 1 - cd tools || return 1 - make dbus-launch || return 1 - install -m755 -d "${pkgdir}/usr/bin" - install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m755 dbus-launch "${pkgdir}/usr/bin/" || return 1 - install -m644 dbus-launch.1 "${pkgdir}/usr/share/man/man1/" || return 1 - - install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d" - install -m755 "${srcdir}/30-dbus" "${pkgdir}/etc/X11/xinit/xinitrc.d/" || return 1 - - install -d -m755 "${pkgdir}/usr/share/licenses/dbus" - install -m644 ../COPYING "${pkgdir}/usr/share/licenses/dbus/" || return 1 -} diff --git a/abs/core-testing/dbus/dbus b/abs/core-testing/dbus/dbus deleted file mode 100644 index cd26db8..0000000 --- a/abs/core-testing/dbus/dbus +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting D-BUS system messagebus" - if [ ! -x /var/run/dbus ] ; then - install -m755 -g 81 -o 81 -d /var/run/dbus - fi - if [ -x /usr/bin/dbus-uuidgen ] ; then - /usr/bin/dbus-uuidgen --ensure - fi - - /usr/bin/dbus-daemon --system - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon dbus - stat_done - fi - ;; - stop) - stat_busy "Stopping D-BUS system messagebus" - [ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/dbus.pid - rm_daemon dbus - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading D-BUS configuration" - [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \ - --system --type=method_call \ - --dest=org.freedesktop.DBus \ - / org.freedesktop.DBus.ReloadConfig - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/abs/core-testing/dbus/dbus.install b/abs/core-testing/dbus/dbus.install deleted file mode 100644 index 85dd9a7..0000000 --- a/abs/core-testing/dbus/dbus.install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus - getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus - usr/bin/passwd -l dbus &>/dev/null - dbus-uuidgen --ensure -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 - - #Make sure new rc script can shutdown running dbus - [ -f var/run/dbus/pid ] && mv var/run/dbus/pid var/run/dbus.pid -} - -# arg 1: the old package version -pre_remove() { - usr/sbin/userdel dbus &>/dev/null - usr/sbin/groupdel dbus &>/dev/null -} diff --git a/abs/core-testing/dcron/PKGBUILD b/abs/core-testing/dcron/PKGBUILD deleted file mode 100644 index e5a46d8..0000000 --- a/abs/core-testing/dcron/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: judd -pkgname=dcron -pkgver=3.2 -pkgrel=12 -pkgdesc="Dillon's Cron Daemon" -arch=(i686 x86_64) -license=('GPL') -groups=('base') -url="http://apollo.backplane.com/FreeSrc/" -backup=(var/spool/cron/root) -depends=('glibc') -provides=('cron') -source=(http://apollo.backplane.com/FreeSrc/dcron32.tgz - dcron-3.1.patch - root.crontab - crond - crond.logrotate - run-cron) -md5sums=('c2c816deb389b4bfb00761f26afe3efd' '2f0c3f7497a12c8826c9be3f87843fcd'\ - '7fcc06b13708ebd667711b1fbf62ee6e' 'd7edac165ef19ebb9d0089bdc218b53a'\ - 'aeabcd5e4924d1a7593c8782d1068c86' '5ff0cdcb9ec99778938ac6ef26800327') - -build() { - cd $startdir/src/dcron - patch -Np1 -i ../dcron-3.1.patch || return 1 - make || return 1 - install -D -m4755 crontab $startdir/pkg/usr/bin/crontab - install -D -m755 crond $startdir/pkg/usr/sbin/crond - install -D -m644 crontab.1 $startdir/pkg/usr/man/man1/crontab.1 - install -D -m644 crond.8 $startdir/pkg/usr/man/man8/crond.8 - mkdir -p $startdir/pkg/var/spool/cron $startdir/pkg/etc/cron.d - mkdir -p $startdir/pkg/etc/{rc.d,cron.hourly,cron.daily,cron.weekly,cron.monthly} - install -D -m0600 ../root.crontab $startdir/pkg/var/spool/cron/root - install -D -m755 ../crond $startdir/pkg/etc/rc.d/crond - install -D -m644 ../crond.logrotate $startdir/pkg/etc/logrotate.d/crond - install -D -m755 ../run-cron $startdir/pkg/usr/sbin/run-cron -} diff --git a/abs/core-testing/dcron/crond b/abs/core-testing/dcron/crond deleted file mode 100755 index ef80db3..0000000 --- a/abs/core-testing/dcron/crond +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/crond` -case "$1" in - start) - stat_busy "Starting Cron Daemon" - [ -z "$PID" ] && /usr/sbin/crond >>/var/log/crond 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - PID=`pidof -o %PPID /usr/sbin/crond` - echo $PID >/var/run/crond.pid - add_daemon crond - stat_done - fi - ;; - stop) - stat_busy "Stopping Cron Daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon crond - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/core-testing/dcron/crond.logrotate b/abs/core-testing/dcron/crond.logrotate deleted file mode 100644 index 38299d6..0000000 --- a/abs/core-testing/dcron/crond.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/crond { - sharedscripts - copytruncate - missingok -} diff --git a/abs/core-testing/dcron/dcron-3.1.patch b/abs/core-testing/dcron/dcron-3.1.patch deleted file mode 100644 index 975d51c..0000000 --- a/abs/core-testing/dcron/dcron-3.1.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur dcron-orig/defs.h dcron/defs.h ---- dcron-orig/defs.h 2006-04-29 10:20:58.000000000 -0700 -+++ dcron/defs.h 2006-05-04 18:40:05.000000000 -0700 -@@ -28,7 +28,7 @@ - #define arysize(ary) (sizeof(ary)/sizeof((ary)[0])) - - #ifndef CRONTABS --#define CRONTABS "/var/spool/cron/crontabs" -+#define CRONTABS "/var/spool/cron" - #endif - #ifndef SCRONTABS - #define SCRONTABS "/etc/cron.d" -@@ -44,7 +44,7 @@ - #if defined(__DragonFly__) - #define SENDMAIL "/usr/sbin/sendmail" - #else --#define SENDMAIL "/usr/lib/sendmail" -+#define SENDMAIL "/usr/sbin/sendmail" - #endif - #endif - -diff -Naur dcron-orig/subs.c dcron/subs.c ---- dcron-orig/subs.c 2006-04-27 10:29:56.000000000 -0700 -+++ dcron/subs.c 2006-05-04 18:40:19.000000000 -0700 -@@ -79,7 +79,7 @@ - - buf[0] = 0; - if (useDate) -- strftime(buf, 128, "%d-%b-%y %H:%M ", tp); -+ strftime(buf, 128, "%d-%b-%Y %H:%M ", tp); - vsnprintf(buf + strlen(buf), nmax, ctl, va); - return(strlen(buf)); - } diff --git a/abs/core-testing/dcron/root.crontab b/abs/core-testing/dcron/root.crontab deleted file mode 100644 index 726558f..0000000 --- a/abs/core-testing/dcron/root.crontab +++ /dev/null @@ -1,12 +0,0 @@ -# -# DO NOT EDIT THIS FILE MANUALLY!! USE crontab -e INSTEAD. -# - -# - - -01 * * * * /usr/sbin/run-cron /etc/cron.hourly -02 00 * * * /usr/sbin/run-cron /etc/cron.daily -22 00 * * 0 /usr/sbin/run-cron /etc/cron.weekly -42 00 1 * * /usr/sbin/run-cron /etc/cron.monthly - diff --git a/abs/core-testing/dcron/run-cron b/abs/core-testing/dcron/run-cron deleted file mode 100755 index 51007a1..0000000 --- a/abs/core-testing/dcron/run-cron +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - - -if [ -z $1 ]; then - echo "Usage: $0 crondir" - exit 1 -fi - -for cron in $1/* ; do - if [ -x $cron ]; then - $cron - fi -done -unset cron diff --git a/abs/core-testing/ddcxinfo-arch/PKGBUILD b/abs/core-testing/ddcxinfo-arch/PKGBUILD deleted file mode 100644 index 108a97e..0000000 --- a/abs/core-testing/ddcxinfo-arch/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: damir -# TUR: Ben -# Contributor: Elia Yehuda - -pkgname=ddcxinfo-arch -pkgver=0.8 -pkgrel=1 -pkgdesc="utility to probe non/ddc monitors - used by hwd" -url="http://user-contributions.org/projects/ddcxinfo-arch/" -depends=('glibc') -arch=i686 -source=(http://user-contributions.org/projects/ddcxinfo-arch/source/$pkgname-$pkgver.tar.gz) - -md5sums=('ca734d958a54bef03a543479f7ab8b00') - -build() { - cd $startdir/src/$pkgname-$pkgver - make ddcxinfo-arch || return 1 - install -D -m755 ddcxinfo-arch $startdir/pkg/usr/sbin/ddcxinfo-arch -} diff --git a/abs/core-testing/ddcxinfo/PKGBUILD b/abs/core-testing/ddcxinfo/PKGBUILD deleted file mode 100644 index b358c0c..0000000 --- a/abs/core-testing/ddcxinfo/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -pkgname=ddcxinfo -pkgver=0.6.19 -pkgrel=3 -pkgdesc="DDC readout using the VESA BIOS extension" -url="http://www.t2-project.org/packages/ddcxinfo.html" -license="GPL" -depends=(x-server) -makedepends=() -conflicts=() -replaces=() -backup=() -arch=('i686') -install= -source=(http://www.kanotix.com/files/debian/pool/main/d/ddcxinfo-kanotix/$pkgname-kanotix_$pkgver.tar.gz - lrmi.patch) - - -build() { - cd $startdir/src/$pkgname-kanotix-$pkgver - mkdir -p $startdir/pkg/usr/sbin - patch -p1 < $startdir/src/lrmi.patch - make DESTDIR=$startdir/pkg install - cp svgamodes $startdir/pkg/usr/sbin/ - chmod +s $startdir/pkg/usr/sbin/ddcprobe -} diff --git a/abs/core-testing/ddcxinfo/ddcxinfo-kanotix_0.6.19.tar.gz b/abs/core-testing/ddcxinfo/ddcxinfo-kanotix_0.6.19.tar.gz deleted file mode 100644 index fbbb329..0000000 Binary files a/abs/core-testing/ddcxinfo/ddcxinfo-kanotix_0.6.19.tar.gz and /dev/null differ diff --git a/abs/core-testing/ddcxinfo/lrmi.patch b/abs/core-testing/ddcxinfo/lrmi.patch deleted file mode 100644 index ca735fa..0000000 --- a/abs/core-testing/ddcxinfo/lrmi.patch +++ /dev/null @@ -1,18 +0,0 @@ -Common subdirectories: ddcxinfo-kanotix-0.6.19-orig/debian and ddcxinfo-kanotix-0.6.19/debian -diff -u ddcxinfo-kanotix-0.6.19-orig/lrmi.c ddcxinfo-kanotix-0.6.19/lrmi.c ---- ddcxinfo-kanotix-0.6.19-orig/lrmi.c 2009-07-25 06:15:09.000000000 +0000 -+++ ddcxinfo-kanotix-0.6.19/lrmi.c 2009-07-25 06:17:22.000000000 +0000 -@@ -170,6 +170,13 @@ - } - } - -+#ifndef TF_MASK -+#define TF_MASK X86_EFLAGS_TF -+#define IF_MASK X86_EFLAGS_IF -+#define IOPL_MASK X86_EFLAGS_IOPL -+#define VIF_MASK X86_EFLAGS_VIF -+#define VIP_MASK X86_EFLAGS_VIP -+#endif - - #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) - #define DEFAULT_STACK_SIZE 0x1000 diff --git a/abs/core-testing/device-mapper/ChangeLog b/abs/core-testing/device-mapper/ChangeLog deleted file mode 100644 index 5809ab5..0000000 --- a/abs/core-testing/device-mapper/ChangeLog +++ /dev/null @@ -1,103 +0,0 @@ -2010-07-11 Thomas Bächler - - * lvm2/device-mapper 2.02.70-1 - * Upstream update - * Do not move the dmeventd manpage, has been fixed upstream - * Remove all the || return 1 in PKGBUILD - -2010-07-01 Eric Belanger - - * lvm2/device-mapper 2.02.69-1 - * Upstream update - * Moved dmeventd man page from lvm2 to device-mapper package - -2010-06-25 Eric Belanger - - * lvm2/device-mapper 2.02.68-1 - * Upstream update - * Fixed tr path in lvmdump - -2010-04-05 Eric Belanger - - * lvm2/device-mapper 2.02.62-1 - * Upstream update - * Fixed license - -2010-02-27 Eric Belanger - - * lvm2/device-mapper 2.02.61-1 - * Upstream update - -2010-01-24 Thomas Bächler - * lvm2/device-mapper 2.02.60-2 - * Rebuilt without -Wl,--as-needed, it breaks dmeventd monitoring - -2010-01-24 Thomas Bächler - * lvm2/device-mapper update to 2.02.60-1 - * Clean up PKGBUILD, fix internal paths to dmeventd and its helpers - -2009-11-27 Eric Belanger - - * lvm2 2.02.56-1 - * device-mapper 1.02.40-1 - * Upstream update - -2009-10-31 Eric Belanger - - * lvm2 2.02.54-1 - * device-mapper 1.02.39-1 - * Upstream update - * Enabled the device-mapper event daemon - * Moved the udev rule from /etc to /lib - -2009-09-27 Eric Belanger - - * lvm2 2.02.53-1 - * device-mapper 1.02.38-1 - * Upstream update - -2009-09-18 Eric Belanger - - * lvm2 2.02.52-1 - * device-mapper 1.02.37-1 - * Upstream update - * Implemented split packages - * PKGBUILD clean up - * Renamed pkgconfig file (close FS#15909) - -2009-07-09 Eric Belanger - - * lvm2 2.02.48-1 - * device-mapper 1.02.33-1 - * Upstream update - * Removed unneeded readline depends (close FS#15205) - -2009-05-24 Eric Belanger - - * lvm2 2.02.47-1 - * device-mapper 1.02.32-1 - * Upstream update - * Added dmsetup.static - -2009-03-07 Eric Belanger - - * lvm2 2.02.45-1 - * device-mapper 1.02.31-1 - * Upstream update - -2009-01-31 Eric Belanger - - * lvm2 2.02.44-1 - * device-mapper 1.02.30-1 - * Upstream update - * Added bash depends - * Added readline depends - * Added pkgconfig file - -2008-11-11 Eric Belanger - - * lvm2 2.02.43-1 - * device-mapper 1.02.29-1 - * Upstream update - * Disabled SMP build - * Added ChangeLog diff --git a/abs/core-testing/device-mapper/PKGBUILD b/abs/core-testing/device-mapper/PKGBUILD deleted file mode 100644 index b4be343..0000000 --- a/abs/core-testing/device-mapper/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 85275 2010-07-11 10:26:53Z thomas $ -# Maintainer: Eric Belanger - -pkgbase=lvm2 -pkgname=('lvm2' 'device-mapper') -pkgver=2.02.70 -_pkgverdm=1.02.52 -_pkgverlvm=${pkgver} -pkgrel=1 -arch=('i686' 'x86_64') -url="http://sourceware.org/lvm2/" -license=('GPL2' 'LGPL2.1') -groups=('base') -conflicts=('mkinitcpio<0.5.99') -changelog=ChangeLog -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz - lvm2_install - lvm2_hook) -md5sums=('39c26d5a821754cc347d7a19e82d4a24' - 'f781c9f5dd4f9934952c687b73d26a18' - '95bed25bdbc2c2d8500e7a07aeff7f65') -sha1sums=('6f88114e72204feee491befd5f0e203036b90f11' - '583424bb0a6f89ffe4e4ea446b912f0fedac7050' - '0dc0c0d620f634c4d078afdb78e3bae15ccf957b') - -build() { - cd "${srcdir}/LVM2.${_pkgverlvm}" - sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh - unset LDFLAGS - ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ - --includedir=/usr/include --with-usrlibdir=/usr/lib \ - --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ - --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules - make -} - -package_device-mapper() { - pkgdesc="Device mapper userspace library and tools" - url="http://sourceware.org/dm/" - depends=('glibc' 'udev') - - cd "${srcdir}/LVM2.${_pkgverlvm}" - make DESTDIR="${pkgdir}" install_device-mapper -} - -package_lvm2() { - pkgdesc="Logical Volume Manager 2 utilities" - depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') - conflicts=('lvm' 'mkinitcpio<0.5.99') - backup=('etc/lvm/lvm.conf') - options=('!makeflags') - - cd "${srcdir}/LVM2.${_pkgverlvm}" - make DESTDIR="${pkgdir}" install_lvm2 - # install applib - cd liblvm - make DESTDIR="${pkgdir}" install - cd .. - # /etc directories - install -d "${pkgdir}"/etc/lvm/{archive,backup} - # mkinitcpio hook - install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" - install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" -} diff --git a/abs/core-testing/device-mapper/lvm2_hook b/abs/core-testing/device-mapper/lvm2_hook deleted file mode 100644 index 13183c6..0000000 --- a/abs/core-testing/device-mapper/lvm2_hook +++ /dev/null @@ -1,25 +0,0 @@ -# vim:set ft=sh: -run_hook () -{ - /sbin/modprobe -q dm-mod >/dev/null 2>&1 - if [ -e "/sys/class/misc/device-mapper" ]; then - if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') - fi - - # If the lvmwait= parameter has been specified on the command line - # wait for the device(s) before trying to activate the volume group(s) - if [ -n "${lvmwait}" ]; then - for pvdev in $(echo ${lvmwait} | sed 's|,| |g'); do - poll_device ${pvdev} ${rootdelay} - done - fi - - [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" - - msg "Scanning logical volumes..." - eval /sbin/lvm vgscan --ignorelockingfailure $LVMQUIET - msg "Activating logical volumes..." - eval /sbin/lvm vgchange --ignorelockingfailure --ignoremonitoring -ay $LVMQUIET - fi -} diff --git a/abs/core-testing/device-mapper/lvm2_install b/abs/core-testing/device-mapper/lvm2_install deleted file mode 100644 index 4ce9f18..0000000 --- a/abs/core-testing/device-mapper/lvm2_install +++ /dev/null @@ -1,30 +0,0 @@ -# vim: set ft=sh: - -install () -{ - MODULES=" dm-mod dm-snapshot dm-mirror" - BINARIES="" - FILES="" - SCRIPT="lvm2" - - add_dir "/dev/mapper" - add_binary "/sbin/lvm" - add_binary "/sbin/dmsetup" - add_binary "/sbin/dmeventd" - add_file "/lib/udev/rules.d/10-dm.rules" - add_file "/lib/udev/rules.d/13-dm-disk.rules" - add_file "/lib/udev/rules.d/95-dm-notify.rules" - add_file "/lib/udev/rules.d/11-dm-lvm.rules" -} - -help () -{ -cat< - * dhcp 4.1.0.p1-1 - * Adopted RedHat patch to fix bug where dhcpd won't start if ipv6 module - is not loaded. Fixes FS#12792. - * Added /etc/conf.d/dhcp feature contributed by Fabiano Furtado Pessoa - Coelho - diff --git a/abs/core-testing/dhcp/PKGBUILD b/abs/core-testing/dhcp/PKGBUILD deleted file mode 100644 index db15ac3..0000000 --- a/abs/core-testing/dhcp/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 46754 2009-07-20 03:16:44Z kevin $ -# Maintainer: judd -pkgname=dhcp -# separate patch levels with a period to maintain proper versioning. -pkgver=4.1.0.p1 -_pkgver=4.1.0p1 -pkgrel=1 -pkgdesc="A DHCP server, client, and relay agent" -arch=(i686 x86_64) -license=('custom:isc-dhcp') -url="https://www.isc.org/software/dhcp" -depends=('openssl>=0.9.8a') -backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp') -install=dhcp.install -source=(http://ftp.isc.org/isc/${pkgname}/${pkgname}-${_pkgver}.tar.gz -dhcpd dhcp.conf.d dhcp-4.1.0-missing-ipv6-not-fatal.patch) - -build() { - cd ${srcdir}/${pkgname}-${_pkgver} - # Define _GNU_SOURCE to fix IPV6. - sed '/^CFLAGS="$CFLAGS/ s/INGS"/INGS -D_GNU_SOURCE"/' -i configure - # Make not having ipv6 non-fatal. - patch -Np1 -i ${srcdir}/dhcp-4.1.0-missing-ipv6-not-fatal.patch - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \ - --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases - make || return 1 - make DESTDIR=${pkgdir} install - - install -D -m755 ${srcdir}/dhcpd ${pkgdir}/etc/rc.d/dhcpd - install -D -m644 ${srcdir}/dhcp.conf.d ${pkgdir}/etc/conf.d/${pkgname} - mkdir -p ${pkgdir}/var/state/dhcp - rm -f ${pkgdir}/etc/dhclient.conf - rm -f ${pkgdir}/usr/sbin/dhclient - rm -f ${pkgdir}/usr/share/man/man{5,8}/dhclient* - # install licenses - install -m644 -D ${srcdir}/${pkgname}-${_pkgver}/LICENSE \ - ${pkgdir}/usr/share/licenses/dhcp/LICENSE -} diff --git a/abs/core-testing/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch b/abs/core-testing/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch deleted file mode 100644 index ebf3865..0000000 --- a/abs/core-testing/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur dhcp-4.1.0a2/common/discover.c dhcp-4.1.0a2-mcn/common/discover.c ---- dhcp-4.1.0a2/common/discover.c 2008-08-29 18:48:57.000000000 +0100 -+++ dhcp-4.1.0a2-mcn/common/discover.c 2008-10-02 13:02:06.000000000 +0100 -@@ -443,15 +443,17 @@ - } - - #ifdef DHCPv6 -- ifaces->fp6 = fopen("/proc/net/if_inet6", "r"); -- if (ifaces->fp6 == NULL) { -- log_error("Error opening '/proc/net/if_inet6' to " -- "list IPv6 interfaces; %m"); -- close(ifaces->sock); -- ifaces->sock = -1; -- fclose(ifaces->fp); -- ifaces->fp = NULL; -- return 0; -+ if (local_family == AF_INET6) { -+ ifaces->fp6 = fopen("/proc/net/if_inet6", "r"); -+ if (ifaces->fp6 == NULL) { -+ log_error("Error opening '/proc/net/if_inet6' to " -+ "list IPv6 interfaces; %m"); -+ close(ifaces->sock); -+ ifaces->sock = -1; -+ fclose(ifaces->fp); -+ ifaces->fp = NULL; -+ return 0; -+ } - } - #endif - -@@ -720,7 +722,8 @@ - } - #ifdef DHCPv6 - if (!(*err)) { -- return next_iface6(info, err, ifaces); -+ if (local_family == AF_INET6) -+ return next_iface6(info, err, ifaces); - } - #endif - return 0; -@@ -736,7 +739,8 @@ - close(ifaces->sock); - ifaces->sock = -1; - #ifdef DHCPv6 -- fclose(ifaces->fp6); -+ if (local_family == AF_INET6) -+ fclose(ifaces->fp6); - ifaces->fp6 = NULL; - #endif - } diff --git a/abs/core-testing/dhcp/dhcp.conf.d b/abs/core-testing/dhcp/dhcp.conf.d deleted file mode 100644 index 99ba6d1..0000000 --- a/abs/core-testing/dhcp/dhcp.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Arguments to be passed to the DHCP server daemon -# - -DHCP_ARGS="-q" - diff --git a/abs/core-testing/dhcp/dhcp.install b/abs/core-testing/dhcp/dhcp.install deleted file mode 100644 index edb84b1..0000000 --- a/abs/core-testing/dhcp/dhcp.install +++ /dev/null @@ -1,15 +0,0 @@ -# arg 1: the new package version -post_install() { - [ -f var/state/dhcp/dhcpd.leases ] || : >var/state/dhcp/dhcpd.leases - echo "If dhcpd doesn' start ensure the ipv6 kernel module is loaded." -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -op=$1 -shift -$op $* diff --git a/abs/core-testing/dhcp/dhcpd b/abs/core-testing/dhcp/dhcpd deleted file mode 100755 index 1fbb31e..0000000 --- a/abs/core-testing/dhcp/dhcpd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/dhcp - -PIDFILE="/var/run/dhcpd.pid" -PID=`cat $PIDFILE 2>/dev/null` -case "$1" in - start) - stat_busy "Starting DHCP Server" - if [ "$PID" = "" ]; then - /usr/sbin/dhcpd $DHCP_ARGS - fi - if [ "$PID" != "" -o $? -gt 0 ]; then - stat_fail - else - add_daemon dhcpd - stat_done - fi - ;; - stop) - stat_busy "Stopping DHCP Server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - rm -f $PIDFILE - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon dhcpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/abs/core-testing/dhcpcd/PKGBUILD b/abs/core-testing/dhcpcd/PKGBUILD deleted file mode 100644 index 1cfb7f9..0000000 --- a/abs/core-testing/dhcpcd/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ - -pkgname=dhcpcd -pkgver=5.0.7 -pkgrel=1 -pkgdesc="RFC2131 compliant DHCP client daemon" -url="http://roy.marples.name/dhcpcd/" -arch=('i686' 'x86_64') -license=('BSD') -groups=('base') -depends=('glibc' 'bash') -backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') -options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory -source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ - 'dhcpcd.conf.d') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # Fix Installation Locations - export PREFIX=/usr - sed -i 's/${PREFIX}\/etc/\/etc/' Makefile || return 1 - sed -i 's/\/db/\/lib\/dhcpcd/' Makefile || return 1 - sed -i 's/\/libexec/\/lib\/dhcpcd/' Makefile || return 1 - sed -i 's/\/libexec/\/lib\/dhcpcd/' dhcpcd-hooks/Makefile || return 1 - sed -i 's/${PREFIX}\/sbin/\/sbin/' Makefile || return 1 - - # Build - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - - # Create Binary Symlink - install -d ${pkgdir}/usr/sbin || return 1 - ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd || return 1 - - # Install Configuration File used in /etc/rc.d/network - install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname || return 1 - - # Install License - install -d $pkgdir/usr/share/licenses/$pkgname || return 1 - awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/config.h \ - >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 - - # Make Man Pages FHS Compliant - mv -f ${pkgdir}/usr/man ${pkgdir}/usr/share/man || return 1 - - # Set Options in /etc/dhcpcd.conf - echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf || return 1 # Disable ip4vall -} diff --git a/abs/core-testing/dhcpcd/dhcpcd.conf.d b/abs/core-testing/dhcpcd/dhcpcd.conf.d deleted file mode 100644 index 9f5a80b..0000000 --- a/abs/core-testing/dhcpcd/dhcpcd.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Arguments to be passed to the DHCP client daemon -# - -DHCPCD_ARGS="-t 30 -h $HOSTNAME" - diff --git a/abs/core-testing/dialog/PKGBUILD b/abs/core-testing/dialog/PKGBUILD deleted file mode 100644 index 0299f6d..0000000 --- a/abs/core-testing/dialog/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 1369 2008-05-06 16:13:12Z andyrtr $ -# Maintainer: dorphell -pkgname=dialog -pkgver=1.1_20080316 -_pkgver=1.1-20080316 -pkgrel=12 -pkgdesc="A tool to display dialog boxes from shell scripts" -arch=('i686' 'x86_64') -license=('GPL') -groups=('base') -depends=('ncurses>=5.6-6') -url="http://packages.debian.org/dialog" -source=(ftp://ftp.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_$_pkgver.orig.tar.gz) -md5sums=('3d262cbc41e4db23251e7be924c4a28b') - -build() { - cd $startdir/src/$pkgname-$_pkgver - ./configure --prefix=/usr --with-ncursesw --mandir=/usr/share/man - make || return 1 - make DESTDIR=$startdir/pkg install -} diff --git a/abs/core-testing/dialog/timeout.patch b/abs/core-testing/dialog/timeout.patch deleted file mode 100644 index 257f275..0000000 --- a/abs/core-testing/dialog/timeout.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dialog-1.1-20070514/ui_getc.c 2007-05-15 00:24:00.000000000 +0200 -+++ dialog-1.1-20070514_fixed/ui_getc.c 2007-05-29 20:20:27.000000000 +0200 -@@ -252,6 +252,8 @@ - ch = wgetch(win); - /* if error from resizing, wait and try again */ - if (ch == ERR) { -+ current = time((time_t *) 0); -+ if (interval > 0 && current >= expired) dlg_exiterr("timeout"); - napms(50); - continue; - } diff --git a/abs/core-testing/diffutils/PKGBUILD b/abs/core-testing/diffutils/PKGBUILD deleted file mode 100644 index 8b075bc..0000000 --- a/abs/core-testing/diffutils/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: judd -pkgname=diffutils -pkgver=2.8.1 -pkgrel=5 -pkgdesc="Utility programs used for creating patch files" -arch=(i686 x86_64) -license=('GPL') -groups=('base-devel') -url="http://www.gnu.org/software/diffutils" -depends=('glibc') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('71f9c5ae19b60608f6c7f162da86a428') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${startdir}/pkg install -} diff --git a/abs/core-testing/directfb/ChangeLog b/abs/core-testing/directfb/ChangeLog deleted file mode 100644 index 4e10ded..0000000 --- a/abs/core-testing/directfb/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2008-07-29 Eric Belanger - - * directfb 1.2.0-1 - * Upstream update - * Added ChangeLog diff --git a/abs/core-testing/directfb/PKGBUILD b/abs/core-testing/directfb/PKGBUILD deleted file mode 100644 index 89d322a..0000000 --- a/abs/core-testing/directfb/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD,v 1.7 2008/08/02 19:48:28 Snowman Exp $ -# Maintainer: Eric Belanger -# Contributor: Eric Belanger - -pkgname=directfb -pkgver=1.2.0 -pkgrel=2 -pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device" -arch=('i686' 'x86_64') -url="http://www.directfb.org" -license=('LGPL') -depends=('libjpeg' 'libxext' 'sdl' 'sysfsutils' 'libpng' 'freetype2') -options=('!libtool') -source=(http://www.directfb.org/downloads/Old/DirectFB-${pkgver}.tar.gz dfb_serial.diff) -md5sums=('231f2247c9d0a2b8a51f415571105ecb' - '5993ae20546b80d0e5fa4f7b367e2f82') - -build() { - cd ${srcdir}/DirectFB-${pkgver} -# patch -p0 < ../dfb_serial.diff - ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-zlib \ - --enable-x11 --enable-sdl --disable-vnc --disable-osx \ - --enable-video4linux2 --enable-voodoo || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 -} diff --git a/abs/core-testing/directfb/dfb_serial.diff b/abs/core-testing/directfb/dfb_serial.diff deleted file mode 100644 index 638467b..0000000 --- a/abs/core-testing/directfb/dfb_serial.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/direct/serial.h.orig 2009-02-11 05:40:20.000000000 +0000 -+++ lib/direct/serial.h 2009-02-11 05:40:44.000000000 +0000 -@@ -31,6 +31,7 @@ - - #include - #include -+#include - - struct __D_DirectSerial { - int magic; diff --git a/abs/core-testing/diskless-legacy/PKGBUILD b/abs/core-testing/diskless-legacy/PKGBUILD deleted file mode 100644 index 85cfc3a..0000000 --- a/abs/core-testing/diskless-legacy/PKGBUILD +++ /dev/null @@ -1,14 +0,0 @@ -# $Id: PKGBUILD 23123 2009-01-03 02:43:02Z kevin $ -# Maintainer: Greg Frost -pkgname=diskless-legacy -pkgver=1 -pkgrel=3 -pkgdesc="Script for configuring a diskless mythtv frontends using NFS root." -arch=i686 -depends=(tftp-hpa dhcp) -source=(config_diskless_frontend.bash) - -build() { - install -D -m755 ${srcdir}/config_diskless_frontend.bash \ - ${pkgdir}/usr/local/bin/config_diskless_frontend.bash -} diff --git a/abs/core-testing/diskless-legacy/config_diskless_frontend.bash b/abs/core-testing/diskless-legacy/config_diskless_frontend.bash deleted file mode 100755 index 24d5fc1..0000000 --- a/abs/core-testing/diskless-legacy/config_diskless_frontend.bash +++ /dev/null @@ -1,704 +0,0 @@ -#!/bin/bash -# This script configures your backend so that a diskless -# frontend can boot from it. - -function backtitle() { # no arguments. - BT="${0##*/}" - KMV='/etc/LinHES-release' - if [ -f "$KMV" ]; then - BT="-= $(cat $KMV) $BT =-" - fi -} - -function must_be_root() { # no arguments. - test $(id -u) == 0 && return - MSG="\Z1ERROR\Zn: This script \Z4should\Zn be run by \Z1root\Zn." - dialog --backtitle "$BT" --colors --msgbox "$MSG" 5 45 - exit 4 -} - -backtitle -must_be_root - -TITLE="Diskless FE Configuration" -DOPTS=(--backtitle "$BT" --title "$TITLE" --trim --aspect 30 ) - -DAEMON_LOG=/var/log/daemon.log -BOOT_DEFAULT=/tftpboot/pxelinux.cfg/default - -unable_to_determine_mac_for_default_fe () -{ - if dialog "${DOPTS[@]}" --yes-label "Boot FE and try again" \ - --no-label "Delete $fe_nfsroot" \ - --yesno "Unable to automatically determine the MAC address of - the current default frontend by interrogating $DAEMON_LOG. - This may be because you have not yet booted the diskless FE. You can - either boot the diskless FE and try running $0 again, or delete - $fe_nfsroot and re-create it later." 0 0 ; then - exit - else - rm -Rf $fe_nfsroot $BOOT_DEFAULT - fi - exit -} - -find_existing_diskless_fes() { - - unset frontend_names - unset frontend_nfsroots - unset frontend_ips - unset frontend_macs - - for frontend_config in $(ls /tftpboot/pxelinux.cfg 2> /dev/null) ; do - - frontend_name=$(basename $( - grep append /tftpboot/pxelinux.cfg/$frontend_config | - sed -e 's/.*nfsroot=//' | awk -F, '{print $1}' | awk -F/ '{print $NF}')) - frontend_nfsroot=$( - grep append /tftpboot/pxelinux.cfg/$frontend_config | - cut -d ':' -f 2 | cut -d ',' -f 1) - frontend_ip=\ -$((0x${frontend_config:0:2})).$((0x${frontend_config:2:2})).\ -$((0x${frontend_config:4:2})).$((0x${frontend_config:6:2})) - frontend_mac=$( - cat /etc/dhcpd.conf | - grep "host $frontend_name" | - sed 's/hardware ethernet /#/g' | - cut -d '#' -f 2 | - cut -d ';' -f 1) - - if [ -n "$frontend_name" -a -n "$frontend_nfsroot" -a \ - -n "$frontend_ip" -a -n "$frontend_mac" ] ; then - frontend_names=( "${frontend_names[@]}" $frontend_name ) - frontend_nfsroots=( "${frontend_nfsroots[@]}" $frontend_nfsroot ) - frontend_ips=( "${frontend_ips[@]}" $frontend_ip ) - frontend_macs=( "${frontend_macs[@]}" $frontend_mac ) - fi - done - -echo frontend_names="${frontend_names[@]}" -echo frontend_nfsroots="${frontend_nfsroots[@]}" -echo frontend_ips="${frontend_ips[@]}" -echo frontend_macs="${frontend_macs[@]}" - -} - -check_for_default_fe () { - # This function looks to see if there is a diskless FE that has only been - # partially configured (i.e. it's MAC address has not been determined and - # as a result it has not been allocated a fixed IP. - - if [ -e $BOOT_DEFAULT ] ; then - # There is a $BOOT_DEFAULT config file that has not yet been set to a - # fixed IP address. See if we can interrogate the log files to - # determine what the MAC adderss of the FE is so that we can turn it - # into a fixed ip node. This is the first step in allowing multiple - # diskless frontends. - - # First determine from the default file, the nfsroot that it is for. - - fe_nfsroot=$(grep append $BOOT_DEFAULT | cut -d ':' -f 2 | cut -d ',' -f 1) - - if [ -z "$fe_nfsroot" ] ; then - echo "Unable to determine the location of the nfsroot from" \ - $BOOT_DEFAULT - exit - fi - - echo fe_nfsroot=$fe_nfsroot - - # Now determine the IP address by looking for an instance in the - # daemon log file for which the specified nfsroot was mounted. - - fe_ipaddress=$( - grep "authenticated mount request from " $DAEMON_LOG | - grep $fe_nfsroot | - tail -1 | - sed 's/authenticated mount request from /#/g' | - cut -d '#' -f 2 | - cut -d ':' -f 1) - - echo fe_ipaddress=$fe_ipaddress - - unset fe_macaddress - - if [ ! -z "$fe_ipaddress" ] ; then - fe_macaddress=$( - grep "DHCPACK on $fe_ipaddress" $DAEMON_LOG | - tail -1 | - sed 's/DHCPACK on '$fe_ipaddress' to /#/g' | - cut -d '#' -f 2 | - cut -d ' ' -f 1) - fi - - echo fe_macaddress=$fe_macaddress - - if [ -z "$fe_macaddress" ] ; then - unable_to_determine_mac_for_default_fe - else - if ! dialog "${DOPTS[@]}" --yesno "By interrogating $DAEMON_LOG, - it appears that the $(basename $fe_nfsroot) frontend was - last used by a host with MAC Address of $fe_macaddress which - was allocated IP address $fe_ipaddress. - Do you wish to allocate the IP to that host (so that you - can configure another diskless FE)?" 0 0 ; then - dialog "${DOPTS[@]}" --msgbox "Boot the correct diskless FE and - run $0 again." 0 0 - exit - fi - - # Setup dhcpd.conf so that the FE's MAC address always uses a fixed - # ip address and the PXE configuration is fixed for that address. - - hex_ip_address=$(printf "%02X%02X%02X%02X" $(echo $fe_ipaddress | - tr '.' ' ')) - echo hex_ip_address=$hex_ip_address - mv -fv $BOOT_DEFAULT $(dirname $BOOT_DEFAULT)/$hex_ip_address - - cp -f /etc/dhcpd.conf /etc/dhcpd.conf.bak - cat /etc/dhcpd.conf.bak | - grep -v "host $(basename $fe_nfsroot)" > \ - /etc/dhcpd.conf - echo "\ -host $(basename $fe_nfsroot) \ -{hardware ethernet $fe_macaddress; fixed-address $fe_ipaddress;}" \ - >> /etc/dhcpd.conf - - /sbin/sv restart dhcpd - - dialog "${DOPTS[@]}" --msgbox "The frontend $(basename $fe_nfsroot) - with a MAC address of $fe_macaddress and an nfsroot directory of - $fe_nfsroot has been configured with a fixed IP address of - $fe_ipaddress." 0 0 - exit - fi - fi - -} - -get_network_interface() { - NETDEVICES="$(cat /proc/net/dev | - awk -F: '/ath.:|wlan.:|eth.:|tr.:/{print $1}')" - echo NETDEVICES=$NETDEVICES - NUM_DEVICES=$(echo $NETDEVICES | wc -w) - echo NUM_DEVICES=$NUM_DEVICES - if [ $NUM_DEVICES = 1 ] ; then - INTERFACE=$NETDEVICES - else - DEVICELIST="" - DEVNUM=0 - for DEVICE in $NETDEVICES - do - DEVNUM=$(($DEVNUM + 1)) - DEVICELIST="$DEVICELIST $DEVICE Interface${DEVNUM} " - done - echo DEVICELIST=$DEVICELIST - TMP=/tmp/interface - rm -Rf $TMP - dialog "${DOPTS[@]}" --menu "Which network interface?" 18 70 12 \ - $DEVICELIST 2>$TMP || exit - INTERFACE=$(cat $TMP) - fi - echo INTERFACE=$INTERFACE -} - -validip(){ - echo "$1" | egrep -q -e '[0-9]+\.[0-9]+\.[0-9]+.[0-9]+' - return $? -} - -get_network_info() { - BACKEND_IP=$(echo $(ifconfig $INTERFACE | grep "inet addr" | tr ':' ' ') | - cut -d ' ' -f 3) - echo BACKEND_IP=$BACKEND_IP - NAMESERVERS="$(awk '/^nameserver/{printf "%s ",$2}' /etc/resolv.conf)" - echo NAMESERVERS=$NAMESERVERS - GATEWAY="$(LANG=C LC_ALL=C route -n | awk '/^0\.0\.0\.0/{print $2; exit}')" - echo GATEWAY=$GATEWAY - NETWORK="${BACKEND_IP%.*}" - echo NETWORK=$NETWORK - HOST="${BACKEND_IP##*.}" - echo HOST=$HOST - NETMASK="$(LANG=C LC_ALL=C ifconfig $INTERFACE | - awk '/[Mm]ask/{FS="[: ]*";$0=$0; print $8; exit}')" - echo NETMASK=$NETMASK - - # See if we can determine the range of IP addresses currently allowed in - # dhcpd.conf - - IPRANGE=( $(grep ^[[:space:]]*range /etc/dhcpd.conf | - sed 's/range//g' | tr -d ';') ) - - echo ${IPRANGE[@]} - if [ $(echo ${IPRANGE[@]} | wc -w) -eq 2 ] ; then - START=$(echo ${IPRANGE[0]} | tr '.' '\t' | cut -f 4) - END=$(echo ${IPRANGE[1]} | tr '.' '\t' | cut -f 4) - echo START=$START - echo END=$END - fi - - # Could not - - if [ -z "$START" -o -z "$END" ] ; then - if [ "$HOST" -lt "20" ] ; then - START=21 - END=26 - else - START=11 - END=16 - fi - fi - - IPRANGE_FROM="" - IPRANGE_TO="" - - while [ -z "$IPRANGE_FROM" -o -z "$IPRANGE_TO" -o -z "$IPRANGE" ] - do - IPRANGE="$NETWORK.$START $NETWORK.$END" - rm -f /tmp/iprange - - if ! dialog "${DOPTS[@]}" --clear --inputbox "Please enter the desired - IP-Range of addresses that should be allocated by clients, - separated by a single space." 10 75 "$IPRANGE" \ - 2> /tmp/iprange ; then - exit - fi - - IPRANGE=$(cat /tmp/iprange) - echo IPRANGE=$IPRANGE - IPRANGE_FROM="${IPRANGE%% *}" - IPRANGE_TO="${IPRANGE##* }" - - for i in "$IPRANGE_FROM" "$IPRANGE_TO" - do - validip "$i" || IPRANGE="" - done - done -} - -setup_dhcpd() { - # Generate dhcpd.conf from template - - if [ ! -f /etc/dhcpd.conf.orig ] ; then - mv -f /etc/dhcpd.conf /etc/dhcpd.conf.orig - fi - - ALLNAMESERVERS="" - for i in $NAMESERVERS; do - ALLNAMESERVERS="${ALLNAMESERVERS:+$ALLNAMESERVERS,} $i" - done - echo ALLNAMESERVERS=$ALLNAMESERVERS - - cat >/etc/dhcpd.conf <> \ - /etc/dhcpd.conf - done - - /sbin/add_service.sh dhcpd -} - -setup_tftpd() { - /sbin/add_service.sh tftpd -} - -check_delete_of_existing_nfsroot() { - if [ -d $NFSROOT ] ; then - if dialog "${DOPTS[@]}" --yesno "\ -There is already a directory $NFSROOT. Do you want to delete it and \ -rebuild it from scratch?" 10 70 ; then - echo Deleting $NFSROOT - rm -Rf $NFSROOT - else - echo "OK then, bye." - exit - fi - fi -} - -enable_mysql_and_backend_networking() { - # Enable mysql networking on the backend. - - /sbin/sv stop mythbackend - - if grep -q ^skip-networking /etc/my.cnf ; then - echo "Commenting out skip-networking." - cp /etc/my.cnf /etc/my.cnf~ - cat /etc/my.cnf~ | sed 's/^skip-networking/#skip-networking/g' > \ - /etc/my.cnf - /sbin/sv restart mysql - else - echo "Already commented out skip-networking." - fi - - # Make sure that the backend ip settings in the mythtv mysql database have - # the actual IP address of the backend rather than the loopback address. - # Otherwise the frontend will not be able to connect to the backend. - - echo "Setting backend IP in mythtv's mysql settings" - echo " -UPDATE settings SET data='$BACKEND_IP' WHERE value='BackendServerIP'; -UPDATE settings SET data='$BACKEND_IP' WHERE value='MasterServerIP';" | - mysql mythconverg - - /sbin/sv start mythbackend -} - -export_mounts() { - # Ensure that the /myth directory is exported. - - if ! grep -q ^/myth[[:space:]] /etc/exports ; then - echo "Adding line for /myth in /etc/exports" - echo "/myth *(rw,async,no_subtree_check)" >> /etc/exports - else - echo "Already added line for /myth in /etc/exports" - fi - - if ! grep -q ^/data/var/cache/pacman[[:space:]] /etc/exports ; then - echo "Adding line for /data/var/cache/pacman in /etc/exports" - echo "/data/var/cache/pacman *(rw,async,no_subtree_check)" >> /etc/exports - else - echo "Already added line for /data/var/cache/pacman in /etc/exports" - fi - - # Ensure that the montpoints that are used as storage groups are exported. - - for storage_mount in ${storage_mounts[@]} ; do - - if ! grep -q ^${storage_mount}[[:space:]] /etc/exports ; then - echo "Adding line for ${storage_mount} in /etc/exports" - echo "${storage_mount} *(rw,async,no_subtree_check)" >> /etc/exports - else - echo "Already added line for ${storage_mount} in /etc/exports" - fi - done -} - -find_storage_mounts() { - unset storage_mounts - for group in $(mysql -sB mythconverg -e \ - "select dirname from storagegroup where hostname = '$(hostname)'") ; do - - group_mount=$group - while ! mountpoint -q $group_mount ; do - group_mount=$(dirname $group_mount) - done - - echo Storage group $group mountpoint is $group_mount - storage_mounts=( "${storage_mounts[@]}" $group_mount ) - done -} - -enable_nfs() { - /sbin/add_service.sh nfsd -} - -restart_nfs (){ - /usr/sbin/exportfs -arv -} - -export_nfsroot() { - # Ensure that the NFSROOT directory is appropriately exported. - - if ! grep -q ^$NFSROOT[[:space:]] /etc/exports ; then - echo "Adding line for $NFSROOT in /etc/exports" - echo "$NFSROOT *(rw,no_root_squash,async,no_subtree_check)" >> /etc/exports - else - echo "Already added line for $NFSROOT in /etc/exports" - fi -} - -create_tftpboot_directory() { - # Create the directory with the tftp stuff. - - echo "Creating /tftpboot directories" - mkdir -p /tftpboot/pxelinux.cfg - - if [ ! -e /tftpboot/pxelinux.0 ] ; then - cp -fv /usr/lib/syslinux/pxelinux.0 /tftpboot/pxelinux.0 - fi - - if [ ! -e /tftpboot/vmlinuz26 ] ; then - cp -fv /boot/vmlinuz26 /tftpboot/vmlinuz26 - fi - - if [ ! -e /tftpboot/kernel26.img ] ; then - - echo "Building kernel miniroot" -# if [ -z "$(awk -F\" '$1 ~ /^MODULES=/ && $2 ~ /nfs/' /etc/mkinitcpio.conf)" ] ; then -# cp /etc/mkinitcpio.conf /etc/mkinitcpio.conf~ -# sed -e '/^MODULES=/s/\"$/ nfs\"/' < /etc/mkinitcpio.conf~ > /etc/mkinitcpio.conf -# fi - if [ -z "$(awk -F\" '$1 ~ /^HOOKS=/ && $2 ~ /net/' /etc/mkinitcpio.conf)" ] ; then - cp /etc/mkinitcpio.conf /etc/mkinitcpio.conf~ - sed -e '/^HOOKS=/s/\"$/ net\"/' < /etc/mkinitcpio.conf~ > /etc/mkinitcpio.conf - fi - /sbin/mkinitcpio -g /tftpboot/kernel26.img - fi -} - -create_default_pxelinux_entry() { - echo "\ - default linux - - label linux - kernel vmlinuz26 - append initrd=kernel26.img rootfstype=nfs root=/dev/nfs nfsroot=$BACKEND_IP:$NFSROOT,v3,rsize=16384,wsize=16384 init=/sbin/runit ip=dhcp" \ - > /tftpboot/pxelinux.cfg/default -} - -create_new_nfsroot() { - # Prompt the user for the name of the NFSROOT. - - FRONTEND= - NFSROOT= - - while [ -z "$FRONTEND" ] ; do - if ! dialog "${DOPTS[@]}" --inputbox "Enter the hostname of the new - diskless FE:" 0 0 2> /tmp/frontend_hostname ; then - exit - fi - - FRONTEND=$(cat /tmp/frontend_hostname) - done - - # Prompt the user for the location of the NFSROOT. - - while [ -z "$NFSROOT" ] ; do - NFSROOT=/nfsroot/$FRONTEND - - if ! dialog "${DOPTS[@]}" --clear --inputbox "Enter the location of the - NFSROOT for the diskless FE:" \ - 0 0 "$NFSROOT" 2> /tmp/nfsroot_location ; then - exit - fi - - NFSROOT=$(cat /tmp/nfsroot_location) - done - - check_delete_of_existing_nfsroot - - # Create the nfsroot directory that the FE will use as its root filesystem. - - echo "Creating the $NFSROOT directory." - mkdir -p $NFSROOT - for DIR in /* ; do - if [[ "$DIR" != /mnt && \ - "$DIR" != /data && \ - "$DIR" != /media && \ - "$DIR" != /tmp && \ - "$DIR" != /etc.old && \ - "$DIR" != /storage && \ - "$DIR" != /var && \ - "$DIR" != /nfsroot && \ - "$DIR" != /tftpboot && \ - "$DIR" != /cdrom ]] - then - if mountpoint -q $DIR && [ "$DIR" != "/dev" ] ; then - echo " Making mountpoint dir $DIR" - cd $NFSROOT - tar c $DIR --exclude=$DIR/* 2> /dev/null | tar x 2> /dev/null - else - echo " Copying $DIR to $NFSROOT" - cp -ax $DIR $NFSROOT - fi - fi - done - - cd $NFSROOT - - # Exclude specific bits of /var - - tar c /var \ - --exclude=/var/lib/dhcpcd \ - --exclude=/var/lib/locate \ - --exclude=/var/lib/mlocate \ - --exclude=/var/lib/named \ - 2> /dev/null | tar x 2> /dev/null - - for DIR in /mnt /data /tmp /media /cdrom /var/lib/mlocate ; do - echo " Creating $DIR" - tar c $DIR --exclude=$DIR/* 2> /dev/null | tar x 2> /dev/null - done - - mkdir -p $NFSROOT/data/var/cache/pacman - - chroot $NFSROOT /sbin/remove_service.sh dhcpd - chroot $NFSROOT /sbin/remove_service.sh lighttpd - chroot $NFSROOT /sbin/remove_service.sh mysql - chroot $NFSROOT /sbin/remove_service.sh mythbackend - chroot $NFSROOT /sbin/remove_service.sh nfsd - chroot $NFSROOT /sbin/remove_service.sh nmbd - chroot $NFSROOT /sbin/remove_service.sh smbd - chroot $NFSROOT /sbin/remove_service.sh tftpd - chroot $NFSROOT /sbin/remove_service.sh avahi - - # Update the fstab. - - cp $NSFROOT/etc/fstab $NFSROOT/etc/fstab~ - cat $NFSROOT/etc/fstab~ | grep -v ext[34] | grep -v xfs | - grep -v ^UUID= > $NFSROOT/etc/fstab - - echo "\ -$BACKEND_IP:/nfsroot / nfs defaults,nolock,auto,noatime 0 2 -$BACKEND_IP:/myth /myth nfs defaults,nolock,auto,noatime 0 0 -$BACKEND_IP:/data/var/cache/pacman /data/var/cache/pacman nfs defaults,nolock,auto,noatime 0 0 -" >> $NFSROOT/etc/fstab - - for storage_mount in ${storage_mounts[@]} ; do - echo "\ -$BACKEND_IP:${storage_mount} ${storage_mount} nfs auto,noatime,nolock,rsize=32768,wsize=32768 0 0" \ - >> $NFSROOT/etc/fstab - done - - cp $NFSROOT/etc/rc.sysinit $NFSROOT/etc/rc.sysinit~ - sed -e '/^\/sbin\/minilogd/s/$/\n\n# Mount NFS early\n\/bin\/mount -a -t nfs/' \ - < $NFSROOT/etc/rc.sysinit~ > $NFSROOT/etc/rc.sysinit - - # Update networking - - echo $FRONTEND > $NFSROOT/etc/hostname - - cp $NFSROOT/etc/hosts $NFSROOT/etc/hosts~ - echo "127.0.0.1 $FRONTEND localhost" > $NFSROOT/etc/hosts - cat $NFSROOT/etc/hosts~ | grep -v 127.0.0.1 >> $NFSROOT/etc/hosts - - cp $NFSROOT/etc/net/ifaces/eth0/options $NFSROOT/etc/net/ifaces/eth0/options~ - sed -e 's/^BOOTPROTO=.*/BOOTPROTO=none/' < $NFSROOT/etc/net/ifaces/eth0/options~ \ - > $NFSROOT/etc/net/ifaces/eth0/options - - # Update mysql settings - - cp /usr/share/mythtv/mysql.txt $NFSROOT/home/mythtv/.mythtv/mysql.txt - - if grep -q DBHostName=localhost $NFSROOT/home/mythtv/.mythtv/mysql.txt ; then - echo "Setting database host in frontend's mysql.txt." - cp $NFSROOT/home/mythtv/.mythtv/mysql.txt \ - $NFSROOT/home/mythtv/.mythtv/mysql.txt.orig - cat $NFSROOT/home/mythtv/.mythtv/mysql.txt.orig | - sed 's/DBHostName=localhost/DBHostName='$BACKEND_IP'/g' > \ - $NFSROOT/home/mythtv/.mythtv/mysql.txt - else - echo "Already set Database host in frontend's mysql.txt." - fi - - chown mythtv:mythtv $NFSROOT/home/mythtv/.mythtv/mysql.txt - - # Check if the user has a diskless_tweak. file in root's - # home directory. If they do, run it inside the chroot of the NFS root. - - if [[ -x ~/diskless_tweak.$FRONTEND ]] ; then - echo Running tweak file ~/diskless_tweak.$FRONTEND - chroot $NFSROOT bash -v ~/diskless_tweak.$FRONTEND - fi - - create_default_pxelinux_entry - export_nfsroot - restart_nfs - - dialog "${DOPTS[@]}" --msgbox "Boot your diskless FE - and then re-run this script ($0) so that the MAC address - of the Diskless FE can be obtained." 0 0 -} - -########################################## -########################################## -## -## MAIN BODY OF SCRIPT ## -## -########################################## -########################################## - -check_for_default_fe -find_existing_diskless_fes - -get_network_interface -get_network_info -setup_tftpd -setup_dhcpd -enable_mysql_and_backend_networking -find_storage_mounts -export_mounts -create_tftpboot_directory -enable_nfs - -# Restart nfs to ensure that the exported /myth directory can be mounted. This -# is required to create a new frontend. - -restart_nfs - -if [ ${#frontend_names[@]} -eq 0 ] ; then - create_new_nfsroot -else - for (( fe = 0 ; fe < ${#frontend_names[@]} ; fe++ )) ; do - frontend_options=( "${frontend_options[@]}" \ - "${frontend_names[$fe]} (MAC:${frontend_macs[$fe]} \ -IP:${frontend_ips[$fe]})" "" ) - done - -echo 0=${frontend_names[0]} -echo 1=${frontend_names[1]} -echo 2=${frontend_names[2]} -echo 3=${frontend_names[3]} - - if ! dialog "${DOPTS[@]}" --menu "Select a frontend to delete or to create - a new one." 0 0 0 "${frontend_options[@]}" \ - "New Frontend" "" 2> /tmp/selected_fe; then - exit - fi - - selected_option=$(cat /tmp/selected_fe) - - if [ "$selected_option" = "New Frontend" ] ; then - create_new_nfsroot - exit - fi - -echo $selected_option -echo ${frontend_options[0]} -echo ${frontend_options[2]} -echo ${frontend_nfsroots[@]} - - for (( fe = 0 ; fe < ${#frontend_names[@]} ; fe++ )) ; do - if [ "$selected_option" = "${frontend_options[$(($fe*2))]}" ] ; then - if dialog "${DOPTS[@]}" --yesno "Do you wish to delete the frontend - with nfsroot ${frontend_nfsroots[$fe]}?" 0 0 ; then - # Delete the nfsroot directory. - rm -Rfv ${frontend_nfsroots[$fe]} - - # Delete the tftpboot pxe boot config file. - - hex_ip_address=$(printf "%02X%02X%02X%02X" \ - $(echo ${frontend_ips[$fe]} | tr '.' ' ')) - rm /tftpboot/pxelinux.cfg/$hex_ip_address - - # Remove reference to the frontend from the dhcp.conf - cp -fv /etc/dhcpd.conf /etc/dhcpd.conf.bak - grep -v "host ${frontend_names[$fe]}" /etc/dhcpd.conf.bak > \ - /etc/dhcpd.conf - /sbin/sv restart dhcpd - fi - fi - done -fi - diff --git a/abs/core-testing/dmapi/PKGBUILD b/abs/core-testing/dmapi/PKGBUILD deleted file mode 100644 index 0f5d015..0000000 --- a/abs/core-testing/dmapi/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Tobias Powalowski -pkgname=dmapi -pkgver=2.2.8 -pkgrel=12 -pkgdesc="Data migration API" -arch=(i686 x86_64) -url="http://oss.sgi.com/projects/xfs/" -license=('GPL') -groups=('base') -depends=('glibc') -makedepends=('xfsprogs') -provides=('xfsdmapi') -conflicts=('xfsdmapi') -replaces=('xfsdmapi') -options=('!libtool') -source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/dmapi_$pkgver-1.tar.gz) -md5sums=('1265828fabc6e3ec4b70696db331fb8a') - -build() { - cd $startdir/src/dmapi-$pkgver - [ "$CARCH" = "x86_64" ] && export CFLAGS="$CLFAGS -fPIC" - autoconf - ./configure --prefix=$startdir/pkg/usr - make || return 1 - make prefix=$startdir/pkg/usr/ install install-lib install-dev - # the static lib - install -D -m644 libdm/.libs/libdm.a $startdir/pkg/usr/lib/libdm.a - # and the header file, please - install -D -m644 include/dmapi.h $startdir/pkg/usr/include/xfs/dmapi.h -} diff --git a/abs/core-testing/dmidecode/PKGBUILD b/abs/core-testing/dmidecode/PKGBUILD deleted file mode 100644 index c29957a..0000000 --- a/abs/core-testing/dmidecode/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Jan de Groot -# Contributor: Giovanni Scafora - -pkgname=dmidecode -pkgver=2.9 -pkgrel=2 -pkgdesc="Desktop Management Interface table related utilities" -arch=('i686') -url="http://www.nongnu.org/dmidecode" -license=('GPL') -depends=('glibc') -source=(http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('3dac4b1817012ffebd78671473d8f56c') - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - make prefix=/usr || return 1 - make prefix=/usr DESTDIR=${startdir}/pkg install -} diff --git a/abs/core-testing/dmxproto/PKGBUILD b/abs/core-testing/dmxproto/PKGBUILD deleted file mode 100644 index 1ccffd6..0000000 --- a/abs/core-testing/dmxproto/PKGBUILD +++ /dev/null @@ -1,19 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -#Maintainer: Jan de Groot - -pkgname=dmxproto -pkgver=2.2.2 -pkgrel=1 -pkgdesc="X11 Distributed Multihead X extension wire protocol" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -md5sums=('d80acad88411e7944b9b085463d53302') -sha1sums=('80c573166ec3b9f17893e2fff84ce0107045faac') - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 -} diff --git a/abs/core-testing/dnsutils/PKGBUILD b/abs/core-testing/dnsutils/PKGBUILD deleted file mode 100644 index 336f534..0000000 --- a/abs/core-testing/dnsutils/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 85957 2010-07-22 20:05:06Z kevin $ -# Maintainer: kevin -# Contributor: mario -pkgname=dnsutils -# Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.7.1.P2 -_pkgver=9.7.1-P2 -pkgrel=1 -pkgdesc="Various DNS utilities - dig host nslookup nsupdate" -arch=(i686 x86_64) -url="https://www.isc.org/software/bind" -license=('custom:ISC') -depends=('openssl') -replaces=('bind-tools' 'host') -options=('makeflags') -source=(http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz - bind.so_bsdcompat.diff tools-only.patch) -md5sums=('bd6be63cc910d04da39103d441871596' - '447d58721cfee0e1e377b46f7d50b327' - 'be0558f70ed81d90e68e6b6003ba12ed') - -build() { - cd "${srcdir}/bind-${_pkgver}" - patch -Np0 -i "${srcdir}/bind.so_bsdcompat.diff" || return 1 - patch -Np1 -i "${srcdir}/tools-only.patch" || return 1 - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-openssl=yes --disable-linux-caps --without-libxml2 || return 1 - make || return 1 -} - -package() { - cd "${srcdir}/bind-${_pkgver}/bin" - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 ../COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 -} diff --git a/abs/core-testing/dnsutils/bind.so_bsdcompat.diff b/abs/core-testing/dnsutils/bind.so_bsdcompat.diff deleted file mode 100644 index 5d78031..0000000 --- a/abs/core-testing/dnsutils/bind.so_bsdcompat.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./lib/isc/unix/socket.c.orig 2005-11-03 17:08:42.000000000 -0600 -+++ ./lib/isc/unix/socket.c 2006-02-18 13:09:15.000000000 -0600 -@@ -245,6 +245,8 @@ - - #define SOCK_DEAD(s) ((s)->references == 0) - -+#undef SO_BSDCOMPAT -+ - static void - manager_log(isc_socketmgr_t *sockmgr, - isc_logcategory_t *category, isc_logmodule_t *module, int level, diff --git a/abs/core-testing/dnsutils/tools-only.patch b/abs/core-testing/dnsutils/tools-only.patch deleted file mode 100644 index b46b71f..0000000 --- a/abs/core-testing/dnsutils/tools-only.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur bind-9.7.1-P2.orig/bin/Makefile.in bind-9.7.1-P2/bin/Makefile.in ---- bind-9.7.1-P2.orig/bin/Makefile.in 2009-10-05 08:07:08.000000000 -0400 -+++ bind-9.7.1-P2/bin/Makefile.in 2010-07-22 15:55:00.000000000 -0400 -@@ -19,8 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -- check confgen @PKCS11_TOOLS@ -+SUBDIRS = dig nsupdate - TARGETS = - - @BIND9_MAKE_RULES@ -diff -Naur bind-9.7.1-P2.orig/lib/Makefile.in bind-9.7.1-P2/lib/Makefile.in ---- bind-9.7.1-P2.orig/lib/Makefile.in 2007-06-19 19:47:13.000000000 -0400 -+++ bind-9.7.1-P2/lib/Makefile.in 2010-07-22 15:56:29.000000000 -0400 -@@ -23,7 +23,7 @@ - # Attempt to disable parallel processing. - .NOTPARALLEL: - .NO_PARALLEL: --SUBDIRS = isc isccc dns isccfg bind9 lwres tests -+SUBDIRS = isc dns isccfg bind9 lwres - TARGETS = - - @BIND9_MAKE_RULES@ diff --git a/abs/core-testing/docutils/PKGBUILD b/abs/core-testing/docutils/PKGBUILD deleted file mode 100644 index d1240c4..0000000 --- a/abs/core-testing/docutils/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 21893 2010-07-18 10:50:27Z spupykin $ -# Maintainer: Sergej Pupykin -# Maintainer: tardo - -pkgname=docutils -pkgver=0.7 -pkgrel=2 -pkgdesc="Set of tools for processing plaintext docs into formats such as HTML, XML, or LaTeX" -arch=(any) -url="http://docutils.sourceforge.net" -license=('custom') -depends=('python') -source=(http://downloads.sourceforge.net/docutils/docutils-$pkgver.tar.gz) -md5sums=('9aec716baf15d06b5aa57cf8d5591c15') - -build() { - pacman -Q docutils && { error "You should remove docutils" ; return 1; } - - cd $srcdir/docutils-$pkgver - python setup.py install --root=$pkgdir - - for f in $pkgdir/usr/bin/*.py; do - mv $f $pkgdir/usr/bin/$(basename $f .py) - done - - install -D -m644 COPYING.txt $pkgdir/usr/share/licenses/$pkgname/COPYING.txt - install -D -m644 licenses/python* $pkgdir/usr/share/licenses/$pkgname/ -} - diff --git a/abs/core-testing/dosfstools/PKGBUILD b/abs/core-testing/dosfstools/PKGBUILD deleted file mode 100644 index 488cab5..0000000 --- a/abs/core-testing/dosfstools/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 9911 2008-08-21 00:29:06Z eric $ -# Maintainer: dorphell -# Committer: Judd Vinet -pkgname=dosfstools -pkgver=2.11 -pkgrel=2 -pkgdesc="DOS filesystem utilities" -arch=(i686 x86_64) -depends=('glibc') -source=(ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/$pkgname/$pkgname-$pkgver.src.tar.gz linux-2.6.patch) -md5sums=('407d405ade410f7597d364ab5dc8c9f6' '6689fb7693ed213e6c3289b533b4f66d') -url="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/" - -build() { - cd $startdir/src/$pkgname-$pkgver - patch -p1 -i $startdir/src/linux-2.6.patch - patch -Np0 -i $startdir/src/dosfstools_$pkgver-1.diff - make || return 1 - make PREFIX=$startdir/pkg install -} diff --git a/abs/core-testing/dosfstools/linux-2.6.patch b/abs/core-testing/dosfstools/linux-2.6.patch deleted file mode 100644 index e21e94c..0000000 --- a/abs/core-testing/dosfstools/linux-2.6.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -Nur dosfstools-2.10/dosfsck/boot.c dosfstools-2.10-fixed/dosfsck/boot.c ---- dosfstools-2.10/dosfsck/boot.c 2003-06-14 22:03:20.000000000 +0200 -+++ dosfstools-2.10-fixed/dosfsck/boot.c 2004-02-11 21:15:48.000000000 +0100 -@@ -14,6 +14,9 @@ - #include "io.h" - #include "boot.h" - -+#ifndef MSDOS_FAT12 -+# define MSDOS_FAT12 4084 /* taken from 2.4 linux/msdos_fs.h */ -+#endif - - #define ROUND_TO_MULTIPLE(n,m) ((n) && (m) ? (n)+(m)-1-((n)-1)%(m) : 0) - /* don't divide by zero */ -diff -Nur dosfstools-2.10/dosfsck/common.h dosfstools-2.10-fixed/dosfsck/common.h ---- dosfstools-2.10/dosfsck/common.h 1998-04-28 13:14:25.000000000 +0200 -+++ dosfstools-2.10-fixed/dosfsck/common.h 2004-02-11 21:15:01.000000000 +0100 -@@ -6,6 +6,9 @@ - #ifndef _COMMON_H - #define _COMMON_H - -+#include -+#include -+ - void die(char *msg,...) __attribute((noreturn)); - - /* Displays a prinf-style message and terminates the program. */ -diff -Nur dosfstools-2.10/dosfsck/file.c dosfstools-2.10-fixed/dosfsck/file.c ---- dosfstools-2.10/dosfsck/file.c 2003-06-14 22:03:20.000000000 +0200 -+++ dosfstools-2.10-fixed/dosfsck/file.c 2004-02-11 21:13:53.000000000 +0100 -@@ -15,9 +15,9 @@ - #define _LINUX_STAT_H /* hack to avoid inclusion of */ - #define _LINUX_STRING_H_ /* hack to avoid inclusion of */ - #define _LINUX_FS_H /* hack to avoid inclusion of */ -+#include "common.h" - #include - --#include "common.h" - #include "file.h" - - -diff -Nur dosfstools-2.10/dosfsck/io.c dosfstools-2.10-fixed/dosfsck/io.c ---- dosfstools-2.10/dosfsck/io.c 2003-06-14 22:03:20.000000000 +0200 -+++ dosfstools-2.10-fixed/dosfsck/io.c 2004-02-11 21:14:24.000000000 +0100 -@@ -21,8 +21,8 @@ - #include - #include - --#include "dosfsck.h" - #include "common.h" -+#include "dosfsck.h" - #include "io.h" - - -diff -Nur dosfstools-2.10/mkdosfs/mkdosfs.c dosfstools-2.10-fixed/mkdosfs/mkdosfs.c ---- dosfstools-2.10/mkdosfs/mkdosfs.c 2003-06-14 22:07:08.000000000 +0200 -+++ dosfstools-2.10-fixed/mkdosfs/mkdosfs.c 2004-02-11 21:13:09.000000000 +0100 -@@ -62,6 +62,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/abs/core-testing/dri2proto/PKGBUILD b/abs/core-testing/dri2proto/PKGBUILD deleted file mode 100644 index d05b73f..0000000 --- a/abs/core-testing/dri2proto/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Jan de Groot - -pkgname=dri2proto -pkgver=2.3 -pkgrel=1 -pkgdesc="X11 DRI protocol" -arch=(any) -license=('custom') -url="http://xorg.freedesktop.org/" -makedepends=('xorg-util-macros') -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('6c9e2c822e777db435a43616067f8dd21cc00a53') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 -} diff --git a/abs/core-testing/dvb-firmware/PKGBUILD b/abs/core-testing/dvb-firmware/PKGBUILD deleted file mode 100644 index 3a84167..0000000 --- a/abs/core-testing/dvb-firmware/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $ -# Maintainer: Cecil Watson - -pkgname=dvb-firmware -pkgver=1 -pkgrel=9 -pkgdesc="Firmware for DVB cards" -arch=('i586' 'i686' 'x86_64') -url="http://linuxtv.org/" -source=(ftp://ftp.knoppmyth.net/R6/sources/dvb-firmware.tar.bz2 -http://dl.ivtvdriver.org/ivtv/firmware/cx18-firmware.tar.gz - xc3028-v27.fw - dvb-usb-dib0700-1.20.fw - dvb-usb-af9015.fw) -md5sums=('6932d0b4f763424e35b7fa3a6cc82a2e' - '667fa0ee6b79e054736beef922966333' - '293dc5e915d9a0f74a368f8a2ce3cc10' - 'f42f86e2971fd994003186a055813237' - 'dccbc92c9168cc629a88b34ee67ede7b') - -build() { - cd $startdir/src/ - mkdir -p $startdir/pkg/lib/firmware - cp -a dvb-fw/* $startdir/pkg/lib/firmware - cp -a cx18-firmware/*.fw $startdir/pkg/lib/firmware - cp $startdir/src/*.fw $startdir/pkg/lib/firmware -} diff --git a/abs/core-testing/dvb-firmware/dvb-usb-af9015.fw b/abs/core-testing/dvb-firmware/dvb-usb-af9015.fw deleted file mode 100644 index 0014181..0000000 Binary files a/abs/core-testing/dvb-firmware/dvb-usb-af9015.fw and /dev/null differ diff --git a/abs/core-testing/dvb-firmware/dvb-usb-dib0700-1.20.fw b/abs/core-testing/dvb-firmware/dvb-usb-dib0700-1.20.fw deleted file mode 100644 index ce41240..0000000 Binary files a/abs/core-testing/dvb-firmware/dvb-usb-dib0700-1.20.fw and /dev/null differ diff --git a/abs/core-testing/dvb-firmware/xc3028-v27.fw b/abs/core-testing/dvb-firmware/xc3028-v27.fw deleted file mode 100644 index 76f46ab..0000000 Binary files a/abs/core-testing/dvb-firmware/xc3028-v27.fw and /dev/null differ diff --git a/abs/core-testing/dvd+rw-tools/PKGBUILD b/abs/core-testing/dvd+rw-tools/PKGBUILD deleted file mode 100644 index 7f7597b..0000000 --- a/abs/core-testing/dvd+rw-tools/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: damir - -pkgname=dvd+rw-tools -pkgver=7.1 -origver=7.1 # sometimes it is not the same as pkgver and has '-' in it -pkgrel=1 -[ "$CARCH" = "x86_64" ] && force=y -pkgdesc="dvd burning tools" -arch=(i686 x86_64) -license=('GPL') -url="http://fy.chalmers.se/~appro/linux/DVD+RW" -depends=('cdrkit' 'gcc-libs') -source=("http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-$origver.tar.gz" - "buildpatch-7.0-3-20080108-karolina.patch") -md5sums=('8acb3c885c87f6838704a0025e435871' '54b4dc52f5380216d4d9fc2dd2086d31') - -build() { - # fix build, thank you Karolina - cd $startdir/src/$pkgname-$pkgver - patch -Np1 -i $startdir/src/buildpatch-7.0-3-20080108-karolina.patch - - cd ${startdir}/src/${pkgname}-${pkgver} - make || return 1 - mkdir -p ${startdir}/pkg/usr/bin - for bin in growisofs dvd+rw-booktype dvd+rw-format dvd+rw-mediainfo dvd-ram-control; do - install -D -m755 $bin ${startdir}/pkg/usr/bin/$bin || return 1 - done - install -D -m644 growisofs.1 ${startdir}/pkg/usr/share/man/man1/growisofs.1 || return 1 -} - - diff --git a/abs/core-testing/dvd+rw-tools/buildpatch-7.0-3-20080108-karolina.patch b/abs/core-testing/dvd+rw-tools/buildpatch-7.0-3-20080108-karolina.patch deleted file mode 100644 index 0b7951f..0000000 --- a/abs/core-testing/dvd+rw-tools/buildpatch-7.0-3-20080108-karolina.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur dvd+rw-tools-7.0/growisofs.c dvd+rw-tools-7.0_new/growisofs.c ---- dvd+rw-tools-7.0/growisofs.c 2006-09-24 19:28:53.000000000 +0200 -+++ dvd+rw-tools-7.0_new/growisofs.c 2008-01-08 00:56:57.000000000 +0100 -@@ -418,6 +418,7 @@ - #include - #include - #include -+#include - #include "mp.h" - - #if defined(__unix) || defined(__unix__) -diff -Naur dvd+rw-tools-7.0/transport.hxx dvd+rw-tools-7.0_new/transport.hxx ---- dvd+rw-tools-7.0/transport.hxx 2006-09-23 13:29:07.000000000 +0200 -+++ dvd+rw-tools-7.0_new/transport.hxx 2008-01-08 00:57:36.000000000 +0100 -@@ -137,6 +137,7 @@ - #include - #include - #include -+#include - #if !defined(SG_FLAG_LUN_INHIBIT) - # if defined(SG_FLAG_UNUSED_LUN_INHIBIT) - # define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT diff --git a/abs/core-testing/dvdauthor/PKGBUILD b/abs/core-testing/dvdauthor/PKGBUILD deleted file mode 100644 index 6066d7f..0000000 --- a/abs/core-testing/dvdauthor/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# Maintainer: Travis Willard -# Contributor: Jaroslaw Swierczynski -# Contributor: Nicolai Lissner - -pkgname=dvdauthor -pkgver=0.6.14 -pkgrel=2 -pkgdesc="DVD authoring tools" -arch=('i686' 'x86_64') -url="http://dvdauthor.sourceforge.net/" -license=('GPL') -depends=('libdvdread' 'fribidi' 'imagemagick>=6.4.0.2') -source=(http://dl.sourceforge.net/sourceforge/dvdauthor/${pkgname}-${pkgver}.tar.gz) -md5sums=('bd646b47950c4091ffd781d43fd2c5e9') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make prefix=$startdir/pkg/usr install -} diff --git a/abs/core-testing/e2fsprogs/MIT-LICENSE b/abs/core-testing/e2fsprogs/MIT-LICENSE deleted file mode 100644 index d849b28..0000000 --- a/abs/core-testing/e2fsprogs/MIT-LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2003-2007 Theodore Ts'o -Copyright (c) 1997-2003 Yann Dirson -Copyright (c) 2001 Alcove -Copyright (c) 1997 Klee Dienes -Copyright (c) 1995-1996 Michael Nonweiler - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject -to the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR -IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/abs/core-testing/e2fsprogs/Makefile-fsck.static.patch b/abs/core-testing/e2fsprogs/Makefile-fsck.static.patch deleted file mode 100644 index a006443..0000000 --- a/abs/core-testing/e2fsprogs/Makefile-fsck.static.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- e2fsprogs-1.40.4/misc/Makefile 2008-01-16 14:52:53.000000000 +0000 -+++ e2fsprogs-1.40.4/misc/Makefile.neu 2008-01-16 14:53:43.000000000 +0000 -@@ -376,6 +376,10 @@ - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_BLKID) $(LIBINTL) - -+fsck.static: $(FSCK_OBJS) $(DEPSTATIC_LIBBLKID) -+ @echo " LD $@" -+ @$(CC) $(ALL_LDFLAGS) -static -o fsck.static $(FSCK_OBJS) $(STATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) $(LIBINTL) -+ - badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL) diff --git a/abs/core-testing/e2fsprogs/PKGBUILD b/abs/core-testing/e2fsprogs/PKGBUILD deleted file mode 100644 index 730522b..0000000 --- a/abs/core-testing/e2fsprogs/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 80571 2010-05-19 18:38:36Z ronald $ -# Maintainer: Ronald van Haren -# Contributor: judd - -pkgname=e2fsprogs -pkgver=1.41.12 -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') -makedepends=('bc') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'MIT-LICENSE') -backup=('etc/mke2fs.conf') -install=${pkgname}.install -sha1sums=('62b002fe507b2ddafc24b89532e472fe4b55a14f' - 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Remove unnecessary init.d directory - sed -i '/init\.d/s|^|#|' misc/Makefile.in || return 1 - - ./configure --prefix=/usr --with-root-prefix="" --enable-elf-shlibs \ - --disable-fsck --disable-uuidd \ - --disable-libuuid --disable-libblkid || return 1 - - - make || return 1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install install-libs || return 1 - - sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et" || return 1 - - # install MIT license - install -Dm644 "${srcdir}/MIT-LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" || return 1 - -} diff --git a/abs/core-testing/e2fsprogs/e2fsprogs.install b/abs/core-testing/e2fsprogs/e2fsprogs.install deleted file mode 100644 index f91d39f..0000000 --- a/abs/core-testing/e2fsprogs/e2fsprogs.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(libext2fs.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/abs/core-testing/e2fsprogs/mke2fs.conf b/abs/core-testing/e2fsprogs/mke2fs.conf deleted file mode 100644 index 92464e3..0000000 --- a/abs/core-testing/e2fsprogs/mke2fs.conf +++ /dev/null @@ -1,26 +0,0 @@ -[defaults] - base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr - blocksize = 4096 - inode_size = 128 - inode_ratio = 16384 - -[fs_types] - small = { - blocksize = 1024 - inode_size = 128 - inode_ratio = 4096 - } - floppy = { - blocksize = 1024 - inode_size = 128 - inode_ratio = 8192 - } - news = { - inode_ratio = 4096 - } - largefile = { - inode_ratio = 1048576 - } - largefile4 = { - inode_ratio = 4194304 - } diff --git a/abs/core-testing/ed/PKGBUILD b/abs/core-testing/ed/PKGBUILD deleted file mode 100644 index 09188d1..0000000 --- a/abs/core-testing/ed/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 17077 2008-10-24 19:45:39Z andyrtr $ -# Maintainer: Andreas Radke - -pkgname=ed -pkgver=1.1 -pkgrel=2 -pkgdesc="A POSIX-compliant line editor" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnu.org/software/ed/ed.html" -install=ed.install -groups=('base-devel') -depends=('glibc' 'texinfo') -options=('!emptydirs') -source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.bz2) -md5sums=('d190a6e8937f552118e2822085037099') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/ - make || return 1 -# installing executable - install -D -m755 ed ${pkgdir}/bin/ed - cd ${pkgdir}/bin - ln ed red -# installing man page - cd ${srcdir}/${pkgname}-${pkgver} - install -D -m644 doc/ed.1 ${pkgdir}/usr/share/man/man1/ed.1 - cd ${pkgdir}/usr/share/man/man1 - ln ed.1 red.1 -# installing info files - cd ${srcdir}/${pkgname}-${pkgver} - install -D -m644 doc/ed.info ${pkgdir}/usr/share/info/ed.info - cd ${pkgdir}/usr/share/info - ln ed.info red.info -} diff --git a/abs/core-testing/ed/ed.install b/abs/core-testing/ed/ed.install deleted file mode 100644 index 1a6e983..0000000 --- a/abs/core-testing/ed/ed.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(ed.info red.info) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/core-testing/eggdbus/PKGBUILD b/abs/core-testing/eggdbus/PKGBUILD deleted file mode 100644 index ddadba2..0000000 --- a/abs/core-testing/eggdbus/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 59198 2009-11-21 11:27:17Z jgc $ -# Maintainer: Jan de Groot - -pkgname=eggdbus -pkgver=0.6 -pkgrel=1 -pkgdesc="Experimental D-Bus bindings for GObject" -arch=(i686 x86_64) -license=('LGPL') -url="http://www.freedesktop.org/wiki/Software/Policykit" -depends=('glib2>=2.22.2' 'dbus-glib>=0.82-2') -makedepends=('gtk-doc') -options=('!libtool') -source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('b43d2a6c523fcb8b9d0b0300c4222386') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static --enable-gtk-doc || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/abs/core-testing/eject/PKGBUILD b/abs/core-testing/eject/PKGBUILD deleted file mode 100644 index b2ba852..0000000 --- a/abs/core-testing/eject/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: dorphell -# Contributor: Tom Newsom - -pkgname=eject -pkgver=2.1.5 -pkgrel=3 -pkgdesc="Eject is a program for ejecting removable media under software control" -arch=(i686 x86_64) -source=(http://www.pobox.com/~tranter/$pkgname-$pkgver.tar.gz eject-2.1.5-handle-spaces.patch) -url="http://ca.geocities.com/jefftranter@rogers.com/eject.html" -md5sums=('b96a6d4263122f1711db12701d79f738' '595b97c3bd56fd41e3b01b07885f81dc') - -build() { - cd $startdir/src/$pkgname - patch -Np0 -i ../eject-2.1.5-handle-spaces.patch || return 1 - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install -} diff --git a/abs/core-testing/eject/eject-2.1.5-handle-spaces.patch b/abs/core-testing/eject/eject-2.1.5-handle-spaces.patch deleted file mode 100644 index 692368f..0000000 --- a/abs/core-testing/eject/eject-2.1.5-handle-spaces.patch +++ /dev/null @@ -1,57 +0,0 @@ -http://bugs.gentoo.org/151257 - ---- eject.c -+++ eject.c -@@ -370,6 +370,30 @@ static int FileExists(const char *name, - - - /* -+ * Linux mangles spaces in mount points by changing them to an octal string -+ * of '\040'. So lets scan the mount point and fix it up by replacing all -+ * occurrences off '\0##' with the ASCII value of 0##. Requires a writable -+ * string as input as we mangle in place. Some of this was taken from the -+ * util-linux package. -+ */ -+#define octalify(a) ((a) & 7) -+#define tooctal(s) (64*octalify(s[1]) + 8*octalify(s[2]) + octalify(s[3])) -+#define isoctal(a) (((a) & ~7) == '0') -+static char *DeMangleMount(char *s) -+{ -+ char *tmp = s; -+ while ((tmp = strchr(tmp, '\\')) != NULL) { -+ if (isoctal(tmp[1]) && isoctal(tmp[2]) && isoctal(tmp[3])) { -+ tmp[0] = tooctal(tmp); -+ memmove(tmp+1, tmp+4, strlen(tmp)-3); -+ } -+ ++tmp; -+ } -+ return s; -+} -+ -+ -+/* - * Given name, such as foo, see if any of the following exist: - * - * foo (if foo starts with '.' or '/') -@@ -884,8 +908,8 @@ static int MountedDevice(const char *nam - if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) || - ((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) { - FCLOSE(fp); -- *deviceName = strdup(s1); -- *mountName = strdup(s2); -+ *deviceName = DeMangleMount(strdup(s1)); -+ *mountName = DeMangleMount(strdup(s2)); - return 1; - } - } -@@ -928,8 +952,8 @@ static int MountableDevice(const char *n - rc = sscanf(line, "%1023s %1023s", s1, s2); - if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) { - FCLOSE(fp); -- *deviceName = strdup(s1); -- *mountName = strdup(s2); -+ *deviceName = DeMangleMount(strdup(s1)); -+ *mountName = DeMangleMount(strdup(s2)); - return 1; - } - } diff --git a/abs/core-testing/elfutils/PKGBUILD b/abs/core-testing/elfutils/PKGBUILD deleted file mode 100644 index 5ecdcde..0000000 --- a/abs/core-testing/elfutils/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 87360 2010-08-13 03:21:31Z allan $ -# Maintainer: Allan McRae -# Contributor: Andrej Gelenberg - -pkgname=elfutils -pkgver=0.148 -pkgrel=1 -pkgdesc="Collection of libraries and utilities for working with ELF object files and DWARF debugging information" -arch=('i686' 'x86_64') -url="https://fedorahosted.org/elfutils/" -license=('GPL2') -depends=('glibc') -#optdepends=('zlib' 'xz' 'bzip2') -provides=('libelf') -replaces=('libelf') -conflicts=('libelf') -source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2) -md5sums=('a0bed1130135f17ad27533b0034dba8d') - -build() -{ - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --program-prefix="eu-" - make - make check -} - -package() -{ - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/abs/core-testing/esound/PKGBUILD b/abs/core-testing/esound/PKGBUILD deleted file mode 100644 index b157aab..0000000 --- a/abs/core-testing/esound/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 19662 2008-11-28 20:35:54Z jgc $ -# Maintainer: Jan de Groot -pkgname=esound -pkgver=0.2.41 -pkgrel=1 -pkgdesc="Enlightened Sound Daemon" -arch=(i686 x86_64) -license=('LGPL') -depends=('audiofile' 'tcp_wrappers' 'alsa-lib>=1.0.18') -url="http://www.tux.org/~ricdude/EsounD.html" -provides=("esd=${pkgver}") -replaces=('esd') -conflicts=('esd') -backup=('etc/esd.conf') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2 - esd-0.2.38-alsa-drain.patch - esd) -md5sums=('8d9aad3d94d15e0d59ba9dc0ea990c6c' - '3de93efcd1bc196a3585e6aef50eac48' - 'a4c76e7c7f75b201ea7ab6fb15b47472') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/esd-0.2.38-alsa-drain.patch" || return 1 - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --with-audiofile --with-libwrap \ - --enable-alsa --disable-artstest || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 "${srcdir}/esd" "${pkgdir}/etc/rc.d/esd" || return 1 -} diff --git a/abs/core-testing/esound/esd b/abs/core-testing/esound/esd deleted file mode 100755 index d90ef55..0000000 --- a/abs/core-testing/esound/esd +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/esd` -case "$1" in - start) - stat_busy "Starting Esound Daemon" - if [ -z "$PID" ]; then - /usr/bin/esd -nobeeps & - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon esd - stat_done - fi - ;; - stop) - stat_busy "Stopping Esound Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon esd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/abs/core-testing/esound/esd-0.2.38-alsa-drain.patch b/abs/core-testing/esound/esd-0.2.38-alsa-drain.patch deleted file mode 100644 index f2fb716..0000000 --- a/abs/core-testing/esound/esd-0.2.38-alsa-drain.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- esound-0.2.38/audio_alsa09.c.old 2007-06-11 12:22:24.000000000 +0200 -+++ esound-0.2.38/audio_alsa09.c 2007-06-11 12:22:49.000000000 +0200 -@@ -486,7 +486,7 @@ void esd_audio_flush(void) - } - - if (alsa_playback_handle != NULL) -- snd_pcm_drain( alsa_playback_handle ); -+ snd_pcm_drop( alsa_playback_handle ); - - if (alsadbg) - print_state(); diff --git a/abs/core-testing/etcnet/10-defaults b/abs/core-testing/etcnet/10-defaults deleted file mode 100644 index 3aeac58..0000000 --- a/abs/core-testing/etcnet/10-defaults +++ /dev/null @@ -1,11 +0,0 @@ -DHCP_CLIENT=/sbin/dhcpcd -DHCP_ARGS=-L -IP=/usr/sbin/ip -TC=/usr/sbin/tc -LSMOD=/bin/lsmod -IFGROUP[1]='eth wlan plip usb dvb bnep tuntap ath0' -IFRENAME=/usr/sbin/ifrename -IPTABLES=/usr/sbin/iptables -IP6TABLES=/usr/sbin/ip6tables -AUTO_BROADCAST=on - diff --git a/abs/core-testing/etcnet/PKGBUILD b/abs/core-testing/etcnet/PKGBUILD deleted file mode 100755 index e9ac4f4..0000000 --- a/abs/core-testing/etcnet/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -pkgname=etcnet -pkgver=0.9.8 -pkgrel=13 -pkgdesc="/etc/net network configuration subsystem" -url="http://etcnet.org/" -depends=('bash' 'grep' 'sed' 'iproute2' 'wireless_tools' 'iptables' 'dhcpcd') -arch=i686 -install=etcnet.install -source=(http://etcnet.org/files/$pkgname-$pkgver.tar.gz 10-defaults network functions.patch options ipv4route ipv4address ) -#backup=(etc/net/ifaces/eth0/options etc/net/ifaces/eth0/ipv4route etc/net/ifaces/eth0/ipv4address) - -build() { - cd $startdir/src/$pkgname-$pkgver - mkdir -p $startdir/pkg/var/lib/etcnet - mkdir -p $startdir/pkg/etc/sysconfig - cd etc/net - patch -p0 < $startdir/src/functions.patch || return 1 - - install -D -m 644 $startdir/src/10-defaults $startdir/pkg/etc/net/options.d/10-defaults - install -D -m 644 $startdir/src/network $startdir/pkg/etc/sysconfig/network - cp -rp $startdir/src/$pkgname-$pkgver/docs $startdir/pkg/etc/net - cp -rp $startdir/src/$pkgname-$pkgver/examples $startdir/pkg/etc/net - - #setup default for eth0 - mkdir -p $startdir/pkg/etc/net/ifaces/eth0 -# cp $startdir/src/options $startdir/pkg/etc/net/ifaces/eth0/options -# cp $startdir/src/ipv4route $startdir/pkg/etc/net/ifaces/eth0/ipv4route -# cp $startdir/src/ipv4address $startdir/pkg/etc/net/ifaces/eth0/ipv4address - - cd $startdir/src/$pkgname-$pkgver - rm -Rf etc/sysconfig etc/net/{README.ALT,TODO,ChangeLog,ifaces/unknown} - cp -Rf etc $startdir/pkg - cd $startdir/pkg/etc/net/scripts - ln -s ifup-ifplugd ifup-wireless - ln -s ifdown-ifplugd ifdown-wireless - -} diff --git a/abs/core-testing/etcnet/adddhcp.patch b/abs/core-testing/etcnet/adddhcp.patch deleted file mode 100755 index ee7b782..0000000 --- a/abs/core-testing/etcnet/adddhcp.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -ruN etc/net/ifaces/default/options /etc/net/ifaces/default/options ---- etc/net/ifaces/default/options 2005-08-02 08:26:44.000000000 +0000 -+++ /etc/net/ifaces/default/options 2005-10-24 16:20:07.000000000 +0000 -@@ -24,7 +24,7 @@ - # /etc/net will try to configure interface at the first succeeding - # method. Note that etcnet will process routes and rules despite of - # BOOTPROTO. --BOOTPROTO=static -+BOOTPROTO=dhcp - - # Defines if the interface will be automatically brought up during - # system startup or 'service network start' invocation. -diff -ruN etc/net/scripts/config-ipv4 /etc/net/scripts/config-ipv4 ---- etc/net/scripts/config-ipv4 2005-08-10 08:08:40.000000000 +0000 -+++ /etc/net/scripts/config-ipv4 2005-10-24 16:48:49.000000000 +0000 -@@ -1,5 +1,5 @@ - #!/bin/bash -- -+#set -x - . $SCRIPTDIR/functions - pickup_options - -diff -ruN etc/net/scripts/ifup /etc/net/scripts/ifup ---- etc/net/scripts/ifup 2005-09-16 18:38:01.000000000 +0000 -+++ /etc/net/scripts/ifup 2005-10-24 16:42:12.000000000 +0000 -@@ -1,5 +1,5 @@ - #!/bin/bash -- -+#set -x - # This script is intended to be run from command-line or etcnet - # initscript. It determines if the iface should be created, then - # creates the device and calls ifup-common to do the rest. -diff -ruN etc/net/scripts/ifup-common /etc/net/scripts/ifup-common ---- etc/net/scripts/ifup-common 2005-08-03 09:03:26.000000000 +0000 -+++ /etc/net/scripts/ifup-common 2005-10-24 16:42:51.000000000 +0000 -@@ -1,5 +1,5 @@ - #!/bin/bash -- -+#set -x - # This script continues configuration of an interface started by ifup, - # ifup-removable or ifup-ifplugd scripts. We assume that all necessary - # checks are done yet. -diff -ruN etc/net/scripts/network.init /etc/net/scripts/network.init ---- etc/net/scripts/network.init 2005-09-29 12:54:32.000000000 +0000 -+++ /etc/net/scripts/network.init 2005-10-24 16:41:17.000000000 +0000 -@@ -1,4 +1,5 @@ - #!/bin/bash -+#set -x - # - # network - # chkconfig: 2345 10 90 diff --git a/abs/core-testing/etcnet/etcnet.install b/abs/core-testing/etcnet/etcnet.install deleted file mode 100755 index f34629f..0000000 --- a/abs/core-testing/etcnet/etcnet.install +++ /dev/null @@ -1,53 +0,0 @@ -# This is a default template for a post-install scriptlet. You can -# remove any functions you don't need (and this header). - -# arg 1: the new package version -pre_install() { - /bin/cp -Rf /etc/net /etc/net.pacsave >/dev/null 2>&1 - if [ ! -d /var/lock/subsys ] - then - mkdir -p /var/lock/subsys - fi - -} - -# arg 1: the new package version -post_install() { - /bin/true - touch /etc/net/ -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - /bin/cp -Rf /etc/net /etc/net.pacsave >/dev/null 2>&1 - if [ ! -d /var/lock/subsys ] - then - mkdir -p /var/lock/subsys - fi -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ -f /etc/net/ifaces/eth0/options.pacsave ] - then - systemconfig.py -m network - mv /etc/net/ifaces/eth0/options.pacsave /etc/net/ifaces/eth0/options.pacsave.orig - fi -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - -op=$1 -shift -$op $* - diff --git a/abs/core-testing/etcnet/functions.patch b/abs/core-testing/etcnet/functions.patch deleted file mode 100644 index 855ef90..0000000 --- a/abs/core-testing/etcnet/functions.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/functions.orig 2009-06-14 17:24:46.000000000 +0000 -+++ scripts/functions 2009-06-14 17:25:24.000000000 +0000 -@@ -16,7 +16,7 @@ - DEFAULT_IFPLUGSTATUS=/usr/sbin/ifplugstatus - DEFAULT_IFPLUGD=/usr/sbin/ifplugd - DEFAULT_IWPRIV=/sbin/iwpriv --DEFAULT_IWCONFIG=/sbin/iwconfig -+DEFAULT_IWCONFIG=/usr/sbin/iwconfig - DEFAULT_WLANCONFIG=/usr/sbin/wlanconfig - DEFAULT_WPA_SUPPLICANT=/usr/sbin/wpa_supplicant - DEFAULT_WPA_CLI=/usr/sbin/wpa_cli diff --git a/abs/core-testing/etcnet/ipv4address b/abs/core-testing/etcnet/ipv4address deleted file mode 100755 index 39a5dd4..0000000 --- a/abs/core-testing/etcnet/ipv4address +++ /dev/null @@ -1 +0,0 @@ -192.168.1.5/24 diff --git a/abs/core-testing/etcnet/ipv4route b/abs/core-testing/etcnet/ipv4route deleted file mode 100755 index b0dbb61..0000000 --- a/abs/core-testing/etcnet/ipv4route +++ /dev/null @@ -1 +0,0 @@ -default via 192.168.1.1 diff --git a/abs/core-testing/etcnet/network b/abs/core-testing/etcnet/network deleted file mode 100644 index a0a17ab..0000000 --- a/abs/core-testing/etcnet/network +++ /dev/null @@ -1,6 +0,0 @@ -# When set to no, this may cause most daemons' initscripts skip starting. -NETWORKING=yes -# Used by hotplug/pcmcia/ifplugd scripts to detect current network config -# subsystem. -CONFMETHOD=etcnet - diff --git a/abs/core-testing/etcnet/options b/abs/core-testing/etcnet/options deleted file mode 100755 index 23bb8bf..0000000 --- a/abs/core-testing/etcnet/options +++ /dev/null @@ -1,62 +0,0 @@ -# 0.4.0: now we don't have to specify TYPE for disabled interfaces -DISABLED=no - -# BOOTPROTO can be any of the following: static, dhcp, ipv4ll. -# * "static": use ipv4address/ipv6address -# 'static' has the same meaning as 'none' in initscripts/net-scripts sense. -# IF you don't want to assing any address to an interface, but still keep -# it up and running, you can just use 'static' and have no ipv4address file. -# * "dhcp": run DHCP client -# * "ipv4ll": run IPv4LL client (zcip) -# As far as I know, there are no working IPv6 DHCP -# implementations. IPv4LL is not required for IPv6 because of -# link-scope addresses. -# Additional feature is multi-method configurations (methods -# can be delimited by ' ', ',' or '-': -# * "dhcp-static": try DHCP, if it fails, configure static address(es) -# * "dhcp-ipv4ll": same, but fallback to IPv4LL -# * "dhcp-ipv4ll-static": try DHCP, fallback to IPv4LL (very unlikely to fail), -# fallback to static -# /etc/net will try to configure interface at the first succeeding -# method. Note that etcnet will process routes and rules despite of -# BOOTPROTO. -BOOTPROTO=dhcp-static - -# Defines if the interface will be automatically brought up during -# system startup or 'service network start' invocation. -ONBOOT=yes -USE_HOTPLUG=no -USE_PCMCIA=no -CONFIG_IPV4=yes -CONFIG_IPV6=no -CONFIG_IPX=no -CONFIG_QOS=yes -CONFIG_WIRELESS=no -CONFIG_FW=no - -# If set to yes, interface will not be set UP, but configured. -KEEP_DOWN=no -# IPv4/IPv6. Don't flush existing addresses from interface before assigning new. -DONT_FLUSH=no - -# ****************** Interface dependencies ****************** -# If interface A has REQUIRES=B in it's options file, A is the child, B is the parent. -# I don't recommend changing defaults here. See also: README/3.5 - -# If set to yes, this variable will cause ifup call for all child (having current -# interface in their REQUIRES list) after the current interface is set up. -IFUP_CHILDREN=no - -# If set to yes, this variable will cause ifup call for all parent (listed in current -# REQUIRES list) before the current interface is set up. -# Note: this will not work for ifplugd-controlled interfaces. -IFUP_PARENTS=yes - -# If set to yes, this variable will cause ifdown call for all child (having current -# interface in their REQUIRES list) before the current interface is shut down. -IFDOWN_CHILDREN=yes - -# If set to yes, this variable will cause ifdown call for all parent (listed in current -# REQUIRES list) after the current interface is shut down. -# Note: this will not work for ifplugd-controlled interfaces. -IFDOWN_PARENTS=no diff --git a/abs/core-testing/eventlog/PKGBUILD b/abs/core-testing/eventlog/PKGBUILD deleted file mode 100644 index 476dbad..0000000 --- a/abs/core-testing/eventlog/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ - -pkgname=eventlog -pkgver=0.2.5 -pkgrel=2 -pkgdesc="A new API to format and send structured log messages" -arch=('i686' 'x86_64') -url="http://www.balabit.com/support/community/products/" -license=('BSD') -depends=('glibc') -options=('!libtool') -source=(http://www.balabit.com/downloads/files/eventlog/0.2/eventlog-$pkgver.tar.gz) -md5sums=('a6bdba91f88540cc69b398fd138d86cd') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE -} \ No newline at end of file diff --git a/abs/core-testing/evieext/PKGBUILD b/abs/core-testing/evieext/PKGBUILD deleted file mode 100644 index 0f7161a..0000000 --- a/abs/core-testing/evieext/PKGBUILD +++ /dev/null @@ -1,19 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -#Maintainer: Jan de Groot - -pkgname=evieext -pkgver=1.0.2 -pkgrel=1 -pkgdesc="X11 Event Interception extension wire protocol" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2507b5d0f4b2848147fbddd155aa6cfe') -sha1sums=('1ab4048ffbfb6b69e88d2f0f2cab7ca60e50cc99') - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 -} diff --git a/abs/core-testing/expat/CVE-2009-3560.patch b/abs/core-testing/expat/CVE-2009-3560.patch deleted file mode 100644 index 5fe9c36..0000000 --- a/abs/core-testing/expat/CVE-2009-3560.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urNad trunk~/lib/xmlparse.c trunk/lib/xmlparse.c ---- trunk~/lib/xmlparse.c 2007-05-08 04:25:35.000000000 +0200 -+++ trunk/lib/xmlparse.c 2009-12-29 21:57:22.141732904 +0100 -@@ -3703,6 +3703,9 @@ - return XML_ERROR_UNCLOSED_TOKEN; - case XML_TOK_PARTIAL_CHAR: - return XML_ERROR_PARTIAL_CHAR; -+ case -XML_TOK_PROLOG_S: -+ tok = -tok; -+ break; - case XML_TOK_NONE: - #ifdef XML_DTD - /* for internal PE NOT referenced between declarations */ diff --git a/abs/core-testing/expat/CVE-2009-3720.patch b/abs/core-testing/expat/CVE-2009-3720.patch deleted file mode 100644 index 65d1643..0000000 --- a/abs/core-testing/expat/CVE-2009-3720.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNad trunk~/lib/xmltok_impl.c trunk/lib/xmltok_impl.c ---- trunk~/lib/xmltok_impl.c 2006-11-26 18:34:46.000000000 +0100 -+++ trunk/lib/xmltok_impl.c 2009-10-22 21:42:41.000000000 +0200 -@@ -1744,7 +1744,7 @@ - const char *end, - POSITION *pos) - { -- while (ptr != end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - #define LEAD_CASE(n) \ - case BT_LEAD ## n: \ diff --git a/abs/core-testing/expat/PKGBUILD b/abs/core-testing/expat/PKGBUILD deleted file mode 100644 index e2f1038..0000000 --- a/abs/core-testing/expat/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 62836 2010-01-12 23:27:10Z allan $ -# Maintainer: dorphell -# Committer: Judd Vinet - -pkgname=expat -pkgver=2.0.1 -pkgrel=5 -pkgdesc="An XML Parser library written in C" -arch=('i686' 'x86_64') -url="http://expat.sourceforge.net/" -license=('custom') -depends=('glibc') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz - CVE-2009-3560.patch - CVE-2009-3720.patch) -md5sums=('ee8b492592568805593f81f8cdf2a04c' - '50603cac0f03aabc7087415251f592be' - 'f3eeb796f28945899216b815e5901996') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i $srcdir/CVE-2009-3560.patch - patch -Np1 -i $srcdir/CVE-2009-3720.patch - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1 -} diff --git a/abs/core-testing/expect/PKGBUILD b/abs/core-testing/expect/PKGBUILD deleted file mode 100644 index 0f2f46b..0000000 --- a/abs/core-testing/expect/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Kevin Piche - -pkgname=expect -pkgver=5.44.1.4 -pkgrel=2 -pkgdesc="A tool for automating interactive applications" -arch=(i686 x86_64) -depends=('tcl>=8.5.0' 'tk>=8.5.0') -makedepends=('tk>=8.5.0') -tcltkver=8.5.0 -source=(ftp://ftp.archlinux.org/other/expect/expect-$pkgver.tar.bz2 -#http://expect.nist.gov/src/expect-$pkgver.tar.bz2 -http://heanet.dl.sourceforge.net/sourceforge/tcl/tk$tcltkver-src.tar.gz -http://heanet.dl.sourceforge.net/sourceforge/tcl/tcl$tcltkver-src.tar.gz) -url="http://expect.nist.gov/" - -build() { - cd $startdir/src/expect-5.44.1.4 - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-tcl=/usr/lib --with-tk=/usr/lib --without-x \ - --with-tclinclude=$startdir/src/tcl$tcltkver/generic \ - --with-tkinclude=$startdir/src/tk$tcltkver/generic - # Keep $startdir/pkg out of library search paths. - sed -e 's/-rpath,${LIB_RUNTIME_DIR}:/-rpath,/' -i Makefile - make || return 1 - make prefix=$startdir/pkg/usr exec_prefix=$startdir/pkg/usr sysconfdir=$startdir/pkg/etc \ - localstatedir=$startdir/pkg/var install - # Remove X related stuff. - rm -f $startdir/pkg/usr/bin/{multixterm,tknewsbiff,tkpasswd,xpstat} - rm -f $startdir/pkg/usr/man/man1/{multixterm.1,tknewsbiff.1} -} -md5sums=('bbfd5ef50f3c1df4fe79e5a20a947d41' - 'bc217c45ed6b2f5b8d3120df63fa13bd' - 'd890c505465411b25050b6cd95971d2c') diff --git a/abs/core-testing/faac/PKGBUILD b/abs/core-testing/faac/PKGBUILD deleted file mode 100644 index 3d7ce11..0000000 --- a/abs/core-testing/faac/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Alexander Baldeck -# Contributor: Sarah Hay -# Contributor: dorphell -pkgname=faac -pkgver=1.26 -pkgrel=1 -pkgdesc="FAAC is an AAC audio encoder." -arch=(i686 x86_64) -url="http://www.audiocoding.com/" -license=('GPL' 'custom') -depends=('libmp4v2' 'glibc') -makedepends=('automake' 'autoconf' 'libtool') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) - -build() { - cd ${startdir}/src/${pkgname} - find . -type f -print0 | xargs -0 sed -i 's/\r//g' - ./bootstrap - ./configure --prefix=/usr --with-mp4v2 - make || return 1 - make DESTDIR=${startdir}/pkg install - - install -D -m644 ${startdir}/src/${pkgname}/libfaac/kiss_fft/COPYING \ - ${startdir}/pkg/usr/share/licenses/faac/COPYING.kiss_fft -} -md5sums=('1d7c019bd2dbb4f3101b8937ebc59cf6') diff --git a/abs/core-testing/faac/libmp4v2.patch b/abs/core-testing/faac/libmp4v2.patch deleted file mode 100644 index b2c0165..0000000 --- a/abs/core-testing/faac/libmp4v2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- faac/configure.in 2006-08-13 14:17:26.000000000 +0000 -+++ faac-patched/configure.in 2007-01-29 19:18:45.000000000 +0000 -@@ -35,6 +35,8 @@ - - if test x$external_mp4v2 = xyes; then - AC_MSG_NOTICE([*** Building with external mp4v2 ***]) -+ MY_DEFINE(HAVE_LIBMP4V2) -+ LIBS="-lmp4v2 $LIBS" - else - if test x$WITHMP4V2 = xyes; then - AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) diff --git a/abs/core-testing/faac/pipe-output.patch b/abs/core-testing/faac/pipe-output.patch deleted file mode 100644 index a8581f3..0000000 --- a/abs/core-testing/faac/pipe-output.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- faac/frontend/main.c 2004-12-08 11:07:17.000000000 +0000 -+++ faac-patched/frontend/main.c 2007-01-29 19:17:26.000000000 +0000 -@@ -918,7 +918,14 @@ - { - #endif - /* open the aac output file */ -- outfile = fopen(aacFileName, "wb"); -+ if (aacFileName[0] == '-') -+ { -+ outfile = stdout; -+ } -+ else -+ { -+ outfile = fopen(aacFileName, "wb"); -+ } - if (!outfile) - { - fprintf(stderr, "Couldn't create output file %s\n", aacFileName); diff --git a/abs/core-testing/faad2/ChangeLog b/abs/core-testing/faad2/ChangeLog deleted file mode 100644 index ed5548b..0000000 --- a/abs/core-testing/faad2/ChangeLog +++ /dev/null @@ -1,26 +0,0 @@ -2009-02-16 Eric Belanger - - * faad2 2.7-1 - * Upstream update - * Updated LICENSE file - * Compiled with -fPIC option - -2009-01-05 Eric Belanger - - * faad2 2.6.1-2 - * Applied security patch - -2008-07-19 Eric Belanger - - * faad2 2.6.1-1 - * Upstream update - * Patched to fix libtool build problem : - faad2-2.6.1-libtool22.patch - * Patched to make faad2 exit if output pipe breaks : - faad2-2.6.1-broken-pipe.patch - * Patched to fix include file implicit declaration : - faad2-2.6.1-implicitdeclar.patch - * Patched to bump soname (symbols have been changed) : - faad2-2.6.1-abi_has_changed.patch - * Updated license - * Added ChangeLog diff --git a/abs/core-testing/faad2/LICENSE b/abs/core-testing/faad2/LICENSE deleted file mode 100644 index a16abf6..0000000 --- a/abs/core-testing/faad2/LICENSE +++ /dev/null @@ -1,42 +0,0 @@ -__________ -COPYRIGHTS - -For FAAD2 the following license applies: - -****************************************************************************** -** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -** -** Any non-GPL usage of this software or parts of this software is strictly -** forbidden. -** -** The "appropriate copyright message" mentioned in section 2c of the GPLv2 -** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com" -** -** Commercial non-GPL licensing of this software is possible. -** For more info contact Nero AG through Mpeg4AAClicense@nero.com. -****************************************************************************** - - -Please note that the use of this software may require the payment of -patent royalties. You need to consider this issue before you start -building derivative works. We are not warranting or indemnifying you in -any way for patent royalities! YOU ARE SOLELY RESPONSIBLE FOR YOUR OWN -ACTIONS! - - -______ diff --git a/abs/core-testing/faad2/PKGBUILD b/abs/core-testing/faad2/PKGBUILD deleted file mode 100644 index 729d69b..0000000 --- a/abs/core-testing/faad2/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 27494 2009-02-22 04:26:47Z eric $ -# Maintainer: Eric Belanger -# Contributor: Sarah Hay - -pkgname=faad2 -pkgver=2.7 -pkgrel=1 -pkgdesc="ISO AAC audio decoder" -arch=('i686' 'x86_64') -url="http://www.audiocoding.com/" -license=('custom:GPL') -depends=('glibc') -options=('!libtool' '!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.bz2 LICENSE) -md5sums=('4c332fa23febc0e4648064685a3d4332' 'ec95f38142e14fb46c849503897a37a0') -sha1sums=('b0e80481d27ae9faf9e46c8c8dfb617a0adb91b5' '00edd9b30d8d5098b5e91c03c595d96a3bbe56fd') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make CFLAGS="${CFLAGS} -fPIC" || return 1 - make DESTDIR=${pkgdir} manmdir=/usr/share/man/man1 install || return 1 - install -m644 common/mp4ff/mp4ff_int_types.h ${pkgdir}/usr/include/mp4ff_int_types.h || return 1 - install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 - mv ${pkgdir}/usr/share/man/man1/faad.man ${pkgdir}/usr/share/man/man1/faad.1 -} diff --git a/abs/core-testing/faad2/faad2-2.6.1-abi_has_changed.patch b/abs/core-testing/faad2/faad2-2.6.1-abi_has_changed.patch deleted file mode 100644 index 7206e38..0000000 --- a/abs/core-testing/faad2/faad2-2.6.1-abi_has_changed.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: faad2/libfaad/Makefile.am -=================================================================== ---- faad2.orig/libfaad/Makefile.am -+++ faad2/libfaad/Makefile.am -@@ -3,7 +3,8 @@ lib_LTLIBRARIES = libfaad.la - include_HEADERS = $(top_srcdir)/include/faad.h \ - $(top_srcdir)/include/neaacdec.h - --libfaad_la_LDFLAGS = -lm -+libfaad_la_LDFLAGS = -version-info 1:0:0 -+libfaad_la_LIBADD = -lm - - libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \ - drm_dec.c error.c filtbank.c \ diff --git a/abs/core-testing/faad2/faad2-2.6.1-broken-pipe.patch b/abs/core-testing/faad2/faad2-2.6.1-broken-pipe.patch deleted file mode 100644 index 428d7dd..0000000 --- a/abs/core-testing/faad2/faad2-2.6.1-broken-pipe.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- faad2/frontend/main.c~ 2007-11-01 06:33:29.000000000 -0600 -+++ faad2/frontend/main.c 2008-01-03 18:05:10.000000000 -0700 -@@ -640,7 +640,8 @@ - - if ((frameInfo.error == 0) && (frameInfo.samples > 0) && (!adts_out)) - { -- write_audio_file(aufile, sample_buffer, frameInfo.samples, 0); -+ if (write_audio_file(aufile, sample_buffer, frameInfo.samples, 0) == 0) -+ break; - } - - /* fill buffer */ -@@ -976,7 +977,8 @@ - - if ((frameInfo.error == 0) && (sample_count > 0) && (!adts_out)) - { -- write_audio_file(aufile, sample_buffer, sample_count, delay); -+ if (write_audio_file(aufile, sample_buffer, sample_count, delay) == 0) -+ break; - } - - if (frameInfo.error > 0) diff --git a/abs/core-testing/faad2/faad2-2.6.1-implicitdeclar.patch b/abs/core-testing/faad2/faad2-2.6.1-implicitdeclar.patch deleted file mode 100644 index 9379329..0000000 --- a/abs/core-testing/faad2/faad2-2.6.1-implicitdeclar.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur faad2-orig/frontend/main.c faad2/frontend/main.c ---- faad2-orig/frontend/main.c 2007-11-01 08:33:29.000000000 -0400 -+++ faad2/frontend/main.c 2008-06-21 19:33:08.000000000 -0400 -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/abs/core-testing/faad2/faad2-2.6.1-libtool22.patch b/abs/core-testing/faad2/faad2-2.6.1-libtool22.patch deleted file mode 100644 index 4eab084..0000000 --- a/abs/core-testing/faad2/faad2-2.6.1-libtool22.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: faad2/configure.in -=================================================================== ---- faad2.orig/configure.in -+++ faad2/configure.in -@@ -18,7 +18,7 @@ dnl Checks for programs. - AC_PROG_CC - AC_PROG_CPP - dnl disable for mpeg4ip plugin --dnl AC_PROG_CXX -+AC_PROG_CXX - AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_MAKE_SET diff --git a/abs/core-testing/fam/PKGBUILD b/abs/core-testing/fam/PKGBUILD deleted file mode 100644 index e7f5e41..0000000 --- a/abs/core-testing/fam/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 15741 2008-10-18 01:59:29Z allan $ -# Maintainer: Allan McRae -# Contributor: Tom Newsom -pkgname=fam -pkgver=2.7.0 -pkgrel=11 -pkgdesc="File Alteration Monitor - used by KDE, GNOME and others" -arch=('i686' 'x86_64') -license=('LGPL' 'GPL') -depends=('portmap') -url="http://oss.sgi.com/projects/fam/" -backup=(etc/fam/fam.conf) -options=('!makeflags') # Don't !libtool -source=(ftp://oss.sgi.com/projects/fam/download/stable/${pkgname}-${pkgver}.tar.gz - fam-2.7.0-dnotify.patch - fam-2.7.0-largefiles.patch - fam-2.7.0-noc++.patch - fam-2.7.0-gcc43.patch - include_fam_h.patch - fam) -md5sums=('1bf3ae6c0c58d3201afc97c6a4834e39' - '073d1763318344635ea316293390205c' - '47b41e0b0498793af004696a096d7da1' - '0274cd113d3dcb015653b5606c7714ac' - '13c14778038aa9601a27498448e855e0' - '2638b8ffacb9f03b6e438e08ea7b290a' - '45b648907ba1c7edec17fb544f1f4a13') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/fam-2.7.0-dnotify.patch || return 1 - patch -Np1 -i ${srcdir}/fam-2.7.0-largefiles.patch || return 1 - patch -Np0 -i ${srcdir}/include_fam_h.patch || return 1 - patch -Np1 -i ${srcdir}/fam-2.7.0-noc++.patch || return 1 - patch -Np1 -i ${srcdir}/fam-2.7.0-gcc43.patch || return 1 - - chmod 755 configure || return 1 - - autoheader || return 1 - aclocal || return 1 - automake -a -c || return 1 - autoconf || return 1 - libtoolize --copy --force || return 1 - - ./configure --prefix=/usr --sysconfdir=/etc/fam - make || return 1 - make DESTDIR=${pkgdir} install - install -D -m755 ../fam ${pkgdir}/etc/rc.d/fam -} diff --git a/abs/core-testing/fam/fam b/abs/core-testing/fam/fam deleted file mode 100755 index 3acceff..0000000 --- a/abs/core-testing/fam/fam +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/famd` -case "$1" in - start) - #Check for running portmap, start when not running - ck_daemon portmap && /etc/rc.d/portmap start - stat_busy "Starting File Alteration Monitor" - if [ ! -f /var/run/daemons/portmap ]; then - stat_fail - echo "ERROR: PORTMAP is not running" - exit 1 - fi - if [ -z "$PID" ]; then - /usr/sbin/famd -T 0 -c /etc/fam/fam.conf - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon fam - stat_done - fi - ;; - stop) - stat_busy "Stopping File Alteration Monitor" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon fam - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/abs/core-testing/fam/fam-2.7.0-dnotify.patch b/abs/core-testing/fam/fam-2.7.0-dnotify.patch deleted file mode 100644 index 1d8910e..0000000 --- a/abs/core-testing/fam/fam-2.7.0-dnotify.patch +++ /dev/null @@ -1,975 +0,0 @@ ---- fam-2.7.0/src/DNotify.c++ 2004-01-30 00:00:00.000000000 +0100 -+++ fam-2.7.0.dnotify/src/DNotify.c++ 2004-01-30 00:00:00.000000000 +0100 -@@ -0,0 +1,582 @@ -+// Copyright (C) 2001 Red Hat, Inc. All Rights Reserved. -+// Copyright (C) 1999 Silicon Graphics, Inc. All Rights Reserved. -+// -+// This program is free software; you can redistribute it and/or modify it -+// under the terms of version 2 of the GNU General Public License as -+// published by the Free Software Foundation. -+// -+// This program is distributed in the hope that it would be useful, but -+// WITHOUT ANY WARRANTY; without even the implied warranty of -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Further, any -+// license provided herein, whether implied or otherwise, is limited to -+// this program in accordance with the express provisions of the GNU -+// General Public License. Patent licenses, if any, provided herein do not -+// apply to combinations of this program with other product or programs, or -+// any other product whatsoever. This program is distributed without any -+// warranty that the program is delivered free of the rightful claim of any -+// third person by way of infringement or the like. See the GNU General -+// Public License for more details. -+// -+// You should have received a copy of the GNU General Public License along -+// with this program; if not, write the Free Software Foundation, Inc., 59 -+// Temple Place - Suite 330, Boston MA 02111-1307, USA. -+ -+#define _GNU_SOURCE -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "DNotify.h" -+ -+#include "Interest.h" -+#include "Log.h" -+#include "Scheduler.h" -+#include -+ -+ -+int DNotify::pipe_write_fd = -2; -+int DNotify::pipe_read_fd = -2; -+volatile sig_atomic_t DNotify::queue_overflowed = 0; -+volatile sig_atomic_t DNotify::queue_changed = 0; -+int DNotify::change_queue[QUEUESIZE]; -+volatile int DNotify::queue_head = 0; // Only modified by read handler -+volatile int DNotify::queue_tail = 0; // Only modified by signal handler -+DNotify::EventHandler DNotify::ehandler; -+ -+DNotify::DirWatch *DNotify::dir_hash[DIR_HASHSIZE]; -+DNotify::FileWatch *DNotify::file_hash[FILE_HASHSIZE]; -+ -+struct DNotify::FileWatch -+{ -+ DirWatch *dir_watch; -+ dev_t file_dev; -+ ino_t file_ino; -+ FileWatch *next; // The DirWatch.watches list -+ FileWatch *hash_link; -+}; -+ -+struct DNotify::DirWatch -+{ -+ int fd; -+ dev_t dir_dev; -+ ino_t dir_ino; -+ -+ DirWatch *hash_link; -+ FileWatch *watches; -+}; -+ -+struct DNotify::ChangeEventData -+{ -+ dev_t file_dev; -+ ino_t file_ino; -+}; -+ -+DNotify::DNotify(EventHandler h) -+{ -+ assert(ehandler == NULL); -+ ehandler = h; -+} -+ -+DNotify::~DNotify() -+{ -+ if (pipe_read_fd >= 0) -+ { -+ // Tell the scheduler. -+ -+ (void) Scheduler::remove_read_handler(pipe_read_fd); -+ -+ // Close the pipe. -+ -+ if (close(pipe_read_fd) < 0) -+ Log::perror("can't pipe read end"); -+ else -+ Log::debug("closed pipe read end"); -+ -+ if (close(pipe_write_fd) < 0) -+ Log::perror("can't pipe write end"); -+ else -+ Log::debug("closed pipe write end"); -+ pipe_read_fd = -1; -+ } -+ ehandler = NULL; -+} -+ -+void -+DNotify::overflow_signal_handler(int sig, siginfo_t *si, void *data) -+{ -+ char c = 'x'; -+ -+ { -+ char *str = "*************** overflow sigqueue ***********************\n"; -+ write (STDERR_FILENO, str, strlen(str)); -+ } -+ -+ if (!queue_overflowed) -+ { -+ queue_overflowed = 1; -+ // Trigger the read handler -+ write(pipe_write_fd, &c, 1); -+ } -+} -+ -+void -+DNotify::signal_handler(int sig, siginfo_t *si, void *data) -+{ -+ int left; -+ char c = 'x'; -+ -+ if (queue_head <= queue_tail) -+ left = (QUEUESIZE + queue_head) - queue_tail; -+ else -+ left = queue_head - queue_tail; -+ -+ // Must leave at least one item unused to see difference -+ // Betweeen empty and full -+ if (left <= 1) -+ { -+ queue_overflowed = 1; -+ { -+ char *str = "*************** overflow famqueue ****************\n"; -+ write (STDERR_FILENO, str, strlen(str)); -+ } -+ } -+ else -+ { -+ change_queue[queue_tail] = si->si_fd; -+ queue_tail = (queue_tail + 1) % QUEUESIZE; -+ } -+ -+ if (!queue_changed) -+ { -+ queue_changed = 1; -+ // Trigger the read handler -+ write(pipe_write_fd, &c, 1); -+ } -+} -+ -+bool -+DNotify::is_active() -+{ -+ if (pipe_read_fd == -2) -+ { -+ int filedes[2]; -+ int res; -+ -+ res = pipe (filedes); -+ if (res >= 0) -+ { Log::debug("opened pipe"); -+ pipe_read_fd = filedes[0]; -+ pipe_write_fd = filedes[1]; -+ -+ // Setup signal handler: -+ struct sigaction act; -+ -+ act.sa_sigaction = signal_handler; -+ sigemptyset(&act.sa_mask); -+ act.sa_flags = SA_SIGINFO; -+ sigaction(SIGRTMIN, &act, NULL); -+ -+ // When the RT queue overflows we get a SIGIO -+ act.sa_sigaction = overflow_signal_handler; -+ sigemptyset(&act.sa_mask); -+ sigaction(SIGIO, &act, NULL); -+ -+ (void) Scheduler::install_read_handler(pipe_read_fd, read_handler, NULL); -+ } -+ } -+ return pipe_read_fd >= 0; -+} -+ -+DNotify::DirWatch * -+DNotify::lookup_dirwatch (int fd) -+{ -+ DirWatch **p; -+ DirWatch *w; -+ -+ p = dir_hashchain (fd); -+ -+ while (*p) -+ { -+ w = *p; -+ -+ if (w->fd == fd) -+ return w; -+ -+ p = &w->hash_link; -+ } -+ -+ return *p; -+} -+ -+// This colud be made faster by using another hash table. -+// But it's not that bad, since it is only used by express/revoke -+DNotify::DirWatch * -+DNotify::lookup_dirwatch (dev_t dir_dev, ino_t dir_ino) -+{ -+ DirWatch *p; -+ int i; -+ -+ for (i=0;idir_dev == dir_dev && p->dir_ino == dir_ino) -+ return p; -+ -+ p = p->hash_link; -+ } -+ } -+ -+ return NULL; -+} -+ -+DNotify::FileWatch * -+DNotify::lookup_filewatch (dev_t dev, ino_t ino) -+{ -+ FileWatch **p; -+ FileWatch *w; -+ -+ p = file_hashchain (dev, ino); -+ -+ while (*p) -+ { -+ w = *p; -+ -+ if (w->file_dev == dev && w->file_ino == ino) -+ return w; -+ -+ p = &w->hash_link; -+ } -+ -+ return *p; -+} -+ -+// Make sure w is not already in the hash table before calling -+// this function. -+void -+DNotify::hash_dirwatch(DirWatch *w) -+{ -+ DirWatch **p; -+ p = dir_hashchain (w->fd); -+ w->hash_link = *p; -+ *p = w; -+} -+ -+// Make sure w is not already in the hash table before calling -+// this function. -+void -+DNotify::hash_filewatch(FileWatch *w) -+{ -+ FileWatch **p; -+ p = file_hashchain (w->file_dev, w->file_ino); -+ w->hash_link = *p; -+ *p = w; -+} -+ -+void -+DNotify::unhash_dirwatch(DirWatch *w) -+{ -+ DirWatch **p; -+ -+ p = dir_hashchain (w->fd); -+ -+ while (*p) -+ { -+ if (*p == w) -+ { -+ *p = w->hash_link; -+ break; -+ } -+ p = &(*p)->hash_link; -+ } -+ w->hash_link = NULL; -+} -+ -+void -+DNotify::unhash_filewatch(FileWatch *w) -+{ -+ FileWatch **p; -+ -+ p = file_hashchain (w->file_dev, w->file_ino); -+ -+ while (*p) -+ { -+ if (*p == w) -+ { -+ *p = w->hash_link; -+ break; -+ } -+ p = &(*p)->hash_link; -+ } -+ w->hash_link = NULL; -+} -+ -+DNotify::Status -+DNotify::watch_dir(const char *notify_dir, dev_t file_dev, ino_t file_ino) -+{ -+ struct stat stat; -+ dev_t dir_dev; -+ ino_t dir_ino; -+ DirWatch *dwatch; -+ FileWatch *fw; -+ -+ if (lstat (notify_dir, &stat) == -1) -+ return BAD; -+ -+ dwatch = lookup_dirwatch(stat.st_dev, stat.st_ino); -+ if (!dwatch) -+ { -+ Log::debug ("New DirWatch for %s (%x %x)\n", -+ notify_dir, (int)stat.st_dev, (int)stat.st_ino); -+ dwatch = new DirWatch; -+ dwatch->watches = NULL; -+ dwatch->hash_link = NULL; -+ dwatch->dir_dev = stat.st_dev; -+ dwatch->dir_ino = stat.st_ino; -+ -+ dwatch->fd = open(notify_dir, O_RDONLY); -+ fcntl (dwatch->fd, F_SETSIG, SIGRTMIN); -+ if (fcntl (dwatch->fd, F_NOTIFY, -+ (DN_MODIFY|DN_CREATE|DN_DELETE|DN_RENAME|DN_ATTRIB) -+ | DN_MULTISHOT) == -1) { -+ return BAD; -+ } -+ hash_dirwatch (dwatch); -+ } -+ -+ fw = lookup_filewatch (file_dev, file_ino); -+ if (fw && fw->dir_watch == dwatch) -+ return OK; -+ -+ // No old FileWatch, need to add one: -+ Log::debug("New FileWatch for %x %x\n", (int)file_dev, (int)file_ino); -+ fw = new FileWatch; -+ fw->next = dwatch->watches; -+ dwatch->watches = fw; -+ fw->file_dev = file_dev; -+ fw->file_ino = file_ino; -+ fw->dir_watch = dwatch; -+ hash_filewatch(fw); -+ return OK; -+} -+ -+char * -+dirname_dup (const char *name) -+{ -+ char *copy = strdup(name); -+ char *res = dirname(copy); -+ res = strdup(res); -+ free (copy); -+ return res; -+} -+ -+DNotify::Status -+DNotify::express(const char *name, struct stat *status) -+{ -+ struct stat stat; -+ char *notify_dir; -+ int res; -+ Status s; -+ dev_t dev; -+ ino_t ino; -+ -+ Log::debug("express() name: %s\n", name); -+ -+ if (!is_active()) -+ return BAD; -+ -+ if (::lstat (name, &stat) == -1) -+ return BAD; -+ -+ dev = stat.st_dev; -+ ino = stat.st_ino; -+ -+ if ((stat.st_mode & S_IFMT) != S_IFDIR) -+ notify_dir = dirname_dup (name); -+ else -+ notify_dir = (char *)name; -+ -+ s = watch_dir (notify_dir, dev, ino); -+ if (notify_dir != name) -+ free (notify_dir); -+ if (s) -+ return s; -+ -+ // Check for a race condition; if someone removed or changed the -+ // file at the same time that we are expressing interest in it, -+ // revoke the interest so we don't get notifications about changes -+ // to a recycled inode that we don't otherwise care about. -+ // -+ struct stat st; -+ if (status == NULL) { -+ status = &st; -+ } -+ if (::lstat(name, status) == -1) { -+ Log::perror("stat on \"%s\" failed", name); -+ revoke(name, stat.st_dev, stat.st_ino); -+ return BAD; -+ } -+ if (status->st_dev != stat.st_dev -+ || status->st_ino != stat.st_ino) { -+ Log::error("File \"%s\" changed between express and stat", -+ name); -+ revoke(name, stat.st_dev, stat.st_ino); -+ return BAD; -+ } -+ -+ Log::debug("told dnotify to monitor \"%s\" = dev %d/%d, ino %d", name, -+ major(status->st_dev), minor(status->st_dev), -+ status->st_ino); -+ return OK; -+} -+ -+DNotify::Status -+DNotify::revoke(const char *name, dev_t dev, ino_t ino) -+{ -+ FileWatch *fwatch; -+ DirWatch *dwatch; -+ -+ Log::debug("revoke() name: %s, dev: %x, ino: %x\n", name, dev, ino); -+ -+ if (!is_active()) -+ return BAD; -+ -+ // Lookup FileWatch by dev:ino, and its DirWatch. -+ fwatch = lookup_filewatch (dev, ino); -+ if (fwatch == NULL) -+ return BAD; -+ -+ dwatch = fwatch->dir_watch; -+ -+ // delete FileWatch, if last FileWatch: close fd, delete DirWatch -+ Log::debug ("Destroying FileWatch for (%x %x)\n", -+ (int)fwatch->file_dev, (int)fwatch->file_ino); -+ FileWatch **p; -+ for (p=&dwatch->watches; *p; p=&(*p)->next) -+ { -+ if (*p == fwatch) -+ { -+ *p = (*p)->next; -+ break; -+ } -+ } -+ unhash_filewatch(fwatch); -+ delete fwatch; -+ if (dwatch->watches == NULL) -+ { -+ Log::debug ("Destroying DirWatch for (%x %x)\n", -+ (int)dwatch->dir_dev, (int)dwatch->dir_ino); -+ close(dwatch->fd); -+ unhash_dirwatch(dwatch); -+ delete dwatch; -+ } -+ -+ return OK; -+} -+ -+ -+void -+DNotify::all_watches_changed(void) -+{ -+ int i; -+ FileWatch *fw; -+ -+ for (i=0; ifile_dev, fw->file_ino, CHANGE); -+ -+ fw = fw->hash_link; -+ } -+ } -+} -+ -+ -+void -+DNotify::read_handler(int fd, void *) -+{ -+ static char readbuf[5000]; -+ DirWatch *dw; -+ FileWatch *fw; -+ int snap_queue_tail; -+ int last_fd; -+ -+ int rc = read(fd, readbuf, sizeof readbuf); -+ queue_changed = 0; -+ if (rc < 0) -+ Log::perror("pipe read"); -+ else if (queue_overflowed) -+ { -+ // There is a *slight* race condition here. Between reading -+ // the queue_overflow flag and resetting it. But it doesn't -+ // matter, since I'm gonna handle the overflow after reseting -+ // anyway. -+ queue_overflowed = false; -+ -+ // We're soon gonna check all watches anyway, so -+ // get rid of the current queue -+ queue_head = queue_tail; -+ -+ all_watches_changed (); -+ } -+ else -+ { -+ // Don't read events that happen later than -+ // the initial read. (Otherwise skipping fd's -+ // might miss some changes). -+ snap_queue_tail = queue_tail; -+ last_fd = -1; -+ while (queue_head != snap_queue_tail) -+ { -+ fd = change_queue[queue_head]; -+ queue_head = (queue_head + 1) % QUEUESIZE; -+ -+ // Skip multiple changes to the same fd -+ if (fd != last_fd) -+ { -+ dw = lookup_dirwatch (fd); -+ if (dw) -+ { -+ int n_watches, i; -+ ChangeEventData *data; -+ -+ Log::debug("dnotify said dev %d/%d, ino %ld changed", -+ major(dw->dir_dev), minor(dw->dir_dev), dw->dir_ino); -+ -+ n_watches = 0; -+ for (fw=dw->watches; fw; fw=fw->next) -+ n_watches++; -+ -+ data = new ChangeEventData[n_watches]; -+ -+ i = 0; -+ for (fw=dw->watches; fw; fw=fw->next) -+ { -+ data[i].file_dev = fw->file_dev; -+ data[i].file_ino = fw->file_ino; -+ i++; -+ } -+ -+ for (i = 0; i < n_watches; i++) -+ { -+ (*ehandler)(data[i].file_dev, data[i].file_ino, CHANGE); -+ } -+ -+ delete[] data; -+ } -+ } -+ last_fd = fd; -+ } -+ } -+} -+ ---- fam-2.7.0/src/DNotify.h 2004-01-30 00:00:00.000000000 +0100 -+++ fam-2.7.0.dnotify/src/DNotify.h 2004-01-30 00:00:00.000000000 +0100 -@@ -0,0 +1,98 @@ -+// Copyright (C) 2001 Red Hat, Inc. All Rights Reserved. -+// Copyright (C) 1999 Silicon Graphics, Inc. All Rights Reserved. -+// -+// This program is free software; you can redistribute it and/or modify it -+// under the terms of version 2 of the GNU General Public License as -+// published by the Free Software Foundation. -+// -+// This program is distributed in the hope that it would be useful, but -+// WITHOUT ANY WARRANTY; without even the implied warranty of -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Further, any -+// license provided herein, whether implied or otherwise, is limited to -+// this program in accordance with the express provisions of the GNU -+// General Public License. Patent licenses, if any, provided herein do not -+// apply to combinations of this program with other product or programs, or -+// any other product whatsoever. This program is distributed without any -+// warranty that the program is delivered free of the rightful claim of any -+// third person by way of infringement or the like. See the GNU General -+// Public License for more details. -+// -+// You should have received a copy of the GNU General Public License along -+// with this program; if not, write the Free Software Foundation, Inc., 59 -+// Temple Place - Suite 330, Boston MA 02111-1307, USA. -+ -+#ifndef DNotify_included -+#define DNotify_included -+ -+#include "config.h" -+#include "Monitor.h" -+#include -+ -+// DNotify is an object encapsulating the dnotify linux fcntl. -+// It "emulates" the IMon interface. -+// There can only be one instantiation of the DNotify object. -+// -+// The user of this object uses express() and revoke() to -+// express/revoke interest in a file. There is also -+// a callback, the EventHandler. When an dnotify event comes in, -+// the EventHandler is called. -+// -+// The user of the DNotify object is the Interest class. -+ -+class DNotify : public Monitor { -+public: -+ DNotify(EventHandler h); -+ ~DNotify(); -+ -+ static bool is_active(); -+ -+ virtual Status express(const char *name, struct stat *stat_return); -+ virtual Status revoke(const char *name, dev_t dev, ino_t ino); -+ -+private: -+ struct FileWatch; -+ struct DirWatch; -+ struct ChangeEventData; -+ -+ // Class Variables -+ enum { QUEUESIZE = 1024 }; -+ static int pipe_write_fd; -+ static int pipe_read_fd; -+ static int change_queue[QUEUESIZE]; -+ static volatile sig_atomic_t queue_overflowed; -+ static volatile sig_atomic_t queue_changed; -+ static volatile int queue_head; // Only modified by read handler -+ static volatile int queue_tail; // Only modified by signal handler -+ static EventHandler ehandler; -+ static void overflow_signal_handler(int sig, siginfo_t *si, void *data); -+ static void signal_handler(int sig, siginfo_t *si, void *data); -+ static void read_handler(int fd, void *closure); -+ -+ enum { DIR_HASHSIZE = 367 }; -+ static DirWatch *dir_hash[DIR_HASHSIZE]; -+ enum { FILE_HASHSIZE = 823 }; -+ static FileWatch *file_hash[FILE_HASHSIZE]; -+ -+ static DirWatch **dir_hashchain(int fd) -+ { return &dir_hash[(unsigned) (fd) % DIR_HASHSIZE]; } -+ static FileWatch **file_hashchain(dev_t d, ino_t i) -+ { return &file_hash[(unsigned) (d+i) % FILE_HASHSIZE]; } -+ -+ static DirWatch *lookup_dirwatch (int fd); -+ static DirWatch *lookup_dirwatch (dev_t dir_dev, ino_t dir_ino); -+ static FileWatch *lookup_filewatch (dev_t file_dev, ino_t file_ino); -+ static void hash_dirwatch(DirWatch *w); -+ static void hash_filewatch(FileWatch *w); -+ static void unhash_dirwatch(DirWatch *w); -+ static void unhash_filewatch(FileWatch *w); -+ static Status watch_dir(const char *notify_dir, dev_t file_dev, ino_t file_ino); -+ -+ static void all_watches_changed(void); -+ -+ DNotify(const DNotify&); // Do not copy -+ DNotify & operator = (const DNotify&); // or assign. -+}; -+ -+#endif /* !IMon_included */ -+ -+ ---- fam-2.7.0/src/Interest.c++ 2004-01-30 00:00:00.000000000 +0100 -+++ fam-2.7.0.dnotify/src/Interest.c++ 2004-01-30 00:00:00.000000000 +0100 -@@ -42,12 +42,21 @@ - #include "Event.h" - #include "FileSystem.h" - #include "IMon.h" -+#include "DNotify.h" - #include "Log.h" - #include "Pollster.h" - #include "timeval.h" - - Interest *Interest::hashtable[]; --IMon Interest::imon(imon_handler); -+ -+#ifdef USE_DNOTIFY -+static DNotify dnotify(Interest::monitor_handler); -+Monitor * Interest::monitor = &dnotify; -+#else -+static IMon imon(Interest::monitor_handler); -+Monitor * Interest::monitor = &imon; -+#endif -+ - bool Interest::xtab_verification = true; - - Interest::Interest(const char *name, FileSystem *fs, in_addr host, ExportVerification ev) -@@ -60,10 +69,10 @@ - mypath_exported_to_host(ev == NO_VERIFY_EXPORTED) - { - memset(&old_stat, 0, sizeof(old_stat)); -- IMon::Status s = IMon::BAD; - -- s = imon.express(name, &old_stat); -- if (s != IMon::OK) -+ Monitor::Status s = Monitor::BAD; -+ s = monitor->express(name, &old_stat); -+ if (s != Monitor::OK) - { int rc = lstat(name, &old_stat); - if (rc < 0) - { Log::info("can't lstat %s", name); -@@ -100,7 +109,7 @@ - } - #endif - -- if (exported_to_host()) fs->ll_monitor(this, s == IMon::OK); -+ if (exported_to_host()) fs->ll_monitor(this, s == Monitor::OK); - } - - Interest::~Interest() -@@ -128,7 +137,7 @@ - pp = &p->hashlink; // move to next element - } - if (!found_same) -- (void) imon.revoke(name(), dev, ino); -+ (void) monitor->revoke(name(), dev, ino); - } - } - -@@ -147,7 +156,7 @@ - - // Express interest. - IMon::Status s = IMon::BAD; -- s = imon.express(name(), NULL); -+ s = monitor->express(name(), NULL); - if (s != IMon::OK) { - return true; - } -@@ -248,23 +257,23 @@ - } - - void --Interest::imon_handler(dev_t device, ino_t inumber, int event) -+Interest::monitor_handler(dev_t device, ino_t inumber, int event) - { - assert(device || inumber); - - for (Interest *p = *hashchain(device, inumber), *next = p; p; p = next) - { next = p->hashlink; - if (p->ino == inumber && p->dev == device) -- { if (event == IMon::EXEC) -+ { if (event == Monitor::EXEC) - { p->cur_exec_state = EXECUTING; - (void) p->report_exec_state(); - } -- else if (event == IMon::EXIT) -+ else if (event == Monitor::EXIT) - { p->cur_exec_state = NOT_EXECUTING; - (void) p->report_exec_state(); - } - else -- { assert(event == IMon::CHANGE); -+ { assert(event == Monitor::CHANGE); - p->scan(); - } - } ---- fam-2.7.0/config.h.in 2003-01-20 01:40:15.000000000 +0100 -+++ fam-2.7.0.dnotify/config.h.in 2004-01-30 13:50:33.000000000 +0100 -@@ -180,3 +180,6 @@ - - /* Define to `int' if doesn't define. */ - #undef uid_t -+ -+/* Define to 1 if you have F_NOTIFY fcntl */ -+#undef USE_DNOTIFY ---- fam-2.7.0/configure.ac 2003-11-26 20:47:59.000000000 +0100 -+++ fam-2.7.0.dnotify/configure.ac 2004-01-30 13:50:33.000000000 +0100 -@@ -34,7 +34,26 @@ - AC_HEADER_DIRENT - AC_CHECK_HEADERS([fcntl.h limits.h linux/imon.h netinet/in.h rpc/rpc.h rpcsvc/mount.h stddef.h stdlib.h string.h syslog.h sys/imon.h sys/param.h sys/select.h sys/statvfs.h sys/syssgi.h sys/time.h sys/types.h sys/un.h unistd.h]) - --if test "$have_sys_imon_h"; then -+# Test for the linux dnotify fcntl -+AC_MSG_CHECKING([for dnotify fcntl support]) -+AC_TRY_COMPILE([ -+#define _GNU_SOURCE -+#include -+#include -+], -+[ int fd = 1; -+ fcntl (fd, F_NOTIFY, (DN_MODIFY|DN_CREATE|DN_DELETE|DN_RENAME|DN_ATTRIB) -+ |DN_MULTISHOT); -+], have_dnotify=yes, have_dnotify=no) -+ -+use_dnotify=false -+AC_MSG_RESULT($have_dnotify) -+ -+if test "$have_dnotify"; then -+ MONITOR_FUNCS=IMonNone -+ AC_DEFINE([USE_DNOTIFY], [], [Use dnotify]) -+ use_dnotify=true -+elif test "$have_sys_imon_h"; then - MONITOR_FUNCS=IMonIRIX - elif test "$have_linux_imon_h"; then - MONITOR_FUNCS=IMonLinux -@@ -42,6 +62,7 @@ - MONITOR_FUNCS=IMonNone - fi - AC_SUBST(MONITOR_FUNCS) -+AM_CONDITIONAL(USE_DNOTIFY, $use_dnotify) - - # Checks for typedefs, structures, and compiler characteristics. - AC_HEADER_STDBOOL ---- fam-2.7.0/src/IMon.h 2004-01-30 00:00:00.000000000 +0200 -+++ fam-2.7.0.dnotify/src/IMon.h 2004-01-30 00:00:00.000000000 +0200 -@@ -24,10 +24,7 @@ - #define IMon_included - - #include "config.h" --#include --#include -- --#include "Boolean.h" -+#include "Monitor.h" - - struct stat; - -@@ -41,25 +38,18 @@ - // - // The user of the IMon object is the Interest class. - --class IMon { -+class IMon : public Monitor { - - public: -- -- enum Status { OK = 0, BAD = -1 }; -- enum Event { EXEC, EXIT, CHANGE }; -- -- typedef void (*EventHandler)(dev_t, ino_t, int event); -- - IMon(EventHandler h); - ~IMon(); - - static bool is_active(); - -- Status express(const char *name, struct stat *stat_return); -- Status revoke(const char *name, dev_t dev, ino_t ino); -+ virtual Status express(const char *name, struct stat *stat_return); -+ virtual Status revoke(const char *name, dev_t dev, ino_t ino); - - private: -- - // Class Variables - - static int imonfd; ---- fam-2.7.0/src/Interest.h 2004-01-30 00:00:00.000000000 +0200 -+++ fam-2.7.0.dnotify/src/Interest.h 2004-01-30 00:00:00.000000000 +0200 -@@ -32,7 +32,7 @@ - - class Event; - class FileSystem; --class IMon; -+class Monitor; - struct stat; - - // Interest -- abstract base class for filesystem entities of interest. -@@ -74,7 +74,7 @@ - - // Public Class Method - -- static void imon_handler(dev_t, ino_t, int event); -+ static void monitor_handler(dev_t, ino_t, int event); - - static void enable_xtab_verification(bool enable); - -@@ -121,7 +121,7 @@ - - // Class Variables - -- static IMon imon; -+ static Monitor *monitor; - static Interest *hashtable[HASHSIZE]; - static bool xtab_verification; - ---- fam-2.7.0/src/Makefile.am 2003-01-19 13:00:17.000000000 +0100 -+++ fam-2.7.0.dnotify/src/Makefile.am 2004-01-30 13:50:38.000000000 +0100 -@@ -71,7 +71,11 @@ - main.c++ \ - timeval.c++ \ - timeval.h \ -- @MONITOR_FUNCS@.c++ -+ Monitor.h \ -+ DNotify.h \ -+ DNotify.c++ \ -+ @MONITOR_FUNCS@.c++ - --EXTRA_famd_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++ -+EXTRA_famd_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++ DNotify.c++ \ -+ DNotify.h Monitor.h - ---- fam-2.7.0/src/Monitor.h 2004-01-30 00:00:00.000000000 +0200 -+++ fam-2.7.0.dnotify/src/Monitor.h 2004-01-30 00:00:00.000000000 +0200 -@@ -0,0 +1,57 @@ -+// Copyright (C) 2001 Red Hat, Inc. All Rights Reserved. -+// Copyright (C) 1999 Silicon Graphics, Inc. All Rights Reserved. -+// -+// This program is free software; you can redistribute it and/or modify it -+// under the terms of version 2 of the GNU General Public License as -+// published by the Free Software Foundation. -+// -+// This program is distributed in the hope that it would be useful, but -+// WITHOUT ANY WARRANTY; without even the implied warranty of -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Further, any -+// license provided herein, whether implied or otherwise, is limited to -+// this program in accordance with the express provisions of the GNU -+// General Public License. Patent licenses, if any, provided herein do not -+// apply to combinations of this program with other product or programs, or -+// any other product whatsoever. This program is distributed without any -+// warranty that the program is delivered free of the rightful claim of any -+// third person by way of infringement or the like. See the GNU General -+// Public License for more details. -+// -+// You should have received a copy of the GNU General Public License along -+// with this program; if not, write the Free Software Foundation, Inc., 59 -+// Temple Place - Suite 330, Boston MA 02111-1307, USA. -+ -+#ifndef Monitor_included -+#define Monitor_included -+ -+#include "config.h" -+#include -+#include -+ -+struct stat; -+ -+// Monitor is an abstract baseclass for differend file monitoring -+// systems. The original system used was IMon, and the Montor API -+// is heavily influenced by that. -+// There can only be one instantiation of the Monitor object. -+// -+// The user of this object uses express() and revoke() to -+// express/revoke interest in a file to imon. There is also -+// a callback, the EventHandler. When an event comes in, -+// the EventHandler is called. -+// -+// The main implementers of the Monitor class is IMon and DNotify -+ -+class Monitor { -+public: -+ -+ enum Status { OK = 0, BAD = -1 }; -+ enum Event { EXEC, EXIT, CHANGE }; -+ -+ typedef void (*EventHandler)(dev_t, ino_t, int event); -+ -+ virtual Status express(const char *name, struct stat *stat_return) = 0; -+ virtual Status revoke(const char *name, dev_t dev, ino_t ino) = 0; -+}; -+ -+#endif /* !Monitor_included */ diff --git a/abs/core-testing/fam/fam-2.7.0-gcc43.patch b/abs/core-testing/fam/fam-2.7.0-gcc43.patch deleted file mode 100644 index a5ba7f0..0000000 --- a/abs/core-testing/fam/fam-2.7.0-gcc43.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur fam-2.7.0-old/include/BTree.h fam-2.7.0/include/BTree.h ---- fam-2.7.0-old/include/BTree.h 2003-01-20 14:22:30.000000000 +1000 -+++ fam-2.7.0/include/BTree.h 2008-10-18 10:43:11.000000000 +1000 -@@ -23,6 +23,8 @@ - #ifndef BTree_included - #define BTree_included - -+#include -+ - #include "Boolean.h" - - // This is an in-core B-Tree implementation. -diff -Naur fam-2.7.0-old/src/DNotify.c++ fam-2.7.0/src/DNotify.c++ ---- fam-2.7.0-old/src/DNotify.c++ 2008-10-18 10:33:13.000000000 +1000 -+++ fam-2.7.0/src/DNotify.c++ 2008-10-18 10:41:22.000000000 +1000 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include "DNotify.h" - -diff -Naur fam-2.7.0-old/src/IMon.c++ fam-2.7.0/src/IMon.c++ ---- fam-2.7.0-old/src/IMon.c++ 2003-01-19 00:18:12.000000000 +1000 -+++ fam-2.7.0/src/IMon.c++ 2008-10-18 10:40:21.000000000 +1000 -@@ -40,7 +40,7 @@ - #include "Interest.h" - #include "Log.h" - #include "Scheduler.h" --#include "alloc.h" -+#include - - int IMon::imonfd = -2; - IMon::EventHandler IMon::ehandler = NULL; -diff -Naur fam-2.7.0-old/src/Interest.h fam-2.7.0/src/Interest.h ---- fam-2.7.0-old/src/Interest.h 2008-10-18 10:33:13.000000000 +1000 -+++ fam-2.7.0/src/Interest.h 2008-10-18 10:40:44.000000000 +1000 -@@ -23,6 +23,7 @@ - #ifndef Interest_included - #define Interest_included - -+#include - #include - #include - #include diff --git a/abs/core-testing/fam/fam-2.7.0-largefiles.patch b/abs/core-testing/fam/fam-2.7.0-largefiles.patch deleted file mode 100644 index 60de9a4..0000000 --- a/abs/core-testing/fam/fam-2.7.0-largefiles.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- fam-2.7.0/common.am 2003-01-19 06:09:08.000000000 -0600 -+++ fam-2.7.0.largefile/common.am 2005-01-12 19:08:06.462113110 -0600 -@@ -1,2 +1,5 @@ --INCLUDES = @FAM_INC@ -DFAM_CONF=\"@FAM_CONF@\" -+INCLUDES = @FAM_INC@ -DFAM_CONF=\"@FAM_CONF@\" \ -+ -D_FILE_OFFSET_BITS=64 \ -+ -D_LARGEFILE64_SOURCE -+ diff --git a/abs/core-testing/fam/fam-2.7.0-noc++.patch b/abs/core-testing/fam/fam-2.7.0-noc++.patch deleted file mode 100644 index 9188af0..0000000 --- a/abs/core-testing/fam/fam-2.7.0-noc++.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -ruN fam-2.7.0/lib/Client.c++ fam-2.7.0.noc++/lib/Client.c++ ---- fam-2.7.0/lib/Client.c++ 2003-01-18 14:18:12.000000000 +0000 -+++ fam-2.7.0.noc++/lib/Client.c++ 2006-03-02 22:47:50.000000000 +0000 -@@ -34,8 +34,6 @@ - #include - #include - --#include -- - #include "fam.h" - #include "Client.h" - -@@ -440,3 +438,29 @@ - memcpy(l, p, sizeof(u_int32_t)); - *l = ntohl(*l); - } -+ -+/* Some C++ stuff needed when we not link to libstdc++ */ -+void *operator new (size_t sz) -+{ -+ void *ret = malloc (sz); -+ if (ret == NULL) -+ { -+ fputs ("libfam memory allocation failed\n", stderr); -+ } -+ return ret; -+} -+ -+void *operator new[] (size_t sz) -+{ -+ return ::operator new(sz); -+} -+ -+void operator delete (void *ptr) -+{ -+ free (ptr); -+} -+ -+void operator delete[] (void *ptr) -+{ -+ free (ptr); -+} -diff -ruN fam-2.7.0/lib/Makefile.am fam-2.7.0.noc++/lib/Makefile.am ---- fam-2.7.0/lib/Makefile.am 2003-01-19 01:55:10.000000000 +0000 -+++ fam-2.7.0.noc++/lib/Makefile.am 2006-03-02 22:43:01.000000000 +0000 -@@ -7,8 +7,11 @@ - Client.h \ - fam.c++ - --libfam_la_LDFLAGS = -export-symbols fam.sym --libfam_la_LIBADD = -lstdc++ -+libfam_la_LDFLAGS = -Wl,--version-script=fam.sym.version -+libfam_la_LIBADD = -+AM_CXXFLAGS = -fno-exceptions -fno-rtti -+ -+CXXLD=--tag=CC $(CXX) - - EXTRA_DIST = fam.sym - -diff -ruN fam-2.7.0/lib/fam.sym.version fam-2.7.0.noc++/lib/fam.sym.version ---- fam-2.7.0/lib/fam.sym.version 1970-01-01 00:00:00.000000000 +0000 -+++ fam-2.7.0.noc++/lib/fam.sym.version 2006-03-02 22:49:31.000000000 +0000 -@@ -0,0 +1,20 @@ -+{ -+ global: -+ FAMCancelMonitor; -+ FAMClose; -+ FAMDebugLevel; -+ FamErrlist; -+ FAMErrno; -+ FAMMonitorCollection; -+ FAMMonitorDirectory; -+ FAMMonitorDirectory2; -+ FAMMonitorFile; -+ FAMMonitorFile2; -+ FAMNextEvent; -+ FAMOpen; -+ FAMOpen2; -+ FAMPending; -+ FAMResumeMonitor; -+ FAMSuspendMonitor; -+ local: *; -+}; diff --git a/abs/core-testing/fam/include_fam_h.patch b/abs/core-testing/fam/include_fam_h.patch deleted file mode 100644 index 4248957..0000000 --- a/abs/core-testing/fam/include_fam_h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- include/fam.h.orig 2005-05-25 09:26:38.000000000 +0000 -+++ include/fam.h 2005-05-25 09:27:04.000000000 +0000 -@@ -41,7 +41,7 @@ - *****************************************************************************/ - - /* For NAME_MAX - maximum # of chars in a filename */ --#include "limits.h" -+#include - - - diff --git a/abs/core-testing/fbsplash/PKGBUILD b/abs/core-testing/fbsplash/PKGBUILD deleted file mode 100644 index dcec71a..0000000 --- a/abs/core-testing/fbsplash/PKGBUILD +++ /dev/null @@ -1,71 +0,0 @@ -# Maintainer: Heiko Baums -# Contributor: Kurt J. Bosch - -pkgname=fbsplash -pkgver=1.5.4.3 -pkgrel=33 -pkgdesc="A userspace implementation of a splash screen for Linux (formerly known as gensplash)" -arch=('i686' 'x86_64') -url="http://fbsplash.berlios.de" -license=('GPL') -depends=('miscsplashutils' 'freetype2' 'libjpeg' 'libpng' 'libmng' 'lcms' 'gpm' 'linhes-splash') -optdepends=('kernel26-fbcondecor: enable console background images' - 'fbsplash-extras: additional functionality like daemon icons' - 'uswsusp-fbsplash: suspend to disk with fbsplash' - 'python: convert themes from splashy to fbsplash') -conflicts=('fbsplash-scripts' 'initscripts-extras-fbsplash') -options=('!makeflags') -backup=('etc/conf.d/fbcondecor' 'etc/conf.d/splash') -install=fbsplash.install -source=(http://dev.gentoo.org/~spock/projects/gensplash/archive/splashutils-${pkgver}.tar.bz2 - fbsplash.git.patch - splash.conf - fbsplash-basic.sh - fbsplash.initcpio_install - fbsplash.initcpio_hook - fbcondecor.daemon - fbcondecor.conf) - -build() { - cd ${srcdir}/splashutils-${pkgver} - - # patch for building splashutils with glibc and dynamical linking - patch -Np0 -i ${srcdir}/fbsplash.git.patch || return 1 - autoreconf - - # fix fbcondecor_ctl splash type - sed -e 's,fbsplash_lib_init(fbspl_bootup),fbsplash_lib_init(fbspl_undef),' -i src/fbcon_decor_ctl.c - - ./configure --prefix=/usr --sysconfdir=/etc --without-klibc --enable-fbcondecor --with-gpm --with-mng --with-png --with-ttf --with-ttf-kernel || return 1 - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 - - cd ${pkgdir} - - # fix duplicate slashes to get splash_cache_cleanup grep to work - sed -r -e 's,^(export spl_.*="/)/+,\1,' -i sbin/splash-functions.sh - - # fix the path to splash_util - sed -r -e 's,^(export spl_util=)\"/bin/,\1"/sbin/,' -i sbin/splash-functions.sh - - # provide the mountpoint needed by splash-functions.sh - mkdir -p lib/splash/{cache,tmp} - - # Install fbsplash scripts and config file - install -D -m644 ${srcdir}/splash.conf etc/conf.d/splash - install -D -m644 ${srcdir}/fbsplash-basic.sh etc/rc.d/functions.d/fbsplash-basic.sh - install -D -m644 ${srcdir}/fbsplash.initcpio_install lib/initcpio/install/fbsplash - install -D -m644 ${srcdir}/fbsplash.initcpio_hook lib/initcpio/hooks/fbsplash - - # Install fbcodecor script and config file - install -D -m644 ${srcdir}/fbcondecor.conf etc/conf.d/fbcondecor - install -D -m755 ${srcdir}/fbcondecor.daemon etc/rc.d/fbcondecor -} -md5sums=('c722cd4148817b9c50381d9bdc1ea6ef' - '3a338c60ed0710c8b7e3e08929db521a' - 'a8f40c99a32d20d505aa24fbbd703008' - 'e69753dac753b8ba4e2e29ef5a9c46ca' - 'e29b3db6ee059b9950febe976a0f2881' - 'ac2351bc918b101bb9249ce8940722be' - '715926469d05eecd345c052e6248ca32' - 'b3db9d4fd902b62ac9e38589677e2d16') diff --git a/abs/core-testing/fbsplash/fbcondecor.conf b/abs/core-testing/fbsplash/fbcondecor.conf deleted file mode 100644 index 18db844..0000000 --- a/abs/core-testing/fbsplash/fbcondecor.conf +++ /dev/null @@ -1,6 +0,0 @@ - -# /etc/conf.d/fbcondecor -# - -## Virtual terminals to load with fbcondecor backgrounds -SPLASH_TTYS="1 2 3 4 5 6" diff --git a/abs/core-testing/fbsplash/fbcondecor.daemon b/abs/core-testing/fbsplash/fbcondecor.daemon deleted file mode 100644 index 4d78ea4..0000000 --- a/abs/core-testing/fbsplash/fbcondecor.daemon +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -# /etc/rc.d/fbcondecor - -# Set FbConDecor backgrounds -# - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/fbcondecor -. /sbin/splash-functions.sh - -splash_setup force - -retval=0 -[ -z "${SPLASH_TTYS%% }" ] && retval=1 -case "$1" -in start ) - if [ "${SPLASH_MODE_REQ}" != "off" ]; then - stat_busy "Setting FBconDecor console images" - for tty in ${SPLASH_TTYS}; do - # avoid blinking on boot - [[ "$( fbcondecor_ctl --tty=${tty} -c getstate )" == *\ on ]] && continue - fbcondecor_set_theme ${SPLASH_THEME} ${tty} || retval=1 - done - if [ $retval = 0 ]; then - stat_done - else - stat_fail - fi - fi -;; stop ) - stat_busy "Disabling FBconDecor console images" - for tty in ${SPLASH_TTYS}; do - # avoid errors on restart - [[ "$( fbcondecor_ctl --tty=${tty} -c getstate )" == *\ off ]] && continue - fbcondecor_ctl --tty=${tty} -c off || retval=1 - done - if [ $retval = 0 ]; then - stat_done - else - stat_fail - fi -;; restart ) - $0 stop - sleep .1 - echo # don't swallow our status line - $0 start -;; * ) - echo "usage: $0 {start|stop|restart}" -esac - -exit 0 - -# EOF # diff --git a/abs/core-testing/fbsplash/fbsplash-basic.sh b/abs/core-testing/fbsplash/fbsplash-basic.sh deleted file mode 100644 index 2834060..0000000 --- a/abs/core-testing/fbsplash/fbsplash-basic.sh +++ /dev/null @@ -1,201 +0,0 @@ - -# /etc/rc.d/functions.d/fbsplash-basic.sh # - -# Basic Fbsplash script for Arch Linux initscripts # -# # -# Author: Kurt J. Bosch # -# Based on the work of Greg Helton # -# Thomas Baechler # -# and others # -# # -# Distributed under the terms of the GNU General Public License (GPL) # - -[[ $PREVLEVEL && $RUNLEVEL ]] || return 0 - -# Do nothing if improved scripts are installed -[ -r /etc/rc.d/functions.d/fbsplash-extras.sh ] && return - -# Only do this where needed -# Since we use BASH, all important functions and variables are exported -case ${0#/etc/rc.} in sysinit | multi | shutdown ) - export SPLASH_PUSH_MESSAGES="no" - export SPLASH_VERBOSE_ON_ERRORS="no" - . /sbin/splash-functions.sh # /etc/conf.d/splash is also sourced by this - unset options opt i # eliminate splash_setup non local vars ## FIX ME ## - declare -ix SPLASH_STEPS=3 # sysinit steps - declare -ix SPLASH_STEPS_DONE=0 -esac - -# Verbose mode is handled by fbcondecor kernel patch and daemon script -[[ $SPLASH_MODE_REQ = silent ]] || return 0 - -# Override - Don't try to use /usr/bin/basename -splash_comm_send() { - [[ $( /bin/pidof -o %PPID $spl_daemon ) ]] && echo "$@" >$spl_fifo & -} - -case $0 in /etc/rc.sysinit ) - # Prevent splash destruction - CONSOLEFONT="" - # Continue to use a splash daamon started in initcpio - if /bin/mountpoint -q /dev/.splash-cache; then - /bin/mount --move /dev/.splash-cache $spl_cachedir || return - splash_comm_send set message "$SPLASH_BOOT_MESSAGE" - # Mount a tmpfs - else - ( splash_cache_prep ) || return - fi - add_hook sysinit_udevsettled splash_sysinit_udevsettled - add_hook sysinit_postfsck splash_sysinit_postfsck - add_hook sysinit_postfsckloop splash_sysinit_postfsck - add_hook sysinit_premount splash_sysinit_premount - add_hook sysinit_end splash_sysinit_end - splash_sysinit_udevsettled() { - splash_begin - splash_progress_init - splash_progress - } - splash_sysinit_premount() { - splash_progress - } - splash_sysinit_postfsck() { # fsck failure emergency exit - [ ${fsckret} -gt 1 -a ${fsckret} -ne 32 ] && chvt 1 - } - splash_sysinit_end() { - splash_progress - } -;; /etc/rc.multi ) - add_hook multi_start splash_multi_start - add_hook multi_end splash_multi_end - splash_multi_start() { - SPLASH_STEPS_DONE=$SPLASH_STEPS - splash_progress_init - } - start_daemon() { - [[ $1 = $SPLASH_XSERVICE ]] && SPLASH_EXIT_TYPE=staysilent splash_stop - /etc/rc.d/$1 start - splash_progress - } - start_daemon_bkgd() { - [[ $1 = $SPLASH_XSERVICE ]] && SPLASH_EXIT_TYPE=staysilent splash_stop - stat_bkgd "Starting $1" - ( SPLASH_PUSH_MESSAGES="no" SPLASH_VERBOSE_ON_ERRORS="no" \ - /etc/rc.d/$1 start ) &>/dev/null & - } - splash_multi_end() { - if [[ $PREVLEVEL = N ]]; then - if ! in_array "$SPLASH_XSERVICE" "${DAEMONS[@]}"; then - if [[ $RUNLEVEL = 5 ]]; then - SPLASH_EXIT_TYPE=staysilent splash_stop - else - splash_stop - [[ $( $spl_bindir/fgconsole ) = $SPLASH_TTY ]] && chvt 1 - fi - fi - # Now do setfont - set_consolefont - # Umount the tmpfs - splash_cache_cleanup - fi - } -;; /etc/rc.shutdown ) - ( splash_cache_prep ) || return - # Not using XSERVICE here to avoid missing errors - X should chvt back to SPLASH_TTY - add_hook shutdown_start splash_shutdown_start - add_hook shutdown_prekillall splash_shutdown_prekillall - add_hook shutdown_postkillall splash_shutdown_postkillall - add_hook shutdown_poweroff splash_shutdown_poweroff - splash_shutdown_start() { - splash_begin - } - ## http://bugs.archlinux.org/task/10536 ## FIX ME ## - splash_shutdown_prekillall() { /bin/sleep .1; } - splash_shutdown_postkillall() { - if [[ $( $spl_bindir/fgconsole ) = $SPLASH_TTY ]]; then - stat_busy "Restarting Fbsplash daemon" - PROGRESS=$(( 65535*2/3 )) splash_start - if [[ -e $spl_cachedir/stop_failed-fbsplash-dummy ]]; then - splash_comm_send update_svc fbsplash-dummy svc_stop_failed - fi - stat_done - fi - } - ## - splash_shutdown_poweroff() { - SPLASH_EXIT_TYPE=staysilent splash_stop - } -esac - -splash_progress_init() { - for daemon in "${DAEMONS[@]}"; do - case $daemon in $SPLASH_XSERVICE | @$SPLASH_XSERVICE ) break - ;; \!* |@* ) continue - esac - SPLASH_STEPS+=1 - done -} - -splash_progress() { - splash_comm_send progress $(( 65535*++SPLASH_STEPS_DONE/SPLASH_STEPS )) - splash_comm_send paint -} - -# Start the splash daemon - using upstream function -splash_set_event_dev() { :; } # override - Never grab the keyboard -splash_begin() { - if ! [[ $( /bin/pidof -o %PPID $spl_daemon ) ]]; then - stat_busy "Starting Fbsplash daemon" - if [ -x /etc/splash/$SPLASH_THEME/scripts/rc_init-pre ]; then - /etc/splash/$SPLASH_THEME/scripts/rc_init-pre ${0#/etc/rc.d} $RUNLEVEL - fi && - splash_start && - stat_done || stat_fail - fi -} - -# Stop the splash daemon - if any -splash_stop() { - if [[ $( /bin/pidof -o %PPID $spl_daemon ) ]]; then - SPLASH_PUSH_MESSAGES="no" stat_busy "Stopping Fbsplash daemon" - splash_comm_send progress 65535; splash_comm_send paint; /bin/sleep .1 - splash_comm_send exit $SPLASH_EXIT_TYPE - # Wait for painting/fadeout - local -i i=0 - while [[ i++ -lt 100 && $( /bin/pidof -o %PPID $spl_daemon ) ]]; do - /bin/sleep .1 - done - stat_done - fi -} - -stat_busy() { - printf "${C_OTHER}${PREFIX_REG} ${C_MAIN}${1}${C_CLEAR} " - printf "${SAVE_POSITION}" - deltext - printf " ${C_OTHER}[${C_BUSY}BUSY${C_OTHER}]${C_CLEAR} " - SPLASH_BUSY_MSG=$1 - if [[ $SPLASH_PUSH_MESSAGES = yes ]]; then - splash_comm_send set message "${1}" - splash_comm_send paint - fi -} - -stat_fail() { - deltext - printf " ${C_OTHER}[${C_FAIL}FAIL${C_OTHER}]${C_CLEAR} \n" - local event=stop_failed; [[ $PREVLEVEL = N ]] && event=start_failed - # Provide a general failure status event and write to msglog textbox - splash_comm_send update_svc fbsplash-dummy svc_${event} - splash_comm_send log "Error $SPLASH_BUSY_MSG" - splash_comm_send paint - # Save for daemon restart ## FIX ME ## - if /bin/mountpoint -q $spl_cachedir; then - : >|$spl_cachedir/${event}-fbsplash-dummy - fi - # Upstream way of error handling - if [[ $SPLASH_VERBOSE_ON_ERRORS = yes ]]; then - chvt 1 - fi -} - -# EOF # diff --git a/abs/core-testing/fbsplash/fbsplash.git.patch b/abs/core-testing/fbsplash/fbsplash.git.patch deleted file mode 100644 index 15f041c..0000000 --- a/abs/core-testing/fbsplash/fbsplash.git.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 4ecac1b2645afc8079aad4067a1aa0e8a96eab12 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Micha=C5=82=20Januszewski?= -Date: Tue, 16 Feb 2010 23:30:18 +0100 -Subject: [PATCH] Make it possible to build fbcondecor_helper against glibc. - ---- - configure.ac | 34 ++++++++++++++++++++++++++++++++++ - libs/Makefile.am | 2 ++ - src/Makefile.am | 34 +++++++++++++++++++++++++++++++++- - 3 files changed, 69 insertions(+), 1 deletions(-) - -diff --git configure.ac configure.ac -index 63b1ff6..8db1498 100644 ---- configure.ac -+++ configure.ac -@@ -76,6 +76,23 @@ AC_ARG_ENABLE([klibc-shared], - ) - AM_CONDITIONAL([CONFIG_KLIBC_SHARED], [test "x${config_klibc_shared}" = "xyes"]) - -+AC_ARG_ENABLE([static-binaries], -+ AC_HELP_STRING([--disable-static-binaries], [do not build any statically linked binaries]), -+ [ -+ AS_CASE(["${enableval}"], -+ [yes], [config_static_binaries="yes"], -+ [no], [config_static_binaries="no"], -+ [AC_MSG_ERROR([bad value '${enableval}' for --disable-static-binaries])] -+ ) -+ ], -+ [config_static_binaries="yes"] -+) -+AM_CONDITIONAL([CONFIG_STATIC_BINARIES], [test "x${config_static_binaries}" = "xyes"]) -+AS_IF( -+ [test "x${config_static_binaries}" = "xyes"], -+ [AC_DEFINE([CONFIG_STATIC_BINARIES], [1], [Define to 1 to disable building of statically linked binaries.])] -+) -+ - AC_ARG_ENABLE([deprecated], - AC_HELP_STRING([--enable-deprecated], [include support for deprecated features]), - [ -@@ -333,6 +350,23 @@ AC_ARG_WITH([themedir], - ) - AC_SUBST([themedir]) - -+AC_ARG_WITH([klibc], -+ AC_HELP_STRING([--without-klibc], [link the kernel helper against glibc instead of klibc]), -+ [ -+ AS_CASE(["${withval}"], -+ [yes], [config_klibc="yes"], -+ [no], [config_klibc="no"], -+ [AC_MSG_ERROR([bad value ${withval} for --with-klibc])] -+ ) -+ ], -+ [config_klibc="yes"] -+) -+AM_CONDITIONAL([CONFIG_KLIBC], [test "x${config_klibc}" = "xyes"]) -+AS_IF( -+ [test "x${config_klibc}" = "xyes"], -+ [AC_DEFINE([CONFIG_KLIBC], [1], [use klibc])] -+) -+ - M_CFLFAGS= - M_LIBS= - AC_CHECK_HEADER( -diff --git libs/Makefile.am b/core/libs/Makefile.am -index 6675ec1..d070b29 100644 ---- libs/Makefile.am -+++ libs/Makefile.am -@@ -24,6 +24,7 @@ mostlyclean-local: \ - - noinst_LIBRARIES = - -+if CONFIG_KLIBC - if CONFIG_HELPER - noinst_LIBRARIES += libjpeg.a - if CONFIG_PNG -@@ -33,6 +34,7 @@ if CONFIG_TTF_KERNEL - noinst_LIBRARIES += libfreetype.a - endif - endif -+endif - - libjpeg_a_SOURCES = - libpng_a_SOURCES = -diff --git src/Makefile.am b/core/src/Makefile.am -index fa6919d..7570b5e 100644 ---- src/Makefile.am -+++ src/Makefile.am -@@ -167,7 +167,6 @@ sbin_PROGRAMS += fbcondecor_ctl - endif - sbin_PROGRAMS += fbsplashd - bin_PROGRAMS += splash_util --eexecsbin_PROGRAMS += fbsplashctl - - fbcondecor_ctl_SOURCES = fbcon_decor_ctl.c fbcon_decor.h ../include/console_decor.h ../include/fbcondecor.h common.h fbsplash.h - fbcondecor_ctl_CPPFLAGS = $(AM_CPPFLAGS) -DTARGET_UTIL $(libfbsplashrender_la_CFLAGS) -@@ -185,6 +184,9 @@ splash_util_CPPFLAGS = $(AM_CPPFLAGS) -DTARGET_UTIL $(libfbsplashrender_l - splash_util_LDFLAGS = $(AM_LDFLAGS) - splash_util_LDADD = libfbsplashrender.la libfbsplash.la - -+if CONFIG_STATIC_BINARIES -+eexecsbin_PROGRAMS += fbsplashctl -+ - fbsplashctl_SOURCES = $(fbsplashd_SOURCES) $(splash_util_SOURCES) fbsplashctl.c - fbsplashctl_CFLAGS = $(AM_CFLAGS) $(PTHREAD_STATIC_CFLAGS) $(RT_CFLAGS) $(libfbsplashrender_la_CFLAGS) -DUNIFIED_BUILD - fbsplashctl_CPPFLAGS = $(fbsplashd_CPPFLAGS) $(splash_util_CPPFLAGS) -@@ -210,6 +212,7 @@ uninstall-hook: - if CONFIG_FBCON_DECOR - rm -f $(DESTDIR)$(eexecsbindir)/fbcondecor_ctl.static$(EXEEXT) - endif -+endif - - ################################################################################ - # Kernel -@@ -219,6 +222,7 @@ if CONFIG_HELPER - eexecsbin_PROGRAMS += fbcondecor_helper - endif - -+if CONFIG_KLIBC - fbcondecor_helper_SOURCES = \ - kernel.c \ - libfbsplash.c \ -@@ -236,10 +240,12 @@ fbcondecor_helper_SOURCES = \ - common.h \ - render.h \ - fbsplash.h -+ - fbcondecor_helper_CPPFLAGS = -DWITH_ERRLIST -DTARGET_KERNEL -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER - fbcondecor_helper_CFLAGS = -Os -w -ffunction-sections -fdata-sections -I.@am__isrc@ - fbcondecor_helper_LDFLAGS = - fbcondecor_helper_LDADD = -+ - fbcondecor_helper_CFLAGS += -I$(abs_top_builddir)/libs/libjpeg -I$(LIBJPEG_SOURCE) - fbcondecor_helper_LDADD += $(top_builddir)/libs/libjpeg.a - if CONFIG_PNG -@@ -280,3 +286,29 @@ fbcondecor_helper-%.o: %.c - @$(call infmsg,CC,$@) - $(Q)$(MKDIR_P) $(@D) - $(Q)$(KLCC) $(fbcondecor_helper_CPPFLAGS) $(fbcondecor_helper_CFLAGS) $(INCLUDES) -c $< -o $@ -+else -+fbcondecor_helper_SOURCES = \ -+ kernel.c \ -+ libfbsplash.c \ -+ libfbsplashrender.c \ -+ fbcon_decor.c \ -+ common.c \ -+ parse.c \ -+ list.c \ -+ render.c \ -+ image.c \ -+ effects.c \ -+ fbcon_decor.h \ -+ ../include/console_decor.h \ -+ ../include/fbcondecor.h \ -+ common.h \ -+ render.h \ -+ fbsplash.h -+if CONFIG_TTF_KERNEL -+fbcondecor_helper_SOURCES += ttf.c ttf.h -+endif -+fbcondecor_helper_CPPFLAGS = $(AM_CPPFLAGS) -DTARGET_KERNEL -+fbcondecor_helper_CFLAGS = $(AM_CFLAGS) $(libfbsplashrender_la_CFLAGS) -+fbcondecor_helper_LDFLAGS = $(AM_LDFLAGS) -+fbcondecor_helper_LDADD = $(libfbsplashrender_la_LIBADD) -+endif --- -1.6.5.GIT diff --git a/abs/core-testing/fbsplash/fbsplash.initcpio_hook b/abs/core-testing/fbsplash/fbsplash.initcpio_hook deleted file mode 100644 index 62048df..0000000 --- a/abs/core-testing/fbsplash/fbsplash.initcpio_hook +++ /dev/null @@ -1,102 +0,0 @@ -run_hook () -{ - SPLASH_INIT_MESSAGE="Initializing the kernel" - SPLASH_MODE_REQ="off" - SPLASH_THEME="default" - SPLASH_TTY=16 - SPLASH_TEXTBOX="no" - SPLASH_AUTOVERBOSE=0 - - . /etc/conf.d/splash - - # Kernel parameters override config file - local ifs="$IFS" - IFS=',' - set -- $splash - IFS="$ifs" - local arg effects - for arg in "$@"; do - case "$arg" - in off ) SPLASH_MODE_REQ="off" - ;; silent ) SPLASH_MODE_REQ="silent" - ;; verbose ) SPLASH_MODE_REQ="verbose" - ;; theme:?* ) SPLASH_THEME="${arg#theme:}" - ;; tty:?* ) SPLASH_TTY="${arg#tty:}" - ;; insane ) SPLASH_SANITY="insane" - ;; fadein | fadeout ) effects="$effects,$arg" - esac - done - if [ -n "$effects" ]; then - SPLASH_EFFECTS="${effects#,}" - fi - - if [ "${SPLASH_MODE_REQ}" != "silent" ]; then - return - fi - - if ! [ "$console" = tty1 -o "$SPLASH_SANITY" = insane ]; then - err "Fbsplash requires console=tty1 in kernel line!" - return 1 - fi - - # Start the daemon here if possible - # to show animations early and gain some bootup speed - if [ -x /sbin/fbsplashd.static ]; then - if [ -x /etc/splash/"$SPLASH_THEME"/scripts/rc_init-pre ]; then - msg "Found '/etc/splash/$SPLASH_THEME/scripts/rc_init-pre'" - msg "Not starting Fbsplash daemon - no theme hook support in initcpio." - else - msg "Starting Fbsplash Daemon" - ( - set -e - # Hold the cache and fifo within /dev to get it moved to the new root - mkdir /dev/.splash-cache - # code line derived from splash-functions.sh - mount -t tmpfs cachedir /dev/.splash-cache -o rw,mode=0644,size=4096k - # Take over any existing cache content - mkdir -p /lib/splash/cache - mv /lib/splash/cache /lib/splash/.splash-cache - cp -a /lib/splash/.splash-cache /dev/ - ln -s /dev/.splash-cache /lib/splash/cache - mkfifo -m 600 /lib/splash/cache/.splash - # Wait for any fbcondecor fadein - may take very long on some broken systems - i=0 - while [ -n "$( pidof fbcondecor_helper )" ]; do - if [ $i -ge 50 ]; then - err "timeout on waiting for fbcondecor_helper to die!" - exit 1 - fi - sleep .1 - i=$(( i + 1 )) - done - # Actually start the daemon - options="" - [ -n "$SPLASH_THEME" ] && options="$options --theme=$SPLASH_THEME" - [ -n "$SPLASH_EFFECTS" ] && options="$options --effects=$SPLASH_EFFECTS" - [ "$SPLASH_TEXTBOX" = yes ] && options="$options --textbox" - cd /dev/.splash-cache - BOOT_MSG="${SPLASH_INIT_MESSAGE}" \ - /sbin/fbsplashd.static --type=bootup --pidfile=daemon.pid $options - ( - echo set tty silent $SPLASH_TTY - echo set mode silent - echo repaint - echo set autoverbose $SPLASH_AUTOVERBOSE - ) >/lib/splash/cache/.splash & - ) - return - fi - fi - - # Start the fbcondecor helper if not already done by fbcondecor kernel - ( - # code copied from splash-functions.sh - fbcondecor_supported() { - [ -e /dev/fbsplash -o -e /dev/fbcondecor ] - } - if ! fbcondecor_supported; then - BOOT_MSG="${SPLASH_INIT_MESSAGE}" \ - /sbin/fbcondecor_helper 2 init 0 0 $SPLASH_THEME - fi - ) -} diff --git a/abs/core-testing/fbsplash/fbsplash.initcpio_install b/abs/core-testing/fbsplash/fbsplash.initcpio_install deleted file mode 100644 index 4485f91..0000000 --- a/abs/core-testing/fbsplash/fbsplash.initcpio_install +++ /dev/null @@ -1,114 +0,0 @@ - -install() { - ( - . /etc/conf.d/splash - - if /bin/mountpoint -q /lib/splash/cache; then - /bin/umount /lib/splash/cache - fi - - # Add the helper - add_binary /sbin/fbcondecor_helper - - # Add the daemon for early start - if [[ $SPLASH_DAEMON = early ]]; then - add_binary /sbin/fbsplashd.static - fi - - # Add a clean config file avoiding errors when running the hook - file=$( /usr/bin/mktemp ) - for var in SPLASH_INIT_MESSAGE SPLASH_MODE_REQ SPLASH_THEME SPLASH_TTY \ - SPLASH_AUTOVERBOSE SPLASH_EFFECTS SPLASH_TEXTBOX - do - eval value=\"\$$var\" - [ -n "$value" ] && echo $var="'$value'" - done >|$file - add_file $file /etc/conf.d/splash - - # List file paths contained in given Fbsplash theme cfg file - _get_cfg_files() { - < "$1" /bin/sed -re ' - # convert all whitespace into single blanks - s,[[:space:]]+, ,g ; t L1 - :L1 - # drop comments, grouping directives and blank lines - /^ *([#<]|$)/ d - # get a filepath or drop - s,.*[ =]([^ ]*/[^ ]+).*,\1, ; t ; d - ' | /usr/bin/sort -u - } - - # Check if cfg file name or path - _match_cfg() { - [[ "$1" =~ (^|/)[0-9]+x[0-9]+\.cfg$ ]] - } - - # Add non-cfg files in given dir - _add_non_cfg_files() { - local file dir="$1" - for file in $( /bin/ls "$dir" ); do - if [ -f "$dir/$file" ]; then - _match_cfg "$file" || add_file "$dir/$file" - fi - done - } - - # Add global non-cfg files - _add_non_cfg_files /etc/splash - - # Add themes - dirs="" - for theme in ${SPLASH_THEMES[*]}; do # string list and array allowed - [ ${theme:0:1} = / ] || theme=/etc/splash/$theme - if [ -f $theme ]; then - if ! _match_cfg $theme; then - err "Not a valid theme cfg file name: $theme" - continue - fi - add_file $theme || continue - dir=$( dirname $theme ) - # Add non-cfg files in theme dir - _add_non_cfg_files $dir - # Add files refered in cfg file by paths - for file in $( _get_cfg_files $theme ); do - if [ ${file:0:1} = / ]; then - add_file $file - continue - fi - # Path may be relative to theme-dir or to /etc/splash - [ -e $dir/$file -o ! -f /etc/splash/$file ] && add_file $dir/$file - [ -e /etc/splash/$file -o ! -f $dir/$file ] && add_file /etc/splash/$file - done - elif [ -d $theme ]; then - dir=$theme - add_full_dir $dir - else - err "Theme not found: $theme" - continue - fi - if [[ " "$dirs" " != *" "$dir" "* ]]; then - dirs+=" "$dir - fi - done - for dir in $dirs; do - # Add the rc_init-pre script if we have one - # Currently this just prevents early daemon start for the theme - if [[ $SPLASH_DAEMON = early && -x $dir/scripts/rc_init-pre ]]; then - add_file $dir/scripts/rc_init-pre || continue - echo "WARNING: rc_init-pre script found - no early daemon with '${dir##*/}'!" >&2 - fi - done - ) - - SCRIPT="fbsplash" -} - -help() { -cat< This package doesn't contain a default theme." - echo "> You need to install one separately." - echo "> To find some themes, just search AUR for \"fbsplash-theme\"," - echo "> or GNOME-Look.org or KDE-Look.org for \"fbsplash\"." - echo "------------------------------------------------------------" - echo "> Configuration for fbsplash: /etc/conf.d/splash" - echo "> Configuration for fbcondecor: /etc/conf.d/fbcondecor" - echo "------------------------------------------------------------" - echo "> Remember to rebuild the initrd after changing the" - echo "> configuration." - echo "------------------------------------------------------------" - echo "> Please read http://wiki.archlinux.org/index.php/Fbsplash" - echo "> for more details. " - echo "------------------------------------------------------------" -} - -post_upgrade() { - post_install -} - -op=$1 -shift -$op $* - -#EOF diff --git a/abs/core-testing/fbsplash/splash.conf b/abs/core-testing/fbsplash/splash.conf deleted file mode 100644 index 74cada9..0000000 --- a/abs/core-testing/fbsplash/splash.conf +++ /dev/null @@ -1,63 +0,0 @@ -# -# /etc/conf.d/splash -# - -#### initcpio and Fbsplash daemon ########################################## - -## Themes to include into initcpio -## For a smaller initcpio you may try theme cfg files instead of directories. -SPLASH_THEMES=( - linhes -) - -## Override the initial silent splash screen status message defaults. -## Note: '$progress' will be replaced by Fbsplash itself. -## * initcpio - (no effect with fbcondecor kernel) -SPLASH_INIT_MESSAGE="Initializing the kernel" -## * bootup -SPLASH_BOOT_MESSAGE="Booting '$HOSTNAME' (\$progress%)" -## * reboot -SPLASH_REBOOT_MESSAGE="Rebooting '$HOSTNAME' (\$progress%)" -## * shutdown -SPLASH_SHUTDOWN_MESSAGE="Shutting down '$HOSTNAME' (\$progress%)" - -## To show animations early, include the Fbsplash daemon (1.5 MiB) into initcpio, too, -## instead of the small helper only. -## Note: Themes with 'scripts/rc_init-pre' like 'arch-banner-icons' are not supported. -SPLASH_DAEMON="early" - -## Make the splash daemon use fade effects. -## Note: The initcpio helper does only use the kernel parameter! -# SPLASH_EFFECTS="fadein,fadeout" -## Uggly hack to get that in from the kernel line :p -SPLASH_EFFECTS=$(e=();IFS=',';for w in $splash;do [[ $w == fade* ]]&&e+=($w);done;echo "${e[*]}") - -## Enable the textbox when starting the Fbsplash daemon. -## Useful if the theme provides a message log or other textbox. -## The scripts write any initscripts [FAIL] messages to the log. -## Note: The textbox can also be toggled by pressing F3-key. -SPLASH_TEXTBOX="yes" - -## Splash progress timeout -## If set to a positive value, Fbsplash will automatically switch to verbose -## mode if there is no progress for the specified number of seconds. -SPLASH_AUTOVERBOSE=0 - -#### scripts behaviour ##################################################### - -## Change to verbose mode on any initscripts [FAIL] message -## Useful with very simple themes and also when starting Xorg from DAEMONS -SPLASH_VERBOSE_ON_ERRORS="no" - -## Name of the DAEMONS script starting Xorg if any -## Set this to avoid virtual terminal change struggle between Xorg and Fbsplash. -SPLASH_XSERVICE="gdm" -#SPLASH_XSERVICE="kdm" -#SPLASH_XSERVICE="xdm" -#SPLASH_XSERVICE="lxdm" -#SPLASH_XSERVICE="slim" - -## Push initscripts [BUSY] messages to the splash status message line. -SPLASH_PUSH_MESSAGES="no" - -# EOF # diff --git a/abs/core-testing/fcgi/PKGBUILD b/abs/core-testing/fcgi/PKGBUILD deleted file mode 100644 index e7cf3c5..0000000 --- a/abs/core-testing/fcgi/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 12749 2008-09-19 13:48:16Z pierre $ -# Maintainer: tobias -# Modified by: eliott -# Original by Benjamin Andresen, klapmuetz [at] gmail [dot] com - -pkgname=fcgi -pkgver=2.4.0 -pkgrel=5 -depends=('gcc-libs') -pkgdesc="FASTCgi(fcgi) islanguage independent, high performant extension to CGI" -arch=(i686 x86_64) -license=('custom') -options=('!libtool') -url="http://www.fastcgi.com" -source=("http://www.fastcgi.com/dist/$pkgname-$pkgver.tar.gz" 'fcgi-configure.patch') -md5sums=('d15060a813b91383a9f3c66faf84867e' '4312cdf8ee47c9f8a276e7d892a18ea6') - -build() { - cd $startdir/src/$pkgname-$pkgver - # fix from Debian: http://ftp.debian.org/debian/pool/main/libf/libfcgi/libfcgi_2.4.0-7.diff.gz - patch -p1 -i ${srcdir}/fcgi-configure.patch || return 1 - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - install -Dm 644 LICENSE.TERMS \ - ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/abs/core-testing/fcgi/fcgi-configure.patch b/abs/core-testing/fcgi/fcgi-configure.patch deleted file mode 100644 index 0c4799a..0000000 --- a/abs/core-testing/fcgi/fcgi-configure.patch +++ /dev/null @@ -1,53839 +0,0 @@ ---- libfcgi-2.4.0.orig/depcomp -+++ libfcgi-2.4.0/depcomp -@@ -1,7 +1,10 @@ - #! /bin/sh -- - # depcomp - compile a program generating dependencies as side-effects --# Copyright 1999, 2000 Free Software Foundation, Inc. -+ -+scriptversion=2006-10-15.18 -+ -+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software -+# Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -15,8 +18,8 @@ - - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+# 02110-1301, USA. - - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -25,13 +28,45 @@ - - # Originally written by Alexandre Oliva . - -+case $1 in -+ '') -+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2 -+ exit 1; -+ ;; -+ -h | --h*) -+ cat <<\EOF -+Usage: depcomp [--help] [--version] PROGRAM [ARGS] -+ -+Run PROGRAMS ARGS to compile a file, generating dependencies -+as side-effects. -+ -+Environment variables: -+ depmode Dependency tracking mode. -+ source Source file read by `PROGRAMS ARGS'. -+ object Object file output by `PROGRAMS ARGS'. -+ DEPDIR directory where to store dependencies. -+ depfile Dependency file to output. -+ tmpdepfile Temporary file to use when outputing dependencies. -+ libtool Whether libtool is used (yes/no). -+ -+Report bugs to . -+EOF -+ exit $? -+ ;; -+ -v | --v*) -+ echo "depcomp $scriptversion" -+ exit $? -+ ;; -+esac -+ - if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 - fi --# `libtool' can also be set to `yes' or `no'. - --depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`} -+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -+depfile=${depfile-`echo "$object" | -+ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} - tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - - rm -f "$tmpdepfile" -@@ -57,7 +92,20 @@ - ## gcc 3 implements dependency tracking that does exactly what - ## we want. Yay! Note: for some reason libtool 1.4 doesn't like - ## it if -MD -MP comes after the -MF stuff. Hmm. -- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" -+## Unfortunately, FreeBSD c89 acceptance of flags depends upon -+## the command line argument order; so add the flags where they -+## appear in depend2.am. Note that the slowdown incurred here -+## affects only configure: in makefiles, %FASTDEP% shortcuts this. -+ for arg -+ do -+ case $arg in -+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; -+ *) set fnord "$@" "$arg" ;; -+ esac -+ shift # fnord -+ shift # $arg -+ done -+ "$@" - stat=$? - if test $stat -eq 0; then : - else -@@ -163,19 +211,25 @@ - - aix) - # The C for AIX Compiler uses -M and outputs the dependencies -- # in a .u file. This file always lives in the current directory. -- # Also, the AIX compiler puts `$object:' at the start of each line; -- # $object doesn't have directory information. -- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` -+ # in a .u file. In older versions, this file always lives in the -+ # current directory. Also, the AIX compiler puts `$object:' at the -+ # start of each line; $object doesn't have directory information. -+ # Version 6 uses the directory in both cases. -+ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" -- outname="$stripped.o" - if test "$libtool" = yes; then - "$@" -Wc,-M - else - "$@" -M - fi -- - stat=$? -+ -+ if test -f "$tmpdepfile"; then : -+ else -+ stripped=`echo "$stripped" | sed 's,^.*/,,'` -+ tmpdepfile="$stripped.u" -+ fi -+ - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" -@@ -183,6 +237,7 @@ - fi - - if test -f "$tmpdepfile"; then -+ outname="$stripped.o" - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. -@@ -197,37 +252,136 @@ - rm -f "$tmpdepfile" - ;; - -+icc) -+ # Intel's C compiler understands `-MD -MF file'. However on -+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c -+ # ICC 7.0 will fill foo.d with something like -+ # foo.o: sub/foo.c -+ # foo.o: sub/foo.h -+ # which is wrong. We want: -+ # sub/foo.o: sub/foo.c -+ # sub/foo.o: sub/foo.h -+ # sub/foo.c: -+ # sub/foo.h: -+ # ICC 7.1 will output -+ # foo.o: sub/foo.c sub/foo.h -+ # and will wrap long lines using \ : -+ # foo.o: sub/foo.c ... \ -+ # sub/foo.h ... \ -+ # ... -+ -+ "$@" -MD -MF "$tmpdepfile" -+ stat=$? -+ if test $stat -eq 0; then : -+ else -+ rm -f "$tmpdepfile" -+ exit $stat -+ fi -+ rm -f "$depfile" -+ # Each line is of the form `foo.o: dependent.h', -+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. -+ # Do two passes, one to just change these to -+ # `$object: dependent.h' and one to simply `dependent.h:'. -+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" -+ # Some versions of the HPUX 10.20 sed can't process this invocation -+ # correctly. Breaking it into two sed invocations is a workaround. -+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | -+ sed -e 's/$/ :/' >> "$depfile" -+ rm -f "$tmpdepfile" -+ ;; -+ -+hp2) -+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64 -+ # compilers, which have integrated preprocessors. The correct option -+ # to use with these is +Maked; it writes dependencies to a file named -+ # 'foo.d', which lands next to the object file, wherever that -+ # happens to be. -+ # Much of this is similar to the tru64 case; see comments there. -+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` -+ test "x$dir" = "x$object" && dir= -+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` -+ if test "$libtool" = yes; then -+ tmpdepfile1=$dir$base.d -+ tmpdepfile2=$dir.libs/$base.d -+ "$@" -Wc,+Maked -+ else -+ tmpdepfile1=$dir$base.d -+ tmpdepfile2=$dir$base.d -+ "$@" +Maked -+ fi -+ stat=$? -+ if test $stat -eq 0; then : -+ else -+ rm -f "$tmpdepfile1" "$tmpdepfile2" -+ exit $stat -+ fi -+ -+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" -+ do -+ test -f "$tmpdepfile" && break -+ done -+ if test -f "$tmpdepfile"; then -+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" -+ # Add `dependent.h:' lines. -+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" -+ else -+ echo "#dummy" > "$depfile" -+ fi -+ rm -f "$tmpdepfile" "$tmpdepfile2" -+ ;; -+ - tru64) -- # The Tru64 AIX compiler uses -MD to generate dependencies as a side -+ # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. -- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put -+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. -+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` -+ test "x$dir" = "x$object" && dir= -+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - -- tmpdepfile1="$object.d" -- tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` - if test "$libtool" = yes; then -+ # With Tru64 cc, shared objects can also be used to make a -+ # static library. This mechanism is used in libtool 1.4 series to -+ # handle both shared and static libraries in a single compilation. -+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. -+ # -+ # With libtool 1.5 this exception was removed, and libtool now -+ # generates 2 separate objects for the 2 libraries. These two -+ # compilations output dependencies in $dir.libs/$base.o.d and -+ # in $dir$base.o.d. We have to check for both files, because -+ # one of the two compilations can be disabled. We should prefer -+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is -+ # automatically cleaned when .libs/ is deleted, while ignoring -+ # the former would cause a distcleancheck panic. -+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 -+ tmpdepfile2=$dir$base.o.d # libtool 1.5 -+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 -+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else -+ tmpdepfile1=$dir$base.o.d -+ tmpdepfile2=$dir$base.d -+ tmpdepfile3=$dir$base.d -+ tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else -- rm -f "$tmpdepfile1" "$tmpdepfile2" -+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - -- if test -f "$tmpdepfile1"; then -- tmpdepfile="$tmpdepfile1" -- else -- tmpdepfile="$tmpdepfile2" -- fi -+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" -+ do -+ test -f "$tmpdepfile" && break -+ done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" -- # That's a space and a tab in the []. -- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" -+ # That's a tab and a space in the []. -+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi -@@ -240,34 +394,42 @@ - - dashmstdout) - # Important note: in order to support this mode, a compiler *must* -- # always write the proprocessed file to stdout, regardless of -o, -- # because we must use -o when running libtool. -- test -z "$dashmflag" && dashmflag=-M -- ( IFS=" " -- case " $* " in -- *" --mode=compile "*) # this is libtool, let us make it quiet -- for arg -- do # cycle over the arguments -- case "$arg" in -- "--mode=compile") -- # insert --quiet before "--mode=compile" -- set fnord "$@" --quiet -- shift # fnord -- ;; -- esac -- set fnord "$@" "$arg" -- shift # fnord -- shift # "$arg" -- done -+ # always write the preprocessed file to stdout, regardless of -o. -+ "$@" || exit $? -+ -+ # Remove the call to Libtool. -+ if test "$libtool" = yes; then -+ while test $1 != '--mode=compile'; do -+ shift -+ done -+ shift -+ fi -+ -+ # Remove `-o $object'. -+ IFS=" " -+ for arg -+ do -+ case $arg in -+ -o) -+ shift -+ ;; -+ $object) -+ shift -+ ;; -+ *) -+ set fnord "$@" "$arg" -+ shift # fnord -+ shift # $arg - ;; - esac -- "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" -- ) & -- proc=$! -- "$@" -- stat=$? -- wait "$proc" -- if test "$stat" != 0; then exit $stat; fi -+ done -+ -+ test -z "$dashmflag" && dashmflag=-M -+ # Require at least two characters before searching for `:' -+ # in the target name. This is to cope with DOS-style filenames: -+ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. -+ "$@" $dashmflag | -+ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -@@ -285,36 +447,40 @@ - ;; - - makedepend) -- # X makedepend -- ( -- shift -- cleared=no -- for arg in "$@"; do -- case $cleared in no) -- set ""; shift -- cleared=yes -- esac -- case "$arg" in -- -D*|-I*) -- set fnord "$@" "$arg"; shift;; -- -*) -- ;; -- *) -- set fnord "$@" "$arg"; shift;; -- esac -+ "$@" || exit $? -+ # Remove any Libtool call -+ if test "$libtool" = yes; then -+ while test $1 != '--mode=compile'; do -+ shift - done -- obj_suffix="`echo $object | sed 's/^.*\././'`" -- touch "$tmpdepfile" -- ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@" -- ) & -- proc=$! -- "$@" -- stat=$? -- wait "$proc" -- if test "$stat" != 0; then exit $stat; fi -+ shift -+ fi -+ # X makedepend -+ shift -+ cleared=no -+ for arg in "$@"; do -+ case $cleared in -+ no) -+ set ""; shift -+ cleared=yes ;; -+ esac -+ case "$arg" in -+ -D*|-I*) -+ set fnord "$@" "$arg"; shift ;; -+ # Strip any option that makedepend may not understand. Remove -+ # the object too, otherwise makedepend will parse it as a source file. -+ -*|$object) -+ ;; -+ *) -+ set fnord "$@" "$arg"; shift ;; -+ esac -+ done -+ obj_suffix="`echo $object | sed 's/^.*\././'`" -+ touch "$tmpdepfile" -+ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" -- tail +3 "$tmpdepfile" | tr ' ' ' -+ sed '1,2d' "$tmpdepfile" | tr ' ' ' - ' | \ - ## Some versions of the HPUX 10.20 sed can't process this invocation - ## correctly. Breaking it into two sed invocations is a workaround. -@@ -324,35 +490,40 @@ - - cpp) - # Important note: in order to support this mode, a compiler *must* -- # always write the proprocessed file to stdout, regardless of -o, -- # because we must use -o when running libtool. -- ( IFS=" " -- case " $* " in -- *" --mode=compile "*) -- for arg -- do # cycle over the arguments -- case $arg in -- "--mode=compile") -- # insert --quiet before "--mode=compile" -- set fnord "$@" --quiet -- shift # fnord -- ;; -- esac -- set fnord "$@" "$arg" -- shift # fnord -- shift # "$arg" -- done -+ # always write the preprocessed file to stdout. -+ "$@" || exit $? -+ -+ # Remove the call to Libtool. -+ if test "$libtool" = yes; then -+ while test $1 != '--mode=compile'; do -+ shift -+ done -+ shift -+ fi -+ -+ # Remove `-o $object'. -+ IFS=" " -+ for arg -+ do -+ case $arg in -+ -o) -+ shift -+ ;; -+ $object) -+ shift -+ ;; -+ *) -+ set fnord "$@" "$arg" -+ shift # fnord -+ shift # $arg - ;; - esac -- "$@" -E | -- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | -+ done -+ -+ "$@" -E | -+ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ -+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" -- ) & -- proc=$! -- "$@" -- stat=$? -- wait "$proc" -- if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" -@@ -362,34 +533,27 @@ - - msvisualcpp) - # Important note: in order to support this mode, a compiler *must* -- # always write the proprocessed file to stdout, regardless of -o, -+ # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. -- ( IFS=" " -- case " $* " in -- *" --mode=compile "*) -- for arg -- do # cycle over the arguments -- case $arg in -- "--mode=compile") -- # insert --quiet before "--mode=compile" -- set fnord "$@" --quiet -- shift # fnord -- ;; -- esac -+ "$@" || exit $? -+ IFS=" " -+ for arg -+ do -+ case "$arg" in -+ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") -+ set fnord "$@" -+ shift -+ shift -+ ;; -+ *) - set fnord "$@" "$arg" -- shift # fnord -- shift # "$arg" -- done -- ;; -+ shift -+ shift -+ ;; - esac -- "$@" -E | -- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" -- ) & -- proc=$! -- "$@" -- stat=$? -- wait "$proc" -- if test "$stat" != 0; then exit $stat; fi -+ done -+ "$@" -E | -+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" -@@ -409,3 +573,12 @@ - esac - - exit 0 -+ -+# Local Variables: -+# mode: shell-script -+# sh-indentation: 2 -+# eval: (add-hook 'write-file-hooks 'time-stamp) -+# time-stamp-start: "scriptversion=" -+# time-stamp-format: "%:y-%02m-%02d.%02H" -+# time-stamp-end: "$" -+# End: ---- libfcgi-2.4.0.orig/aclocal.m4 -+++ libfcgi-2.4.0/aclocal.m4 -@@ -1,7 +1,7 @@ --# aclocal.m4 generated automatically by aclocal 1.5 -+# generated automatically by aclocal 1.10 -*- Autoconf -*- - --# Copyright 1996, 1997, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005, 2006 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -11,4434 +11,7446 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --dnl $Id: acinclude.m4,v 1.2 2001/12/21 03:12:50 robs Exp $ -+m4_if(m4_PACKAGE_VERSION, [2.61],, -+[m4_fatal([this file was generated for autoconf 2.61. -+You have another version of autoconf. If you want to use that, -+you should regenerate the build system entirely.], [63])]) - --AC_DEFUN(FCGI_COMMON_CHECKS, [ -- AC_CHECK_TYPE([ssize_t], [int]) -+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - -- AC_MSG_CHECKING([for sun_len in sys/un.h]) -- AC_EGREP_HEADER([sun_len], [sys/un.h], -- [AC_MSG_RESULT([yes]) -- AC_DEFINE([HAVE_SOCKADDR_UN_SUN_LEN], [1], -- [Define if sockaddr_un in sys/un.h contains a sun_len component])], -- AC_MSG_RESULT([no])) -- -- AC_MSG_CHECKING([for fpos_t in stdio.h]) -- AC_EGREP_HEADER([fpos_t], [stdio.h], -- [AC_MSG_RESULT([yes]) -- AC_DEFINE([HAVE_FPOS], [1], -- [Define if the fpos_t typedef is in stdio.h])], -- AC_MSG_RESULT([no])) -- -- AC_CHECK_HEADERS([sys/socket.h netdb.h netinet/in.h arpa/inet.h]) -- AC_CHECK_HEADERS([sys/time.h limits.h sys/param.h unistd.h]) -- -- AC_MSG_CHECKING([for a fileno() prototype in stdio.h]) -- AC_EGREP_HEADER([fileno], [stdio.h], -- [AC_MSG_RESULT([yes]) -- AC_DEFINE([HAVE_FILENO_PROTO], [1], -- [Define if there's a fileno() prototype in stdio.h])], -- AC_MSG_RESULT([no])) -- -- if test "$HAVE_SYS_SOCKET_H"; then -- AC_MSG_CHECKING([for socklen_t in sys/socket.h]) -- AC_EGREP_HEADER([socklen_t], [sys/socket.h], -- [AC_MSG_RESULT([yes]) -- AC_DEFINE([HAVE_SOCKLEN], [1], -- [Define if the socklen_t typedef is in sys/socket.h])], -- AC_MSG_RESULT([no])) -- fi -+# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL - -- #-------------------------------------------------------------------- -- # Do we need cross-process locking on this platform? -- #-------------------------------------------------------------------- -- AC_MSG_CHECKING([whether cross-process locking is required by accept()]) -- case "`uname -sr`" in -- IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0) -- AC_MSG_RESULT([yes]) -- AC_DEFINE([USE_LOCKING], [1], -- [Define if cross-process locking is required by accept()]) -- ;; -- *) -- AC_MSG_RESULT([no]) -- ;; -- esac - -- #-------------------------------------------------------------------- -- # Does va_arg(arg, long double) crash the compiler? -- # hpux 9.04 compiler does and so does Stratus FTX (uses HP's compiler) -- #-------------------------------------------------------------------- -- AC_MSG_CHECKING([whether va_arg(arg, long double) crashes the compiler]) -- AC_TRY_COMPILE([#include ], -- [long double lDblArg; va_list arg; lDblArg = va_arg(arg, long double);], -- AC_MSG_RESULT([no]), -- [AC_MSG_RESULT([yes]) -- AC_DEFINE([HAVE_VA_ARG_LONG_DOUBLE_BUG], [1], -- [Define if va_arg(arg, long double) crashes the compiler])]) -+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -+# ----------------------------------------------------------- -+# If this macro is not defined by Autoconf, define it here. -+m4_ifdef([AC_PROVIDE_IFELSE], -+ [], -+ [m4_define([AC_PROVIDE_IFELSE], -+ [m4_ifdef([AC_PROVIDE_$1], -+ [$2], [$3])])]) - -- AC_C_CONST --]) - -+# AC_PROG_LIBTOOL -+# --------------- -+AC_DEFUN([AC_PROG_LIBTOOL], -+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. -+ AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [AC_LIBTOOL_CXX], -+ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX -+ ])]) -+dnl And a similar setup for Fortran 77 support -+ AC_PROVIDE_IFELSE([AC_PROG_F77], -+ [AC_LIBTOOL_F77], -+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -+])]) -+ -+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. -+ AC_PROVIDE_IFELSE([AC_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [ifdef([AC_PROG_GCJ], -+ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -+ ifdef([A][M_PROG_GCJ], -+ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -+ ifdef([LT_AC_PROG_GCJ], -+ [define([LT_AC_PROG_GCJ], -+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -+])])# AC_PROG_LIBTOOL -+ -+ -+# _AC_PROG_LIBTOOL -+# ---------------- -+AC_DEFUN([_AC_PROG_LIBTOOL], -+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl - --dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) --dnl --dnl This macro figures out how to build C programs using POSIX --dnl threads. It sets the PTHREAD_LIBS output variable to the threads --dnl library and linker flags, and the PTHREAD_CFLAGS output variable --dnl to any special C compiler flags that are needed. (The user can also --dnl force certain compiler flags/libs to be tested by setting these --dnl environment variables.) --dnl --dnl Also sets PTHREAD_CC to any special C compiler that is needed for --dnl multi-threaded programs (defaults to the value of CC otherwise). --dnl (This is necessary on AIX to use the special cc_r compiler alias.) --dnl --dnl If you are only building threads programs, you may wish to --dnl use these variables in your default LIBS, CFLAGS, and CC: --dnl --dnl LIBS="$PTHREAD_LIBS $LIBS" --dnl CFLAGS="$CFLAGS $PTHREAD_CFLAGS" --dnl CC="$PTHREAD_CC" --dnl --dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute --dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE --dnl to that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX). --dnl --dnl ACTION-IF-FOUND is a list of shell commands to run if a threads --dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands --dnl to run it if it is not found. If ACTION-IF-FOUND is not specified, --dnl the default action will define HAVE_PTHREAD. --dnl --dnl Please let the authors know if this macro fails on any platform, --dnl or if you have any other suggestions or comments. This macro was --dnl based on work by SGJ on autoconf scripts for FFTW (www.fftw.org) --dnl (with help from M. Frigo), as well as ac_pthread and hb_pthread --dnl macros posted by AFC to the autoconf macro repository. We are also --dnl grateful for the helpful feedback of numerous users. -+# This can be used to rebuild libtool when needed -+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+ -+# Always use our own libtool. -+LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+AC_SUBST(LIBTOOL)dnl -+ -+# Prevent multiple expansion -+define([AC_PROG_LIBTOOL], []) -+])# _AC_PROG_LIBTOOL -+ -+ -+# AC_LIBTOOL_SETUP -+# ---------------- -+AC_DEFUN([AC_LIBTOOL_SETUP], -+[AC_PREREQ(2.50)dnl -+AC_REQUIRE([AC_ENABLE_SHARED])dnl -+AC_REQUIRE([AC_ENABLE_STATIC])dnl -+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_PROG_LD])dnl -+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -+AC_REQUIRE([AC_PROG_NM])dnl -+ -+AC_REQUIRE([AC_PROG_LN_S])dnl -+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -+AC_REQUIRE([AC_OBJEXT])dnl -+AC_REQUIRE([AC_EXEEXT])dnl - dnl --dnl @version $Id: acinclude.m4,v 1.2 2001/12/21 03:12:50 robs Exp $ --dnl @author Steven G. Johnson and Alejandro Forero Cuervo - --AC_DEFUN([ACX_PTHREAD], [ --AC_REQUIRE([AC_CANONICAL_HOST]) --acx_pthread_ok=no -- --# First, check if the POSIX threads header, pthread.h, is available. --# If it isn't, don't bother looking for the threads libraries. --AC_CHECK_HEADER(pthread.h, , acx_pthread_ok=noheader) -- --# We must check for the threads library under a number of different --# names; the ordering is very important because some systems --# (e.g. DEC) have both -lpthread and -lpthreads, where one of the --# libraries is broken (non-POSIX). -- --# First of all, check if the user has set any of the PTHREAD_LIBS, --# etcetera environment variables, and if threads linking works using --# them: --if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -- save_LIBS="$LIBS" -- LIBS="$PTHREAD_LIBS $LIBS" -- AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) -- AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) -- AC_MSG_RESULT($acx_pthread_ok) -- if test x"$acx_pthread_ok" = xno; then -- PTHREAD_LIBS="" -- PTHREAD_CFLAGS="" -- fi -- LIBS="$save_LIBS" -- CFLAGS="$save_CFLAGS" --fi -+AC_LIBTOOL_SYS_MAX_CMD_LEN -+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+AC_LIBTOOL_OBJDIR - --# Create a list of thread flags to try. Items starting with a "-" are --# C compiler flags, and other items are library names, except for "none" --# which indicates that we try without any flags at all. -- --acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt" -- --# The ordering *is* (sometimes) important. Some notes on the --# individual items follow: -- --# pthreads: AIX (must check this before -lpthread) --# none: in case threads are in libc; should be tried before -Kthread and --# other compiler flags to prevent continual compiler warnings --# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) --# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) --# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) --# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) --# -pthreads: Solaris/gcc --# -mthreads: Mingw32/gcc, Lynx/gcc --# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it --# doesn't hurt to check since this sometimes defines pthreads too; --# also defines -D_REENTRANT) --# pthread: Linux, etcetera --# --thread-safe: KAI C++ -- --case "${host_cpu}-${host_os}" in -- *solaris*) -- -- # On Solaris (at least, for some versions), libc contains stubbed -- # (non-functional) versions of the pthreads routines, so link-based -- # tests will erroneously succeed. (We need to link with -pthread or -- # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather -- # a function called by this macro, so we could check for that, but -- # who knows whether they'll stub that too in a future libc.) So, -- # we'll just look for -pthreads and -lpthread first: -+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+_LT_AC_PROG_ECHO_BACKSLASH - -- acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags" -- ;; -+case $host_os in -+aix3*) -+ # AIX sometimes has problems with the GCC collect2 program. For some -+ # reason, if we set the COLLECT_NAMES environment variable, the problems -+ # vanish in a puff of smoke. -+ if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+ fi -+ ;; - esac - --if test x"$acx_pthread_ok" = xno; then --for flag in $acx_pthread_flags; do -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+Xsed='sed -e 1s/^X//' -+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] - -- case $flag in -- none) -- AC_MSG_CHECKING([whether pthreads work without any flags]) -- ;; -- -- -*) -- AC_MSG_CHECKING([whether pthreads work with $flag]) -- PTHREAD_CFLAGS="$flag" -- ;; -- -- *) -- AC_MSG_CHECKING([for the pthreads library -l$flag]) -- PTHREAD_LIBS="-l$flag" -- ;; -- esac -+# Same as above, but do not quote variable references. -+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] - -- save_LIBS="$LIBS" -- save_CFLAGS="$CFLAGS" -- LIBS="$PTHREAD_LIBS $LIBS" -- CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -- -- # Check for various functions. We must include pthread.h, -- # since some functions may be macros. (On the Sequent, we -- # need a special flag -Kthread to make this header compile.) -- # We check for pthread_join because it is in -lpthread on IRIX -- # while pthread_create is in libc. We check for pthread_attr_init -- # due to DEC craziness with -lpthreads. We check for -- # pthread_cleanup_push because it is one of the few pthread -- # functions on Solaris that doesn't have a non-functional libc stub. -- # We try pthread_create on general principles. -- AC_TRY_LINK([#include ], -- [pthread_t th; pthread_join(th, 0); -- pthread_attr_init(0); pthread_cleanup_push(0, 0); -- pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], -- [acx_pthread_ok=yes]) -- -- LIBS="$save_LIBS" -- CFLAGS="$save_CFLAGS" -- -- AC_MSG_RESULT($acx_pthread_ok) -- if test "x$acx_pthread_ok" = xyes; then -- break; -- fi -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -- PTHREAD_LIBS="" -- PTHREAD_CFLAGS="" --done --fi -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' - --# Various other checks: --if test "x$acx_pthread_ok" = xyes; then -- save_LIBS="$LIBS" -- LIBS="$PTHREAD_LIBS $LIBS" -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -- -- # Detect AIX lossage: threads are created detached by default -- # and the JOINABLE attribute has a nonstandard name (UNDETACHED). -- AC_MSG_CHECKING([for joinable pthread attribute]) -- AC_TRY_LINK([#include ], -- [int attr=PTHREAD_CREATE_JOINABLE;], -- ok=PTHREAD_CREATE_JOINABLE, ok=unknown) -- if test x"$ok" = xunknown; then -- AC_TRY_LINK([#include ], -- [int attr=PTHREAD_CREATE_UNDETACHED;], -- ok=PTHREAD_CREATE_UNDETACHED, ok=unknown) -- fi -- if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then -- AC_DEFINE(PTHREAD_CREATE_JOINABLE, $ok, -- [Define to the necessary symbol if this constant -- uses a non-standard name on your system.]) -- fi -- AC_MSG_RESULT(${ok}) -- if test x"$ok" = xunknown; then -- AC_MSG_WARN([we do not know how to create joinable pthreads]) -- fi -+# Constants: -+rm="rm -f" - -- AC_MSG_CHECKING([if more special flags are required for pthreads]) -- flag=no -- case "${host_cpu}-${host_os}" in -- *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";; -- *solaris* | alpha*-osf*) flag="-D_REENTRANT";; -- esac -- AC_MSG_RESULT(${flag}) -- if test "x$flag" != xno; then -- PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" -- fi -+# Global variables: -+default_ofile=libtool -+can_build_shared=yes - -- LIBS="$save_LIBS" -- CFLAGS="$save_CFLAGS" -+# All known linkers require a `.a' archive for static linking (except MSVC, -+# which needs '.lib'). -+libext=a -+ltmain="$ac_aux_dir/ltmain.sh" -+ofile="$default_ofile" -+with_gnu_ld="$lt_cv_prog_gnu_ld" - -- # More AIX lossage: must compile with cc_r -- AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC}) --else -- PTHREAD_CC="$CC" --fi -+AC_CHECK_TOOL(AR, ar, false) -+AC_CHECK_TOOL(RANLIB, ranlib, :) -+AC_CHECK_TOOL(STRIP, strip, :) - --AC_SUBST(PTHREAD_LIBS) --AC_SUBST(PTHREAD_CFLAGS) --AC_SUBST(PTHREAD_CC) -+old_CC="$CC" -+old_CFLAGS="$CFLAGS" - --# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: --if test x"$acx_pthread_ok" = xyes; then -- ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) -- : --else -- acx_pthread_ok=no -- $2 --fi -+# Set sane defaults for various variables -+test -z "$AR" && AR=ar -+test -z "$AR_FLAGS" && AR_FLAGS=cru -+test -z "$AS" && AS=as -+test -z "$CC" && CC=cc -+test -z "$LTCC" && LTCC=$CC -+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+test -z "$LD" && LD=ld -+test -z "$LN_S" && LN_S="ln -s" -+test -z "$MAGIC_CMD" && MAGIC_CMD=file -+test -z "$NM" && NM=nm -+test -z "$SED" && SED=sed -+test -z "$OBJDUMP" && OBJDUMP=objdump -+test -z "$RANLIB" && RANLIB=: -+test -z "$STRIP" && STRIP=: -+test -z "$ac_objext" && ac_objext=o - --])dnl ACX_PTHREAD -+# Determine commands to create old-style static archives. -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -+old_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= - -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ ;; -+ *) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+fi - -+_LT_CC_BASENAME([$compiler]) - --dnl @synopsis AC_PROG_CC_WARNINGS([ANSI]) --dnl --dnl Enables a reasonable set of warnings for the C compiler. Optionally, --dnl if the first argument is nonempty, turns on flags which enforce and/or --dnl enable proper ANSI C if such flags are known to the compiler used. --dnl --dnl Currently this macro knows about GCC, Solaris C compiler, --dnl Digital Unix C compiler, C for AIX Compiler, HP-UX C compiler, --dnl and IRIX C compiler. --dnl --dnl @version $Id: acinclude.m4,v 1.2 2001/12/21 03:12:50 robs Exp $ --dnl @author Ville Laurikari --dnl --AC_DEFUN([AC_PROG_CC_WARNINGS], [ -- ansi=$1 -- if test -z "$ansi"; then -- msg="for C compiler warning flags" -- else -- msg="for C compiler warning and ANSI conformance flags" -+# Only perform the check for file, if the check method requires it -+case $deplibs_check_method in -+file_magic*) -+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then -+ AC_PATH_MAGIC - fi -- AC_CACHE_CHECK($msg, ac_cv_prog_cc_warnings, [ -- if test -n "$CC"; then -- cat > conftest.c <&1 | grep "Xc.*strict ANSI C" > /dev/null 2>&1 && -- $CC -c -v -Xc conftest.c > /dev/null 2>&1 && -- test -f conftest.o; then -- if test -z "$ansi"; then -- ac_cv_prog_cc_warnings="-v" -- else -- ac_cv_prog_cc_warnings="-v -Xc" -- fi -+AC_ARG_ENABLE([libtool-lock], -+ [AC_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -- dnl HP-UX C compiler -- elif $CC > /dev/null 2>&1 && -- $CC -c -Aa +w1 conftest.c > /dev/null 2>&1 && -- test -f conftest.o; then -- if test -z "$ansi"; then -- ac_cv_prog_cc_warnings="+w1" -- else -- ac_cv_prog_cc_warnings="+w1 -Aa" -- fi -+AC_ARG_WITH([pic], -+ [AC_HELP_STRING([--with-pic], -+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -+ [pic_mode="$withval"], -+ [pic_mode=default]) -+test -z "$pic_mode" && pic_mode=default - -- dnl Digital Unix C compiler -- elif ! $CC > /dev/null 2>&1 && -- $CC -c -verbose -w0 -warnprotos -std1 conftest.c > /dev/null 2>&1 && -- test -f conftest.o; then -- if test -z "$ansi"; then -- ac_cv_prog_cc_warnings="-verbose -w0 -warnprotos" -- else -- ac_cv_prog_cc_warnings="-verbose -w0 -warnprotos -std1" -- fi -+# Use C for the default configuration in the libtool script -+tagname= -+AC_LIBTOOL_LANG_C_CONFIG -+_LT_AC_TAGCONFIG -+])# AC_LIBTOOL_SETUP - -- dnl C for AIX Compiler -- elif $CC > /dev/null 2>&1 | grep AIX > /dev/null 2>&1 && -- $CC -c -qlanglvl=ansi -qinfo=all conftest.c > /dev/null 2>&1 && -- test -f conftest.o; then -- if test -z "$ansi"; then -- ac_cv_prog_cc_warnings="-qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" -- else -- ac_cv_prog_cc_warnings="-qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd -qlanglvl=ansi" -- fi - -- dnl IRIX C compiler -- elif $CC -fullwarn -ansi -ansiE > /dev/null 2>&1 && -- test -f conftest.o; then -- if test -z "$ansi"; then -- ac_cv_prog_cc_warnings="-fullwarn" -- else -- ac_cv_prog_cc_warnings="-fullwarn -ansi -ansiE" -- fi -+# _LT_AC_SYS_COMPILER -+# ------------------- -+AC_DEFUN([_LT_AC_SYS_COMPILER], -+[AC_REQUIRE([AC_PROG_CC])dnl - -- fi -- rm -f conftest.* -- fi -- if test -n "$ac_cv_prog_cc_warnings"; then -- CFLAGS="$CFLAGS $ac_cv_prog_cc_warnings" -- else -- ac_cv_prog_cc_warnings="unknown" -- fi -- ]) --]) -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} - -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -+# Allow CC to be a program name with arguments. -+compiler=$CC -+])# _LT_AC_SYS_COMPILER - --# Do all the work for Automake. This macro actually does too much -- --# some checks are only needed if your package does certain things. --# But this isn't really a big deal. - --# serial 5 -+# _LT_CC_BASENAME(CC) -+# ------------------- -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+AC_DEFUN([_LT_CC_BASENAME], -+[for cc_temp in $1""; do -+ case $cc_temp in -+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+]) - --# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be --# written in clear, in which case automake, when reading aclocal.m4, --# will think it sees a *use*, and therefore will trigger all it's --# C support machinery. Also note that it means that autoscan, seeing --# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - -+# _LT_COMPILER_BOILERPLATE -+# ------------------------ -+# Check for compiler boilerplate output or warnings with -+# the simple compiler test code. -+AC_DEFUN([_LT_COMPILER_BOILERPLATE], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+])# _LT_COMPILER_BOILERPLATE -+ -+ -+# _LT_LINKER_BOILERPLATE -+# ---------------------- -+# Check for linker boilerplate output or warnings with -+# the simple link test code. -+AC_DEFUN([_LT_LINKER_BOILERPLATE], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+])# _LT_LINKER_BOILERPLATE -+ -+ -+# _LT_AC_SYS_LIBPATH_AIX -+# ---------------------- -+# Links a minimal program and checks the executable -+# for the system default hardcoded library path. In most cases, -+# this is /usr/lib:/lib, but when the MPI compilers are used -+# the location of the communication and MPI libs are included too. -+# If we don't find anything, use the default library path according -+# to the aix ld manual. -+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi],[]) -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+])# _LT_AC_SYS_LIBPATH_AIX -+ -+ -+# _LT_AC_SHELL_INIT(ARG) -+# ---------------------- -+AC_DEFUN([_LT_AC_SHELL_INIT], -+[ifdef([AC_DIVERSION_NOTICE], -+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -+ [AC_DIVERT_PUSH(NOTICE)]) -+$1 -+AC_DIVERT_POP -+])# _LT_AC_SHELL_INIT - --# We require 2.13 because we rely on SHELL being computed by configure. --AC_PREREQ([2.13]) - --# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) --# ----------------------------------------------------------- --# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED. --# The purpose of this macro is to provide the user with a means to --# check macros which are provided without letting her know how the --# information is coded. --# If this macro is not defined by Autoconf, define it here. --ifdef([AC_PROVIDE_IFELSE], -- [], -- [define([AC_PROVIDE_IFELSE], -- [ifdef([AC_PROVIDE_$1], -- [$2], [$3])])]) -+# _LT_AC_PROG_ECHO_BACKSLASH -+# -------------------------- -+# Add some code to the start of the generated configure script which -+# will find an echo command which doesn't interpret backslashes. -+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -+[_LT_AC_SHELL_INIT([ -+# Check that we are running under the correct shell. -+SHELL=${CONFIG_SHELL-/bin/sh} - -+case X$ECHO in -+X*--fallback-echo) -+ # Remove one level of quotation (which was required for Make). -+ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` -+ ;; -+esac - --# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) --# ---------------------------------------------- --AC_DEFUN([AM_INIT_AUTOMAKE], --[AC_REQUIRE([AC_PROG_INSTALL])dnl --# test to see if srcdir already configured --if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && -- test -f $srcdir/config.status; then -- AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) -+echo=${ECHO-echo} -+if test "X[$]1" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+elif test "X[$]1" = X--fallback-echo; then -+ # Avoid inline document here, it may be left over -+ : -+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then -+ # Yippee, $echo works! -+ : -+else -+ # Restart under the correct shell. -+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} - fi - --# Define the identity of the package. --PACKAGE=$1 --AC_SUBST(PACKAGE)dnl --VERSION=$2 --AC_SUBST(VERSION)dnl --ifelse([$3],, --[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) --AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) -+if test "X[$]1" = X--fallback-echo; then -+ # used as fallback echo -+ shift -+ cat </dev/null 2>&1 && unset CDPATH - --# Some tools Automake needs. --AC_REQUIRE([AM_SANITY_CHECK])dnl --AC_REQUIRE([AC_ARG_PROGRAM])dnl --AM_MISSING_PROG(ACLOCAL, aclocal) --AM_MISSING_PROG(AUTOCONF, autoconf) --AM_MISSING_PROG(AUTOMAKE, automake) --AM_MISSING_PROG(AUTOHEADER, autoheader) --AM_MISSING_PROG(MAKEINFO, makeinfo) --AM_MISSING_PROG(AMTAR, tar) --AM_PROG_INSTALL_SH --AM_PROG_INSTALL_STRIP --# We need awk for the "check" target. The system "awk" is bad on --# some platforms. --AC_REQUIRE([AC_PROG_AWK])dnl --AC_REQUIRE([AC_PROG_MAKE_SET])dnl --AC_REQUIRE([AM_DEP_TRACK])dnl --AC_REQUIRE([AM_SET_DEPDIR])dnl --AC_PROVIDE_IFELSE([AC_PROG_][CC], -- [_AM_DEPENDENCIES(CC)], -- [define([AC_PROG_][CC], -- defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl --AC_PROVIDE_IFELSE([AC_PROG_][CXX], -- [_AM_DEPENDENCIES(CXX)], -- [define([AC_PROG_][CXX], -- defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl --]) -+if test -z "$ECHO"; then -+if test "X${echo_test_string+set}" != Xset; then -+# find a string as large as possible, as long as the shell can cope with it -+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do -+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -+ if (echo_test_string=`eval $cmd`) 2>/dev/null && -+ echo_test_string=`eval $cmd` && -+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null -+ then -+ break -+ fi -+ done -+fi - --# --# Check to make sure that the build environment is sane. --# -+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ : -+else -+ # The Solaris, AIX, and Digital Unix default echo programs unquote -+ # backslashes. This makes it impossible to quote backslashes using -+ # echo "$something" | sed 's/\\/\\\\/g' -+ # -+ # So, first we look for a working echo in the user's PATH. - --# serial 3 -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for dir in $PATH /usr/ucb; do -+ IFS="$lt_save_ifs" -+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ echo="$dir/echo" -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" - --# AM_SANITY_CHECK --# --------------- --AC_DEFUN([AM_SANITY_CHECK], --[AC_MSG_CHECKING([whether build environment is sane]) --# Just in case --sleep 1 --echo timestamp > conftest.file --# Do `set' in a subshell so we don't clobber the current shell's --# arguments. Must try -L first in case configure is actually a --# symlink; some systems play weird games with the mod time of symlinks --# (eg FreeBSD returns the mod time of the symlink's containing --# directory). --if ( -- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -- if test "$[*]" = "X"; then -- # -L didn't work. -- set X `ls -t $srcdir/configure conftest.file` -+ if test "X$echo" = Xecho; then -+ # We didn't find a better echo, so look for alternatives. -+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # This shell has a builtin print -r that does the trick. -+ echo='print -r' -+ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && -+ test "X$CONFIG_SHELL" != X/bin/ksh; then -+ # If we have ksh, try running configure again with it. -+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -+ export ORIGINAL_CONFIG_SHELL -+ CONFIG_SHELL=/bin/ksh -+ export CONFIG_SHELL -+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} -+ else -+ # Try using printf. -+ echo='printf %s\n' -+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # Cool, printf works -+ : -+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -+ export CONFIG_SHELL -+ SHELL="$CONFIG_SHELL" -+ export SHELL -+ echo="$CONFIG_SHELL [$]0 --fallback-echo" -+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ echo="$CONFIG_SHELL [$]0 --fallback-echo" -+ else -+ # maybe with a smaller string... -+ prev=: -+ -+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do -+ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null -+ then -+ break -+ fi -+ prev="$cmd" -+ done -+ -+ if test "$prev" != 'sed 50q "[$]0"'; then -+ echo_test_string=`eval $prev` -+ export echo_test_string -+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} -+ else -+ # Oops. We lost completely, so just stick with echo. -+ echo=echo -+ fi -+ fi -+ fi -+ fi -+fi -+fi -+ -+# Copy echo and quote the copy suitably for passing to libtool from -+# the Makefile, instead of quoting the original, which is used later. -+ECHO=$echo -+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then -+ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -+fi -+ -+AC_SUBST(ECHO) -+])])# _LT_AC_PROG_ECHO_BACKSLASH -+ -+ -+# _LT_AC_LOCK -+# ----------- -+AC_DEFUN([_LT_AC_LOCK], -+[AC_ARG_ENABLE([libtool-lock], -+ [AC_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+# Some flags need to be propagated to the compiler or linker for good -+# libtool support. -+case $host in -+ia64-*-hpux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *ELF-32*) -+ HPUX_IA64_MODE="32" -+ ;; -+ *ELF-64*) -+ HPUX_IA64_MODE="64" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -melf32bsmip" -+ ;; -+ *N32*) -+ LD="${LD-ld} -melf32bmipn32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -melf64bmip" -+ ;; -+ esac -+ else -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac - fi -- rm -f conftest.file -- if test "$[*]" != "X $srcdir/configure conftest.file" \ -- && test "$[*]" != "X conftest.file $srcdir/configure"; then -+ fi -+ rm -rf conftest* -+ ;; -+ -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+s390*-*linux*|sparc*-*linux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.o` in -+ *32-bit*) -+ case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_i386_fbsd" -+ ;; -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_i386" -+ ;; -+ ppc64-*linux*|powerpc64-*linux*) -+ LD="${LD-ld} -m elf32ppclinux" -+ ;; -+ s390x-*linux*) -+ LD="${LD-ld} -m elf_s390" -+ ;; -+ sparc64-*linux*) -+ LD="${LD-ld} -m elf32_sparc" -+ ;; -+ esac -+ ;; -+ *64-bit*) -+ case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_x86_64_fbsd" -+ ;; -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_x86_64" -+ ;; -+ ppc*-*linux*|powerpc*-*linux*) -+ LD="${LD-ld} -m elf64ppc" -+ ;; -+ s390*-*linux*) -+ LD="${LD-ld} -m elf64_s390" -+ ;; -+ sparc*-*linux*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ -+*-*-sco3.2v5*) -+ # On SCO OpenServer 5, we need -belf to get full-featured binaries. -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -belf" -+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, -+ [AC_LANG_PUSH(C) -+ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -+ AC_LANG_POP]) -+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -+ CFLAGS="$SAVE_CFLAGS" -+ fi -+ ;; -+sparc*-*solaris*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.o` in -+ *64-bit*) -+ case $lt_cv_prog_gnu_ld in -+ yes*) LD="${LD-ld} -m elf64_sparc" ;; -+ *) LD="${LD-ld} -64" ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ -+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -+[*-*-cygwin* | *-*-mingw* | *-*-pw32*) -+ AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+ AC_CHECK_TOOL(AS, as, false) -+ AC_CHECK_TOOL(OBJDUMP, objdump, false) -+ ;; -+ ]) -+esac -+ -+need_locks="$enable_libtool_lock" -+ -+])# _LT_AC_LOCK -+ -+ -+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ---------------------------------------------------------------- -+# Check whether the given compiler option works -+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -+[AC_REQUIRE([LT_AC_PROG_SED]) -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$3" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ fi -+ $rm conftest* -+]) -+ -+if test x"[$]$2" = xyes; then -+ ifelse([$5], , :, [$5]) -+else -+ ifelse([$6], , :, [$6]) -+fi -+])# AC_LIBTOOL_COMPILER_OPTION -+ -+ -+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ------------------------------------------------------------ -+# Check whether the given compiler option works -+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $3" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&AS_MESSAGE_LOG_FD -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ else -+ $2=yes -+ fi -+ fi -+ $rm conftest* -+ LDFLAGS="$save_LDFLAGS" -+]) -+ -+if test x"[$]$2" = xyes; then -+ ifelse([$4], , :, [$4]) -+else -+ ifelse([$5], , :, [$5]) -+fi -+])# AC_LIBTOOL_LINKER_OPTION -+ -+ -+# AC_LIBTOOL_SYS_MAX_CMD_LEN -+# -------------------------- -+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -+[# find the maximum length of command line arguments -+AC_MSG_CHECKING([the maximum length of command line arguments]) -+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl -+ i=0 -+ teststring="ABCD" -+ -+ case $build_os in -+ msdosdjgpp*) -+ # On DJGPP, this test can blow up pretty badly due to problems in libc -+ # (any single argument exceeding 2000 bytes causes a buffer overrun -+ # during glob expansion). Even if it were fixed, the result of this -+ # check would be larger than it should be. -+ lt_cv_sys_max_cmd_len=12288; # 12K is about right -+ ;; -+ -+ gnu*) -+ # Under GNU Hurd, this test is not required because there is -+ # no limit to the length of command line arguments. -+ # Libtool will interpret -1 as no limit whatsoever -+ lt_cv_sys_max_cmd_len=-1; -+ ;; -+ -+ cygwin* | mingw*) -+ # On Win9x/ME, this test blows up -- it succeeds, but takes -+ # about 5 minutes as the teststring grows exponentially. -+ # Worse, since 9x/ME are not pre-emptively multitasking, -+ # you end up with a "frozen" computer, even though with patience -+ # the test eventually succeeds (with a max line length of 256k). -+ # Instead, let's just punt: use the minimum linelength reported by -+ # all of the supported platforms: 8192 (on NT/2K/XP). -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ amigaos*) -+ # On AmigaOS with pdksh, this test takes hours, literally. -+ # So we just punt and use a minimum line length of 8192. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -+ fi -+ # And add a safety zone -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ ;; -+ -+ interix*) -+ # We know the value 262144 and hardcode it with a safety zone (like BSD) -+ lt_cv_sys_max_cmd_len=196608 -+ ;; -+ -+ osf*) -+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -+ # nice to cause kernel panics so lets avoid the loop below. -+ # First set a reasonable default. -+ lt_cv_sys_max_cmd_len=16384 -+ # -+ if test -x /sbin/sysconfig; then -+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -+ *1*) lt_cv_sys_max_cmd_len=-1 ;; -+ esac -+ fi -+ ;; -+ sco3.2v5*) -+ lt_cv_sys_max_cmd_len=102400 -+ ;; -+ sysv5* | sco5v6* | sysv4.2uw2*) -+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -+ if test -n "$kargmax"; then -+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` -+ else -+ lt_cv_sys_max_cmd_len=32768 -+ fi -+ ;; -+ *) -+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -+ if test -n "$lt_cv_sys_max_cmd_len"; then -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ else -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ = "XX$teststring") >/dev/null 2>&1 && -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ teststring= -+ # Add a significant safety factor because C++ compilers can tack on massive -+ # amounts of additional arguments before passing them to the linker. -+ # It appears as though 1/2 is a usable value. -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ fi -+ ;; -+ esac -+]) -+if test -n $lt_cv_sys_max_cmd_len ; then -+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -+else -+ AC_MSG_RESULT(none) -+fi -+])# AC_LIBTOOL_SYS_MAX_CMD_LEN -+ -+ -+# _LT_AC_CHECK_DLFCN -+# ------------------ -+AC_DEFUN([_LT_AC_CHECK_DLFCN], -+[AC_CHECK_HEADERS(dlfcn.h)dnl -+])# _LT_AC_CHECK_DLFCN -+ -+ -+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -+# --------------------------------------------------------------------- -+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -+if test "$cross_compiling" = yes; then : -+ [$4] -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext < -+#endif -+ -+#include -+ -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif -+ -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+#ifdef __cplusplus -+extern "C" void exit (int); -+#endif -+ -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; -+ -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ else -+ puts (dlerror ()); -+ -+ exit (status); -+}] -+EOF -+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) $1 ;; -+ x$lt_dlneed_uscore) $2 ;; -+ x$lt_dlunknown|x*) $3 ;; -+ esac -+ else : -+ # compilation failed -+ $3 -+ fi -+fi -+rm -fr conftest* -+])# _LT_AC_TRY_DLOPEN_SELF -+ -+ -+# AC_LIBTOOL_DLOPEN_SELF -+# ---------------------- -+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -+if test "x$enable_dlopen" != xyes; then -+ enable_dlopen=unknown -+ enable_dlopen_self=unknown -+ enable_dlopen_self_static=unknown -+else -+ lt_cv_dlopen=no -+ lt_cv_dlopen_libs= -+ -+ case $host_os in -+ beos*) -+ lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ;; -+ -+ mingw* | pw32*) -+ lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ cygwin*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ darwin*) -+ # if libdl is installed we need to link against it -+ AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ -+ lt_cv_dlopen="dyld" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ]) -+ ;; -+ -+ *) -+ AC_CHECK_FUNC([shl_load], -+ [lt_cv_dlopen="shl_load"], -+ [AC_CHECK_LIB([dld], [shl_load], -+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], -+ [AC_CHECK_FUNC([dlopen], -+ [lt_cv_dlopen="dlopen"], -+ [AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], -+ [AC_CHECK_LIB([svld], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], -+ [AC_CHECK_LIB([dld], [dld_link], -+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ;; -+ esac -+ -+ if test "x$lt_cv_dlopen" != xno; then -+ enable_dlopen=yes -+ else -+ enable_dlopen=no -+ fi -+ -+ case $lt_cv_dlopen in -+ dlopen) -+ save_CPPFLAGS="$CPPFLAGS" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ -+ save_LDFLAGS="$LDFLAGS" -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+ -+ save_LIBS="$LIBS" -+ LIBS="$lt_cv_dlopen_libs $LIBS" -+ -+ AC_CACHE_CHECK([whether a program can dlopen itself], -+ lt_cv_dlopen_self, [dnl -+ _LT_AC_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, -+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) -+ ]) -+ -+ if test "x$lt_cv_dlopen_self" = xyes; then -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], -+ lt_cv_dlopen_self_static, [dnl -+ _LT_AC_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, -+ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) -+ ]) -+ fi -+ -+ CPPFLAGS="$save_CPPFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ esac -+ -+ case $lt_cv_dlopen_self in -+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -+ *) enable_dlopen_self=unknown ;; -+ esac -+ -+ case $lt_cv_dlopen_self_static in -+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -+ *) enable_dlopen_self_static=unknown ;; -+ esac -+fi -+])# AC_LIBTOOL_DLOPEN_SELF -+ -+ -+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) -+# --------------------------------- -+# Check to see if options -c and -o are simultaneously supported by compiler -+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], -+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], -+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ fi -+ fi -+ chmod u+w . 2>&AS_MESSAGE_LOG_FD -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* -+]) -+])# AC_LIBTOOL_PROG_CC_C_O -+ -+ -+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -+# ----------------------------------------- -+# Check to see if we can do hard links to lock some files if needed -+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -+[AC_REQUIRE([_LT_AC_LOCK])dnl -+ -+hard_links="nottested" -+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ AC_MSG_CHECKING([if we can lock with hard links]) -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ AC_MSG_RESULT([$hard_links]) -+ if test "$hard_links" = no; then -+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi -+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS -+ -+ -+# AC_LIBTOOL_OBJDIR -+# ----------------- -+AC_DEFUN([AC_LIBTOOL_OBJDIR], -+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -+[rm -f .libs 2>/dev/null -+mkdir .libs 2>/dev/null -+if test -d .libs; then -+ lt_cv_objdir=.libs -+else -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs -+fi -+rmdir .libs 2>/dev/null]) -+objdir=$lt_cv_objdir -+])# AC_LIBTOOL_OBJDIR -+ -+ -+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -+# ---------------------------------------------- -+# Check hardcoding attributes. -+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], -+[AC_MSG_CHECKING([how to hardcode library paths into programs]) -+_LT_AC_TAGVAR(hardcode_action, $1)= -+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ -+ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ -+ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then -+ -+ # We can hardcode non-existant directories. -+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && -+ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then -+ # Linking always hardcodes the temporary library directory. -+ _LT_AC_TAGVAR(hardcode_action, $1)=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ _LT_AC_TAGVAR(hardcode_action, $1)=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported -+fi -+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) -+ -+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH -+ -+ -+# AC_LIBTOOL_SYS_LIB_STRIP -+# ------------------------ -+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], -+[striplib= -+old_striplib= -+AC_MSG_CHECKING([whether stripping libraries is possible]) -+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ AC_MSG_RESULT([yes]) -+else -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ old_striplib="$STRIP -S" -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+fi -+ ;; -+ *) -+ AC_MSG_RESULT([no]) -+ ;; -+ esac -+fi -+])# AC_LIBTOOL_SYS_LIB_STRIP -+ -+ -+# AC_LIBTOOL_SYS_DYNAMIC_LINKER -+# ----------------------------- -+# PORTME Fill in your ld.so characteristics -+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_MSG_CHECKING([dynamic linker characteristics]) -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+m4_if($1,[],[ -+if test "$GCC" = yes; then -+ case $host_os in -+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; -+ *) lt_awk_arg="/^libraries:/" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[[lt_foo]]++; } -+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`echo $lt_search_path_spec` -+else -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi]) -+need_lib_prefix=unknown -+hardcode_into_libs=no -+ -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown -+ -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH -+ -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ -+aix4* | aix5*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[[01]] | aix4.[[01]].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib.so -+ # instead of lib.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; -+ -+amigaos*) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; -+ -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; -+ -+bsdi[[45]]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; -+ -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no -+ -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $rm \$dlpath' -+ shlibpath_overrides_runpath=yes -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; -+ -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; -+ -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ m4_if([$1], [],[ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; -+ -+dgux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+freebsd1*) -+ dynamic_linker=no -+ ;; -+ -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[[123]]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[[01]]* | freebsdelf3.[[01]]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ -+ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; -+ -+gnu*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ ;; -+ -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case $host_cpu in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; -+ -+interix[[3-9]]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; -+ -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; -+ -+# This must be Linux ELF. -+linux* | k*bsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes -+ -+ # Append ld.so.conf contents to the search path -+ if test -f /etc/ld.so.conf; then -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ fi -+ -+ # We used to test for /lib/ld.so.1 and disable shared libraries on -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ ;; -+ -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+nto-qnx*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+openbsd*) -+ version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[[89]] | openbsd2.[[89]].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; -+ -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; -+ -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; -+ -+rdos*) -+ dynamic_linker=no -+ ;; -+ -+solaris*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; -+ -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; -+ -+sysv4 | sysv4.3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; -+ -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+*) -+ dynamic_linker=no -+ ;; -+esac -+AC_MSG_RESULT([$dynamic_linker]) -+test "$dynamic_linker" = no && can_build_shared=no -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER -+ -+ -+# _LT_AC_TAGCONFIG -+# ---------------- -+AC_DEFUN([_LT_AC_TAGCONFIG], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_ARG_WITH([tags], -+ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], -+ [include additional configurations @<:@automatic@:>@])], -+ [tagnames="$withval"]) -+ -+if test -f "$ltmain" && test -n "$tagnames"; then -+ if test ! -f "${ofile}"; then -+ AC_MSG_WARN([output file `$ofile' does not exist]) -+ fi -+ -+ if test -z "$LTCC"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCC='`" -+ if test -z "$LTCC"; then -+ AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) -+ else -+ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) -+ fi -+ fi -+ if test -z "$LTCFLAGS"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" -+ fi -+ -+ # Extract list of available tagged configurations in $ofile. -+ # Note that this assumes the entire list is on one line. -+ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` -+ -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for tagname in $tagnames; do -+ IFS="$lt_save_ifs" -+ # Check whether tagname contains only valid characters -+ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in -+ "") ;; -+ *) AC_MSG_ERROR([invalid tag name: $tagname]) -+ ;; -+ esac -+ -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null -+ then -+ AC_MSG_ERROR([tag name \"$tagname\" already exists]) -+ fi -+ -+ # Update the list of available tags. -+ if test -n "$tagname"; then -+ echo appending configuration tag \"$tagname\" to $ofile -+ -+ case $tagname in -+ CXX) -+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_LIBTOOL_LANG_CXX_CONFIG -+ else -+ tagname="" -+ fi -+ ;; -+ -+ F77) -+ if test -n "$F77" && test "X$F77" != "Xno"; then -+ AC_LIBTOOL_LANG_F77_CONFIG -+ else -+ tagname="" -+ fi -+ ;; -+ -+ GCJ) -+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then -+ AC_LIBTOOL_LANG_GCJ_CONFIG -+ else -+ tagname="" -+ fi -+ ;; -+ -+ RC) -+ AC_LIBTOOL_LANG_RC_CONFIG -+ ;; -+ -+ *) -+ AC_MSG_ERROR([Unsupported tag name: $tagname]) -+ ;; -+ esac -+ -+ # Append the new tag name to the list of available tags. -+ if test -n "$tagname" ; then -+ available_tags="$available_tags $tagname" -+ fi -+ fi -+ done -+ IFS="$lt_save_ifs" -+ -+ # Now substitute the updated list of available tags. -+ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then -+ mv "${ofile}T" "$ofile" -+ chmod +x "$ofile" -+ else -+ rm -f "${ofile}T" -+ AC_MSG_ERROR([unable to update list of available tagged configurations.]) -+ fi -+fi -+])# _LT_AC_TAGCONFIG -+ -+ -+# AC_LIBTOOL_DLOPEN -+# ----------------- -+# enable checks for dlopen support -+AC_DEFUN([AC_LIBTOOL_DLOPEN], -+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) -+])# AC_LIBTOOL_DLOPEN -+ -+ -+# AC_LIBTOOL_WIN32_DLL -+# -------------------- -+# declare package support for building win32 DLLs -+AC_DEFUN([AC_LIBTOOL_WIN32_DLL], -+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) -+])# AC_LIBTOOL_WIN32_DLL -+ -+ -+# AC_ENABLE_SHARED([DEFAULT]) -+# --------------------------- -+# implement the --enable-shared flag -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+AC_DEFUN([AC_ENABLE_SHARED], -+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -+AC_ARG_ENABLE([shared], -+ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], -+ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_shared=yes ;; -+ no) enable_shared=no ;; -+ *) -+ enable_shared=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_shared=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_shared=]AC_ENABLE_SHARED_DEFAULT) -+])# AC_ENABLE_SHARED -+ -+ -+# AC_DISABLE_SHARED -+# ----------------- -+# set the default shared flag to --disable-shared -+AC_DEFUN([AC_DISABLE_SHARED], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+AC_ENABLE_SHARED(no) -+])# AC_DISABLE_SHARED -+ -+ -+# AC_ENABLE_STATIC([DEFAULT]) -+# --------------------------- -+# implement the --enable-static flag -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+AC_DEFUN([AC_ENABLE_STATIC], -+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -+AC_ARG_ENABLE([static], -+ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], -+ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_static=yes ;; -+ no) enable_static=no ;; -+ *) -+ enable_static=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_static=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_static=]AC_ENABLE_STATIC_DEFAULT) -+])# AC_ENABLE_STATIC -+ -+ -+# AC_DISABLE_STATIC -+# ----------------- -+# set the default static flag to --disable-static -+AC_DEFUN([AC_DISABLE_STATIC], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+AC_ENABLE_STATIC(no) -+])# AC_DISABLE_STATIC -+ -+ -+# AC_ENABLE_FAST_INSTALL([DEFAULT]) -+# --------------------------------- -+# implement the --enable-fast-install flag -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+AC_DEFUN([AC_ENABLE_FAST_INSTALL], -+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -+AC_ARG_ENABLE([fast-install], -+ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], -+ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_fast_install=yes ;; -+ no) enable_fast_install=no ;; -+ *) -+ enable_fast_install=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_fast_install=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) -+])# AC_ENABLE_FAST_INSTALL -+ -+ -+# AC_DISABLE_FAST_INSTALL -+# ----------------------- -+# set the default to --disable-fast-install -+AC_DEFUN([AC_DISABLE_FAST_INSTALL], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+AC_ENABLE_FAST_INSTALL(no) -+])# AC_DISABLE_FAST_INSTALL -+ -+ -+# AC_LIBTOOL_PICMODE([MODE]) -+# -------------------------- -+# implement the --with-pic flag -+# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -+AC_DEFUN([AC_LIBTOOL_PICMODE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+pic_mode=ifelse($#,1,$1,default) -+])# AC_LIBTOOL_PICMODE -+ -+ -+# AC_PROG_EGREP -+# ------------- -+# This is predefined starting with Autoconf 2.54, so this conditional -+# definition can be removed once we require Autoconf 2.54 or later. -+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], -+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], -+ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -+ then ac_cv_prog_egrep='grep -E' -+ else ac_cv_prog_egrep='egrep' -+ fi]) -+ EGREP=$ac_cv_prog_egrep -+ AC_SUBST([EGREP]) -+])]) -+ -+ -+# AC_PATH_TOOL_PREFIX -+# ------------------- -+# find a file program which can recognize shared library -+AC_DEFUN([AC_PATH_TOOL_PREFIX], -+[AC_REQUIRE([AC_PROG_EGREP])dnl -+AC_MSG_CHECKING([for $1]) -+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -+[case $MAGIC_CMD in -+[[\\/*] | ?:[\\/]*]) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+dnl $ac_dummy forces splitting on constant user-supplied paths. -+dnl POSIX.2 word splitting is done only on the output of word expansions, -+dnl not every word. This closes a longstanding sh security hole. -+ ac_dummy="ifelse([$2], , $PATH, [$2])" -+ for ac_dir in $ac_dummy; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$1; then -+ lt_cv_path_MAGIC_CMD="$ac_dir/$1" -+ if test -n "$file_magic_test_file"; then -+ case $deplibs_check_method in -+ "file_magic "*) -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ : -+ else -+ cat <&2 -+ -+*** Warning: the command libtool uses to detect shared libraries, -+*** $file_magic_cmd, produces output that libtool cannot recognize. -+*** The result is that libtool may fail to recognize shared libraries -+*** as such. This will affect the creation of libtool libraries that -+*** depend on shared libraries, but programs linked with such libtool -+*** libraries will work regardless of this problem. Nevertheless, you -+*** may want to report the problem to your system manager and/or to -+*** bug-libtool@gnu.org -+ -+EOF -+ fi ;; -+ esac -+ fi -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ MAGIC_CMD="$lt_save_MAGIC_CMD" -+ ;; -+esac]) -+MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+if test -n "$MAGIC_CMD"; then -+ AC_MSG_RESULT($MAGIC_CMD) -+else -+ AC_MSG_RESULT(no) -+fi -+])# AC_PATH_TOOL_PREFIX -+ -+ -+# AC_PATH_MAGIC -+# ------------- -+# find a file program which can recognize a shared library -+AC_DEFUN([AC_PATH_MAGIC], -+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -+if test -z "$lt_cv_path_MAGIC_CMD"; then -+ if test -n "$ac_tool_prefix"; then -+ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) -+ else -+ MAGIC_CMD=: -+ fi -+fi -+])# AC_PATH_MAGIC - -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken --alias in your environment]) -- fi - -- test "$[2]" = conftest.file -- ) --then -- # Ok. -- : -+# AC_PROG_LD -+# ---------- -+# find the pathname to the GNU or non-GNU linker -+AC_DEFUN([AC_PROG_LD], -+[AC_ARG_WITH([gnu-ld], -+ [AC_HELP_STRING([--with-gnu-ld], -+ [assume the C compiler uses GNU ld @<:@default=no@:>@])], -+ [test "$withval" = no || with_gnu_ld=yes], -+ [with_gnu_ld=no]) -+AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+ac_prog=ld -+if test "$GCC" = yes; then -+ # Check if gcc -print-prog-name=ld gives a path. -+ AC_MSG_CHECKING([for ld used by $CC]) -+ case $host in -+ *-*-mingw*) -+ # gcc leaves a trailing carriage return which upsets mingw -+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -+ *) -+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $ac_prog in -+ # Accept absolute paths. -+ [[\\/]]* | ?:[[\\/]]*) -+ re_direlt='/[[^/]][[^/]]*/\.\./' -+ # Canonicalize the pathname of ld -+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` -+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` -+ done -+ test -z "$LD" && LD="$ac_prog" -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ac_prog=ld -+ ;; -+ *) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown -+ ;; -+ esac -+elif test "$with_gnu_ld" = yes; then -+ AC_MSG_CHECKING([for GNU ld]) - else -- AC_MSG_ERROR([newly created file is older than distributed files! --Check your system clock]) -+ AC_MSG_CHECKING([for non-GNU ld]) - fi --AC_MSG_RESULT(yes)]) -+AC_CACHE_VAL(lt_cv_path_LD, -+[if test -z "$LD"; then -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ lt_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some variants of GNU ld only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ else -+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ fi -+ ;; -+ -+darwin* | rhapsody*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+freebsd* | dragonfly*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -+ case $host_cpu in -+ i*86 ) -+ # Not sure whether the presence of OpenBSD here was a mistake. -+ # Let's accept both of them until this is cleared up. -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -+ ;; -+ esac -+ else -+ lt_cv_deplibs_check_method=pass_all -+ fi -+ ;; - --# serial 4 -*- Autoconf -*- -+gnu*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+hpux10.20* | hpux11*) -+ lt_cv_file_magic_cmd=/usr/bin/file -+ case $host_cpu in -+ ia64*) -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' -+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -+ ;; -+ hppa*64*) -+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] -+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl -+ ;; -+ *) -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' -+ lt_cv_file_magic_test_file=/usr/lib/libc.sl -+ ;; -+ esac -+ ;; -+ -+interix[[3-9]]*) -+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $LD in -+ *-32|*"-32 ") libmagic=32-bit;; -+ *-n32|*"-n32 ") libmagic=N32;; -+ *-64|*"-64 ") libmagic=64-bit;; -+ *) libmagic=never-match;; -+ esac -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+# This must be Linux ELF. -+linux* | k*bsd*-gnu) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -+ else -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' -+ fi -+ ;; -+ -+newos6*) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=/usr/lib/libnls.so -+ ;; - -+nto-qnx*) -+ lt_cv_deplibs_check_method=unknown -+ ;; - -+openbsd*) -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' -+ else -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -+ fi -+ ;; - --# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be --# written in clear, in which case automake, when reading aclocal.m4, --# will think it sees a *use*, and therefore will trigger all it's --# C support machinery. Also note that it means that autoscan, seeing --# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -+osf3* | osf4* | osf5*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -+rdos*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -+solaris*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - --# _AM_DEPENDENCIES(NAME) --# --------------------- --# See how the compiler implements dependency checking. --# NAME is "CC", "CXX" or "OBJC". --# We try a few techniques and use that to set a single cache variable. --# --# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was --# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular --# dependency, and given that the user is not expected to run this macro, --# just rely on AC_PROG_CC. --AC_DEFUN([_AM_DEPENDENCIES], --[AC_REQUIRE([AM_SET_DEPDIR])dnl --AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl --AC_REQUIRE([AM_MAKE_INCLUDE])dnl --AC_REQUIRE([AM_DEP_TRACK])dnl -+sysv4 | sysv4.3*) -+ case $host_vendor in -+ motorola) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` -+ ;; -+ ncr) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ sequent) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' -+ ;; -+ sni) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" -+ lt_cv_file_magic_test_file=/lib/libc.so -+ ;; -+ siemens) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ pc) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ esac -+ ;; - --ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -- [$1], CXX, [depcc="$CXX" am_compiler_list=], -- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'] -- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -- [depcc="$$1" am_compiler_list=]) -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+esac -+]) -+file_magic_cmd=$lt_cv_file_magic_cmd -+deplibs_check_method=$lt_cv_deplibs_check_method -+test -z "$deplibs_check_method" && deplibs_check_method=unknown -+])# AC_DEPLIBS_CHECK_METHOD - --AC_CACHE_CHECK([dependency style of $depcc], -- [am_cv_$1_dependencies_compiler_type], --[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -- # We make a subdir and do the tests there. Otherwise we can end up -- # making bogus files that we don't know about and never remove. For -- # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -- mkdir conftest.dir -- # Copy depcomp to subdir because otherwise we won't find it if we're -- # using a relative directory. -- cp "$am_depcomp" conftest.dir -- cd conftest.dir - -- am_cv_$1_dependencies_compiler_type=none -- if test "$am_compiler_list" = ""; then -- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -+# AC_PROG_NM -+# ---------- -+# find the pathname to a BSD-compatible name lister -+AC_DEFUN([AC_PROG_NM], -+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, -+[if test -n "$NM"; then -+ # Let the user override the test. -+ lt_cv_path_NM="$NM" -+else -+ lt_nm_to_check="${ac_tool_prefix}nm" -+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then -+ lt_nm_to_check="$lt_nm_to_check nm" - fi -- for depmode in $am_compiler_list; do -- # We need to recreate these files for each test, as the compiler may -- # overwrite some of them when testing with obscure command lines. -- # This happens at least with the AIX C compiler. -- echo '#include "conftest.h"' > conftest.c -- echo 'int i;' > conftest.h -- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf -- -- case $depmode in -- nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -- if test "x$enable_dependency_tracking" = xyes; then -- continue -- else -- break -+ for lt_tmp_nm in $lt_nm_to_check; do -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ tmp_nm="$ac_dir/$lt_tmp_nm" -+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -+ # Check to see if the nm accepts a BSD-compat flag. -+ # Adding the `sed 1q' prevents false positives on HP-UX, which says: -+ # nm: unknown option "B" ignored -+ # Tru64's nm complains that /dev/null is an invalid object file -+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -+ */dev/null* | *'Invalid file or object type'*) -+ lt_cv_path_NM="$tmp_nm -B" -+ break -+ ;; -+ *) -+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in -+ */dev/null*) -+ lt_cv_path_NM="$tmp_nm -p" -+ break -+ ;; -+ *) -+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -+ continue # so that we can try to find one that supports BSD flags -+ ;; -+ esac -+ ;; -+ esac - fi -- ;; -- none) break ;; -- esac -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -- # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. -- if depmode=$depmode \ -- source=conftest.c object=conftest.o \ -- depfile=conftest.Po tmpdepfile=conftest.TPo \ -- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && -- grep conftest.h conftest.Po > /dev/null 2>&1 && -- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- am_cv_$1_dependencies_compiler_type=$depmode -- break -- fi -+ done -+ IFS="$lt_save_ifs" - done -- -- cd .. -- rm -rf conftest.dir --else -- am_cv_$1_dependencies_compiler_type=none --fi --]) --$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" --AC_SUBST([$1DEPMODE]) --]) -+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -+fi]) -+NM="$lt_cv_path_NM" -+])# AC_PROG_NM - - --# AM_SET_DEPDIR -+# AC_CHECK_LIBM - # ------------- --# Choose a directory name for dependency files. --# This macro is AC_REQUIREd in _AM_DEPENDENCIES --AC_DEFUN([AM_SET_DEPDIR], --[rm -f .deps 2>/dev/null --mkdir .deps 2>/dev/null --if test -d .deps; then -- DEPDIR=.deps --else -- # MS-DOS does not allow filenames that begin with a dot. -- DEPDIR=_deps --fi --rmdir .deps 2>/dev/null --AC_SUBST(DEPDIR) --]) -- -- --# AM_DEP_TRACK --# ------------ --AC_DEFUN([AM_DEP_TRACK], --[AC_ARG_ENABLE(dependency-tracking, --[ --disable-dependency-tracking Speeds up one-time builds -- --enable-dependency-tracking Do not reject slow dependency extractors]) --if test "x$enable_dependency_tracking" != xno; then -- am_depcomp="$ac_aux_dir/depcomp" -- AMDEPBACKSLASH='\' --fi --AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) --pushdef([subst], defn([AC_SUBST])) --subst(AMDEPBACKSLASH) --popdef([subst]) --]) -+# check for math library -+AC_DEFUN([AC_CHECK_LIBM], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+LIBM= -+case $host in -+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+ # These system don't have libm, or don't need it -+ ;; -+*-ncr-sysv4.3*) -+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") -+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") -+ ;; -+*) -+ AC_CHECK_LIB(m, cos, LIBM="-lm") -+ ;; -+esac -+])# AC_CHECK_LIBM - --# Generate code to set up dependency tracking. --# This macro should only be invoked once -- use via AC_REQUIRE. --# Usage: --# AM_OUTPUT_DEPENDENCY_COMMANDS - --# --# This code is only required when automatic dependency tracking --# is enabled. FIXME. This creates each `.P' file that we will --# need in order to bootstrap the dependency handling code. --AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[ --AC_OUTPUT_COMMANDS([ --test x"$AMDEP_TRUE" != x"" || --for mf in $CONFIG_FILES; do -- case "$mf" in -- Makefile) dirpart=.;; -- */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; -- *) continue;; -+# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -+# ----------------------------------- -+# sets LIBLTDL to the link flags for the libltdl convenience library and -+# LTDLINCL to the include flags for the libltdl header and adds -+# --enable-ltdl-convenience to the configure arguments. Note that -+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -+# it is assumed to be `libltdl'. LIBLTDL will be prefixed with -+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' -+# (note the single quotes!). If your package is not flat and you're not -+# using automake, define top_builddir and top_srcdir appropriately in -+# the Makefiles. -+AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+ case $enable_ltdl_convenience in -+ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; -+ "") enable_ltdl_convenience=yes -+ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac -- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue -- # Extract the definition of DEP_FILES from the Makefile without -- # running `make'. -- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` -- test -z "$DEPDIR" && continue -- # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n -e '/^U = / s///p' < "$mf"` -- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -- # We invoke sed twice because it is the simplest approach to -- # changing $(DEPDIR) to its actual value in the expansion. -- for file in `sed -n -e ' -- /^DEP_FILES = .*\\\\$/ { -- s/^DEP_FILES = // -- :loop -- s/\\\\$// -- p -- n -- /\\\\$/ b loop -- p -- } -- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ -- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -- # Make sure the directory exists. -- test -f "$dirpart/$file" && continue -- fdir=`echo "$file" | sed -e 's|/[^/]*$||'` -- $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 -- # echo "creating $dirpart/$file" -- echo '# dummy' > "$dirpart/$file" -- done --done --], [AMDEP_TRUE="$AMDEP_TRUE" --ac_aux_dir="$ac_aux_dir"])]) -- --# AM_MAKE_INCLUDE() --# ----------------- --# Check to see how make treats includes. --AC_DEFUN([AM_MAKE_INCLUDE], --[am_make=${MAKE-make} --cat > confinc << 'END' --doit: -- @echo done --END --# If we don't find an include directive, just comment out the code. --AC_MSG_CHECKING([for style of include used by $am_make]) --am__include='#' --am__quote= --_am_result=none --# First try GNU make style include. --echo "include confinc" > confmf --# We grep out `Entering directory' and `Leaving directory' --# messages which can occur if `w' ends up in MAKEFLAGS. --# In particular we don't look at `^make:' because GNU make might --# be invoked under some other name (usually "gmake"), in which --# case it prints its new name instead of `make'. --if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then -- am__include=include -- am__quote= -- _am_result=GNU --fi --# Now try BSD make style include. --if test "$am__include" = "#"; then -- echo '.include "confinc"' > confmf -- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -- am__include=.include -- am__quote='"' -- _am_result=BSD -- fi --fi --AC_SUBST(am__include) --AC_SUBST(am__quote) --AC_MSG_RESULT($_am_result) --rm -f confinc confmf --]) -- --# serial 3 -+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la -+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -+ # For backwards non-gettext consistent compatibility... -+ INCLTDL="$LTDLINCL" -+])# AC_LIBLTDL_CONVENIENCE - --# AM_CONDITIONAL(NAME, SHELL-CONDITION) --# ------------------------------------- --# Define a conditional. --# --# FIXME: Once using 2.50, use this: --# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl --AC_DEFUN([AM_CONDITIONAL], --[ifelse([$1], [TRUE], -- [errprint(__file__:__line__: [$0: invalid condition: $1 --])dnl --m4exit(1)])dnl --ifelse([$1], [FALSE], -- [errprint(__file__:__line__: [$0: invalid condition: $1 --])dnl --m4exit(1)])dnl --AC_SUBST([$1_TRUE]) --AC_SUBST([$1_FALSE]) --if $2; then -- $1_TRUE= -- $1_FALSE='#' --else -- $1_TRUE='#' -- $1_FALSE= --fi]) - --# Like AC_CONFIG_HEADER, but automatically create stamp file. -+# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -+# ----------------------------------- -+# sets LIBLTDL to the link flags for the libltdl installable library and -+# LTDLINCL to the include flags for the libltdl header and adds -+# --enable-ltdl-install to the configure arguments. Note that -+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -+# and an installed libltdl is not found, it is assumed to be `libltdl'. -+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with -+# '${top_srcdir}/' (note the single quotes!). If your package is not -+# flat and you're not using automake, define top_builddir and top_srcdir -+# appropriately in the Makefiles. -+# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -+AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+ AC_CHECK_LIB(ltdl, lt_dlinit, -+ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], -+ [if test x"$enable_ltdl_install" = xno; then -+ AC_MSG_WARN([libltdl not installed, but installation disabled]) -+ else -+ enable_ltdl_install=yes -+ fi -+ ]) -+ if test x"$enable_ltdl_install" = x"yes"; then -+ ac_configure_args="$ac_configure_args --enable-ltdl-install" -+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la -+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -+ else -+ ac_configure_args="$ac_configure_args --enable-ltdl-install=no" -+ LIBLTDL="-lltdl" -+ LTDLINCL= -+ fi -+ # For backwards non-gettext consistent compatibility... -+ INCLTDL="$LTDLINCL" -+])# AC_LIBLTDL_INSTALLABLE - --# serial 3 - --# When config.status generates a header, we must update the stamp-h file. --# This file resides in the same directory as the config header --# that is generated. We must strip everything past the first ":", --# and everything past the last "/". -+# AC_LIBTOOL_CXX -+# -------------- -+# enable support for C++ libraries -+AC_DEFUN([AC_LIBTOOL_CXX], -+[AC_REQUIRE([_LT_AC_LANG_CXX]) -+])# AC_LIBTOOL_CXX - --AC_PREREQ([2.12]) - --AC_DEFUN([AM_CONFIG_HEADER], --[ifdef([AC_FOREACH],dnl -- [dnl init our file count if it isn't already -- m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0])) -- dnl prepare to store our destination file list for use in config.status -- AC_FOREACH([_AM_File], [$1], -- [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*])) -- m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index)) -- dnl and add it to the list of files AC keeps track of, along -- dnl with our hook -- AC_CONFIG_HEADERS(_AM_File, --dnl COMMANDS, [, INIT-CMDS] --[# update the timestamp --echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index[" --][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS -- m4_popdef([_AM_Dest])])],dnl --[AC_CONFIG_HEADER([$1]) -- AC_OUTPUT_COMMANDS( -- ifelse(patsubst([$1], [[^ ]], []), -- [], -- [test -z "$CONFIG_HEADERS" || echo timestamp >dnl -- patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl --[am_indx=1 --for am_file in $1; do -- case " \$CONFIG_HEADERS " in -- *" \$am_file "*) -- am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\` -- if test -n "\$am_dir"; then -- am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\` -- for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do -- am_tmpdir=\$am_tmpdir\$am_subdir/ -- if test ! -d \$am_tmpdir; then -- mkdir \$am_tmpdir -- fi -- done -- fi -- echo timestamp > "\$am_dir"stamp-h\$am_indx -- ;; -- esac -- am_indx=\`expr \$am_indx + 1\` --done]) --])]) # AM_CONFIG_HEADER -+# _LT_AC_LANG_CXX -+# --------------- -+AC_DEFUN([_LT_AC_LANG_CXX], -+[AC_REQUIRE([AC_PROG_CXX]) -+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) -+])# _LT_AC_LANG_CXX - --# _AM_DIRNAME(PATH) --# ----------------- --# Like AS_DIRNAME, only do it during macro expansion --AC_DEFUN([_AM_DIRNAME], -- [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, -- m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1, -- m4_if(m4_regexp([$1], [^/.*]), -1, -- [.], -- m4_patsubst([$1], [^\(/\).*], [\1])), -- m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), -- m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl --]) # _AM_DIRNAME -+# _LT_AC_PROG_CXXCPP -+# ------------------ -+AC_DEFUN([_LT_AC_PROG_CXXCPP], -+[ -+AC_REQUIRE([AC_PROG_CXX]) -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_PROG_CXXCPP -+fi -+])# _LT_AC_PROG_CXXCPP -+ -+# AC_LIBTOOL_F77 -+# -------------- -+# enable support for Fortran 77 libraries -+AC_DEFUN([AC_LIBTOOL_F77], -+[AC_REQUIRE([_LT_AC_LANG_F77]) -+])# AC_LIBTOOL_F77 - --# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- - --# serial 46 AC_PROG_LIBTOOL -+# _LT_AC_LANG_F77 -+# --------------- -+AC_DEFUN([_LT_AC_LANG_F77], -+[AC_REQUIRE([AC_PROG_F77]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) -+])# _LT_AC_LANG_F77 - --AC_DEFUN([AC_PROG_LIBTOOL], --[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl - --# This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+# AC_LIBTOOL_GCJ -+# -------------- -+# enable support for GCJ libraries -+AC_DEFUN([AC_LIBTOOL_GCJ], -+[AC_REQUIRE([_LT_AC_LANG_GCJ]) -+])# AC_LIBTOOL_GCJ - --# Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' --AC_SUBST(LIBTOOL)dnl - --# Prevent multiple expansion --define([AC_PROG_LIBTOOL], []) --]) -+# _LT_AC_LANG_GCJ -+# --------------- -+AC_DEFUN([_LT_AC_LANG_GCJ], -+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], -+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], -+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], -+ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], -+ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], -+ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) -+])# _LT_AC_LANG_GCJ - --AC_DEFUN([AC_LIBTOOL_SETUP], --[AC_PREREQ(2.13)dnl --AC_REQUIRE([AC_ENABLE_SHARED])dnl --AC_REQUIRE([AC_ENABLE_STATIC])dnl --AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl --AC_REQUIRE([AC_CANONICAL_HOST])dnl --AC_REQUIRE([AC_CANONICAL_BUILD])dnl --AC_REQUIRE([AC_PROG_CC])dnl --AC_REQUIRE([AC_PROG_LD])dnl --AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl --AC_REQUIRE([AC_PROG_NM])dnl --AC_REQUIRE([AC_PROG_LN_S])dnl --AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl --AC_REQUIRE([AC_OBJEXT])dnl --AC_REQUIRE([AC_EXEEXT])dnl --dnl - --_LT_AC_PROG_ECHO_BACKSLASH --# Only perform the check for file, if the check method requires it --case $deplibs_check_method in --file_magic*) -- if test "$file_magic_cmd" = '$MAGIC_CMD'; then -- AC_PATH_MAGIC -- fi -- ;; --esac -+# AC_LIBTOOL_RC -+# ------------- -+# enable support for Windows resource files -+AC_DEFUN([AC_LIBTOOL_RC], -+[AC_REQUIRE([LT_AC_PROG_RC]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) -+])# AC_LIBTOOL_RC - --AC_CHECK_TOOL(RANLIB, ranlib, :) --AC_CHECK_TOOL(STRIP, strip, :) - --ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) --ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], --enable_win32_dll=yes, enable_win32_dll=no) -+# AC_LIBTOOL_LANG_C_CONFIG -+# ------------------------ -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) -+AC_DEFUN([_LT_AC_LANG_C_CONFIG], -+[lt_save_CC="$CC" -+AC_LANG_PUSH(C) -+ -+# Source file extension for C test sources. -+ac_ext=c -+ -+# Object file extension for compiled C test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(){return(0);}' -+ -+_LT_AC_SYS_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+AC_LIBTOOL_SYS_LIB_STRIP -+AC_LIBTOOL_DLOPEN_SELF - --AC_ARG_ENABLE(libtool-lock, -- [ --disable-libtool-lock avoid locking (might break parallel builds)]) --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+# Report which library types will actually be built -+AC_MSG_CHECKING([if libtool supports shared libraries]) -+AC_MSG_RESULT([$can_build_shared]) - --# Some flags need to be propagated to the compiler or linker for good --# libtool support. --case $host in --*-*-irix6*) -- # Find out which ABI we are using. -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -- if AC_TRY_EVAL(ac_compile); then -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -32" -- ;; -- *N32*) -- LD="${LD-ld} -n32" -- ;; -- *64-bit*) -- LD="${LD-ld} -64" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -+AC_MSG_CHECKING([whether to build shared libraries]) -+test "$can_build_shared" = "no" && enable_shared=no - --*-*-sco3.2v5*) -- # On SCO OpenServer 5, we need -belf to get full-featured binaries. -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -belf" -- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, -- [AC_LANG_SAVE -- AC_LANG_C -- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -- AC_LANG_RESTORE]) -- if test x"$lt_cv_cc_needs_belf" != x"yes"; then -- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -- CFLAGS="$SAVE_CFLAGS" -+# On AIX, shared libraries and static libraries use the same namespace, and -+# are all built from PIC. -+case $host_os in -+aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' - fi - ;; - --ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], --[*-*-cygwin* | *-*-mingw* | *-*-pw32*) -- AC_CHECK_TOOL(DLLTOOL, dlltool, false) -- AC_CHECK_TOOL(AS, as, false) -- AC_CHECK_TOOL(OBJDUMP, objdump, false) -- -- # recent cygwin and mingw systems supply a stub DllMain which the user -- # can override, but on older systems we have to supply one -- AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain, -- [AC_TRY_LINK([], -- [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); -- DllMain (0, 0, 0);], -- [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])]) -- -- case $host/$CC in -- *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) -- # old mingw systems require "-dll" to link a DLL, while more recent ones -- # require "-mdll" -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -mdll" -- AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch, -- [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])]) -- CFLAGS="$SAVE_CFLAGS" ;; -- *-*-cygwin* | *-*-pw32*) -- # cygwin systems need to pass --dll to the linker, and not link -- # crt.o which will require a WinMain@16 definition. -- lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;; -- esac -- ;; -- ]) -+aix4* | aix5*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; - esac -+AC_MSG_RESULT([$enable_shared]) - --_LT_AC_LTCONFIG_HACK -- --]) -+AC_MSG_CHECKING([whether to build static libraries]) -+# Make sure either enable_shared or enable_static is yes. -+test "$enable_shared" = yes || enable_static=yes -+AC_MSG_RESULT([$enable_static]) - --# AC_LIBTOOL_HEADER_ASSERT --# ------------------------ --AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT], --[AC_CACHE_CHECK([whether $CC supports assert without backlinking], -- [lt_cv_func_assert_works], -- [case $host in -- *-*-solaris*) -- if test "$GCC" = yes && test "$with_gnu_ld" != yes; then -- case `$CC --version 2>/dev/null` in -- [[12]].*) lt_cv_func_assert_works=no ;; -- *) lt_cv_func_assert_works=yes ;; -- esac -- fi -- ;; -- esac]) -+AC_LIBTOOL_CONFIG($1) - --if test "x$lt_cv_func_assert_works" = xyes; then -- AC_CHECK_HEADERS(assert.h) --fi --])# AC_LIBTOOL_HEADER_ASSERT -+AC_LANG_POP -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_C_CONFIG - --# _LT_AC_CHECK_DLFCN --# -------------------- --AC_DEFUN([_LT_AC_CHECK_DLFCN], --[AC_CHECK_HEADERS(dlfcn.h) --])# _LT_AC_CHECK_DLFCN - --# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE --# --------------------------------- --AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], --[AC_REQUIRE([AC_CANONICAL_HOST]) --AC_REQUIRE([AC_PROG_NM]) --AC_REQUIRE([AC_OBJEXT]) --# Check for command to grab the raw symbol name followed by C symbol from nm. --AC_MSG_CHECKING([command to parse $NM output]) --AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl -+# AC_LIBTOOL_LANG_CXX_CONFIG -+# -------------------------- -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) -+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], -+[AC_LANG_PUSH(C++) -+AC_REQUIRE([AC_PROG_CXX]) -+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -+ -+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_AC_TAGVAR(allow_undefined_flag, $1)= -+_LT_AC_TAGVAR(always_export_symbols, $1)=no -+_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_direct, $1)=no -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+_LT_AC_TAGVAR(hardcode_automatic, $1)=no -+_LT_AC_TAGVAR(module_cmds, $1)= -+_LT_AC_TAGVAR(module_expsym_cmds, $1)= -+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_AC_TAGVAR(no_undefined_flag, $1)= -+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ -+# Dependencies to place before and after the object being linked: -+_LT_AC_TAGVAR(predep_objects, $1)= -+_LT_AC_TAGVAR(postdep_objects, $1)= -+_LT_AC_TAGVAR(predeps, $1)= -+_LT_AC_TAGVAR(postdeps, $1)= -+_LT_AC_TAGVAR(compiler_lib_search_path, $1)= -+ -+# Source file extension for C++ test sources. -+ac_ext=cpp -+ -+# Object file extension for compiled C++ test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE - --# These are sane defaults that work on at least a few old systems. --# [They come from Ultrix. What could be older than Ultrix?!! ;)] -+# Allow CC to be a program name with arguments. -+lt_save_CC=$CC -+lt_save_LD=$LD -+lt_save_GCC=$GCC -+GCC=$GXX -+lt_save_with_gnu_ld=$with_gnu_ld -+lt_save_path_LD=$lt_cv_path_LD -+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -+else -+ $as_unset lt_cv_prog_gnu_ld -+fi -+if test -n "${lt_cv_path_LDCXX+set}"; then -+ lt_cv_path_LD=$lt_cv_path_LDCXX -+else -+ $as_unset lt_cv_path_LD -+fi -+test -z "${LDCXX+set}" || LD=$LDCXX -+CC=${CXX-"c++"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) -+ -+# We don't want -fno-exception wen compiling C++ code, so set the -+# no_builtin_flag separately -+if test "$GXX" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+else -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -+fi - --# Character class describing NM global symbol codes. --symcode='[[BCDEGRST]]' -+if test "$GXX" = yes; then -+ # Set up default GNU C++ configuration - --# Regexp to match symbols that can be accessed directly from C. --sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -+ AC_PROG_LD - --# Transform the above into a raw symbol and a C symbol. --symxfrm='\1 \2\3 \3' -+ # Check if GNU C++ uses GNU ld as the underlying linker, since the -+ # archiving commands below assume that GNU ld is being used. -+ if test "$with_gnu_ld" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - --# Transform an extracted symbol line into a proper C declaration --lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - --# Transform an extracted symbol line into symbol name and symbol address --lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -+ # investigate it a little bit more. (MM) -+ wlarc='${wl}' -+ -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ -+ grep 'no-whole-archive' > /dev/null; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ else -+ with_gnu_ld=no -+ wlarc= - --# Define system-specific variables. --case $host_os in --aix*) -- symcode='[[BCDT]]' -- ;; --cygwin* | mingw* | pw32*) -- symcode='[[ABCDGISTW]]' -- ;; --hpux*) # Its linker distinguishes data from code symbols -- lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -- lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -- ;; --irix*) -- symcode='[[BCDEGRST]]' -- ;; --solaris* | sysv5*) -- symcode='[[BDT]]' -- ;; --sysv4) -- symcode='[[DFNSTU]]' -- ;; --esac -+ # A generic and very simple default shared library creation -+ # command for GNU C++ for the case where it uses the native -+ # linker, instead of GNU ld. If possible, this setting should -+ # overridden to take advantage of the native linker features on -+ # the platform it is being used on. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ fi - --# Handle CRLF in mingw tool chain --opt_cr= --case $host_os in --mingw*) -- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -- ;; --esac -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - --# If we're using GNU nm, then use its standard symbol codes. --if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then -- symcode='[[ABCDGISTW]]' -+else -+ GXX=no -+ with_gnu_ld=no -+ wlarc= - fi - --# Try without a prefix undercore, then with it. --for ac_symprfx in "" "_"; do -- -- # Write the raw and C identifiers. --lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" -- -- # Check to see that the pipe works correctly. -- pipe_works=no -- rm -f conftest* -- cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then -- # Try sorting and uniquifying the output. -- if sort "$nlist" | uniq > "$nlist"T; then -- mv -f "$nlist"T "$nlist" -- else -- rm -f "$nlist"T -- fi -+# PORTME: fill in a description of your system's C++ link characteristics -+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+_LT_AC_TAGVAR(ld_shlibs, $1)=yes -+case $host_os in -+ aix3*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ aix_use_runtimelinking=no - -- # Make sure that we snagged all the symbols we need. -- if egrep ' nm_test_var$' "$nlist" >/dev/null; then -- if egrep ' nm_test_func$' "$nlist" >/dev/null; then -- cat < conftest.$ac_ext --#ifdef __cplusplus --extern "C" { --#endif -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ case $ld_flag in -+ *-brtl*) -+ aix_use_runtimelinking=yes -+ break -+ ;; -+ esac -+ done -+ ;; -+ esac - --EOF -- # Now generate the symbol file. -- eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext' -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi - -- cat <> conftest.$ac_ext --#if defined (__STDC__) && __STDC__ --# define lt_ptr void * --#else --# define lt_ptr char * --# define const --#endif -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - --/* The mapping between symbol names and symbols. */ --const struct { -- const char *name; -- lt_ptr address; --} --lt_preloaded_symbols[[]] = --{ --EOF -- sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext -- cat <<\EOF >> conftest.$ac_ext -- {0, (lt_ptr) 0} --}; -+ _LT_AC_TAGVAR(archive_cmds, $1)='' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - --#ifdef __cplusplus --} --#endif --EOF -- # Now try linking the two files. -- mv conftest.$ac_objext conftstm.$ac_objext -- save_LIBS="$LIBS" -- save_CFLAGS="$CFLAGS" -- LIBS="conftstm.$ac_objext" -- CFLAGS="$CFLAGS$no_builtin_flag" -- if AC_TRY_EVAL(ac_link) && test -s conftest; then -- pipe_works=yes -- fi -- LIBS="$save_LIBS" -- CFLAGS="$save_CFLAGS" -+ if test "$GXX" = yes; then -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : - else -- echo "cannot find nm_test_func in $nlist" >&AC_FD_CC -+ # We have old collect2 -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi -- else -- echo "cannot find nm_test_var in $nlist" >&AC_FD_CC -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' - fi - else -- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi - fi -- else -- echo "$progname: failed program was:" >&AC_FD_CC -- cat conftest.$ac_ext >&5 -- fi -- rm -f conftest* conftst* - -- # Do not use the global_symbol_pipe unless it works. -- if test "$pipe_works" = yes; then -- break -- else -- lt_cv_sys_global_symbol_pipe= -- fi --done --]) --global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" --if test -z "$lt_cv_sys_global_symbol_pipe"; then -- global_symbol_to_cdecl= -- global_symbol_to_c_name_address= --else -- global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" -- global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" --fi --if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; --then -- AC_MSG_RESULT(failed) --else -- AC_MSG_RESULT(ok) --fi --]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - --# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR --# --------------------------------- --AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR], --[# Find the correct PATH separator. Usually this is `:', but --# DJGPP uses `;' like DOS. --if test "X${PATH_SEPARATOR+set}" != Xset; then -- UNAME=${UNAME-`uname 2>/dev/null`} -- case X$UNAME in -- *-DOS) lt_cv_sys_path_separator=';' ;; -- *) lt_cv_sys_path_separator=':' ;; -- esac -- PATH_SEPARATOR=$lt_cv_sys_path_separator --fi --])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; - --# _LT_AC_PROG_ECHO_BACKSLASH --# -------------------------- --# Add some code to the start of the generated configure script which --# will find an echo command which doesn't interpret backslashes. --AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], --[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -- [AC_DIVERT_PUSH(NOTICE)]) --_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --# Check that we are running under the correct shell. --SHELL=${CONFIG_SHELL-/bin/sh} -+ chorus*) -+ case $cc_basename in -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; - --case X$ECHO in --X*--fallback-echo) -- # Remove one level of quotation (which was required for Make). -- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(always_export_symbols, $1)=no -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi - ;; --esac -- --echo=${ECHO-echo} --if test "X[$]1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X[$]1" = X--fallback-echo; then -- # Avoid inline document here, it may be left over -- : --elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then -- # Yippee, $echo works! -- : --else -- # Restart under the correct shell. -- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} --fi -- --if test "X[$]1" = X--fallback-echo; then -- # used as fallback echo -- shift -- cat <&1 | $EGREP 'single_module' >/dev/null ; then -+ lt_int_apple_cc_single_mod=yes -+ fi -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ fi -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ fi -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+ ;; - --# The HP-UX ksh and POSIX shell print the target directory to stdout --# if CDPATH is set. --if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ freebsd[[12]]*) -+ # C++ shared libraries reported to be fairly broken before switch to ELF -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ freebsd-elf*) -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ ;; -+ freebsd* | dragonfly*) -+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -+ # conventions -+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes -+ ;; -+ gnu*) -+ ;; -+ hpux9*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ hpux10*|hpux11*) -+ if test $with_gnu_ld = no; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - --if test -z "$ECHO"; then --if test "X${echo_test_string+set}" != Xset; then --# find a string as large as possible, as long as the shell can cope with it -- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do -- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if (echo_test_string="`eval $cmd`") 2>/dev/null && -- echo_test_string="`eval $cmd`" && -- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null -- then -- break -+ case $host_cpu in -+ hppa*64*|ia64*) ;; -+ *) -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; -+ esac - fi -- done --fi -- --if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- : --else -- # The Solaris, AIX, and Digital Unix default echo programs unquote -- # backslashes. This makes it impossible to quote backslashes using -- # echo "$something" | sed 's/\\/\\\\/g' -- # -- # So, first we look for a working echo in the user's PATH. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ ;; -+ esac - -- IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for dir in $PATH /usr/ucb; do -- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- echo="$dir/echo" -- break -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC*) -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test $with_gnu_ld = no; then -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ fi -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ interix[[3-9]]*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ irix5* | irix6*) -+ case $cc_basename in -+ CC*) -+ # SGI C++ -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' -+ fi -+ fi -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ esac -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -+ ;; -+ icpc*) -+ # Intel C++ -+ with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ ;; -+ pgCC*) -+ # Portland Group C++ compiler -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) -+ # Compaq C++ -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+ -+ runpath_var=LD_RUN_PATH -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ -+ # Not sure whether something based on -+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 -+ # would be better. -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ lynxos*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ m88k*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' -+ wlarc= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - fi -- done -- IFS="$save_ifs" -- -- if test "X$echo" = Xecho; then -- # We didn't find a better echo, so look for alternatives. -- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # This shell has a builtin print -r that does the trick. -- echo='print -r' -- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && -- test "X$CONFIG_SHELL" != X/bin/ksh; then -- # If we have ksh, try running configure again with it. -- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -- export ORIGINAL_CONFIG_SHELL -- CONFIG_SHELL=/bin/ksh -- export CONFIG_SHELL -- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} -- else -- # Try using printf. -- echo='printf %s\n' -- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # Cool, printf works -- : -- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -- export CONFIG_SHELL -- SHELL="$CONFIG_SHELL" -- export SHELL -- echo="$CONFIG_SHELL [$]0 --fallback-echo" -- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- echo="$CONFIG_SHELL [$]0 --fallback-echo" -- else -- # maybe with a smaller string... -- prev=: -+ # Workaround some broken pre-1.5 toolchains -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ ;; -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd='echo' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ osf3*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - -- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do -- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null -- then -- break -- fi -- prev="$cmd" -- done -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ cxx*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - -- if test "$prev" != 'sed 50q "[$]0"'; then -- echo_test_string=`eval $prev` -- export echo_test_string -- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else -- # Oops. We lost completely, so just stick with echo. -- echo=echo -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi -- fi -- fi -- fi --fi --fi -+ ;; -+ esac -+ ;; -+ osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Archives containing C++ object files must be created using -+ # the KAI C++ compiler. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ cxx*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -+ echo "-hidden">> $lib.exp~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ -+ $rm $lib.exp' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - --# Copy echo and quote the copy suitably for passing to libtool from --# the Makefile, instead of quoting the original, which is used later. --ECHO=$echo --if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then -- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" --fi -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ psos*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ lcc*) -+ # Lucid -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -+ ;; -+ esac -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - --AC_SUBST(ECHO) --AC_DIVERT_POP --])# _LT_AC_PROG_ECHO_BACKSLASH -+ output_verbose_link_cmd='echo' - --# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, --# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) --# ------------------------------------------------------------------ --AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], --[if test "$cross_compiling" = yes; then : -- [$4] --else -- AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -- lt_status=$lt_dlunknown -- cat > conftest.$ac_ext < --#endif -+ # The C++ compiler must be used to create the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -+ ;; -+ *) -+ # GNU C++ compiler with Solaris linker -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' -+ if $CC --version | grep -v '^2\.7' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ else -+ # g++ 2.7 appears to require `-G' NOT `-shared' on this -+ # platform. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ fi - --#include -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ ;; -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' - --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif --#endif -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ # For security reasons, it is highly recommended that you always -+ # use absolute paths for naming shared libraries, and exclude the -+ # DT_RUNPATH tag from executables and libraries. But doing so -+ # requires that you compile everything twice, which is a pain. -+ # So that behaviour is only enabled if SCOABSPATH is set to a -+ # non-empty value in the environment. Most likely only useful for -+ # creating official distributions of packages. -+ # This is a hack until libtool officially supports absolute path -+ # names for shared libraries. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' - --/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -- find out it does not work in some platform. */ --#ifndef LT_DLLAZY_OR_NOW --# ifdef RTLD_LAZY --# define LT_DLLAZY_OR_NOW RTLD_LAZY --# else --# ifdef DL_LAZY --# define LT_DLLAZY_OR_NOW DL_LAZY --# else --# ifdef RTLD_NOW --# define LT_DLLAZY_OR_NOW RTLD_NOW --# else --# ifdef DL_NOW --# define LT_DLLAZY_OR_NOW DL_NOW --# else --# define LT_DLLAZY_OR_NOW 0 --# endif --# endif --# endif --# endif --#endif -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ vxworks*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+esac -+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - --#ifdef __cplusplus --extern "C" void exit (int); --#endif -+_LT_AC_TAGVAR(GCC, $1)="$GXX" -+_LT_AC_TAGVAR(LD, $1)="$LD" - --void fnord() { int i=42;} --int main () -+AC_LIBTOOL_POSTDEP_PREDEP($1) -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+ -+AC_LIBTOOL_CONFIG($1) -+ -+AC_LANG_POP -+CC=$lt_save_CC -+LDCXX=$LD -+LD=$lt_save_LD -+GCC=$lt_save_GCC -+with_gnu_ldcxx=$with_gnu_ld -+with_gnu_ld=$lt_save_with_gnu_ld -+lt_cv_path_LDCXX=$lt_cv_path_LD -+lt_cv_path_LD=$lt_save_path_LD -+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -+])# AC_LIBTOOL_LANG_CXX_CONFIG -+ -+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -+# ------------------------------------ -+# Figure out "hidden" library dependencies from verbose -+# compiler output when linking a shared library. -+# Parse the compiler output and extract the necessary -+# objects, libraries and library flags. -+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ -+dnl we can't use the lt_simple_compile_test_code here, -+dnl because it contains code intended for an executable, -+dnl not a library. It's possible we should let each -+dnl tag define a new lt_????_link_test_code variable, -+dnl but it's only used here... -+ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext </dev/null; then -- (./conftest; exit; ) 2>/dev/null -- lt_status=$? -- case x$lt_status in -- x$lt_dlno_uscore) $1 ;; -- x$lt_dlneed_uscore) $2 ;; -- x$lt_unknown|x*) $3 ;; - esac -- else : -- # compilation failed -- $3 -- fi --fi --rm -fr conftest* --])# _LT_AC_TRY_DLOPEN_SELF -+ done - --# AC_LIBTOOL_DLOPEN_SELF --# ------------------- --AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], --[if test "x$enable_dlopen" != xyes; then -- enable_dlopen=unknown -- enable_dlopen_self=unknown -- enable_dlopen_self_static=unknown -+ # Clean up. -+ rm -f a.out a.exe - else -- lt_cv_dlopen=no -- lt_cv_dlopen_libs= -+ echo "libtool.m4: error: problem compiling $1 test program" -+fi - -- case $host_os in -- beos*) -- lt_cv_dlopen="load_add_on" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -+$rm -f confest.$objext -+ -+# PORTME: override above test on systems where it is broken -+ifelse([$1],[CXX], -+[case $host_os in -+interix[[3-9]]*) -+ # Interix 3.5 installs completely hosed .la files for C++, so rather than -+ # hack all around it, let's just trust "g++" to DTRT. -+ _LT_AC_TAGVAR(predep_objects,$1)= -+ _LT_AC_TAGVAR(postdep_objects,$1)= -+ _LT_AC_TAGVAR(postdeps,$1)= -+ ;; -+ -+linux*) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ # -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi - ;; -+ esac -+ ;; - -- cygwin* | mingw* | pw32*) -- lt_cv_dlopen="LoadLibrary" -- lt_cv_dlopen_libs= -- ;; -+solaris*) -+ case $cc_basename in -+ CC*) -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac - -- *) -- AC_CHECK_FUNC([shl_load], -- [lt_cv_dlopen="shl_load"], -- [AC_CHECK_LIB([dld], [shl_load], -- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], -- [AC_CHECK_FUNC([dlopen], -- [lt_cv_dlopen="dlopen"], -- [AC_CHECK_LIB([dl], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], -- [AC_CHECK_LIB([svld], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], -- [AC_CHECK_LIB([dld], [dld_link], -- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) -- ]) -- ]) -- ]) -- ]) -- ]) -+ # Adding this requires a known-good setup of shared libraries for -+ # Sun compiler versions before 5.6, else PIC objects from an old -+ # archive will be linked into the output, leading to subtle bugs. -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi - ;; - esac -+ ;; -+esac -+]) - -- if test "x$lt_cv_dlopen" != xno; then -- enable_dlopen=yes -- else -- enable_dlopen=no -+case " $_LT_AC_TAGVAR(postdeps, $1) " in -+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; -+esac -+])# AC_LIBTOOL_POSTDEP_PREDEP -+ -+# AC_LIBTOOL_LANG_F77_CONFIG -+# -------------------------- -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) -+AC_DEFUN([_LT_AC_LANG_F77_CONFIG], -+[AC_REQUIRE([AC_PROG_F77]) -+AC_LANG_PUSH(Fortran 77) -+ -+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_AC_TAGVAR(allow_undefined_flag, $1)= -+_LT_AC_TAGVAR(always_export_symbols, $1)=no -+_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_direct, $1)=no -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -+_LT_AC_TAGVAR(hardcode_automatic, $1)=no -+_LT_AC_TAGVAR(module_cmds, $1)= -+_LT_AC_TAGVAR(module_expsym_cmds, $1)= -+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_AC_TAGVAR(no_undefined_flag, $1)= -+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ -+# Source file extension for f77 test sources. -+ac_ext=f -+ -+# Object file extension for compiled f77 test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code="\ -+ program t -+ end -+" -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${F77-"f77"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) -+ -+AC_MSG_CHECKING([if libtool supports shared libraries]) -+AC_MSG_RESULT([$can_build_shared]) -+ -+AC_MSG_CHECKING([whether to build shared libraries]) -+test "$can_build_shared" = "no" && enable_shared=no -+ -+# On AIX, shared libraries and static libraries use the same namespace, and -+# are all built from PIC. -+case $host_os in -+aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' - fi -+ ;; -+aix4* | aix5*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+esac -+AC_MSG_RESULT([$enable_shared]) -+ -+AC_MSG_CHECKING([whether to build static libraries]) -+# Make sure either enable_shared or enable_static is yes. -+test "$enable_shared" = yes || enable_static=yes -+AC_MSG_RESULT([$enable_static]) -+ -+_LT_AC_TAGVAR(GCC, $1)="$G77" -+_LT_AC_TAGVAR(LD, $1)="$LD" -+ -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+ -+AC_LIBTOOL_CONFIG($1) - -- case $lt_cv_dlopen in -- dlopen) -- save_CPPFLAGS="$CPPFLAGS" -- AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+AC_LANG_POP -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_F77_CONFIG - -- save_LDFLAGS="$LDFLAGS" -- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - -- save_LIBS="$LIBS" -- LIBS="$lt_cv_dlopen_libs $LIBS" -+# AC_LIBTOOL_LANG_GCJ_CONFIG -+# -------------------------- -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) -+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], -+[AC_LANG_SAVE -+ -+# Source file extension for Java test sources. -+ac_ext=java -+ -+# Object file extension for compiled Java test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="class foo {}" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE - -- AC_CACHE_CHECK([whether a program can dlopen itself], -- lt_cv_dlopen_self, [dnl -- _LT_AC_TRY_DLOPEN_SELF( -- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, -- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) -- ]) -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${GCJ-"gcj"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) -+ -+# GCJ did not exist at the time GCC didn't implicitly link libc in. -+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ -+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+ -+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+ -+AC_LIBTOOL_CONFIG($1) -+ -+AC_LANG_RESTORE -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_GCJ_CONFIG -+ -+ -+# AC_LIBTOOL_LANG_RC_CONFIG -+# ------------------------- -+# Ensure that the configuration vars for the Windows resource compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) -+AC_DEFUN([_LT_AC_LANG_RC_CONFIG], -+[AC_LANG_SAVE -+ -+# Source file extension for RC test sources. -+ac_ext=rc -+ -+# Object file extension for compiled RC test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code="$lt_simple_compile_test_code" -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE - -- if test "x$lt_cv_dlopen_self" = xyes; then -- LDFLAGS="$LDFLAGS $link_static_flag" -- AC_CACHE_CHECK([whether a statically linked program can dlopen itself], -- lt_cv_dlopen_self_static, [dnl -- _LT_AC_TRY_DLOPEN_SELF( -- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, -- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) -- ]) -- fi -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${RC-"windres"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) -+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ -+AC_LIBTOOL_CONFIG($1) -+ -+AC_LANG_RESTORE -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_RC_CONFIG -+ -+ -+# AC_LIBTOOL_CONFIG([TAGNAME]) -+# ---------------------------- -+# If TAGNAME is not passed, then create an initial libtool script -+# with a default configuration from the untagged config vars. Otherwise -+# add code to config.status for appending the configuration named by -+# TAGNAME from the matching tagged config vars. -+AC_DEFUN([AC_LIBTOOL_CONFIG], -+[# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ _LT_AC_TAGVAR(compiler, $1) \ -+ _LT_AC_TAGVAR(CC, $1) \ -+ _LT_AC_TAGVAR(LD, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ -+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ -+ _LT_AC_TAGVAR(old_archive_cmds, $1) \ -+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ -+ _LT_AC_TAGVAR(predep_objects, $1) \ -+ _LT_AC_TAGVAR(postdep_objects, $1) \ -+ _LT_AC_TAGVAR(predeps, $1) \ -+ _LT_AC_TAGVAR(postdeps, $1) \ -+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ -+ _LT_AC_TAGVAR(archive_cmds, $1) \ -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ -+ _LT_AC_TAGVAR(postinstall_cmds, $1) \ -+ _LT_AC_TAGVAR(postuninstall_cmds, $1) \ -+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ -+ _LT_AC_TAGVAR(allow_undefined_flag, $1) \ -+ _LT_AC_TAGVAR(no_undefined_flag, $1) \ -+ _LT_AC_TAGVAR(export_symbols_cmds, $1) \ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ -+ _LT_AC_TAGVAR(hardcode_automatic, $1) \ -+ _LT_AC_TAGVAR(module_cmds, $1) \ -+ _LT_AC_TAGVAR(module_expsym_cmds, $1) \ -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ -+ _LT_AC_TAGVAR(fix_srcfile_path, $1) \ -+ _LT_AC_TAGVAR(exclude_expsyms, $1) \ -+ _LT_AC_TAGVAR(include_expsyms, $1); do - -- CPPFLAGS="$save_CPPFLAGS" -- LDFLAGS="$save_LDFLAGS" -- LIBS="$save_LIBS" -- ;; -- esac -+ case $var in -+ _LT_AC_TAGVAR(old_archive_cmds, $1) | \ -+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ -+ _LT_AC_TAGVAR(archive_cmds, $1) | \ -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ -+ _LT_AC_TAGVAR(module_cmds, $1) | \ -+ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ -+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ -+ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ ;; -+ *) -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ;; -+ esac -+ done - -- case $lt_cv_dlopen_self in -- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -- *) enable_dlopen_self=unknown ;; -+ case $lt_echo in -+ *'\[$]0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` -+ ;; - esac - -- case $lt_cv_dlopen_self_static in -- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -- *) enable_dlopen_self_static=unknown ;; -- esac --fi --])# AC_LIBTOOL_DLOPEN_SELF -+ifelse([$1], [], -+ [cfgfile="${ofile}T" -+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15 -+ $rm -f "$cfgfile" -+ AC_MSG_NOTICE([creating $ofile])], -+ [cfgfile="$ofile"]) -+ -+ cat <<__EOF__ >> "$cfgfile" -+ifelse([$1], [], -+[#! $SHELL - --AC_DEFUN([_LT_AC_LTCONFIG_HACK], --[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --Xsed='sed -e s/^X//' --sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g' -+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -+# NOTE: Changes made to this file will be lost: look at ltmain.sh. -+# -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -+# Free Software Foundation, Inc. -+# -+# This file is part of GNU Libtool: -+# Originally by Gordon Matzigkeit , 1996 -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. - --# Same as above, but do not quote variable references. --double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g' -+# A sed program that does not truncate output. -+SED=$lt_SED - --# Sed substitution to delay expansion of an escaped shell variable in a --# double_quote_subst'ed string. --delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+# Sed that helps us avoid accidentally triggering echo(1) options like -n. -+Xsed="$SED -e 1s/^X//" - --# Constants: --rm="rm -f" -+# The HP-UX ksh and POSIX shell print the target directory to stdout -+# if CDPATH is set. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - --# Global variables: --default_ofile=libtool --can_build_shared=yes -+# The names of the tagged configurations supported by this script. -+available_tags= - --# All known linkers require a `.a' archive for static linking (except M$VC, --# which needs '.lib'). --libext=a --ltmain="$ac_aux_dir/ltmain.sh" --ofile="$default_ofile" --with_gnu_ld="$lt_cv_prog_gnu_ld" --need_locks="$enable_libtool_lock" -+# ### BEGIN LIBTOOL CONFIG], -+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) - --old_CC="$CC" --old_CFLAGS="$CFLAGS" -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - --# Set sane defaults for various variables --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --test -z "$AS" && AS=as --test -z "$CC" && CC=cc --test -z "$DLLTOOL" && DLLTOOL=dlltool --test -z "$LD" && LD=ld --test -z "$LN_S" && LN_S="ln -s" --test -z "$MAGIC_CMD" && MAGIC_CMD=file --test -z "$NM" && NM=nm --test -z "$OBJDUMP" && OBJDUMP=objdump --test -z "$RANLIB" && RANLIB=: --test -z "$STRIP" && STRIP=: --test -z "$ac_objext" && ac_objext=o -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL - --if test x"$host" != x"$build"; then -- ac_tool_prefix=${host_alias}- --else -- ac_tool_prefix= --fi -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared - --# Transform linux* to *-*-linux-gnu*, to support old configure scripts. --case $host_os in --linux-gnu*) ;; --linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` --esac -+# Whether or not to build static libraries. -+build_old_libs=$enable_static - --case $host_os in --aix3*) -- # AIX sometimes has problems with the GCC collect2 program. For some -- # reason, if we set the COLLECT_NAMES environment variable, the problems -- # vanish in a puff of smoke. -- if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES -- fi -- ;; --esac -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) - --# Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' --old_postinstall_cmds='chmod 644 $oldlib' --old_postuninstall_cmds= -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) - --if test -n "$RANLIB"; then -- case $host_os in -- openbsd*) -- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" -- ;; -- *) -- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" -- ;; -- esac -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" --fi -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install - --# Allow CC to be a program name with arguments. --set dummy $CC --compiler="[$]2" -+# The host system. -+host_alias=$host_alias -+host=$host -+host_os=$host_os - --AC_MSG_CHECKING([for objdir]) --rm -f .libs 2>/dev/null --mkdir .libs 2>/dev/null --if test -d .libs; then -- objdir=.libs --else -- # MS-DOS does not allow filenames that begin with a dot. -- objdir=_libs --fi --rmdir .libs 2>/dev/null --AC_MSG_RESULT($objdir) -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - -+# An echo program that does not interpret backslashes. -+echo=$lt_echo - --AC_ARG_WITH(pic, --[ --with-pic try to use only PIC/non-PIC objects [default=use both]], --pic_mode="$withval", pic_mode=default) --test -z "$pic_mode" && pic_mode=default -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS - --# We assume here that the value for lt_cv_prog_cc_pic will not be cached --# in isolation, and that seeing it set (from the cache) indicates that --# the associated values are set (in the cache) correctly too. --AC_MSG_CHECKING([for $compiler option to produce PIC]) --AC_CACHE_VAL(lt_cv_prog_cc_pic, --[ lt_cv_prog_cc_pic= -- lt_cv_prog_cc_shlib= -- lt_cv_prog_cc_wl= -- lt_cv_prog_cc_static= -- lt_cv_prog_cc_no_builtin= -- lt_cv_prog_cc_can_build_shared=$can_build_shared -+# A C compiler. -+LTCC=$lt_LTCC - -- if test "$GCC" = yes; then -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-static' -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS - -- case $host_os in -- aix*) -- # Below there is a dirty hack to force normal static linking with -ldl -- # The problem is because libdl dynamically linked with both libc and -- # libC (AIX C++ library), which obviously doesn't included in libraries -- # list by gcc. This cause undefined symbols with -static flags. -- # This hack allows C programs to be linked with "-static -ldl", but -- # not sure about C++ programs. -- lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" -- ;; -- amigaos*) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' -- ;; -- beos* | irix5* | irix6* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; -- darwin* | rhapsody*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- lt_cv_prog_cc_pic='-fno-common' -- ;; -- cygwin* | mingw* | pw32* | os2*) -- # This hack is so that the source file can tell whether it is being -- # built for inclusion in a dll (and should export symbols for example). -- lt_cv_prog_cc_pic='-DDLL_EXPORT' -- ;; -- sysv4*MP*) -- if test -d /usr/nec; then -- lt_cv_prog_cc_pic=-Kconform_pic -- fi -- ;; -- *) -- lt_cv_prog_cc_pic='-fPIC' -- ;; -- esac -- else -- # PORTME Check for PIC flags for the system compiler. -- case $host_os in -- aix3* | aix4* | aix5*) -- lt_cv_prog_cc_wl='-Wl,' -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- lt_cv_prog_cc_static='-Bstatic' -- else -- lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' -- fi -- ;; -+# A language-specific compiler. -+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) - -- hpux9* | hpux10* | hpux11*) -- # Is there a better lt_cv_prog_cc_static that works with the bundled CC? -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive" -- lt_cv_prog_cc_pic='+Z' -- ;; -+# Is the compiler the GNU C compiler? -+with_gcc=$_LT_AC_TAGVAR(GCC, $1) - -- irix5* | irix6*) -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-non_shared' -- # PIC (with -KPIC) is the default. -- ;; -+# An ERE matcher. -+EGREP=$lt_EGREP - -- cygwin* | mingw* | pw32* | os2*) -- # This hack is so that the source file can tell whether it is being -- # built for inclusion in a dll (and should export symbols for example). -- lt_cv_prog_cc_pic='-DDLL_EXPORT' -- ;; -+# The linker used to build libraries. -+LD=$lt_[]_LT_AC_TAGVAR(LD, $1) - -- newsos6) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- ;; -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S - -- osf3* | osf4* | osf5*) -- # All OSF/1 code is PIC. -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-non_shared' -- ;; -+# A BSD-compatible nm program. -+NM=$lt_NM - -- sco3.2v5*) -- lt_cv_prog_cc_pic='-Kpic' -- lt_cv_prog_cc_static='-dn' -- lt_cv_prog_cc_shlib='-belf' -- ;; -+# A symbol stripping program -+STRIP=$lt_STRIP - -- solaris*) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- lt_cv_prog_cc_wl='-Wl,' -- ;; -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD - -- sunos4*) -- lt_cv_prog_cc_pic='-PIC' -- lt_cv_prog_cc_static='-Bstatic' -- lt_cv_prog_cc_wl='-Qoption ld ' -- ;; -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" - -- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- if test "x$host_vendor" = xsni; then -- lt_cv_prog_cc_wl='-LD' -- else -- lt_cv_prog_cc_wl='-Wl,' -- fi -- ;; -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" - -- uts4*) -- lt_cv_prog_cc_pic='-pic' -- lt_cv_prog_cc_static='-Bstatic' -- ;; -+# Used on cygwin: assembler. -+AS="$AS" - -- sysv4*MP*) -- if test -d /usr/nec ;then -- lt_cv_prog_cc_pic='-Kconform_pic' -- lt_cv_prog_cc_static='-Bstatic' -- fi -- ;; -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir - -- *) -- lt_cv_prog_cc_can_build_shared=no -- ;; -- esac -- fi --]) --if test -z "$lt_cv_prog_cc_pic"; then -- AC_MSG_RESULT([none]) --else -- AC_MSG_RESULT([$lt_cv_prog_cc_pic]) -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds - -- # Check to make sure the pic_flag actually works. -- AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works]) -- AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" -- AC_TRY_COMPILE([], [], [dnl -- case $host_os in -- hpux9* | hpux10* | hpux11*) -- # On HP-UX, both CC and GCC only warn that PIC is supported... then -- # they create non-PIC objects. So, if there were any warnings, we -- # assume that PIC is not supported. -- if test -s conftest.err; then -- lt_cv_prog_cc_pic_works=no -- else -- lt_cv_prog_cc_pic_works=yes -- fi -- ;; -- *) -- lt_cv_prog_cc_pic_works=yes -- ;; -- esac -- ], [dnl -- lt_cv_prog_cc_pic_works=no -- ]) -- CFLAGS="$save_CFLAGS" -- ]) -+# How to pass a linker flag through the compiler. -+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - -- if test "X$lt_cv_prog_cc_pic_works" = Xno; then -- lt_cv_prog_cc_pic= -- lt_cv_prog_cc_can_build_shared=no -- else -- lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" -- fi -+# Object file suffix (normally "o"). -+objext="$ac_objext" - -- AC_MSG_RESULT([$lt_cv_prog_cc_pic_works]) --fi -+# Old archive suffix (normally "a"). -+libext="$libext" - --# Check for any special shared library compilation flags. --if test -n "$lt_cv_prog_cc_shlib"; then -- AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) -- if echo "$old_CC $old_CFLAGS " | egrep -e "[[ ]]$lt_cv_prog_cc_shlib[[ ]]" >/dev/null; then : -- else -- AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) -- lt_cv_prog_cc_can_build_shared=no -- fi --fi -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' - --AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works]) --AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl -- lt_cv_prog_cc_static_works=no -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" -- AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes]) -- LDFLAGS="$save_LDFLAGS" --]) -+# Executable file suffix (normally ""). -+exeext="$exeext" - --# Belt *and* braces to stop my trousers falling down: --test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= --AC_MSG_RESULT([$lt_cv_prog_cc_static_works]) -- --pic_flag="$lt_cv_prog_cc_pic" --special_shlib_compile_flags="$lt_cv_prog_cc_shlib" --wl="$lt_cv_prog_cc_wl" --link_static_flag="$lt_cv_prog_cc_static" --no_builtin_flag="$lt_cv_prog_cc_no_builtin" --can_build_shared="$lt_cv_prog_cc_can_build_shared" -- -- --# Check to see if options -o and -c are simultaneously supported by compiler --AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext]) --AC_CACHE_VAL([lt_cv_compiler_c_o], [ --$rm -r conftest 2>/dev/null --mkdir conftest --cd conftest --echo "int some_variable = 0;" > conftest.$ac_ext --mkdir out --# According to Tom Tromey, Ian Lance Taylor reported there are C compilers --# that will create temporary files in the current directory regardless of --# the output directory. Thus, making CWD read-only will cause this test --# to fail, enabling locking or at least warning the user not to do parallel --# builds. --chmod -w . --save_CFLAGS="$CFLAGS" --CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" --compiler_c_o=no --if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s out/conftest.err; then -- lt_cv_compiler_c_o=no -- else -- lt_cv_compiler_c_o=yes -- fi --else -- # Append any errors to the config.log. -- cat out/conftest.err 1>&AC_FD_CC -- lt_cv_compiler_c_o=no --fi --CFLAGS="$save_CFLAGS" --chmod u+w . --$rm conftest* out/* --rmdir out --cd .. --rmdir conftest --$rm -r conftest 2>/dev/null --]) --compiler_c_o=$lt_cv_compiler_c_o --AC_MSG_RESULT([$compiler_c_o]) -+# Additional compiler flags for building library objects. -+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -+pic_mode=$pic_mode - --if test x"$compiler_c_o" = x"yes"; then -- # Check to see if we can write to a .lo -- AC_MSG_CHECKING([if $compiler supports -c -o file.lo]) -- AC_CACHE_VAL([lt_cv_compiler_o_lo], [ -- lt_cv_compiler_o_lo=no -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -c -o conftest.lo" -- save_objext="$ac_objext" -- ac_objext=lo -- AC_TRY_COMPILE([], [int some_variable = 0;], [dnl -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s conftest.err; then -- lt_cv_compiler_o_lo=no -- else -- lt_cv_compiler_o_lo=yes -- fi -- ]) -- ac_objext="$save_objext" -- CFLAGS="$save_CFLAGS" -- ]) -- compiler_o_lo=$lt_cv_compiler_o_lo -- AC_MSG_RESULT([$compiler_o_lo]) --else -- compiler_o_lo=no --fi -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len - --# Check to see if we can do hard links to lock some files if needed --hard_links="nottested" --if test "$compiler_c_o" = no && test "$need_locks" != no; then -- # do not overwrite the value of need_locks provided by the user -- AC_MSG_CHECKING([if we can lock with hard links]) -- hard_links=yes -- $rm conftest* -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- touch conftest.a -- ln conftest.a conftest.b 2>&5 || hard_links=no -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- AC_MSG_RESULT([$hard_links]) -- if test "$hard_links" = no; then -- AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe]) -- need_locks=warn -- fi --else -- need_locks=no --fi -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) - --if test "$GCC" = yes; then -- # Check to see if options -fno-rtti -fno-exceptions are supported by compiler -- AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions]) -- echo "int some_variable = 0;" > conftest.$ac_ext -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" -- compiler_rtti_exceptions=no -- AC_TRY_COMPILE([], [int some_variable = 0;], [dnl -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s conftest.err; then -- compiler_rtti_exceptions=no -- else -- compiler_rtti_exceptions=yes -- fi -- ]) -- CFLAGS="$save_CFLAGS" -- AC_MSG_RESULT([$compiler_rtti_exceptions]) -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks - -- if test "$compiler_rtti_exceptions" = "yes"; then -- no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' -- else -- no_builtin_flag=' -fno-builtin' -- fi --fi -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix - --# See if the linker supports building shared libraries. --AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries]) -+# Do we need a version for libraries? -+need_version=$need_version - --allow_undefined_flag= --no_undefined_flag= --need_lib_prefix=unknown --need_version=unknown --# when you set need_version to no, make sure it does not cause -set_version --# flags to be left without arguments --archive_cmds= --archive_expsym_cmds= --old_archive_from_new_cmds= --old_archive_from_expsyms_cmds= --export_dynamic_flag_spec= --whole_archive_flag_spec= --thread_safe_flag_spec= --hardcode_into_libs=no --hardcode_libdir_flag_spec= --hardcode_libdir_separator= --hardcode_direct=no --hardcode_minus_L=no --hardcode_shlibpath_var=unsupported --runpath_var= --link_all_deplibs=unknown --always_export_symbols=no --export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols' --# include_expsyms should be a list of space-separated symbols to be *always* --# included in the symbol list --include_expsyms= --# exclude_expsyms can be an egrep regular expression of symbols to exclude --# it will be wrapped by ` (' and `)$', so one must not match beginning or --# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', --# as well as any symbol that contains `d'. --exclude_expsyms="_GLOBAL_OFFSET_TABLE_" --# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out --# platforms (ab)use it in PIC code, but their linkers get confused if --# the symbol is explicitly referenced. Since portable code cannot --# rely on this symbol name, it's probably fine to never include it in --# preloaded symbol tables. --extract_expsyms_cmds= -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen - --case $host_os in --cygwin* | mingw* | pw32*) -- # FIXME: the MSVC++ port hasn't been tested in a loooong time -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- if test "$GCC" != yes; then -- with_gnu_ld=no -- fi -- ;; --openbsd*) -- with_gnu_ld=no -- ;; --esac -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self - --ld_shlibs=yes --if test "$with_gnu_ld" = yes; then -- # If archive_cmds runs LD, not CC, wlarc should be empty -- wlarc='${wl}' -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static - -- # See if GNU ld supports shared libraries. -- case $host_os in -- aix3* | aix4* | aix5*) -- # On AIX, the GNU linker is very broken -- # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available. -- ld_shlibs=no -- cat <&2 -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) - --*** Warning: the GNU linker, at least up to release 2.9.1, is reported --*** to be unable to reliably create shared libraries on AIX. --*** Therefore, libtool is disabling shared libraries support. If you --*** really care for shared libraries, you may want to modify your PATH --*** so that a non-GNU linker is found, and then restart. -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) - --EOF -- ;; -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) - -- amigaos*) -- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- -- # Samuel A. Falvo II reports -- # that the semantics of dynamic libraries on AmigaOS, at least up -- # to version 4, is to share data among multiple programs linked -- # with the same dynamic library. Since this doesn't match the -- # behavior of shared libraries on other platforms, we can use -- # them. -- ld_shlibs=no -- ;; -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) - -- beos*) -- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- allow_undefined_flag=unsupported -- # Joseph Beckenbach says some releases of gcc -- # support --undefined. This deserves some investigation. FIXME -- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- else -- ld_shlibs=no -- fi -- ;; -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) - -- cygwin* | mingw* | pw32*) -- # hardcode_libdir_flag_spec is actually meaningless, as there is -- # no search path for DLLs. -- hardcode_libdir_flag_spec='-L$libdir' -- allow_undefined_flag=unsupported -- always_export_symbols=yes -- -- extract_expsyms_cmds='test -f $output_objdir/impgen.c || \ -- sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~ -- test -f $output_objdir/impgen.exe || (cd $output_objdir && \ -- if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \ -- else $CC -o impgen impgen.c ; fi)~ -- $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' -- -- old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' -- -- # cygwin and mingw dlls have different entry points and sets of symbols -- # to exclude. -- # FIXME: what about values for MSVC? -- dll_entry=__cygwin_dll_entry@12 -- dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~ -- case $host_os in -- mingw*) -- # mingw values -- dll_entry=_DllMainCRTStartup@12 -- dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~ -- ;; -- esac -+# Library versioning type. -+version_type=$version_type - -- # mingw and cygwin differ, and it's simplest to just exclude the union -- # of the two symbol sets. -- dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12 -- -- # recent cygwin and mingw systems supply a stub DllMain which the user -- # can override, but on older systems we have to supply one (in ltdll.c) -- if test "x$lt_cv_need_dllmain" = "xyes"; then -- ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " -- ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ -- test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' -- else -- ltdll_obj= -- ltdll_cmds= -- fi -+# Format of library name prefix. -+libname_spec=$lt_libname_spec - -- # Extract the symbol export list from an `--export-all' def file, -- # then regenerate the def file from the symbol export list, so that -- # the compiled dll only exports the symbol export list. -- # Be careful not to strip the DATA tag left be newer dlltools. -- export_symbols_cmds="$ltdll_cmds"' -- $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ -- sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' -- -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is. -- # If DATA tags from a recent dlltool are present, honour them! -- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname-def; -- else -- echo EXPORTS > $output_objdir/$soname-def; -- _lt_hint=1; -- cat $export_symbols | while read symbol; do -- set dummy \$symbol; -- case \[$]# in -- 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; -- *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; -- esac; -- _lt_hint=`expr 1 + \$_lt_hint`; -- done; -- fi~ -- '"$ltdll_cmds"' -- $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ -- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~ -- $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ -- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~ -- $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags' -- ;; -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec - -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -- wlarc= -- else -- archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- fi -- ;; -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec - -- solaris* | sysv5*) -- if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then -- ld_shlibs=no -- cat <&2 -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds - --*** Warning: The releases 2.8.* of the GNU linker cannot reliably --*** create shared libraries on Solaris systems. Therefore, libtool --*** is disabling shared libraries support. We urge you to upgrade GNU --*** binutils to release 2.9.1 or newer. Another option is to modify --*** your PATH or compiler configuration so that the native linker is --*** used, and then restart. -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) - --EOF -- elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- ld_shlibs=no -- fi -- ;; -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) - -- sunos4*) -- archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- wlarc= -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) -+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds - -- *) -- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- ld_shlibs=no -- fi -- ;; -- esac -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) -+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) - -- if test "$ld_shlibs" = yes; then -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec='${wl}--export-dynamic' -- case $host_os in -- cygwin* | mingw* | pw32*) -- # dlltool doesn't understand --whole-archive et. al. -- whole_archive_flag_spec= -- ;; -- *) -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec= -- fi -- ;; -- esac -- fi --else -- # PORTME fill in a description of your system's linker (not GNU ld) -- case $host_os in -- aix3*) -- allow_undefined_flag=unsupported -- always_export_symbols=yes -- archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -- # Note: this linker hardcodes the directories in LIBPATH if there -- # are no directories specified by -L. -- hardcode_minus_L=yes -- if test "$GCC" = yes && test -z "$link_static_flag"; then -- # Neither direct hardcoding nor static linking is supported with a -- # broken collect2. -- hardcode_direct=unsupported -- fi -- ;; -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib - -- aix4* | aix5*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- aix_use_runtimelinking=no -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) -+ -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) - -- # Test if we are trying to use run time linking or normal -- # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -- for ld_flag in $LDFLAGS; do -- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -- aix_use_runtimelinking=yes -- break -- fi -- done -- esac -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=$lt_deplibs_check_method - -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi -+# Command to use when deplibs_check_method == file_magic. -+file_magic_cmd=$lt_file_magic_cmd - -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) - -- hardcode_direct=yes -- archive_cmds='' -- hardcode_libdir_separator=':' -- if test "$GCC" = yes; then -- case $host_os in aix4.[[012]]|aix4.[[012]].*) -- collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- hardcode_direct=yes -- else -- # We have old collect2 -- hardcode_direct=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- hardcode_minus_L=yes -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_libdir_separator= -- fi -- esac -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) - -- shared_flag='-shared' -- else -- # not using gcc -- if test "$host_cpu" = ia64; then -- shared_flag='${wl}-G' -- else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -- fi -- fi -- fi -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds - -- # It seems that -bexpall can do strange things, so it is better to -- # generate a list of symbols to export. -- always_export_symbols=yes -- if test "$aix_use_runtimelinking" = yes; then -- # Warning - without using the other runtime loading flags (-brtl), -- # -berok will link without error, but may produce a broken library. -- allow_undefined_flag='-berok' -- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' -- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -- if test "$host_cpu" = ia64; then -- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -- allow_undefined_flag="-z nodefs" -- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" -- else -- hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- allow_undefined_flag='${wl}-berok' -- # This is a bit strange, but is similar to how AIX traditionally builds -- # it's shared libraries. -- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' -- fi -- fi -- ;; -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval -+ -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -- amigaos*) -- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- # see comment about different semantics on the GNU ld section -- ld_shlibs=no -- ;; -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -- cygwin* | mingw* | pw32*) -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- # hardcode_libdir_flag_spec is actually meaningless, as there is -- # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- ;; -- -- darwin* | rhapsody*) -- case "$host_os" in -- rhapsody* | darwin1.[[012]]) -- allow_undefined_flag='-undefined suppress' -- ;; -- *) # Darwin 1.3 on -- allow_undefined_flag='-flat_namespace -undefined suppress' -- ;; -- esac -- # FIXME: Relying on posixy $() will cause problems for -- # cross-compilation, but unfortunately the echo tests do not -- # yet detect zsh echo's removal of \ escapes. -- archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' -- # We need to add '_' to the symbols in $export_symbols first -- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- whole_archive_flag_spec='-all_load $convenience' -- ;; -- -- freebsd1*) -- ld_shlibs=no -- ;; -- -- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -- # support. Future versions do this automatically, but an explicit c++rt0.o -- # does not break anything, and helps significantly (at the cost of a little -- # extra space). -- freebsd2.2*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var - -- # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_minus_L=yes -- hardcode_shlibpath_var=no -- ;; -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var - -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -- hpux9* | hpux10* | hpux11*) -- case $host_os in -- hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;; -- *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; -- esac -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator=: -- hardcode_direct=yes -- hardcode_minus_L=yes # Not in the search PATH, but as the default -- # location of the library. -- export_dynamic_flag_spec='${wl}-E' -- ;; -+# How to hardcode a shared library path into an executable. -+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) - -- irix5* | irix6*) -- if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- fi -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- link_all_deplibs=yes -- ;; -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs - -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -- else -- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -- fi -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) - -- newsos6) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- hardcode_shlibpath_var=no -- ;; -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) - -- openbsd*) -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- export_dynamic_flag_spec='${wl}-E' -- else -- case "$host_os" in -- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-R$libdir' -- ;; -- *) -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- ;; -- esac -- fi -- ;; -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) - -- os2*) -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- allow_undefined_flag=unsupported -- archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -- ;; -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) - -- osf3*) -- if test "$GCC" = yes; then -- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- fi -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- ;; -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) - -- osf4* | osf5*) # as osf3* with the addition of -msym flag -- if test "$GCC" = yes; then -- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- else -- allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) - -- #Both c and cxx compiler support -rpath directly -- hardcode_libdir_flag_spec='-rpath $libdir' -- fi -- hardcode_libdir_separator=: -- ;; -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) - -- sco3.2v5*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var=no -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- export_dynamic_flag_spec='${wl}-Bexport' -- ;; -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" - -- solaris*) -- # gcc --version < 3.0 without binutils cannot create self contained -- # shared libraries reliably, requiring libgcc.a to resolve some of -- # the object symbols generated in some cases. Libraries that use -- # assert need libgcc.a to resolve __eprintf, for example. Linking -- # a copy of libgcc.a into every shared library to guarantee resolving -- # such symbols causes other problems: According to Tim Van Holder -- # , C++ libraries end up with a separate -- # (to the application) exception stack for one thing. -- no_undefined_flag=' -z defs' -- if test "$GCC" = yes; then -- case `$CC --version 2>/dev/null` in -- [[12]].*) -- cat <&2 -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) - --*** Warning: Releases of GCC earlier than version 3.0 cannot reliably --*** create self contained shared libraries on Solaris systems, without --*** introducing a dependency on libgcc.a. Therefore, libtool is disabling --*** -no-undefined support, which will at least allow you to build shared --*** libraries. However, you may find that when you link such libraries --*** into an application without using GCC, you have to manually add --*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to --*** upgrade to a newer version of GCC. Another option is to rebuild your --*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer. -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - --EOF -- no_undefined_flag= -- ;; -- esac -- fi -- # $CC -shared without GNU ld will not create a library from C++ -- # object files and a static libstdc++, better avoid it by now -- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_shlibpath_var=no -- case $host_os in -- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -- *) # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; -- esac -- link_all_deplibs=yes -- ;; -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -- sunos4*) -- if test "x$host_vendor" = xsequent; then -- # Use $CC to link under sequent, because it throws in some extra .o -- # files that make .init and .fini sections work. -- archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -- fi -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_direct=yes -- hardcode_minus_L=yes -- hardcode_shlibpath_var=no -- ;; -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path - -- sysv4) -- if test "x$host_vendor" = xsno; then -- archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes # is this really true??? -- else -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=no #Motorola manual says yes, but my tests say they lie -- fi -- runpath_var='LD_RUN_PATH' -- hardcode_shlibpath_var=no -- ;; -+# Set to yes if exported symbols are required. -+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) - -- sysv4.3*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var=no -- export_dynamic_flag_spec='-Bexport' -- ;; -- -- sysv5*) -- no_undefined_flag=' -z text' -- # $CC -shared without GNU ld will not create a library from C++ -- # object files and a static libstdc++, better avoid it by now -- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -- hardcode_libdir_flag_spec= -- hardcode_shlibpath_var=no -- runpath_var='LD_RUN_PATH' -- ;; -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) - -- uts4*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_shlibpath_var=no -- ;; -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds - -- dgux*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_shlibpath_var=no -- ;; -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) - -- sysv4*MP*) -- if test -d /usr/nec; then -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var=no -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- ld_shlibs=yes -- fi -- ;; -+# Symbols that must always be exported. -+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) - -- sysv4.2uw2*) -- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_minus_L=no -- hardcode_shlibpath_var=no -- hardcode_runpath_var=yes -- runpath_var=LD_RUN_PATH -- ;; -+ifelse([$1],[], -+[# ### END LIBTOOL CONFIG], -+[# ### END LIBTOOL TAG CONFIG: $tagname]) - -- sysv5uw7* | unixware7*) -- no_undefined_flag='${wl}-z ${wl}text' -- if test "$GCC" = yes; then -- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- fi -- runpath_var='LD_RUN_PATH' -- hardcode_shlibpath_var=no -- ;; -+__EOF__ - -- *) -- ld_shlibs=no -+ifelse([$1],[], [ -+ case $host_os in -+ aix3*) -+ cat <<\EOF >> "$cfgfile" -+ -+# AIX sometimes has problems with the GCC collect2 program. For some -+# reason, if we set the COLLECT_NAMES environment variable, the problems -+# vanish in a puff of smoke. -+if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+fi -+EOF - ;; - esac --fi --AC_MSG_RESULT([$ld_shlibs]) --test "$ld_shlibs" = no && can_build_shared=no - --# Check hardcoding attributes. --AC_MSG_CHECKING([how to hardcode library paths into programs]) --hardcode_action= --if test -n "$hardcode_libdir_flag_spec" || \ -- test -n "$runpath_var"; then -+ # We use sed instead of cat because bash on DJGPP gets confused if -+ # if finds mixed CR/LF and LF-only lines. Since sed operates in -+ # text mode, it properly converts lines to CR/LF. This bash problem -+ # is reportedly fixed, but why not run on old versions too? -+ sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) - -- # We can hardcode non-existant directories. -- if test "$hardcode_direct" != no && -- # If the only mechanism to avoid hardcoding is shlibpath_var, we -- # have to relink, otherwise we might link with an installed library -- # when we should be linking with a yet-to-be-installed one -- ## test "$hardcode_shlibpath_var" != no && -- test "$hardcode_minus_L" != no; then -- # Linking always hardcodes the temporary library directory. -- hardcode_action=relink -- else -- # We can link without hardcoding, and we can hardcode nonexisting dirs. -- hardcode_action=immediate -- fi -+ mv -f "$cfgfile" "$ofile" || \ -+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -+ chmod +x "$ofile" -+]) - else -- # We cannot hardcode anything, or else we can only hardcode existing -- # directories. -- hardcode_action=unsupported -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi --AC_MSG_RESULT([$hardcode_action]) -+])# AC_LIBTOOL_CONFIG - --striplib= --old_striplib= --AC_MSG_CHECKING([whether stripping libraries is possible]) --if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -- test -z "$striplib" && striplib="$STRIP --strip-unneeded" -- AC_MSG_RESULT([yes]) --else -- AC_MSG_RESULT([no]) -+ -+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) -+# ------------------------------------------- -+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+ -+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -+ -+if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+ -+ AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], -+ lt_cv_prog_compiler_rtti_exceptions, -+ [-fno-rtti -fno-exceptions], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) - fi -+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI - --reload_cmds='$LD$reload_flag -o $output$reload_objs' --test -z "$deplibs_check_method" && deplibs_check_method=unknown - --# PORTME Fill in your ld.so characteristics --AC_MSG_CHECKING([dynamic linker characteristics]) --library_names_spec= --libname_spec='lib$name' --soname_spec= --postinstall_cmds= --postuninstall_cmds= --finish_cmds= --finish_eval= --shlibpath_var= --shlibpath_overrides_runpath=unknown --version_type=none --dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+# --------------------------------- -+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -+[AC_REQUIRE([AC_CANONICAL_HOST]) -+AC_REQUIRE([LT_AC_PROG_SED]) -+AC_REQUIRE([AC_PROG_NM]) -+AC_REQUIRE([AC_OBJEXT]) -+# Check for command to grab the raw symbol name followed by C symbol from nm. -+AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -+[ -+# These are sane defaults that work on at least a few old systems. -+# [They come from Ultrix. What could be older than Ultrix?!! ;)] -+ -+# Character class describing NM global symbol codes. -+symcode='[[BCDEGRST]]' -+ -+# Regexp to match symbols that can be accessed directly from C. -+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -+ -+# Transform an extracted symbol line into a proper C declaration -+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" -+ -+# Transform an extracted symbol line into symbol name and symbol address -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ -+# Define system-specific variables. -+case $host_os in -+aix*) -+ symcode='[[BCDT]]' -+ ;; -+cygwin* | mingw* | pw32*) -+ symcode='[[ABCDGISTW]]' -+ ;; -+hpux*) # Its linker distinguishes data from code symbols -+ if test "$host_cpu" = ia64; then -+ symcode='[[ABCDEGRST]]' -+ fi -+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ ;; -+linux* | k*bsd*-gnu) -+ if test "$host_cpu" = ia64; then -+ symcode='[[ABCDGIRSTW]]' -+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ fi -+ ;; -+irix* | nonstopux*) -+ symcode='[[BCDEGRST]]' -+ ;; -+osf*) -+ symcode='[[BCDEGQRST]]' -+ ;; -+solaris*) -+ symcode='[[BDRT]]' -+ ;; -+sco3.2v5*) -+ symcode='[[DT]]' -+ ;; -+sysv4.2uw2*) -+ symcode='[[DT]]' -+ ;; -+sysv5* | sco5v6* | unixware* | OpenUNIX*) -+ symcode='[[ABDT]]' -+ ;; -+sysv4) -+ symcode='[[DFNSTU]]' -+ ;; -+esac -+ -+# Handle CRLF in mingw tool chain -+opt_cr= -+case $build_os in -+mingw*) -+ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -+ ;; -+esac -+ -+# If we're using GNU nm, then use its standard symbol codes. -+case `$NM -V 2>&1` in -+*GNU* | *'with BFD'*) -+ symcode='[[ABCDGIRSTW]]' ;; -+esac -+ -+# Try without a prefix undercore, then with it. -+for ac_symprfx in "" "_"; do -+ -+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -+ symxfrm="\\1 $ac_symprfx\\2 \\2" -+ -+ # Write the raw and C identifiers. -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" -+ -+ # Check to see that the pipe works correctly. -+ pipe_works=no -+ -+ rm -f conftest* -+ cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then -+ # Try sorting and uniquifying the output. -+ if sort "$nlist" | uniq > "$nlist"T; then -+ mv -f "$nlist"T "$nlist" -+ else -+ rm -f "$nlist"T -+ fi -+ -+ # Make sure that we snagged all the symbols we need. -+ if grep ' nm_test_var$' "$nlist" >/dev/null; then -+ if grep ' nm_test_func$' "$nlist" >/dev/null; then -+ cat < conftest.$ac_ext -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+EOF -+ # Now generate the symbol file. -+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' - --case $host_os in --aix3*) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix $libname.a' -- shlibpath_var=LIBPATH -+ cat <> conftest.$ac_ext -+#if defined (__STDC__) && __STDC__ -+# define lt_ptr_t void * -+#else -+# define lt_ptr_t char * -+# define const -+#endif - -- # AIX has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}.so$major' -- ;; -+/* The mapping between symbol names and symbols. */ -+const struct { -+ const char *name; -+ lt_ptr_t address; -+} -+lt_preloaded_symbols[[]] = -+{ -+EOF -+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext -+ cat <<\EOF >> conftest.$ac_ext -+ {0, (lt_ptr_t) 0} -+}; - --aix4* | aix5*) -- version_type=linux -- if test "$host_cpu" = ia64; then -- # AIX 5 supports IA64 -- library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' -- shlibpath_var=LD_LIBRARY_PATH -- else -- # With GCC up to 2.95.x, collect2 would create an import file -- # for dependence libraries. The import file would start with -- # the line `#! .'. This would cause the generated library to -- # depend on `.', always an invalid library. This was fixed in -- # development snapshots of GCC prior to 3.0. -- case $host_os in -- aix4 | aix4.[[01]] | aix4.[[01]].*) -- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -- echo ' yes ' -- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -- : -+#ifdef __cplusplus -+} -+#endif -+EOF -+ # Now try linking the two files. -+ mv conftest.$ac_objext conftstm.$ac_objext -+ lt_save_LIBS="$LIBS" -+ lt_save_CFLAGS="$CFLAGS" -+ LIBS="conftstm.$ac_objext" -+ CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" -+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then -+ pipe_works=yes -+ fi -+ LIBS="$lt_save_LIBS" -+ CFLAGS="$lt_save_CFLAGS" - else -- can_build_shared=no -+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi -- ;; -- esac -- # AIX (on Power*) has no versioning support, so currently we can -- # not hardcode correct soname into executable. Probably we can -- # add versioning support to collect2, so additional links can -- # be useful in future. -- if test "$aix_use_runtimelinking" = yes; then -- # If using run time linking (on AIX 4.2 or later) use lib.so -- # instead of lib.a to let people know that these are not -- # typical AIX shared libraries. -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ else -+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD -+ fi - else -- # We preserve .a as extension for shared libraries through AIX4.2 -- # and later when we are not doing run time linking. -- library_names_spec='${libname}${release}.a $libname.a' -- soname_spec='${libname}${release}.so$major' -+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi -- shlibpath_var=LIBPATH -+ else -+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD -+ cat conftest.$ac_ext >&5 - fi -- ;; -- --amigaos*) -- library_names_spec='$libname.ixlibrary $libname.a' -- # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' -- ;; -- --beos*) -- library_names_spec='${libname}.so' -- dynamic_linker="$host_os ld.so" -- shlibpath_var=LIBRARY_PATH -- ;; -+ rm -f conftest* conftst* - --bsdi4*) -- version_type=linux -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -- export_dynamic_flag_spec=-rdynamic -- # the default ld.so.conf also contains /usr/contrib/lib and -- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -- # libtool to hard-code these into programs -- ;; -+ # Do not use the global_symbol_pipe unless it works. -+ if test "$pipe_works" = yes; then -+ break -+ else -+ lt_cv_sys_global_symbol_pipe= -+ fi -+done -+]) -+if test -z "$lt_cv_sys_global_symbol_pipe"; then -+ lt_cv_sys_global_symbol_to_cdecl= -+fi -+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -+ AC_MSG_RESULT(failed) -+else -+ AC_MSG_RESULT(ok) -+fi -+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - --cygwin* | mingw* | pw32*) -- version_type=windows -- need_version=no -- need_lib_prefix=no -- case $GCC,$host_os in -- yes,cygwin*) -- library_names_spec='$libname.dll.a' -- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' -- postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ -- dldir=$destdir/`dirname \$dlpath`~ -- test -d \$dldir || mkdir -p \$dldir~ -- $install_prog .libs/$dlname \$dldir/$dlname' -- postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~ -- dlpath=$dir/\$dldll~ -- $rm \$dlpath' -- ;; -- yes,mingw*) -- library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` -- ;; -- yes,pw32*) -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' -- ;; -- *) -- library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib' -- ;; -- esac -- dynamic_linker='Win32 ld.exe' -- # FIXME: first we should search . and the directory the executable is in -- shlibpath_var=PATH -- ;; - --darwin* | rhapsody*) -- dynamic_linker="$host_os dyld" -- version_type=darwin -- need_lib_prefix=no -- need_version=no -- # FIXME: Relying on posixy $() will cause problems for -- # cross-compilation, but unfortunately the echo tests do not -- # yet detect zsh echo's removal of \ escapes. -- library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' -- soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' -- shlibpath_overrides_runpath=yes -- shlibpath_var=DYLD_LIBRARY_PATH -- ;; -+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) -+# --------------------------------------- -+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], -+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= -+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= - --freebsd1*) -- dynamic_linker=no -- ;; -+AC_MSG_CHECKING([for $compiler option to produce PIC]) -+ ifelse([$1],[CXX],[ -+ # C++ specific cases for pic, static, wl, etc. -+ if test "$GXX" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - --freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -- version_type=freebsd-$objformat -- case $version_type in -- freebsd-elf*) -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -- need_version=no -- need_lib_prefix=no -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi - ;; -- freebsd-*) -- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' -- need_version=yes -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; -- esac -- shlibpath_var=LD_LIBRARY_PATH -- case $host_os in -- freebsd2*) -- shlibpath_overrides_runpath=yes -- ;; -- *) -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -- esac -- ;; -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ mingw* | cygwin* | os2* | pw32*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ ;; -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -+ ;; -+ *djgpp*) -+ # DJGPP does not support shared libraries at all -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ ;; -+ interix[[3-9]]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -+ fi -+ ;; -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ else -+ case $host_os in -+ aix4* | aix5*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ else -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ chorus*) -+ case $cc_basename in -+ cxch68*) -+ # Green Hills C++ Compiler -+ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" -+ ;; -+ esac -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ esac -+ ;; -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ freebsd* | dragonfly*) -+ # FreeBSD uses GNU C++ -+ ;; -+ hpux9* | hpux10* | hpux11*) -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ if test "$host_cpu" != ia64; then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ fi -+ ;; -+ aCC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ ;; -+ esac -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ interix*) -+ # This is c89, which is MS Visual C++ (no shared libs) -+ # Anyone wants to do a port? -+ ;; -+ irix5* | irix6* | nonstopux*) -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ # CC pic flag -KPIC is the default. -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ KCC*) -+ # KAI C++ Compiler -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ icpc* | ecpc*) -+ # Intel C++ -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ pgCC*) -+ # Portland Group C++ compiler. -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ cxx*) -+ # Compaq C++ -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ lynxos*) -+ ;; -+ m88k*) -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ netbsd* | netbsdelf*-gnu) -+ ;; -+ osf3* | osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ cxx*) -+ # Digital/Compaq C++ -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ psos*) -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ lcc*) -+ # Lucid -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ esac -+ ;; -+ vxworks*) -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ esac -+ fi -+], -+[ -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - --gnu*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- hardcode_into_libs=yes -- ;; -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; - --hpux9* | hpux10* | hpux11*) -- # Give a soname corresponding to the major version so that dld.sl refuses to -- # link against other versions. -- dynamic_linker="$host_os dld.sl" -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- shlibpath_var=SHLIB_PATH -- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' -- soname_spec='${libname}${release}.sl$major' -- # HP-UX runs *really* slowly unless shared libraries are mode 555. -- postinstall_cmds='chmod 555 $lib' -- ;; -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -+ ;; - --irix5* | irix6*) -- version_type=irix -- need_lib_prefix=no -- need_version=no -- soname_spec='${libname}${release}.so$major' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' -- case $host_os in -- irix5*) -- libsuff= shlibsuff= -- ;; -- *) -- case $LD in # libtool.m4 will add one of these switches to LD -- *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; -- *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; -- *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; -- *) libsuff= shlibsuff= libmagic=never-match;; -- esac -- ;; -- esac -- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -- ;; -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; - --# No shared lib support for Linux oldld, aout, or coff. --linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) -- dynamic_linker=no -- ;; -+ mingw* | cygwin* | pw32* | os2*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ ;; - --# This must be Linux ELF. --linux-gnu*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- # This implies no fast_install, which is unacceptable. -- # Some rework will be needed to allow for fast_install -- # before this can be enabled. -- hardcode_into_libs=yes -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -+ ;; - -- # We used to test for /lib/ld.so.1 and disable shared libraries on -- # powerpc, because MkLinux only supported shared libraries with the -- # GNU dynamic linker. Since this was broken with cross compilers, -- # most powerpc-linux boxes support dynamic linking these days and -- # people can always --disable-shared, the test was removed, and we -- # assume the GNU/Linux dynamic linker is in use. -- dynamic_linker='GNU/Linux ld.so' -- ;; -+ interix[[3-9]]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; - --netbsd*) -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- dynamic_linker='NetBSD (a.out) ld.so' -- else -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -- soname_spec='${libname}${release}.so$major' -- dynamic_linker='NetBSD ld.elf_so' -- fi -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ enable_shared=no -+ ;; - --newsos6) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -+ fi -+ ;; - --openbsd*) -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- case "$host_os" in -- openbsd2.[[89]] | openbsd2.[[89]].*) -- shlibpath_overrides_runpath=no -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac - ;; -+ - *) -- shlibpath_overrides_runpath=yes -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else -- shlibpath_overrides_runpath=yes -- fi -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -- --os2*) -- libname_spec='$name' -- need_lib_prefix=no -- library_names_spec='$libname.dll $libname.a' -- dynamic_linker='OS/2 ld.exe' -- shlibpath_var=LIBPATH -- ;; -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ else -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ esac -+ ;; - --osf3* | osf4* | osf5*) -- version_type=osf -- need_version=no -- soname_spec='${libname}${release}.so' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -- ;; -+ mingw* | cygwin* | pw32* | os2*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ ;; - --sco3.2v5*) -- version_type=osf -- soname_spec='${libname}${release}.so$major' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -+ hpux9* | hpux10* | hpux11*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ ;; - --solaris*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- # ldd complains unless libraries are executable -- postinstall_cmds='chmod +x $lib' -- ;; -+ irix5* | irix6* | nonstopux*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC (with -KPIC) is the default. -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; - --sunos4*) -- version_type=sunos -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- fi -- need_version=yes -- ;; -+ newsos6) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- case $host_vendor in -- sni) -- shlibpath_overrides_runpath=no -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ icc* | ecc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ ccc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All Alpha code is PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' -+ ;; -+ esac -+ ;; -+ esac - ;; -- motorola) -- need_lib_prefix=no -- need_version=no -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ -+ osf3* | osf4* | osf5*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All OSF/1 code is PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; -- esac -- ;; - --uts4*) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -+ rdos*) -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; - --dgux*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -+ solaris*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -+ esac -+ ;; - --sysv4*MP*) -- if test -d /usr/nec ;then -- version_type=linux -- library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' -- soname_spec='$libname.so.$major' -- shlibpath_var=LD_LIBRARY_PATH -- fi -- ;; -+ sunos4*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --*) -- dynamic_linker=no -- ;; --esac --AC_MSG_RESULT([$dynamic_linker]) --test "$dynamic_linker" = no && can_build_shared=no -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --# Report the final consequences. --AC_MSG_CHECKING([if libtool supports shared libraries]) --AC_MSG_RESULT([$can_build_shared]) -+ sysv4*MP*) -+ if test -d /usr/nec ;then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; - --AC_MSG_CHECKING([whether to build shared libraries]) --test "$can_build_shared" = "no" && enable_shared=no -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --# On AIX, shared libraries and static libraries use the same namespace, and --# are all built from PIC. --case "$host_os" in --aix3*) -- test "$enable_shared" = yes && enable_static=no -- if test -n "$RANLIB"; then -- archive_cmds="$archive_cmds~\$RANLIB \$lib" -- postinstall_cmds='$RANLIB $lib' -- fi -- ;; -+ unicos*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; - --aix4*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -- fi -- ;; --esac --AC_MSG_RESULT([$enable_shared]) -+ uts4*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --AC_MSG_CHECKING([whether to build static libraries]) --# Make sure either enable_shared or enable_static is yes. --test "$enable_shared" = yes || enable_static=yes --AC_MSG_RESULT([$enable_static]) -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ esac -+ fi -+]) -+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) - --if test "$hardcode_action" = relink; then -- # Fast installation is not supported -- enable_fast_install=no --elif test "$shlibpath_overrides_runpath" = yes || -- test "$enable_shared" = no; then -- # Fast installation is not necessary -- enable_fast_install=needless -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then -+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], -+ _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), -+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], -+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in -+ "" | " "*) ;; -+ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; -+ esac], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) - fi -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" -+ ;; -+esac - --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --if test "$GCC" = yes; then -- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" --fi -+# -+# Check to make sure the static flag actually works. -+# -+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" -+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -+ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), -+ $lt_tmp_static_flag, -+ [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -+]) - --AC_LIBTOOL_DLOPEN_SELF - --if test "$enable_shared" = yes && test "$GCC" = yes; then -- case $archive_cmds in -- *'~'*) -- # FIXME: we may have to deal with multi-command sequences. -- ;; -- '$CC '*) -- # Test whether the compiler implicitly links with -lc since on some -- # systems, -lgcc has to come before -lc. If gcc already passes -lc -- # to ld, don't add -lc before -lgcc. -- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) -- AC_CACHE_VAL([lt_cv_archive_cmds_need_lc], -- [$rm conftest* -- echo 'static int dummy;' > conftest.$ac_ext -- -- if AC_TRY_EVAL(ac_compile); then -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$lt_cv_prog_cc_wl -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- save_allow_undefined_flag=$allow_undefined_flag -- allow_undefined_flag= -- if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) -- then -- lt_cv_archive_cmds_need_lc=no -- else -- lt_cv_archive_cmds_need_lc=yes -- fi -- allow_undefined_flag=$save_allow_undefined_flag -+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -+# ------------------------------------ -+# See if the linker supports building shared libraries. -+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+ifelse([$1],[CXX],[ -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ case $host_os in -+ aix4* | aix5*) -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else -- cat conftest.err 1>&5 -- fi]) -- AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc]) -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ fi -+ ;; -+ pw32*) -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -+ ;; -+ cygwin* | mingw*) -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ ;; -+ linux* | k*bsd*-gnu) -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no -+ ;; -+ *) -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ esac -+],[ -+ runpath_var= -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)= -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ _LT_AC_TAGVAR(archive_cmds, $1)= -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)= -+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= -+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no -+ _LT_AC_TAGVAR(module_cmds, $1)= -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)= -+ _LT_AC_TAGVAR(always_export_symbols, $1)=no -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ _LT_AC_TAGVAR(include_expsyms, $1)= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ _LT_CC_BASENAME([$compiler]) -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no - ;; - esac --fi --need_lc=${lt_cv_archive_cmds_need_lc-yes} - --# The second clause should only fire when bootstrapping the --# libtool distribution, otherwise you forgot to ship ltmain.sh --# with your package, and you will get complaints that there are --# no rules to generate ltmain.sh. --if test -f "$ltmain"; then -- : --else -- # If there is no Makefile yet, we rely on a make rule to execute -- # `config.status --recheck' to rerun these tests and create the -- # libtool script then. -- test -f Makefile && make "$ltmain" --fi -+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' - --if test -f "$ltmain"; then -- trap "$rm \"${ofile}T\"; exit 1" 1 2 15 -- $rm -f "${ofile}T" -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac - -- echo creating $ofile -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix3* | aix4* | aix5*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <&2 - -- # Now quote all the things that may contain metacharacters while being -- # careful not to overquote the AC_SUBSTed values. We take copies of the -- # variables and quote the copies for generation of the libtool script. -- for var in echo old_CC old_CFLAGS \ -- AR AR_FLAGS CC LD LN_S NM SHELL \ -- reload_flag reload_cmds wl \ -- pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ -- thread_safe_flag_spec whole_archive_flag_spec libname_spec \ -- library_names_spec soname_spec \ -- RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ -- old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \ -- postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \ -- old_striplib striplib file_magic_cmd export_symbols_cmds \ -- deplibs_check_method allow_undefined_flag no_undefined_flag \ -- finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ -- global_symbol_to_c_name_address \ -- hardcode_libdir_flag_spec hardcode_libdir_separator \ -- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -- compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do -+*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** to be unable to reliably create shared libraries on AIX. -+*** Therefore, libtool is disabling shared libraries support. If you -+*** really care for shared libraries, you may want to modify your PATH -+*** so that a non-GNU linker is found, and then restart. - -- case $var in -- reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ -- old_postinstall_cmds | old_postuninstall_cmds | \ -- export_symbols_cmds | archive_cmds | archive_expsym_cmds | \ -- extract_expsyms_cmds | old_archive_from_expsyms_cmds | \ -- postinstall_cmds | postuninstall_cmds | \ -- finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -- # Double-quote double-evaled strings. -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -- ;; -- *) -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+EOF -+ fi - ;; -- esac -- done - -- cat <<__EOF__ > "${ofile}T" --#! $SHELL -+ amigaos*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ -+ # Samuel A. Falvo II reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we can't use -+ # them. -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; - --# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. --# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) --# NOTE: Changes made to this file will be lost: look at ltmain.sh. --# --# Copyright (C) 1996-2000 Free Software Foundation, Inc. --# Originally by Gordon Matzigkeit , 1996 --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, but --# WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --# --# As a special exception to the GNU General Public License, if you --# distribute this file as part of a program that contains a --# configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --# Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="sed -e s/^X//" -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(always_export_symbols, $1)=no -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --# The HP-UX ksh and POSIX shell print the target directory to stdout --# if CDPATH is set. --if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -+ interix[[3-9]]*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; - --# ### BEGIN LIBTOOL CONFIG -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ if test $supports_anon_versioning = yes; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --# Shell to use when invoking shell scripts. --SHELL=$lt_SHELL -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -+ wlarc= -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; - --# Whether or not to build shared libraries. --build_libtool_libs=$enable_shared -+ solaris*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <&2 - --# Whether or not to build static libraries. --build_old_libs=$enable_static -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. - --# Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$need_lc -+EOF -+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --# Whether or not to optimize for fast installation. --fast_install=$enable_fast_install -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <<_LT_EOF 1>&2 - --# The host system. --host_alias=$host_alias --host=$host -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. - --# An echo program that does not interpret backslashes. --echo=$lt_echo -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; - --# The archiver. --AR=$lt_AR --AR_FLAGS=$lt_AR_FLAGS -+ sunos4*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# The default C compiler. --CC=$lt_CC -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac - --# Is the compiler the GNU C compiler? --with_gcc=$GCC -+ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then -+ runpath_var= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ fi -+ ;; - --# The linker used to build libraries. --LD=$lt_LD -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ else -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ fi -+ aix_use_runtimelinking=no - --# Whether we need hard or soft links. --LN_S=$lt_LN_S -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac - --# A BSD-compatible nm program. --NM=$lt_NM -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi - --# A symbol stripping program --STRIP=$STRIP -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ _LT_AC_TAGVAR(archive_cmds, $1)='' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi - --# Used to examine libraries when file_magic_cmd begins "file" --MAGIC_CMD=$MAGIC_CMD -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; - --# Used on cygwin: DLL creation program. --DLLTOOL="$DLLTOOL" -+ amigaos*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ # see comment about different semantics on the GNU ld section -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; - --# Used on cygwin: object dumper. --OBJDUMP="$OBJDUMP" -+ bsdi[[45]]*) -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic -+ ;; - --# Used on cygwin: assembler. --AS="$AS" -+ cygwin* | mingw* | pw32*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; - --# The name of the directory that contains temporary libtool files. --objdir=$objdir -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+ ;; - --# How to create reloadable object files. --reload_flag=$lt_reload_flag --reload_cmds=$lt_reload_cmds -+ dgux*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# How to pass a linker flag through the compiler. --wl=$lt_wl -+ freebsd1*) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; - --# Object file suffix (normally "o"). --objext="$ac_objext" -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# Old archive suffix (normally "a"). --libext="$libext" -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# Executable file suffix (normally ""). --exeext="$exeext" -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | dragonfly*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# Additional compiler flags for building library objects. --pic_flag=$lt_pic_flag --pic_mode=$pic_mode -+ hpux9*) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; - --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_compiler_c_o -+ hpux10*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ fi -+ ;; - --# Can we write directly to a .lo ? --compiler_o_lo=$lt_compiler_o_lo -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - --# Must we lock files when doing compilation ? --need_locks=$lt_need_locks -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ ;; -+ esac -+ fi -+ ;; - --# Do we need the lib prefix for modules? --need_lib_prefix=$need_lib_prefix -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ ;; - --# Do we need a version for libraries? --need_version=$need_version -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# Whether dlopen is supported. --dlopen_support=$enable_dlopen -+ newsos6) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# Whether dlopen of programs is supported. --dlopen_self=$enable_dlopen_self -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ else -+ case $host_os in -+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --# Whether dlopen of statically linked programs is supported. --dlopen_self_static=$enable_dlopen_self_static -+ os2*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; - --# Compiler flag to prevent dynamic linking. --link_static_flag=$lt_link_static_flag -+ osf3*) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; - --# Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_no_builtin_flag -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ else -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - --# Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_export_dynamic_flag_spec -+ # Both c and cxx compiler support -rpath directly -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; - --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_whole_archive_flag_spec -+ solaris*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ wlarc='' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -+ fi -+ ;; -+ esac -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ ;; - --# Compiler flag to generate thread-safe objects. --thread_safe_flag_spec=$lt_thread_safe_flag_spec -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# Library versioning type. --version_type=$version_type -+ sysv4) -+ case $host_vendor in -+ sni) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ ;; -+ motorola) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# Format of library name prefix. --libname_spec=$lt_libname_spec -+ sysv4.3*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' -+ ;; - --# List of archive names. First name is the real one, the rest are links. --# The last name is the one that the linker finds with -lNAME. --library_names_spec=$lt_library_names_spec -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes -+ fi -+ ;; - --# The coded name of the library, if different from the real name. --soname_spec=$lt_soname_spec -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; - --# Commands used to build and install an old-style archive. --RANLIB=$lt_RANLIB --old_archive_cmds=$lt_old_archive_cmds --old_postinstall_cmds=$lt_old_postinstall_cmds --old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; - --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_old_archive_from_new_cmds -+ uts4*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+]) -+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - --# Commands used to build and install a shared archive. --archive_cmds=$lt_archive_cmds --archive_expsym_cmds=$lt_archive_expsym_cmds --postinstall_cmds=$lt_postinstall_cmds --postuninstall_cmds=$lt_postuninstall_cmds -+# -+# Do we need to explicitly link libc? -+# -+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in -+x|xyes) -+ # Assume -lc should be added -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - --# Commands to strip libraries. --old_striplib=$lt_old_striplib --striplib=$lt_striplib -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $_LT_AC_TAGVAR(archive_cmds, $1) in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) -+ $rm conftest* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) -+ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)= -+ if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) -+ then -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ else -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ fi -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) -+ ;; -+ esac -+ fi -+ ;; -+esac -+])# AC_LIBTOOL_PROG_LD_SHLIBS - --# Method to check whether dependent libraries are shared objects. --deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == file_magic. --file_magic_cmd=$lt_file_magic_cmd -+# _LT_AC_FILE_LTDLL_C -+# ------------------- -+# Be careful that the start marker always follows a newline. -+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ -+# /* ltdll.c starts here */ -+# #define WIN32_LEAN_AND_MEAN -+# #include -+# #undef WIN32_LEAN_AND_MEAN -+# #include -+# -+# #ifndef __CYGWIN__ -+# # ifdef __CYGWIN32__ -+# # define __CYGWIN__ __CYGWIN32__ -+# # endif -+# #endif -+# -+# #ifdef __cplusplus -+# extern "C" { -+# #endif -+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -+# #ifdef __cplusplus -+# } -+# #endif -+# -+# #ifdef __CYGWIN__ -+# #include -+# DECLARE_CYGWIN_DLL( DllMain ); -+# #endif -+# HINSTANCE __hDllInstance_base; -+# -+# BOOL APIENTRY -+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -+# { -+# __hDllInstance_base = hInst; -+# return TRUE; -+# } -+# /* ltdll.c ends here */ -+])# _LT_AC_FILE_LTDLL_C - --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_allow_undefined_flag - --# Flag that forces no undefined symbols. --no_undefined_flag=$lt_no_undefined_flag -+# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -+# --------------------------------- -+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) - --# Commands used to finish a libtool library installation in a directory. --finish_cmds=$lt_finish_cmds - --# Same as above, but a single script fragment to be evaled but not shown. --finish_eval=$lt_finish_eval -+# old names -+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -+AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -+AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -+AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) - --# Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_global_symbol_pipe -+# This is just to silence aclocal about the macro not being used -+ifelse([AC_DISABLE_FAST_INSTALL]) - --# Transform the output of nm in a proper C declaration --global_symbol_to_cdecl=$lt_global_symbol_to_cdecl -+AC_DEFUN([LT_AC_PROG_GCJ], -+[AC_CHECK_TOOL(GCJ, gcj, no) -+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -+ AC_SUBST(GCJFLAGS) -+]) - --# Transform the output of nm in a C name address pair --global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address -+AC_DEFUN([LT_AC_PROG_RC], -+[AC_CHECK_TOOL(RC, windres, no) -+]) - --# This is the shared library runtime path variable. --runpath_var=$runpath_var - --# This is the shared library path variable. --shlibpath_var=$shlibpath_var -+# Cheap backport of AS_EXECUTABLE_P and required macros -+# from Autoconf 2.59; we should not use $as_executable_p directly. - --# Is shlibpath searched before the hard-coded library search path? --shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+# _AS_TEST_PREPARE -+# ---------------- -+m4_ifndef([_AS_TEST_PREPARE], -+[m4_defun([_AS_TEST_PREPARE], -+[if test -x / >/dev/null 2>&1; then -+ as_executable_p='test -x' -+else -+ as_executable_p='test -f' -+fi -+])])# _AS_TEST_PREPARE - --# How to hardcode a shared library path into an executable. --hardcode_action=$hardcode_action -+# AS_EXECUTABLE_P -+# --------------- -+# Check whether a file is executable. -+m4_ifndef([AS_EXECUTABLE_P], -+[m4_defun([AS_EXECUTABLE_P], -+[AS_REQUIRE([_AS_TEST_PREPARE])dnl -+$as_executable_p $1[]dnl -+])])# AS_EXECUTABLE_P -+ -+# NOTE: This macro has been submitted for inclusion into # -+# GNU Autoconf as AC_PROG_SED. When it is available in # -+# a released version of Autoconf we should remove this # -+# macro and use it instead. # -+# LT_AC_PROG_SED -+# -------------- -+# Check for a fully-functional sed program, that truncates -+# as few characters as possible. Prefer GNU sed if found. -+AC_DEFUN([LT_AC_PROG_SED], -+[AC_MSG_CHECKING([for a sed that does not truncate output]) -+AC_CACHE_VAL(lt_cv_path_SED, -+[# Loop through the user's path and test for sed and gsed. -+# Then use that list of sed's as ones to test for truncation. -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for lt_ac_prog in sed gsed; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then -+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" -+ fi -+ done -+ done -+done -+IFS=$as_save_IFS -+lt_ac_max=0 -+lt_ac_count=0 -+# Add /usr/xpg4/bin/sed as it is typically found on Solaris -+# along with /bin/sed that truncates output. -+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -+ test ! -f $lt_ac_sed && continue -+ cat /dev/null > conftest.in -+ lt_ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in -+ # Check for GNU sed and select it if it is found. -+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -+ lt_cv_path_SED=$lt_ac_sed -+ break -+ fi -+ while true; do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo >>conftest.nl -+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -+ cmp -s conftest.out conftest.nl || break -+ # 10000 chars as input seems more than enough -+ test $lt_ac_count -gt 10 && break -+ lt_ac_count=`expr $lt_ac_count + 1` -+ if test $lt_ac_count -gt $lt_ac_max; then -+ lt_ac_max=$lt_ac_count -+ lt_cv_path_SED=$lt_ac_sed -+ fi -+ done -+done -+]) -+SED=$lt_cv_path_SED -+AC_SUBST([SED]) -+AC_MSG_RESULT([$SED]) -+]) - --# Whether we should hardcode library paths into libraries. --hardcode_into_libs=$hardcode_into_libs -+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# Flag to hardcode \$libdir into a binary during linking. --# This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -+# AM_AUTOMAKE_VERSION(VERSION) -+# ---------------------------- -+# Automake X.Y traces this macro to ensure aclocal.m4 has been -+# generated from the m4 files accompanying Automake X.Y. -+# (This private macro should not be called outside this file.) -+AC_DEFUN([AM_AUTOMAKE_VERSION], -+[am__api_version='1.10' -+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -+dnl require some minimum version. Point them to the right macro. -+m4_if([$1], [1.10], [], -+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -+]) - --# Whether we need a single -rpath flag with a separated argument. --hardcode_libdir_separator=$lt_hardcode_libdir_separator -+# _AM_AUTOCONF_VERSION(VERSION) -+# ----------------------------- -+# aclocal traces this macro to find the Autoconf version. -+# This is a private macro too. Using m4_define simplifies -+# the logic in aclocal, which can simply ignore this definition. -+m4_define([_AM_AUTOCONF_VERSION], []) -+ -+# AM_SET_CURRENT_AUTOMAKE_VERSION -+# ------------------------------- -+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -+[AM_AUTOMAKE_VERSION([1.10])dnl -+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) - --# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the --# resulting binary. --hardcode_direct=$hardcode_direct -+# AM_AUX_DIR_EXPAND -*- Autoconf -*- - --# Set to yes if using the -LDIR flag during linking hardcodes DIR into the --# resulting binary. --hardcode_minus_L=$hardcode_minus_L -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -+# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -+# -+# Of course, Automake must honor this variable whenever it calls a -+# tool from the auxiliary directory. The problem is that $srcdir (and -+# therefore $ac_aux_dir as well) can be either absolute or relative, -+# depending on how configure is run. This is pretty annoying, since -+# it makes $ac_aux_dir quite unusable in subdirectories: in the top -+# source directory, any form will work fine, but in subdirectories a -+# relative path needs to be adjusted first. -+# -+# $ac_aux_dir/missing -+# fails when called from a subdirectory if $ac_aux_dir is relative -+# $top_srcdir/$ac_aux_dir/missing -+# fails if $ac_aux_dir is absolute, -+# fails when called from a subdirectory in a VPATH build with -+# a relative $ac_aux_dir -+# -+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -+# are both prefixed by $srcdir. In an in-source build this is usually -+# harmless because $srcdir is `.', but things will broke when you -+# start a VPATH build or use an absolute $srcdir. -+# -+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -+# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -+# and then we would define $MISSING as -+# MISSING="\${SHELL} $am_aux_dir/missing" -+# This will work as long as MISSING is not called from configure, because -+# unfortunately $(top_srcdir) has no meaning in configure. -+# However there are other variables, like CC, which are often used in -+# configure, and could therefore not use this "fixed" $ac_aux_dir. -+# -+# Another solution, used here, is to always expand $ac_aux_dir to an -+# absolute PATH. The drawback is that using absolute paths prevent a -+# configured tree to be moved without reconfiguration. - --# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into --# the resulting binary. --hardcode_shlibpath_var=$hardcode_shlibpath_var -+AC_DEFUN([AM_AUX_DIR_EXPAND], -+[dnl Rely on autoconf to set up CDPATH properly. -+AC_PREREQ([2.50])dnl -+# expand $ac_aux_dir to an absolute path -+am_aux_dir=`cd $ac_aux_dir && pwd` -+]) - --# Variables whose values should be saved in libtool wrapper scripts and --# restored at relink time. --variables_saved_for_relink="$variables_saved_for_relink" -+# AM_CONDITIONAL -*- Autoconf -*- - --# Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$link_all_deplibs -+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# Compile-time system search path for libraries --sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+# serial 8 - --# Run-time system search path for libraries --sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+# AM_CONDITIONAL(NAME, SHELL-CONDITION) -+# ------------------------------------- -+# Define a conditional. -+AC_DEFUN([AM_CONDITIONAL], -+[AC_PREREQ(2.52)dnl -+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -+AC_SUBST([$1_TRUE])dnl -+AC_SUBST([$1_FALSE])dnl -+_AM_SUBST_NOTMAKE([$1_TRUE])dnl -+_AM_SUBST_NOTMAKE([$1_FALSE])dnl -+if $2; then -+ $1_TRUE= -+ $1_FALSE='#' -+else -+ $1_TRUE='#' -+ $1_FALSE= -+fi -+AC_CONFIG_COMMANDS_PRE( -+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -+ AC_MSG_ERROR([[conditional "$1" was never defined. -+Usually this means the macro was only invoked conditionally.]]) -+fi])]) - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path" -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# Set to yes if exported symbols are required. --always_export_symbols=$always_export_symbols -+# serial 9 - --# The commands to list exported symbols. --export_symbols_cmds=$lt_export_symbols_cmds -+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -+# written in clear, in which case automake, when reading aclocal.m4, -+# will think it sees a *use*, and therefore will trigger all it's -+# C support machinery. Also note that it means that autoscan, seeing -+# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - --# The commands to extract the exported symbol list from a shared archive. --extract_expsyms_cmds=$lt_extract_expsyms_cmds - --# Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_exclude_expsyms -+# _AM_DEPENDENCIES(NAME) -+# ---------------------- -+# See how the compiler implements dependency checking. -+# NAME is "CC", "CXX", "GCJ", or "OBJC". -+# We try a few techniques and use that to set a single cache variable. -+# -+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -+# dependency, and given that the user is not expected to run this macro, -+# just rely on AC_PROG_CC. -+AC_DEFUN([_AM_DEPENDENCIES], -+[AC_REQUIRE([AM_SET_DEPDIR])dnl -+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -+AC_REQUIRE([AM_MAKE_INCLUDE])dnl -+AC_REQUIRE([AM_DEP_TRACK])dnl - --# Symbols that must always be exported. --include_expsyms=$lt_include_expsyms -+ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -+ [$1], CXX, [depcc="$CXX" am_compiler_list=], -+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -+ [$1], UPC, [depcc="$UPC" am_compiler_list=], -+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -+ [depcc="$$1" am_compiler_list=]) - --# ### END LIBTOOL CONFIG -+AC_CACHE_CHECK([dependency style of $depcc], -+ [am_cv_$1_dependencies_compiler_type], -+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub - --__EOF__ -+ am_cv_$1_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -- case $host_os in -- aix3*) -- cat <<\EOF >> "${ofile}T" -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_$1_dependencies_compiler_type=$depmode -+ break -+ fi -+ fi -+ done - --# AIX sometimes has problems with the GCC collect2 program. For some --# reason, if we set the COLLECT_NAMES environment variable, the problems --# vanish in a puff of smoke. --if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES -+ cd .. -+ rm -rf conftest.dir -+else -+ am_cv_$1_dependencies_compiler_type=none - fi --EOF -- ;; -- esac -+]) -+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -+AM_CONDITIONAL([am__fastdep$1], [ -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -+]) - -- case $host_os in -- cygwin* | mingw* | pw32* | os2*) -- cat <<'EOF' >> "${ofile}T" -- # This is a source program that is used to create dlls on Windows -- # Don't remove nor modify the starting and closing comments --# /* ltdll.c starts here */ --# #define WIN32_LEAN_AND_MEAN --# #include --# #undef WIN32_LEAN_AND_MEAN --# #include --# --# #ifndef __CYGWIN__ --# # ifdef __CYGWIN32__ --# # define __CYGWIN__ __CYGWIN32__ --# # endif --# #endif --# --# #ifdef __cplusplus --# extern "C" { --# #endif --# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); --# #ifdef __cplusplus --# } --# #endif --# --# #ifdef __CYGWIN__ --# #include --# DECLARE_CYGWIN_DLL( DllMain ); --# #endif --# HINSTANCE __hDllInstance_base; --# --# BOOL APIENTRY --# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) --# { --# __hDllInstance_base = hInst; --# return TRUE; --# } --# /* ltdll.c ends here */ -- # This is a source program that is used to create import libraries -- # on Windows for dlls which lack them. Don't remove nor modify the -- # starting and closing comments --# /* impgen.c starts here */ --# /* Copyright (C) 1999-2000 Free Software Foundation, Inc. --# --# This file is part of GNU libtool. --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --# */ --# --# #include /* for printf() */ --# #include /* for open(), lseek(), read() */ --# #include /* for O_RDONLY, O_BINARY */ --# #include /* for strdup() */ --# --# /* O_BINARY isn't required (or even defined sometimes) under Unix */ --# #ifndef O_BINARY --# #define O_BINARY 0 --# #endif --# --# static unsigned int --# pe_get16 (fd, offset) --# int fd; --# int offset; --# { --# unsigned char b[2]; --# lseek (fd, offset, SEEK_SET); --# read (fd, b, 2); --# return b[0] + (b[1]<<8); --# } --# --# static unsigned int --# pe_get32 (fd, offset) --# int fd; --# int offset; --# { --# unsigned char b[4]; --# lseek (fd, offset, SEEK_SET); --# read (fd, b, 4); --# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); --# } --# --# static unsigned int --# pe_as32 (ptr) --# void *ptr; --# { --# unsigned char *b = ptr; --# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); --# } --# --# int --# main (argc, argv) --# int argc; --# char *argv[]; --# { --# int dll; --# unsigned long pe_header_offset, opthdr_ofs, num_entries, i; --# unsigned long export_rva, export_size, nsections, secptr, expptr; --# unsigned long name_rvas, nexp; --# unsigned char *expdata, *erva; --# char *filename, *dll_name; --# --# filename = argv[1]; --# --# dll = open(filename, O_RDONLY|O_BINARY); --# if (dll < 1) --# return 1; --# --# dll_name = filename; --# --# for (i=0; filename[i]; i++) --# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':') --# dll_name = filename + i +1; --# --# pe_header_offset = pe_get32 (dll, 0x3c); --# opthdr_ofs = pe_header_offset + 4 + 20; --# num_entries = pe_get32 (dll, opthdr_ofs + 92); --# --# if (num_entries < 1) /* no exports */ --# return 1; --# --# export_rva = pe_get32 (dll, opthdr_ofs + 96); --# export_size = pe_get32 (dll, opthdr_ofs + 100); --# nsections = pe_get16 (dll, pe_header_offset + 4 +2); --# secptr = (pe_header_offset + 4 + 20 + --# pe_get16 (dll, pe_header_offset + 4 + 16)); --# --# expptr = 0; --# for (i = 0; i < nsections; i++) --# { --# char sname[8]; --# unsigned long secptr1 = secptr + 40 * i; --# unsigned long vaddr = pe_get32 (dll, secptr1 + 12); --# unsigned long vsize = pe_get32 (dll, secptr1 + 16); --# unsigned long fptr = pe_get32 (dll, secptr1 + 20); --# lseek(dll, secptr1, SEEK_SET); --# read(dll, sname, 8); --# if (vaddr <= export_rva && vaddr+vsize > export_rva) --# { --# expptr = fptr + (export_rva - vaddr); --# if (export_rva + export_size > vaddr + vsize) --# export_size = vsize - (export_rva - vaddr); --# break; --# } --# } --# --# expdata = (unsigned char*)malloc(export_size); --# lseek (dll, expptr, SEEK_SET); --# read (dll, expdata, export_size); --# erva = expdata - export_rva; --# --# nexp = pe_as32 (expdata+24); --# name_rvas = pe_as32 (expdata+32); --# --# printf ("EXPORTS\n"); --# for (i = 0; i> "${ofile}T" || (rm -f "${ofile}T"; exit 1) - -- mv -f "${ofile}T" "$ofile" || \ -- (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T") -- chmod +x "$ofile" -+# AM_DEP_TRACK -+# ------------ -+AC_DEFUN([AM_DEP_TRACK], -+[AC_ARG_ENABLE(dependency-tracking, -+[ --disable-dependency-tracking speeds up one-time build -+ --enable-dependency-tracking do not reject slow dependency extractors]) -+if test "x$enable_dependency_tracking" != xno; then -+ am_depcomp="$ac_aux_dir/depcomp" -+ AMDEPBACKSLASH='\' - fi -+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -+AC_SUBST([AMDEPBACKSLASH])dnl -+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -+]) - --])# _LT_AC_LTCONFIG_HACK -+# Generate code to set up dependency tracking. -*- Autoconf -*- - --# AC_LIBTOOL_DLOPEN - enable checks for dlopen support --AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's --AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) -+#serial 3 - --# AC_ENABLE_SHARED - implement the --enable-shared flag --# Usage: AC_ENABLE_SHARED[(DEFAULT)] --# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to --# `yes'. --AC_DEFUN([AC_ENABLE_SHARED], --[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl --AC_ARG_ENABLE(shared, --changequote(<<, >>)dnl --<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], --changequote([, ])dnl --[p=${PACKAGE-default} --case $enableval in --yes) enable_shared=yes ;; --no) enable_shared=no ;; --*) -- enable_shared=no -- # Look at the argument we got. We use all the common list separators. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_shared=yes -- fi -+# _AM_OUTPUT_DEPENDENCY_COMMANDS -+# ------------------------------ -+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -+[for mf in $CONFIG_FILES; do -+ # Strip MF so we end up with the name of the file. -+ mf=`echo "$mf" | sed -e 's/:.*$//'` -+ # Check whether this is an Automake generated Makefile or not. -+ # We used to match only the files named `Makefile.in', but -+ # some people rename them; so instead we look at the file content. -+ # Grep'ing the first line is not enough: some people post-process -+ # each Makefile.in and add a new line on top of each file to say so. -+ # Grep'ing the whole file is not good either: AIX grep has a line -+ # limit of 2048, but all sed's we know have understand at least 4000. -+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ dirpart=`AS_DIRNAME("$mf")` -+ else -+ continue -+ fi -+ # Extract the definition of DEPDIR, am__include, and am__quote -+ # from the Makefile without running `make'. -+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` -+ test -z "$DEPDIR" && continue -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` -+ test -z "am__include" && continue -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -+ # When using ansi2knr, U may be empty or an underscore; expand it -+ U=`sed -n 's/^U = //p' < "$mf"` -+ # Find all dependency output files, they are included files with -+ # $(DEPDIR) in their names. We invoke sed twice because it is the -+ # simplest approach to changing $(DEPDIR) to its actual value in the -+ # expansion. -+ for file in `sed -n " -+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -+ # Make sure the directory exists. -+ test -f "$dirpart/$file" && continue -+ fdir=`AS_DIRNAME(["$file"])` -+ AS_MKDIR_P([$dirpart/$fdir]) -+ # echo "creating $dirpart/$file" -+ echo '# dummy' > "$dirpart/$file" - done -- IFS="$ac_save_ifs" -- ;; --esac], --enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl --]) -+done -+])# _AM_OUTPUT_DEPENDENCY_COMMANDS - --# AC_DISABLE_SHARED - set the default shared flag to --disable-shared --AC_DEFUN([AC_DISABLE_SHARED], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --AC_ENABLE_SHARED(no)]) - --# AC_ENABLE_STATIC - implement the --enable-static flag --# Usage: AC_ENABLE_STATIC[(DEFAULT)] --# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to --# `yes'. --AC_DEFUN([AC_ENABLE_STATIC], --[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl --AC_ARG_ENABLE(static, --changequote(<<, >>)dnl --<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], --changequote([, ])dnl --[p=${PACKAGE-default} --case $enableval in --yes) enable_static=yes ;; --no) enable_static=no ;; --*) -- enable_static=no -- # Look at the argument we got. We use all the common list separators. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_static=yes -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac], --enable_static=AC_ENABLE_STATIC_DEFAULT)dnl -+# AM_OUTPUT_DEPENDENCY_COMMANDS -+# ----------------------------- -+# This macro should only be invoked once -- use via AC_REQUIRE. -+# -+# This code is only required when automatic dependency tracking -+# is enabled. FIXME. This creates each `.P' file that we will -+# need in order to bootstrap the dependency handling code. -+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -+[AC_CONFIG_COMMANDS([depfiles], -+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], -+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) - ]) - --# AC_DISABLE_STATIC - set the default static flag to --disable-static --AC_DEFUN([AC_DISABLE_STATIC], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --AC_ENABLE_STATIC(no)]) -- -- --# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag --# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] --# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to --# `yes'. --AC_DEFUN([AC_ENABLE_FAST_INSTALL], --[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl --AC_ARG_ENABLE(fast-install, --changequote(<<, >>)dnl --<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], --changequote([, ])dnl --[p=${PACKAGE-default} --case $enableval in --yes) enable_fast_install=yes ;; --no) enable_fast_install=no ;; --*) -- enable_fast_install=no -- # Look at the argument we got. We use all the common list separators. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_fast_install=yes -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac], --enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl --]) -+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install --AC_DEFUN([AC_DISABLE_FAST_INSTALL], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --AC_ENABLE_FAST_INSTALL(no)]) -+# serial 8 - --# AC_LIBTOOL_PICMODE - implement the --with-pic flag --# Usage: AC_LIBTOOL_PICMODE[(MODE)] --# Where MODE is either `yes' or `no'. If omitted, it defaults to --# `both'. --AC_DEFUN([AC_LIBTOOL_PICMODE], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --pic_mode=ifelse($#,1,$1,default)]) -+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -+# Do all the work for Automake. -*- Autoconf -*- - --# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library --AC_DEFUN([AC_PATH_TOOL_PREFIX], --[AC_MSG_CHECKING([for $1]) --AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, --[case $MAGIC_CMD in -- /*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -- ;; -- ?:/*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. -- ;; -- *) -- ac_save_MAGIC_CMD="$MAGIC_CMD" -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" --dnl $ac_dummy forces splitting on constant user-supplied paths. --dnl POSIX.2 word splitting is done only on the output of word expansions, --dnl not every word. This closes a longstanding sh security hole. -- ac_dummy="ifelse([$2], , $PATH, [$2])" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$1; then -- lt_cv_path_MAGIC_CMD="$ac_dir/$1" -- if test -n "$file_magic_test_file"; then -- case $deplibs_check_method in -- "file_magic "*) -- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" -- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -- egrep "$file_magic_regex" > /dev/null; then -- : -- else -- cat <&2 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005, 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --*** Warning: the command libtool uses to detect shared libraries, --*** $file_magic_cmd, produces output that libtool cannot recognize. --*** The result is that libtool may fail to recognize shared libraries --*** as such. This will affect the creation of libtool libraries that --*** depend on shared libraries, but programs linked with such libtool --*** libraries will work regardless of this problem. Nevertheless, you --*** may want to report the problem to your system manager and/or to --*** bug-libtool@gnu.org -+# serial 12 - --EOF -- fi ;; -- esac -- fi -- break -- fi -- done -- IFS="$ac_save_ifs" -- MAGIC_CMD="$ac_save_MAGIC_CMD" -- ;; --esac]) --MAGIC_CMD="$lt_cv_path_MAGIC_CMD" --if test -n "$MAGIC_CMD"; then -- AC_MSG_RESULT($MAGIC_CMD) --else -- AC_MSG_RESULT(no) --fi --]) -+# This macro actually does too much. Some checks are only needed if -+# your package does certain things. But this isn't really a big deal. - -+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -+# AM_INIT_AUTOMAKE([OPTIONS]) -+# ----------------------------------------------- -+# The call with PACKAGE and VERSION arguments is the old style -+# call (pre autoconf-2.50), which is being phased out. PACKAGE -+# and VERSION should now be passed to AC_INIT and removed from -+# the call to AM_INIT_AUTOMAKE. -+# We support both call styles for the transition. After -+# the next Automake release, Autoconf can make the AC_INIT -+# arguments mandatory, and then we can depend on a new Autoconf -+# release and drop the old call support. -+AC_DEFUN([AM_INIT_AUTOMAKE], -+[AC_PREREQ([2.60])dnl -+dnl Autoconf wants to disallow AM_ names. We explicitly allow -+dnl the ones we care about. -+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -+AC_REQUIRE([AC_PROG_INSTALL])dnl -+if test "`cd $srcdir && pwd`" != "`pwd`"; then -+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -+ # is not polluted with repeated "-I." -+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl -+ # test to see if srcdir already configured -+ if test -f $srcdir/config.status; then -+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -+ fi -+fi - --# AC_PATH_MAGIC - find a file program which can recognise a shared library --AC_DEFUN([AC_PATH_MAGIC], --[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl --AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH) --if test -z "$lt_cv_path_MAGIC_CMD"; then -- if test -n "$ac_tool_prefix"; then -- AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH) -+# test whether we have cygpath -+if test -z "$CYGPATH_W"; then -+ if (cygpath --version) >/dev/null 2>/dev/null; then -+ CYGPATH_W='cygpath -w' - else -- MAGIC_CMD=: -+ CYGPATH_W=echo - fi - fi -+AC_SUBST([CYGPATH_W]) -+ -+# Define the identity of the package. -+dnl Distinguish between old-style and new-style calls. -+m4_ifval([$2], -+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -+ AC_SUBST([PACKAGE], [$1])dnl -+ AC_SUBST([VERSION], [$2])], -+[_AM_SET_OPTIONS([$1])dnl -+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, -+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl -+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl -+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -+ -+_AM_IF_OPTION([no-define],, -+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -+ -+# Some tools Automake needs. -+AC_REQUIRE([AM_SANITY_CHECK])dnl -+AC_REQUIRE([AC_ARG_PROGRAM])dnl -+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -+AM_MISSING_PROG(AUTOCONF, autoconf) -+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -+AM_MISSING_PROG(AUTOHEADER, autoheader) -+AM_MISSING_PROG(MAKEINFO, makeinfo) -+AM_PROG_INSTALL_SH -+AM_PROG_INSTALL_STRIP -+AC_REQUIRE([AM_PROG_MKDIR_P])dnl -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. -+AC_REQUIRE([AC_PROG_AWK])dnl -+AC_REQUIRE([AC_PROG_MAKE_SET])dnl -+AC_REQUIRE([AM_SET_LEADING_DOT])dnl -+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], -+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], -+ [_AM_PROG_TAR([v7])])]) -+_AM_IF_OPTION([no-dependencies],, -+[AC_PROVIDE_IFELSE([AC_PROG_CC], -+ [_AM_DEPENDENCIES(CC)], -+ [define([AC_PROG_CC], -+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [_AM_DEPENDENCIES(CXX)], -+ [define([AC_PROG_CXX], -+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_OBJC], -+ [_AM_DEPENDENCIES(OBJC)], -+ [define([AC_PROG_OBJC], -+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -+]) - ]) - - --# AC_PROG_LD - find the path to the GNU or non-GNU linker --AC_DEFUN([AC_PROG_LD], --[AC_ARG_WITH(gnu-ld, --[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], --test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) --AC_REQUIRE([AC_PROG_CC])dnl --AC_REQUIRE([AC_CANONICAL_HOST])dnl --AC_REQUIRE([AC_CANONICAL_BUILD])dnl --AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl --ac_prog=ld --if test "$GCC" = yes; then -- # Check if gcc -print-prog-name=ld gives a path. -- AC_MSG_CHECKING([for ld used by GCC]) -- case $host in -- *-*-mingw*) -- # gcc leaves a trailing carriage return which upsets mingw -- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -- *) -- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -- esac -- case $ac_prog in -- # Accept absolute paths. -- [[\\/]]* | [[A-Za-z]]:[[\\/]]*) -- re_direlt='/[[^/]][[^/]]*/\.\./' -- # Canonicalize the path of ld -- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` -- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` -- done -- test -z "$LD" && LD="$ac_prog" -- ;; -- "") -- # If it fails, then pretend we aren't using GCC. -- ac_prog=ld -- ;; -- *) -- # If it is relative, then search for the first ld in PATH. -- with_gnu_ld=unknown -- ;; -+# When config.status generates a header, we must update the stamp-h file. -+# This file resides in the same directory as the config header -+# that is generated. The stamp files are numbered to have different names. -+ -+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -+# loop where config.status creates the headers, so we can generate -+# our stamp files there. -+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -+[# Compute $1's index in $config_headers. -+_am_stamp_count=1 -+for _am_header in $config_headers :; do -+ case $_am_header in -+ $1 | $1:* ) -+ break ;; -+ * ) -+ _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac --elif test "$with_gnu_ld" = yes; then -- AC_MSG_CHECKING([for GNU ld]) -+done -+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -+ -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_PROG_INSTALL_SH -+# ------------------ -+# Define $install_sh. -+AC_DEFUN([AM_PROG_INSTALL_SH], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} -+AC_SUBST(install_sh)]) -+ -+# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 2 -+ -+# Check whether the underlying file-system supports filenames -+# with a leading dot. For instance MS-DOS doesn't. -+AC_DEFUN([AM_SET_LEADING_DOT], -+[rm -rf .tst 2>/dev/null -+mkdir .tst 2>/dev/null -+if test -d .tst; then -+ am__leading_dot=. - else -- AC_MSG_CHECKING([for non-GNU ld]) -+ am__leading_dot=_ - fi --AC_CACHE_VAL(lt_cv_path_LD, --[if test -z "$LD"; then -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for ac_dir in $PATH; do -- test -z "$ac_dir" && ac_dir=. -- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -- lt_cv_path_LD="$ac_dir/$ac_prog" -- # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some GNU ld's only accept -v. -- # Break only if it was the GNU/non-GNU ld that we prefer. -- if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then -- test "$with_gnu_ld" != no && break -- else -- test "$with_gnu_ld" != yes && break -- fi -- fi -- done -- IFS="$ac_save_ifs" --else -- lt_cv_path_LD="$LD" # Let the user override the test with a path. --fi]) --LD="$lt_cv_path_LD" --if test -n "$LD"; then -- AC_MSG_RESULT($LD) --else -- AC_MSG_RESULT(no) -+rmdir .tst 2>/dev/null -+AC_SUBST([am__leading_dot])]) -+ -+# Check to see how 'make' treats includes. -*- Autoconf -*- -+ -+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 3 -+ -+# AM_MAKE_INCLUDE() -+# ----------------- -+# Check to see how make treats includes. -+AC_DEFUN([AM_MAKE_INCLUDE], -+[am_make=${MAKE-make} -+cat > confinc << 'END' -+am__doit: -+ @echo done -+.PHONY: am__doit -+END -+# If we don't find an include directive, just comment out the code. -+AC_MSG_CHECKING([for style of include used by $am_make]) -+am__include="#" -+am__quote= -+_am_result=none -+# First try GNU make style include. -+echo "include confinc" > confmf -+# We grep out `Entering directory' and `Leaving directory' -+# messages which can occur if `w' ends up in MAKEFLAGS. -+# In particular we don't look at `^make:' because GNU make might -+# be invoked under some other name (usually "gmake"), in which -+# case it prints its new name instead of `make'. -+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then -+ am__include=include -+ am__quote= -+ _am_result=GNU - fi --test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) --AC_PROG_LD_GNU -+# Now try BSD make style include. -+if test "$am__include" = "#"; then -+ echo '.include "confinc"' > confmf -+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -+ am__include=.include -+ am__quote="\"" -+ _am_result=BSD -+ fi -+fi -+AC_SUBST([am__include]) -+AC_SUBST([am__quote]) -+AC_MSG_RESULT([$_am_result]) -+rm -f confinc confmf - ]) - --# AC_PROG_LD_GNU - --AC_DEFUN([AC_PROG_LD_GNU], --[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, --[# I'd rather use --version here, but apparently some GNU ld's only accept -v. --if $LD -v 2>&1 &5; then -- lt_cv_prog_gnu_ld=yes --else -- lt_cv_prog_gnu_ld=no --fi]) --with_gnu_ld=$lt_cv_prog_gnu_ld --]) -+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - --# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker --# -- PORTME Some linkers may need a different reload flag. --AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], --[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag, --[lt_cv_ld_reload_flag='-r']) --reload_flag=$lt_cv_ld_reload_flag --test -n "$reload_flag" && reload_flag=" $reload_flag" --]) -+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies --# -- PORTME fill in with the dynamic library characteristics --AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], --[AC_CACHE_CHECK([how to recognise dependant libraries], --lt_cv_deplibs_check_method, --[lt_cv_file_magic_cmd='$MAGIC_CMD' --lt_cv_file_magic_test_file= --lt_cv_deplibs_check_method='unknown' --# Need to set the preceding variable on all platforms that support --# interlibrary dependencies. --# 'none' -- dependencies not supported. --# `unknown' -- same as none, but documents that we really don't know. --# 'pass_all' -- all dependencies passed with no checks. --# 'test_compile' -- check by making test program. --# 'file_magic [[regex]]' -- check by looking for files in library path --# which responds to the $file_magic_cmd with a given egrep regex. --# If you have `file' or equivalent on your system and you're not sure --# whether `pass_all' will *always* work, you probably want this one. -+# serial 5 - --case $host_os in --aix4* | aix5*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+# AM_MISSING_PROG(NAME, PROGRAM) -+# ------------------------------ -+AC_DEFUN([AM_MISSING_PROG], -+[AC_REQUIRE([AM_MISSING_HAS_RUN]) -+$1=${$1-"${am_missing_run}$2"} -+AC_SUBST($1)]) -+ -+ -+# AM_MISSING_HAS_RUN -+# ------------------ -+# Define MISSING if not defined so far and test if it supports --run. -+# If it does, set am_missing_run to use it, otherwise, to nothing. -+AC_DEFUN([AM_MISSING_HAS_RUN], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+AC_REQUIRE_AUX_FILE([missing])dnl -+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -+# Use eval to expand $SHELL -+if eval "$MISSING --run true"; then -+ am_missing_run="$MISSING --run " -+else -+ am_missing_run= -+ AC_MSG_WARN([`missing' script is too old or missing]) -+fi -+]) - --beos*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --bsdi4*) -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' -- lt_cv_file_magic_cmd='/usr/bin/file -L' -- lt_cv_file_magic_test_file=/shlib/libc.so -- ;; -+# AM_PROG_MKDIR_P -+# --------------- -+# Check for `mkdir -p'. -+AC_DEFUN([AM_PROG_MKDIR_P], -+[AC_PREREQ([2.60])dnl -+AC_REQUIRE([AC_PROG_MKDIR_P])dnl -+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -+dnl while keeping a definition of mkdir_p for backward compatibility. -+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -+dnl Makefile.ins that do not define MKDIR_P, so we do our own -+dnl adjustment using top_builddir (which is defined more often than -+dnl MKDIR_P). -+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -+case $mkdir_p in -+ [[\\/$]]* | ?:[[\\/]]*) ;; -+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -+esac -+]) - --cygwin* | mingw* | pw32*) -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -- lt_cv_file_magic_cmd='$OBJDUMP -f' -- ;; -+# Helper functions for option handling. -*- Autoconf -*- - --darwin* | rhapsody*) -- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' -- lt_cv_file_magic_cmd='/usr/bin/file -L' -- case "$host_os" in -- rhapsody* | darwin1.[[012]]) -- lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` -- ;; -- *) # Darwin 1.3 on -- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' -- ;; -- esac -- ;; -+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --freebsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -- case $host_cpu in -- i*86 ) -- # Not sure whether the presence of OpenBSD here was a mistake. -- # Let's accept both of them until this is cleared up. -- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -- ;; -- esac -- else -- lt_cv_deplibs_check_method=pass_all -- fi -- ;; -+# serial 3 - --gnu*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+# _AM_MANGLE_OPTION(NAME) -+# ----------------------- -+AC_DEFUN([_AM_MANGLE_OPTION], -+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - --hpux10.20*|hpux11*) -- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=/usr/lib/libc.sl -- ;; -+# _AM_SET_OPTION(NAME) -+# ------------------------------ -+# Set option NAME. Presently that only means defining a flag for this option. -+AC_DEFUN([_AM_SET_OPTION], -+[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -+ -+# _AM_SET_OPTIONS(OPTIONS) -+# ---------------------------------- -+# OPTIONS is a space-separated list of Automake options. -+AC_DEFUN([_AM_SET_OPTIONS], -+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -+ -+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -+# ------------------------------------------- -+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -+AC_DEFUN([_AM_IF_OPTION], -+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - --irix5* | irix6*) -- case $host_os in -- irix5*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" -- ;; -- *) -- case $LD in -- *-32|*"-32 ") libmagic=32-bit;; -- *-n32|*"-n32 ") libmagic=N32;; -- *-64|*"-64 ") libmagic=64-bit;; -- *) libmagic=never-match;; -- esac -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" -- ;; -- esac -- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` -- lt_cv_deplibs_check_method=pass_all -- ;; -+# Check to make sure that the build environment is sane. -*- Autoconf -*- - --# This must be Linux ELF. --linux-gnu*) -- case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) -- lt_cv_deplibs_check_method=pass_all ;; -- *) -- # glibc up to 2.1.1 does not perform some relocations on ARM -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; -- esac -- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` -- ;; -+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -- lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' -- else -- lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$' -- fi -- ;; -+# serial 4 - --newos6*) -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=/usr/lib/libnls.so -- ;; -+# AM_SANITY_CHECK -+# --------------- -+AC_DEFUN([AM_SANITY_CHECK], -+[AC_MSG_CHECKING([whether build environment is sane]) -+# Just in case -+sleep 1 -+echo timestamp > conftest.file -+# Do `set' in a subshell so we don't clobber the current shell's -+# arguments. Must try -L first in case configure is actually a -+# symlink; some systems play weird games with the mod time of symlinks -+# (eg FreeBSD returns the mod time of the symlink's containing -+# directory). -+if ( -+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -+ if test "$[*]" = "X"; then -+ # -L didn't work. -+ set X `ls -t $srcdir/configure conftest.file` -+ fi -+ rm -f conftest.file -+ if test "$[*]" != "X $srcdir/configure conftest.file" \ -+ && test "$[*]" != "X conftest.file $srcdir/configure"; then - --openbsd*) -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' -- else -- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' -- fi -- ;; -+ # If neither matched, then we have a broken ls. This can happen -+ # if, for instance, CONFIG_SHELL is bash and it inherits a -+ # broken ls alias from the environment. This has actually -+ # happened. Such a system could not be considered "sane". -+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -+alias in your environment]) -+ fi - --osf3* | osf4* | osf5*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' -- lt_cv_file_magic_test_file=/shlib/libc.so -- lt_cv_deplibs_check_method=pass_all -- ;; -+ test "$[2]" = conftest.file -+ ) -+then -+ # Ok. -+ : -+else -+ AC_MSG_ERROR([newly created file is older than distributed files! -+Check your system clock]) -+fi -+AC_MSG_RESULT(yes)]) - --sco3.2v5*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --solaris*) -- lt_cv_deplibs_check_method=pass_all -- lt_cv_file_magic_test_file=/lib/libc.so -- ;; -+# AM_PROG_INSTALL_STRIP -+# --------------------- -+# One issue with vendor `install' (even GNU) is that you can't -+# specify the program used to strip binaries. This is especially -+# annoying in cross-compiling environments, where the build's strip -+# is unlikely to handle the host's binaries. -+# Fortunately install-sh will honor a STRIPPROG variable, so we -+# always use install-sh in `make install-strip', and initialize -+# STRIPPROG with the value of the STRIP variable (set by the user). -+AC_DEFUN([AM_PROG_INSTALL_STRIP], -+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -+# Installed binaries are usually stripped using `strip' when the user -+# run `make install-strip'. However `strip' might not be the right -+# tool to use in cross-compilation environments, therefore Automake -+# will honor the `STRIP' environment variable to overrule this program. -+dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -+if test "$cross_compiling" != no; then -+ AC_CHECK_TOOL([STRIP], [strip], :) -+fi -+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -+AC_SUBST([INSTALL_STRIP_PROGRAM])]) - --sysv5uw[[78]]* | sysv4*uw2*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+# Copyright (C) 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- case $host_vendor in -- motorola) -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` -- ;; -- ncr) -- lt_cv_deplibs_check_method=pass_all -- ;; -- sequent) -- lt_cv_file_magic_cmd='/bin/file' -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' -- ;; -- sni) -- lt_cv_file_magic_cmd='/bin/file' -- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" -- lt_cv_file_magic_test_file=/lib/libc.so -- ;; -- esac -- ;; --esac --]) --file_magic_cmd=$lt_cv_file_magic_cmd --deplibs_check_method=$lt_cv_deplibs_check_method --]) -+# _AM_SUBST_NOTMAKE(VARIABLE) -+# --------------------------- -+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. -+# This macro is traced by Automake. -+AC_DEFUN([_AM_SUBST_NOTMAKE]) - -+# Check how to create a tarball. -*- Autoconf -*- - --# AC_PROG_NM - find the path to a BSD-compatible name lister --AC_DEFUN([AC_PROG_NM], --[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl --AC_MSG_CHECKING([for BSD-compatible nm]) --AC_CACHE_VAL(lt_cv_path_NM, --[if test -n "$NM"; then -- # Let the user override the test. -- lt_cv_path_NM="$NM" --else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do -- test -z "$ac_dir" && ac_dir=. -- tmp_nm=$ac_dir/${ac_tool_prefix}nm -- if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then -- # Check to see if the nm accepts a BSD-compat flag. -- # Adding the `sed 1q' prevents false positives on HP-UX, which says: -- # nm: unknown option "B" ignored -- # Tru64's nm complains that /dev/null is an invalid object file -- if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then -- lt_cv_path_NM="$tmp_nm -B" -- break -- elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then -- lt_cv_path_NM="$tmp_nm -p" -- break -- else -- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -- continue # so that we can try to find one that supports BSD flags -- fi -- fi -- done -- IFS="$ac_save_ifs" -- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm --fi]) --NM="$lt_cv_path_NM" --AC_MSG_RESULT([$NM]) --]) -+# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# AC_CHECK_LIBM - check for math library --AC_DEFUN([AC_CHECK_LIBM], --[AC_REQUIRE([AC_CANONICAL_HOST])dnl --LIBM= --case $host in --*-*-beos* | *-*-cygwin* | *-*-pw32*) -- # These system don't have libm -- ;; --*-ncr-sysv4.3*) -- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") -- AC_CHECK_LIB(m, main, LIBM="$LIBM -lm") -- ;; --*) -- AC_CHECK_LIB(m, main, LIBM="-lm") -- ;; --esac --]) -+# serial 2 - --# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for --# the libltdl convenience library and INCLTDL to the include flags for --# the libltdl header and adds --enable-ltdl-convenience to the --# configure arguments. Note that LIBLTDL and INCLTDL are not --# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not --# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed --# with '${top_builddir}/' and INCLTDL will be prefixed with --# '${top_srcdir}/' (note the single quotes!). If your package is not --# flat and you're not using automake, define top_builddir and --# top_srcdir appropriately in the Makefiles. --AC_DEFUN([AC_LIBLTDL_CONVENIENCE], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -- case $enable_ltdl_convenience in -- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; -- "") enable_ltdl_convenience=yes -- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; -+# _AM_PROG_TAR(FORMAT) -+# -------------------- -+# Check how to create a tarball in format FORMAT. -+# FORMAT should be one of `v7', `ustar', or `pax'. -+# -+# Substitute a variable $(am__tar) that is a command -+# writing to stdout a FORMAT-tarball containing the directory -+# $tardir. -+# tardir=directory && $(am__tar) > result.tar -+# -+# Substitute a variable $(am__untar) that extract such -+# a tarball read from stdin. -+# $(am__untar) < result.tar -+AC_DEFUN([_AM_PROG_TAR], -+[# Always define AMTAR for backward compatibility. -+AM_MISSING_PROG([AMTAR], [tar]) -+m4_if([$1], [v7], -+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], -+ [m4_case([$1], [ustar],, [pax],, -+ [m4_fatal([Unknown tar format])]) -+AC_MSG_CHECKING([how to create a $1 tar archive]) -+# Loop over all known methods to create a tar archive until one works. -+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -+_am_tools=${am_cv_prog_tar_$1-$_am_tools} -+# Do not fold the above two line into one, because Tru64 sh and -+# Solaris sh will not grok spaces in the rhs of `-'. -+for _am_tool in $_am_tools -+do -+ case $_am_tool in -+ gnutar) -+ for _am_tar in tar gnutar gtar; -+ do -+ AM_RUN_LOG([$_am_tar --version]) && break -+ done -+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' -+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' -+ am__untar="$_am_tar -xf -" -+ ;; -+ plaintar) -+ # Must skip GNU tar: if it does not support --format= it doesn't create -+ # ustar tarball either. -+ (tar --version) >/dev/null 2>&1 && continue -+ am__tar='tar chf - "$$tardir"' -+ am__tar_='tar chf - "$tardir"' -+ am__untar='tar xf -' -+ ;; -+ pax) -+ am__tar='pax -L -x $1 -w "$$tardir"' -+ am__tar_='pax -L -x $1 -w "$tardir"' -+ am__untar='pax -r' -+ ;; -+ cpio) -+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' -+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' -+ am__untar='cpio -i -H $1 -d' -+ ;; -+ none) -+ am__tar=false -+ am__tar_=false -+ am__untar=false -+ ;; - esac -- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la -- INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) --]) - --# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for --# the libltdl installable library and INCLTDL to the include flags for --# the libltdl header and adds --enable-ltdl-install to the configure --# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is --# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed --# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will --# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed --# with '${top_srcdir}/' (note the single quotes!). If your package is --# not flat and you're not using automake, define top_builddir and --# top_srcdir appropriately in the Makefiles. --# In the future, this macro may have to be called after AC_PROG_LIBTOOL. --AC_DEFUN([AC_LIBLTDL_INSTALLABLE], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -- AC_CHECK_LIB(ltdl, main, -- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], -- [if test x"$enable_ltdl_install" = xno; then -- AC_MSG_WARN([libltdl not installed, but installation disabled]) -- else -- enable_ltdl_install=yes -- fi -- ]) -- if test x"$enable_ltdl_install" = x"yes"; then -- ac_configure_args="$ac_configure_args --enable-ltdl-install" -- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la -- INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -- else -- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" -- LIBLTDL="-lltdl" -- INCLTDL= -- fi --]) -+ # If the value was cached, stop now. We just wanted to have am__tar -+ # and am__untar set. -+ test -n "${am_cv_prog_tar_$1}" && break - --# old names --AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) --AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) --AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) --AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) --AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) --AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) --AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -+ # tar/untar a dummy directory, and stop if the command works -+ rm -rf conftest.dir -+ mkdir conftest.dir -+ echo GrepMe > conftest.dir/file -+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) -+ rm -rf conftest.dir -+ if test -s conftest.tar; then -+ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break -+ fi -+done -+rm -rf conftest.dir - --# This is just to silence aclocal about the macro not being used --ifelse([AC_DISABLE_FAST_INSTALL]) -+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -+AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -+AC_SUBST([am__tar]) -+AC_SUBST([am__untar]) -+]) # _AM_PROG_TAR - -+m4_include([acinclude.m4]) ---- libfcgi-2.4.0.orig/cgi-fcgi/Makefile.in -+++ libfcgi-2.4.0/cgi-fcgi/Makefile.in -@@ -1,7 +1,8 @@ --# Makefile.in generated automatically by automake 1.5 from Makefile.am. -+# Makefile.in generated by automake 1.10 from Makefile.am. -+# @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -13,254 +14,350 @@ - - @SET_MAKE@ - --# $Id: Makefile.am,v 1.4 2001/12/22 03:16:22 robs Exp $ -- --SHELL = @SHELL@ -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. -- --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- --INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ -+build_triplet = @build@ - host_triplet = @host@ -+bin_PROGRAMS = cgi-fcgi$(EXEEXT) -+subdir = cgi-fcgi -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/fcgi_config.h -+CONFIG_CLEAN_FILES = -+am__installdirs = "$(DESTDIR)$(bindir)" -+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -+PROGRAMS = $(bin_PROGRAMS) -+am__objects_1 = -+am_cgi_fcgi_OBJECTS = $(am__objects_1) cgi-fcgi.$(OBJEXT) -+cgi_fcgi_OBJECTS = $(am_cgi_fcgi_OBJECTS) -+cgi_fcgi_LDADD = $(LDADD) -+cgi_fcgi_DEPENDENCIES = $(LIBFCGI) -+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(cgi_fcgi_SOURCES) -+DIST_SOURCES = $(cgi_fcgi_SOURCES) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ --AS = @AS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ - CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ - ECHO_CPP = @ECHO_CPP@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ - EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+GREP = @GREP@ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ - LIBFCGIXX = @LIBFCGIXX@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --OBJDUMP = @OBJDUMP@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - PTHREAD_CC = @PTHREAD_CC@ - PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ - PTHREAD_LIBS = @PTHREAD_LIBS@ - RANLIB = @RANLIB@ -+SED = @SED@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ - SYSTEM = @SYSTEM@ - THREADED = @THREADED@ - VERSION = @VERSION@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ - am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+builddir = @builddir@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+htmldir = @htmldir@ -+includedir = @includedir@ -+infodir = @infodir@ - install_sh = @install_sh@ -- --bin_PROGRAMS = cgi-fcgi -- -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+psdir = @psdir@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -- - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ - $(INCLUDEDIR)/fcgimisc.h - -- - LIBDIR = ../libfcgi - LIBFCGI = $(LIBDIR)/libfcgi.la -- - LDADD = $(LIBFCGI) - cgi_fcgi_SOURCES = $(INCLUDE_FILES) cgi-fcgi.c --subdir = cgi-fcgi --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/fcgi_config.h --CONFIG_CLEAN_FILES = --bin_PROGRAMS = cgi-fcgi$(EXEEXT) --PROGRAMS = $(bin_PROGRAMS) -- --am_cgi_fcgi_OBJECTS = cgi-fcgi.$(OBJEXT) --cgi_fcgi_OBJECTS = $(am_cgi_fcgi_OBJECTS) --cgi_fcgi_LDADD = $(LDADD) --cgi_fcgi_DEPENDENCIES = $(LIBDIR)/libfcgi.la --cgi_fcgi_LDFLAGS = -- --DEFS = @DEFS@ --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ --depcomp = $(SHELL) $(top_srcdir)/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/cgi-fcgi.Po --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --CFLAGS = @CFLAGS@ --DIST_SOURCES = $(cgi_fcgi_SOURCES) --DIST_COMMON = Makefile.am Makefile.in --SOURCES = $(cgi_fcgi_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj -- --mostlyclean-libtool: -- -rm -f *.lo -- --clean-libtool: -- -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cgi-fcgi/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign cgi-fcgi/Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && \ -- CONFIG_HEADERS= CONFIG_LINKS= \ -- CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status -+ $(AUTOMAKE) --gnu cgi-fcgi/Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(bindir) -+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ -- f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \ -+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - - uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ -- f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ -- rm -f $(DESTDIR)$(bindir)/$$f; \ -+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - - clean-binPROGRAMS: -- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -+ @list='$(bin_PROGRAMS)'; for p in $$list; do \ -+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ -+ echo " rm -f $$p $$f"; \ -+ rm -f $$p $$f ; \ -+ done - cgi-fcgi$(EXEEXT): $(cgi_fcgi_OBJECTS) $(cgi_fcgi_DEPENDENCIES) - @rm -f cgi-fcgi$(EXEEXT) -- $(LINK) $(cgi_fcgi_LDFLAGS) $(cgi_fcgi_OBJECTS) $(cgi_fcgi_LDADD) $(LIBS) -+ $(LINK) $(cgi_fcgi_OBJECTS) $(cgi_fcgi_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cgi-fcgi.Po@am__quote@ -- --distclean-depend: -- -rm -rf $(DEPDIR) -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cgi-fcgi.Po@am__quote@ - - .c.o: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(COMPILE) -c `cygpath -w $<` -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< --CCDEPMODE = @CCDEPMODE@ --uninstall-info-am: -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - --tags: TAGS -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- mkid -fID $$unique $(LISP) -+ mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique - - GTAGS: -- here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -- --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = .. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) -- @for file in $(DISTFILES); do \ -- if test -f $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- $(mkinstalldirs) "$(distdir)/$$dir"; \ -- fi; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ -- cp -pR $$d/$$file $(distdir) \ -- || exit 1; \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ -@@ -270,10 +367,10 @@ - check-am: all-am - check: check-am - all-am: Makefile $(PROGRAMS) -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(bindir) -- -+ for dir in "$(DESTDIR)$(bindir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -285,6 +382,7 @@ - installcheck: installcheck-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -292,7 +390,7 @@ - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -302,30 +400,42 @@ - clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am - - distclean: distclean-am -- --distclean-am: clean-am distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-tags -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: install-binPROGRAMS - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -- -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-am -@@ -333,19 +443,31 @@ - mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - --uninstall-am: uninstall-binPROGRAMS uninstall-info-am -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: - --.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ -- clean-generic clean-libtool distclean distclean-compile \ -- distclean-depend distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-binPROGRAMS install-data install-data-am \ -- install-exec install-exec-am install-info install-info-am \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool tags uninstall uninstall-am \ -- uninstall-binPROGRAMS uninstall-info-am -+uninstall-am: uninstall-binPROGRAMS -+ -+.MAKE: install-am install-strip -+ -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ -+ clean-generic clean-libtool ctags distclean distclean-compile \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-binPROGRAMS install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am \ -+ uninstall-binPROGRAMS - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. ---- libfcgi-2.4.0.orig/ltmain.sh -+++ libfcgi-2.4.0/ltmain.sh -@@ -1,8 +1,8 @@ - # ltmain.sh - Provide generalized library-building support services. - # NOTE: Changing this file will not affect anything until you rerun configure. - # --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -+# 2007 Free Software Foundation, Inc. - # Originally by Gordon Matzigkeit , 1996 - # - # This program is free software; you can redistribute it and/or modify -@@ -17,13 +17,49 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - -+basename="s,^.*/,,g" -+ -+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -+# is ksh but when the shell is invoked as "sh" and the current value of -+# the _XPG environment variable is not equal to 1 (one), the special -+# positional parameter $0, within a function call, is the name of the -+# function. -+progpath="$0" -+ -+# The name of this program: -+progname=`echo "$progpath" | $SED $basename` -+modename="$progname" -+ -+# Global variables: -+EXIT_SUCCESS=0 -+EXIT_FAILURE=1 -+ -+PROGRAM=ltmain.sh -+PACKAGE=libtool -+VERSION="1.5.24 Debian 1.5.24-1" -+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" -+ -+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -+fi -+BIN_SH=xpg4; export BIN_SH # for Tru64 -+DUALCASE=1; export DUALCASE # for MKS sh -+ - # Check that we have a working $echo. - if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. -@@ -36,7 +72,7 @@ - : - else - # Restart under the correct shell, and then maybe $echo will work. -- exec $SHELL "$0" --no-reexec ${1+"$@"} -+ exec $SHELL "$progpath" --no-reexec ${1+"$@"} - fi - - if test "X$1" = X--fallback-echo; then -@@ -45,19 +81,9 @@ - cat <&2 -- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -- exit 1 -+ $echo "$modename: not configured to build any kind of library" 1>&2 -+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -+ exit $EXIT_FAILURE - fi - - # Global variables. -@@ -99,11 +142,286 @@ - show="$echo" - show_help= - execute_dlfiles= -+duplicate_deps=no -+preserve_args= - lo2o="s/\\.lo\$/.${objext}/" - o2lo="s/\\.${objext}\$/.lo/" -+extracted_archives= -+extracted_serial=0 -+ -+##################################### -+# Shell function definitions: -+# This seems to be the best place for them -+ -+# func_mktempdir [string] -+# Make a temporary directory that won't clash with other running -+# libtool processes, and avoids race conditions if possible. If -+# given, STRING is the basename for that directory. -+func_mktempdir () -+{ -+ my_template="${TMPDIR-/tmp}/${1-$progname}" -+ -+ if test "$run" = ":"; then -+ # Return a directory name, but don't create it in dry-run mode -+ my_tmpdir="${my_template}-$$" -+ else -+ -+ # If mktemp works, use that first and foremost -+ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` -+ -+ if test ! -d "$my_tmpdir"; then -+ # Failing that, at least try and use $RANDOM to avoid a race -+ my_tmpdir="${my_template}-${RANDOM-0}$$" -+ -+ save_mktempdir_umask=`umask` -+ umask 0077 -+ $mkdir "$my_tmpdir" -+ umask $save_mktempdir_umask -+ fi -+ -+ # If we're not in dry-run mode, bomb out on failure -+ test -d "$my_tmpdir" || { -+ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 -+ exit $EXIT_FAILURE -+ } -+ fi -+ -+ $echo "X$my_tmpdir" | $Xsed -+} -+ -+ -+# func_win32_libid arg -+# return the library type of file 'arg' -+# -+# Need a lot of goo to handle *both* DLLs and import libs -+# Has to be a shell function in order to 'eat' the argument -+# that is supplied when $file_magic_command is called. -+func_win32_libid () -+{ -+ win32_libid_type="unknown" -+ win32_fileres=`file -L $1 2>/dev/null` -+ case $win32_fileres in -+ *ar\ archive\ import\ library*) # definitely import -+ win32_libid_type="x86 archive import" -+ ;; -+ *ar\ archive*) # could be an import, or static -+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ -+ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then -+ win32_nmres=`eval $NM -f posix -A $1 | \ -+ $SED -n -e '1,100{ -+ / I /{ -+ s,.*,import, -+ p -+ q -+ } -+ }'` -+ case $win32_nmres in -+ import*) win32_libid_type="x86 archive import";; -+ *) win32_libid_type="x86 archive static";; -+ esac -+ fi -+ ;; -+ *DLL*) -+ win32_libid_type="x86 DLL" -+ ;; -+ *executable*) # but shell scripts are "executable" too... -+ case $win32_fileres in -+ *MS\ Windows\ PE\ Intel*) -+ win32_libid_type="x86 DLL" -+ ;; -+ esac -+ ;; -+ esac -+ $echo $win32_libid_type -+} -+ -+ -+# func_infer_tag arg -+# Infer tagged configuration to use if any are available and -+# if one wasn't chosen via the "--tag" command line option. -+# Only attempt this if the compiler in the base compile -+# command doesn't match the default compiler. -+# arg is usually of the form 'gcc ...' -+func_infer_tag () -+{ -+ if test -n "$available_tags" && test -z "$tagname"; then -+ CC_quoted= -+ for arg in $CC; do -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ CC_quoted="$CC_quoted $arg" -+ done -+ case $@ in -+ # Blanks in the command may have been stripped by the calling shell, -+ # but not from the CC environment variable when configure was run. -+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; -+ # Blanks at the start of $base_compile will cause this to fail -+ # if we don't check for them as well. -+ *) -+ for z in $available_tags; do -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then -+ # Evaluate the configuration. -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" -+ CC_quoted= -+ for arg in $CC; do -+ # Double-quote args containing other shell metacharacters. -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ CC_quoted="$CC_quoted $arg" -+ done -+ case "$@ " in -+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) -+ # The compiler in the base compile command matches -+ # the one in the tagged configuration. -+ # Assume this is the tagged configuration we want. -+ tagname=$z -+ break -+ ;; -+ esac -+ fi -+ done -+ # If $tagname still isn't set, then no tagged configuration -+ # was found and let the user know that the "--tag" command -+ # line option must be used. -+ if test -z "$tagname"; then -+ $echo "$modename: unable to infer tagged configuration" -+ $echo "$modename: specify a tag with \`--tag'" 1>&2 -+ exit $EXIT_FAILURE -+# else -+# $echo "$modename: using $tagname tagged configuration" -+ fi -+ ;; -+ esac -+ fi -+} -+ -+ -+# func_extract_an_archive dir oldlib -+func_extract_an_archive () -+{ -+ f_ex_an_ar_dir="$1"; shift -+ f_ex_an_ar_oldlib="$1" -+ -+ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" -+ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? -+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then -+ : -+ else -+ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+} -+ -+# func_extract_archives gentop oldlib ... -+func_extract_archives () -+{ -+ my_gentop="$1"; shift -+ my_oldlibs=${1+"$@"} -+ my_oldobjs="" -+ my_xlib="" -+ my_xabs="" -+ my_xdir="" -+ my_status="" -+ -+ $show "${rm}r $my_gentop" -+ $run ${rm}r "$my_gentop" -+ $show "$mkdir $my_gentop" -+ $run $mkdir "$my_gentop" -+ my_status=$? -+ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then -+ exit $my_status -+ fi -+ -+ for my_xlib in $my_oldlibs; do -+ # Extract the objects. -+ case $my_xlib in -+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; -+ *) my_xabs=`pwd`"/$my_xlib" ;; -+ esac -+ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` -+ my_xlib_u=$my_xlib -+ while :; do -+ case " $extracted_archives " in -+ *" $my_xlib_u "*) -+ extracted_serial=`expr $extracted_serial + 1` -+ my_xlib_u=lt$extracted_serial-$my_xlib ;; -+ *) break ;; -+ esac -+ done -+ extracted_archives="$extracted_archives $my_xlib_u" -+ my_xdir="$my_gentop/$my_xlib_u" -+ -+ $show "${rm}r $my_xdir" -+ $run ${rm}r "$my_xdir" -+ $show "$mkdir $my_xdir" -+ $run $mkdir "$my_xdir" -+ exit_status=$? -+ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then -+ exit $exit_status -+ fi -+ case $host in -+ *-darwin*) -+ $show "Extracting $my_xabs" -+ # Do not bother doing anything if just a dry run -+ if test -z "$run"; then -+ darwin_orig_dir=`pwd` -+ cd $my_xdir || exit $? -+ darwin_archive=$my_xabs -+ darwin_curdir=`pwd` -+ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` -+ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` -+ if test -n "$darwin_arches"; then -+ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` -+ darwin_arch= -+ $show "$darwin_base_archive has multiple architectures $darwin_arches" -+ for darwin_arch in $darwin_arches ; do -+ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" -+ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" -+ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" -+ func_extract_an_archive "`pwd`" "${darwin_base_archive}" -+ cd "$darwin_curdir" -+ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" -+ done # $darwin_arches -+ ## Okay now we have a bunch of thin objects, gotta fatten them up :) -+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` -+ darwin_file= -+ darwin_files= -+ for darwin_file in $darwin_filelist; do -+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ lipo -create -output "$darwin_file" $darwin_files -+ done # $darwin_filelist -+ ${rm}r unfat-$$ -+ cd "$darwin_orig_dir" -+ else -+ cd "$darwin_orig_dir" -+ func_extract_an_archive "$my_xdir" "$my_xabs" -+ fi # $darwin_arches -+ fi # $run -+ ;; -+ *) -+ func_extract_an_archive "$my_xdir" "$my_xabs" -+ ;; -+ esac -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ done -+ func_extract_archives_result="$my_oldobjs" -+} -+# End of Shell function definitions -+##################################### -+ -+# Darwin sucks -+eval std_shrext=\"$shrext_cmds\" -+ -+disable_libs=no - - # Parse our command line options once, thoroughly. --while test $# -gt 0 -+while test "$#" -gt 0 - do - arg="$1" - shift -@@ -119,6 +437,34 @@ - execute_dlfiles) - execute_dlfiles="$execute_dlfiles $arg" - ;; -+ tag) -+ tagname="$arg" -+ preserve_args="${preserve_args}=$arg" -+ -+ # Check whether tagname contains only valid characters -+ case $tagname in -+ *[!-_A-Za-z0-9,/]*) -+ $echo "$progname: invalid tag name: $tagname" 1>&2 -+ exit $EXIT_FAILURE -+ ;; -+ esac -+ -+ case $tagname in -+ CC) -+ # Don't test for the "default" C tag, as we know, it's there, but -+ # not specially marked. -+ ;; -+ *) -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then -+ taglist="$taglist $tagname" -+ # Evaluate the configuration. -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" -+ else -+ $echo "$progname: ignoring unknown tag $tagname" 1>&2 -+ fi -+ ;; -+ esac -+ ;; - *) - eval "$prev=\$arg" - ;; -@@ -136,18 +482,28 @@ - ;; - - --version) -- echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" -- exit 0 -+ echo "\ -+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP -+ -+Copyright (C) 2007 Free Software Foundation, Inc. -+This is free software; see the source for copying conditions. There is NO -+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -+ exit $? - ;; - - --config) -- sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 -- exit 0 -+ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath -+ # Now print the configurations for the tags. -+ for tagname in $taglist; do -+ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" -+ done -+ exit $? - ;; - - --debug) -- echo "$progname: enabling shell trace mode" -+ $echo "$progname: enabling shell trace mode" - set -x -+ preserve_args="$preserve_args $arg" - ;; - - --dry-run | -n) -@@ -155,18 +511,18 @@ - ;; - - --features) -- echo "host: $host" -+ $echo "host: $host" - if test "$build_libtool_libs" = yes; then -- echo "enable shared libraries" -+ $echo "enable shared libraries" - else -- echo "disable shared libraries" -+ $echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then -- echo "enable static libraries" -+ $echo "enable static libraries" - else -- echo "disable static libraries" -+ $echo "disable static libraries" - fi -- exit 0 -+ exit $? - ;; - - --finish) mode="finish" ;; -@@ -174,8 +530,23 @@ - --mode) prevopt="--mode" prev=mode ;; - --mode=*) mode="$optarg" ;; - -+ --preserve-dup-deps) duplicate_deps="yes" ;; -+ - --quiet | --silent) - show=: -+ preserve_args="$preserve_args $arg" -+ ;; -+ -+ --tag) -+ prevopt="--tag" -+ prev=tag -+ preserve_args="$preserve_args --tag" -+ ;; -+ --tag=*) -+ set tag "$optarg" ${1+"$@"} -+ shift -+ prev=tag -+ preserve_args="$preserve_args --tag" - ;; - - -dlopen) -@@ -186,7 +557,7 @@ - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - - *) -@@ -199,15 +570,34 @@ - if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - -+case $disable_libs in -+no) -+ ;; -+shared) -+ build_libtool_libs=no -+ build_old_libs=yes -+ ;; -+static) -+ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -+ ;; -+esac -+ -+# If this variable is set in any of the actions, the command in it -+# will be execed at the end. This prevents here-documents from being -+# left over by shells. -+exec_cmd= -+ - if test -z "$show_help"; then - - # Infer the operation mode. - if test -z "$mode"; then -+ $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 -+ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 - case $nonopt in -- *cc | *++ | gcc* | *-gcc*) -+ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) - mode=link - for arg - do -@@ -248,7 +638,7 @@ - if test -n "$execute_dlfiles" && test "$mode" != execute; then - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. -@@ -262,158 +652,127 @@ - modename="$modename: compile" - # Get the compilation command and the source file. - base_compile= -- prev= -- lastarg= -- srcfile="$nonopt" -+ srcfile="$nonopt" # always keep a non-empty value in "srcfile" -+ suppress_opt=yes - suppress_output= -+ arg_mode=normal -+ libobj= -+ later= - -- user_target=no - for arg - do -- case $prev in -- "") ;; -- xcompiler) -- # Aesthetically quote the previous argument. -- prev= -- lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -- -- case $arg in -- # Double-quote args containing other shell metacharacters. -- # Many Bourne shells cannot handle close brackets correctly -- # in scan sets, so we specify it separately. -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -- ;; -- esac -- -- # Add the previous argument to base_compile. -- if test -z "$base_compile"; then -- base_compile="$lastarg" -- else -- base_compile="$base_compile $lastarg" -- fi -- continue -- ;; -- esac -- -- # Accept any command-line options. -- case $arg in -- -o) -- if test "$user_target" != "no"; then -- $echo "$modename: you cannot specify \`-o' more than once" 1>&2 -- exit 1 -- fi -- user_target=next -+ case $arg_mode in -+ arg ) -+ # do not "continue". Instead, add this to base_compile -+ lastarg="$arg" -+ arg_mode=normal - ;; - -- -static) -- build_old_libs=yes -+ target ) -+ libobj="$arg" -+ arg_mode=normal - continue - ;; - -- -prefer-pic) -- pic_mode=yes -- continue -- ;; -+ normal ) -+ # Accept any command-line options. -+ case $arg in -+ -o) -+ if test -n "$libobj" ; then -+ $echo "$modename: you cannot specify \`-o' more than once" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ arg_mode=target -+ continue -+ ;; - -- -prefer-non-pic) -- pic_mode=no -- continue -- ;; -+ -static | -prefer-pic | -prefer-non-pic) -+ later="$later $arg" -+ continue -+ ;; - -- -Xcompiler) -- prev=xcompiler -- continue -- ;; -+ -no-suppress) -+ suppress_opt=no -+ continue -+ ;; - -- -Wc,*) -- args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` -- lastarg= -- IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' -- for arg in $args; do -- IFS="$save_ifs" -+ -Xcompiler) -+ arg_mode=arg # the next one goes into the "base_compile" arg list -+ continue # The current "srcfile" will either be retained or -+ ;; # replaced later. I would guess that would be a bug. -+ -+ -Wc,*) -+ args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` -+ lastarg= -+ save_ifs="$IFS"; IFS=',' -+ for arg in $args; do -+ IFS="$save_ifs" - -- # Double-quote args containing other shell metacharacters. -- # Many Bourne shells cannot handle close brackets correctly -- # in scan sets, so we specify it separately. -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -- ;; -- esac -- lastarg="$lastarg $arg" -- done -- IFS="$save_ifs" -- lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` -+ # Double-quote args containing other shell metacharacters. -+ # Many Bourne shells cannot handle close brackets correctly -+ # in scan sets, so we specify it separately. -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ lastarg="$lastarg $arg" -+ done -+ IFS="$save_ifs" -+ lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` - -- # Add the arguments to base_compile. -- if test -z "$base_compile"; then -- base_compile="$lastarg" -- else -+ # Add the arguments to base_compile. - base_compile="$base_compile $lastarg" -- fi -- continue -- ;; -- esac -+ continue -+ ;; - -- case $user_target in -- next) -- # The next one is the -o target name -- user_target=yes -- continue -- ;; -- yes) -- # We got the output file -- user_target=set -- libobj="$arg" -- continue -+ * ) -+ # Accept the current argument as the source file. -+ # The previous "srcfile" becomes the current argument. -+ # -+ lastarg="$srcfile" -+ srcfile="$arg" -+ ;; -+ esac # case $arg - ;; -- esac -- -- # Accept the current argument as the source file. -- lastarg="$srcfile" -- srcfile="$arg" -+ esac # case $arg_mode - - # Aesthetically quote the previous argument. -- -- # Backslashify any backslashes, double quotes, and dollar signs. -- # These are the only characters that are still specially -- # interpreted inside of double-quoted scrings. - lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` - -+ case $lastarg in - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly -- # in scan sets, so we specify it separately. -- case $lastarg in -+ # in scan sets, and some SunOS ksh mistreat backslash-escaping -+ # in scan sets (worked around with variable expansion), -+ # and furthermore cannot handle '|' '&' '(' ')' in scan sets -+ # at all, so we specify them separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - lastarg="\"$lastarg\"" - ;; - esac - -- # Add the previous argument to base_compile. -- if test -z "$base_compile"; then -- base_compile="$lastarg" -- else -- base_compile="$base_compile $lastarg" -- fi -- done -+ base_compile="$base_compile $lastarg" -+ done # for arg - -- case $user_target in -- set) -+ case $arg_mode in -+ arg) -+ $echo "$modename: you must specify an argument for -Xcompile" -+ exit $EXIT_FAILURE - ;; -- no) -- # Get the name of the library object. -- libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` -+ target) -+ $echo "$modename: you must specify a target with \`-o'" 1>&2 -+ exit $EXIT_FAILURE - ;; - *) -- $echo "$modename: you must specify a target with \`-o'" 1>&2 -- exit 1 -+ # Get the name of the library object. -+ [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo -- xform='[cCFSfmso]' -+ xform='[cCFSifmso]' - case $libobj in - *.ada) xform=ada ;; - *.adb) xform=adb ;; -@@ -421,10 +780,14 @@ - *.asm) xform=asm ;; - *.c++) xform=c++ ;; - *.cc) xform=cc ;; -+ *.ii) xform=ii ;; -+ *.class) xform=class ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; -- *.f90) xform=f90 ;; -+ *.[fF][09]?) xform=[fF][09]. ;; - *.for) xform=for ;; -+ *.java) xform=java ;; -+ *.obj) xform=obj ;; - esac - - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` -@@ -433,25 +796,63 @@ - *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; - *) - $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - -+ func_infer_tag $base_compile -+ -+ for arg in $later; do -+ case $arg in -+ -static) -+ build_old_libs=yes -+ continue -+ ;; -+ -+ -prefer-pic) -+ pic_mode=yes -+ continue -+ ;; -+ -+ -prefer-non-pic) -+ pic_mode=no -+ continue -+ ;; -+ esac -+ done -+ -+ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` -+ case $qlibobj in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ qlibobj="\"$qlibobj\"" ;; -+ esac -+ test "X$libobj" != "X$qlibobj" \ -+ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ -+ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." -+ objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` -+ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$obj"; then -+ xdir= -+ else -+ xdir=$xdir/ -+ fi -+ lobj=${xdir}$objdir/$objname -+ - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then -- removelist="$obj $libobj" -+ removelist="$obj $lobj $libobj ${libobj}T" - else -- removelist="$libobj" -+ removelist="$lobj $libobj ${libobj}T" - fi - - $run $rm $removelist -- trap "$run $rm $removelist; exit 1" 1 2 15 -+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in -@@ -459,7 +860,7 @@ - pic_mode=default - ;; - esac -- if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then -+ if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi -@@ -470,8 +871,9 @@ - output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - removelist="$removelist $output_obj $lockfile" -- trap "$run $rm $removelist; exit 1" 1 2 15 -+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - else -+ output_obj= - need_locks=no - lockfile= - fi -@@ -479,13 +881,13 @@ - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then -- until $run ln "$0" "$lockfile" 2>/dev/null; do -+ until $run ln "$progpath" "$lockfile" 2>/dev/null; do - $show "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then -- echo "\ -+ $echo "\ - *** ERROR, $lockfile exists and contains: - `cat $lockfile 2>/dev/null` - -@@ -497,14 +899,33 @@ - compiler." - - $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi -- echo $srcfile > "$lockfile" -+ $echo "$srcfile" > "$lockfile" - fi - - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi -+ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` -+ case $qsrcfile in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ qsrcfile="\"$qsrcfile\"" ;; -+ esac -+ -+ $run $rm "$libobj" "${libobj}T" -+ -+ # Create a libtool object file (analogous to a ".la" file), -+ # but don't create it if we're doing a dry run. -+ test -z "$run" && cat > ${libobj}T </dev/null`" != x"$srcfile"; then -- echo "\ -+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then -+ $echo "\ - *** ERROR, $lockfile contains: - `cat $lockfile 2>/dev/null` - -@@ -573,13 +979,13 @@ - compiler." - - $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one -- if test x"$output_obj" != x"$libobj"; then -- $show "$mv $output_obj $libobj" -- if $run $mv $output_obj $libobj; then : -+ if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then -+ $show "$mv $output_obj $lobj" -+ if $run $mv $output_obj $lobj; then : - else - error=$? - $run $rm $removelist -@@ -587,73 +993,50 @@ - fi - fi - -- # If we have no pic_flag, then copy the object into place and finish. -- if (test -z "$pic_flag" || test "$pic_mode" != default) && -- test "$build_old_libs" = yes; then -- # Rename the .lo from within objdir to obj -- if test -f $obj; then -- $show $rm $obj -- $run $rm $obj -- fi -+ # Append the name of the PIC object to the libtool object file. -+ test -z "$run" && cat >> ${libobj}T <> ${libobj}T </dev/null`" != x"$srcfile"; then -- echo "\ -+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then -+ $echo "\ - *** ERROR, $lockfile contains: - `cat $lockfile 2>/dev/null` - -@@ -668,11 +1051,11 @@ - compiler." - - $run $rm $removelist -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Just move the object if needed -- if test x"$output_obj" != x"$obj"; then -+ if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - $show "$mv $output_obj $obj" - if $run $mv $output_obj $obj; then : - else -@@ -682,29 +1065,31 @@ - fi - fi - -- # Create an invalid libtool object if no PIC, so that we do not -- # accidentally link it into a program. -- if test "$build_libtool_libs" != yes; then -- $show "echo timestamp > $libobj" -- $run eval "echo timestamp > \$libobj" || exit $? -- else -- # Move the .lo from within objdir -- $show "$mv $libobj $lo_libobj" -- if $run $mv $libobj $lo_libobj; then : -- else -- error=$? -- $run $rm $removelist -- exit $error -- fi -- fi -+ # Append the name of the non-PIC object the libtool object file. -+ # Only append if the libtool object file exists. -+ test -z "$run" && cat >> ${libobj}T <> ${libobj}T <&2 - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi -- else -+ prefer_static_libs=yes -+ ;; -+ -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi -- fi -+ prefer_static_libs=built -+ ;; -+ -static-libtool-libs) -+ if test -z "$pic_flag" && test -n "$link_static_flag"; then -+ dlopen_self=$dlopen_self_static -+ fi -+ prefer_static_libs=yes -+ ;; -+ esac - build_libtool_libs=no - build_old_libs=yes -- prefer_static_libs=yes - break - ;; - esac -@@ -800,7 +1203,7 @@ - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. -- while test $# -gt 0; do -+ while test "$#" -gt 0; do - arg="$1" - shift - case $arg in -@@ -865,7 +1268,7 @@ - export_symbols="$arg" - if test ! -f "$arg"; then - $echo "$modename: symbol file \`$arg' does not exist" -- exit 1 -+ exit $EXIT_FAILURE - fi - prev= - continue -@@ -875,18 +1278,140 @@ - prev= - continue - ;; -+ inst_prefix) -+ inst_prefix_dir="$arg" -+ prev= -+ continue -+ ;; -+ precious_regex) -+ precious_files_regex="$arg" -+ prev= -+ continue -+ ;; - release) - release="-$arg" - prev= - continue - ;; -+ objectlist) -+ if test -f "$arg"; then -+ save_arg=$arg -+ moreargs= -+ for fil in `cat $save_arg` -+ do -+# moreargs="$moreargs $fil" -+ arg=$fil -+ # A libtool-controlled object. -+ -+ # Check to see that this really is a libtool object. -+ if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ pic_object= -+ non_pic_object= -+ -+ # Read the .lo file -+ # If there is no directory component, then add one. -+ case $arg in -+ */* | *\\*) . $arg ;; -+ *) . ./$arg ;; -+ esac -+ -+ if test -z "$pic_object" || \ -+ test -z "$non_pic_object" || -+ test "$pic_object" = none && \ -+ test "$non_pic_object" = none; then -+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ -+ # Extract subdirectory from the argument. -+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$arg"; then -+ xdir= -+ else -+ xdir="$xdir/" -+ fi -+ -+ if test "$pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ pic_object="$xdir$pic_object" -+ -+ if test "$prev" = dlfiles; then -+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -+ dlfiles="$dlfiles $pic_object" -+ prev= -+ continue -+ else -+ # If libtool objects are unsupported, then we need to preload. -+ prev=dlprefiles -+ fi -+ fi -+ -+ # CHECK ME: I think I busted this. -Ossama -+ if test "$prev" = dlprefiles; then -+ # Preload the old-style object. -+ dlprefiles="$dlprefiles $pic_object" -+ prev= -+ fi -+ -+ # A PIC object. -+ libobjs="$libobjs $pic_object" -+ arg="$pic_object" -+ fi -+ -+ # Non-PIC object. -+ if test "$non_pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ non_pic_object="$xdir$non_pic_object" -+ -+ # A standard non-PIC object -+ non_pic_objects="$non_pic_objects $non_pic_object" -+ if test -z "$pic_object" || test "$pic_object" = none ; then -+ arg="$non_pic_object" -+ fi -+ else -+ # If the PIC object exists, use it instead. -+ # $xdir was prepended to $pic_object above. -+ non_pic_object="$pic_object" -+ non_pic_objects="$non_pic_objects $non_pic_object" -+ fi -+ else -+ # Only an error if not doing a dry-run. -+ if test -z "$run"; then -+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 -+ exit $EXIT_FAILURE -+ else -+ # Dry-run case. -+ -+ # Extract subdirectory from the argument. -+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$arg"; then -+ xdir= -+ else -+ xdir="$xdir/" -+ fi -+ -+ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` -+ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` -+ libobjs="$libobjs $pic_object" -+ non_pic_objects="$non_pic_objects $non_pic_object" -+ fi -+ fi -+ done -+ else -+ $echo "$modename: link input file \`$save_arg' does not exist" -+ exit $EXIT_FAILURE -+ fi -+ arg=$save_arg -+ prev= -+ continue -+ ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - if test "$prev" = rpath; then -@@ -918,13 +1443,33 @@ - finalize_command="$finalize_command $wl$qarg" - continue - ;; -+ xcclinker) -+ linker_flags="$linker_flags $qarg" -+ compiler_flags="$compiler_flags $qarg" -+ prev= -+ compile_command="$compile_command $qarg" -+ finalize_command="$finalize_command $qarg" -+ continue -+ ;; -+ shrext) -+ shrext_cmds="$arg" -+ prev= -+ continue -+ ;; -+ darwin_framework|darwin_framework_skip) -+ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ prev= -+ continue -+ ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac -- fi # test -n $prev -+ fi # test -n "$prev" - - prevarg="$arg" - -@@ -966,7 +1511,7 @@ - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: more than one -exported-symbols argument is not allowed" -- exit 1 -+ exit $EXIT_FAILURE - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms -@@ -976,11 +1521,28 @@ - continue - ;; - -+ -framework|-arch|-isysroot) -+ case " $CC " in -+ *" ${arg} ${1} "* | *" ${arg} ${1} "*) -+ prev=darwin_framework_skip ;; -+ *) compiler_flags="$compiler_flags $arg" -+ prev=darwin_framework ;; -+ esac -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ continue -+ ;; -+ -+ -inst-prefix-dir) -+ prev=inst_prefix -+ continue -+ ;; -+ - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in -- no/*-*-irix*) -+ no/*-*-irix* | /*-*-irix*) - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - ;; -@@ -997,7 +1559,8 @@ - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 -- exit 1 -+ absdir="$dir" -+ notinst_path="$notinst_path $dir" - fi - dir="$absdir" - ;; -@@ -1011,10 +1574,15 @@ - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - *) dllsearchpath="$dllsearchpath:$dir";; - esac -+ case :$dllsearchpath: in -+ *":$testbindir:"*) ;; -+ *) dllsearchpath="$dllsearchpath:$testbindir";; -+ esac - ;; - esac - continue -@@ -1023,25 +1591,99 @@ - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in -- *-*-cygwin* | *-*-pw32* | *-*-beos*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) - # These systems don't actually have a C or math library (as such) - continue - ;; -- *-*-mingw* | *-*-os2*) -+ *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -+ # Do not include libc due to us having libc/libc_r. -+ test "X$arg" = "X-lc" && continue -+ ;; -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # Rhapsody C and math libraries are in the System framework -+ deplibs="$deplibs -framework System" -+ continue -+ ;; -+ *-*-sco3.2v5* | *-*-sco5v6*) -+ # Causes problems with __ctype -+ test "X$arg" = "X-lc" && continue -+ ;; -+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) -+ # Compiler inserts libc in the correct place for threads to work -+ test "X$arg" = "X-lc" && continue -+ ;; - esac -+ elif test "X$arg" = "X-lc_r"; then -+ case $host in -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -+ # Do not include libc_r directly, use -pthread flag. -+ continue -+ ;; -+ esac - fi - deplibs="$deplibs $arg" - continue - ;; - -+ # Tru64 UNIX uses -model [arg] to determine the layout of C++ -+ # classes, name mangling, and exception handling. -+ -model) -+ compile_command="$compile_command $arg" -+ compiler_flags="$compiler_flags $arg" -+ finalize_command="$finalize_command $arg" -+ prev=xcompiler -+ continue -+ ;; -+ -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -+ compiler_flags="$compiler_flags $arg" -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ continue -+ ;; -+ - -module) - module=yes - continue - ;; - -+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -+ # -r[0-9][0-9]* specifies the processor on the SGI compiler -+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -+ # +DA*, +DD* enable 64-bit mode on the HP compiler -+ # -q* pass through compiler args for the IBM compiler -+ # -m* pass through architecture-specific compiler args for GCC -+ # -m*, -t[45]*, -txscale* pass through architecture-specific -+ # compiler args for GCC -+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC -+ # -F/path gives path to uninstalled frameworks, gcc on darwin -+ # @file GCC response files -+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -+ # Unknown arguments in both finalize_command and compile_command need -+ # to be aesthetically quoted because they are evaled later. -+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ compiler_flags="$compiler_flags $arg" -+ continue -+ ;; -+ -+ -shrext) -+ prev=shrext -+ continue -+ ;; -+ - -no-fast-install) - fast_install=no - continue -@@ -1049,9 +1691,9 @@ - - -no-install) - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) - # The PATH hackery in wrapper scripts is required on Windows -- # in order for the loader to find any dlls it needs. -+ # and Darwin in order for the loader to find any dlls it needs. - $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 - $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 - fast_install=no -@@ -1066,8 +1708,18 @@ - continue - ;; - -+ -objectlist) -+ prev=objectlist -+ continue -+ ;; -+ - -o) prev=output ;; - -+ -precious-files-regex) -+ prev=precious_regex -+ continue -+ ;; -+ - -release) - prev=release - continue -@@ -1090,7 +1742,7 @@ - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - case "$xrpath " in -@@ -1100,7 +1752,7 @@ - continue - ;; - -- -static) -+ -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects -@@ -1118,11 +1770,16 @@ - prev=vinfo - continue - ;; -+ -version-number) -+ prev=vinfo -+ vinfo_number=yes -+ continue -+ ;; - - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` - arg= -- IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' -+ save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in -@@ -1140,7 +1797,7 @@ - -Wl,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` - arg= -- IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' -+ save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in -@@ -1166,6 +1823,11 @@ - continue - ;; - -+ -XCClinker) -+ prev=xcclinker -+ continue -+ ;; -+ - # Some other compiler flag. - -* | +*) - # Unknown arguments in both finalize_command and compile_command need -@@ -1178,29 +1840,106 @@ - esac - ;; - -- *.lo | *.$objext) -- # A library or standard object. -- if test "$prev" = dlfiles; then -- # This file was specified with -dlopen. -- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $arg" -- prev= -- continue -- else -- # If libtool objects are unsupported, then we need to preload. -- prev=dlprefiles -- fi -- fi -+ *.$objext) -+ # A standard object. -+ objs="$objs $arg" -+ ;; - -- if test "$prev" = dlprefiles; then -- # Preload the old-style object. -- dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"` -- prev= -- else -+ *.lo) -+ # A libtool-controlled object. -+ -+ # Check to see that this really is a libtool object. -+ if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ pic_object= -+ non_pic_object= -+ -+ # Read the .lo file -+ # If there is no directory component, then add one. - case $arg in -- *.lo) libobjs="$libobjs $arg" ;; -- *) objs="$objs $arg" ;; -+ */* | *\\*) . $arg ;; -+ *) . ./$arg ;; - esac -+ -+ if test -z "$pic_object" || \ -+ test -z "$non_pic_object" || -+ test "$pic_object" = none && \ -+ test "$non_pic_object" = none; then -+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ -+ # Extract subdirectory from the argument. -+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$arg"; then -+ xdir= -+ else -+ xdir="$xdir/" -+ fi -+ -+ if test "$pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ pic_object="$xdir$pic_object" -+ -+ if test "$prev" = dlfiles; then -+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -+ dlfiles="$dlfiles $pic_object" -+ prev= -+ continue -+ else -+ # If libtool objects are unsupported, then we need to preload. -+ prev=dlprefiles -+ fi -+ fi -+ -+ # CHECK ME: I think I busted this. -Ossama -+ if test "$prev" = dlprefiles; then -+ # Preload the old-style object. -+ dlprefiles="$dlprefiles $pic_object" -+ prev= -+ fi -+ -+ # A PIC object. -+ libobjs="$libobjs $pic_object" -+ arg="$pic_object" -+ fi -+ -+ # Non-PIC object. -+ if test "$non_pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ non_pic_object="$xdir$non_pic_object" -+ -+ # A standard non-PIC object -+ non_pic_objects="$non_pic_objects $non_pic_object" -+ if test -z "$pic_object" || test "$pic_object" = none ; then -+ arg="$non_pic_object" -+ fi -+ else -+ # If the PIC object exists, use it instead. -+ # $xdir was prepended to $pic_object above. -+ non_pic_object="$pic_object" -+ non_pic_objects="$non_pic_objects $non_pic_object" -+ fi -+ else -+ # Only an error if not doing a dry-run. -+ if test -z "$run"; then -+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 -+ exit $EXIT_FAILURE -+ else -+ # Dry-run case. -+ -+ # Extract subdirectory from the argument. -+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$arg"; then -+ xdir= -+ else -+ xdir="$xdir/" -+ fi -+ -+ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` -+ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` -+ libobjs="$libobjs $pic_object" -+ non_pic_objects="$non_pic_objects $non_pic_object" -+ fi - fi - ;; - -@@ -1251,7 +1990,7 @@ - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -@@ -1260,6 +1999,7 @@ - finalize_command="$finalize_command $arg" - fi - -+ oldlibs= - # calculate the name of the file, without its directory - outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` - libobjs_save="$libobjs" -@@ -1280,12 +2020,12 @@ - output_objdir="$output_objdir/$objdir" - fi - # Create the object directory. -- if test ! -d $output_objdir; then -+ if test ! -d "$output_objdir"; then - $show "$mkdir $output_objdir" - $run $mkdir $output_objdir -- status=$? -- if test $status -ne 0 && test ! -d $output_objdir; then -- exit $status -+ exit_status=$? -+ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then -+ exit $exit_status - fi - fi - -@@ -1294,7 +2034,7 @@ - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; -@@ -1302,22 +2042,52 @@ - *) linkmode=prog ;; # Anything else should be a program. - esac - -+ case $host in -+ *cygwin* | *mingw* | *pw32*) -+ # don't eliminate duplications in $postdeps and $predeps -+ duplicate_compiler_generated_deps=yes -+ ;; -+ *) -+ duplicate_compiler_generated_deps=$duplicate_deps -+ ;; -+ esac - specialdeplibs= -+ - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do -- case "$libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -+ if test "X$duplicate_deps" = "Xyes" ; then -+ case "$libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi - libs="$libs $deplib" - done -+ -+ if test "$linkmode" = lib; then -+ libs="$predeps $libs $compiler_lib_search_path $postdeps" -+ -+ # Compute libraries that are listed more than once in $predeps -+ # $postdeps and mark them as special (i.e., whose duplicates are -+ # not to be eliminated). -+ pre_post_deps= -+ if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then -+ for pre_post_dep in $predeps $postdeps; do -+ case "$pre_post_deps " in -+ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -+ esac -+ pre_post_deps="$pre_post_deps $pre_post_dep" -+ done -+ fi -+ pre_post_deps= -+ fi -+ - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries -- notinst_path= # paths that contain not-installed libtool libraries - case $linkmode in - lib) - passes="conv link" -@@ -1326,7 +2096,7 @@ - *.la) ;; - *) - $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - done -@@ -1343,39 +2113,58 @@ - ;; - esac - for pass in $passes; do -- if test $linkmode = prog; then -- # Determine which files to process -+ if test "$linkmode,$pass" = "lib,link" || -+ test "$linkmode,$pass" = "prog,scan"; then -+ libs="$deplibs" -+ deplibs= -+ fi -+ if test "$linkmode" = prog; then - case $pass in -- dlopen) -- libs="$dlfiles" -- save_deplibs="$deplibs" # Collect dlpreopened libraries -- deplibs= -- ;; -+ dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; -- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; -+ link) -+ libs="$deplibs %DEPLIBS%" -+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" -+ ;; - esac - fi -+ if test "$pass" = dlopen; then -+ # Collect dlpreopened libraries -+ save_deplibs="$deplibs" -+ deplibs= -+ fi - for deplib in $libs; do - lib= - found=no - case $deplib in -- -l*) -- if test $linkmode = oldlib && test $linkmode = obj; then -- $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 -- continue -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ compiler_flags="$compiler_flags $deplib" - fi -- if test $pass = conv; then -- deplibs="$deplib $deplibs" -+ continue -+ ;; -+ -l*) -+ if test "$linkmode" != lib && test "$linkmode" != prog; then -+ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 - continue - fi - name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do -- # Search the libtool library -- lib="$searchdir/lib${name}.la" -- if test -f "$lib"; then -- found=yes -- break -- fi -+ for search_ext in .la $std_shrext .so .a; do -+ # Search the libtool library -+ lib="$searchdir/lib${name}${search_ext}" -+ if test -f "$lib"; then -+ if test "$search_ext" = ".la"; then -+ found=yes -+ else -+ found=no -+ fi -+ break 2 -+ fi -+ done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library -@@ -1384,40 +2173,76 @@ - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" -- test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs" -+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue -+ else # deplib is a libtool library -+ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, -+ # We need to do some special things here, and not later. -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $deplib "*) -+ if (${SED} -e '2q' $lib | -+ grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ library_names= -+ old_library= -+ case $lib in -+ */* | *\\*) . $lib ;; -+ *) . ./$lib ;; -+ esac -+ for l in $old_library $library_names; do -+ ll="$l" -+ done -+ if test "X$ll" = "X$old_library" ; then # only static version available -+ found=no -+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` -+ test "X$ladir" = "X$lib" && ladir="." -+ lib=$ladir/$old_library -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" -+ fi -+ continue -+ fi -+ fi -+ ;; -+ *) ;; -+ esac -+ fi - fi - ;; # -l - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" -- test $pass = conv && continue -+ test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - prog) -- if test $pass = conv; then -+ if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi -- if test $pass = scan; then -+ if test "$pass" = scan; then - deplibs="$deplib $deplibs" -- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi -+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - *) -- $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2 -+ $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 - ;; - esac # linkmode - continue - ;; # -L - -R*) -- if test $pass = link; then -+ if test "$pass" = link; then - dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - # Make sure the xrpath contains only unique directories. - case "$xrpath " in -@@ -1430,28 +2255,45 @@ - ;; - *.la) lib="$deplib" ;; - *.$libext) -- if test $pass = conv; then -+ if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) -- if test "$deplibs_check_method" != pass_all; then -- echo -- echo "*** Warning: This library needs some functionality provided by $deplib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -+ valid_a_lib=no -+ case $deplibs_check_method in -+ match_pattern*) -+ set dummy $deplibs_check_method -+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` -+ if eval $echo \"$deplib\" 2>/dev/null \ -+ | $SED 10q \ -+ | $EGREP "$match_pattern_regex" > /dev/null; then -+ valid_a_lib=yes -+ fi -+ ;; -+ pass_all) -+ valid_a_lib=yes -+ ;; -+ esac -+ if test "$valid_a_lib" != yes; then -+ $echo -+ $echo "*** Warning: Trying to link with static lib archive $deplib." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which you do not appear to have" -+ $echo "*** because the file extensions .$libext of this argument makes me believe" -+ $echo "*** that it is just a static archive that I should not used here." - else -- echo -- echo "*** Warning: Linking the shared library $output against the" -- echo "*** static library $deplib is not portable!" -+ $echo -+ $echo "*** Warning: Linking the shared library $output against the" -+ $echo "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - continue - ;; - prog) -- if test $pass != link; then -+ if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" -@@ -1462,14 +2304,18 @@ - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) -- if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -- # If there is no dlopen support or we're linking statically, -- # we need to preload. -- newdlprefiles="$newdlprefiles $deplib" -- compile_deplibs="$deplib $compile_deplibs" -- finalize_deplibs="$deplib $finalize_deplibs" -- else -- newdlfiles="$newdlfiles $deplib" -+ if test "$pass" = conv; then -+ deplibs="$deplib $deplibs" -+ elif test "$linkmode" = prog; then -+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -+ # If there is no dlopen support or we're linking statically, -+ # we need to preload. -+ newdlprefiles="$newdlprefiles $deplib" -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ newdlfiles="$newdlfiles $deplib" -+ fi - fi - continue - ;; -@@ -1478,17 +2324,17 @@ - continue - ;; - esac # case $deplib -- if test $found = yes || test -f "$lib"; then : -+ if test "$found" = yes || test -f "$lib"; then : - else -- $echo "$modename: cannot find the library \`$lib'" 1>&2 -- exit 1 -+ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 -+ exit $EXIT_FAILURE - fi - - # Check to see that this really is a libtool archive. -- if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` -@@ -1501,8 +2347,11 @@ - library_names= - old_library= - # If the library was installed with an old release of libtool, -- # it will not redefine variable installed. -+ # it will not redefine variables installed, or shouldnotlink - installed=yes -+ shouldnotlink=no -+ avoidtemprpath= -+ - - # Read the .la file - case $lib in -@@ -1512,19 +2361,18 @@ - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || -- { test $linkmode = oldlib && test $linkmode = obj; }; then -- # Add dl[pre]opened files of deplib -+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" - fi - -- if test $pass = conv; then -+ if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" -@@ -1532,18 +2380,21 @@ - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -+ if test "X$duplicate_deps" = "Xyes" ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi - tmp_libs="$tmp_libs $deplib" - done -- elif test $linkmode != prog && test $linkmode != lib; then -+ elif test "$linkmode" != prog && test "$linkmode" != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - continue - fi # $pass = conv - -+ - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do -@@ -1551,19 +2402,23 @@ - done - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # This library was specified with -dlopen. -- if test $pass = dlopen; then -+ if test "$pass" = dlopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi -- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -+ if test -z "$dlname" || -+ test "$dlopen_support" != yes || -+ test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking -- # statically, we need to preload. -- dlprefiles="$dlprefiles $lib" -+ # statically, we need to preload. We also need to preload any -+ # dependent libraries so libltdl's deplib preloader doesn't -+ # bomb out in the load deplibs phase. -+ dlprefiles="$dlprefiles $lib $dependency_libs" - else - newdlfiles="$newdlfiles $lib" - fi -@@ -1595,19 +2450,27 @@ - dir="$libdir" - absdir="$libdir" - fi -+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -- dir="$ladir/$objdir" -- absdir="$abs_ladir/$objdir" -- # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ dir="$ladir" -+ absdir="$abs_ladir" -+ # Remove this search path later -+ notinst_path="$notinst_path $abs_ladir" -+ else -+ dir="$ladir/$objdir" -+ absdir="$abs_ladir/$objdir" -+ # Remove this search path later -+ notinst_path="$notinst_path $abs_ladir" -+ fi - fi # $installed = yes - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - - # This library was specified with -dlpreopen. -- if test $pass = dlpreopen; then -+ if test "$pass" = dlpreopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). -@@ -1623,18 +2486,19 @@ - - if test -z "$libdir"; then - # Link the convenience library -- if test $linkmode = lib; then -+ if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else -- deplibs="$lib $deplibs" -+ deplibs="$lib $deplibs" # used for prog,scan pass - fi - continue - fi - -- if test $linkmode = prog && test $pass != link; then -+ -+ if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" - -@@ -1650,28 +2514,38 @@ - -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test - esac - # Need to link against all dependency_libs? -- if test $linkalldeplibs = yes; then -+ if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -+ if test "X$duplicate_deps" = "Xyes" ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi - tmp_libs="$tmp_libs $deplib" - done # for deplib - continue - fi # $linkmode = prog... - -- link_static=no # Whether the deplib will be linked statically -- if test -n "$library_names" && -- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then -- # Link against this shared library -+ if test "$linkmode,$pass" = "prog,link"; then -+ if test -n "$library_names" && -+ { { test "$prefer_static_libs" = no || -+ test "$prefer_static_libs,$installed" = "built,yes"; } || -+ test -z "$old_library"; }; then -+ # We need to hardcode the library path -+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then -+ # Make sure the rpath contains only unique directories. -+ case "$temp_rpath " in -+ *" $dir "*) ;; -+ *" $absdir "*) ;; -+ *) temp_rpath="$temp_rpath $absdir" ;; -+ esac -+ fi - -- if test "$linkmode,$pass" = "prog,link" || -- { test $linkmode = lib && test $hardcode_into_libs = yes; }; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. -@@ -1693,17 +2567,6 @@ - esac - ;; - esac -- if test $linkmode = prog; then -- # We need to hardcode the library path -- if test -n "$shlibpath_var"; then -- # Make sure the rpath contains only unique directories. -- case "$temp_rpath " in -- *" $dir "*) ;; -- *" $absdir "*) ;; -- *) temp_rpath="$temp_rpath $dir" ;; -- esac -- fi -- fi - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && -@@ -1713,11 +2576,56 @@ - # We only need to search for static libraries - continue - fi -+ fi - -+ link_static=no # Whether the deplib will be linked statically -+ use_static_libs=$prefer_static_libs -+ if test "$use_static_libs" = built && test "$installed" = yes ; then -+ use_static_libs=no -+ fi -+ if test -n "$library_names" && -+ { test "$use_static_libs" = no || test -z "$old_library"; }; then - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi -+ # This is a shared library -+ -+ # Warn about portability, can't link against -module's on -+ # some systems (darwin) -+ if test "$shouldnotlink" = yes && test "$pass" = link ; then -+ $echo -+ if test "$linkmode" = prog; then -+ $echo "*** Warning: Linking the executable $output against the loadable module" -+ else -+ $echo "*** Warning: Linking the shared library $output against the loadable module" -+ fi -+ $echo "*** $linklib is not portable!" -+ fi -+ if test "$linkmode" = lib && -+ test "$hardcode_into_libs" = yes; then -+ # Hardcode the library path. -+ # Skip directories that are in the system default run-time -+ # search path. -+ case " $sys_lib_dlsearch_path " in -+ *" $absdir "*) ;; -+ *) -+ case "$compile_rpath " in -+ *" $absdir "*) ;; -+ *) compile_rpath="$compile_rpath $absdir" -+ esac -+ ;; -+ esac -+ case " $sys_lib_dlsearch_path " in -+ *" $libdir "*) ;; -+ *) -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" -+ esac -+ ;; -+ esac -+ fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname -@@ -1731,7 +2639,7 @@ - elif test -n "$soname_spec"; then - # bleh windows - case $host in -- *cygwin*) -+ *cygwin* | mingw*) - major=`expr $current - $age` - versuffix="-$major" - ;; -@@ -1743,17 +2651,18 @@ - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" -- soname=`echo $soroot | sed -e 's/^.*\///'` -- newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a" -+ soname=`$echo $soroot | ${SED} -e 's/^.*\///'` -+ newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - $show "extracting exported symbol list from \`$soname'" -- IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' -- eval cmds=\"$extract_expsyms_cmds\" -+ save_ifs="$IFS"; IFS='~' -+ cmds=$extract_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -1763,10 +2672,11 @@ - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - $show "generating import library for \`$soname'" -- IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' -- eval cmds=\"$old_archive_from_expsyms_cmds\" -+ save_ifs="$IFS"; IFS='~' -+ cmds=$old_archive_from_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -1775,9 +2685,9 @@ - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib -- fi # test -n $old_archive_from_expsyms_cmds -+ fi # test -n "$old_archive_from_expsyms_cmds" - -- if test $linkmode = prog || test "$mode" != relink; then -+ if test "$linkmode" = prog || test "$mode" != relink; then - add_shlibpath= - add_dir= - add= -@@ -1786,6 +2696,26 @@ - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" -+ case $host in -+ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; -+ *-*-sysv4*uw2*) add_dir="-L$dir" ;; -+ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ -+ *-*-unixware7*) add_dir="-L$dir" ;; -+ *-*-darwin* ) -+ # if the lib is a module then we can not link against -+ # it, someone is ignoring the new warnings I added -+ if /usr/bin/file -L $add 2> /dev/null | -+ $EGREP ": [^:]* bundle" >/dev/null ; then -+ $echo "** Warning, lib $linklib is a module, not a shared library" -+ if test -z "$old_library" ; then -+ $echo -+ $echo "** And there doesn't seem to be a static archive available" -+ $echo "** The link will probably fail, sorry" -+ else -+ add="$dir/$old_library" -+ fi -+ fi -+ esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; -@@ -1804,6 +2734,14 @@ - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" -+ # Try looking first in the location we're being installed to. -+ if test -n "$inst_prefix_dir"; then -+ case $libdir in -+ [\\/]*) -+ add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ ;; -+ esac -+ fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" -@@ -1817,7 +2755,7 @@ - - if test "$lib_linked" != yes; then - $echo "$modename: configuration error: unsupported hardcode properties" -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test -n "$add_shlibpath"; then -@@ -1826,7 +2764,7 @@ - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; - esac - fi -- if test $linkmode = prog; then -+ if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else -@@ -1843,7 +2781,7 @@ - fi - fi - -- if test $linkmode = prog || test "$mode" = relink; then -+ if test "$linkmode" = prog || test "$mode" = relink; then - add_shlibpath= - add_dir= - add= -@@ -1859,13 +2797,28 @@ - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - add="-l$name" -+ elif test "$hardcode_automatic" = yes; then -+ if test -n "$inst_prefix_dir" && -+ test -f "$inst_prefix_dir$libdir/$linklib" ; then -+ add="$inst_prefix_dir$libdir/$linklib" -+ else -+ add="$libdir/$linklib" -+ fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" -+ # Try looking first in the location we're being installed to. -+ if test -n "$inst_prefix_dir"; then -+ case $libdir in -+ [\\/]*) -+ add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ ;; -+ esac -+ fi - add="-l$name" - fi - -- if test $linkmode = prog; then -+ if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else -@@ -1873,16 +2826,7 @@ - test -n "$add" && deplibs="$add $deplibs" - fi - fi -- elif test $linkmode = prog; then -- if test "$alldeplibs" = yes && -- { test "$deplibs_check_method" = pass_all || -- { test "$build_libtool_libs" = yes && -- test -n "$library_names"; }; }; then -- # We only need to search for static libraries -- continue -- fi -- -- # Try to link the static library -+ elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. -@@ -1902,40 +2846,40 @@ - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. -- echo -- echo "*** Warning: This library needs some functionality provided by $lib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -+ $echo -+ $echo "*** Warning: This system can not link to static lib archive $lib." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then -- echo "*** Therefore, libtool will create a static module, that should work " -- echo "*** as long as the dlopening application is linked with the -dlopen flag." -+ $echo "*** But as you try to build a module library, libtool will still create " -+ $echo "*** a static module, that should work as long as the dlopening application" -+ $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then -- echo -- echo "*** However, this would only work if libtool was able to extract symbol" -- echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -- echo "*** not find such a program. So, this module is probably useless." -- echo "*** \`nm' from GNU binutils and a full rebuild may help." -+ $echo -+ $echo "*** However, this would only work if libtool was able to extract symbol" -+ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ $echo "*** not find such a program. So, this module is probably useless." -+ $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then -- build_libtool_libs=module -- build_old_libs=yes -+ build_libtool_libs=module -+ build_old_libs=yes - else -- build_libtool_libs=no -+ build_libtool_libs=no - fi - fi - else -- convenience="$convenience $dir/$old_library" -- old_convenience="$old_convenience $dir/$old_library" - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? - -- if test $linkmode = lib; then -+ if test "$linkmode" = lib; then - if test -n "$dependency_libs" && -- { test $hardcode_into_libs != yes || test $build_old_libs = yes || -- test $link_static = yes; }; then -+ { test "$hardcode_into_libs" != yes || -+ test "$build_old_libs" = yes || -+ test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do -@@ -1958,13 +2902,15 @@ - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -+ if test "X$duplicate_deps" = "Xyes" ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi - tmp_libs="$tmp_libs $deplib" - done - -- if test $link_all_deplibs != no; then -+ if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - case $deplib in -@@ -1984,38 +2930,83 @@ - ;; - esac - if grep "^installed=no" $deplib > /dev/null; then -- path="-L$absdir/$objdir" -+ path="$absdir/$objdir" - else -- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - if test "$absdir" != "$libdir"; then - $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 - fi -- path="-L$absdir" -+ path="$absdir" - fi -+ depdepl= -+ case $host in -+ *-*-darwin*) -+ # we do not want to link against static libs, -+ # but need to link against shared -+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` -+ if test -n "$deplibrary_names" ; then -+ for tmp in $deplibrary_names ; do -+ depdepl=$tmp -+ done -+ if test -f "$path/$depdepl" ; then -+ depdepl="$path/$depdepl" -+ fi -+ # do not add paths which are already there -+ case " $newlib_search_path " in -+ *" $path "*) ;; -+ *) newlib_search_path="$newlib_search_path $path";; -+ esac -+ fi -+ path="" -+ ;; -+ *) -+ path="-L$path" -+ ;; -+ esac -+ ;; -+ -l*) -+ case $host in -+ *-*-darwin*) -+ # Again, we only want to link against shared libraries -+ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` -+ for tmp in $newlib_search_path ; do -+ if test -f "$tmp/lib$tmp_libs.dylib" ; then -+ eval depdepl="$tmp/lib$tmp_libs.dylib" -+ break -+ fi -+ done -+ path="" -+ ;; -+ *) continue ;; -+ esac - ;; - *) continue ;; - esac - case " $deplibs " in - *" $path "*) ;; -- *) deplibs="$deplibs $path" ;; -+ *) deplibs="$path $deplibs" ;; -+ esac -+ case " $deplibs " in -+ *" $depdepl "*) ;; -+ *) deplibs="$depdepl $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs -- if test $pass = dlpreopen; then -+ dependency_libs="$newdependency_libs" -+ if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi -- if test $pass != dlopen; then -- test $pass != scan && dependency_libs="$newdependency_libs" -- if test $pass != conv; then -+ if test "$pass" != dlopen; then -+ if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do -@@ -2037,9 +3028,30 @@ - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do -+ # FIXME: Pedantically, this is the right thing to do, so -+ # that some nasty dependency loop isn't accidentally -+ # broken: -+ #new_libs="$deplib $new_libs" -+ # Pragmatically, this seems to cause very few problems in -+ # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; -+ -R*) ;; - *) -+ # And here is the reason: when a library appears more -+ # than once as an explicit dependence of a library, or -+ # is implicitly linked in more than once by the -+ # compiler, it is considered special, and multiple -+ # occurrences thereof are not removed. Compare this -+ # with having the same library being listed as a -+ # dependency of multiple other libraries: in this case, -+ # we know (pedantically, we assume) the library does not -+ # need to be listed more than once, so we keep only the -+ # last copy. This is not always right, but it is rare -+ # enough that we require users that really mean to play -+ # such unportable linking tricks to link the library -+ # using -Wl,-lname, so that libtool does not consider it -+ # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) -@@ -2067,19 +3079,32 @@ - eval $var=\"$tmp_libs\" - done # for var - fi -- if test "$pass" = "conv" && -- { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then -- libs="$deplibs" # reset libs -- deplibs= -- fi -+ # Last step: remove runtime libs from dependency_libs -+ # (they stay in deplibs) -+ tmp_libs= -+ for i in $dependency_libs ; do -+ case " $predeps $postdeps $compiler_lib_search_path " in -+ *" $i "*) -+ i="" -+ ;; -+ esac -+ if test -n "$i" ; then -+ tmp_libs="$tmp_libs $i" -+ fi -+ done -+ dependency_libs=$tmp_libs - done # for pass -- if test $linkmode = prog; then -+ if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) -+ if test -n "$deplibs"; then -+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 -+ fi -+ - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 - fi -@@ -2093,7 +3118,7 @@ - fi - - if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2 -+ $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 - fi - - if test -n "$release"; then -@@ -2115,17 +3140,19 @@ - case $outputname in - lib*) - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` -+ eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - if test "$module" = no; then - $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` -+ eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` -@@ -2136,11 +3163,11 @@ - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 -- exit 1 -+ exit $EXIT_FAILURE - else -- echo -- echo "*** Warning: Linking the shared library $output against the non-libtool" -- echo "*** objects $objs is not portable!" -+ $echo -+ $echo "*** Warning: Linking the shared library $output against the non-libtool" -+ $echo "*** objects $objs is not portable!" - libobjs="$libobjs $objs" - fi - fi -@@ -2150,7 +3177,7 @@ - fi - - set dummy $rpath -- if test $# -gt 2; then -+ if test "$#" -gt 2; then - $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 - fi - install_libdir="$2" -@@ -2159,14 +3186,16 @@ - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. -- libext=al -+ # Some compilers have problems with a `.al' extension so -+ # convenience libraries should have the same extension an -+ # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi - - if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2 -+ $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 - fi - - if test -n "$release"; then -@@ -2175,52 +3204,95 @@ - else - - # Parse the version information argument. -- IFS="${IFS= }"; save_ifs="$IFS"; IFS=':' -+ save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - IFS="$save_ifs" - - if test -n "$8"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - -- current="$2" -- revision="$3" -- age="$4" -+ # convert absolute version numbers to libtool ages -+ # this retains compatibility with .la files and attempts -+ # to make the code below a bit more comprehensible -+ -+ case $vinfo_number in -+ yes) -+ number_major="$2" -+ number_minor="$3" -+ number_revision="$4" -+ # -+ # There are really only two kinds -- those that -+ # use the current revision as the major version -+ # and those that subtract age and use age as -+ # a minor version. But, then there is irix -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+ darwin|linux|osf|windows|none) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+ freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+ ;; -+ irix|nonstopux) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_minor" -+ lt_irix_increment=no -+ ;; -+ *) -+ $echo "$modename: unknown library version type \`$version_type'" 1>&2 -+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -+ exit $EXIT_FAILURE -+ ;; -+ esac -+ ;; -+ no) -+ current="$2" -+ revision="$3" -+ age="$4" -+ ;; -+ esac - - # Check that each of the things are valid numbers. - case $current in -- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; -+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) -- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 -+ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - - case $revision in -- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; -+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) -- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 -+ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - - case $age in -- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; -+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) -- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 -+ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - -- if test $age -gt $current; then -+ if test "$age" -gt "$current"; then - $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Calculate the version variables. -@@ -2237,6 +3309,7 @@ - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - minor_current=`expr $current + 1` -+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; - -@@ -2250,16 +3323,24 @@ - versuffix=".$current"; - ;; - -- irix) -- major=`expr $current - $age + 1` -- verstring="sgi$major.$revision" -+ irix | nonstopux) -+ if test "X$lt_irix_increment" = "Xno"; then -+ major=`expr $current - $age` -+ else -+ major=`expr $current - $age + 1` -+ fi -+ case $version_type in -+ nonstopux) verstring_prefix=nonstopux ;; -+ *) verstring_prefix=sgi ;; -+ esac -+ verstring="$verstring_prefix$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision -- while test $loop != 0; do -+ while test "$loop" -ne 0; do - iface=`expr $revision - $loop` - loop=`expr $loop - 1` -- verstring="sgi$major.$iface:$verstring" -+ verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. -@@ -2273,13 +3354,13 @@ - ;; - - osf) -- major=`expr $current - $age` -+ major=.`expr $current - $age` - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age -- while test $loop != 0; do -+ while test "$loop" -ne 0; do - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" -@@ -2303,15 +3384,24 @@ - - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 -- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -- exit 1 -+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -+ exit $EXIT_FAILURE - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= -- verstring="0.0" -+ case $version_type in -+ darwin) -+ # we can't check for "0.0" in archive_cmds due to quoting -+ # problems, so we reset it completely -+ verstring= -+ ;; -+ *) -+ verstring="0.0" -+ ;; -+ esac - if test "$need_version" = no; then - versuffix= - else -@@ -2340,9 +3430,30 @@ - fi - - if test "$mode" != relink; then -- # Remove our outputs. -- $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" -- $run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.* -+ # Remove our outputs, but don't remove object files since they -+ # may have been created when compiling PIC objects. -+ removelist= -+ tempremovelist=`$echo "$output_objdir/*"` -+ for p in $tempremovelist; do -+ case $p in -+ *.$objext) -+ ;; -+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) -+ if test "X$precious_files_regex" != "X"; then -+ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 -+ then -+ continue -+ fi -+ fi -+ removelist="$removelist $p" -+ ;; -+ *) ;; -+ esac -+ done -+ if test -n "$removelist"; then -+ $show "${rm}r $removelist" -+ $run ${rm}r $removelist -+ fi - fi - - # Now set the variables for building old libraries. -@@ -2354,11 +3465,11 @@ - fi - - # Eliminate all temporary directories. -- for path in $notinst_path; do -- lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'` -- deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'` -- dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'` -- done -+ #for path in $notinst_path; do -+ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` -+ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` -+ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` -+ #done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. -@@ -2370,7 +3481,7 @@ - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done -- if test $hardcode_into_libs != yes || test $build_old_libs = yes; then -+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi -@@ -2408,9 +3519,18 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -- *) -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -+ # Do not include libc due to us having libc/libc_r. -+ ;; -+ *-*-sco3.2v5* | *-*-sco5v6*) -+ # Causes problems with __ctype -+ ;; -+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) -+ # Compiler inserts libc in the correct place for threads to work -+ ;; -+ *) - # Add libc to deplibs on all other systems if necessary. -- if test $build_libtool_need_lc = "yes"; then -+ if test "$build_libtool_need_lc" = "yes"; then - deplibs="$deplibs -lc" - fi - ;; -@@ -2437,7 +3557,7 @@ - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just -- # implementing what was already the behaviour. -+ # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) -@@ -2450,64 +3570,85 @@ - int main() { return 0; } - EOF - $rm conftest -- $CC -o conftest conftest.c $deplibs -- if test $? -eq 0 ; then -+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then - ldd_output=`ldd conftest` - for i in $deplibs; do -- name="`expr $i : '-l\(.*\)'`" -+ name=`expr $i : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. -- if test -n "$name" && test "$name" != "0"; then -- libname=`eval \\$echo \"$libname_spec\"` -- deplib_matches=`eval \\$echo \"$library_names_spec\"` -- set dummy $deplib_matches -- deplib_match=$2 -- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -- else -- droppeddeps=yes -- echo -- echo "*** Warning: This library needs some functionality provided by $i." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -+ if test "$name" != "" && test "$name" != "0"; then -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $i "*) -+ newdeplibs="$newdeplibs $i" -+ i="" -+ ;; -+ esac -+ fi -+ if test -n "$i" ; then -+ libname=`eval \\$echo \"$libname_spec\"` -+ deplib_matches=`eval \\$echo \"$library_names_spec\"` -+ set dummy $deplib_matches -+ deplib_match=$2 -+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -+ newdeplibs="$newdeplibs $i" -+ else -+ droppeddeps=yes -+ $echo -+ $echo "*** Warning: dynamic linker does not accept needed library $i." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which I believe you do not have" -+ $echo "*** because a test_compile did reveal that the linker did not use it for" -+ $echo "*** its dynamic dependency list that programs get resolved with at runtime." -+ fi - fi - else - newdeplibs="$newdeplibs $i" - fi - done - else -- # Error occured in the first compile. Let's try to salvage the situation: -- # Compile a seperate program for each library. -+ # Error occurred in the first compile. Let's try to salvage -+ # the situation: Compile a separate program for each library. - for i in $deplibs; do -- name="`expr $i : '-l\(.*\)'`" -- # If $name is empty we are operating on a -L argument. -- if test -n "$name" && test "$name" != "0"; then -+ name=`expr $i : '-l\(.*\)'` -+ # If $name is empty we are operating on a -L argument. -+ if test "$name" != "" && test "$name" != "0"; then - $rm conftest -- $CC -o conftest conftest.c $i -- # Did it work? -- if test $? -eq 0 ; then -+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then - ldd_output=`ldd conftest` -- libname=`eval \\$echo \"$libname_spec\"` -- deplib_matches=`eval \\$echo \"$library_names_spec\"` -- set dummy $deplib_matches -- deplib_match=$2 -- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -- else -- droppeddeps=yes -- echo -- echo "*** Warning: This library needs some functionality provided by $i." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $i "*) -+ newdeplibs="$newdeplibs $i" -+ i="" -+ ;; -+ esac -+ fi -+ if test -n "$i" ; then -+ libname=`eval \\$echo \"$libname_spec\"` -+ deplib_matches=`eval \\$echo \"$library_names_spec\"` -+ set dummy $deplib_matches -+ deplib_match=$2 -+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -+ newdeplibs="$newdeplibs $i" -+ else -+ droppeddeps=yes -+ $echo -+ $echo "*** Warning: dynamic linker does not accept needed library $i." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which you do not appear to have" -+ $echo "*** because a test_compile did reveal that the linker did not use this one" -+ $echo "*** as a dynamic dependency that programs can get resolved with at runtime." -+ fi - fi - else - droppeddeps=yes -- echo -- echo "*** Warning! Library $i is needed by this library but I was not able to" -- echo "*** make it link in! You will probably need to install it or some" -- echo "*** library that it depends on before this library will be fully" -- echo "*** functional. Installing it before continuing would be even better." -+ $echo -+ $echo "*** Warning! Library $i is needed by this library but I was not able to" -+ $echo "*** make it link in! You will probably need to install it or some" -+ $echo "*** library that it depends on before this library will be fully" -+ $echo "*** functional. Installing it before continuing would be even better." - fi - else - newdeplibs="$newdeplibs $i" -@@ -2519,13 +3660,22 @@ - set dummy $deplibs_check_method - file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do -- name="`expr $a_deplib : '-l\(.*\)'`" -+ name=`expr $a_deplib : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. -- if test -n "$name" && test "$name" != "0"; then -- libname=`eval \\$echo \"$libname_spec\"` -- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -- for potent_lib in $potential_libs; do -+ if test "$name" != "" && test "$name" != "0"; then -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $a_deplib "*) -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ ;; -+ esac -+ fi -+ if test -n "$a_deplib" ; then -+ libname=`eval \\$echo \"$libname_spec\"` -+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null \ - | grep " -> " >/dev/null; then -@@ -2538,28 +3688,36 @@ - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do -- potliblink=`ls -ld $potlib | sed 's/.* -> //'` -+ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ -- | sed 10q \ -- | egrep "$file_magic_regex" > /dev/null; then -+ | ${SED} 10q \ -+ | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi -- done -- done -+ done -+ done -+ fi - if test -n "$a_deplib" ; then - droppeddeps=yes -- echo -- echo "*** Warning: This library needs some functionality provided by $a_deplib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -+ $echo -+ $echo "*** Warning: linker path does not have real file for library $a_deplib." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which you do not appear to have" -+ $echo "*** because I did check the linker path looking for a file starting" -+ if test -z "$potlib" ; then -+ $echo "*** with $libname but no candidates were found. (...for file magic test)" -+ else -+ $echo "*** with $libname and none of the candidates passed a file format test" -+ $echo "*** using a file magic. Last file checked: $potlib" -+ fi - fi - else - # Add a -L argument. -@@ -2571,29 +3729,47 @@ - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do -- name="`expr $a_deplib : '-l\(.*\)'`" -+ name=`expr $a_deplib : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then -- libname=`eval \\$echo \"$libname_spec\"` -- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -- for potent_lib in $potential_libs; do -- if eval echo \"$potent_lib\" 2>/dev/null \ -- | sed 10q \ -- | egrep "$match_pattern_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -- a_deplib="" -- break 2 -- fi -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $a_deplib "*) -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ ;; -+ esac -+ fi -+ if test -n "$a_deplib" ; then -+ libname=`eval \\$echo \"$libname_spec\"` -+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ for potent_lib in $potential_libs; do -+ potlib="$potent_lib" # see symlink-check above in file_magic test -+ if eval $echo \"$potent_lib\" 2>/dev/null \ -+ | ${SED} 10q \ -+ | $EGREP "$match_pattern_regex" > /dev/null; then -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ break 2 -+ fi -+ done - done -- done -+ fi - if test -n "$a_deplib" ; then - droppeddeps=yes -- echo -- echo "*** Warning: This library needs some functionality provided by $a_deplib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -+ $echo -+ $echo "*** Warning: linker path does not have real file for library $a_deplib." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which you do not appear to have" -+ $echo "*** because I did check the linker path looking for a file starting" -+ if test -z "$potlib" ; then -+ $echo "*** with $libname but no candidates were found. (...for regex pattern test)" -+ else -+ $echo "*** with $libname and none of the candidates passed a file format test" -+ $echo "*** using a regex pattern. Last file checked: $potlib" -+ fi - fi - else - # Add a -L argument. -@@ -2603,16 +3779,23 @@ - ;; - none | unknown | *) - newdeplibs="" -- if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ -- -e 's/ -[LR][^ ]*//g' -e 's/[ ]//g' | -- grep . >/dev/null; then -- echo -+ tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ -+ -e 's/ -[LR][^ ]*//g'` -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ for i in $predeps $postdeps ; do -+ # can't use Xsed below, because $i might contain '/' -+ tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` -+ done -+ fi -+ if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ -+ | grep . >/dev/null; then -+ $echo - if test "X$deplibs_check_method" = "Xnone"; then -- echo "*** Warning: inter-library dependencies are not supported in this platform." -+ $echo "*** Warning: inter-library dependencies are not supported in this platform." - else -- echo "*** Warning: inter-library dependencies are not known to be supported." -+ $echo "*** Warning: inter-library dependencies are not known to be supported." - fi -- echo "*** All declared inter-library dependencies are being dropped." -+ $echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - fi - ;; -@@ -2632,17 +3815,17 @@ - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then -- echo -- echo "*** Warning: libtool could not satisfy all declared inter-library" -- echo "*** dependencies of module $libname. Therefore, libtool will create" -- echo "*** a static module, that should work as long as the dlopening" -- echo "*** application is linked with the -dlopen flag." -+ $echo -+ $echo "*** Warning: libtool could not satisfy all declared inter-library" -+ $echo "*** dependencies of module $libname. Therefore, libtool will create" -+ $echo "*** a static module, that should work as long as the dlopening" -+ $echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then -- echo -- echo "*** However, this would only work if libtool was able to extract symbol" -- echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -- echo "*** not find such a program. So, this module is probably useless." -- echo "*** \`nm' from GNU binutils and a full rebuild may help." -+ $echo -+ $echo "*** However, this would only work if libtool was able to extract symbol" -+ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ $echo "*** not find such a program. So, this module is probably useless." -+ $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" -@@ -2652,16 +3835,16 @@ - build_libtool_libs=no - fi - else -- echo "*** The inter-library dependencies that have been dropped here will be" -- echo "*** automatically added whenever a program is linked with this library" -- echo "*** or is declared to -dlopen it." -- -- if test $allow_undefined = no; then -- echo -- echo "*** Since this library must not contain undefined symbols," -- echo "*** because either the platform does not support them or" -- echo "*** it was explicitly requested with -no-undefined," -- echo "*** libtool will only create a static version of it." -+ $echo "*** The inter-library dependencies that have been dropped here will be" -+ $echo "*** automatically added whenever a program is linked with this library" -+ $echo "*** or is declared to -dlopen it." -+ -+ if test "$allow_undefined" = no; then -+ $echo -+ $echo "*** Since this library must not contain undefined symbols," -+ $echo "*** because either the platform does not support them or" -+ $echo "*** it was explicitly requested with -no-undefined," -+ $echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module -@@ -2676,6 +3859,35 @@ - deplibs=$newdeplibs - fi - -+ -+ # move library search paths that coincide with paths to not yet -+ # installed libraries to the beginning of the library search list -+ new_libs= -+ for path in $notinst_path; do -+ case " $new_libs " in -+ *" -L$path/$objdir "*) ;; -+ *) -+ case " $deplibs " in -+ *" -L$path/$objdir "*) -+ new_libs="$new_libs -L$path/$objdir" ;; -+ esac -+ ;; -+ esac -+ done -+ for deplib in $deplibs; do -+ case $deplib in -+ -L*) -+ case " $new_libs " in -+ *" $deplib "*) ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac -+ ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac -+ done -+ deplibs="$new_libs" -+ -+ - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= -@@ -2683,7 +3895,7 @@ - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then -- if test $hardcode_into_libs = yes; then -+ if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= -@@ -2719,7 +3931,14 @@ - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- eval dep_rpath=\"$hardcode_libdir_flag_spec\" -+ if test -n "$hardcode_libdir_flag_spec_ld"; then -+ case $archive_cmds in -+ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; -+ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; -+ esac -+ else -+ eval dep_rpath=\"$hardcode_libdir_flag_spec\" -+ fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. -@@ -2739,6 +3958,7 @@ - fi - - # Get the real and link names of the library. -+ eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" -@@ -2749,31 +3969,17 @@ - else - soname="$realname" - fi -- test -z "$dlname" && dlname=$soname -+ if test -z "$dlname"; then -+ dlname=$soname -+ fi - - lib="$output_objdir/$realname" -+ linknames= - for link - do - linknames="$linknames $link" - done - -- # Ensure that we have .o objects for linkers which dislike .lo -- # (e.g. aix) in case we are running --disable-static -- for obj in $libobjs; do -- xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$xdir" = "X$obj"; then -- xdir="." -- else -- xdir="$xdir" -- fi -- baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` -- oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` -- if test ! -f $xdir/$oldobj; then -- $show "(cd $xdir && ${LN_S} $baseobj $oldobj)" -- $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $? -- fi -- done -- - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - -@@ -2783,17 +3989,29 @@ - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols -- eval cmds=\"$export_symbols_cmds\" -- IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' -+ cmds=$export_symbols_cmds -+ save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" || exit $? -+ eval cmd=\"$cmd\" -+ if len=`expr "X$cmd" : ".*"` && -+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ skipped_export=false -+ else -+ # The command line is too long to execute in one step. -+ $show "using reloadable object file for export list..." -+ skipped_export=: -+ # Break out early, otherwise skipped_export may be -+ # set to false by a later but shorter cmd. -+ break -+ fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex"; then -- $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" -- $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' -+ $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" -+ $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - $show "$mv \"${export_symbols}T\" \"$export_symbols\"" - $run eval '$mv "${export_symbols}T" "$export_symbols"' - fi -@@ -2804,74 +4022,210 @@ - $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' - fi - -+ tmp_deplibs= -+ for test_deplib in $deplibs; do -+ case " $convenience " in -+ *" $test_deplib "*) ;; -+ *) -+ tmp_deplibs="$tmp_deplibs $test_deplib" -+ ;; -+ esac -+ done -+ deplibs="$tmp_deplibs" -+ - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then -+ save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${outputname}x" -- $show "${rm}r $gentop" -- $run ${rm}r "$gentop" -- $show "mkdir $gentop" -- $run mkdir "$gentop" -- status=$? -- if test $status -ne 0 && test ! -d "$gentop"; then -- exit $status -- fi - generated="$generated $gentop" - -- for xlib in $convenience; do -- # Extract the objects. -- case $xlib in -- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; -- *) xabs=`pwd`"/$xlib" ;; -- esac -- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` -- xdir="$gentop/$xlib" -+ func_extract_archives $gentop $convenience -+ libobjs="$libobjs $func_extract_archives_result" -+ fi -+ fi -+ -+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then -+ eval flag=\"$thread_safe_flag_spec\" -+ linker_flags="$linker_flags $flag" -+ fi -+ -+ # Make a backup of the uninstalled library when relinking -+ if test "$mode" = relink; then -+ $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? -+ fi -+ -+ # Do each of the archive commands. -+ if test "$module" = yes && test -n "$module_cmds" ; then -+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -+ eval test_cmds=\"$module_expsym_cmds\" -+ cmds=$module_expsym_cmds -+ else -+ eval test_cmds=\"$module_cmds\" -+ cmds=$module_cmds -+ fi -+ else -+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -+ eval test_cmds=\"$archive_expsym_cmds\" -+ cmds=$archive_expsym_cmds -+ else -+ eval test_cmds=\"$archive_cmds\" -+ cmds=$archive_cmds -+ fi -+ fi -+ -+ if test "X$skipped_export" != "X:" && -+ len=`expr "X$test_cmds" : ".*" 2>/dev/null` && -+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ : -+ else -+ # The command line is too long to link in one step, link piecewise. -+ $echo "creating reloadable object files..." - -- $show "${rm}r $xdir" -- $run ${rm}r "$xdir" -- $show "mkdir $xdir" -- $run mkdir "$xdir" -- status=$? -- if test $status -ne 0 && test ! -d "$xdir"; then -- exit $status -+ # Save the value of $output and $libobjs because we want to -+ # use them later. If we have whole_archive_flag_spec, we -+ # want to use save_libobjs as it was before -+ # whole_archive_flag_spec was expanded, because we can't -+ # assume the linker understands whole_archive_flag_spec. -+ # This may have to be revisited, in case too many -+ # convenience libraries get linked in and end up exceeding -+ # the spec. -+ if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then -+ save_libobjs=$libobjs -+ fi -+ save_output=$output -+ output_la=`$echo "X$output" | $Xsed -e "$basename"` -+ -+ # Clear the reloadable object creation command queue and -+ # initialize k to one. -+ test_cmds= -+ concat_cmds= -+ objlist= -+ delfiles= -+ last_robj= -+ k=1 -+ output=$output_objdir/$output_la-${k}.$objext -+ # Loop over the list of objects to be linked. -+ for obj in $save_libobjs -+ do -+ eval test_cmds=\"$reload_cmds $objlist $last_robj\" -+ if test "X$objlist" = X || -+ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && -+ test "$len" -le "$max_cmd_len"; }; then -+ objlist="$objlist $obj" -+ else -+ # The command $test_cmds is almost too long, add a -+ # command to the queue. -+ if test "$k" -eq 1 ; then -+ # The first file doesn't have a previous command to add. -+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\" -+ else -+ # All subsequent reloadable object files will link in -+ # the last one created. -+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" - fi -- $show "(cd $xdir && $AR x $xabs)" -- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? -+ last_robj=$output_objdir/$output_la-${k}.$objext -+ k=`expr $k + 1` -+ output=$output_objdir/$output_la-${k}.$objext -+ objlist=$obj -+ len=1 -+ fi -+ done -+ # Handle the remaining objects by creating one last -+ # reloadable object file. All subsequent reloadable object -+ # files will link in the last one created. -+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" -+ -+ if ${skipped_export-false}; then -+ $show "generating symbol list for \`$libname.la'" -+ export_symbols="$output_objdir/$libname.exp" -+ $run $rm $export_symbols -+ libobjs=$output -+ # Append the command to create the export file. -+ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" -+ fi -+ -+ # Set up a command to remove the reloadable object files -+ # after they are used. -+ i=0 -+ while test "$i" -lt "$k" -+ do -+ i=`expr $i + 1` -+ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" -+ done -+ -+ $echo "creating a temporary reloadable object file: $output" -+ -+ # Loop through the commands generated above and execute them. -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $concat_cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ -+ libobjs=$output -+ # Restore the value of output. -+ output=$save_output - -- libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` -- done -+ if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - fi -- fi -- -- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then -- eval flag=\"$thread_safe_flag_spec\" -- linker_flags="$linker_flags $flag" -- fi -+ # Expand the library linking commands again to reset the -+ # value of $libobjs for piecewise linking. - -- # Make a backup of the uninstalled library when relinking -- if test "$mode" = relink; then -- $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? -- fi -+ # Do each of the archive commands. -+ if test "$module" = yes && test -n "$module_cmds" ; then -+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -+ cmds=$module_expsym_cmds -+ else -+ cmds=$module_cmds -+ fi -+ else -+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -+ cmds=$archive_expsym_cmds -+ else -+ cmds=$archive_cmds -+ fi -+ fi - -- # Do each of the archive commands. -- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -- eval cmds=\"$archive_expsym_cmds\" -- else -- eval cmds=\"$archive_cmds\" -+ # Append the command to remove the reloadable object files -+ # to the just-reset $cmds. -+ eval cmds=\"\$cmds~\$rm $delfiles\" - fi -- IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' -+ save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" -- $run eval "$cmd" || exit $? -+ $run eval "$cmd" || { -+ lt_exit=$? -+ -+ # Restore the uninstalled library and exit -+ if test "$mode" = relink; then -+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' -+ fi -+ -+ exit $lt_exit -+ } - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? -- exit 0 -+ -+ if test -n "$convenience"; then -+ if test -z "$whole_archive_flag_spec"; then -+ $show "${rm}r $gentop" -+ $run ${rm}r "$gentop" -+ fi -+ fi -+ -+ exit $EXIT_SUCCESS - fi - - # Create links to the real library. -@@ -2919,7 +4273,7 @@ - *.lo) - if test -n "$objs$old_deplibs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e "$lo2o"` -@@ -2940,46 +4294,20 @@ - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of -- # -Wl from whole_archive_flag_spec -+ # -Wl from whole_archive_flag_spec and hope we can get by with -+ # turning comma into space.. - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then -- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" -+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" -+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` - else - gentop="$output_objdir/${obj}x" -- $show "${rm}r $gentop" -- $run ${rm}r "$gentop" -- $show "mkdir $gentop" -- $run mkdir "$gentop" -- status=$? -- if test $status -ne 0 && test ! -d "$gentop"; then -- exit $status -- fi - generated="$generated $gentop" - -- for xlib in $convenience; do -- # Extract the objects. -- case $xlib in -- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; -- *) xabs=`pwd`"/$xlib" ;; -- esac -- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` -- xdir="$gentop/$xlib" -- -- $show "${rm}r $xdir" -- $run ${rm}r "$xdir" -- $show "mkdir $xdir" -- $run mkdir "$xdir" -- status=$? -- if test $status -ne 0 && test ! -d "$xdir"; then -- exit $status -- fi -- $show "(cd $xdir && $AR x $xabs)" -- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? -- -- reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` -- done -+ func_extract_archives $gentop $convenience -+ reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - -@@ -2987,10 +4315,11 @@ - reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" -- eval cmds=\"$reload_cmds\" -- IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' -+ cmds=$reload_cmds -+ save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -3003,7 +4332,7 @@ - $run ${rm}r $gentop - fi - -- exit 0 -+ exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then -@@ -3014,37 +4343,24 @@ - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. -- $show "echo timestamp > $libobj" -- $run eval "echo timestamp > $libobj" || exit $? -- exit 0 -+ # $show "echo timestamp > $libobj" -+ # $run eval "echo timestamp > $libobj" || exit $? -+ exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" -- eval cmds=\"$reload_cmds\" -- IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' -+ cmds=$reload_cmds -+ save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" -- else -- # Just create a symlink. -- $show $rm $libobj -- $run $rm $libobj -- xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$xdir" = "X$libobj"; then -- xdir="." -- else -- xdir="$xdir" -- fi -- baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` -- oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` -- $show "(cd $xdir && $LN_S $oldobj $baseobj)" -- $run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $? - fi - - if test -n "$gentop"; then -@@ -3052,12 +4368,12 @@ - $run ${rm}r $gentop - fi - -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - prog) - case $host in -- *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;; -+ *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; - esac - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 -@@ -3082,6 +4398,45 @@ - ;; - esac - -+ case $host in -+ *darwin*) -+ # Don't allow lazy linking, it breaks C++ global constructors -+ if test "$tagname" = CXX ; then -+ compile_command="$compile_command ${wl}-bind_at_load" -+ finalize_command="$finalize_command ${wl}-bind_at_load" -+ fi -+ ;; -+ esac -+ -+ -+ # move library search paths that coincide with paths to not yet -+ # installed libraries to the beginning of the library search list -+ new_libs= -+ for path in $notinst_path; do -+ case " $new_libs " in -+ *" -L$path/$objdir "*) ;; -+ *) -+ case " $compile_deplibs " in -+ *" -L$path/$objdir "*) -+ new_libs="$new_libs -L$path/$objdir" ;; -+ esac -+ ;; -+ esac -+ done -+ for deplib in $compile_deplibs; do -+ case $deplib in -+ -L*) -+ case " $new_libs " in -+ *" $deplib "*) ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac -+ ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac -+ done -+ compile_deplibs="$new_libs" -+ -+ - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" - -@@ -3126,10 +4481,15 @@ - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - *) dllsearchpath="$dllsearchpath:$libdir";; - esac -+ case :$dllsearchpath: in -+ *":$testbindir:"*) ;; -+ *) dllsearchpath="$dllsearchpath:$testbindir";; -+ esac - ;; - esac - done -@@ -3232,31 +4592,43 @@ - done - - if test -n "$exclude_expsyms"; then -- $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' -+ $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - if test -n "$export_symbols_regex"; then -- $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T' -+ $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then -- export_symbols="$output_objdir/$output.exp" -+ export_symbols="$output_objdir/$outputname.exp" - $run $rm $export_symbols -- $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' -+ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' -+ case $host in -+ *cygwin* | *mingw* ) -+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' -+ ;; -+ esac - else -- $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' -- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' -+ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' -+ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - $run eval 'mv "$nlist"T "$nlist"' -+ case $host in -+ *cygwin* | *mingw* ) -+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' -+ ;; -+ esac - fi - fi - - for arg in $dlprefiles; do - $show "extracting global C symbols from \`$arg'" -- name=`echo "$arg" | sed -e 's%^.*/%%'` -- $run eval 'echo ": $name " >> "$nlist"' -+ name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` -+ $run eval '$echo ": $name " >> "$nlist"' - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - -@@ -3265,12 +4637,18 @@ - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then -- egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T -+ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $mv "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. -- if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then -+ if grep -v "^: " < "$nlist" | -+ if sort -k 3 /dev/null 2>&1; then -+ sort -k 3 -+ else -+ sort +2 -+ fi | -+ uniq > "$nlist"S; then - : - else - grep -v "^: " < "$nlist" > "$nlist"S -@@ -3279,7 +4657,7 @@ - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' - else -- echo '/* NONE */' >> "$output_objdir/$dlsyms" -+ $echo '/* NONE */' >> "$output_objdir/$dlsyms" - fi - - $echo >> "$output_objdir/$dlsyms" "\ -@@ -3287,27 +4665,44 @@ - #undef lt_preloaded_symbols - - #if defined (__STDC__) && __STDC__ --# define lt_ptr_t void * -+# define lt_ptr void * - #else --# define lt_ptr_t char * -+# define lt_ptr char * - # define const - #endif - - /* The mapping between symbol names and symbols. */ -+" -+ -+ case $host in -+ *cygwin* | *mingw* ) -+ $echo >> "$output_objdir/$dlsyms" "\ -+/* DATA imports from DLLs on WIN32 can't be const, because -+ runtime relocations are performed -- see ld's documentation -+ on pseudo-relocs */ -+struct { -+" -+ ;; -+ * ) -+ $echo >> "$output_objdir/$dlsyms" "\ - const struct { -+" -+ ;; -+ esac -+ -+ -+ $echo >> "$output_objdir/$dlsyms" "\ - const char *name; -- lt_ptr_t address; -+ lt_ptr address; - } - lt_preloaded_symbols[] = - {\ - " - -- sed -n -e 's/^: \([^ ]*\) $/ {\"\1\", (lt_ptr_t) 0},/p' \ -- -e 's/^. \([^ ]*\) \([^ ]*\)$/ {"\2", (lt_ptr_t) \&\2},/p' \ -- < "$nlist" >> "$output_objdir/$dlsyms" -+ eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" - - $echo >> "$output_objdir/$dlsyms" "\ -- {0, (lt_ptr_t) 0} -+ {0, (lt_ptr) 0} - }; - - /* This works around a problem in FreeBSD linker */ -@@ -3333,30 +4728,43 @@ - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - case "$compile_command " in - *" -static "*) ;; -- *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; -+ *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; - esac;; - *-*-hpux*) - case "$compile_command " in - *" -static "*) ;; -- *) pic_flag_for_symtable=" $pic_flag -DPIC";; -+ *) pic_flag_for_symtable=" $pic_flag";; - esac - esac - - # Now compile the dynamic symbol file. -- $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" -- $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? -+ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" -+ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? - - # Clean up the generated files. - $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" - $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" - - # Transform the symbol file into the correct name. -- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` -- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` -+ case $host in -+ *cygwin* | *mingw* ) -+ if test -f "$output_objdir/${outputname}.def" ; then -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ else -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ fi -+ ;; -+ * ) -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ ;; -+ esac - ;; - *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - else -@@ -3365,19 +4773,19 @@ - # really was required. - - # Nullify the symbol file. -- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` -- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - fi - -- if test $need_relink = no || test "$build_libtool_libs" != yes; then -+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - # Replace the output file specification. -- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - $show "$link_command" - $run eval "$link_command" -- status=$? -+ exit_status=$? - - # Delete the generated files. - if test -n "$dlsyms"; then -@@ -3385,7 +4793,7 @@ - $run $rm "$output_objdir/${outputname}S.${objext}" - fi - -- exit $status -+ exit $exit_status - fi - - if test -n "$shlibpath_var"; then -@@ -3444,7 +4852,7 @@ - # Link the executable and exit - $show "$link_command" - $run eval "$link_command" || exit $? -- exit 0 -+ exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then -@@ -3458,7 +4866,7 @@ - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then -- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` -+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` - else - # fast_install is set to needless - relink_command= -@@ -3494,15 +4902,15 @@ - relink_command="$var=\"$var_value\"; export $var; $relink_command" - fi - done -- relink_command="cd `pwd`; $relink_command" -- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` -+ relink_command="(cd `pwd`; $relink_command)" -+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - fi - - # Quote $echo for shipping. -- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then -- case $0 in -- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; -- *) qecho="$SHELL `pwd`/$0 --fallback-echo";; -+ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then -+ case $progpath in -+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; -+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; - esac - qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` - else -@@ -3514,15 +4922,376 @@ - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in -- *.exe) output=`echo $output|sed 's,.exe$,,'` ;; -+ *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in -- *cygwin*) exeext=.exe ;; -+ *cygwin*) -+ exeext=.exe -+ outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; - *) exeext= ;; - esac -- $rm $output -- trap "$rm $output; exit 1" 1 2 15 -+ case $host in -+ *cygwin* | *mingw* ) -+ output_name=`basename $output` -+ output_path=`dirname $output` -+ cwrappersource="$output_path/$objdir/lt-$output_name.c" -+ cwrapper="$output_path/$output_name.exe" -+ $rm $cwrappersource $cwrapper -+ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 -+ -+ cat > $cwrappersource <> $cwrappersource<<"EOF" -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#if defined(PATH_MAX) -+# define LT_PATHMAX PATH_MAX -+#elif defined(MAXPATHLEN) -+# define LT_PATHMAX MAXPATHLEN -+#else -+# define LT_PATHMAX 1024 -+#endif -+ -+#ifndef DIR_SEPARATOR -+# define DIR_SEPARATOR '/' -+# define PATH_SEPARATOR ':' -+#endif -+ -+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ -+ defined (__OS2__) -+# define HAVE_DOS_BASED_FILE_SYSTEM -+# ifndef DIR_SEPARATOR_2 -+# define DIR_SEPARATOR_2 '\\' -+# endif -+# ifndef PATH_SEPARATOR_2 -+# define PATH_SEPARATOR_2 ';' -+# endif -+#endif -+ -+#ifndef DIR_SEPARATOR_2 -+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -+#else /* DIR_SEPARATOR_2 */ -+# define IS_DIR_SEPARATOR(ch) \ -+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -+#endif /* DIR_SEPARATOR_2 */ -+ -+#ifndef PATH_SEPARATOR_2 -+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -+#else /* PATH_SEPARATOR_2 */ -+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -+#endif /* PATH_SEPARATOR_2 */ -+ -+#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -+#define XFREE(stale) do { \ -+ if (stale) { free ((void *) stale); stale = 0; } \ -+} while (0) -+ -+/* -DDEBUG is fairly common in CFLAGS. */ -+#undef DEBUG -+#if defined DEBUGWRAPPER -+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -+#else -+# define DEBUG(format, ...) -+#endif -+ -+const char *program_name = NULL; -+ -+void * xmalloc (size_t num); -+char * xstrdup (const char *string); -+const char * base_name (const char *name); -+char * find_executable(const char *wrapper); -+int check_executable(const char *path); -+char * strendzap(char *str, const char *pat); -+void lt_fatal (const char *message, ...); -+ -+int -+main (int argc, char *argv[]) -+{ -+ char **newargz; -+ int i; -+ -+ program_name = (char *) xstrdup (base_name (argv[0])); -+ DEBUG("(main) argv[0] : %s\n",argv[0]); -+ DEBUG("(main) program_name : %s\n",program_name); -+ newargz = XMALLOC(char *, argc+2); -+EOF -+ -+ cat >> $cwrappersource <> $cwrappersource <<"EOF" -+ newargz[1] = find_executable(argv[0]); -+ if (newargz[1] == NULL) -+ lt_fatal("Couldn't find %s", argv[0]); -+ DEBUG("(main) found exe at : %s\n",newargz[1]); -+ /* we know the script has the same name, without the .exe */ -+ /* so make sure newargz[1] doesn't end in .exe */ -+ strendzap(newargz[1],".exe"); -+ for (i = 1; i < argc; i++) -+ newargz[i+1] = xstrdup(argv[i]); -+ newargz[argc+1] = NULL; -+ -+ for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" -+ return 127; -+} -+ -+void * -+xmalloc (size_t num) -+{ -+ void * p = (void *) malloc (num); -+ if (!p) -+ lt_fatal ("Memory exhausted"); -+ -+ return p; -+} -+ -+char * -+xstrdup (const char *string) -+{ -+ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL -+; -+} -+ -+const char * -+base_name (const char *name) -+{ -+ const char *base; -+ -+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -+ /* Skip over the disk name in MSDOS pathnames. */ -+ if (isalpha ((unsigned char)name[0]) && name[1] == ':') -+ name += 2; -+#endif -+ -+ for (base = name; *name; name++) -+ if (IS_DIR_SEPARATOR (*name)) -+ base = name + 1; -+ return base; -+} -+ -+int -+check_executable(const char * path) -+{ -+ struct stat st; -+ -+ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); -+ if ((!path) || (!*path)) -+ return 0; -+ -+ if ((stat (path, &st) >= 0) && -+ ( -+ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ -+#if defined (S_IXOTH) -+ ((st.st_mode & S_IXOTH) == S_IXOTH) || -+#endif -+#if defined (S_IXGRP) -+ ((st.st_mode & S_IXGRP) == S_IXGRP) || -+#endif -+ ((st.st_mode & S_IXUSR) == S_IXUSR)) -+ ) -+ return 1; -+ else -+ return 0; -+} -+ -+/* Searches for the full path of the wrapper. Returns -+ newly allocated full path name if found, NULL otherwise */ -+char * -+find_executable (const char* wrapper) -+{ -+ int has_slash = 0; -+ const char* p; -+ const char* p_next; -+ /* static buffer for getcwd */ -+ char tmp[LT_PATHMAX + 1]; -+ int tmp_len; -+ char* concat_name; -+ -+ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); -+ -+ if ((wrapper == NULL) || (*wrapper == '\0')) -+ return NULL; -+ -+ /* Absolute path? */ -+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -+ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') -+ { -+ concat_name = xstrdup (wrapper); -+ if (check_executable(concat_name)) -+ return concat_name; -+ XFREE(concat_name); -+ } -+ else -+ { -+#endif -+ if (IS_DIR_SEPARATOR (wrapper[0])) -+ { -+ concat_name = xstrdup (wrapper); -+ if (check_executable(concat_name)) -+ return concat_name; -+ XFREE(concat_name); -+ } -+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -+ } -+#endif -+ -+ for (p = wrapper; *p; p++) -+ if (*p == '/') -+ { -+ has_slash = 1; -+ break; -+ } -+ if (!has_slash) -+ { -+ /* no slashes; search PATH */ -+ const char* path = getenv ("PATH"); -+ if (path != NULL) -+ { -+ for (p = path; *p; p = p_next) -+ { -+ const char* q; -+ size_t p_len; -+ for (q = p; *q; q++) -+ if (IS_PATH_SEPARATOR(*q)) -+ break; -+ p_len = q - p; -+ p_next = (*q == '\0' ? q : q + 1); -+ if (p_len == 0) -+ { -+ /* empty path: current directory */ -+ if (getcwd (tmp, LT_PATHMAX) == NULL) -+ lt_fatal ("getcwd failed"); -+ tmp_len = strlen(tmp); -+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); -+ memcpy (concat_name, tmp, tmp_len); -+ concat_name[tmp_len] = '/'; -+ strcpy (concat_name + tmp_len + 1, wrapper); -+ } -+ else -+ { -+ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); -+ memcpy (concat_name, p, p_len); -+ concat_name[p_len] = '/'; -+ strcpy (concat_name + p_len + 1, wrapper); -+ } -+ if (check_executable(concat_name)) -+ return concat_name; -+ XFREE(concat_name); -+ } -+ } -+ /* not found in PATH; assume curdir */ -+ } -+ /* Relative path | not found in path: prepend cwd */ -+ if (getcwd (tmp, LT_PATHMAX) == NULL) -+ lt_fatal ("getcwd failed"); -+ tmp_len = strlen(tmp); -+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); -+ memcpy (concat_name, tmp, tmp_len); -+ concat_name[tmp_len] = '/'; -+ strcpy (concat_name + tmp_len + 1, wrapper); -+ -+ if (check_executable(concat_name)) -+ return concat_name; -+ XFREE(concat_name); -+ return NULL; -+} -+ -+char * -+strendzap(char *str, const char *pat) -+{ -+ size_t len, patlen; -+ -+ assert(str != NULL); -+ assert(pat != NULL); -+ -+ len = strlen(str); -+ patlen = strlen(pat); -+ -+ if (patlen <= len) -+ { -+ str += len - patlen; -+ if (strcmp(str, pat) == 0) -+ *str = '\0'; -+ } -+ return str; -+} -+ -+static void -+lt_error_core (int exit_status, const char * mode, -+ const char * message, va_list ap) -+{ -+ fprintf (stderr, "%s: %s: ", program_name, mode); -+ vfprintf (stderr, message, ap); -+ fprintf (stderr, ".\n"); -+ -+ if (exit_status >= 0) -+ exit (exit_status); -+} -+ -+void -+lt_fatal (const char *message, ...) -+{ -+ va_list ap; -+ va_start (ap, message); -+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap); -+ va_end (ap); -+} -+EOF -+ # we should really use a build-platform specific compiler -+ # here, but OTOH, the wrappers (shell script and this C one) -+ # are only useful if you want to execute the "real" binary. -+ # Since the "real" binary is built for $host, then this -+ # wrapper might as well be built for $host, too. -+ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource -+ ;; -+ esac -+ $rm $output -+ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 - - $echo > $output "\ - #! $SHELL -@@ -3538,12 +5307,26 @@ - - # Sed substitution that helps us do robust quoting. It backslashifies - # metacharacters that are still active within double-quoted strings. --Xsed='sed -e 1s/^X//' -+Xsed='${SED} -e 1s/^X//' - sed_quote_subst='$sed_quote_subst' - -+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -+fi -+BIN_SH=xpg4; export BIN_SH # for Tru64 -+DUALCASE=1; export DUALCASE # for MKS sh -+ - # The HP-UX ksh and POSIX shell print the target directory to stdout - # if CDPATH is set. --if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - relink_command=\"$relink_command\" - -@@ -3576,7 +5359,7 @@ - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. -- file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\` -+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` - -@@ -3589,7 +5372,7 @@ - fi - - file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` -- file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\` -+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` - done - - # Try to get the absolute directory name. -@@ -3598,12 +5381,12 @@ - " - - if test "$fast_install" = yes; then -- echo >> $output "\ -+ $echo >> $output "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || \\ -- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\ -+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" -@@ -3614,14 +5397,15 @@ - $rm \"\$progdir/\$file\" - fi" - -- echo >> $output "\ -+ $echo >> $output "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then -- if (eval \$relink_command); then : -+ if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else -+ $echo \"\$relink_command_output\" >&2 - $rm \"\$progdir/\$file\" -- exit 1 -+ exit $EXIT_FAILURE - fi - fi - -@@ -3631,13 +5415,13 @@ - $rm \"\$progdir/\$file\" - fi" - else -- echo >> $output "\ -+ $echo >> $output "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" - " - fi - -- echo >> $output "\ -+ $echo >> $output "\ - - if test -f \"\$progdir/\$program\"; then" - -@@ -3668,47 +5452,35 @@ - # Run the actual program with our arguments. - " - case $host in -- # win32 systems need to use the prog path for dll -- # lookup to work -- *-*-cygwin* | *-*-pw32*) -- $echo >> $output "\ -- exec \$progdir/\$program \${1+\"\$@\"} --" -- ;; -- - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) - $echo >> $output "\ -- exec \$progdir\\\\\$program \${1+\"\$@\"} -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} - " - ;; - - *) - $echo >> $output "\ -- # Export the path to the program. -- PATH=\"\$progdir:\$PATH\" -- export PATH -- -- exec \$program \${1+\"\$@\"} -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} - " - ;; - esac - $echo >> $output "\ -- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" -- exit 1 -+ \$echo \"\$0: cannot exec \$program \$*\" -+ exit $EXIT_FAILURE - fi - else - # The program doesn't exist. -- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 -+ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$echo \"This script is just a wrapper for \$program.\" 1>&2 -- echo \"See the $PACKAGE documentation for more information.\" 1>&2 -- exit 1 -+ $echo \"See the $PACKAGE documentation for more information.\" 1>&2 -+ exit $EXIT_FAILURE - fi - fi\ - " - chmod +x $output - fi -- exit 0 -+ exit $EXIT_SUCCESS - ;; - esac - -@@ -3724,74 +5496,130 @@ - oldobjs="$libobjs_save" - build_libtool_libs=no - else -- oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP` -+ oldobjs="$old_deplibs $non_pic_objects" - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" -- $show "${rm}r $gentop" -- $run ${rm}r "$gentop" -- $show "mkdir $gentop" -- $run mkdir "$gentop" -- status=$? -- if test $status -ne 0 && test ! -d "$gentop"; then -- exit $status -- fi - generated="$generated $gentop" - -- # Add in members from convenience archives. -- for xlib in $addlibs; do -- # Extract the objects. -- case $xlib in -- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; -- *) xabs=`pwd`"/$xlib" ;; -- esac -- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` -- xdir="$gentop/$xlib" -- -- $show "${rm}r $xdir" -- $run ${rm}r "$xdir" -- $show "mkdir $xdir" -- $run mkdir "$xdir" -- status=$? -- if test $status -ne 0 && test ! -d "$xdir"; then -- exit $status -- fi -- $show "(cd $xdir && $AR x $xabs)" -- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? -- -- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` -- done -+ func_extract_archives $gentop $addlibs -+ oldobjs="$oldobjs $func_extract_archives_result" - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then -- eval cmds=\"$old_archive_from_new_cmds\" -+ cmds=$old_archive_from_new_cmds - else -- # Ensure that we have .o objects in place in case we decided -- # not to build a shared library, and have fallen back to building -- # static libs even though --disable-static was passed! -- for oldobj in $oldobjs; do -- if test ! -f $oldobj; then -- xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$xdir" = "X$oldobj"; then -- xdir="." -- else -- xdir="$xdir" -+ # POSIX demands no paths to be encoded in archives. We have -+ # to avoid creating archives with duplicate basenames if we -+ # might have to extract them afterwards, e.g., when creating a -+ # static archive out of a convenience library, or when linking -+ # the entirety of a libtool archive into another (currently -+ # not supported by libtool). -+ if (for obj in $oldobjs -+ do -+ $echo "X$obj" | $Xsed -e 's%^.*/%%' -+ done | sort | sort -uc >/dev/null 2>&1); then -+ : -+ else -+ $echo "copying selected object files to avoid basename conflicts..." -+ -+ if test -z "$gentop"; then -+ gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" -+ -+ $show "${rm}r $gentop" -+ $run ${rm}r "$gentop" -+ $show "$mkdir $gentop" -+ $run $mkdir "$gentop" -+ exit_status=$? -+ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then -+ exit $exit_status - fi -- baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'` -- obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` -- $show "(cd $xdir && ${LN_S} $obj $baseobj)" -- $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $? - fi -- done -+ -+ save_oldobjs=$oldobjs -+ oldobjs= -+ counter=1 -+ for obj in $save_oldobjs -+ do -+ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` -+ case " $oldobjs " in -+ " ") oldobjs=$obj ;; -+ *[\ /]"$objbase "*) -+ while :; do -+ # Make sure we don't pick an alternate name that also -+ # overlaps. -+ newobj=lt$counter-$objbase -+ counter=`expr $counter + 1` -+ case " $oldobjs " in -+ *[\ /]"$newobj "*) ;; -+ *) if test ! -f "$gentop/$newobj"; then break; fi ;; -+ esac -+ done -+ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -+ $run ln "$obj" "$gentop/$newobj" || -+ $run cp "$obj" "$gentop/$newobj" -+ oldobjs="$oldobjs $gentop/$newobj" -+ ;; -+ *) oldobjs="$oldobjs $obj" ;; -+ esac -+ done -+ fi - - eval cmds=\"$old_archive_cmds\" -+ -+ if len=`expr "X$cmds" : ".*"` && -+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ cmds=$old_archive_cmds -+ else -+ # the command line is too long to link in one step, link in parts -+ $echo "using piecewise archive linking..." -+ save_RANLIB=$RANLIB -+ RANLIB=: -+ objlist= -+ concat_cmds= -+ save_oldobjs=$oldobjs -+ -+ # Is there a better way of finding the last object in the list? -+ for obj in $save_oldobjs -+ do -+ last_oldobj=$obj -+ done -+ for obj in $save_oldobjs -+ do -+ oldobjs="$objlist $obj" -+ objlist="$objlist $obj" -+ eval test_cmds=\"$old_archive_cmds\" -+ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && -+ test "$len" -le "$max_cmd_len"; then -+ : -+ else -+ # the above command should be used before it gets too long -+ oldobjs=$objlist -+ if test "$obj" = "$last_oldobj" ; then -+ RANLIB=$save_RANLIB -+ fi -+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" -+ objlist= -+ fi -+ done -+ RANLIB=$save_RANLIB -+ oldobjs=$objlist -+ if test "X$oldobjs" = "X" ; then -+ eval cmds=\"\$concat_cmds\" -+ else -+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" -+ fi -+ fi - fi -- IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' -+ save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do -+ eval cmd=\"$cmd\" - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? -@@ -3823,8 +5651,12 @@ - fi - done - # Quote the link command for shipping. -- relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" -- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` -+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" -+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` -+ if test "$hardcode_automatic" = yes ; then -+ relink_command= -+ fi -+ - - # Only create the output if not a dry run. - if test -z "$run"; then -@@ -3840,10 +5672,10 @@ - case $deplib in - *.la) - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` -- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - newdependency_libs="$newdependency_libs $libdir/$name" - ;; -@@ -3854,10 +5686,10 @@ - newdlfiles= - for lib in $dlfiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` -- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - newdlfiles="$newdlfiles $libdir/$name" - done -@@ -3865,20 +5697,39 @@ - newdlprefiles= - for lib in $dlprefiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` -- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - newdlprefiles="$newdlprefiles $libdir/$name" - done - dlprefiles="$newdlprefiles" -+ else -+ newdlfiles= -+ for lib in $dlfiles; do -+ case $lib in -+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; -+ *) abs=`pwd`"/$lib" ;; -+ esac -+ newdlfiles="$newdlfiles $abs" -+ done -+ dlfiles="$newdlfiles" -+ newdlprefiles= -+ for lib in $dlprefiles; do -+ case $lib in -+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; -+ *) abs=`pwd`"/$lib" ;; -+ esac -+ newdlprefiles="$newdlprefiles $abs" -+ done -+ dlprefiles="$newdlprefiles" - fi - $rm $output - # place dlname in correct position for cygwin - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in -- *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; -+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac - $echo > $output "\ - # $outputname - a libtool library file -@@ -3907,13 +5758,16 @@ - # Is this an already installed library? - installed=$installed - -+# Should we warn about portability when linking against -modules? -+shouldnotlink=$module -+ - # Files to dlopen/dlpreopen - dlopen='$dlfiles' - dlpreopen='$dlprefiles' - - # Directory that this library needs to be installed in: - libdir='$install_libdir'" -- if test "$installed" = no && test $need_relink = yes; then -+ if test "$installed" = no && test "$need_relink" = yes; then - $echo >> $output "\ - relink_command=\"$relink_command\"" - fi -@@ -3926,7 +5780,7 @@ - $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? - ;; - esac -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - # libtool install mode -@@ -3937,11 +5791,11 @@ - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. -- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then -+ $echo "X$nonopt" | grep shtool > /dev/null; then - # Aesthetically quote it. - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac -@@ -3950,14 +5804,14 @@ - shift - else - install_prog= -- arg="$nonopt" -+ arg=$nonopt - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac -@@ -3975,28 +5829,31 @@ - do - if test -n "$dest"; then - files="$files $dest" -- dest="$arg" -+ dest=$arg - continue - fi - - case $arg in - -d) isdir=yes ;; -- -f) prev="-f" ;; -- -g) prev="-g" ;; -- -m) prev="-m" ;; -- -o) prev="-o" ;; -+ -f) -+ case " $install_prog " in -+ *[\\\ /]cp\ *) ;; -+ *) prev=$arg ;; -+ esac -+ ;; -+ -g | -m | -o) prev=$arg ;; - -s) - stripme=" -s" - continue - ;; -- -*) ;; -- -+ -*) -+ ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= - else -- dest="$arg" -+ dest=$arg - continue - fi - ;; -@@ -4005,7 +5862,7 @@ - # Aesthetically quote the argument. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac -@@ -4015,13 +5872,13 @@ - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - if test -z "$files"; then -@@ -4031,7 +5888,7 @@ - $echo "$modename: you must specify a destination" 1>&2 - fi - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Strip any trailing slash from the destination. -@@ -4049,10 +5906,10 @@ - - # Not a directory, so check to see that there is only one file specified. - set dummy $files -- if test $# -gt 2; then -+ if test "$#" -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - fi - case $destdir in -@@ -4064,7 +5921,7 @@ - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - done -@@ -4089,11 +5946,11 @@ - - *.la) - # Check to see that this really is a libtool archive. -- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - library_names= -@@ -4124,12 +5981,33 @@ - dir="$dir$objdir" - - if test -n "$relink_command"; then -+ # Determine the prefix the user has applied to our future dir. -+ inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` -+ -+ # Don't allow the user to place us outside of our expected -+ # location b/c this prevents finding dependent libraries that -+ # are installed to the same prefix. -+ # At present, this check doesn't affect windows .dll's that -+ # are installed into $libdir/../bin (currently, that works fine) -+ # but it's something to keep an eye on. -+ if test "$inst_prefix_dir" = "$destdir"; then -+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ -+ if test -n "$inst_prefix_dir"; then -+ # Stick the inst_prefix_dir data into the link command. -+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` -+ else -+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` -+ fi -+ - $echo "$modename: warning: relinking \`$file'" 1>&2 - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 -- continue -+ exit $EXIT_FAILURE - fi - fi - -@@ -4151,25 +6029,38 @@ - $run eval "$striplib $destdir/$realname" || exit $? - fi - -- if test $# -gt 0; then -+ if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. -+ # Try `ln -sf' first, because the `ln' binary might depend on -+ # the symlink we replace! Solaris /bin/ln does not understand -f, -+ # so we also need to try rm && ln -s. - for linkname - do - if test "$linkname" != "$realname"; then -- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" -- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" -+ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" -+ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - fi - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" -- eval cmds=\"$postinstall_cmds\" -- IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' -+ cmds=$postinstall_cmds -+ save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" -- $run eval "$cmd" || exit $? -+ $run eval "$cmd" || { -+ lt_exit=$? -+ -+ # Restore the uninstalled library and exit -+ if test "$mode" = relink; then -+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' -+ fi -+ -+ exit $lt_exit -+ } - done - IFS="$save_ifs" - fi -@@ -4207,7 +6098,7 @@ - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - -@@ -4225,7 +6116,7 @@ - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? - fi -- exit 0 -+ exit $EXIT_SUCCESS - ;; - - *) -@@ -4237,21 +6128,47 @@ - destfile="$destdir/$destfile" - fi - -+ # If the file is missing, and there is a .exe on the end, strip it -+ # because it is most likely a libtool script we actually want to -+ # install -+ stripped_ext="" -+ case $file in -+ *.exe) -+ if test ! -f "$file"; then -+ file=`$echo $file|${SED} 's,.exe$,,'` -+ stripped_ext=".exe" -+ fi -+ ;; -+ esac -+ - # Do a test to see if this is really a libtool program. -- if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ case $host in -+ *cygwin*|*mingw*) -+ wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` -+ ;; -+ *) -+ wrapper=$file -+ ;; -+ esac -+ if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then - notinst_deplibs= - relink_command= - -+ # Note that it is not necessary on cygwin/mingw to append a dot to -+ # foo even if both foo and FILE.exe exist: automatic-append-.exe -+ # behavior happens only for exec(3), not for open(2)! Also, sourcing -+ # `FILE.' does not work on cygwin managed mounts. -+ # - # If there is no directory component, then add one. -- case $file in -- */* | *\\*) . $file ;; -- *) . ./$file ;; -+ case $wrapper in -+ */* | *\\*) . ${wrapper} ;; -+ *) . ./${wrapper} ;; - esac - - # Check the variables that should have been set. - if test -z "$notinst_deplibs"; then -- $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 -- exit 1 -+ $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 -+ exit $EXIT_FAILURE - fi - - finalize=yes -@@ -4273,27 +6190,25 @@ - done - - relink_command= -+ # Note that it is not necessary on cygwin/mingw to append a dot to -+ # foo even if both foo and FILE.exe exist: automatic-append-.exe -+ # behavior happens only for exec(3), not for open(2)! Also, sourcing -+ # `FILE.' does not work on cygwin managed mounts. -+ # - # If there is no directory component, then add one. -- case $file in -- */* | *\\*) . $file ;; -- *) . ./$file ;; -+ case $wrapper in -+ */* | *\\*) . ${wrapper} ;; -+ *) . ./${wrapper} ;; - esac - - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - if test "$finalize" = yes && test -z "$run"; then -- tmpdir="/tmp" -- test -n "$TMPDIR" && tmpdir="$TMPDIR" -- tmpdir="$tmpdir/libtool-$$" -- if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : -- else -- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 -- continue -- fi -- file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -+ tmpdir=`func_mktempdir` -+ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` - outputname="$tmpdir/$file" - # Replace the output file specification. -- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` -+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` - - $show "$relink_command" - if $run eval "$relink_command"; then : -@@ -4308,14 +6223,14 @@ - fi - else - # Install the binary that we compiled earlier. -- file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` -+ file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another -- # one anyways -+ # one anyway - case $install_prog,$host in -- /usr/bin/install*,*cygwin*) -+ */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok -@@ -4324,7 +6239,7 @@ - destfile=$destfile.exe - ;; - *:*.exe) -- destfile=`echo $destfile | sed -e 's,.exe$,,'` -+ destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` - ;; - esac - ;; -@@ -4345,16 +6260,17 @@ - $show "$install_prog $file $oldlib" - $run eval "$install_prog \$file \$oldlib" || exit $? - -- if test -n "$stripme" && test -n "$striplib"; then -+ if test -n "$stripme" && test -n "$old_striplib"; then - $show "$old_striplib $oldlib" - $run eval "$old_striplib $oldlib" || exit $? - fi - - # Do each command in the postinstall commands. -- eval cmds=\"$old_postinstall_cmds\" -- IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' -+ cmds=$old_postinstall_cmds -+ save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done -@@ -4368,11 +6284,10 @@ - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - test -n "$run" && current_libdirs=" -n$current_libdirs" -- exec $SHELL $0 --finish$current_libdirs -- exit 1 -+ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' -+ else -+ exit $EXIT_SUCCESS - fi -- -- exit 0 - ;; - - # libtool finish mode -@@ -4390,10 +6305,11 @@ - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. -- eval cmds=\"$finish_cmds\" -- IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' -+ cmds=$finish_cmds -+ save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || admincmds="$admincmds - $cmd" -@@ -4410,43 +6326,43 @@ - fi - - # Exit here if they wanted silent mode. -- test "$show" = ":" && exit 0 -+ test "$show" = : && exit $EXIT_SUCCESS - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -+ $echo "X----------------------------------------------------------------------" | $Xsed -+ $echo "Libraries have been installed in:" - for libdir in $libdirs; do -- echo " $libdir" -+ $echo " $libdir" - done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -+ $echo -+ $echo "If you ever happen to want to link against installed libraries" -+ $echo "in a given directory, LIBDIR, you must either use libtool, and" -+ $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ $echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -+ $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ $echo " during execution" - fi - if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -+ $echo " - add LIBDIR to the \`$runpath_var' environment variable" -+ $echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - -- echo " - use the \`$flag' linker flag" -+ $echo " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then -- echo " - have your system administrator run these commands:$admincmds" -+ $echo " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi -- echo -- echo "See any operating system documentation about shared libraries for" -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "----------------------------------------------------------------------" -- exit 0 -+ $echo -+ $echo "See any operating system documentation about shared libraries for" -+ $echo "more information, such as the ld(1) and ld.so(8) manual pages." -+ $echo "X----------------------------------------------------------------------" | $Xsed -+ exit $EXIT_SUCCESS - ;; - - # libtool execute mode -@@ -4458,7 +6374,7 @@ - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Handle -dlopen flags immediately. -@@ -4466,18 +6382,18 @@ - if test ! -f "$file"; then - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - dir= - case $file in - *.la) - # Check to see that this really is a libtool archive. -- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - # Read the libtool library. -@@ -4503,8 +6419,10 @@ - if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" - else -- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 -- exit 1 -+ if test ! -f "$dir/$dlname"; then -+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 -+ exit $EXIT_FAILURE -+ fi - fi - ;; - -@@ -4544,7 +6462,7 @@ - -*) ;; - *) - # Do a test to see if this is really a libtool program. -- if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; -@@ -4567,19 +6485,16 @@ - eval "export $shlibpath_var" - fi - -- # Restore saved enviroment variables -- if test "${save_LC_ALL+set}" = set; then -- LC_ALL="$save_LC_ALL"; export LC_ALL -- fi -- if test "${save_LANG+set}" = set; then -- LANG="$save_LANG"; export LANG -- fi -- -- # Now actually exec the command. -- eval "exec \$cmd$args" -+ # Restore saved environment variables -+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -+ do -+ eval "if test \"\${save_$lt_var+set}\" = set; then -+ $lt_var=\$save_$lt_var; export $lt_var -+ fi" -+ done - -- $echo "$modename: cannot exec \$cmd$args" -- exit 1 -+ # Now prepare to actually exec the command. -+ exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then -@@ -4587,7 +6502,7 @@ - $echo "export $shlibpath_var" - fi - $echo "$cmd$args" -- exit 0 -+ exit $EXIT_SUCCESS - fi - ;; - -@@ -4615,24 +6530,25 @@ - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - fi - - rmdirs= - -+ origobjdir="$objdir" - for file in $files; do - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$file"; then - dir=. -- objdir="$objdir" -+ objdir="$origobjdir" - else -- objdir="$dir/$objdir" -+ objdir="$dir/$origobjdir" - fi - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -- test $mode = uninstall && objdir="$dir" -+ test "$mode" = uninstall && objdir="$dir" - - # Remember objdir for removal later, being careful to avoid duplicates -- if test $mode = clean; then -+ if test "$mode" = clean; then - case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; -@@ -4641,14 +6557,14 @@ - - # Don't error if the file doesn't exist and rm -f was used. - if (test -L "$file") >/dev/null 2>&1 \ -- || (test -h "$file") >/dev/null 2>&1 \ -+ || (test -h "$file") >/dev/null 2>&1 \ - || test -f "$file"; then -- : -+ : - elif test -d "$file"; then -- exit_status=1 -+ exit_status=1 - continue - elif test "$rmforce" = yes; then -- continue -+ continue - fi - - rmfiles="$file" -@@ -4656,7 +6572,7 @@ - case $name in - *.la) - # Possibly a libtool archive, so verify it. -- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - . $dir/$name - - # Delete the libtool libraries and symlinks. -@@ -4664,18 +6580,27 @@ - rmfiles="$rmfiles $objdir/$n" - done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" -- test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - -- if test $mode = uninstall; then -+ case "$mode" in -+ clean) -+ case " $library_names " in -+ # " " in the beginning catches empty $dlname -+ *" $dlname "*) ;; -+ *) rmfiles="$rmfiles $objdir/$dlname" ;; -+ esac -+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" -+ ;; -+ uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. -- eval cmds=\"$postuninstall_cmds\" -- IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' -+ cmds=$postuninstall_cmds -+ save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" -- if test $? != 0 && test "$rmforce" != yes; then -+ if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done -@@ -4684,40 +6609,72 @@ - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. -- eval cmds=\"$old_postuninstall_cmds\" -- IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' -+ cmds=$old_postuninstall_cmds -+ save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -+ eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" -- if test $? != 0 && test "$rmforce" != yes; then -+ if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" - fi - # FIXME: should reinstall the best remaining shared library. -- fi -+ ;; -+ esac - fi - ;; - - *.lo) -- if test "$build_old_libs" = yes; then -- oldobj=`$echo "X$name" | $Xsed -e "$lo2o"` -- rmfiles="$rmfiles $dir/$oldobj" -+ # Possibly a libtool object, so verify it. -+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ -+ # Read the .lo file -+ . $dir/$name -+ -+ # Add PIC object to the list of files to remove. -+ if test -n "$pic_object" \ -+ && test "$pic_object" != none; then -+ rmfiles="$rmfiles $dir/$pic_object" -+ fi -+ -+ # Add non-PIC object to the list of files to remove. -+ if test -n "$non_pic_object" \ -+ && test "$non_pic_object" != none; then -+ rmfiles="$rmfiles $dir/$non_pic_object" -+ fi - fi - ;; - - *) -- # Do a test to see if this is a libtool program. -- if test $mode = clean && -- (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -- relink_command= -- . $dir/$file -+ if test "$mode" = clean ; then -+ noexename=$name -+ case $file in -+ *.exe) -+ file=`$echo $file|${SED} 's,.exe$,,'` -+ noexename=`$echo $name|${SED} 's,.exe$,,'` -+ # $file with .exe has already been added to rmfiles, -+ # add $file without .exe -+ rmfiles="$rmfiles $file" -+ ;; -+ esac -+ # Do a test to see if this is a libtool program. -+ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ relink_command= -+ . $dir/$noexename - -- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" -- if test "$fast_install" = yes && test -n "$relink_command"; then -- rmfiles="$rmfiles $objdir/lt-$name" -+ # note $name still contains .exe if it was in $file originally -+ # as does the version of $file that was added into $rmfiles -+ rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" -+ if test "$fast_install" = yes && test -n "$relink_command"; then -+ rmfiles="$rmfiles $objdir/lt-$name" -+ fi -+ if test "X$noexename" != "X$name" ; then -+ rmfiles="$rmfiles $objdir/lt-${noexename}.c" -+ fi - fi - fi - ;; -@@ -4725,6 +6682,7 @@ - $show "$rm $rmfiles" - $run $rm $rmfiles || exit_status=1 - done -+ objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do -@@ -4740,15 +6698,22 @@ - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - -- $echo "$modename: invalid operation mode \`$mode'" 1>&2 -- $echo "$generic_help" 1>&2 -- exit 1 -+ if test -z "$exec_cmd"; then -+ $echo "$modename: invalid operation mode \`$mode'" 1>&2 -+ $echo "$generic_help" 1>&2 -+ exit $EXIT_FAILURE -+ fi - fi # test -z "$show_help" - -+if test -n "$exec_cmd"; then -+ eval exec $exec_cmd -+ exit $EXIT_FAILURE -+fi -+ - # We need to display help for each of the modes. - case $mode in - "") $echo \ -@@ -4765,6 +6730,7 @@ - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --quiet same as \`--silent' - --silent don't print informational messages -+ --tag=TAG use configuration variables from tag TAG - --version print version information - - MODE must be one of the following: -@@ -4778,8 +6744,10 @@ - uninstall remove libraries from an installed directory - - MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for --a more detailed description of MODE." -- exit 0 -+a more detailed description of MODE. -+ -+Report bugs to ." -+ exit $EXIT_SUCCESS - ;; - - clean) -@@ -4880,9 +6848,9 @@ - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE -- try to export only the symbols listed in SYMFILE -+ try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX -- try to export only the symbols matching REGEX -+ try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened -@@ -4890,12 +6858,17 @@ - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects -+ -objectlist FILE Use a list of object files found in FILE to specify objects -+ -precious-files-regex REGEX -+ don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries -- -static do not do any dynamic linking of libtool libraries -+ -static do not do any dynamic linking of uninstalled libtool libraries -+ -static-libtool-libs -+ do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] -- specify library version info [each variable defaults to 0] -+ specify library version info [each variable defaults to 0] - - All other options (arguments beginning with \`-') are ignored. - -@@ -4931,14 +6904,33 @@ - *) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 -- exit 1 -+ exit $EXIT_FAILURE - ;; - esac - --echo -+$echo - $echo "Try \`$modename --help' for more information about other modes." - --exit 0 -+exit $? -+ -+# The TAGs below are defined such that we never get into a situation -+# in which we disable both kinds of libraries. Given conflicting -+# choices, we go for a static library, that is the most portable, -+# since we can't tell whether shared libraries were disabled because -+# the user asked for that or because the platform doesn't support -+# them. This is particularly important on AIX, because we don't -+# support having both static and shared libraries enabled at the same -+# time on that platform, so we default to a shared-only configuration. -+# If a disable-shared tag is given, we'll fallback to a static-only -+# configuration. But we'll never go from static-only to shared-only. -+ -+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -+disable_libs=shared -+# ### END LIBTOOL TAG CONFIG: disable-shared -+ -+# ### BEGIN LIBTOOL TAG CONFIG: disable-static -+disable_libs=static -+# ### END LIBTOOL TAG CONFIG: disable-static - - # Local Variables: - # mode:shell-script ---- libfcgi-2.4.0.orig/configure -+++ libfcgi-2.4.0/configure -@@ -1,22 +1,554 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by Autoconf 2.52. -+# Generated by GNU Autoconf 2.61. - # --# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. -+## --------------------- ## -+## M4sh Initialization. ## -+## --------------------- ## - --# Find the correct PATH separator. Usually this is `:', but --# DJGPP uses `;' like DOS. --if test "X${PATH_SEPARATOR+set}" != Xset; then -- UNAME=${UNAME-`uname 2>/dev/null`} -- case X$UNAME in -- *-DOS) lt_cv_sys_path_separator=';' ;; -- *) lt_cv_sys_path_separator=':' ;; -- esac -- PATH_SEPARATOR=$lt_cv_sys_path_separator -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh -+fi -+ -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ -+ -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+as_nl=' -+' -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+for as_var in \ -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -+ LC_TELEPHONE LC_TIME -+do -+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ fi -+done -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+ -+# Name of the executable. -+as_me=`$as_basename -- "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ -+# CDPATH. -+$as_unset CDPATH -+ -+ -+if test "x$CONFIG_SHELL" = x; then -+ if (eval ":") 2>/dev/null; then -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ -+ if test $as_have_required = yes && (eval ": -+(as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0) || { (exit 1); exit 1; } -+ -+( -+ as_lineno_1=\$LINENO -+ as_lineno_2=\$LINENO -+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && -+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -+") 2> /dev/null; then -+ : -+else -+ as_candidate_shells= -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ case $as_dir in -+ /*) -+ for as_base in sh bash ksh sh5; do -+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" -+ done;; -+ esac -+done -+IFS=$as_save_IFS -+ -+ -+ for as_shell in $as_candidate_shells $SHELL; do -+ # Try only shells that exist, to save several forks. -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { ("$as_shell") 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+_ASEOF -+}; then -+ CONFIG_SHELL=$as_shell -+ as_have_required=yes -+ if { "$as_shell" 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+(as_func_return () { -+ (exit $1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = "$1" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test $exitcode = 0) || { (exit 1); exit 1; } -+ -+( -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } -+ -+_ASEOF -+}; then -+ break -+fi -+ -+fi -+ -+ done -+ -+ if test "x$CONFIG_SHELL" != x; then -+ for as_var in BASH_ENV ENV -+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ done -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+fi -+ -+ -+ if test $as_have_required = no; then -+ echo This script requires a shell more modern than all the -+ echo shells that I found on your system. Please install a -+ echo modern shell, or manually run the script under such a -+ echo shell if you do have one. -+ { (exit 1); exit 1; } -+fi -+ -+ -+fi -+ -+fi -+ -+ -+ -+(eval "as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0") || { -+ echo No shell found that supports shell functions. -+ echo Please tell autoconf@gnu.org about your system, -+ echo including any error possibly output before this -+ echo message -+} -+ -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -+ -+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -+ # uniformly replaced by the line number. The first 'sed' inserts a -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. -+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | -+ sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno -+ N -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -+ t loop -+ s/-\n.*// -+ ' >$as_me.lineno && -+ chmod +x "$as_me.lineno" || -+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { (exit 1); exit 1; }; } -+ -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" -+ # Exit status is that of the last command. -+ exit -+} -+ -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; -+esac -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir -+fi -+echo >conf$$.file -+if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+else -+ as_ln_s='cp -p' -+fi -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' - fi -+as_executable_p=$as_test_x -+ -+# Sed expression to map a string onto a valid CPP name. -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -+ -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+ -+ -+ - - # Check that we are running under the correct shell. - SHELL=${CONFIG_SHELL-/bin/sh} -@@ -35,7 +567,7 @@ - elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : --elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then -+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : - else -@@ -47,22 +579,22 @@ - # used as fallback echo - shift - cat </dev/null 2>&1 && unset CDPATH - - if test -z "$ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if (echo_test_string="`eval $cmd`") 2>/dev/null && -- echo_test_string="`eval $cmd`" && -+ if (echo_test_string=`eval $cmd`) 2>/dev/null && -+ echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break -@@ -81,8 +613,9 @@ - # - # So, first we look for a working echo in the user's PATH. - -- IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do -+ IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -@@ -91,7 +624,7 @@ - break - fi - done -- IFS="$save_ifs" -+ IFS="$lt_save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. -@@ -163,140 +696,205 @@ - ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" - fi - --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -- --# Sed expression to map a string onto a valid variable name. --as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - --# Sed expression to map a string onto a valid CPP name. --as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix --fi - --# Name of the executable. --as_me=`echo "$0" |sed 's,.*[\\/],,'` -+tagnames=${tagnames+${tagnames},}CXX - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -+tagnames=${tagnames+${tagnames},}F77 - --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -- as_ln_s='ln -s' -- fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln --else -- as_ln_s='cp -p' --fi --rm -f conf$$ conf$$.exe conf$$.file -- --as_executable_p="test -f" -- --# Support unset when possible. --if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false --fi -- --# NLS nuisances. --$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } --$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } --$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } --$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } --$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } --$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } --$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } --$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } -- --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } -+exec 7<&0 &1 - - # Name of the host. - # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, - # so uname gets run too. - ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - --exec 6>&1 -- - # - # Initializations. - # - ac_default_prefix=/usr/local -+ac_clean_files= -+ac_config_libobj_dir=. -+LIBOBJS= - cross_compiling=no - subdirs= --MFLAGS= MAKEFLAGS= -+MFLAGS= -+MAKEFLAGS= - SHELL=${CONFIG_SHELL-/bin/sh} - --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} -+# Identity of this package. -+PACKAGE_NAME= -+PACKAGE_TARNAME= -+PACKAGE_VERSION= -+PACKAGE_STRING= -+PACKAGE_BUGREPORT= - - # Factoring default headers for most tests. - ac_includes_default="\ - #include --#if HAVE_SYS_TYPES_H -+#ifdef HAVE_SYS_TYPES_H - # include - #endif --#if HAVE_SYS_STAT_H -+#ifdef HAVE_SYS_STAT_H - # include - #endif --#if STDC_HEADERS -+#ifdef STDC_HEADERS - # include - # include - #else --# if HAVE_STDLIB_H -+# ifdef HAVE_STDLIB_H - # include - # endif - #endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H - # include - # endif - # include - #endif --#if HAVE_STRINGS_H -+#ifdef HAVE_STRINGS_H - # include - #endif --#if HAVE_INTTYPES_H -+#ifdef HAVE_INTTYPES_H - # include --#else --# if HAVE_STDINT_H --# include --# endif - #endif --#if HAVE_UNISTD_H -+#ifdef HAVE_STDINT_H -+# include -+#endif -+#ifdef HAVE_UNISTD_H - # include - #endif" - -+ac_subst_vars='SHELL -+PATH_SEPARATOR -+PACKAGE_NAME -+PACKAGE_TARNAME -+PACKAGE_VERSION -+PACKAGE_STRING -+PACKAGE_BUGREPORT -+exec_prefix -+prefix -+program_transform_name -+bindir -+sbindir -+libexecdir -+datarootdir -+datadir -+sysconfdir -+sharedstatedir -+localstatedir -+includedir -+oldincludedir -+docdir -+infodir -+htmldir -+dvidir -+pdfdir -+psdir -+libdir -+localedir -+mandir -+DEFS -+ECHO_C -+ECHO_N -+ECHO_T -+LIBS -+build_alias -+host_alias -+target_alias -+INSTALL_PROGRAM -+INSTALL_SCRIPT -+INSTALL_DATA -+am__isrc -+CYGPATH_W -+PACKAGE -+VERSION -+ACLOCAL -+AUTOCONF -+AUTOMAKE -+AUTOHEADER -+MAKEINFO -+install_sh -+STRIP -+INSTALL_STRIP_PROGRAM -+mkdir_p -+AWK -+SET_MAKE -+am__leading_dot -+AMTAR -+am__tar -+am__untar -+CC -+CFLAGS -+LDFLAGS -+CPPFLAGS -+ac_ct_CC -+EXEEXT -+OBJEXT -+DEPDIR -+am__include -+am__quote -+AMDEP_TRUE -+AMDEP_FALSE -+AMDEPBACKSLASH -+CCDEPMODE -+am__fastdepCC_TRUE -+am__fastdepCC_FALSE -+CPP -+build -+build_cpu -+build_vendor -+build_os -+host -+host_cpu -+host_vendor -+host_os -+SED -+GREP -+EGREP -+LN_S -+ECHO -+AR -+RANLIB -+CXX -+CXXFLAGS -+ac_ct_CXX -+CXXDEPMODE -+am__fastdepCXX_TRUE -+am__fastdepCXX_FALSE -+CXXCPP -+F77 -+FFLAGS -+ac_ct_F77 -+LIBTOOL -+LIBFCGIXX -+ECHO_CPP -+PTHREAD_CC -+PTHREAD_LIBS -+PTHREAD_CFLAGS -+THREADED -+LIBOBJS -+SYSTEM -+LTLIBOBJS' -+ac_subst_files='' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CPP -+CXX -+CXXFLAGS -+CCC -+CXXCPP -+F77 -+FFLAGS' -+ -+ - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -@@ -322,41 +920,48 @@ - # and all the variables that are supposed to be based on exec_prefix - # by default will actually change. - # Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' --libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -- --# Identity of this package. --PACKAGE_NAME= --PACKAGE_TARNAME= --PACKAGE_VERSION= --PACKAGE_STRING= --PACKAGE_BUGREPORT= -+docdir='${datarootdir}/doc/${PACKAGE}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' - - ac_prev= -+ac_dashdash= - for ac_option - do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -+ eval $ac_prev=\$ac_option - ac_prev= - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case $ac_option in -+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *) ac_optarg=yes ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; -@@ -378,33 +983,45 @@ - --config-cache | -C) - cache_file=config.cache ;; - -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -+ eval enable_$ac_feature=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -- esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -+ eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -431,6 +1048,12 @@ - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; -@@ -455,13 +1078,16 @@ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ - -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -+ | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -474,7 +1100,7 @@ - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -- | --no-cr | --no-c) -+ | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -@@ -526,6 +1152,16 @@ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; -@@ -578,24 +1214,20 @@ - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -- esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -+ eval with_$ac_package=\$ac_optarg ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -+ eval with_$ac_package=no ;; - - --x) - # Obsolete; use --with-x. -@@ -626,8 +1258,7 @@ - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -+ eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) -@@ -647,36 +1278,29 @@ - { (exit 1); exit 1; }; } - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -- esac --done -- --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+# Be sure to have absolute directory names. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir - do -- eval ac_val=$`echo $ac_var` -+ eval ac_val=\$$ac_var - case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { (exit 1); exit 1; }; } - done - - # There might be people who depend on the old broken behavior: `$host' - # used to hold the argument of --host etc. -+# FIXME: To remove some day. - build=$build_alias - host=$host_alias - target=$target_alias - --# FIXME: should be removed in autoconf 3.0. -+# FIXME: To remove some day. - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -@@ -692,70 +1316,77 @@ - - test "$silent" = yes && exec 6>/dev/null - -+ -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ { echo "$as_me: error: Working directory cannot be determined" >&2 -+ { (exit 1); exit 1; }; } -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ { echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { (exit 1); exit 1; }; } -+ -+ - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes -- # Try the directory containing this script, then its parent. -- ac_prog=$0 -- ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` -- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$0" || -+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$0" : 'X\(//\)[^/]' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$0" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - srcdir=$ac_confdir -- if test ! -r $srcdir/$ac_unique_file; then -+ if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi - else - ac_srcdir_defaulted=no - fi --if test ! -r $srcdir/$ac_unique_file; then -- if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -- else -- { echo "$as_me: error: cannot find sources in $srcdir" >&2 -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } -- fi - fi --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP --ac_env_CXX_set=${CXX+set} --ac_env_CXX_value=$CXX --ac_cv_env_CXX_set=${CXX+set} --ac_cv_env_CXX_value=$CXX --ac_env_CXXFLAGS_set=${CXXFLAGS+set} --ac_env_CXXFLAGS_value=$CXXFLAGS --ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} --ac_cv_env_CXXFLAGS_value=$CXXFLAGS -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 -+ { (exit 1); exit 1; }; } -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done - - # - # Report the --help message. -@@ -763,7 +1394,7 @@ - if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. -- cat < if you have libraries in a - nonstandard directory -- CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have -- headers in a nonstandard directory -+ LIBS libraries to pass to the linker, e.g. -l -+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if -+ you have headers in a nonstandard directory - CPP C preprocessor - CXX C++ compiler command - CXXFLAGS C++ compiler flags -+ CXXCPP C++ preprocessor -+ F77 Fortran 77 compiler command -+ FFLAGS Fortran 77 compiler flags - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - --EOF -+_ACEOF -+ac_status=$? - fi - - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` -- for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue -- cd $ac_subdir -- # A "../" for each directory in /$ac_subdir. -- ac_dots=`echo $ac_subdir | -- sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` -- -- case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_sub_srcdir=$srcdir ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_sub_srcdir=$srcdir/$ac_subdir ;; -- *) # Relative path. -- ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; -- esac -+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -+ test -d "$ac_dir" || continue -+ ac_builddir=. - -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_sub_srcdir/configure.gnu; then -- echo -- $SHELL $ac_sub_srcdir/configure.gnu --help=recursive -- elif test -f $ac_sub_srcdir/configure; then -- echo -- $SHELL $ac_sub_srcdir/configure --help=recursive -- elif test -f $ac_sub_srcdir/configure.ac || -- test -f $ac_sub_srcdir/configure.in; then -- echo -- $ac_configure --help -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive - else -- echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 -- fi -- cd $ac_popdir -+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } - done - fi - --test -n "$ac_init_help" && exit 0 -+test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then -- cat <<\EOF -+ cat <<\_ACEOF -+configure -+generated by GNU Autoconf 2.61 - --Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. --EOF -- exit 0 -+_ACEOF -+ exit - fi --exec 5>config.log --cat >&5 <config.log <<_ACEOF - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.52. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - --EOF -+_ACEOF -+exec 5>>config.log - { - cat <<_ASUNAME --## ---------- ## --## Platform. ## --## ---------- ## -+## --------- ## -+## Platform. ## -+## --------- ## - - hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` - uname -m = `(uname -m) 2>/dev/null || echo unknown` -@@ -941,110 +1603,233 @@ - /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` - /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` - /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` - /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` - /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` - /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - --PATH = $PATH -- - _ASUNAME -+ -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ echo "PATH: $as_dir" -+done -+IFS=$as_save_IFS -+ - } >&5 - --cat >&5 <&5 <<_ACEOF -+ -+ -+## ----------- ## -+## Core tests. ## -+## ----------- ## -+ -+_ACEOF - --EOF - - # Keep a trace of the command line. - # Strip out --no-create and --no-recursion so they do not pile up. -+# Strip out --silent because we don't want to record it for future runs. - # Also quote any args containing shell meta-characters. -+# Make two passes to allow for proper duplicate-argument suppression. - ac_configure_args= --ac_sep= --for ac_arg -+ac_configure_args0= -+ac_configure_args1= -+ac_must_keep_next=false -+for ac_pass in 1 2 - do -- case $ac_arg in -- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -- | --no-cr | --no-c) ;; -- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- ac_sep=" " ;; -- *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" -- ac_sep=" " ;; -- esac -- # Get rid of the leading space. -+ for ac_arg -+ do -+ case $ac_arg in -+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ continue ;; -+ *\'*) -+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ case $ac_pass in -+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 2) -+ ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ if test $ac_must_keep_next = true; then -+ ac_must_keep_next=false # Got value, back to normal. -+ else -+ case $ac_arg in -+ *=* | --config-cache | -C | -disable-* | --disable-* \ -+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -+ | -with-* | --with-* | -without-* | --without-* | --x) -+ case "$ac_configure_args0 " in -+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -+ esac -+ ;; -+ -* ) ac_must_keep_next=true ;; -+ esac -+ fi -+ ac_configure_args="$ac_configure_args '$ac_arg'" -+ ;; -+ esac -+ done - done -+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there - # would cause problems or look ugly. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. -- echo >&5 -- echo "## ----------------- ##" >&5 -- echo "## Cache variables. ##" >&5 -- echo "## ----------------- ##" >&5 -- echo >&5 -- # The following way of writing the cache mishandles newlines in values, --{ -+ { -+ echo -+ -+ cat <<\_ASBOX -+## ---------------- ## -+## Cache variables. ## -+## ---------------- ## -+_ASBOX -+ echo -+ # The following way of writing the cache mishandles newlines in values, -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done - (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( - *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} >&5 -- sed "/^$/d" confdefs.h >conftest.log -- if test -s conftest.log; then -- echo >&5 -- echo "## ------------ ##" >&5 -- echo "## confdefs.h. ##" >&5 -- echo "## ------------ ##" >&5 -- echo >&5 -- cat conftest.log >&5 -- fi -- (echo; echo) >&5 -- test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" >&5 -- echo "$as_me: exit $exit_status" >&5 -- rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && -+ esac | -+ sort -+) -+ echo -+ -+ cat <<\_ASBOX -+## ----------------- ## -+## Output variables. ## -+## ----------------- ## -+_ASBOX -+ echo -+ for ac_var in $ac_subst_vars -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ echo "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo -+ -+ if test -n "$ac_subst_files"; then -+ cat <<\_ASBOX -+## ------------------- ## -+## File substitutions. ## -+## ------------------- ## -+_ASBOX -+ echo -+ for ac_var in $ac_subst_files -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ echo "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo -+ fi -+ -+ if test -s confdefs.h; then -+ cat <<\_ASBOX -+## ----------- ## -+## confdefs.h. ## -+## ----------- ## -+_ASBOX -+ echo -+ cat confdefs.h -+ echo -+ fi -+ test "$ac_signal" != 0 && -+ echo "$as_me: caught signal $ac_signal" -+ echo "$as_me: exit $exit_status" -+ } >&5 -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -- ' 0 -+' 0 - for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal - done - ac_signal=0 - - # confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -+rm -f -r conftest* confdefs.h -+ -+# Predefined preprocessor variables. -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_NAME "$PACKAGE_NAME" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_VERSION "$PACKAGE_VERSION" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_STRING "$PACKAGE_STRING" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -+_ACEOF -+ - - # Let the site file select an alternate cache file if it wants to. - # Prefer explicitly selected file to automatically selected ones. --if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -- fi -+if test -n "$CONFIG_SITE"; then -+ set x "$CONFIG_SITE" -+elif test "x$prefix" != xNONE; then -+ set x "$prefix/share/config.site" "$prefix/etc/config.site" -+else -+ set x "$ac_default_prefix/share/config.site" \ -+ "$ac_default_prefix/etc/config.site" - fi --for ac_site_file in $CONFIG_SITE; do -+shift -+for ac_site_file -+do - if test -r "$ac_site_file"; then -- { echo "$as_me:1045: loading site script $ac_site_file" >&5 -+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 - echo "$as_me: loading site script $ac_site_file" >&6;} -- cat "$ac_site_file" >&5 -+ sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi - done -@@ -1053,15 +1838,15 @@ - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then -- { echo "$as_me:1056: loading cache $cache_file" >&5 -+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5 - echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; - esac - fi - else -- { echo "$as_me:1064: creating cache $cache_file" >&5 -+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5 - echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi -@@ -1069,105 +1854,107 @@ - # Check that the precious variables saved in the cache have kept the same - # value. - ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:1080: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 - echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { echo "$as_me:1084: error: \`$ac_var' was not set in the previous run" >&5 -+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 - echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:1090: error: \`$ac_var' has changed since the previous run:" >&5 -+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 - echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:1092: former value: $ac_old_val" >&5 -+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 - echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:1094: current value: $ac_new_val" >&5 -+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 - echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ ac_cache_corrupted=: - fi;; - esac -- # Pass precious variables to config.status. It doesn't matter if -- # we pass some twice (in addition to the command line arguments). -+ # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` -- ac_configure_args="$ac_configure_args '$ac_arg'" -- ;; -- *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" -- ;; -+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *) ac_arg=$ac_var=$ac_new_val ;; -+ esac -+ case " $ac_configure_args " in -+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:1113: error: changes in the environment can compromise the build" >&5 -+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 - echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:1115: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 - echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } - fi - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; --esac --echo "#! $SHELL" >conftest.sh --echo "exit 0" >>conftest.sh --chmod +x conftest.sh --if { (echo "$as_me:1135: PATH=\".;.\"; conftest.sh") >&5 -- (PATH=".;."; conftest.sh) 2>&5 -- ac_status=$? -- echo "$as_me:1138: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- ac_path_separator=';' --else -- ac_path_separator=: --fi --PATH_SEPARATOR="$ac_path_separator" --rm -f conftest.sh -+ -+am__api_version='1.10' - - ac_aux_dir= --for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do -- if test -f $ac_dir/install-sh; then -+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:1164: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} -+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - # Find a good install program. We prefer a C program (faster), - # so one script is as good as another. But avoid the broken or -@@ -1180,58 +1967,66 @@ - # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag - # AFS /usr/afsws/bin/install, which mishandles nonexistent args - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -+# OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --echo "$as_me:1184: checking for a BSD compatible install" >&5 --echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } - if test -z "$INSTALL"; then - if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_save_IFS=$IFS; IFS=$ac_path_separator -- for ac_dir in $PATH; do -- IFS=$ac_save_IFS -- # Account for people who put trailing slashes in PATH elements. -- case $ac_dir/ in -- / | ./ | .// | /cC/* \ -- | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ -- | /usr/ucb/* ) ;; -- *) -- # OSF1 and SCO ODT 3.0 have their own names for install. -- # Don't use installbsd from OSF since it installs stuff as root -- # by default. -- for ac_prog in ginstall scoinst install; do -- if $as_executable_p "$ac_dir/$ac_prog"; then -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ # Account for people who put trailing slashes in PATH elements. -+case $as_dir/ in -+ ./ | .// | /cC/* | \ -+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -+ /usr/ucb/* ) ;; -+ *) -+ # OSF1 and SCO ODT 3.0 have their own names for install. -+ # Don't use installbsd from OSF since it installs stuff as root -+ # by default. -+ for ac_prog in ginstall scoinst install; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && -- grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then -+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && -- grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then -+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else -- ac_cv_path_install="$ac_dir/$ac_prog -c" -- break 2 -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 - fi - fi - done -- ;; -- esac -- done -+ done -+ ;; -+esac -+done -+IFS=$as_save_IFS -+ - - fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else -- # As a last resort, use the slow shell script. We don't cache a -- # path for INSTALL within a source directory, because that will -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is -- # removed, or if the path is relative. -+ # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi - fi --echo "$as_me:1233: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -+{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -+echo "${ECHO_T}$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -1241,8 +2036,8 @@ - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --echo "$as_me:1244: checking whether build environment is sane" >&5 --echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } - # Just in case - sleep 1 - echo timestamp > conftest.file -@@ -1265,7 +2060,7 @@ - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". -- { { echo "$as_me:1268: error: ls -t appears to fail. Make sure there is not a broken -+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken - alias in your environment" >&5 - echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken - alias in your environment" >&2;} -@@ -1278,29 +2073,29 @@ - # Ok. - : - else -- { { echo "$as_me:1281: error: newly created file is older than distributed files! -+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! - Check your system clock" >&5 - echo "$as_me: error: newly created file is older than distributed files! - Check your system clock" >&2;} - { (exit 1); exit 1; }; } - fi --echo "$as_me:1287: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+{ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - test "$program_prefix" != NONE && -- program_transform_name="s,^,$program_prefix,;$program_transform_name" -+ program_transform_name="s&^&$program_prefix&;$program_transform_name" - # Use a double $ so make ignores it. - test "$program_suffix" != NONE && -- program_transform_name="s,\$,$program_suffix,;$program_transform_name" -+ program_transform_name="s&\$&$program_suffix&;$program_transform_name" - # Double any \ or $. echo might interpret backslashes. - # By default was `s,x,x', remove it if useless. - cat <<\_ACEOF >conftest.sed - s/[\\$]/&&/g;s/;s,x,x,$// - _ACEOF - program_transform_name=`echo $program_transform_name | sed -f conftest.sed` --rm conftest.sed -+rm -f conftest.sed - - # expand $ac_aux_dir to an absolute path --am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` -+am_aux_dir=`cd $ac_aux_dir && pwd` - - test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" - # Use eval to expand $SHELL -@@ -1308,160 +2103,314 @@ - am_missing_run="$MISSING --run " - else - am_missing_run= -- am_backtick='`' -- { echo "$as_me:1312: WARNING: ${am_backtick}missing' script is too old or missing" >&5 --echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} -+ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -+fi -+ -+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } -+if test -z "$MKDIR_P"; then -+ if test "${ac_cv_path_mkdir+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in mkdir gmkdir; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue -+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -+ 'mkdir (GNU coreutils) '* | \ -+ 'mkdir (coreutils) '* | \ -+ 'mkdir (fileutils) '4.1*) -+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext -+ break 3;; -+ esac -+ done -+ done -+done -+IFS=$as_save_IFS -+ -+fi -+ -+ if test "${ac_cv_path_mkdir+set}" = set; then -+ MKDIR_P="$ac_cv_path_mkdir -p" -+ else -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for MKDIR_P within a source directory, because that will -+ # break other packages using the cache if that directory is -+ # removed, or if the value is a relative name. -+ test -d ./--version && rmdir ./--version -+ MKDIR_P="$ac_install_sh -d" -+ fi - fi -+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -+echo "${ECHO_T}$MKDIR_P" >&6; } -+ -+mkdir_p="$MKDIR_P" -+case $mkdir_p in -+ [\\/$]* | ?:[\\/]*) ;; -+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -+esac - --for ac_prog in mawk gawk nawk awk -+for ac_prog in gawk mawk nawk awk - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:1320: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. - else -- ac_save_IFS=$IFS; IFS=$ac_path_separator --ac_dummy="$PATH" --for ac_dir in $ac_dummy; do -- IFS=$ac_save_IFS -- test -z "$ac_dir" && ac_dir=. -- $as_executable_p "$ac_dir/$ac_word" || continue --ac_cv_prog_AWK="$ac_prog" --echo "$as_me:1335: found $ac_dir/$ac_word" >&5 --break -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_AWK="$ac_prog" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done - done -+IFS=$as_save_IFS - - fi - fi - AWK=$ac_cv_prog_AWK - if test -n "$AWK"; then -- echo "$as_me:1343: result: $AWK" >&5 --echo "${ECHO_T}$AWK" >&6 -+ { echo "$as_me:$LINENO: result: $AWK" >&5 -+echo "${ECHO_T}$AWK" >&6; } - else -- echo "$as_me:1346: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$AWK" && break - done - --echo "$as_me:1353: checking whether ${MAKE-make} sets \${MAKE}" >&5 --echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 --set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` --if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.make <<\EOF -+ cat >conftest.make <<\_ACEOF -+SHELL = /bin/sh - all: -- @echo 'ac_maketemp="${MAKE}"' --EOF -+ @echo '@@@%%%=$(MAKE)=@@@%%%' -+_ACEOF - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. --eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` --if test -n "$ac_maketemp"; then -- eval ac_cv_prog_make_${ac_make}_set=yes --else -- eval ac_cv_prog_make_${ac_make}_set=no --fi -+case `${MAKE-make} -f conftest.make 2>/dev/null` in -+ *@@@%%%=?*=@@@%%%*) -+ eval ac_cv_prog_make_${ac_make}_set=yes;; -+ *) -+ eval ac_cv_prog_make_${ac_make}_set=no;; -+esac - rm -f conftest.make - fi --if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then -- echo "$as_me:1373: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - SET_MAKE= - else -- echo "$as_me:1377: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi - --# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. --if test "${enable_dependency_tracking+set}" = set; then -- enableval="$enable_dependency_tracking" -- --fi; --if test "x$enable_dependency_tracking" != xno; then -- am_depcomp="$ac_aux_dir/depcomp" -- AMDEPBACKSLASH='\' --fi -- --if test "x$enable_dependency_tracking" != xno; then -- AMDEP_TRUE= -- AMDEP_FALSE='#' --else -- AMDEP_TRUE='#' -- AMDEP_FALSE= -+rm -rf .tst 2>/dev/null -+mkdir .tst 2>/dev/null -+if test -d .tst; then -+ am__leading_dot=. -+else -+ am__leading_dot=_ -+fi -+rmdir .tst 2>/dev/null -+ -+if test "`cd $srcdir && pwd`" != "`pwd`"; then -+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -+ # is not polluted with repeated "-I." -+ am__isrc=' -I$(srcdir)' -+ # test to see if srcdir already configured -+ if test -f $srcdir/config.status; then -+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} -+ { (exit 1); exit 1; }; } -+ fi - fi - --rm -f .deps 2>/dev/null --mkdir .deps 2>/dev/null --if test -d .deps; then -- DEPDIR=.deps --else -- # MS-DOS does not allow filenames that begin with a dot. -- DEPDIR=_deps -+# test whether we have cygpath -+if test -z "$CYGPATH_W"; then -+ if (cygpath --version) >/dev/null 2>/dev/null; then -+ CYGPATH_W='cygpath -w' -+ else -+ CYGPATH_W=echo -+ fi - fi --rmdir .deps 2>/dev/null - --# test to see if srcdir already configured --if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && -- test -f $srcdir/config.status; then -- { { echo "$as_me:1413: error: source directory already configured; run \"make distclean\" there first" >&5 --echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} -- { (exit 1); exit 1; }; } --fi - - # Define the identity of the package. --PACKAGE=fcgi --VERSION=2.4.0 -+ PACKAGE=fcgi -+ VERSION=2.4.0 - --cat >>confdefs.h <>confdefs.h <>confdefs.h <<_ACEOF -+#define PACKAGE "$PACKAGE" -+_ACEOF - --# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow --# the ones we care about. - --# Autoconf 2.50 always computes EXEEXT. However we need to be --# compatible with 2.13, for now. So we always define EXEEXT, but we --# don't compute it. -- --# Similar for OBJEXT -- only we only use OBJEXT if the user actually --# requests that it be used. This is a bit dumb. --: ${OBJEXT=o} -+cat >>confdefs.h <<_ACEOF -+#define VERSION "$VERSION" -+_ACEOF - - # Some tools Automake needs. - --ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} -+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - --AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - --AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} -+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - --AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - --MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - --AMTAR=${AMTAR-"${am_missing_run}tar"} - --install_sh=${install_sh-"$am_aux_dir/install-sh"} -+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - --INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" - --# We need awk for the "check" target. The system "awk" is bad on --# some platforms. -+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -- ac_config_headers="$ac_config_headers fcgi_config.h" -+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - --ac_ext=c -+# Installed binaries are usually stripped using `strip' when the user -+# run `make install-strip'. However `strip' might not be the right -+# tool to use in cross-compilation environments, therefore Automake -+# will honor the `STRIP' environment variable to overrule this program. -+if test "$cross_compiling" != no; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -+set dummy ${ac_tool_prefix}strip; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_STRIP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$STRIP"; then -+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_STRIP="${ac_tool_prefix}strip" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+STRIP=$ac_cv_prog_STRIP -+if test -n "$STRIP"; then -+ { echo "$as_me:$LINENO: result: $STRIP" >&5 -+echo "${ECHO_T}$STRIP" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_STRIP"; then -+ ac_ct_STRIP=$STRIP -+ # Extract the first word of "strip", so it can be a program name with args. -+set dummy strip; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_STRIP"; then -+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_STRIP="strip" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -+if test -n "$ac_ct_STRIP"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+echo "${ECHO_T}$ac_ct_STRIP" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_STRIP" = x; then -+ STRIP=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ STRIP=$ac_ct_STRIP -+ fi -+else -+ STRIP="$ac_cv_prog_STRIP" -+fi -+ -+fi -+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -+ -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. -+# Always define AMTAR for backward compatibility. -+ -+AMTAR=${AMTAR-"${am_missing_run}tar"} -+ -+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' -+ -+ -+ -+ -+ -+ -+ac_config_headers="$ac_config_headers fcgi_config.h" -+ -+ -+ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -1469,156 +2418,145 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:1472: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else -- ac_save_IFS=$IFS; IFS=$ac_path_separator --ac_dummy="$PATH" --for ac_dir in $ac_dummy; do -- IFS=$ac_save_IFS -- test -z "$ac_dir" && ac_dir=. -- $as_executable_p "$ac_dir/$ac_word" || continue --ac_cv_prog_CC="${ac_tool_prefix}gcc" --echo "$as_me:1487: found $ac_dir/$ac_word" >&5 --break -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_CC="${ac_tool_prefix}gcc" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi - done -+done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:1495: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:1498: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:1507: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. - else -- ac_save_IFS=$IFS; IFS=$ac_path_separator --ac_dummy="$PATH" --for ac_dir in $ac_dummy; do -- IFS=$ac_save_IFS -- test -z "$ac_dir" && ac_dir=. -- $as_executable_p "$ac_dir/$ac_word" || continue --ac_cv_prog_ac_ct_CC="gcc" --echo "$as_me:1522: found $ac_dir/$ac_word" >&5 --break -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_CC="gcc" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi - done -+done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:1530: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } - else -- echo "$as_me:1533: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - else - CC="$ac_cv_prog_CC" - fi - - if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:1546: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else -- ac_save_IFS=$IFS; IFS=$ac_path_separator --ac_dummy="$PATH" --for ac_dir in $ac_dummy; do -- IFS=$ac_save_IFS -- test -z "$ac_dir" && ac_dir=. -- $as_executable_p "$ac_dir/$ac_word" || continue --ac_cv_prog_CC="${ac_tool_prefix}cc" --echo "$as_me:1561: found $ac_dir/$ac_word" >&5 --break -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_CC="${ac_tool_prefix}cc" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done - done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:1569: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:1572: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:1581: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else -- ac_save_IFS=$IFS; IFS=$ac_path_separator --ac_dummy="$PATH" --for ac_dir in $ac_dummy; do -- IFS=$ac_save_IFS -- test -z "$ac_dir" && ac_dir=. -- $as_executable_p "$ac_dir/$ac_word" || continue --ac_cv_prog_ac_ct_CC="cc" --echo "$as_me:1596: found $ac_dir/$ac_word" >&5 --break --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:1604: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:1607: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi - -+ fi - fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:1620: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1626,20 +2564,24 @@ - ac_cv_prog_CC="$CC" # Let the user override the test. - else - ac_prog_rejected=no -- ac_save_IFS=$IFS; IFS=$ac_path_separator --ac_dummy="$PATH" --for ac_dir in $ac_dummy; do -- IFS=$ac_save_IFS -- test -z "$ac_dir" && ac_dir=. -- $as_executable_p "$ac_dir/$ac_word" || continue --if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then -- ac_prog_rejected=yes -- continue --fi --ac_cv_prog_CC="cc" --echo "$as_me:1640: found $ac_dir/$ac_word" >&5 --break -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then -+ ac_prog_rejected=yes -+ continue -+ fi -+ ac_cv_prog_CC="cc" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done - done -+IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. -@@ -1650,133 +2592,176 @@ - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift -- set dummy "$ac_dir/$ac_word" ${1+"$@"} -- shift -- ac_cv_prog_CC="$@" -+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi - fi - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:1662: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:1665: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:1676: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else -- ac_save_IFS=$IFS; IFS=$ac_path_separator --ac_dummy="$PATH" --for ac_dir in $ac_dummy; do -- IFS=$ac_save_IFS -- test -z "$ac_dir" && ac_dir=. -- $as_executable_p "$ac_dir/$ac_word" || continue --ac_cv_prog_CC="$ac_tool_prefix$ac_prog" --echo "$as_me:1691: found $ac_dir/$ac_word" >&5 --break -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi - done -+done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:1699: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:1702: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$CC" && break - done - fi - if test -z "$CC"; then - ac_ct_CC=$CC -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:1715: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. - else -- ac_save_IFS=$IFS; IFS=$ac_path_separator --ac_dummy="$PATH" --for ac_dir in $ac_dummy; do -- IFS=$ac_save_IFS -- test -z "$ac_dir" && ac_dir=. -- $as_executable_p "$ac_dir/$ac_word" || continue --ac_cv_prog_ac_ct_CC="$ac_prog" --echo "$as_me:1730: found $ac_dir/$ac_word" >&5 --break -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_CC="$ac_prog" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi - done -+done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:1738: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } - else -- echo "$as_me:1741: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$ac_ct_CC" && break - done - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - fi - - fi - --test -z "$CC" && { { echo "$as_me:1753: error: no acceptable cc found in \$PATH" >&5 --echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} -+ -+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&5 -+echo "$as_me: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - - # Provide some information about the compiler. --echo "$as_me:1758:" \ -- "checking for C compiler version" >&5 -+echo "$as_me:$LINENO: checking for C compiler version" >&5 - ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:1761: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? -- echo "$as_me:1764: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:1766: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? -- echo "$as_me:1769: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:1771: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? -- echo "$as_me:1774: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - - cat >conftest.$ac_ext <<_ACEOF --#line 1778 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - int - main () -@@ -1787,127 +2772,188 @@ - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe" -+ac_clean_files="$ac_clean_files a.out a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:1794: checking for C compiler default output" >&5 --echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } - ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:1797: \"$ac_link_default\"") >&5 -- (eval $ac_link_default) 2>&5 -+# -+# List of possible output files, starting from the most likely. -+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -+# only as a last resort. b.out is created by i960 compilers. -+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -+# -+# The IRIX 6 linker writes into existing files which may not be -+# executable, retaining their permissions. Remove them first so a -+# subsequent execution test works. -+ac_rmfiles= -+for ac_file in $ac_files -+do -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { (ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link_default") 2>&5 - ac_status=$? -- echo "$as_me:1800: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. --for ac_file in `ls a.exe conftest.exe 2>/dev/null; -- ls a.out conftest 2>/dev/null; -- ls a.* conftest.* 2>/dev/null`; do -+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -+# in a Makefile. We should not override ac_cv_exeext if it was cached, -+# so that the user can short-circuit this test for compilers unknown to -+# Autoconf. -+for ac_file in $ac_files '' -+do -+ test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; -- a.out ) # We found the default executable, but exeext='' is most -- # certainly right. -- break;; -- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool --akim. -- export ac_cv_exeext -- break;; -- * ) break;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) -+ ;; -+ [ab].out ) -+ # We found the default executable, but exeext='' is most -+ # certainly right. -+ break;; -+ *.* ) -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an `-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. -+ break;; -+ * ) -+ break;; - esac - done -+test "$ac_cv_exeext" = no && ac_cv_exeext= -+ - else -+ ac_file='' -+fi -+ -+{ echo "$as_me:$LINENO: result: $ac_file" >&5 -+echo "${ECHO_T}$ac_file" >&6; } -+if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --{ { echo "$as_me:1823: error: C compiler cannot create executables" >&5 --echo "$as_me: error: C compiler cannot create executables" >&2;} -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -+See \`config.log' for more details." >&5 -+echo "$as_me: error: C compiler cannot create executables -+See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - fi - - ac_exeext=$ac_cv_exeext --echo "$as_me:1829: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 - --# Check the compiler produces executables we can run. If not, either -+# Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --echo "$as_me:1834: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } - # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 - # If not cross compiling, check that we can run a simple program. - if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' -- { (eval echo "$as_me:1840: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:1843: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else -- { { echo "$as_me:1850: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'." >&5 -+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'." >&2;} -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi - fi --echo "$as_me:1858: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+{ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - --rm -f a.out a.exe conftest$ac_cv_exeext -+rm -f a.out a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either -+# Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --echo "$as_me:1865: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:1867: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -- --echo "$as_me:1870: checking for executable suffix" >&5 --echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 --if { (eval echo "$as_me:1872: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -+echo "${ECHO_T}$cross_compiling" >&6; } -+ -+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:1875: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will - # work properly (i.e., refer to `conftest.exe'), while it won't with - # `rm'. --for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do -+for ac_file in conftest.exe conftest conftest.*; do -+ test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext -- break;; -+ break;; - * ) break;; - esac - done - else -- { { echo "$as_me:1891: error: cannot compute EXEEXT: cannot compile and link" >&5 --echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} -+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - - rm -f conftest$ac_cv_exeext --echo "$as_me:1897: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -+echo "${ECHO_T}$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --echo "$as_me:1903: checking for object suffix" >&5 --echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } - if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 1909 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - int - main () -@@ -1918,40 +2964,52 @@ - } - _ACEOF - rm -f conftest.o conftest.obj --if { (eval echo "$as_me:1921: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>&5 - ac_status=$? -- echo "$as_me:1924: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -+ for ac_file in conftest.o conftest.obj conftest.*; do -+ test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --{ { echo "$as_me:1936: error: cannot compute OBJEXT: cannot compile" >&5 --echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot compute suffix of object files: cannot compile -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:1943: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -+echo "${ECHO_T}$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --echo "$as_me:1947: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } - if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 1953 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - int - main () -@@ -1965,41 +3023,54 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:1968: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:1971: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:1974: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:1977: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_compiler_gnu=no -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_compiler_gnu=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:1989: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } - GCC=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:1995: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } - if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --#line 2001 "configure" --#include "confdefs.h" -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - int - main () -@@ -2010,164 +3081,268 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:2013: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:2016: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:2019: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:2022: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_prog_cc_g=no --fi --rm -f conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:2032: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 --if test "$ac_test_CFLAGS" = set; then -- CFLAGS=$ac_save_CFLAGS --elif test $ac_cv_prog_cc_g = yes; then -- if test "$GCC" = yes; then -- CFLAGS="-g -O2" -- else -- CFLAGS="-g" -- fi --else -- if test "$GCC" = yes; then -- CFLAGS="-O2" -- else -- CFLAGS= -- fi --fi --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#endif -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ CFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:2059: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:2062: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:2065: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:2068: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- ''\ -- '#include ' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --#line 2080 "configure" --#include "confdefs.h" --#include --$ac_declaration -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ - int - main () - { --exit (42); -+ - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:2093: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:2096: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:2099: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:2102: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - : - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --continue --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --#line 2112 "configure" --#include "confdefs.h" --$ac_declaration -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ - int - main () - { --exit (42); -+ - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:2124: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:2127: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:2130: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:2133: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cc_g=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --fi --rm -f conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ - fi - --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.$ac_objext conftest.$ac_ext --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu - --ac_config_commands="$ac_config_commands default-1" -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi - --am_make=${MAKE-make} --cat > confinc << 'END' --doit: -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -+if test "$ac_test_CFLAGS" = set; then -+ CFLAGS=$ac_save_CFLAGS -+elif test $ac_cv_prog_cc_g = yes; then -+ if test "$GCC" = yes; then -+ CFLAGS="-g -O2" -+ else -+ CFLAGS="-g" -+ fi -+else -+ if test "$GCC" = yes; then -+ CFLAGS="-O2" -+ else -+ CFLAGS= -+ fi -+fi -+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cc_c89+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_prog_cc_c89=no -+ac_save_CC=$CC -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+#include -+#include -+#include -+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -+struct buf { int x; }; -+FILE * (*rcsopen) (struct buf *, struct stat *, int); -+static char *e (p, i) -+ char **p; -+ int i; -+{ -+ return p[i]; -+} -+static char *f (char * (*g) (char **, int), char **p, ...) -+{ -+ char *s; -+ va_list v; -+ va_start (v,p); -+ s = g (p, va_arg (v,int)); -+ va_end (v); -+ return s; -+} -+ -+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has -+ function prototypes and stuff, but not '\xHH' hex character constants. -+ These don't provoke an error unfortunately, instead are silently treated -+ as 'x'. The following induces an error, until -std is added to get -+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an -+ array size at least. It's necessary to write '\x00'==0 to get something -+ that's true only with -std. */ -+int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -+ -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ -+int test (int i, double x); -+struct s1 {int (*f) (int a);}; -+struct s2 {int (*f) (double a);}; -+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -+int argc; -+char **argv; -+int -+main () -+{ -+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -+ ; -+ return 0; -+} -+_ACEOF -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+do -+ CC="$ac_save_CC $ac_arg" -+ rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cc_c89=$ac_arg -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break -+done -+rm -f conftest.$ac_ext -+CC=$ac_save_CC -+ -+fi -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } ;; -+ xno) -+ { echo "$as_me:$LINENO: result: unsupported" >&5 -+echo "${ECHO_T}unsupported" >&6; } ;; -+ *) -+ CC="$CC $ac_cv_prog_cc_c89" -+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -+esac -+ -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+DEPDIR="${am__leading_dot}deps" -+ -+ac_config_commands="$ac_config_commands depfiles" -+ -+ -+am_make=${MAKE-make} -+cat > confinc << 'END' -+am__doit: - @echo done -+.PHONY: am__doit - END - # If we don't find an include directive, just comment out the code. --echo "$as_me:2168: checking for style of include used by $am_make" >&5 --echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 --am__include='#' -+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } -+am__include="#" - am__quote= - _am_result=none - # First try GNU make style include. -@@ -2177,7 +3352,7 @@ - # In particular we don't look at `^make:' because GNU make might - # be invoked under some other name (usually "gmake"), in which - # case it prints its new name instead of `make'. --if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then -+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -@@ -2187,19 +3362,39 @@ - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include -- am__quote='"' -+ am__quote="\"" - _am_result=BSD - fi - fi - --echo "$as_me:2195: result: $_am_result" >&5 --echo "${ECHO_T}$_am_result" >&6 -+ -+{ echo "$as_me:$LINENO: result: $_am_result" >&5 -+echo "${ECHO_T}$_am_result" >&6; } - rm -f confinc confmf - -+# Check whether --enable-dependency-tracking was given. -+if test "${enable_dependency_tracking+set}" = set; then -+ enableval=$enable_dependency_tracking; -+fi -+ -+if test "x$enable_dependency_tracking" != xno; then -+ am_depcomp="$ac_aux_dir/depcomp" -+ AMDEPBACKSLASH='\' -+fi -+ if test "x$enable_dependency_tracking" != xno; then -+ AMDEP_TRUE= -+ AMDEP_FALSE='#' -+else -+ AMDEP_TRUE='#' -+ AMDEP_FALSE= -+fi -+ -+ -+ - depcc="$CC" am_compiler_list= - --echo "$as_me:2201: checking dependency style of $depcc" >&5 --echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } - if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2214,18 +3409,34 @@ - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. -- echo '#include "conftest.h"' > conftest.c -- echo 'int i;' > conftest.h -- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) -@@ -2243,13 +3454,26 @@ - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ -- source=conftest.c object=conftest.o \ -- depfile=conftest.Po tmpdepfile=conftest.TPo \ -- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && -- grep conftest.h conftest.Po > /dev/null 2>&1 && -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- am_cv_CC_dependencies_compiler_type=$depmode -- break -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_CC_dependencies_compiler_type=$depmode -+ break -+ fi - fi - done - -@@ -2260,17 +3484,28 @@ - fi - - fi --echo "$as_me:2263: result: $am_cv_CC_dependencies_compiler_type" >&5 --echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 --CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" -+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } -+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -+ -+ if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then -+ am__fastdepCC_TRUE= -+ am__fastdepCC_FALSE='#' -+else -+ am__fastdepCC_TRUE='#' -+ am__fastdepCC_FALSE= -+fi -+ - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --echo "$as_me:2272: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -2287,73 +3522,87 @@ - do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF --#line 2293 "configure" --#include "confdefs.h" --#include -- Syntax error -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error - _ACEOF --if { (eval echo "$as_me:2298: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:2304: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - : - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - # Broken: fails on valid input. - continue - fi -+ - rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF --#line 2327 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:2331: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:2337: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - # Passes both tests. - ac_preproc_ok=: - break - fi -+ - rm -f conftest.err conftest.$ac_ext - - done -@@ -2371,80 +3620,94 @@ - else - ac_cv_prog_CPP=$CPP - fi --echo "$as_me:2374: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 -+{ echo "$as_me:$LINENO: result: $CPP" >&5 -+echo "${ECHO_T}$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes - do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF --#line 2384 "configure" --#include "confdefs.h" --#include -- Syntax error -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error - _ACEOF --if { (eval echo "$as_me:2389: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:2395: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - : - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - # Broken: fails on valid input. - continue - fi -+ - rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF --#line 2418 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:2422: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:2428: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - # Passes both tests. - ac_preproc_ok=: - break - fi -+ - rm -f conftest.err conftest.$ac_ext - - done -@@ -2453,8 +3716,10 @@ - if $ac_preproc_ok; then - : - else -- { { echo "$as_me:2456: error: C preprocessor \"$CPP\" fails sanity check" >&5 --echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} -+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." >&5 -+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -2475,58 +3740,66 @@ - # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag - # AFS /usr/afsws/bin/install, which mishandles nonexistent args - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -+# OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --echo "$as_me:2479: checking for a BSD compatible install" >&5 --echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } - if test -z "$INSTALL"; then - if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_save_IFS=$IFS; IFS=$ac_path_separator -- for ac_dir in $PATH; do -- IFS=$ac_save_IFS -- # Account for people who put trailing slashes in PATH elements. -- case $ac_dir/ in -- / | ./ | .// | /cC/* \ -- | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ -- | /usr/ucb/* ) ;; -- *) -- # OSF1 and SCO ODT 3.0 have their own names for install. -- # Don't use installbsd from OSF since it installs stuff as root -- # by default. -- for ac_prog in ginstall scoinst install; do -- if $as_executable_p "$ac_dir/$ac_prog"; then -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ # Account for people who put trailing slashes in PATH elements. -+case $as_dir/ in -+ ./ | .// | /cC/* | \ -+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -+ /usr/ucb/* ) ;; -+ *) -+ # OSF1 and SCO ODT 3.0 have their own names for install. -+ # Don't use installbsd from OSF since it installs stuff as root -+ # by default. -+ for ac_prog in ginstall scoinst install; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && -- grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then -+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && -- grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then -+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else -- ac_cv_path_install="$ac_dir/$ac_prog -c" -- break 2 -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 - fi - fi - done -- ;; -- esac -- done -+ done -+ ;; -+esac -+done -+IFS=$as_save_IFS -+ - - fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else -- # As a last resort, use the slow shell script. We don't cache a -- # path for INSTALL within a source directory, because that will -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is -- # removed, or if the path is relative. -+ # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi - fi --echo "$as_me:2528: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -+{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -+echo "${ECHO_T}$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -2536,201 +3809,453 @@ - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --# Check whether --enable-shared or --disable-shared was given. -+# Check whether --enable-shared was given. - if test "${enable_shared+set}" = set; then -- enableval="$enable_shared" -- p=${PACKAGE-default} --case $enableval in --yes) enable_shared=yes ;; --no) enable_shared=no ;; --*) -- enable_shared=no -- # Look at the argument we got. We use all the common list separators. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_shared=yes -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac -+ enableval=$enable_shared; p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_shared=yes ;; -+ no) enable_shared=no ;; -+ *) -+ enable_shared=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_shared=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac - else - enable_shared=yes --fi; --# Check whether --enable-static or --disable-static was given. -+fi -+ -+ -+# Check whether --enable-static was given. - if test "${enable_static+set}" = set; then -- enableval="$enable_static" -- p=${PACKAGE-default} --case $enableval in --yes) enable_static=yes ;; --no) enable_static=no ;; --*) -- enable_static=no -- # Look at the argument we got. We use all the common list separators. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_static=yes -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac -+ enableval=$enable_static; p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_static=yes ;; -+ no) enable_static=no ;; -+ *) -+ enable_static=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_static=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac - else - enable_static=yes --fi; --# Check whether --enable-fast-install or --disable-fast-install was given. -+fi -+ -+ -+# Check whether --enable-fast-install was given. - if test "${enable_fast_install+set}" = set; then -- enableval="$enable_fast_install" -- p=${PACKAGE-default} --case $enableval in --yes) enable_fast_install=yes ;; --no) enable_fast_install=no ;; --*) -- enable_fast_install=no -- # Look at the argument we got. We use all the common list separators. -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," -- for pkg in $enableval; do -- if test "X$pkg" = "X$p"; then -- enable_fast_install=yes -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac -+ enableval=$enable_fast_install; p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_fast_install=yes ;; -+ no) enable_fast_install=no ;; -+ *) -+ enable_fast_install=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_fast_install=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac - else - enable_fast_install=yes --fi; -+fi -+ -+ - # Make sure we can run config.sub. --$ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:2607: error: cannot run $ac_config_sub" >&5 --echo "$as_me: error: cannot run $ac_config_sub" >&2;} -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - --echo "$as_me:2611: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking build system type" >&5 -+echo $ECHO_N "checking build system type... $ECHO_C" >&6; } - if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_build_alias=$build_alias --test -z "$ac_cv_build_alias" && -- ac_cv_build_alias=`$ac_config_guess` --test -z "$ac_cv_build_alias" && -- { { echo "$as_me:2620: error: cannot guess build type; you must specify one" >&5 -+ ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -+test "x$ac_build_alias" = x && -+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 - echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } --ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -- { { echo "$as_me:2624: error: $ac_config_sub $ac_cv_build_alias failed." >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} -+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - - fi --echo "$as_me:2629: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -+echo "${ECHO_T}$ac_cv_build" >&6; } -+case $ac_cv_build in -+*-*-*) ;; -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -+echo "$as_me: error: invalid value of canonical build" >&2;} -+ { (exit 1); exit 1; }; };; -+esac - build=$ac_cv_build --build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - --echo "$as_me:2636: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6 -+ -+{ echo "$as_me:$LINENO: checking host system type" >&5 -+echo $ECHO_N "checking host system type... $ECHO_C" >&6; } - if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_host_alias=$host_alias --test -z "$ac_cv_host_alias" && -- ac_cv_host_alias=$ac_cv_build_alias --ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -- { { echo "$as_me:2645: error: $ac_config_sub $ac_cv_host_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} -+ if test "x$host_alias" = x; then -+ ac_cv_host=$ac_cv_build -+else -+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } -+fi - - fi --echo "$as_me:2650: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -+echo "${ECHO_T}$ac_cv_host" >&6; } -+case $ac_cv_host in -+*-*-*) ;; -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -+echo "$as_me: error: invalid value of canonical host" >&2;} -+ { (exit 1); exit 1; }; };; -+esac - host=$ac_cv_host --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -- --# Find the correct PATH separator. Usually this is `:', but --# DJGPP uses `;' like DOS. --if test "X${PATH_SEPARATOR+set}" != Xset; then -- UNAME=${UNAME-`uname 2>/dev/null`} -- case X$UNAME in -- *-DOS) lt_cv_sys_path_separator=';' ;; -- *) lt_cv_sys_path_separator=':' ;; -- esac -- PATH_SEPARATOR=$lt_cv_sys_path_separator -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_host -+shift -+host_cpu=$1 -+host_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+host_os=$* -+IFS=$ac_save_IFS -+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -+ -+ -+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } -+if test "${lt_cv_path_SED+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # Loop through the user's path and test for sed and gsed. -+# Then use that list of sed's as ones to test for truncation. -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for lt_ac_prog in sed gsed; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then -+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" -+ fi -+ done -+ done -+done -+IFS=$as_save_IFS -+lt_ac_max=0 -+lt_ac_count=0 -+# Add /usr/xpg4/bin/sed as it is typically found on Solaris -+# along with /bin/sed that truncates output. -+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -+ test ! -f $lt_ac_sed && continue -+ cat /dev/null > conftest.in -+ lt_ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in -+ # Check for GNU sed and select it if it is found. -+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -+ lt_cv_path_SED=$lt_ac_sed -+ break -+ fi -+ while true; do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo >>conftest.nl -+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -+ cmp -s conftest.out conftest.nl || break -+ # 10000 chars as input seems more than enough -+ test $lt_ac_count -gt 10 && break -+ lt_ac_count=`expr $lt_ac_count + 1` -+ if test $lt_ac_count -gt $lt_ac_max; then -+ lt_ac_max=$lt_ac_count -+ lt_cv_path_SED=$lt_ac_sed -+ fi -+ done -+done -+ - fi - --# Check whether --with-gnu-ld or --without-gnu-ld was given. --if test "${with_gnu_ld+set}" = set; then -- withval="$with_gnu_ld" -- test "$withval" = no || with_gnu_ld=yes -+SED=$lt_cv_path_SED -+ -+{ echo "$as_me:$LINENO: result: $SED" >&5 -+echo "${ECHO_T}$SED" >&6; } -+ -+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -+if test "${ac_cv_path_GREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- with_gnu_ld=no --fi; --ac_prog=ld --if test "$GCC" = yes; then -- # Check if gcc -print-prog-name=ld gives a path. -- echo "$as_me:2678: checking for ld used by GCC" >&5 --echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 -- case $host in -- *-*-mingw*) -- # gcc leaves a trailing carriage return which upsets mingw -- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -- *) -- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -- esac -- case $ac_prog in -- # Accept absolute paths. -- [\\/]* | [A-Za-z]:[\\/]*) -- re_direlt='/[^/][^/]*/\.\./' -- # Canonicalize the path of ld -- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` -- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` -- done -- test -z "$LD" && LD="$ac_prog" -- ;; -- "") -- # If it fails, then pretend we aren't using GCC. -- ac_prog=ld -- ;; -- *) -- # If it is relative, then search for the first ld in PATH. -- with_gnu_ld=unknown -+ # Extract the first word of "grep ggrep" to use in msg output -+if test -z "$GREP"; then -+set dummy grep ggrep; ac_prog_name=$2 -+if test "${ac_cv_path_GREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_path_GREP_found=false -+# Loop through the user's path and test for each of PROGNAME-LIST -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -+ # Check for GNU ac_path_GREP and select it if it is found. -+ # Check for GNU $ac_path_GREP -+case `"$ac_path_GREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -+*) -+ ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ -+ $ac_path_GREP_found && break 3 -+ done -+done -+ -+done -+IFS=$as_save_IFS -+ -+ -+fi -+ -+GREP="$ac_cv_path_GREP" -+if test -z "$GREP"; then -+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+else -+ ac_cv_path_GREP=$GREP -+fi -+ -+ -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -+echo "${ECHO_T}$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ echo "$as_me:$LINENO: checking for egrep" >&5 -+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -+if test "${ac_cv_path_EGREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -+ then ac_cv_path_EGREP="$GREP -E" -+ else -+ # Extract the first word of "egrep" to use in msg output -+if test -z "$EGREP"; then -+set dummy egrep; ac_prog_name=$2 -+if test "${ac_cv_path_EGREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_path_EGREP_found=false -+# Loop through the user's path and test for each of PROGNAME-LIST -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -+ # Check for GNU ac_path_EGREP and select it if it is found. -+ # Check for GNU $ac_path_EGREP -+case `"$ac_path_EGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -+*) -+ ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ -+ $ac_path_EGREP_found && break 3 -+ done -+done -+ -+done -+IFS=$as_save_IFS -+ -+ -+fi -+ -+EGREP="$ac_cv_path_EGREP" -+if test -z "$EGREP"; then -+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+else -+ ac_cv_path_EGREP=$EGREP -+fi -+ -+ -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" -+ -+ -+ -+# Check whether --with-gnu-ld was given. -+if test "${with_gnu_ld+set}" = set; then -+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -+else -+ with_gnu_ld=no -+fi -+ -+ac_prog=ld -+if test "$GCC" = yes; then -+ # Check if gcc -print-prog-name=ld gives a path. -+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } -+ case $host in -+ *-*-mingw*) -+ # gcc leaves a trailing carriage return which upsets mingw -+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -+ *) -+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $ac_prog in -+ # Accept absolute paths. -+ [\\/]* | ?:[\\/]*) -+ re_direlt='/[^/][^/]*/\.\./' -+ # Canonicalize the pathname of ld -+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` -+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` -+ done -+ test -z "$LD" && LD="$ac_prog" -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ac_prog=ld -+ ;; -+ *) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown - ;; - esac - elif test "$with_gnu_ld" = yes; then -- echo "$as_me:2708: checking for GNU ld" >&5 --echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for GNU ld" >&5 -+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } - else -- echo "$as_me:2711: checking for non-GNU ld" >&5 --echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } - fi - if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -z "$LD"; then -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do -+ IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some GNU ld's only accept -v. -+ # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. -- if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then -+ case `"$lt_cv_path_LD" -v 2>&1 &5 --echo "${ECHO_T}$LD" >&6 -+ { echo "$as_me:$LINENO: result: $LD" >&5 -+echo "${ECHO_T}$LD" >&6; } - else -- echo "$as_me:2744: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi --test -z "$LD" && { { echo "$as_me:2747: error: no acceptable ld found in \$PATH" >&5 -+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 - echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } --echo "$as_me:2750: checking if the linker ($LD) is GNU ld" >&5 --echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } - if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # I'd rather use --version here, but apparently some GNU ld's only accept -v. --if $LD -v 2>&1 &5; then -+ # I'd rather use --version here, but apparently some GNU lds only accept -v. -+case `$LD -v 2>&1 &5 --echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } - with_gnu_ld=$lt_cv_prog_gnu_ld - --echo "$as_me:2766: checking for $LD option to reload object files" >&5 --echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 -+ -+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } - if test "${lt_cv_ld_reload_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_ld_reload_flag='-r' - fi --echo "$as_me:2773: result: $lt_cv_ld_reload_flag" >&5 --echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } - reload_flag=$lt_cv_ld_reload_flag --test -n "$reload_flag" && reload_flag=" $reload_flag" -+case $reload_flag in -+"" | " "*) ;; -+*) reload_flag=" $reload_flag" ;; -+esac -+reload_cmds='$LD$reload_flag -o $output$reload_objs' -+case $host_os in -+ darwin*) -+ if test "$GCC" = yes; then -+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -+ else -+ reload_cmds='$LD$reload_flag -o $output$reload_objs' -+ fi -+ ;; -+esac - --echo "$as_me:2778: checking for BSD-compatible nm" >&5 --echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } - if test "${lt_cv_path_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2784,49 +4326,63 @@ - # Let the user override the test. - lt_cv_path_NM="$NM" - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do -- test -z "$ac_dir" && ac_dir=. -- tmp_nm=$ac_dir/${ac_tool_prefix}nm -- if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then -- # Check to see if the nm accepts a BSD-compat flag. -- # Adding the `sed 1q' prevents false positives on HP-UX, which says: -- # nm: unknown option "B" ignored -- # Tru64's nm complains that /dev/null is an invalid object file -- if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then -- lt_cv_path_NM="$tmp_nm -B" -- break -- elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then -- lt_cv_path_NM="$tmp_nm -p" -- break -- else -- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -- continue # so that we can try to find one that supports BSD flags -+ lt_nm_to_check="${ac_tool_prefix}nm" -+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then -+ lt_nm_to_check="$lt_nm_to_check nm" -+ fi -+ for lt_tmp_nm in $lt_nm_to_check; do -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ tmp_nm="$ac_dir/$lt_tmp_nm" -+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -+ # Check to see if the nm accepts a BSD-compat flag. -+ # Adding the `sed 1q' prevents false positives on HP-UX, which says: -+ # nm: unknown option "B" ignored -+ # Tru64's nm complains that /dev/null is an invalid object file -+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -+ */dev/null* | *'Invalid file or object type'*) -+ lt_cv_path_NM="$tmp_nm -B" -+ break -+ ;; -+ *) -+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in -+ */dev/null*) -+ lt_cv_path_NM="$tmp_nm -p" -+ break -+ ;; -+ *) -+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -+ continue # so that we can try to find one that supports BSD flags -+ ;; -+ esac -+ ;; -+ esac - fi -- fi -+ done -+ IFS="$lt_save_ifs" - done -- IFS="$ac_save_ifs" - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm - fi - fi -- -+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -+echo "${ECHO_T}$lt_cv_path_NM" >&6; } - NM="$lt_cv_path_NM" --echo "$as_me:2814: result: $NM" >&5 --echo "${ECHO_T}$NM" >&6 - --echo "$as_me:2817: checking whether ln -s works" >&5 --echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } - LN_S=$as_ln_s - if test "$LN_S" = "ln -s"; then -- echo "$as_me:2821: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else -- echo "$as_me:2824: result: no, using $LN_S" >&5 --echo "${ECHO_T}no, using $LN_S" >&6 -+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -+echo "${ECHO_T}no, using $LN_S" >&6; } - fi - --echo "$as_me:2828: checking how to recognise dependant libraries" >&5 --echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } - if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2840,7 +4396,7 @@ - # 'pass_all' -- all dependencies passed with no checks. - # 'test_compile' -- check by making test program. - # 'file_magic [[regex]]' -- check by looking for files in library path --# which responds to the $file_magic_cmd with a given egrep regex. -+# which responds to the $file_magic_cmd with a given extended regex. - # If you have `file' or equivalent on your system and you're not sure - # whether `pass_all' will *always* work, you probably want this one. - -@@ -2853,37 +4409,42 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --bsdi4*) -+bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - --cygwin* | mingw* | pw32*) -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -- lt_cv_file_magic_cmd='$OBJDUMP -f' -+cygwin*) -+ # func_win32_libid is a shell function defined in ltmain.sh -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ ;; -+ -+mingw* | pw32*) -+ # Base MSYS/MinGW do not provide the 'file' command needed by -+ # func_win32_libid shell function, so use a weaker test based on 'objdump', -+ # unless we find 'file', for example because we are cross-compiling. -+ if ( file / ) >/dev/null 2>&1; then -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ else -+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ fi - ;; - - darwin* | rhapsody*) -- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' -- lt_cv_file_magic_cmd='/usr/bin/file -L' -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` -- ;; -- *) # Darwin 1.3 on -- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' -- ;; -- esac -+ lt_cv_deplibs_check_method=pass_all - ;; - --freebsd*) -+freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. -- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; -@@ -2897,50 +4458,49 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --hpux10.20*|hpux11*) -- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' -+hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=/usr/lib/libc.sl -- ;; -- --irix5* | irix6*) -- case $host_os in -- irix5*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" -+ case $host_cpu in -+ ia64*) -+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' -+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -+ ;; -+ hppa*64*) -+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' -+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) -- case $LD in -- *-32|*"-32 ") libmagic=32-bit;; -- *-n32|*"-n32 ") libmagic=N32;; -- *-64|*"-64 ") libmagic=64-bit;; -- *) libmagic=never-match;; -- esac -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" -+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' -+ lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac -- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` -+ ;; -+ -+interix[3-9]*) -+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $LD in -+ *-32|*"-32 ") libmagic=32-bit;; -+ *-n32|*"-n32 ") libmagic=N32;; -+ *-64|*"-64 ") libmagic=64-bit;; -+ *) libmagic=never-match;; -+ esac - lt_cv_deplibs_check_method=pass_all - ;; - - # This must be Linux ELF. --linux-gnu*) -- case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) -- lt_cv_deplibs_check_method=pass_all ;; -- *) -- # glibc up to 2.1.1 does not perform some relocations on ARM -- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; -- esac -- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` -+linux* | k*bsd*-gnu) -+ lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else -- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$' -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' - fi - ;; - -@@ -2950,37 +4510,31 @@ - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -+nto-qnx*) -+ lt_cv_deplibs_check_method=unknown -+ ;; -+ - openbsd*) -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else -- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - fi - ;; - - osf3* | osf4* | osf5*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' -- lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - --sco3.2v5*) -+rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - - solaris*) - lt_cv_deplibs_check_method=pass_all -- lt_cv_file_magic_test_file=/lib/libc.so -- ;; -- --sysv5uw[78]* | sysv4*uw2*) -- lt_cv_deplibs_check_method=pass_all - ;; - --sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' -@@ -2998,2003 +4552,13375 @@ - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; -+ siemens) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ pc) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - esac - ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - esac - - fi --echo "$as_me:3006: result: $lt_cv_deplibs_check_method" >&5 --echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method -+test -z "$deplibs_check_method" && deplibs_check_method=unknown - --# Check for command to grab the raw symbol name followed by C symbol from nm. --echo "$as_me:3012: checking command to parse $NM output" >&5 --echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6 --if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- --# These are sane defaults that work on at least a few old systems. --# [They come from Ultrix. What could be older than Ultrix?!! ;)] -- --# Character class describing NM global symbol codes. --symcode='[BCDEGRST]' - --# Regexp to match symbols that can be accessed directly from C. --sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - --# Transform the above into a raw symbol and a C symbol. --symxfrm='\1 \2\3 \3' - --# Transform an extracted symbol line into a proper C declaration --lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} - --# Transform an extracted symbol line into symbol name and symbol address --lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - --# Define system-specific variables. --case $host_os in --aix*) -- symcode='[BCDT]' -- ;; --cygwin* | mingw* | pw32*) -- symcode='[ABCDGISTW]' -- ;; --hpux*) # Its linker distinguishes data from code symbols -- lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -- lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -- ;; --irix*) -- symcode='[BCDEGRST]' -- ;; --solaris* | sysv5*) -- symcode='[BDT]' -- ;; --sysv4) -- symcode='[DFNSTU]' -- ;; --esac -+# Allow CC to be a program name with arguments. -+compiler=$CC - --# Handle CRLF in mingw tool chain --opt_cr= --case $host_os in --mingw*) -- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -- ;; --esac - --# If we're using GNU nm, then use its standard symbol codes. --if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then -- symcode='[ABCDGISTW]' -+# Check whether --enable-libtool-lock was given. -+if test "${enable_libtool_lock+set}" = set; then -+ enableval=$enable_libtool_lock; - fi - --# Try without a prefix undercore, then with it. --for ac_symprfx in "" "_"; do -- -- # Write the raw and C identifiers. --lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" -- -- # Check to see that the pipe works correctly. -- pipe_works=no -- rm -f conftest* -- cat > conftest.$ac_ext <&5 -+# Some flags need to be propagated to the compiler or linker for good -+# libtool support. -+case $host in -+ia64-*-hpux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:3096: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- # Now try to grab the symbols. -- nlist=conftest.nm -- if { (eval echo "$as_me:3100: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 -- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 -+ case `/usr/bin/file conftest.$ac_objext` in -+ *ELF-32*) -+ HPUX_IA64_MODE="32" -+ ;; -+ *ELF-64*) -+ HPUX_IA64_MODE="64" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '#line 4620 "configure"' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:3103: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s "$nlist"; then -- # Try sorting and uniquifying the output. -- if sort "$nlist" | uniq > "$nlist"T; then -- mv -f "$nlist"T "$nlist" -- else -- rm -f "$nlist"T -- fi -- -- # Make sure that we snagged all the symbols we need. -- if egrep ' nm_test_var$' "$nlist" >/dev/null; then -- if egrep ' nm_test_func$' "$nlist" >/dev/null; then -- cat < conftest.$ac_ext --#ifdef __cplusplus --extern "C" { --#endif -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -melf32bsmip" -+ ;; -+ *N32*) -+ LD="${LD-ld} -melf32bmipn32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -melf64bmip" -+ ;; -+ esac -+ else -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac -+ fi -+ fi -+ rm -rf conftest* -+ ;; - --EOF -- # Now generate the symbol file. -- eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext' -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+s390*-*linux*|sparc*-*linux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.o` in -+ *32-bit*) -+ case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_i386_fbsd" -+ ;; -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_i386" -+ ;; -+ ppc64-*linux*|powerpc64-*linux*) -+ LD="${LD-ld} -m elf32ppclinux" -+ ;; -+ s390x-*linux*) -+ LD="${LD-ld} -m elf_s390" -+ ;; -+ sparc64-*linux*) -+ LD="${LD-ld} -m elf32_sparc" -+ ;; -+ esac -+ ;; -+ *64-bit*) -+ case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_x86_64_fbsd" -+ ;; -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_x86_64" -+ ;; -+ ppc*-*linux*|powerpc*-*linux*) -+ LD="${LD-ld} -m elf64ppc" -+ ;; -+ s390*-*linux*) -+ LD="${LD-ld} -m elf64_s390" -+ ;; -+ sparc*-*linux*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; - -- cat <> conftest.$ac_ext --#if defined (__STDC__) && __STDC__ --# define lt_ptr void * --#else --# define lt_ptr char * --# define const --#endif -+*-*-sco3.2v5*) -+ # On SCO OpenServer 5, we need -belf to get full-featured binaries. -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -belf" -+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } -+if test "${lt_cv_cc_needs_belf+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - --/* The mapping between symbol names and symbols. */ --const struct { -- const char *name; -- lt_ptr address; --} --lt_preloaded_symbols[] = -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () - { --EOF -- sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext -- cat <<\EOF >> conftest.$ac_ext -- {0, (lt_ptr) 0} --}; - --#ifdef __cplusplus -+ ; -+ return 0; - } --#endif --EOF -- # Now try linking the two files. -- mv conftest.$ac_objext conftstm.$ac_objext -- save_LIBS="$LIBS" -- save_CFLAGS="$CFLAGS" -- LIBS="conftstm.$ac_objext" -- CFLAGS="$CFLAGS$no_builtin_flag" -- if { (eval echo "$as_me:3155: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- echo "$as_me:3158: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s conftest; then -- pipe_works=yes -- fi -- LIBS="$save_LIBS" -- CFLAGS="$save_CFLAGS" -- else -- echo "cannot find nm_test_func in $nlist" >&5 -- fi -- else -- echo "cannot find nm_test_var in $nlist" >&5 -- fi -- else -- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 -- fi -- else -- echo "$progname: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- fi -- rm -f conftest* conftst* -- -- # Do not use the global_symbol_pipe unless it works. -- if test "$pipe_works" = yes; then -- break -- else -- lt_cv_sys_global_symbol_pipe= -- fi --done -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ lt_cv_cc_needs_belf=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ lt_cv_cc_needs_belf=no - fi - --global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" --if test -z "$lt_cv_sys_global_symbol_pipe"; then -- global_symbol_to_cdecl= -- global_symbol_to_c_name_address= --else -- global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" -- global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" --fi --if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; --then -- echo "$as_me:3199: result: failed" >&5 --echo "${ECHO_T}failed" >&6 --else -- echo "$as_me:3202: result: ok" >&5 --echo "${ECHO_T}ok" >&6 -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ - fi -+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } -+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -+ CFLAGS="$SAVE_CFLAGS" -+ fi -+ ;; -+sparc*-*solaris*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.o` in -+ *64-bit*) -+ case $lt_cv_prog_gnu_ld in -+ yes*) LD="${LD-ld} -m elf64_sparc" ;; -+ *) LD="${LD-ld} -64" ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; - --for ac_header in dlfcn.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:3209: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ -+esac -+ -+need_locks="$enable_libtool_lock" -+ -+ -+ -+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -+if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 3215 "configure" --#include "confdefs.h" --#include <$ac_header> -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+#include -+#include -+#include -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} - _ACEOF --if { (eval echo "$as_me:3219: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:3225: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- eval "$as_ac_Header=yes" -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_header_stdc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_ext --fi --echo "$as_me:3244: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <&5 - -+ ac_cv_header_stdc=no - fi --done - --# Only perform the check for file, if the check method requires it --case $deplibs_check_method in --file_magic*) -- if test "$file_magic_cmd" = '$MAGIC_CMD'; then -- echo "$as_me:3258: checking for ${ac_tool_prefix}file" >&5 --echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 --if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- case $MAGIC_CMD in -- /*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -- ;; -- ?:/*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. -- ;; -- *) -- ac_save_MAGIC_CMD="$MAGIC_CMD" -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="/usr/bin:$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/${ac_tool_prefix}file; then -- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" -- if test -n "$file_magic_test_file"; then -- case $deplibs_check_method in -- "file_magic "*) -- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" -- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -- egrep "$file_magic_regex" > /dev/null; then -- : -- else -- cat <&2 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - --*** Warning: the command libtool uses to detect shared libraries, --*** $file_magic_cmd, produces output that libtool cannot recognize. --*** The result is that libtool may fail to recognize shared libraries --*** as such. This will affect the creation of libtool libraries that --*** depend on shared libraries, but programs linked with such libtool --*** libraries will work regardless of this problem. Nevertheless, you --*** may want to report the problem to your system manager and/or to --*** bug-libtool@gnu.org -+if test $ac_cv_header_stdc = yes; then -+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include - --EOF -- fi ;; -- esac -- fi -- break -- fi -- done -- IFS="$ac_save_ifs" -- MAGIC_CMD="$ac_save_MAGIC_CMD" -- ;; --esac -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "memchr" >/dev/null 2>&1; then -+ : -+else -+ ac_cv_header_stdc=no - fi -+rm -f conftest* - --MAGIC_CMD="$lt_cv_path_MAGIC_CMD" --if test -n "$MAGIC_CMD"; then -- echo "$as_me:3313: result: $MAGIC_CMD" >&5 --echo "${ECHO_T}$MAGIC_CMD" >&6 -+fi -+ -+if test $ac_cv_header_stdc = yes; then -+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "free" >/dev/null 2>&1; then -+ : - else -- echo "$as_me:3316: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ ac_cv_header_stdc=no - fi -+rm -f conftest* - --if test -z "$lt_cv_path_MAGIC_CMD"; then -- if test -n "$ac_tool_prefix"; then -- echo "$as_me:3322: checking for file" >&5 --echo $ECHO_N "checking for file... $ECHO_C" >&6 --if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+ -+if test $ac_cv_header_stdc = yes; then -+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -+ if test "$cross_compiling" = yes; then -+ : - else -- case $MAGIC_CMD in -- /*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -- ;; -- ?:/*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. -- ;; -- *) -- ac_save_MAGIC_CMD="$MAGIC_CMD" -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="/usr/bin:$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/file; then -- lt_cv_path_MAGIC_CMD="$ac_dir/file" -- if test -n "$file_magic_test_file"; then -- case $deplibs_check_method in -- "file_magic "*) -- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" -- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -- egrep "$file_magic_regex" > /dev/null; then -- : -- else -- cat <&2 -- --*** Warning: the command libtool uses to detect shared libraries, --*** $file_magic_cmd, produces output that libtool cannot recognize. --*** The result is that libtool may fail to recognize shared libraries --*** as such. This will affect the creation of libtool libraries that --*** depend on shared libraries, but programs linked with such libtool --*** libraries will work regardless of this problem. Nevertheless, you --*** may want to report the problem to your system manager and/or to --*** bug-libtool@gnu.org -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+#include -+#if ((' ' & 0x0FF) == 0x020) -+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -+#else -+# define ISLOWER(c) \ -+ (('a' <= (c) && (c) <= 'i') \ -+ || ('j' <= (c) && (c) <= 'r') \ -+ || ('s' <= (c) && (c) <= 'z')) -+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -+#endif - --EOF -- fi ;; -- esac -- fi -- break -- fi -- done -- IFS="$ac_save_ifs" -- MAGIC_CMD="$ac_save_MAGIC_CMD" -- ;; -+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -+int -+main () -+{ -+ int i; -+ for (i = 0; i < 256; i++) -+ if (XOR (islower (i), ISLOWER (i)) -+ || toupper (i) != TOUPPER (i)) -+ return 2; -+ return 0; -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ : -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_header_stdc=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - --MAGIC_CMD="$lt_cv_path_MAGIC_CMD" --if test -n "$MAGIC_CMD"; then -- echo "$as_me:3377: result: $MAGIC_CMD" >&5 --echo "${ECHO_T}$MAGIC_CMD" >&6 --else -- echo "$as_me:3380: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ -+fi - fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -+echo "${ECHO_T}$ac_cv_header_stdc" >&6; } -+if test $ac_cv_header_stdc = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define STDC_HEADERS 1 -+_ACEOF - -- else -- MAGIC_CMD=: -- fi - fi - -- fi -- ;; --esac -+# On IRIX 5.3, sys/types and inttypes.h are conflicting. - --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. --set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --echo "$as_me:3396: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_RANLIB+set}" = set; then -+ -+ -+ -+ -+ -+ -+ -+ -+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -+ inttypes.h stdint.h unistd.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test -n "$RANLIB"; then -- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+ -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ eval "$as_ac_Header=yes" - else -- ac_save_IFS=$IFS; IFS=$ac_path_separator --ac_dummy="$PATH" --for ac_dir in $ac_dummy; do -- IFS=$ac_save_IFS -- test -z "$ac_dir" && ac_dir=. -- $as_executable_p "$ac_dir/$ac_word" || continue --ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" --echo "$as_me:3411: found $ac_dir/$ac_word" >&5 --break --done -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ eval "$as_ac_Header=no" - fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --RANLIB=$ac_cv_prog_RANLIB --if test -n "$RANLIB"; then -- echo "$as_me:3419: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6 --else -- echo "$as_me:3422: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - - fi --if test -z "$ac_cv_prog_RANLIB"; then -- ac_ct_RANLIB=$RANLIB -- # Extract the first word of "ranlib", so it can be a program name with args. --set dummy ranlib; ac_word=$2 --echo "$as_me:3431: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_RANLIB"; then -- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. --else -- ac_save_IFS=$IFS; IFS=$ac_path_separator --ac_dummy="$PATH" --for ac_dir in $ac_dummy; do -- IFS=$ac_save_IFS -- test -z "$ac_dir" && ac_dir=. -- $as_executable_p "$ac_dir/$ac_word" || continue --ac_cv_prog_ac_ct_RANLIB="ranlib" --echo "$as_me:3446: found $ac_dir/$ac_word" >&5 --break -+ - done - -- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" -+ -+ -+for ac_header in dlfcn.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no - fi --ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB --if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:3455: result: $ac_ct_RANLIB" >&5 --echo "${ECHO_T}$ac_ct_RANLIB" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes - else -- echo "$as_me:3458: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no - fi - -- RANLIB=$ac_ct_RANLIB -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- RANLIB="$ac_cv_prog_RANLIB" -+ eval "$as_ac_Header=\$ac_header_preproc" - fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. --set dummy ${ac_tool_prefix}strip; ac_word=$2 --echo "$as_me:3470: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_STRIP+set}" = set; then -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+if test -z "$CXX"; then -+ if test -n "$CCC"; then -+ CXX=$CCC -+ else -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test -n "$STRIP"; then -- ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -+ if test -n "$CXX"; then -+ ac_cv_prog_CXX="$CXX" # Let the user override the test. - else -- ac_save_IFS=$IFS; IFS=$ac_path_separator --ac_dummy="$PATH" --for ac_dir in $ac_dummy; do -- IFS=$ac_save_IFS -- test -z "$ac_dir" && ac_dir=. -- $as_executable_p "$ac_dir/$ac_word" || continue --ac_cv_prog_STRIP="${ac_tool_prefix}strip" --echo "$as_me:3485: found $ac_dir/$ac_word" >&5 --break -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done - done -+IFS=$as_save_IFS - - fi - fi --STRIP=$ac_cv_prog_STRIP --if test -n "$STRIP"; then -- echo "$as_me:3493: result: $STRIP" >&5 --echo "${ECHO_T}$STRIP" >&6 -+CXX=$ac_cv_prog_CXX -+if test -n "$CXX"; then -+ { echo "$as_me:$LINENO: result: $CXX" >&5 -+echo "${ECHO_T}$CXX" >&6; } - else -- echo "$as_me:3496: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ -+ test -n "$CXX" && break -+ done - fi --if test -z "$ac_cv_prog_STRIP"; then -- ac_ct_STRIP=$STRIP -- # Extract the first word of "strip", so it can be a program name with args. --set dummy strip; ac_word=$2 --echo "$as_me:3505: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -+if test -z "$CXX"; then -+ ac_ct_CXX=$CXX -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test -n "$ac_ct_STRIP"; then -- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -+ if test -n "$ac_ct_CXX"; then -+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. - else -- ac_save_IFS=$IFS; IFS=$ac_path_separator --ac_dummy="$PATH" --for ac_dir in $ac_dummy; do -- IFS=$ac_save_IFS -- test -z "$ac_dir" && ac_dir=. -- $as_executable_p "$ac_dir/$ac_word" || continue --ac_cv_prog_ac_ct_STRIP="strip" --echo "$as_me:3520: found $ac_dir/$ac_word" >&5 --break -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_CXX="$ac_prog" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi - done -+done -+IFS=$as_save_IFS - -- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" --fi - fi --ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP --if test -n "$ac_ct_STRIP"; then -- echo "$as_me:3529: result: $ac_ct_STRIP" >&5 --echo "${ECHO_T}$ac_ct_STRIP" >&6 --else -- echo "$as_me:3532: result: no" >&5 --echo "${ECHO_T}no" >&6 - fi -- -- STRIP=$ac_ct_STRIP -+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -+if test -n "$ac_ct_CXX"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -+echo "${ECHO_T}$ac_ct_CXX" >&6; } - else -- STRIP="$ac_cv_prog_STRIP" -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - --enable_dlopen=no --enable_win32_dll=no - --# Check whether --enable-libtool-lock or --disable-libtool-lock was given. --if test "${enable_libtool_lock+set}" = set; then -- enableval="$enable_libtool_lock" -+ test -n "$ac_ct_CXX" && break -+done - --fi; --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ if test "x$ac_ct_CXX" = x; then -+ CXX="g++" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CXX=$ac_ct_CXX -+ fi -+fi - --# Some flags need to be propagated to the compiler or linker for good --# libtool support. --case $host in --*-*-irix6*) -- # Find out which ABI we are using. -- echo '#line 3556 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:3557: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:3560: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -32" -- ;; -- *N32*) -- LD="${LD-ld} -n32" -- ;; -- *64-bit*) -- LD="${LD-ld} -64" -- ;; -- esac - fi -- rm -rf conftest* -- ;; -+fi -+# Provide some information about the compiler. -+echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -+ac_compiler=`set X $ac_compile; echo $2` -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } - --*-*-sco3.2v5*) -- # On SCO OpenServer 5, we need -belf to get full-featured binaries. -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -belf" -- echo "$as_me:3581: checking whether the C compiler needs -belf" >&5 --echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 --if test "${lt_cv_cc_needs_belf+set}" = set; then -+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } -+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- -- ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- cat >conftest.$ac_ext <<_ACEOF --#line 3594 "configure" --#include "confdefs.h" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - int - main () - { -+#ifndef __GNUC__ -+ choke me -+#endif - - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:3606: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:3609: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:3612: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:3615: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- lt_cv_cc_needs_belf=yes -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --lt_cv_cc_needs_belf=no --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -- ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_compiler_gnu=no - fi --echo "$as_me:3631: result: $lt_cv_cc_needs_belf" >&5 --echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 -- if test x"$lt_cv_cc_needs_belf" != x"yes"; then -- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -- CFLAGS="$SAVE_CFLAGS" -- fi -- ;; -- --esac - --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --Xsed='sed -e s/^X//' --sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - --# Same as above, but do not quote variable references. --double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } -+GXX=`test $ac_compiler_gnu = yes && echo yes` -+ac_test_CXXFLAGS=${CXXFLAGS+set} -+ac_save_CXXFLAGS=$CXXFLAGS -+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cxx_g+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag -+ ac_cxx_werror_flag=yes -+ ac_cv_prog_cxx_g=no -+ CXXFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --# Sed substitution to delay expansion of an escaped shell variable in a --# double_quote_subst'ed string. --delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+int -+main () -+{ - --# Constants: --rm="rm -f" -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cxx_g=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Global variables: --default_ofile=libtool --can_build_shared=yes -+ CXXFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --# All known linkers require a `.a' archive for static linking (except M$VC, --# which needs '.lib'). --libext=a --ltmain="$ac_aux_dir/ltmain.sh" --ofile="$default_ofile" --with_gnu_ld="$lt_cv_prog_gnu_ld" --need_locks="$enable_libtool_lock" -+int -+main () -+{ - --old_CC="$CC" --old_CFLAGS="$CFLAGS" -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ : -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Set sane defaults for various variables --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --test -z "$AS" && AS=as --test -z "$CC" && CC=cc --test -z "$DLLTOOL" && DLLTOOL=dlltool --test -z "$LD" && LD=ld --test -z "$LN_S" && LN_S="ln -s" --test -z "$MAGIC_CMD" && MAGIC_CMD=file --test -z "$NM" && NM=nm --test -z "$OBJDUMP" && OBJDUMP=objdump --test -z "$RANLIB" && RANLIB=: --test -z "$STRIP" && STRIP=: --test -z "$ac_objext" && ac_objext=o -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+ CXXFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --if test x"$host" != x"$build"; then -- ac_tool_prefix=${host_alias}- --else -- ac_tool_prefix= --fi -+int -+main () -+{ - --# Transform linux* to *-*-linux-gnu*, to support old configure scripts. --case $host_os in --linux-gnu*) ;; --linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cxx_g=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --case $host_os in --aix3*) -- # AIX sometimes has problems with the GCC collect2 program. For some -- # reason, if we set the COLLECT_NAMES environment variable, the problems -- # vanish in a puff of smoke. -- if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES -- fi -- ;; --esac - --# Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' --old_postinstall_cmds='chmod 644 $oldlib' --old_postuninstall_cmds= -+fi - --if test -n "$RANLIB"; then -- case $host_os in -- openbsd*) -- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" -- ;; -- *) -- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" -- ;; -- esac -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - --# Allow CC to be a program name with arguments. --set dummy $CC --compiler="$2" -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi - --echo "$as_me:3731: checking for objdir" >&5 --echo $ECHO_N "checking for objdir... $ECHO_C" >&6 --rm -f .libs 2>/dev/null --mkdir .libs 2>/dev/null --if test -d .libs; then -- objdir=.libs -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } -+if test "$ac_test_CXXFLAGS" = set; then -+ CXXFLAGS=$ac_save_CXXFLAGS -+elif test $ac_cv_prog_cxx_g = yes; then -+ if test "$GXX" = yes; then -+ CXXFLAGS="-g -O2" -+ else -+ CXXFLAGS="-g" -+ fi - else -- # MS-DOS does not allow filenames that begin with a dot. -- objdir=_libs -+ if test "$GXX" = yes; then -+ CXXFLAGS="-O2" -+ else -+ CXXFLAGS= -+ fi - fi --rmdir .libs 2>/dev/null --echo "$as_me:3742: result: $objdir" >&5 --echo "${ECHO_T}$objdir" >&6 -+ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - --# Check whether --with-pic or --without-pic was given. --if test "${with_pic+set}" = set; then -- withval="$with_pic" -- pic_mode="$withval" --else -- pic_mode=default --fi; --test -z "$pic_mode" && pic_mode=default -+depcc="$CXX" am_compiler_list= - --# We assume here that the value for lt_cv_prog_cc_pic will not be cached --# in isolation, and that seeing it set (from the cache) indicates that --# the associated values are set (in the cache) correctly too. --echo "$as_me:3757: checking for $compiler option to produce PIC" >&5 --echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 --if test "${lt_cv_prog_cc_pic+set}" = set; then -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_cv_prog_cc_pic= -- lt_cv_prog_cc_shlib= -- lt_cv_prog_cc_wl= -- lt_cv_prog_cc_static= -- lt_cv_prog_cc_no_builtin= -- lt_cv_prog_cc_can_build_shared=$can_build_shared -+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub - -- if test "$GCC" = yes; then -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-static' -+ am_cv_CXX_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -- case $host_os in -- aix*) -- # Below there is a dirty hack to force normal static linking with -ldl -- # The problem is because libdl dynamically linked with both libc and -- # libC (AIX C++ library), which obviously doesn't included in libraries -- # list by gcc. This cause undefined symbols with -static flags. -- # This hack allows C programs to be linked with "-static -ldl", but -- # not sure about C++ programs. -- lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" -- ;; -- amigaos*) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' -- ;; -- beos* | irix5* | irix6* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; -- darwin* | rhapsody*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- lt_cv_prog_cc_pic='-fno-common' -- ;; -- cygwin* | mingw* | pw32* | os2*) -- # This hack is so that the source file can tell whether it is being -- # built for inclusion in a dll (and should export symbols for example). -- lt_cv_prog_cc_pic='-DDLL_EXPORT' -- ;; -- sysv4*MP*) -- if test -d /usr/nec; then -- lt_cv_prog_cc_pic=-Kconform_pic -- fi -- ;; -- *) -- lt_cv_prog_cc_pic='-fPIC' -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi - ;; -+ none) break ;; - esac -- else -- # PORTME Check for PIC flags for the system compiler. -- case $host_os in -- aix3* | aix4* | aix5*) -- lt_cv_prog_cc_wl='-Wl,' -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- lt_cv_prog_cc_static='-Bstatic' -- else -- lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_CXX_dependencies_compiler_type=$depmode -+ break - fi -- ;; -+ fi -+ done - -- hpux9* | hpux10* | hpux11*) -- # Is there a better lt_cv_prog_cc_static that works with the bundled CC? -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive" -- lt_cv_prog_cc_pic='+Z' -- ;; -+ cd .. -+ rm -rf conftest.dir -+else -+ am_cv_CXX_dependencies_compiler_type=none -+fi - -- irix5* | irix6*) -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-non_shared' -- # PIC (with -KPIC) is the default. -- ;; -+fi -+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } -+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - -- cygwin* | mingw* | pw32* | os2*) -- # This hack is so that the source file can tell whether it is being -- # built for inclusion in a dll (and should export symbols for example). -- lt_cv_prog_cc_pic='-DDLL_EXPORT' -- ;; -+ if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then -+ am__fastdepCXX_TRUE= -+ am__fastdepCXX_FALSE='#' -+else -+ am__fastdepCXX_TRUE='#' -+ am__fastdepCXX_FALSE= -+fi - -- newsos6) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- ;; - -- osf3* | osf4* | osf5*) -- # All OSF/1 code is PIC. -- lt_cv_prog_cc_wl='-Wl,' -- lt_cv_prog_cc_static='-non_shared' -- ;; - -- sco3.2v5*) -- lt_cv_prog_cc_pic='-Kpic' -- lt_cv_prog_cc_static='-dn' -- lt_cv_prog_cc_shlib='-belf' -- ;; - -- solaris*) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- lt_cv_prog_cc_wl='-Wl,' -- ;; -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } -+if test -z "$CXXCPP"; then -+ if test "${ac_cv_prog_CXXCPP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # Double quotes because CXXCPP needs to be expanded -+ for CXXCPP in "$CXX -E" "/lib/cpp" -+ do -+ ac_preproc_ok=false -+for ac_cxx_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ : -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- sunos4*) -- lt_cv_prog_cc_pic='-PIC' -- lt_cv_prog_cc_static='-Bstatic' -- lt_cv_prog_cc_wl='-Qoption ld ' -- ;; -+ # Broken: fails on valid input. -+continue -+fi - -- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- lt_cv_prog_cc_pic='-KPIC' -- lt_cv_prog_cc_static='-Bstatic' -- if test "x$host_vendor" = xsni; then -- lt_cv_prog_cc_wl='-LD' -- else -- lt_cv_prog_cc_wl='-Wl,' -- fi -- ;; -+rm -f conftest.err conftest.$ac_ext - -- uts4*) -- lt_cv_prog_cc_pic='-pic' -- lt_cv_prog_cc_static='-Bstatic' -- ;; -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ # Broken: success on invalid input. -+continue -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- sysv4*MP*) -- if test -d /usr/nec ;then -- lt_cv_prog_cc_pic='-Kconform_pic' -- lt_cv_prog_cc_static='-Bstatic' -- fi -- ;; -+ # Passes both tests. -+ac_preproc_ok=: -+break -+fi - -- *) -- lt_cv_prog_cc_can_build_shared=no -- ;; -- esac -- fi -+rm -f conftest.err conftest.$ac_ext - -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ break - fi - --if test -z "$lt_cv_prog_cc_pic"; then -- echo "$as_me:3904: result: none" >&5 --echo "${ECHO_T}none" >&6 --else -- echo "$as_me:3907: result: $lt_cv_prog_cc_pic" >&5 --echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6 -+ done -+ ac_cv_prog_CXXCPP=$CXXCPP - -- # Check to make sure the pic_flag actually works. -- echo "$as_me:3911: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 --echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6 -- if test "${lt_cv_prog_cc_pic_works+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+ CXXCPP=$ac_cv_prog_CXXCPP - else -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" -- cat >conftest.$ac_ext <<_ACEOF --#line 3919 "configure" --#include "confdefs.h" -+ ac_cv_prog_CXXCPP=$CXXCPP -+fi -+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 -+echo "${ECHO_T}$CXXCPP" >&6; } -+ac_preproc_ok=false -+for ac_cxx_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ : -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --int --main () --{ -+ # Broken: fails on valid input. -+continue -+fi - -- ; -- return 0; --} -+rm -f conftest.err conftest.$ac_ext -+ -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:3931: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:3934: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:3937: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? -- echo "$as_me:3940: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- case $host_os in -- hpux9* | hpux10* | hpux11*) -- # On HP-UX, both CC and GCC only warn that PIC is supported... then -- # they create non-PIC objects. So, if there were any warnings, we -- # assume that PIC is not supported. -- if test -s conftest.err; then -- lt_cv_prog_cc_pic_works=no -- else -- lt_cv_prog_cc_pic_works=yes -- fi -- ;; -- *) -- lt_cv_prog_cc_pic_works=yes -- ;; -- esac -- -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ # Broken: success on invalid input. -+continue - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -- lt_cv_prog_cc_pic_works=no -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ # Passes both tests. -+ac_preproc_ok=: -+break - fi --rm -f conftest.$ac_objext conftest.$ac_ext -- CFLAGS="$save_CFLAGS" - -+rm -f conftest.err conftest.$ac_ext -+ -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ : -+else -+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -+See \`config.log' for more details." >&5 -+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } - fi - -- if test "X$lt_cv_prog_cc_pic_works" = Xno; then -- lt_cv_prog_cc_pic= -- lt_cv_prog_cc_can_build_shared=no -- else -- lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" -- fi -+ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -- echo "$as_me:3976: result: $lt_cv_prog_cc_pic_works" >&5 --echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6 - fi - --# Check for any special shared library compilation flags. --if test -n "$lt_cv_prog_cc_shlib"; then -- { echo "$as_me:3982: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 --echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} -- if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : -- else -- { echo "$as_me:3986: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 --echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} -- lt_cv_prog_cc_can_build_shared=no -- fi --fi - --echo "$as_me:3992: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 --echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6 --if test "${lt_cv_prog_cc_static_works+set}" = set; then -+ac_ext=f -+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_f77_compiler_gnu -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_cv_prog_cc_static_works=no -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" -- cat >conftest.$ac_ext <<_ACEOF --#line 4001 "configure" --#include "confdefs.h" -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:4013: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:4016: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:4019: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:4022: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- lt_cv_prog_cc_static_works=yes -+ if test -n "$F77"; then -+ ac_cv_prog_F77="$F77" # Let the user override the test. - else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_F77="$ac_tool_prefix$ac_prog" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS - - fi -+fi -+F77=$ac_cv_prog_F77 -+if test -n "$F77"; then -+ { echo "$as_me:$LINENO: result: $F77" >&5 -+echo "${ECHO_T}$F77" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - --# Belt *and* braces to stop my trousers falling down: --test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= --echo "$as_me:4036: result: $lt_cv_prog_cc_static_works" >&5 --echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6 -- --pic_flag="$lt_cv_prog_cc_pic" --special_shlib_compile_flags="$lt_cv_prog_cc_shlib" --wl="$lt_cv_prog_cc_wl" --link_static_flag="$lt_cv_prog_cc_static" --no_builtin_flag="$lt_cv_prog_cc_no_builtin" --can_build_shared="$lt_cv_prog_cc_can_build_shared" - --# Check to see if options -o and -c are simultaneously supported by compiler --echo "$as_me:4047: checking if $compiler supports -c -o file.$ac_objext" >&5 --echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 --if test "${lt_cv_compiler_c_o+set}" = set; then -+ test -n "$F77" && break -+ done -+fi -+if test -z "$F77"; then -+ ac_ct_F77=$F77 -+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- --$rm -r conftest 2>/dev/null --mkdir conftest --cd conftest --echo "int some_variable = 0;" > conftest.$ac_ext --mkdir out --# According to Tom Tromey, Ian Lance Taylor reported there are C compilers --# that will create temporary files in the current directory regardless of --# the output directory. Thus, making CWD read-only will cause this test --# to fail, enabling locking or at least warning the user not to do parallel --# builds. --chmod -w . --save_CFLAGS="$CFLAGS" --CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" --compiler_c_o=no --if { (eval echo configure:4067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s out/conftest.err; then -- lt_cv_compiler_c_o=no -- else -- lt_cv_compiler_c_o=yes -+ if test -n "$ac_ct_F77"; then -+ ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_F77="$ac_prog" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 - fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_F77=$ac_cv_prog_ac_ct_F77 -+if test -n "$ac_ct_F77"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -+echo "${ECHO_T}$ac_ct_F77" >&6; } - else -- # Append any errors to the config.log. -- cat out/conftest.err 1>&5 -- lt_cv_compiler_c_o=no -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi --CFLAGS="$save_CFLAGS" --chmod u+w . --$rm conftest* out/* --rmdir out --cd .. --rmdir conftest --$rm -r conftest 2>/dev/null - --fi - --compiler_c_o=$lt_cv_compiler_c_o --echo "$as_me:4091: result: $compiler_c_o" >&5 --echo "${ECHO_T}$compiler_c_o" >&6 -+ test -n "$ac_ct_F77" && break -+done - --if test x"$compiler_c_o" = x"yes"; then -- # Check to see if we can write to a .lo -- echo "$as_me:4096: checking if $compiler supports -c -o file.lo" >&5 --echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6 -- if test "${lt_cv_compiler_o_lo+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -+ if test "x$ac_ct_F77" = x; then -+ F77="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ F77=$ac_ct_F77 -+ fi -+fi - -- lt_cv_compiler_o_lo=no -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -c -o conftest.lo" -- save_objext="$ac_objext" -- ac_objext=lo -- cat >conftest.$ac_ext <<_ACEOF --#line 4108 "configure" --#include "confdefs.h" - --int --main () --{ --int some_variable = 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:4120: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+# Provide some information about the compiler. -+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 -+ac_compiler=`set X $ac_compile; echo $2` -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? -- echo "$as_me:4123: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:4126: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? -- echo "$as_me:4129: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s conftest.err; then -- lt_cv_compiler_o_lo=no -- else -- lt_cv_compiler_o_lo=yes -- fi -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+rm -f a.out -+ -+# If we don't use `.F' as extension, the preprocessor is not run on the -+# input file. (Note that this only needs to work for GNU compilers.) -+ac_save_ext=$ac_ext -+ac_ext=F -+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } -+if test "${ac_cv_f77_compiler_gnu+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+ program main -+#ifndef __GNUC__ -+ choke me -+#endif - -+ end -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- ac_objext="$save_objext" -- CFLAGS="$save_CFLAGS" -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_compiler_gnu=no - fi - -- compiler_o_lo=$lt_cv_compiler_o_lo -- echo "$as_me:4150: result: $compiler_o_lo" >&5 --echo "${ECHO_T}$compiler_o_lo" >&6 --else -- compiler_o_lo=no --fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ac_cv_f77_compiler_gnu=$ac_compiler_gnu - --# Check to see if we can do hard links to lock some files if needed --hard_links="nottested" --if test "$compiler_c_o" = no && test "$need_locks" != no; then -- # do not overwrite the value of need_locks provided by the user -- echo "$as_me:4160: checking if we can lock with hard links" >&5 --echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 -- hard_links=yes -- $rm conftest* -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- touch conftest.a -- ln conftest.a conftest.b 2>&5 || hard_links=no -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- echo "$as_me:4168: result: $hard_links" >&5 --echo "${ECHO_T}$hard_links" >&6 -- if test "$hard_links" = no; then -- { echo "$as_me:4171: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 --echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -- need_locks=warn -- fi --else -- need_locks=no - fi -+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } -+ac_ext=$ac_save_ext -+ac_test_FFLAGS=${FFLAGS+set} -+ac_save_FFLAGS=$FFLAGS -+FFLAGS= -+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } -+if test "${ac_cv_prog_f77_g+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ FFLAGS=-g -+cat >conftest.$ac_ext <<_ACEOF -+ program main - --if test "$GCC" = yes; then -- # Check to see if options -fno-rtti -fno-exceptions are supported by compiler -- echo "$as_me:4181: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 --echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 -- echo "int some_variable = 0;" > conftest.$ac_ext -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" -- compiler_rtti_exceptions=no -- cat >conftest.$ac_ext <<_ACEOF --#line 4188 "configure" --#include "confdefs.h" -- --int --main () --{ --int some_variable = 0; -- ; -- return 0; --} -+ end - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:4200: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:4203: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:4206: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:4209: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s conftest.err; then -- compiler_rtti_exceptions=no -- else -- compiler_rtti_exceptions=yes -- fi -- -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_f77_g=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_prog_f77_g=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -- CFLAGS="$save_CFLAGS" -- echo "$as_me:4225: result: $compiler_rtti_exceptions" >&5 --echo "${ECHO_T}$compiler_rtti_exceptions" >&6 - -- if test "$compiler_rtti_exceptions" = "yes"; then -- no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } -+if test "$ac_test_FFLAGS" = set; then -+ FFLAGS=$ac_save_FFLAGS -+elif test $ac_cv_prog_f77_g = yes; then -+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then -+ FFLAGS="-g -O2" -+ else -+ FFLAGS="-g" -+ fi -+else -+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then -+ FFLAGS="-O2" - else -- no_builtin_flag=' -fno-builtin' -+ FFLAGS= - fi - fi - --# See if the linker supports building shared libraries. --echo "$as_me:4236: checking whether the linker ($LD) supports shared libraries" >&5 --echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6 -- --allow_undefined_flag= --no_undefined_flag= --need_lib_prefix=unknown --need_version=unknown --# when you set need_version to no, make sure it does not cause -set_version --# flags to be left without arguments --archive_cmds= --archive_expsym_cmds= --old_archive_from_new_cmds= --old_archive_from_expsyms_cmds= --export_dynamic_flag_spec= --whole_archive_flag_spec= --thread_safe_flag_spec= --hardcode_into_libs=no --hardcode_libdir_flag_spec= --hardcode_libdir_separator= --hardcode_direct=no --hardcode_minus_L=no --hardcode_shlibpath_var=unsupported --runpath_var= --link_all_deplibs=unknown --always_export_symbols=no --export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols' --# include_expsyms should be a list of space-separated symbols to be *always* --# included in the symbol list --include_expsyms= --# exclude_expsyms can be an egrep regular expression of symbols to exclude --# it will be wrapped by ` (' and `)$', so one must not match beginning or --# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', --# as well as any symbol that contains `d'. --exclude_expsyms="_GLOBAL_OFFSET_TABLE_" --# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out --# platforms (ab)use it in PIC code, but their linkers get confused if --# the symbol is explicitly referenced. Since portable code cannot --# rely on this symbol name, it's probably fine to never include it in --# preloaded symbol tables. --extract_expsyms_cmds= -+G77=`test $ac_compiler_gnu = yes && echo yes` -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - --case $host_os in --cygwin* | mingw* | pw32*) -- # FIXME: the MSVC++ port hasn't been tested in a loooong time -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- if test "$GCC" != yes; then -- with_gnu_ld=no -- fi -- ;; --openbsd*) -- with_gnu_ld=no -- ;; --esac - --ld_shlibs=yes --if test "$with_gnu_ld" = yes; then -- # If archive_cmds runs LD, not CC, wlarc should be empty -- wlarc='${wl}' - -- # See if GNU ld supports shared libraries. -- case $host_os in -- aix3* | aix4* | aix5*) -- # On AIX, the GNU linker is very broken -- # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available. -- ld_shlibs=no -- cat <&2 -+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! - --*** Warning: the GNU linker, at least up to release 2.9.1, is reported --*** to be unable to reliably create shared libraries on AIX. --*** Therefore, libtool is disabling shared libraries support. If you --*** really care for shared libraries, you may want to modify your PATH --*** so that a non-GNU linker is found, and then restart. -+# find the maximum length of command line arguments -+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } -+if test "${lt_cv_sys_max_cmd_len+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ i=0 -+ teststring="ABCD" - --EOF -+ case $build_os in -+ msdosdjgpp*) -+ # On DJGPP, this test can blow up pretty badly due to problems in libc -+ # (any single argument exceeding 2000 bytes causes a buffer overrun -+ # during glob expansion). Even if it were fixed, the result of this -+ # check would be larger than it should be. -+ lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - -- amigaos*) -- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- -- # Samuel A. Falvo II reports -- # that the semantics of dynamic libraries on AmigaOS, at least up -- # to version 4, is to share data among multiple programs linked -- # with the same dynamic library. Since this doesn't match the -- # behavior of shared libraries on other platforms, we can use -- # them. -- ld_shlibs=no -+ gnu*) -+ # Under GNU Hurd, this test is not required because there is -+ # no limit to the length of command line arguments. -+ # Libtool will interpret -1 as no limit whatsoever -+ lt_cv_sys_max_cmd_len=-1; - ;; - -- beos*) -- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- allow_undefined_flag=unsupported -- # Joseph Beckenbach says some releases of gcc -- # support --undefined. This deserves some investigation. FIXME -- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- else -- ld_shlibs=no -- fi -+ cygwin* | mingw*) -+ # On Win9x/ME, this test blows up -- it succeeds, but takes -+ # about 5 minutes as the teststring grows exponentially. -+ # Worse, since 9x/ME are not pre-emptively multitasking, -+ # you end up with a "frozen" computer, even though with patience -+ # the test eventually succeeds (with a max line length of 256k). -+ # Instead, let's just punt: use the minimum linelength reported by -+ # all of the supported platforms: 8192 (on NT/2K/XP). -+ lt_cv_sys_max_cmd_len=8192; - ;; - -- cygwin* | mingw* | pw32*) -- # hardcode_libdir_flag_spec is actually meaningless, as there is -- # no search path for DLLs. -- hardcode_libdir_flag_spec='-L$libdir' -- allow_undefined_flag=unsupported -- always_export_symbols=yes -- -- extract_expsyms_cmds='test -f $output_objdir/impgen.c || \ -- sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~ -- test -f $output_objdir/impgen.exe || (cd $output_objdir && \ -- if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \ -- else $CC -o impgen impgen.c ; fi)~ -- $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' -- -- old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' -- -- # cygwin and mingw dlls have different entry points and sets of symbols -- # to exclude. -- # FIXME: what about values for MSVC? -- dll_entry=__cygwin_dll_entry@12 -- dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~ -- case $host_os in -- mingw*) -- # mingw values -- dll_entry=_DllMainCRTStartup@12 -- dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~ -- ;; -- esac -+ amigaos*) -+ # On AmigaOS with pdksh, this test takes hours, literally. -+ # So we just punt and use a minimum line length of 8192. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; - -- # mingw and cygwin differ, and it's simplest to just exclude the union -- # of the two symbol sets. -- dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12 -- -- # recent cygwin and mingw systems supply a stub DllMain which the user -- # can override, but on older systems we have to supply one (in ltdll.c) -- if test "x$lt_cv_need_dllmain" = "xyes"; then -- ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " -- ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ -- test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' -+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else -- ltdll_obj= -- ltdll_cmds= -+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi -+ # And add a safety zone -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ ;; - -- # Extract the symbol export list from an `--export-all' def file, -- # then regenerate the def file from the symbol export list, so that -- # the compiled dll only exports the symbol export list. -- # Be careful not to strip the DATA tag left be newer dlltools. -- export_symbols_cmds="$ltdll_cmds"' -- $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ -- sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' -- -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is. -- # If DATA tags from a recent dlltool are present, honour them! -- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname-def; -- else -- echo EXPORTS > $output_objdir/$soname-def; -- _lt_hint=1; -- cat $export_symbols | while read symbol; do -- set dummy \$symbol; -- case \$# in -- 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; -- *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; -- esac; -- _lt_hint=`expr 1 + \$_lt_hint`; -- done; -- fi~ -- '"$ltdll_cmds"' -- $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ -- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~ -- $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ -- $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~ -- $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags' -+ interix*) -+ # We know the value 262144 and hardcode it with a safety zone (like BSD) -+ lt_cv_sys_max_cmd_len=196608 - ;; - -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -- wlarc= -- else -- archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ osf*) -+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -+ # nice to cause kernel panics so lets avoid the loop below. -+ # First set a reasonable default. -+ lt_cv_sys_max_cmd_len=16384 -+ # -+ if test -x /sbin/sysconfig; then -+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -+ *1*) lt_cv_sys_max_cmd_len=-1 ;; -+ esac - fi - ;; -- -- solaris* | sysv5*) -- if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then -- ld_shlibs=no -- cat <&2 -- --*** Warning: The releases 2.8.* of the GNU linker cannot reliably --*** create shared libraries on Solaris systems. Therefore, libtool --*** is disabling shared libraries support. We urge you to upgrade GNU --*** binutils to release 2.9.1 or newer. Another option is to modify --*** your PATH or compiler configuration so that the native linker is --*** used, and then restart. -- --EOF -- elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ sco3.2v5*) -+ lt_cv_sys_max_cmd_len=102400 -+ ;; -+ sysv5* | sco5v6* | sysv4.2uw2*) -+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -+ if test -n "$kargmax"; then -+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` - else -- ld_shlibs=no -+ lt_cv_sys_max_cmd_len=32768 - fi - ;; -- -- sunos4*) -- archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- wlarc= -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -- - *) -- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -+ if test -n "$lt_cv_sys_max_cmd_len"; then -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else -- ld_shlibs=no -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ = "XX$teststring") >/dev/null 2>&1 && -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ teststring= -+ # Add a significant safety factor because C++ compilers can tack on massive -+ # amounts of additional arguments before passing them to the linker. -+ # It appears as though 1/2 is a usable value. -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac - -- if test "$ld_shlibs" = yes; then -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec='${wl}--export-dynamic' -- case $host_os in -- cygwin* | mingw* | pw32*) -- # dlltool doesn't understand --whole-archive et. al. -- whole_archive_flag_spec= -- ;; -- *) -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec= -- fi -- ;; -- esac -- fi -+fi -+ -+if test -n $lt_cv_sys_max_cmd_len ; then -+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } - else -- # PORTME fill in a description of your system's linker (not GNU ld) -- case $host_os in -- aix3*) -- allow_undefined_flag=unsupported -- always_export_symbols=yes -- archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -- # Note: this linker hardcodes the directories in LIBPATH if there -- # are no directories specified by -L. -- hardcode_minus_L=yes -- if test "$GCC" = yes && test -z "$link_static_flag"; then -- # Neither direct hardcoding nor static linking is supported with a -- # broken collect2. -- hardcode_direct=unsupported -- fi -- ;; -+ { echo "$as_me:$LINENO: result: none" >&5 -+echo "${ECHO_T}none" >&6; } -+fi - -- aix4* | aix5*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- aix_use_runtimelinking=no - -- # Test if we are trying to use run time linking or normal -- # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -- for ld_flag in $LDFLAGS; do -- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -- aix_use_runtimelinking=yes -- break -- fi -- done -- esac - -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi - -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - -- hardcode_direct=yes -- archive_cmds='' -- hardcode_libdir_separator=':' -- if test "$GCC" = yes; then -- case $host_os in aix4.[012]|aix4.[012].*) -- collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- hardcode_direct=yes -- else -- # We have old collect2 -- hardcode_direct=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- hardcode_minus_L=yes -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_libdir_separator= -- fi -- esac -+# Check for command to grab the raw symbol name followed by C symbol from nm. -+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } -+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else - -- shared_flag='-shared' -- else -- # not using gcc -- if test "$host_cpu" = ia64; then -- shared_flag='${wl}-G' -- else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -- fi -- fi -- fi -+# These are sane defaults that work on at least a few old systems. -+# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -- # It seems that -bexpall can do strange things, so it is better to -- # generate a list of symbols to export. -- always_export_symbols=yes -- if test "$aix_use_runtimelinking" = yes; then -- # Warning - without using the other runtime loading flags (-brtl), -- # -berok will link without error, but may produce a broken library. -- allow_undefined_flag='-berok' -- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' -- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -- if test "$host_cpu" = ia64; then -- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -- allow_undefined_flag="-z nodefs" -- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" -- else -- hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- allow_undefined_flag='${wl}-berok' -- # This is a bit strange, but is similar to how AIX traditionally builds -- # it's shared libraries. -- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' -- fi -- fi -- ;; -+# Character class describing NM global symbol codes. -+symcode='[BCDEGRST]' - -- amigaos*) -- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- # see comment about different semantics on the GNU ld section -- ld_shlibs=no -- ;; -+# Regexp to match symbols that can be accessed directly from C. -+sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - -- cygwin* | mingw* | pw32*) -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- # hardcode_libdir_flag_spec is actually meaningless, as there is -- # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- ;; -- -- darwin* | rhapsody*) -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag='-undefined suppress' -- ;; -- *) # Darwin 1.3 on -- allow_undefined_flag='-flat_namespace -undefined suppress' -- ;; -- esac -- # FIXME: Relying on posixy $() will cause problems for -- # cross-compilation, but unfortunately the echo tests do not -- # yet detect zsh echo's removal of \ escapes. -- archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' -- # We need to add '_' to the symbols in $export_symbols first -- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- whole_archive_flag_spec='-all_load $convenience' -- ;; -- -- freebsd1*) -- ld_shlibs=no -- ;; -- -- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -- # support. Future versions do this automatically, but an explicit c++rt0.o -- # does not break anything, and helps significantly (at the cost of a little -- # extra space). -- freebsd2.2*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+# Transform an extracted symbol line into a proper C declaration -+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" - -- # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_minus_L=yes -- hardcode_shlibpath_var=no -- ;; -- -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+# Transform an extracted symbol line into symbol name and symbol address -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - -- hpux9* | hpux10* | hpux11*) -- case $host_os in -- hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;; -- *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; -- esac -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator=: -- hardcode_direct=yes -- hardcode_minus_L=yes # Not in the search PATH, but as the default -- # location of the library. -- export_dynamic_flag_spec='${wl}-E' -- ;; -+# Define system-specific variables. -+case $host_os in -+aix*) -+ symcode='[BCDT]' -+ ;; -+cygwin* | mingw* | pw32*) -+ symcode='[ABCDGISTW]' -+ ;; -+hpux*) # Its linker distinguishes data from code symbols -+ if test "$host_cpu" = ia64; then -+ symcode='[ABCDEGRST]' -+ fi -+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ ;; -+linux* | k*bsd*-gnu) -+ if test "$host_cpu" = ia64; then -+ symcode='[ABCDGIRSTW]' -+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ fi -+ ;; -+irix* | nonstopux*) -+ symcode='[BCDEGRST]' -+ ;; -+osf*) -+ symcode='[BCDEGQRST]' -+ ;; -+solaris*) -+ symcode='[BDRT]' -+ ;; -+sco3.2v5*) -+ symcode='[DT]' -+ ;; -+sysv4.2uw2*) -+ symcode='[DT]' -+ ;; -+sysv5* | sco5v6* | unixware* | OpenUNIX*) -+ symcode='[ABDT]' -+ ;; -+sysv4) -+ symcode='[DFNSTU]' -+ ;; -+esac - -- irix5* | irix6*) -- if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- fi -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- link_all_deplibs=yes -- ;; -+# Handle CRLF in mingw tool chain -+opt_cr= -+case $build_os in -+mingw*) -+ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -+ ;; -+esac - -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -- else -- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -- fi -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+# If we're using GNU nm, then use its standard symbol codes. -+case `$NM -V 2>&1` in -+*GNU* | *'with BFD'*) -+ symcode='[ABCDGIRSTW]' ;; -+esac - -- newsos6) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- hardcode_shlibpath_var=no -- ;; -+# Try without a prefix undercore, then with it. -+for ac_symprfx in "" "_"; do - -- openbsd*) -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- export_dynamic_flag_spec='${wl}-E' -- else -- case "$host_os" in -- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-R$libdir' -- ;; -- *) -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- ;; -- esac -- fi -- ;; -+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -+ symxfrm="\\1 $ac_symprfx\\2 \\2" - -- os2*) -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- allow_undefined_flag=unsupported -- archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -- ;; -+ # Write the raw and C identifiers. -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - -- osf3*) -- if test "$GCC" = yes; then -- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- fi -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- ;; -+ # Check to see that the pipe works correctly. -+ pipe_works=no - -- osf4* | osf5*) # as osf3* with the addition of -msym flag -- if test "$GCC" = yes; then -- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- else -- allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' -+ rm -f conftest* -+ cat > conftest.$ac_ext <&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ # Now try to grab the symbols. -+ nlist=conftest.nm -+ if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 -+ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s "$nlist"; then -+ # Try sorting and uniquifying the output. -+ if sort "$nlist" | uniq > "$nlist"T; then -+ mv -f "$nlist"T "$nlist" -+ else -+ rm -f "$nlist"T -+ fi - -- sco3.2v5*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var=no -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- export_dynamic_flag_spec='${wl}-Bexport' -- ;; -+ # Make sure that we snagged all the symbols we need. -+ if grep ' nm_test_var$' "$nlist" >/dev/null; then -+ if grep ' nm_test_func$' "$nlist" >/dev/null; then -+ cat < conftest.$ac_ext -+#ifdef __cplusplus -+extern "C" { -+#endif - -- solaris*) -- # gcc --version < 3.0 without binutils cannot create self contained -- # shared libraries reliably, requiring libgcc.a to resolve some of -- # the object symbols generated in some cases. Libraries that use -- # assert need libgcc.a to resolve __eprintf, for example. Linking -- # a copy of libgcc.a into every shared library to guarantee resolving -- # such symbols causes other problems: According to Tim Van Holder -- # , C++ libraries end up with a separate -- # (to the application) exception stack for one thing. -- no_undefined_flag=' -z defs' -- if test "$GCC" = yes; then -- case `$CC --version 2>/dev/null` in -- [12].*) -- cat <&2 -+EOF -+ # Now generate the symbol file. -+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' - --*** Warning: Releases of GCC earlier than version 3.0 cannot reliably --*** create self contained shared libraries on Solaris systems, without --*** introducing a dependency on libgcc.a. Therefore, libtool is disabling --*** -no-undefined support, which will at least allow you to build shared --*** libraries. However, you may find that when you link such libraries --*** into an application without using GCC, you have to manually add --*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to --*** upgrade to a newer version of GCC. Another option is to rebuild your --*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer. -+ cat <> conftest.$ac_ext -+#if defined (__STDC__) && __STDC__ -+# define lt_ptr_t void * -+#else -+# define lt_ptr_t char * -+# define const -+#endif - -+/* The mapping between symbol names and symbols. */ -+const struct { -+ const char *name; -+ lt_ptr_t address; -+} -+lt_preloaded_symbols[] = -+{ - EOF -- no_undefined_flag= -- ;; -- esac -- fi -- # $CC -shared without GNU ld will not create a library from C++ -- # object files and a static libstdc++, better avoid it by now -- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_shlibpath_var=no -- case $host_os in -- solaris2.[0-5] | solaris2.[0-5].*) ;; -- *) # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; -- esac -- link_all_deplibs=yes -- ;; -- -- sunos4*) -- if test "x$host_vendor" = xsequent; then -- # Use $CC to link under sequent, because it throws in some extra .o -- # files that make .init and .fini sections work. -- archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -- fi -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_direct=yes -- hardcode_minus_L=yes -- hardcode_shlibpath_var=no -- ;; -+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext -+ cat <<\EOF >> conftest.$ac_ext -+ {0, (lt_ptr_t) 0} -+}; - -- sysv4) -- if test "x$host_vendor" = xsno; then -- archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes # is this really true??? -+#ifdef __cplusplus -+} -+#endif -+EOF -+ # Now try linking the two files. -+ mv conftest.$ac_objext conftstm.$ac_objext -+ lt_save_LIBS="$LIBS" -+ lt_save_CFLAGS="$CFLAGS" -+ LIBS="conftstm.$ac_objext" -+ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext}; then -+ pipe_works=yes -+ fi -+ LIBS="$lt_save_LIBS" -+ CFLAGS="$lt_save_CFLAGS" -+ else -+ echo "cannot find nm_test_func in $nlist" >&5 -+ fi -+ else -+ echo "cannot find nm_test_var in $nlist" >&5 -+ fi - else -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=no #Motorola manual says yes, but my tests say they lie -- fi -- runpath_var='LD_RUN_PATH' -- hardcode_shlibpath_var=no -- ;; -- -- sysv4.3*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var=no -- export_dynamic_flag_spec='-Bexport' -- ;; -- -- sysv5*) -- no_undefined_flag=' -z text' -- # $CC -shared without GNU ld will not create a library from C++ -- # object files and a static libstdc++, better avoid it by now -- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -- hardcode_libdir_flag_spec= -- hardcode_shlibpath_var=no -- runpath_var='LD_RUN_PATH' -- ;; -- -- uts4*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_shlibpath_var=no -- ;; -- -- dgux*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_shlibpath_var=no -- ;; -- -- sysv4*MP*) -- if test -d /usr/nec; then -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var=no -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- ld_shlibs=yes -+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi -- ;; -- -- sysv4.2uw2*) -- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_minus_L=no -- hardcode_shlibpath_var=no -- hardcode_runpath_var=yes -- runpath_var=LD_RUN_PATH -- ;; -+ else -+ echo "$progname: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ fi -+ rm -f conftest* conftst* - -- sysv5uw7* | unixware7*) -- no_undefined_flag='${wl}-z ${wl}text' -- if test "$GCC" = yes; then -- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- fi -- runpath_var='LD_RUN_PATH' -- hardcode_shlibpath_var=no -- ;; -+ # Do not use the global_symbol_pipe unless it works. -+ if test "$pipe_works" = yes; then -+ break -+ else -+ lt_cv_sys_global_symbol_pipe= -+ fi -+done - -- *) -- ld_shlibs=no -- ;; -- esac - fi --echo "$as_me:4916: result: $ld_shlibs" >&5 --echo "${ECHO_T}$ld_shlibs" >&6 --test "$ld_shlibs" = no && can_build_shared=no - --# Check hardcoding attributes. --echo "$as_me:4921: checking how to hardcode library paths into programs" >&5 --echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 --hardcode_action= --if test -n "$hardcode_libdir_flag_spec" || \ -- test -n "$runpath_var"; then -- -- # We can hardcode non-existant directories. -- if test "$hardcode_direct" != no && -- # If the only mechanism to avoid hardcoding is shlibpath_var, we -- # have to relink, otherwise we might link with an installed library -- # when we should be linking with a yet-to-be-installed one -- ## test "$hardcode_shlibpath_var" != no && -- test "$hardcode_minus_L" != no; then -- # Linking always hardcodes the temporary library directory. -- hardcode_action=relink -- else -- # We can link without hardcoding, and we can hardcode nonexisting dirs. -- hardcode_action=immediate -- fi -+if test -z "$lt_cv_sys_global_symbol_pipe"; then -+ lt_cv_sys_global_symbol_to_cdecl= -+fi -+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -+ { echo "$as_me:$LINENO: result: failed" >&5 -+echo "${ECHO_T}failed" >&6; } - else -- # We cannot hardcode anything, or else we can only hardcode existing -- # directories. -- hardcode_action=unsupported -+ { echo "$as_me:$LINENO: result: ok" >&5 -+echo "${ECHO_T}ok" >&6; } - fi --echo "$as_me:4945: result: $hardcode_action" >&5 --echo "${ECHO_T}$hardcode_action" >&6 - --striplib= --old_striplib= --echo "$as_me:4950: checking whether stripping libraries is possible" >&5 --echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 --if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -- test -z "$striplib" && striplib="$STRIP --strip-unneeded" -- echo "$as_me:4955: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+{ echo "$as_me:$LINENO: checking for objdir" >&5 -+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } -+if test "${lt_cv_objdir+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ rm -f .libs 2>/dev/null -+mkdir .libs 2>/dev/null -+if test -d .libs; then -+ lt_cv_objdir=.libs - else -- echo "$as_me:4958: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs -+fi -+rmdir .libs 2>/dev/null - fi -+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -+echo "${ECHO_T}$lt_cv_objdir" >&6; } -+objdir=$lt_cv_objdir - --reload_cmds='$LD$reload_flag -o $output$reload_objs' --test -z "$deplibs_check_method" && deplibs_check_method=unknown - --# PORTME Fill in your ld.so characteristics --echo "$as_me:4966: checking dynamic linker characteristics" >&5 --echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 --library_names_spec= --libname_spec='lib$name' --soname_spec= --postinstall_cmds= --postuninstall_cmds= --finish_cmds= --finish_eval= --shlibpath_var= --shlibpath_overrides_runpath=unknown --version_type=none --dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - --case $host_os in --aix3*) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix $libname.a' -- shlibpath_var=LIBPATH - -- # AIX has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}.so$major' -- ;; - --aix4* | aix5*) -- version_type=linux -- if test "$host_cpu" = ia64; then -- # AIX 5 supports IA64 -- library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' -- shlibpath_var=LD_LIBRARY_PATH -+case $host_os in -+aix3*) -+ # AIX sometimes has problems with the GCC collect2 program. For some -+ # reason, if we set the COLLECT_NAMES environment variable, the problems -+ # vanish in a puff of smoke. -+ if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+ fi -+ ;; -+esac -+ -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+Xsed='sed -e 1s/^X//' -+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' -+ -+# Same as above, but do not quote variable references. -+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' -+ -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+ -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' -+ -+# Constants: -+rm="rm -f" -+ -+# Global variables: -+default_ofile=libtool -+can_build_shared=yes -+ -+# All known linkers require a `.a' archive for static linking (except MSVC, -+# which needs '.lib'). -+libext=a -+ltmain="$ac_aux_dir/ltmain.sh" -+ofile="$default_ofile" -+with_gnu_ld="$lt_cv_prog_gnu_ld" -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -+set dummy ${ac_tool_prefix}ar; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_AR+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$AR"; then -+ ac_cv_prog_AR="$AR" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_AR="${ac_tool_prefix}ar" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+AR=$ac_cv_prog_AR -+if test -n "$AR"; then -+ { echo "$as_me:$LINENO: result: $AR" >&5 -+echo "${ECHO_T}$AR" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_AR"; then -+ ac_ct_AR=$AR -+ # Extract the first word of "ar", so it can be a program name with args. -+set dummy ar; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_AR"; then -+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_AR="ar" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_AR=$ac_cv_prog_ac_ct_AR -+if test -n "$ac_ct_AR"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -+echo "${ECHO_T}$ac_ct_AR" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_AR" = x; then -+ AR="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ AR=$ac_ct_AR -+ fi -+else -+ AR="$ac_cv_prog_AR" -+fi -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -+set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_RANLIB+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$RANLIB"; then -+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+RANLIB=$ac_cv_prog_RANLIB -+if test -n "$RANLIB"; then -+ { echo "$as_me:$LINENO: result: $RANLIB" >&5 -+echo "${ECHO_T}$RANLIB" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_RANLIB"; then -+ ac_ct_RANLIB=$RANLIB -+ # Extract the first word of "ranlib", so it can be a program name with args. -+set dummy ranlib; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_RANLIB"; then -+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_RANLIB="ranlib" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -+if test -n "$ac_ct_RANLIB"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -+echo "${ECHO_T}$ac_ct_RANLIB" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_RANLIB" = x; then -+ RANLIB=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ RANLIB=$ac_ct_RANLIB -+ fi -+else -+ RANLIB="$ac_cv_prog_RANLIB" -+fi -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -+set dummy ${ac_tool_prefix}strip; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_STRIP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$STRIP"; then -+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_STRIP="${ac_tool_prefix}strip" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+STRIP=$ac_cv_prog_STRIP -+if test -n "$STRIP"; then -+ { echo "$as_me:$LINENO: result: $STRIP" >&5 -+echo "${ECHO_T}$STRIP" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_STRIP"; then -+ ac_ct_STRIP=$STRIP -+ # Extract the first word of "strip", so it can be a program name with args. -+set dummy strip; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_STRIP"; then -+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_STRIP="strip" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -+if test -n "$ac_ct_STRIP"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+echo "${ECHO_T}$ac_ct_STRIP" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_STRIP" = x; then -+ STRIP=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ STRIP=$ac_ct_STRIP -+ fi -+else -+ STRIP="$ac_cv_prog_STRIP" -+fi -+ -+ -+old_CC="$CC" -+old_CFLAGS="$CFLAGS" -+ -+# Set sane defaults for various variables -+test -z "$AR" && AR=ar -+test -z "$AR_FLAGS" && AR_FLAGS=cru -+test -z "$AS" && AS=as -+test -z "$CC" && CC=cc -+test -z "$LTCC" && LTCC=$CC -+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+test -z "$LD" && LD=ld -+test -z "$LN_S" && LN_S="ln -s" -+test -z "$MAGIC_CMD" && MAGIC_CMD=file -+test -z "$NM" && NM=nm -+test -z "$SED" && SED=sed -+test -z "$OBJDUMP" && OBJDUMP=objdump -+test -z "$RANLIB" && RANLIB=: -+test -z "$STRIP" && STRIP=: -+test -z "$ac_objext" && ac_objext=o -+ -+# Determine commands to create old-style static archives. -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -+old_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= -+ -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ ;; -+ *) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+fi -+ -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ -+# Only perform the check for file, if the check method requires it -+case $deplibs_check_method in -+file_magic*) -+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then -+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } -+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $MAGIC_CMD in -+[\\/*] | ?:[\\/]*) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" -+ for ac_dir in $ac_dummy; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/${ac_tool_prefix}file; then -+ lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" -+ if test -n "$file_magic_test_file"; then -+ case $deplibs_check_method in -+ "file_magic "*) -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ : -+ else -+ cat <&2 -+ -+*** Warning: the command libtool uses to detect shared libraries, -+*** $file_magic_cmd, produces output that libtool cannot recognize. -+*** The result is that libtool may fail to recognize shared libraries -+*** as such. This will affect the creation of libtool libraries that -+*** depend on shared libraries, but programs linked with such libtool -+*** libraries will work regardless of this problem. Nevertheless, you -+*** may want to report the problem to your system manager and/or to -+*** bug-libtool@gnu.org -+ -+EOF -+ fi ;; -+ esac -+ fi -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ MAGIC_CMD="$lt_save_MAGIC_CMD" -+ ;; -+esac -+fi -+ -+MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+if test -n "$MAGIC_CMD"; then -+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+echo "${ECHO_T}$MAGIC_CMD" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+if test -z "$lt_cv_path_MAGIC_CMD"; then -+ if test -n "$ac_tool_prefix"; then -+ { echo "$as_me:$LINENO: checking for file" >&5 -+echo $ECHO_N "checking for file... $ECHO_C" >&6; } -+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $MAGIC_CMD in -+[\\/*] | ?:[\\/]*) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" -+ for ac_dir in $ac_dummy; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/file; then -+ lt_cv_path_MAGIC_CMD="$ac_dir/file" -+ if test -n "$file_magic_test_file"; then -+ case $deplibs_check_method in -+ "file_magic "*) -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ : -+ else -+ cat <&2 -+ -+*** Warning: the command libtool uses to detect shared libraries, -+*** $file_magic_cmd, produces output that libtool cannot recognize. -+*** The result is that libtool may fail to recognize shared libraries -+*** as such. This will affect the creation of libtool libraries that -+*** depend on shared libraries, but programs linked with such libtool -+*** libraries will work regardless of this problem. Nevertheless, you -+*** may want to report the problem to your system manager and/or to -+*** bug-libtool@gnu.org -+ -+EOF -+ fi ;; -+ esac -+ fi -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ MAGIC_CMD="$lt_save_MAGIC_CMD" -+ ;; -+esac -+fi -+ -+MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+if test -n "$MAGIC_CMD"; then -+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+echo "${ECHO_T}$MAGIC_CMD" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ else -+ MAGIC_CMD=: -+ fi -+fi -+ -+ fi -+ ;; -+esac -+ -+enable_dlopen=no -+enable_win32_dll=no -+ -+# Check whether --enable-libtool-lock was given. -+if test "${enable_libtool_lock+set}" = set; then -+ enableval=$enable_libtool_lock; -+fi -+ -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+ -+# Check whether --with-pic was given. -+if test "${with_pic+set}" = set; then -+ withval=$with_pic; pic_mode="$withval" -+else -+ pic_mode=default -+fi -+ -+test -z "$pic_mode" && pic_mode=default -+ -+# Use C for the default configuration in the libtool script -+tagname= -+lt_save_CC="$CC" -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+# Source file extension for C test sources. -+ac_ext=c -+ -+# Object file extension for compiled C test sources. -+objext=o -+objext=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(){return(0);}' -+ -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+ -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ -+ -+lt_prog_compiler_no_builtin_flag= -+ -+if test "$GCC" = yes; then -+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' -+ -+ -+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_rtti_exceptions=no -+ ac_outfile=conftest.$ac_objext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="-fno-rtti -fno-exceptions" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:7127: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:7131: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_rtti_exceptions=yes -+ fi -+ fi -+ $rm conftest* -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } -+ -+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -+ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -+else -+ : -+fi -+ -+fi -+ -+lt_prog_compiler_wl= -+lt_prog_compiler_pic= -+lt_prog_compiler_static= -+ -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } -+ -+ if test "$GCC" = yes; then -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_static='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static='-Bstatic' -+ fi -+ ;; -+ -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ -+ mingw* | cygwin* | pw32* | os2*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ lt_prog_compiler_pic='-DDLL_EXPORT' -+ ;; -+ -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ lt_prog_compiler_pic='-fno-common' -+ ;; -+ -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ lt_prog_compiler_can_build_shared=no -+ enable_shared=no -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ lt_prog_compiler_pic=-Kconform_pic -+ fi -+ ;; -+ -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic='-fPIC' -+ ;; -+ esac -+ ;; -+ -+ *) -+ lt_prog_compiler_pic='-fPIC' -+ ;; -+ esac -+ else -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ lt_prog_compiler_wl='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static='-Bstatic' -+ else -+ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic='-qnocommon' -+ lt_prog_compiler_wl='-Wl,' -+ ;; -+ esac -+ ;; -+ -+ mingw* | cygwin* | pw32* | os2*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ lt_prog_compiler_pic='-DDLL_EXPORT' -+ ;; -+ -+ hpux9* | hpux10* | hpux11*) -+ lt_prog_compiler_wl='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ lt_prog_compiler_static='${wl}-a ${wl}archive' -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ lt_prog_compiler_wl='-Wl,' -+ # PIC (with -KPIC) is the default. -+ lt_prog_compiler_static='-non_shared' -+ ;; -+ -+ newsos6) -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ icc* | ecc*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-fpic' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ ccc*) -+ lt_prog_compiler_wl='-Wl,' -+ # All Alpha code is PIC. -+ lt_prog_compiler_static='-non_shared' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ lt_prog_compiler_wl='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ lt_prog_compiler_wl='' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ -+ osf3* | osf4* | osf5*) -+ lt_prog_compiler_wl='-Wl,' -+ # All OSF/1 code is PIC. -+ lt_prog_compiler_static='-non_shared' -+ ;; -+ -+ rdos*) -+ lt_prog_compiler_static='-non_shared' -+ ;; -+ -+ solaris*) -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl='-Wl,';; -+ esac -+ ;; -+ -+ sunos4*) -+ lt_prog_compiler_wl='-Qoption ld ' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec ;then -+ lt_prog_compiler_pic='-Kconform_pic' -+ lt_prog_compiler_static='-Bstatic' -+ fi -+ ;; -+ -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ -+ unicos*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_can_build_shared=no -+ ;; -+ -+ uts4*) -+ lt_prog_compiler_pic='-pic' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ -+ *) -+ lt_prog_compiler_can_build_shared=no -+ ;; -+ esac -+ fi -+ -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } -+ -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$lt_prog_compiler_pic"; then -+ -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } -+if test "${lt_prog_compiler_pic_works+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_prog_compiler_pic_works=no -+ ac_outfile=conftest.$ac_objext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:7417: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:7421: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_prog_compiler_pic_works=yes -+ fi -+ fi -+ $rm conftest* -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } -+ -+if test x"$lt_prog_compiler_pic_works" = xyes; then -+ case $lt_prog_compiler_pic in -+ "" | " "*) ;; -+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; -+ esac -+else -+ lt_prog_compiler_pic= -+ lt_prog_compiler_can_build_shared=no -+fi -+ -+fi -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ lt_prog_compiler_pic= -+ ;; -+ *) -+ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" -+ ;; -+esac -+ -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+if test "${lt_prog_compiler_static_works+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_prog_compiler_static_works=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_prog_compiler_static_works=yes -+ fi -+ else -+ lt_prog_compiler_static_works=yes -+ fi -+ fi -+ $rm conftest* -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } -+ -+if test x"$lt_prog_compiler_static_works" = xyes; then -+ : -+else -+ lt_prog_compiler_static= -+fi -+ -+ -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_c_o+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_c_o=no -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:7521: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:7525: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_c_o=yes -+ fi -+ fi -+ chmod u+w . 2>&5 -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } -+ -+ -+hard_links="nottested" -+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } -+ if test "$hard_links" = no; then -+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi -+ -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -+ -+ runpath_var= -+ allow_undefined_flag= -+ enable_shared_with_static_runtimes=no -+ archive_cmds= -+ archive_expsym_cmds= -+ old_archive_From_new_cmds= -+ old_archive_from_expsyms_cmds= -+ export_dynamic_flag_spec= -+ whole_archive_flag_spec= -+ thread_safe_flag_spec= -+ hardcode_libdir_flag_spec= -+ hardcode_libdir_flag_spec_ld= -+ hardcode_libdir_separator= -+ hardcode_direct=no -+ hardcode_minus_L=no -+ hardcode_shlibpath_var=unsupported -+ link_all_deplibs=unknown -+ hardcode_automatic=no -+ module_cmds= -+ module_expsym_cmds= -+ always_export_symbols=no -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ include_expsyms= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ exclude_expsyms="_GLOBAL_OFFSET_TABLE_" -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+ esac -+ -+ ld_shlibs=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' -+ -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix3* | aix4* | aix5*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ ld_shlibs=no -+ cat <&2 -+ -+*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** to be unable to reliably create shared libraries on AIX. -+*** Therefore, libtool is disabling shared libraries support. If you -+*** really care for shared libraries, you may want to modify your PATH -+*** so that a non-GNU linker is found, and then restart. -+ -+EOF -+ fi -+ ;; -+ -+ amigaos*) -+ archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ -+ # Samuel A. Falvo II reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we can't use -+ # them. -+ ld_shlibs=no -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec='-L$libdir' -+ allow_undefined_flag=unsupported -+ always_export_symbols=no -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ interix[3-9]*) -+ hardcode_direct=no -+ hardcode_shlibpath_var=no -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ link_all_deplibs=no -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -+ wlarc= -+ else -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; -+ -+ solaris*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ ld_shlibs=no -+ cat <&2 -+ -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+EOF -+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -+ ld_shlibs=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ sunos4*) -+ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; -+ -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ esac -+ -+ if test "$ld_shlibs" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec= -+ export_dynamic_flag_spec= -+ whole_archive_flag_spec= -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ hardcode_minus_L=yes -+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ hardcode_direct=unsupported -+ fi -+ ;; -+ -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ else -+ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ fi -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ archive_cmds='' -+ hardcode_direct=yes -+ hardcode_libdir_separator=':' -+ link_all_deplibs=yes -+ -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[012]|aix4.[012].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ hardcode_direct=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ hardcode_minus_L=yes -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_libdir_separator= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi -+ -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ allow_undefined_flag='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -+ archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag="-z nodefs" -+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ no_undefined_flag=' ${wl}-bernotok' -+ allow_undefined_flag=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec='$convenience' -+ archive_cmds_need_lc=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ amigaos*) -+ archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ # see comment about different semantics on the GNU ld section -+ ld_shlibs=no -+ ;; -+ -+ bsdi[45]*) -+ export_dynamic_flag_spec=-rdynamic -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_From_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ fix_srcfile_path='`cygpath -w "$srcfile"`' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc=no -+ hardcode_direct=no -+ hardcode_automatic=yes -+ hardcode_shlibpath_var=unsupported -+ whole_archive_flag_spec='' -+ link_all_deplibs=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ dgux*) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_shlibpath_var=no -+ ;; -+ -+ freebsd1*) -+ ld_shlibs=no -+ ;; -+ -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; -+ -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=yes -+ hardcode_minus_L=yes -+ hardcode_shlibpath_var=no -+ ;; -+ -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | dragonfly*) -+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; -+ -+ hpux9*) -+ if test "$GCC" = yes; then -+ archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ fi -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: -+ hardcode_direct=yes -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ export_dynamic_flag_spec='${wl}-E' -+ ;; -+ -+ hpux10*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: -+ -+ hardcode_direct=yes -+ export_dynamic_flag_spec='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ fi -+ ;; -+ -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_libdir_flag_spec_ld='+b $libdir' -+ hardcode_direct=no -+ hardcode_shlibpath_var=no -+ ;; -+ *) -+ hardcode_direct=yes -+ export_dynamic_flag_spec='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ ;; -+ esac -+ fi -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_ld='-rpath $libdir' -+ fi -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ link_all_deplibs=yes -+ ;; -+ -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -+ else -+ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; -+ -+ newsos6) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=yes -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ hardcode_shlibpath_var=no -+ ;; -+ -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec='${wl}-E' -+ else -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ *) -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ os2*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ allow_undefined_flag=unsupported -+ archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; -+ -+ osf3*) -+ if test "$GCC" = yes; then -+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ allow_undefined_flag=' -expect_unresolved \*' -+ archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ ;; -+ -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ else -+ allow_undefined_flag=' -expect_unresolved \*' -+ archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' -+ -+ # Both c and cxx compiler support -rpath directly -+ hardcode_libdir_flag_spec='-rpath $libdir' -+ fi -+ hardcode_libdir_separator=: -+ ;; -+ -+ solaris*) -+ no_undefined_flag=' -z text' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ wlarc='' -+ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_shlibpath_var=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ if test "$GCC" = yes; then -+ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' -+ fi -+ ;; -+ esac -+ link_all_deplibs=yes -+ ;; -+ -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_direct=yes -+ hardcode_minus_L=yes -+ hardcode_shlibpath_var=no -+ ;; -+ -+ sysv4) -+ case $host_vendor in -+ sni) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ reload_cmds='$CC -r -o $output$reload_objs' -+ hardcode_direct=no -+ ;; -+ motorola) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ hardcode_shlibpath_var=no -+ ;; -+ -+ sysv4.3*) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var=no -+ export_dynamic_flag_spec='-Bexport' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ ld_shlibs=yes -+ fi -+ ;; -+ -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -+ no_undefined_flag='${wl}-z,text' -+ archive_cmds_need_lc=no -+ hardcode_shlibpath_var=no -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ no_undefined_flag='${wl}-z,text' -+ allow_undefined_flag='${wl}-z,nodefs' -+ archive_cmds_need_lc=no -+ hardcode_shlibpath_var=no -+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator=':' -+ link_all_deplibs=yes -+ export_dynamic_flag_spec='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ uts4*) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_shlibpath_var=no -+ ;; -+ -+ *) -+ ld_shlibs=no -+ ;; -+ esac -+ fi -+ -+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -+echo "${ECHO_T}$ld_shlibs" >&6; } -+test "$ld_shlibs" = no && can_build_shared=no -+ -+# -+# Do we need to explicitly link libc? -+# -+case "x$archive_cmds_need_lc" in -+x|xyes) -+ # Assume -lc should be added -+ archive_cmds_need_lc=yes -+ -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $archive_cmds in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } -+ $rm conftest* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl -+ pic_flag=$lt_prog_compiler_pic -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag -+ allow_undefined_flag= -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ then -+ archive_cmds_need_lc=no -+ else -+ archive_cmds_need_lc=yes -+ fi -+ allow_undefined_flag=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc" >&6; } -+ ;; -+ esac -+ fi -+ ;; -+esac -+ -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+ -+if test "$GCC" = yes; then -+ case $host_os in -+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; -+ *) lt_awk_arg="/^libraries:/" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[lt_foo]++; } -+ if (lt_freq[lt_foo] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`echo $lt_search_path_spec` -+else -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi -+need_lib_prefix=unknown -+hardcode_into_libs=no -+ -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown -+ -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH -+ -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ -+aix4* | aix5*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[01] | aix4.[01].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib.so -+ # instead of lib.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; -+ -+amigaos*) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; -+ -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; -+ -+bsdi[45]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; -+ -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no -+ -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $rm \$dlpath' -+ shlibpath_overrides_runpath=yes -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; -+ -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; -+ -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; -+ -+dgux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+freebsd1*) -+ dynamic_linker=no -+ ;; -+ -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[01]* | freebsdelf3.[01]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ -+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; -+ -+gnu*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ ;; -+ -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case $host_cpu in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; -+ -+interix[3-9]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; -+ -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; -+ -+# This must be Linux ELF. -+linux* | k*bsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes -+ -+ # Append ld.so.conf contents to the search path -+ if test -f /etc/ld.so.conf; then -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ fi -+ -+ # We used to test for /lib/ld.so.1 and disable shared libraries on -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ ;; -+ -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+nto-qnx*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+openbsd*) -+ version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; -+ -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; -+ -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; -+ -+rdos*) -+ dynamic_linker=no -+ ;; -+ -+solaris*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; -+ -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; -+ -+sysv4 | sysv4.3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; -+ -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+*) -+ dynamic_linker=no -+ ;; -+esac -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } -+test "$dynamic_linker" = no && can_build_shared=no -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+hardcode_action= -+if test -n "$hardcode_libdir_flag_spec" || \ -+ test -n "$runpath_var" || \ -+ test "X$hardcode_automatic" = "Xyes" ; then -+ -+ # We can hardcode non-existant directories. -+ if test "$hardcode_direct" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && -+ test "$hardcode_minus_L" != no; then -+ # Linking always hardcodes the temporary library directory. -+ hardcode_action=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action=unsupported -+fi -+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 -+echo "${ECHO_T}$hardcode_action" >&6; } -+ -+if test "$hardcode_action" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+ -+striplib= -+old_striplib= -+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } -+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+else -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ old_striplib="$STRIP -S" -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ ;; -+ *) -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ ;; -+ esac -+fi -+ -+if test "x$enable_dlopen" != xyes; then -+ enable_dlopen=unknown -+ enable_dlopen_self=unknown -+ enable_dlopen_self_static=unknown -+else -+ lt_cv_dlopen=no -+ lt_cv_dlopen_libs= -+ -+ case $host_os in -+ beos*) -+ lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ;; -+ -+ mingw* | pw32*) -+ lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ cygwin*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ darwin*) -+ # if libdl is installed we need to link against it -+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_dl_dlopen=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_dl_dlopen=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -+if test $ac_cv_lib_dl_dlopen = yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+else -+ -+ lt_cv_dlopen="dyld" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ -+fi -+ -+ ;; -+ -+ *) -+ { echo "$as_me:$LINENO: checking for shl_load" >&5 -+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } -+if test "${ac_cv_func_shl_load+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define shl_load to an innocuous variant, in case declares shl_load. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define shl_load innocuous_shl_load -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char shl_load (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef shl_load -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char shl_load (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_shl_load || defined __stub___shl_load -+choke me -+#endif -+ -+int -+main () -+{ -+return shl_load (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_func_shl_load=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func_shl_load=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } -+if test $ac_cv_func_shl_load = yes; then -+ lt_cv_dlopen="shl_load" -+else -+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } -+if test "${ac_cv_lib_dld_shl_load+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char shl_load (); -+int -+main () -+{ -+return shl_load (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_dld_shl_load=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_dld_shl_load=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } -+if test $ac_cv_lib_dld_shl_load = yes; then -+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" -+else -+ { echo "$as_me:$LINENO: checking for dlopen" >&5 -+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } -+if test "${ac_cv_func_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define dlopen to an innocuous variant, in case declares dlopen. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define dlopen innocuous_dlopen -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char dlopen (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef dlopen -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_dlopen || defined __stub___dlopen -+choke me -+#endif -+ -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_func_dlopen=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_func_dlopen=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } -+if test $ac_cv_func_dlopen = yes; then -+ lt_cv_dlopen="dlopen" -+else -+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_dl_dlopen=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_dl_dlopen=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -+if test $ac_cv_lib_dl_dlopen = yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+else -+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } -+if test "${ac_cv_lib_svld_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lsvld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_svld_dlopen=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_svld_dlopen=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } -+if test $ac_cv_lib_svld_dlopen = yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -+else -+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } -+if test "${ac_cv_lib_dld_dld_link+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dld_link (); -+int -+main () -+{ -+return dld_link (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_dld_dld_link=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_dld_dld_link=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } -+if test $ac_cv_lib_dld_dld_link = yes; then -+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ ;; -+ esac -+ -+ if test "x$lt_cv_dlopen" != xno; then -+ enable_dlopen=yes -+ else -+ enable_dlopen=no -+ fi -+ -+ case $lt_cv_dlopen in -+ dlopen) -+ save_CPPFLAGS="$CPPFLAGS" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ -+ save_LDFLAGS="$LDFLAGS" -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+ -+ save_LIBS="$LIBS" -+ LIBS="$lt_cv_dlopen_libs $LIBS" -+ -+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } -+if test "${lt_cv_dlopen_self+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ lt_cv_dlopen_self=cross -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext < -+#endif -+ -+#include -+ -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif -+ -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+#ifdef __cplusplus -+extern "C" void exit (int); -+#endif -+ -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; -+ -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ else -+ puts (dlerror ()); -+ -+ exit (status); -+} -+EOF -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&5 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; -+ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; -+ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; -+ esac -+ else : -+ # compilation failed -+ lt_cv_dlopen_self=no -+ fi -+fi -+rm -fr conftest* -+ -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } -+ -+ if test "x$lt_cv_dlopen_self" = xyes; then -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } -+if test "${lt_cv_dlopen_self_static+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ lt_cv_dlopen_self_static=cross -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext < -+#endif -+ -+#include -+ -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif -+ -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+#ifdef __cplusplus -+extern "C" void exit (int); -+#endif -+ -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; -+ -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ else -+ puts (dlerror ()); -+ -+ exit (status); -+} -+EOF -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&5 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; -+ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; -+ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; -+ esac -+ else : -+ # compilation failed -+ lt_cv_dlopen_self_static=no -+ fi -+fi -+rm -fr conftest* -+ -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } -+ fi -+ -+ CPPFLAGS="$save_CPPFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ esac -+ -+ case $lt_cv_dlopen_self in -+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -+ *) enable_dlopen_self=unknown ;; -+ esac -+ -+ case $lt_cv_dlopen_self_static in -+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -+ *) enable_dlopen_self_static=unknown ;; -+ esac -+fi -+ -+ -+# Report which library types will actually be built -+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+echo "${ECHO_T}$can_build_shared" >&6; } -+ -+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } -+test "$can_build_shared" = "no" && enable_shared=no -+ -+# On AIX, shared libraries and static libraries use the same namespace, and -+# are all built from PIC. -+case $host_os in -+aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; -+ -+aix4* | aix5*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+esac -+{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -+echo "${ECHO_T}$enable_shared" >&6; } -+ -+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } -+# Make sure either enable_shared or enable_static is yes. -+test "$enable_shared" = yes || enable_static=yes -+{ echo "$as_me:$LINENO: result: $enable_static" >&5 -+echo "${ECHO_T}$enable_static" >&6; } -+ -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler \ -+ CC \ -+ LD \ -+ lt_prog_compiler_wl \ -+ lt_prog_compiler_pic \ -+ lt_prog_compiler_static \ -+ lt_prog_compiler_no_builtin_flag \ -+ export_dynamic_flag_spec \ -+ thread_safe_flag_spec \ -+ whole_archive_flag_spec \ -+ enable_shared_with_static_runtimes \ -+ old_archive_cmds \ -+ old_archive_from_new_cmds \ -+ predep_objects \ -+ postdep_objects \ -+ predeps \ -+ postdeps \ -+ compiler_lib_search_path \ -+ archive_cmds \ -+ archive_expsym_cmds \ -+ postinstall_cmds \ -+ postuninstall_cmds \ -+ old_archive_from_expsyms_cmds \ -+ allow_undefined_flag \ -+ no_undefined_flag \ -+ export_symbols_cmds \ -+ hardcode_libdir_flag_spec \ -+ hardcode_libdir_flag_spec_ld \ -+ hardcode_libdir_separator \ -+ hardcode_automatic \ -+ module_cmds \ -+ module_expsym_cmds \ -+ lt_cv_prog_compiler_c_o \ -+ fix_srcfile_path \ -+ exclude_expsyms \ -+ include_expsyms; do -+ -+ case $var in -+ old_archive_cmds | \ -+ old_archive_from_new_cmds | \ -+ archive_cmds | \ -+ archive_expsym_cmds | \ -+ module_cmds | \ -+ module_expsym_cmds | \ -+ old_archive_from_expsyms_cmds | \ -+ export_symbols_cmds | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ ;; -+ *) -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ;; -+ esac -+ done -+ -+ case $lt_echo in -+ *'\$0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -+ ;; -+ esac -+ -+cfgfile="${ofile}T" -+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15 -+ $rm -f "$cfgfile" -+ { echo "$as_me:$LINENO: creating $ofile" >&5 -+echo "$as_me: creating $ofile" >&6;} -+ -+ cat <<__EOF__ >> "$cfgfile" -+#! $SHELL -+ -+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -+# NOTE: Changes made to this file will be lost: look at ltmain.sh. -+# -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -+# Free Software Foundation, Inc. -+# -+# This file is part of GNU Libtool: -+# Originally by Gordon Matzigkeit , 1996 -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ -+# A sed program that does not truncate output. -+SED=$lt_SED -+ -+# Sed that helps us avoid accidentally triggering echo(1) options like -n. -+Xsed="$SED -e 1s/^X//" -+ -+# The HP-UX ksh and POSIX shell print the target directory to stdout -+# if CDPATH is set. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+# The names of the tagged configurations supported by this script. -+available_tags= -+ -+# ### BEGIN LIBTOOL CONFIG -+ -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL -+ -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared -+ -+# Whether or not to build static libraries. -+build_old_libs=$enable_static -+ -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc -+ -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes -+ -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install -+ -+# The host system. -+host_alias=$host_alias -+host=$host -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os -+ -+# An echo program that does not interpret backslashes. -+echo=$lt_echo -+ -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS -+ -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ -+# A language-specific compiler. -+CC=$lt_compiler -+ -+# Is the compiler the GNU C compiler? -+with_gcc=$GCC -+ -+# An ERE matcher. -+EGREP=$lt_EGREP -+ -+# The linker used to build libraries. -+LD=$lt_LD -+ -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S -+ -+# A BSD-compatible nm program. -+NM=$lt_NM -+ -+# A symbol stripping program -+STRIP=$lt_STRIP -+ -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD -+ -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" -+ -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" -+ -+# Used on cygwin: assembler. -+AS="$AS" -+ -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir -+ -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds -+ -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ -+# Object file suffix (normally "o"). -+objext="$ac_objext" -+ -+# Old archive suffix (normally "a"). -+libext="$libext" -+ -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' -+ -+# Executable file suffix (normally ""). -+exeext="$exeext" -+ -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic -+pic_mode=$pic_mode -+ -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len -+ -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o -+ -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks -+ -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix -+ -+# Do we need a version for libraries? -+need_version=$need_version -+ -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen -+ -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self -+ -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static -+ -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static -+ -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -+ -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec -+ -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec -+ -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_thread_safe_flag_spec -+ -+# Library versioning type. -+version_type=$version_type -+ -+# Format of library name prefix. -+libname_spec=$lt_libname_spec -+ -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec -+ -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec -+ -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_old_archive_cmds -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds -+ -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds -+ -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_archive_cmds -+archive_expsym_cmds=$lt_archive_expsym_cmds -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds -+ -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds -+module_expsym_cmds=$lt_module_expsym_cmds -+ -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_predep_objects -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_postdeps -+ -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path -+ -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=$lt_deplibs_check_method -+ -+# Command to use when deplibs_check_method == file_magic. -+file_magic_cmd=$lt_file_magic_cmd -+ -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag -+ -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag -+ -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds -+ -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval -+ -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var -+ -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var -+ -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action -+ -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs -+ -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -+ -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld -+ -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator -+ -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$hardcode_direct -+ -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$hardcode_minus_L -+ -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var -+ -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$hardcode_automatic -+ -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" -+ -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs -+ -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path -+ -+# Set to yes if exported symbols are required. -+always_export_symbols=$always_export_symbols -+ -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds -+ -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms -+ -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms -+ -+# ### END LIBTOOL CONFIG -+ -+__EOF__ -+ -+ -+ case $host_os in -+ aix3*) -+ cat <<\EOF >> "$cfgfile" -+ -+# AIX sometimes has problems with the GCC collect2 program. For some -+# reason, if we set the COLLECT_NAMES environment variable, the problems -+# vanish in a puff of smoke. -+if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+fi -+EOF -+ ;; -+ esac -+ -+ # We use sed instead of cat because bash on DJGPP gets confused if -+ # if finds mixed CR/LF and LF-only lines. Since sed operates in -+ # text mode, it properly converts lines to CR/LF. This bash problem -+ # is reportedly fixed, but why not run on old versions too? -+ sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) -+ -+ mv -f "$cfgfile" "$ofile" || \ -+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -+ chmod +x "$ofile" -+ -+else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi -+fi -+ -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+CC="$lt_save_CC" -+ -+ -+# Check whether --with-tags was given. -+if test "${with_tags+set}" = set; then -+ withval=$with_tags; tagnames="$withval" -+fi -+ -+ -+if test -f "$ltmain" && test -n "$tagnames"; then -+ if test ! -f "${ofile}"; then -+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 -+echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} -+ fi -+ -+ if test -z "$LTCC"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCC='`" -+ if test -z "$LTCC"; then -+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 -+echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} -+ else -+ { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 -+echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} -+ fi -+ fi -+ if test -z "$LTCFLAGS"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" -+ fi -+ -+ # Extract list of available tagged configurations in $ofile. -+ # Note that this assumes the entire list is on one line. -+ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` -+ -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for tagname in $tagnames; do -+ IFS="$lt_save_ifs" -+ # Check whether tagname contains only valid characters -+ case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in -+ "") ;; -+ *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 -+echo "$as_me: error: invalid tag name: $tagname" >&2;} -+ { (exit 1); exit 1; }; } -+ ;; -+ esac -+ -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null -+ then -+ { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 -+echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ -+ # Update the list of available tags. -+ if test -n "$tagname"; then -+ echo appending configuration tag \"$tagname\" to $ofile -+ -+ case $tagname in -+ CXX) -+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ -+ -+ -+ -+archive_cmds_need_lc_CXX=no -+allow_undefined_flag_CXX= -+always_export_symbols_CXX=no -+archive_expsym_cmds_CXX= -+export_dynamic_flag_spec_CXX= -+hardcode_direct_CXX=no -+hardcode_libdir_flag_spec_CXX= -+hardcode_libdir_flag_spec_ld_CXX= -+hardcode_libdir_separator_CXX= -+hardcode_minus_L_CXX=no -+hardcode_shlibpath_var_CXX=unsupported -+hardcode_automatic_CXX=no -+module_cmds_CXX= -+module_expsym_cmds_CXX= -+link_all_deplibs_CXX=unknown -+old_archive_cmds_CXX=$old_archive_cmds -+no_undefined_flag_CXX= -+whole_archive_flag_spec_CXX= -+enable_shared_with_static_runtimes_CXX=no -+ -+# Dependencies to place before and after the object being linked: -+predep_objects_CXX= -+postdep_objects_CXX= -+predeps_CXX= -+postdeps_CXX= -+compiler_lib_search_path_CXX= -+ -+# Source file extension for C++ test sources. -+ac_ext=cpp -+ -+# Object file extension for compiled C++ test sources. -+objext=o -+objext_CXX=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(int, char *[]) { return(0); }' -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+ -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC=$CC -+lt_save_LD=$LD -+lt_save_GCC=$GCC -+GCC=$GXX -+lt_save_with_gnu_ld=$with_gnu_ld -+lt_save_path_LD=$lt_cv_path_LD -+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -+else -+ $as_unset lt_cv_prog_gnu_ld -+fi -+if test -n "${lt_cv_path_LDCXX+set}"; then -+ lt_cv_path_LD=$lt_cv_path_LDCXX -+else -+ $as_unset lt_cv_path_LD -+fi -+test -z "${LDCXX+set}" || LD=$LDCXX -+CC=${CXX-"c++"} -+compiler=$CC -+compiler_CXX=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ -+# We don't want -fno-exception wen compiling C++ code, so set the -+# no_builtin_flag separately -+if test "$GXX" = yes; then -+ lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' -+else -+ lt_prog_compiler_no_builtin_flag_CXX= -+fi -+ -+if test "$GXX" = yes; then -+ # Set up default GNU C++ configuration -+ -+ -+# Check whether --with-gnu-ld was given. -+if test "${with_gnu_ld+set}" = set; then -+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -+else -+ with_gnu_ld=no -+fi -+ -+ac_prog=ld -+if test "$GCC" = yes; then -+ # Check if gcc -print-prog-name=ld gives a path. -+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } -+ case $host in -+ *-*-mingw*) -+ # gcc leaves a trailing carriage return which upsets mingw -+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -+ *) -+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $ac_prog in -+ # Accept absolute paths. -+ [\\/]* | ?:[\\/]*) -+ re_direlt='/[^/][^/]*/\.\./' -+ # Canonicalize the pathname of ld -+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` -+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` -+ done -+ test -z "$LD" && LD="$ac_prog" -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ac_prog=ld -+ ;; -+ *) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown -+ ;; -+ esac -+elif test "$with_gnu_ld" = yes; then -+ { echo "$as_me:$LINENO: checking for GNU ld" >&5 -+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } -+else -+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } -+fi -+if test "${lt_cv_path_LD+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -z "$LD"; then -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ lt_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some variants of GNU ld only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$lt_cv_path_LD" -v 2>&1 &5 -+echo "${ECHO_T}$LD" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} -+ { (exit 1); exit 1; }; } -+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -+if test "${lt_cv_prog_gnu_ld+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # I'd rather use --version here, but apparently some GNU lds only accept -v. -+case `$LD -v 2>&1 &5 -+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } -+with_gnu_ld=$lt_cv_prog_gnu_ld -+ -+ -+ -+ # Check if GNU C++ uses GNU ld as the underlying linker, since the -+ # archiving commands below assume that GNU ld is being used. -+ if test "$with_gnu_ld" = yes; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -+ # investigate it a little bit more. (MM) -+ wlarc='${wl}' -+ -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ -+ grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_CXX= -+ fi -+ else -+ with_gnu_ld=no -+ wlarc= -+ -+ # A generic and very simple default shared library creation -+ # command for GNU C++ for the case where it uses the native -+ # linker, instead of GNU ld. If possible, this setting should -+ # overridden to take advantage of the native linker features on -+ # the platform it is being used on. -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ fi -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ -+else -+ GXX=no -+ with_gnu_ld=no -+ wlarc= -+fi -+ -+# PORTME: fill in a description of your system's C++ link characteristics -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -+ld_shlibs_CXX=yes -+case $host_os in -+ aix3*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ case $ld_flag in -+ *-brtl*) -+ aix_use_runtimelinking=yes -+ break -+ ;; -+ esac -+ done -+ ;; -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ archive_cmds_CXX='' -+ hardcode_direct_CXX=yes -+ hardcode_libdir_separator_CXX=':' -+ link_all_deplibs_CXX=yes -+ -+ if test "$GXX" = yes; then -+ case $host_os in aix4.[012]|aix4.[012].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ hardcode_direct_CXX=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ hardcode_minus_L_CXX=yes -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ hardcode_libdir_separator_CXX= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi -+ -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols_CXX=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ allow_undefined_flag_CXX='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -+ -+ archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag_CXX="-z nodefs" -+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ no_undefined_flag_CXX=' ${wl}-bernotok' -+ allow_undefined_flag_CXX=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec_CXX='$convenience' -+ archive_cmds_need_lc_CXX=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag_CXX=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ -+ chorus*) -+ case $cc_basename in -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=no -+ enable_shared_with_static_runtimes_CXX=yes -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc_CXX=no -+ hardcode_direct_CXX=no -+ hardcode_automatic_CXX=yes -+ hardcode_shlibpath_var_CXX=unsupported -+ whole_archive_flag_spec_CXX='' -+ link_all_deplibs_CXX=yes -+ -+ if test "$GXX" = yes ; then -+ lt_int_apple_cc_single_mod=no -+ output_verbose_link_cmd='echo' -+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -+ lt_int_apple_cc_single_mod=yes -+ fi -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ else -+ archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ fi -+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ fi -+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ freebsd[12]*) -+ # C++ shared libraries reported to be fairly broken before switch to ELF -+ ld_shlibs_CXX=no -+ ;; -+ freebsd-elf*) -+ archive_cmds_need_lc_CXX=no -+ ;; -+ freebsd* | dragonfly*) -+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -+ # conventions -+ ld_shlibs_CXX=yes -+ ;; -+ gnu*) -+ ;; -+ hpux9*) -+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ hardcode_direct_CXX=yes -+ hardcode_minus_L_CXX=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ aCC*) -+ archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ hpux10*|hpux11*) -+ if test $with_gnu_ld = no; then -+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) ;; -+ *) -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ ;; -+ esac -+ fi -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_direct_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ ;; -+ *) -+ hardcode_direct_CXX=yes -+ hardcode_minus_L_CXX=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ ;; -+ esac -+ -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ aCC*) -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test $with_gnu_ld = no; then -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ fi -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ interix[3-9]*) -+ hardcode_direct_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ irix5* | irix6*) -+ case $cc_basename in -+ CC*) -+ # SGI C++ -+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test "$with_gnu_ld" = no; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' -+ fi -+ fi -+ link_all_deplibs_CXX=yes -+ ;; -+ esac -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ ;; -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' -+ ;; -+ icpc*) -+ # Intel C++ -+ with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac -+ archive_cmds_need_lc_CXX=no -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ ;; -+ pgCC*) -+ # Portland Group C++ compiler -+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) -+ # Compaq C++ -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+ -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_CXX='-rpath $libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ no_undefined_flag_CXX=' -zdefs' -+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' -+ hardcode_libdir_flag_spec_CXX='-R$libdir' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ -+ # Not sure whether something based on -+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 -+ # would be better. -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ lynxos*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ m88k*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' -+ wlarc= -+ hardcode_libdir_flag_spec_CXX='-R$libdir' -+ hardcode_direct_CXX=yes -+ hardcode_shlibpath_var_CXX=no -+ fi -+ # Workaround some broken pre-1.5 toolchains -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ ;; -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ ld_shlibs_CXX=no -+ ;; -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct_CXX=yes -+ hardcode_shlibpath_var_CXX=no -+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd='echo' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ osf3*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' -+ -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ cxx*) -+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Archives containing C++ object files must be created using -+ # the KAI C++ compiler. -+ old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ cxx*) -+ allow_undefined_flag_CXX=' -expect_unresolved \*' -+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -+ echo "-hidden">> $lib.exp~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ -+ $rm $lib.exp' -+ -+ hardcode_libdir_flag_spec_CXX='-rpath $libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ psos*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ lcc*) -+ # Lucid -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ archive_cmds_need_lc_CXX=yes -+ no_undefined_flag_CXX=' -zdefs' -+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ -+ hardcode_libdir_flag_spec_CXX='-R$libdir' -+ hardcode_shlibpath_var_CXX=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' -+ ;; -+ esac -+ link_all_deplibs_CXX=yes -+ -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ -+ # The C++ compiler must be used to create the archive. -+ old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -+ ;; -+ *) -+ # GNU C++ compiler with Solaris linker -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ no_undefined_flag_CXX=' ${wl}-z ${wl}defs' -+ if $CC --version | grep -v '^2\.7' > /dev/null; then -+ archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ else -+ # g++ 2.7 appears to require `-G' NOT `-shared' on this -+ # platform. -+ archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ fi -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ ;; -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -+ no_undefined_flag_CXX='${wl}-z,text' -+ archive_cmds_need_lc_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ # For security reasons, it is highly recommended that you always -+ # use absolute paths for naming shared libraries, and exclude the -+ # DT_RUNPATH tag from executables and libraries. But doing so -+ # requires that you compile everything twice, which is a pain. -+ # So that behaviour is only enabled if SCOABSPATH is set to a -+ # non-empty value in the environment. Most likely only useful for -+ # creating official distributions of packages. -+ # This is a hack until libtool officially supports absolute path -+ # names for shared libraries. -+ no_undefined_flag_CXX='${wl}-z,text' -+ allow_undefined_flag_CXX='${wl}-z,nodefs' -+ archive_cmds_need_lc_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator_CXX=':' -+ link_all_deplibs_CXX=yes -+ export_dynamic_flag_spec_CXX='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ vxworks*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+esac -+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -+test "$ld_shlibs_CXX" = no && can_build_shared=no -+ -+GCC_CXX="$GXX" -+LD_CXX="$LD" -+ -+ -+cat > conftest.$ac_ext <&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ # Parse the compiler output and extract the necessary -+ # objects, libraries and library flags. -+ -+ # Sentinel used to keep track of whether or not we are before -+ # the conftest object file. -+ pre_test_object_deps_done=no -+ -+ # The `*' in the case matches for architectures that use `case' in -+ # $output_verbose_cmd can trigger glob expansion during the loop -+ # eval without this substitution. -+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` -+ -+ for p in `eval $output_verbose_link_cmd`; do -+ case $p in -+ -+ -L* | -R* | -l*) -+ # Some compilers place space between "-{L,R}" and the path. -+ # Remove the space. -+ if test $p = "-L" \ -+ || test $p = "-R"; then -+ prev=$p -+ continue -+ else -+ prev= -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ case $p in -+ -L* | -R*) -+ # Internal compiler library paths should come after those -+ # provided the user. The postdeps already come after the -+ # user supplied libs so there is no need to process them. -+ if test -z "$compiler_lib_search_path_CXX"; then -+ compiler_lib_search_path_CXX="${prev}${p}" -+ else -+ compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" -+ fi -+ ;; -+ # The "-l" case would never come before the object being -+ # linked, so don't bother handling this case. -+ esac -+ else -+ if test -z "$postdeps_CXX"; then -+ postdeps_CXX="${prev}${p}" -+ else -+ postdeps_CXX="${postdeps_CXX} ${prev}${p}" -+ fi -+ fi -+ ;; -+ -+ *.$objext) -+ # This assumes that the test object file only shows up -+ # once in the compiler output. -+ if test "$p" = "conftest.$objext"; then -+ pre_test_object_deps_done=yes -+ continue -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ if test -z "$predep_objects_CXX"; then -+ predep_objects_CXX="$p" -+ else -+ predep_objects_CXX="$predep_objects_CXX $p" -+ fi -+ else -+ if test -z "$postdep_objects_CXX"; then -+ postdep_objects_CXX="$p" -+ else -+ postdep_objects_CXX="$postdep_objects_CXX $p" -+ fi -+ fi -+ ;; -+ -+ *) ;; # Ignore the rest. -+ -+ esac -+ done -+ -+ # Clean up. -+ rm -f a.out a.exe -+else -+ echo "libtool.m4: error: problem compiling CXX test program" -+fi -+ -+$rm -f confest.$objext -+ -+# PORTME: override above test on systems where it is broken -+case $host_os in -+interix[3-9]*) -+ # Interix 3.5 installs completely hosed .la files for C++, so rather than -+ # hack all around it, let's just trust "g++" to DTRT. -+ predep_objects_CXX= -+ postdep_objects_CXX= -+ postdeps_CXX= -+ ;; -+ -+linux*) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ # -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ if test "$solaris_use_stlport4" != yes; then -+ postdeps_CXX='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+ -+solaris*) -+ case $cc_basename in -+ CC*) -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ -+ # Adding this requires a known-good setup of shared libraries for -+ # Sun compiler versions before 5.6, else PIC objects from an old -+ # archive will be linked into the output, leading to subtle bugs. -+ if test "$solaris_use_stlport4" != yes; then -+ postdeps_CXX='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+esac -+ -+ -+case " $postdeps_CXX " in -+*" -lc "*) archive_cmds_need_lc_CXX=no ;; -+esac -+ -+lt_prog_compiler_wl_CXX= -+lt_prog_compiler_pic_CXX= -+lt_prog_compiler_static_CXX= -+ -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } -+ -+ # C++ specific cases for pic, static, wl, etc. -+ if test "$GXX" = yes; then -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_CXX='-Bstatic' -+ fi -+ ;; -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ mingw* | cygwin* | os2* | pw32*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' -+ ;; -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ lt_prog_compiler_pic_CXX='-fno-common' -+ ;; -+ *djgpp*) -+ # DJGPP does not support shared libraries at all -+ lt_prog_compiler_pic_CXX= -+ ;; -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ lt_prog_compiler_pic_CXX=-Kconform_pic -+ fi -+ ;; -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ ;; -+ *) -+ lt_prog_compiler_pic_CXX='-fPIC' -+ ;; -+ esac -+ ;; -+ *) -+ lt_prog_compiler_pic_CXX='-fPIC' -+ ;; -+ esac -+ else -+ case $host_os in -+ aix4* | aix5*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_CXX='-Bstatic' -+ else -+ lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ chorus*) -+ case $cc_basename in -+ cxch68*) -+ # Green Hills C++ Compiler -+ # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" -+ ;; -+ esac -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_CXX='-qnocommon' -+ lt_prog_compiler_wl_CXX='-Wl,' -+ ;; -+ esac -+ ;; -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ lt_prog_compiler_pic_CXX='-KPIC' -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ lt_prog_compiler_pic_CXX='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ freebsd* | dragonfly*) -+ # FreeBSD uses GNU C++ -+ ;; -+ hpux9* | hpux10* | hpux11*) -+ case $cc_basename in -+ CC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' -+ if test "$host_cpu" != ia64; then -+ lt_prog_compiler_pic_CXX='+Z' -+ fi -+ ;; -+ aCC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_CXX='+Z' -+ ;; -+ esac -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ interix*) -+ # This is c89, which is MS Visual C++ (no shared libs) -+ # Anyone wants to do a port? -+ ;; -+ irix5* | irix6* | nonstopux*) -+ case $cc_basename in -+ CC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='-non_shared' -+ # CC pic flag -KPIC is the default. -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ KCC*) -+ # KAI C++ Compiler -+ lt_prog_compiler_wl_CXX='--backend -Wl,' -+ lt_prog_compiler_pic_CXX='-fPIC' -+ ;; -+ icpc* | ecpc*) -+ # Intel C++ -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-static' -+ ;; -+ pgCC*) -+ # Portland Group C++ compiler. -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-fpic' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ cxx*) -+ # Compaq C++ -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ lt_prog_compiler_pic_CXX= -+ lt_prog_compiler_static_CXX='-non_shared' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ lt_prog_compiler_wl_CXX='-Qoption ld ' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ lynxos*) -+ ;; -+ m88k*) -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ lt_prog_compiler_pic_CXX='-W c,exportall' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ netbsd* | netbsdelf*-gnu) -+ ;; -+ osf3* | osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ lt_prog_compiler_wl_CXX='--backend -Wl,' -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ lt_prog_compiler_pic_CXX='-pic' -+ ;; -+ cxx*) -+ # Digital/Compaq C++ -+ lt_prog_compiler_wl_CXX='-Wl,' -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ lt_prog_compiler_pic_CXX= -+ lt_prog_compiler_static_CXX='-non_shared' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ psos*) -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ lt_prog_compiler_wl_CXX='-Qoption ld ' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ lt_prog_compiler_pic_CXX='-PIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ lt_prog_compiler_pic_CXX='-pic' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ lcc*) -+ # Lucid -+ lt_prog_compiler_pic_CXX='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ lt_prog_compiler_pic_CXX='-KPIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ case $cc_basename in -+ CC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ esac -+ ;; -+ vxworks*) -+ ;; -+ *) -+ lt_prog_compiler_can_build_shared_CXX=no -+ ;; -+ esac -+ fi -+ -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } -+ -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$lt_prog_compiler_pic_CXX"; then -+ -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } -+if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_prog_compiler_pic_works_CXX=no -+ ac_outfile=conftest.$ac_objext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:12403: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:12407: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_prog_compiler_pic_works_CXX=yes -+ fi -+ fi -+ $rm conftest* -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } -+ -+if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then -+ case $lt_prog_compiler_pic_CXX in -+ "" | " "*) ;; -+ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; -+ esac -+else -+ lt_prog_compiler_pic_CXX= -+ lt_prog_compiler_can_build_shared_CXX=no -+fi -+ -+fi -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ lt_prog_compiler_pic_CXX= -+ ;; -+ *) -+ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" -+ ;; -+esac -+ -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_prog_compiler_static_works_CXX=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_prog_compiler_static_works_CXX=yes -+ fi -+ else -+ lt_prog_compiler_static_works_CXX=yes -+ fi -+ fi -+ $rm conftest* -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 -+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } -+ -+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then -+ : -+else -+ lt_prog_compiler_static_CXX= -+fi -+ -+ -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_c_o_CXX=no -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:12507: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:12511: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_c_o_CXX=yes -+ fi -+ fi -+ chmod u+w . 2>&5 -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } -+ -+ -+hard_links="nottested" -+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } -+ if test "$hard_links" = no; then -+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi -+ -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -+ -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ case $host_os in -+ aix4* | aix5*) -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ else -+ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ fi -+ ;; -+ pw32*) -+ export_symbols_cmds_CXX="$ltdll_cmds" -+ ;; -+ cygwin* | mingw*) -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ ;; -+ linux* | k*bsd*-gnu) -+ link_all_deplibs_CXX=no -+ ;; -+ *) -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ esac -+ -+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -+test "$ld_shlibs_CXX" = no && can_build_shared=no -+ -+# -+# Do we need to explicitly link libc? -+# -+case "x$archive_cmds_need_lc_CXX" in -+x|xyes) -+ # Assume -lc should be added -+ archive_cmds_need_lc_CXX=yes -+ -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $archive_cmds_CXX in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } -+ $rm conftest* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl_CXX -+ pic_flag=$lt_prog_compiler_pic_CXX -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX -+ allow_undefined_flag_CXX= -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ then -+ archive_cmds_need_lc_CXX=no -+ else -+ archive_cmds_need_lc_CXX=yes -+ fi -+ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } -+ ;; -+ esac -+ fi -+ ;; -+esac -+ -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+ -+need_lib_prefix=unknown -+hardcode_into_libs=no -+ -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown -+ -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH -+ -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ -+aix4* | aix5*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[01] | aix4.[01].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib.so -+ # instead of lib.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; -+ -+amigaos*) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; -+ -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; -+ -+bsdi[45]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; -+ -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no -+ -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $rm \$dlpath' -+ shlibpath_overrides_runpath=yes -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; -+ -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; -+ -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; -+ -+dgux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+freebsd1*) -+ dynamic_linker=no -+ ;; -+ -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[01]* | freebsdelf3.[01]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ -+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; -+ -+gnu*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ ;; -+ -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case $host_cpu in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; -+ -+interix[3-9]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; -+ -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; -+ -+# This must be Linux ELF. -+linux* | k*bsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes -+ -+ # Append ld.so.conf contents to the search path -+ if test -f /etc/ld.so.conf; then -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ fi -+ -+ # We used to test for /lib/ld.so.1 and disable shared libraries on -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ ;; -+ -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+nto-qnx*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+openbsd*) -+ version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; -+ -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; -+ -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; -+ -+rdos*) -+ dynamic_linker=no -+ ;; -+ -+solaris*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; -+ -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; -+ -+sysv4 | sysv4.3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; -+ -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+*) -+ dynamic_linker=no -+ ;; -+esac -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } -+test "$dynamic_linker" = no && can_build_shared=no -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+hardcode_action_CXX= -+if test -n "$hardcode_libdir_flag_spec_CXX" || \ -+ test -n "$runpath_var_CXX" || \ -+ test "X$hardcode_automatic_CXX" = "Xyes" ; then -+ -+ # We can hardcode non-existant directories. -+ if test "$hardcode_direct_CXX" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && -+ test "$hardcode_minus_L_CXX" != no; then -+ # Linking always hardcodes the temporary library directory. -+ hardcode_action_CXX=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action_CXX=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action_CXX=unsupported -+fi -+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -+echo "${ECHO_T}$hardcode_action_CXX" >&6; } -+ -+if test "$hardcode_action_CXX" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+ -+ -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_CXX \ -+ CC_CXX \ -+ LD_CXX \ -+ lt_prog_compiler_wl_CXX \ -+ lt_prog_compiler_pic_CXX \ -+ lt_prog_compiler_static_CXX \ -+ lt_prog_compiler_no_builtin_flag_CXX \ -+ export_dynamic_flag_spec_CXX \ -+ thread_safe_flag_spec_CXX \ -+ whole_archive_flag_spec_CXX \ -+ enable_shared_with_static_runtimes_CXX \ -+ old_archive_cmds_CXX \ -+ old_archive_from_new_cmds_CXX \ -+ predep_objects_CXX \ -+ postdep_objects_CXX \ -+ predeps_CXX \ -+ postdeps_CXX \ -+ compiler_lib_search_path_CXX \ -+ archive_cmds_CXX \ -+ archive_expsym_cmds_CXX \ -+ postinstall_cmds_CXX \ -+ postuninstall_cmds_CXX \ -+ old_archive_from_expsyms_cmds_CXX \ -+ allow_undefined_flag_CXX \ -+ no_undefined_flag_CXX \ -+ export_symbols_cmds_CXX \ -+ hardcode_libdir_flag_spec_CXX \ -+ hardcode_libdir_flag_spec_ld_CXX \ -+ hardcode_libdir_separator_CXX \ -+ hardcode_automatic_CXX \ -+ module_cmds_CXX \ -+ module_expsym_cmds_CXX \ -+ lt_cv_prog_compiler_c_o_CXX \ -+ fix_srcfile_path_CXX \ -+ exclude_expsyms_CXX \ -+ include_expsyms_CXX; do -+ -+ case $var in -+ old_archive_cmds_CXX | \ -+ old_archive_from_new_cmds_CXX | \ -+ archive_cmds_CXX | \ -+ archive_expsym_cmds_CXX | \ -+ module_cmds_CXX | \ -+ module_expsym_cmds_CXX | \ -+ old_archive_from_expsyms_cmds_CXX | \ -+ export_symbols_cmds_CXX | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ ;; -+ *) -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ;; -+ esac -+ done -+ -+ case $lt_echo in -+ *'\$0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -+ ;; -+ esac -+ -+cfgfile="$ofile" -+ -+ cat <<__EOF__ >> "$cfgfile" -+# ### BEGIN LIBTOOL TAG CONFIG: $tagname -+ -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL -+ -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared -+ -+# Whether or not to build static libraries. -+build_old_libs=$enable_static -+ -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc_CXX -+ -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX -+ -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install -+ -+# The host system. -+host_alias=$host_alias -+host=$host -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os -+ -+# An echo program that does not interpret backslashes. -+echo=$lt_echo -+ -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS -+ -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ -+# A language-specific compiler. -+CC=$lt_compiler_CXX -+ -+# Is the compiler the GNU C compiler? -+with_gcc=$GCC_CXX -+ -+# An ERE matcher. -+EGREP=$lt_EGREP -+ -+# The linker used to build libraries. -+LD=$lt_LD_CXX -+ -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S -+ -+# A BSD-compatible nm program. -+NM=$lt_NM -+ -+# A symbol stripping program -+STRIP=$lt_STRIP -+ -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD -+ -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" -+ -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" -+ -+# Used on cygwin: assembler. -+AS="$AS" -+ -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir -+ -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds -+ -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_CXX -+ -+# Object file suffix (normally "o"). -+objext="$ac_objext" -+ -+# Old archive suffix (normally "a"). -+libext="$libext" -+ -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' -+ -+# Executable file suffix (normally ""). -+exeext="$exeext" -+ -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic_CXX -+pic_mode=$pic_mode -+ -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len -+ -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX -+ -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks -+ -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix -+ -+# Do we need a version for libraries? -+need_version=$need_version -+ -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen -+ -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self -+ -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static -+ -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static_CXX -+ -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -+ -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX -+ -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX -+ -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX -+ -+# Library versioning type. -+version_type=$version_type -+ -+# Format of library name prefix. -+libname_spec=$lt_libname_spec -+ -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec -+ -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec -+ -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_old_archive_cmds_CXX -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX -+ -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX -+ -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_archive_cmds_CXX -+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds -+ -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds_CXX -+module_expsym_cmds=$lt_module_expsym_cmds_CXX -+ -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_predep_objects_CXX -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects_CXX -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps_CXX -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_postdeps_CXX -+ -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX -+ -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=$lt_deplibs_check_method -+ -+# Command to use when deplibs_check_method == file_magic. -+file_magic_cmd=$lt_file_magic_cmd -+ -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag_CXX -+ -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag_CXX -+ -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds -+ -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval -+ -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var -+ -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var -+ -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action_CXX -+ -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs -+ -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -+ -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX -+ -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -+ -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$hardcode_direct_CXX -+ -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$hardcode_minus_L_CXX -+ -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX -+ -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$hardcode_automatic_CXX -+ -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" -+ -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs_CXX -+ -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path -+ -+# Set to yes if exported symbols are required. -+always_export_symbols=$always_export_symbols_CXX -+ -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds_CXX -+ -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms_CXX -+ -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms_CXX -+ -+# ### END LIBTOOL TAG CONFIG: $tagname -+ -+__EOF__ -+ -+ -+else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi -+fi -+ -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+CC=$lt_save_CC -+LDCXX=$LD -+LD=$lt_save_LD -+GCC=$lt_save_GCC -+with_gnu_ldcxx=$with_gnu_ld -+with_gnu_ld=$lt_save_with_gnu_ld -+lt_cv_path_LDCXX=$lt_cv_path_LD -+lt_cv_path_LD=$lt_save_path_LD -+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -+ -+ else -+ tagname="" -+ fi -+ ;; -+ -+ F77) -+ if test -n "$F77" && test "X$F77" != "Xno"; then -+ -+ac_ext=f -+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_f77_compiler_gnu -+ -+ -+archive_cmds_need_lc_F77=no -+allow_undefined_flag_F77= -+always_export_symbols_F77=no -+archive_expsym_cmds_F77= -+export_dynamic_flag_spec_F77= -+hardcode_direct_F77=no -+hardcode_libdir_flag_spec_F77= -+hardcode_libdir_flag_spec_ld_F77= -+hardcode_libdir_separator_F77= -+hardcode_minus_L_F77=no -+hardcode_automatic_F77=no -+module_cmds_F77= -+module_expsym_cmds_F77= -+link_all_deplibs_F77=unknown -+old_archive_cmds_F77=$old_archive_cmds -+no_undefined_flag_F77= -+whole_archive_flag_spec_F77= -+enable_shared_with_static_runtimes_F77=no -+ -+# Source file extension for f77 test sources. -+ac_ext=f -+ -+# Object file extension for compiled f77 test sources. -+objext=o -+objext_F77=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code="\ -+ program t -+ end -+" -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+ -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${F77-"f77"} -+compiler=$CC -+compiler_F77=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ -+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+echo "${ECHO_T}$can_build_shared" >&6; } -+ -+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } -+test "$can_build_shared" = "no" && enable_shared=no -+ -+# On AIX, shared libraries and static libraries use the same namespace, and -+# are all built from PIC. -+case $host_os in -+aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; -+aix4* | aix5*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+esac -+{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -+echo "${ECHO_T}$enable_shared" >&6; } -+ -+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } -+# Make sure either enable_shared or enable_static is yes. -+test "$enable_shared" = yes || enable_static=yes -+{ echo "$as_me:$LINENO: result: $enable_static" >&5 -+echo "${ECHO_T}$enable_static" >&6; } -+ -+GCC_F77="$G77" -+LD_F77="$LD" -+ -+lt_prog_compiler_wl_F77= -+lt_prog_compiler_pic_F77= -+lt_prog_compiler_static_F77= -+ -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } -+ -+ if test "$GCC" = yes; then -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_static_F77='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_F77='-Bstatic' -+ fi -+ ;; -+ -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ -+ mingw* | cygwin* | pw32* | os2*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ lt_prog_compiler_pic_F77='-DDLL_EXPORT' -+ ;; -+ -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ lt_prog_compiler_pic_F77='-fno-common' -+ ;; -+ -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ lt_prog_compiler_can_build_shared_F77=no -+ enable_shared=no -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ lt_prog_compiler_pic_F77=-Kconform_pic -+ fi -+ ;; -+ -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_F77='-fPIC' -+ ;; -+ esac -+ ;; -+ -+ *) -+ lt_prog_compiler_pic_F77='-fPIC' -+ ;; -+ esac -+ else -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_F77='-Bstatic' -+ else -+ lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_F77='-qnocommon' -+ lt_prog_compiler_wl_F77='-Wl,' -+ ;; -+ esac -+ ;; -+ -+ mingw* | cygwin* | pw32* | os2*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ lt_prog_compiler_pic_F77='-DDLL_EXPORT' -+ ;; -+ -+ hpux9* | hpux10* | hpux11*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_F77='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ lt_prog_compiler_static_F77='${wl}-a ${wl}archive' -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ # PIC (with -KPIC) is the default. -+ lt_prog_compiler_static_F77='-non_shared' -+ ;; -+ -+ newsos6) -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ icc* | ecc*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-fpic' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ ccc*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ # All Alpha code is PIC. -+ lt_prog_compiler_static_F77='-non_shared' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ lt_prog_compiler_wl_F77='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ lt_prog_compiler_wl_F77='' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ -+ osf3* | osf4* | osf5*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ # All OSF/1 code is PIC. -+ lt_prog_compiler_static_F77='-non_shared' -+ ;; -+ -+ rdos*) -+ lt_prog_compiler_static_F77='-non_shared' -+ ;; -+ -+ solaris*) -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl_F77='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl_F77='-Wl,';; -+ esac -+ ;; -+ -+ sunos4*) -+ lt_prog_compiler_wl_F77='-Qoption ld ' -+ lt_prog_compiler_pic_F77='-PIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec ;then -+ lt_prog_compiler_pic_F77='-Kconform_pic' -+ lt_prog_compiler_static_F77='-Bstatic' -+ fi -+ ;; -+ -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ -+ unicos*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_can_build_shared_F77=no -+ ;; -+ -+ uts4*) -+ lt_prog_compiler_pic_F77='-pic' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ -+ *) -+ lt_prog_compiler_can_build_shared_F77=no -+ ;; -+ esac -+ fi -+ -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } -+ -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$lt_prog_compiler_pic_F77"; then -+ -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } -+if test "${lt_prog_compiler_pic_works_F77+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_prog_compiler_pic_works_F77=no -+ ac_outfile=conftest.$ac_objext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$lt_prog_compiler_pic_F77" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:14084: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:14088: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_prog_compiler_pic_works_F77=yes -+ fi -+ fi -+ $rm conftest* -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } -+ -+if test x"$lt_prog_compiler_pic_works_F77" = xyes; then -+ case $lt_prog_compiler_pic_F77 in -+ "" | " "*) ;; -+ *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; -+ esac -+else -+ lt_prog_compiler_pic_F77= -+ lt_prog_compiler_can_build_shared_F77=no -+fi -+ -+fi -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ lt_prog_compiler_pic_F77= -+ ;; -+ *) -+ lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" -+ ;; -+esac -+ -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+if test "${lt_prog_compiler_static_works_F77+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_prog_compiler_static_works_F77=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_prog_compiler_static_works_F77=yes -+ fi -+ else -+ lt_prog_compiler_static_works_F77=yes -+ fi -+ fi -+ $rm conftest* -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 -+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } -+ -+if test x"$lt_prog_compiler_static_works_F77" = xyes; then -+ : -+else -+ lt_prog_compiler_static_F77= -+fi -+ -+ -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_c_o_F77=no -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:14188: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:14192: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_c_o_F77=yes -+ fi -+ fi -+ chmod u+w . 2>&5 -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } -+ -+ -+hard_links="nottested" -+if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } -+ if test "$hard_links" = no; then -+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi -+ -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -+ -+ runpath_var= -+ allow_undefined_flag_F77= -+ enable_shared_with_static_runtimes_F77=no -+ archive_cmds_F77= -+ archive_expsym_cmds_F77= -+ old_archive_From_new_cmds_F77= -+ old_archive_from_expsyms_cmds_F77= -+ export_dynamic_flag_spec_F77= -+ whole_archive_flag_spec_F77= -+ thread_safe_flag_spec_F77= -+ hardcode_libdir_flag_spec_F77= -+ hardcode_libdir_flag_spec_ld_F77= -+ hardcode_libdir_separator_F77= -+ hardcode_direct_F77=no -+ hardcode_minus_L_F77=no -+ hardcode_shlibpath_var_F77=unsupported -+ link_all_deplibs_F77=unknown -+ hardcode_automatic_F77=no -+ module_cmds_F77= -+ module_expsym_cmds_F77= -+ always_export_symbols_F77=no -+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ include_expsyms_F77= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+ esac -+ -+ ld_shlibs_F77=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' -+ -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_F77='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_F77= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix3* | aix4* | aix5*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ ld_shlibs_F77=no -+ cat <&2 -+ -+*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** to be unable to reliably create shared libraries on AIX. -+*** Therefore, libtool is disabling shared libraries support. If you -+*** really care for shared libraries, you may want to modify your PATH -+*** so that a non-GNU linker is found, and then restart. -+ -+EOF -+ fi -+ ;; -+ -+ amigaos*) -+ archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_minus_L_F77=yes -+ -+ # Samuel A. Falvo II reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we can't use -+ # them. -+ ld_shlibs_F77=no -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag_F77=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ allow_undefined_flag_F77=unsupported -+ always_export_symbols_F77=no -+ enable_shared_with_static_runtimes_F77=yes -+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ -+ interix[3-9]*) -+ hardcode_direct_F77=no -+ hardcode_shlibpath_var_F77=no -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_F77='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ link_all_deplibs_F77=no -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -+ wlarc= -+ else -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; -+ -+ solaris*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ ld_shlibs_F77=no -+ cat <&2 -+ -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+EOF -+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -+ ld_shlibs_F77=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ sunos4*) -+ archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ esac -+ -+ if test "$ld_shlibs_F77" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec_F77= -+ export_dynamic_flag_spec_F77= -+ whole_archive_flag_spec_F77= -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ allow_undefined_flag_F77=unsupported -+ always_export_symbols_F77=yes -+ archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ hardcode_minus_L_F77=yes -+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ hardcode_direct_F77=unsupported -+ fi -+ ;; -+ -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ else -+ export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ fi -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ archive_cmds_F77='' -+ hardcode_direct_F77=yes -+ hardcode_libdir_separator_F77=':' -+ link_all_deplibs_F77=yes -+ -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[012]|aix4.[012].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ hardcode_direct_F77=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ hardcode_minus_L_F77=yes -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_libdir_separator_F77= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi -+ -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols_F77=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ allow_undefined_flag_F77='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+ program main -+ -+ end -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" -+ archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag_F77="-z nodefs" -+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+ program main -+ -+ end -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ no_undefined_flag_F77=' ${wl}-bernotok' -+ allow_undefined_flag_F77=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec_F77='$convenience' -+ archive_cmds_need_lc_F77=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ amigaos*) -+ archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_minus_L_F77=yes -+ # see comment about different semantics on the GNU ld section -+ ld_shlibs_F77=no -+ ;; -+ -+ bsdi[45]*) -+ export_dynamic_flag_spec_F77=-rdynamic -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec_F77=' ' -+ allow_undefined_flag_F77=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_From_new_cmds_F77='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ fix_srcfile_path_F77='`cygpath -w "$srcfile"`' -+ enable_shared_with_static_runtimes_F77=yes -+ ;; -+ -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc_F77=no -+ hardcode_direct_F77=no -+ hardcode_automatic_F77=yes -+ hardcode_shlibpath_var_F77=unsupported -+ whole_archive_flag_spec_F77='' -+ link_all_deplibs_F77=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_F77=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ dgux*) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ freebsd1*) -+ ld_shlibs_F77=no -+ ;; -+ -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_F77=yes -+ hardcode_minus_L_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | dragonfly*) -+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ hpux9*) -+ if test "$GCC" = yes; then -+ archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ fi -+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ hardcode_direct_F77=yes -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_F77=yes -+ export_dynamic_flag_spec_F77='${wl}-E' -+ ;; -+ -+ hpux10*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ -+ hardcode_direct_F77=yes -+ export_dynamic_flag_spec_F77='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_F77=yes -+ fi -+ ;; -+ -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_libdir_flag_spec_ld_F77='+b $libdir' -+ hardcode_direct_F77=no -+ hardcode_shlibpath_var_F77=no -+ ;; -+ *) -+ hardcode_direct_F77=yes -+ export_dynamic_flag_spec_F77='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_F77=yes -+ ;; -+ esac -+ fi -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' -+ fi -+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ link_all_deplibs_F77=yes -+ ;; -+ -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -+ else -+ archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ newsos6) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_F77=yes -+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_F77='${wl}-E' -+ else -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ ;; -+ *) -+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ -+ os2*) -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_minus_L_F77=yes -+ allow_undefined_flag_F77=unsupported -+ archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; -+ -+ osf3*) -+ if test "$GCC" = yes; then -+ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ allow_undefined_flag_F77=' -expect_unresolved \*' -+ archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ ;; -+ -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -+ else -+ allow_undefined_flag_F77=' -expect_unresolved \*' -+ archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' -+ -+ # Both c and cxx compiler support -rpath directly -+ hardcode_libdir_flag_spec_F77='-rpath $libdir' -+ fi -+ hardcode_libdir_separator_F77=: -+ ;; -+ -+ solaris*) -+ no_undefined_flag_F77=' -z text' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ wlarc='' -+ archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_shlibpath_var_F77=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ if test "$GCC" = yes; then -+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' -+ fi -+ ;; -+ esac -+ link_all_deplibs_F77=yes -+ ;; -+ -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_direct_F77=yes -+ hardcode_minus_L_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ sysv4) -+ case $host_vendor in -+ sni) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_F77=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ reload_cmds_F77='$CC -r -o $output$reload_objs' -+ hardcode_direct_F77=no -+ ;; -+ motorola) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ sysv4.3*) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var_F77=no -+ export_dynamic_flag_spec_F77='-Bexport' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var_F77=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ ld_shlibs_F77=yes -+ fi -+ ;; -+ -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -+ no_undefined_flag_F77='${wl}-z,text' -+ archive_cmds_need_lc_F77=no -+ hardcode_shlibpath_var_F77=no -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ no_undefined_flag_F77='${wl}-z,text' -+ allow_undefined_flag_F77='${wl}-z,nodefs' -+ archive_cmds_need_lc_F77=no -+ hardcode_shlibpath_var_F77=no -+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator_F77=':' -+ link_all_deplibs_F77=yes -+ export_dynamic_flag_spec_F77='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ uts4*) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ *) -+ ld_shlibs_F77=no -+ ;; -+ esac -+ fi -+ -+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -+echo "${ECHO_T}$ld_shlibs_F77" >&6; } -+test "$ld_shlibs_F77" = no && can_build_shared=no -+ -+# -+# Do we need to explicitly link libc? -+# -+case "x$archive_cmds_need_lc_F77" in -+x|xyes) -+ # Assume -lc should be added -+ archive_cmds_need_lc_F77=yes -+ -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $archive_cmds_F77 in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } -+ $rm conftest* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl_F77 -+ pic_flag=$lt_prog_compiler_pic_F77 -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag_F77 -+ allow_undefined_flag_F77= -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ then -+ archive_cmds_need_lc_F77=no -+ else -+ archive_cmds_need_lc_F77=yes -+ fi -+ allow_undefined_flag_F77=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } -+ ;; -+ esac -+ fi -+ ;; -+esac -+ -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+ -+need_lib_prefix=unknown -+hardcode_into_libs=no -+ -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown -+ -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH -+ -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ -+aix4* | aix5*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[01] | aix4.[01].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib.so -+ # instead of lib.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; -+ -+amigaos*) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; -+ -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; -+ -+bsdi[45]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; -+ -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no -+ -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $rm \$dlpath' -+ shlibpath_overrides_runpath=yes -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; -+ -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; -+ -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; -+ -+dgux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+freebsd1*) -+ dynamic_linker=no -+ ;; -+ -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[01]* | freebsdelf3.[01]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ -+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; -+ -+gnu*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ ;; -+ -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case $host_cpu in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; -+ -+interix[3-9]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; -+ -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; -+ -+# This must be Linux ELF. -+linux* | k*bsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes -+ -+ # Append ld.so.conf contents to the search path -+ if test -f /etc/ld.so.conf; then -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ fi -+ -+ # We used to test for /lib/ld.so.1 and disable shared libraries on -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ ;; -+ -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+nto-qnx*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+openbsd*) -+ version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; -+ -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; -+ -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; -+ -+rdos*) -+ dynamic_linker=no -+ ;; -+ -+solaris*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; -+ -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; -+ -+sysv4 | sysv4.3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; -+ -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+*) -+ dynamic_linker=no -+ ;; -+esac -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } -+test "$dynamic_linker" = no && can_build_shared=no -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+hardcode_action_F77= -+if test -n "$hardcode_libdir_flag_spec_F77" || \ -+ test -n "$runpath_var_F77" || \ -+ test "X$hardcode_automatic_F77" = "Xyes" ; then -+ -+ # We can hardcode non-existant directories. -+ if test "$hardcode_direct_F77" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && -+ test "$hardcode_minus_L_F77" != no; then -+ # Linking always hardcodes the temporary library directory. -+ hardcode_action_F77=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action_F77=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action_F77=unsupported -+fi -+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -+echo "${ECHO_T}$hardcode_action_F77" >&6; } -+ -+if test "$hardcode_action_F77" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+ -+ -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_F77 \ -+ CC_F77 \ -+ LD_F77 \ -+ lt_prog_compiler_wl_F77 \ -+ lt_prog_compiler_pic_F77 \ -+ lt_prog_compiler_static_F77 \ -+ lt_prog_compiler_no_builtin_flag_F77 \ -+ export_dynamic_flag_spec_F77 \ -+ thread_safe_flag_spec_F77 \ -+ whole_archive_flag_spec_F77 \ -+ enable_shared_with_static_runtimes_F77 \ -+ old_archive_cmds_F77 \ -+ old_archive_from_new_cmds_F77 \ -+ predep_objects_F77 \ -+ postdep_objects_F77 \ -+ predeps_F77 \ -+ postdeps_F77 \ -+ compiler_lib_search_path_F77 \ -+ archive_cmds_F77 \ -+ archive_expsym_cmds_F77 \ -+ postinstall_cmds_F77 \ -+ postuninstall_cmds_F77 \ -+ old_archive_from_expsyms_cmds_F77 \ -+ allow_undefined_flag_F77 \ -+ no_undefined_flag_F77 \ -+ export_symbols_cmds_F77 \ -+ hardcode_libdir_flag_spec_F77 \ -+ hardcode_libdir_flag_spec_ld_F77 \ -+ hardcode_libdir_separator_F77 \ -+ hardcode_automatic_F77 \ -+ module_cmds_F77 \ -+ module_expsym_cmds_F77 \ -+ lt_cv_prog_compiler_c_o_F77 \ -+ fix_srcfile_path_F77 \ -+ exclude_expsyms_F77 \ -+ include_expsyms_F77; do -+ -+ case $var in -+ old_archive_cmds_F77 | \ -+ old_archive_from_new_cmds_F77 | \ -+ archive_cmds_F77 | \ -+ archive_expsym_cmds_F77 | \ -+ module_cmds_F77 | \ -+ module_expsym_cmds_F77 | \ -+ old_archive_from_expsyms_cmds_F77 | \ -+ export_symbols_cmds_F77 | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ ;; -+ *) -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ;; -+ esac -+ done -+ -+ case $lt_echo in -+ *'\$0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -+ ;; -+ esac -+ -+cfgfile="$ofile" -+ -+ cat <<__EOF__ >> "$cfgfile" -+# ### BEGIN LIBTOOL TAG CONFIG: $tagname -+ -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL -+ -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared -+ -+# Whether or not to build static libraries. -+build_old_libs=$enable_static -+ -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc_F77 -+ -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 -+ -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install -+ -+# The host system. -+host_alias=$host_alias -+host=$host -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os -+ -+# An echo program that does not interpret backslashes. -+echo=$lt_echo -+ -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS -+ -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ -+# A language-specific compiler. -+CC=$lt_compiler_F77 -+ -+# Is the compiler the GNU C compiler? -+with_gcc=$GCC_F77 -+ -+# An ERE matcher. -+EGREP=$lt_EGREP -+ -+# The linker used to build libraries. -+LD=$lt_LD_F77 -+ -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S -+ -+# A BSD-compatible nm program. -+NM=$lt_NM -+ -+# A symbol stripping program -+STRIP=$lt_STRIP -+ -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD -+ -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" -+ -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" -+ -+# Used on cygwin: assembler. -+AS="$AS" -+ -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir -+ -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds -+ -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_F77 -+ -+# Object file suffix (normally "o"). -+objext="$ac_objext" -+ -+# Old archive suffix (normally "a"). -+libext="$libext" -+ -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' -+ -+# Executable file suffix (normally ""). -+exeext="$exeext" -+ -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic_F77 -+pic_mode=$pic_mode -+ -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len -+ -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 -+ -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks -+ -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix -+ -+# Do we need a version for libraries? -+need_version=$need_version -+ -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen -+ -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self -+ -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static -+ -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static_F77 -+ -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 -+ -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 -+ -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 -+ -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77 -+ -+# Library versioning type. -+version_type=$version_type -+ -+# Format of library name prefix. -+libname_spec=$lt_libname_spec -+ -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec -+ -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec -+ -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_old_archive_cmds_F77 -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 -+ -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 -+ -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_archive_cmds_F77 -+archive_expsym_cmds=$lt_archive_expsym_cmds_F77 -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds -+ -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds_F77 -+module_expsym_cmds=$lt_module_expsym_cmds_F77 -+ -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_predep_objects_F77 -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects_F77 -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps_F77 -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_postdeps_F77 -+ -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path_F77 -+ -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=$lt_deplibs_check_method -+ -+# Command to use when deplibs_check_method == file_magic. -+file_magic_cmd=$lt_file_magic_cmd -+ -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag_F77 -+ -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag_F77 -+ -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds -+ -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval -+ -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var -+ -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var -+ -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action_F77 -+ -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs -+ -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 -+ -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 -+ -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 -+ -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$hardcode_direct_F77 -+ -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$hardcode_minus_L_F77 -+ -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var_F77 -+ -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$hardcode_automatic_F77 -+ -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" -+ -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs_F77 -+ -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path -+ -+# Set to yes if exported symbols are required. -+always_export_symbols=$always_export_symbols_F77 -+ -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds_F77 -+ -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms_F77 -+ -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms_F77 -+ -+# ### END LIBTOOL TAG CONFIG: $tagname -+ -+__EOF__ -+ -+ -+else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi -+fi -+ -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+CC="$lt_save_CC" -+ -+ else -+ tagname="" -+ fi -+ ;; -+ -+ GCJ) -+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then -+ -+ -+# Source file extension for Java test sources. -+ac_ext=java -+ -+# Object file extension for compiled Java test sources. -+objext=o -+objext_GCJ=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="class foo {}" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+ -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${GCJ-"gcj"} -+compiler=$CC -+compiler_GCJ=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ -+# GCJ did not exist at the time GCC didn't implicitly link libc in. -+archive_cmds_need_lc_GCJ=no -+ -+old_archive_cmds_GCJ=$old_archive_cmds -+ -+ -+lt_prog_compiler_no_builtin_flag_GCJ= -+ -+if test "$GCC" = yes; then -+ lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' -+ -+ -+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_rtti_exceptions=no -+ ac_outfile=conftest.$ac_objext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="-fno-rtti -fno-exceptions" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:16388: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:16392: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_rtti_exceptions=yes -+ fi -+ fi -+ $rm conftest* -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } -+ -+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -+ lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" -+else -+ : -+fi -+ -+fi -+ -+lt_prog_compiler_wl_GCJ= -+lt_prog_compiler_pic_GCJ= -+lt_prog_compiler_static_GCJ= -+ -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } -+ -+ if test "$GCC" = yes; then -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_static_GCJ='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ fi -+ ;; -+ -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ -+ mingw* | cygwin* | pw32* | os2*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' -+ ;; -+ -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ lt_prog_compiler_pic_GCJ='-fno-common' -+ ;; -+ -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ lt_prog_compiler_can_build_shared_GCJ=no -+ enable_shared=no -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ lt_prog_compiler_pic_GCJ=-Kconform_pic -+ fi -+ ;; -+ -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_GCJ='-fPIC' -+ ;; -+ esac -+ ;; -+ -+ *) -+ lt_prog_compiler_pic_GCJ='-fPIC' -+ ;; -+ esac -+ else -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ else -+ lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_GCJ='-qnocommon' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ ;; -+ esac -+ ;; -+ -+ mingw* | cygwin* | pw32* | os2*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' -+ ;; -+ -+ hpux9* | hpux10* | hpux11*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_GCJ='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive' -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ # PIC (with -KPIC) is the default. -+ lt_prog_compiler_static_GCJ='-non_shared' -+ ;; -+ -+ newsos6) -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; -+ -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ icc* | ecc*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-fpic' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; -+ ccc*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ # All Alpha code is PIC. -+ lt_prog_compiler_static_GCJ='-non_shared' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ lt_prog_compiler_wl_GCJ='' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ -+ osf3* | osf4* | osf5*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ # All OSF/1 code is PIC. -+ lt_prog_compiler_static_GCJ='-non_shared' -+ ;; -+ -+ rdos*) -+ lt_prog_compiler_static_GCJ='-non_shared' -+ ;; -+ -+ solaris*) -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl_GCJ='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl_GCJ='-Wl,';; -+ esac -+ ;; -+ -+ sunos4*) -+ lt_prog_compiler_wl_GCJ='-Qoption ld ' -+ lt_prog_compiler_pic_GCJ='-PIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; -+ -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec ;then -+ lt_prog_compiler_pic_GCJ='-Kconform_pic' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ fi -+ ;; -+ -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; -+ -+ unicos*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_can_build_shared_GCJ=no -+ ;; -+ -+ uts4*) -+ lt_prog_compiler_pic_GCJ='-pic' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; -+ -+ *) -+ lt_prog_compiler_can_build_shared_GCJ=no -+ ;; -+ esac -+ fi -+ -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } -+ -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$lt_prog_compiler_pic_GCJ"; then -+ -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } -+if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_prog_compiler_pic_works_GCJ=no -+ ac_outfile=conftest.$ac_objext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$lt_prog_compiler_pic_GCJ" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:16678: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:16682: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_prog_compiler_pic_works_GCJ=yes -+ fi -+ fi -+ $rm conftest* -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } -+ -+if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then -+ case $lt_prog_compiler_pic_GCJ in -+ "" | " "*) ;; -+ *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; -+ esac -+else -+ lt_prog_compiler_pic_GCJ= -+ lt_prog_compiler_can_build_shared_GCJ=no -+fi -+ -+fi -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ lt_prog_compiler_pic_GCJ= -+ ;; -+ *) -+ lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ" -+ ;; -+esac -+ -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_prog_compiler_static_works_GCJ=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_prog_compiler_static_works_GCJ=yes -+ fi -+ else -+ lt_prog_compiler_static_works_GCJ=yes -+ fi -+ fi -+ $rm conftest* -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 -+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } -+ -+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then -+ : -+else -+ lt_prog_compiler_static_GCJ= -+fi -+ -+ -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_c_o_GCJ=no -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:16782: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:16786: \$? = $ac_status" >&5 -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_c_o_GCJ=yes -+ fi -+ fi -+ chmod u+w . 2>&5 -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } -+ -+ -+hard_links="nottested" -+if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } -+ if test "$hard_links" = no; then -+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi -+ -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -+ -+ runpath_var= -+ allow_undefined_flag_GCJ= -+ enable_shared_with_static_runtimes_GCJ=no -+ archive_cmds_GCJ= -+ archive_expsym_cmds_GCJ= -+ old_archive_From_new_cmds_GCJ= -+ old_archive_from_expsyms_cmds_GCJ= -+ export_dynamic_flag_spec_GCJ= -+ whole_archive_flag_spec_GCJ= -+ thread_safe_flag_spec_GCJ= -+ hardcode_libdir_flag_spec_GCJ= -+ hardcode_libdir_flag_spec_ld_GCJ= -+ hardcode_libdir_separator_GCJ= -+ hardcode_direct_GCJ=no -+ hardcode_minus_L_GCJ=no -+ hardcode_shlibpath_var_GCJ=unsupported -+ link_all_deplibs_GCJ=unknown -+ hardcode_automatic_GCJ=no -+ module_cmds_GCJ= -+ module_expsym_cmds_GCJ= -+ always_export_symbols_GCJ=no -+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ include_expsyms_GCJ= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+ esac -+ -+ ld_shlibs_GCJ=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' -+ -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_GCJ= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix3* | aix4* | aix5*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ ld_shlibs_GCJ=no -+ cat <&2 -+ -+*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** to be unable to reliably create shared libraries on AIX. -+*** Therefore, libtool is disabling shared libraries support. If you -+*** really care for shared libraries, you may want to modify your PATH -+*** so that a non-GNU linker is found, and then restart. -+ -+EOF -+ fi -+ ;; -+ -+ amigaos*) -+ archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_minus_L_GCJ=yes -+ -+ # Samuel A. Falvo II reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we can't use -+ # them. -+ ld_shlibs_GCJ=no -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag_GCJ=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ allow_undefined_flag_GCJ=unsupported -+ always_export_symbols_GCJ=no -+ enable_shared_with_static_runtimes_GCJ=yes -+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; -+ -+ interix[3-9]*) -+ hardcode_direct_GCJ=no -+ hardcode_shlibpath_var_GCJ=no -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ link_all_deplibs_GCJ=no -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; -+ -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -+ wlarc= -+ else -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; -+ -+ solaris*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ ld_shlibs_GCJ=no -+ cat <&2 -+ -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+EOF -+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -+ ld_shlibs_GCJ=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ sunos4*) -+ archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; -+ esac -+ -+ if test "$ld_shlibs_GCJ" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec_GCJ= -+ export_dynamic_flag_spec_GCJ= -+ whole_archive_flag_spec_GCJ= -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ allow_undefined_flag_GCJ=unsupported -+ always_export_symbols_GCJ=yes -+ archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ hardcode_minus_L_GCJ=yes -+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ hardcode_direct_GCJ=unsupported -+ fi -+ ;; -+ -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ else -+ export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ fi -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ archive_cmds_GCJ='' -+ hardcode_direct_GCJ=yes -+ hardcode_libdir_separator_GCJ=':' -+ link_all_deplibs_GCJ=yes -+ -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[012]|aix4.[012].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ hardcode_direct_GCJ=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ hardcode_minus_L_GCJ=yes -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_libdir_separator_GCJ= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi -+ -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols_GCJ=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ allow_undefined_flag_GCJ='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" -+ archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag_GCJ="-z nodefs" -+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ -+ hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ no_undefined_flag_GCJ=' ${wl}-bernotok' -+ allow_undefined_flag_GCJ=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec_GCJ='$convenience' -+ archive_cmds_need_lc_GCJ=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ amigaos*) -+ archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_minus_L_GCJ=yes -+ # see comment about different semantics on the GNU ld section -+ ld_shlibs_GCJ=no -+ ;; -+ -+ bsdi[45]*) -+ export_dynamic_flag_spec_GCJ=-rdynamic -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec_GCJ=' ' -+ allow_undefined_flag_GCJ=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_From_new_cmds_GCJ='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' -+ enable_shared_with_static_runtimes_GCJ=yes -+ ;; -+ -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc_GCJ=no -+ hardcode_direct_GCJ=no -+ hardcode_automatic_GCJ=yes -+ hardcode_shlibpath_var_GCJ=unsupported -+ whole_archive_flag_spec_GCJ='' -+ link_all_deplibs_GCJ=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_GCJ=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ dgux*) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ freebsd1*) -+ ld_shlibs_GCJ=no -+ ;; -+ -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_GCJ=yes -+ hardcode_minus_L_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | dragonfly*) -+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ hpux9*) -+ if test "$GCC" = yes; then -+ archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ fi -+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ hardcode_direct_GCJ=yes -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_GCJ=yes -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ ;; -+ -+ hpux10*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ -+ hardcode_direct_GCJ=yes -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_GCJ=yes -+ fi -+ ;; -+ -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' -+ hardcode_direct_GCJ=no -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ *) -+ hardcode_direct_GCJ=yes -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_GCJ=yes -+ ;; -+ esac -+ fi -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' -+ fi -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ link_all_deplibs_GCJ=yes -+ ;; -+ -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -+ else -+ archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ newsos6) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_GCJ=yes -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ else -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ ;; -+ *) -+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; -+ -+ os2*) -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_minus_L_GCJ=yes -+ allow_undefined_flag_GCJ=unsupported -+ archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; -+ -+ osf3*) -+ if test "$GCC" = yes; then -+ allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ allow_undefined_flag_GCJ=' -expect_unresolved \*' -+ archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ ;; -+ -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -+ else -+ allow_undefined_flag_GCJ=' -expect_unresolved \*' -+ archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' -+ -+ # Both c and cxx compiler support -rpath directly -+ hardcode_libdir_flag_spec_GCJ='-rpath $libdir' -+ fi -+ hardcode_libdir_separator_GCJ=: -+ ;; -+ -+ solaris*) -+ no_undefined_flag_GCJ=' -z text' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ wlarc='' -+ archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ if test "$GCC" = yes; then -+ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' -+ fi -+ ;; -+ esac -+ link_all_deplibs_GCJ=yes -+ ;; -+ -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_minus_L_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ sysv4) -+ case $host_vendor in -+ sni) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_GCJ=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ reload_cmds_GCJ='$CC -r -o $output$reload_objs' -+ hardcode_direct_GCJ=no -+ ;; -+ motorola) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ sysv4.3*) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var_GCJ=no -+ export_dynamic_flag_spec_GCJ='-Bexport' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var_GCJ=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ ld_shlibs_GCJ=yes -+ fi -+ ;; -+ -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -+ no_undefined_flag_GCJ='${wl}-z,text' -+ archive_cmds_need_lc_GCJ=no -+ hardcode_shlibpath_var_GCJ=no -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ no_undefined_flag_GCJ='${wl}-z,text' -+ allow_undefined_flag_GCJ='${wl}-z,nodefs' -+ archive_cmds_need_lc_GCJ=no -+ hardcode_shlibpath_var_GCJ=no -+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator_GCJ=':' -+ link_all_deplibs_GCJ=yes -+ export_dynamic_flag_spec_GCJ='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ uts4*) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ *) -+ ld_shlibs_GCJ=no -+ ;; -+ esac -+ fi -+ -+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } -+test "$ld_shlibs_GCJ" = no && can_build_shared=no -+ -+# -+# Do we need to explicitly link libc? -+# -+case "x$archive_cmds_need_lc_GCJ" in -+x|xyes) -+ # Assume -lc should be added -+ archive_cmds_need_lc_GCJ=yes -+ -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $archive_cmds_GCJ in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } -+ $rm conftest* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl_GCJ -+ pic_flag=$lt_prog_compiler_pic_GCJ -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ -+ allow_undefined_flag_GCJ= -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ then -+ archive_cmds_need_lc_GCJ=no -+ else -+ archive_cmds_need_lc_GCJ=yes -+ fi -+ allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } -+ ;; -+ esac -+ fi -+ ;; -+esac -+ -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+ -+need_lib_prefix=unknown -+hardcode_into_libs=no -+ -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown -+ -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH -+ -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ -+aix4* | aix5*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with -@@ -5003,29 +17929,28 @@ - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) -- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -- echo ' yes ' -- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -- : -- else -- can_build_shared=no -- fi -- ;; -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; - esac -- # AIX (on Power*) has no versioning support, so currently we can -- # not hardcode correct soname into executable. Probably we can -- # add versioning support to collect2, so additional links can -- # be useful in future. -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' -- soname_spec='${libname}${release}.so$major' -+ soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi -@@ -5034,25 +17959,24 @@ - amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - - beos*) -- library_names_spec='${libname}.so' -+ library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - --bsdi4*) -+bsdi[45]*) - version_type=linux - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -- export_dynamic_flag_spec=-rdynamic - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs -@@ -5060,29 +17984,56 @@ - - cygwin* | mingw* | pw32*) - version_type=windows -+ shrext_cmds=".dll" - need_version=no - need_lib_prefix=no -+ - case $GCC,$host_os in -- yes,cygwin*) -+ yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' -- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' -- postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ -- $install_prog .libs/$dlname \$dldir/$dlname' -- postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -+ shlibpath_overrides_runpath=yes -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac - ;; -- yes,mingw*) -- library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` -- ;; -- yes,pw32*) -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' -- ;; -+ - *) -- library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib' -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' -@@ -5095,30 +18046,48 @@ - version_type=darwin - need_lib_prefix=no - need_version=no -- # FIXME: Relying on posixy $() will cause problems for -- # cross-compilation, but unfortunately the echo tests do not -- # yet detect zsh echo's removal of \ escapes. -- library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' -- soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; -+ -+dgux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH - ;; - - freebsd1*) - dynamic_linker=no - ;; - --freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) -- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac -@@ -5127,10 +18096,19 @@ - freebsd2*) - shlibpath_overrides_runpath=yes - ;; -- *) -+ freebsd3.[01]* | freebsdelf3.[01]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ -+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; - esac - ;; - -@@ -5138,8 +18116,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -@@ -5147,33 +18125,87 @@ - hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. -- dynamic_linker="$host_os dld.sl" - version_type=sunos - need_lib_prefix=no - need_version=no -- shlibpath_var=SHLIB_PATH -- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' -- soname_spec='${libname}${release}.sl$major' -+ case $host_cpu in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - --irix5* | irix6*) -- version_type=irix -+interix[3-9]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac - need_lib_prefix=no - need_version=no -- soname_spec='${libname}${release}.so$major' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in -- irix5*) -+ irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD -- *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; -- *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; -- *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; -@@ -5182,20 +18214,21 @@ - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes - ;; - - # No shared lib support for Linux oldld, aout, or coff. --linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) -+linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - - # This must be Linux ELF. --linux-gnu*) -+linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -@@ -5204,6 +18237,12 @@ - # before this can be enabled. - hardcode_into_libs=yes - -+ # Append ld.so.conf contents to the search path -+ if test -f /etc/ld.so.conf; then -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ fi -+ - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, -@@ -5213,17 +18252,29 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH -@@ -5233,879 +18284,763 @@ - - newsos6) - version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+nto-qnx*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - - openbsd*) - version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no -- need_version=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- case "$host_os" in -- openbsd2.[89] | openbsd2.[89].*) -- shlibpath_overrides_runpath=no -- ;; -- *) -- shlibpath_overrides_runpath=yes -- ;; -- esac -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac - else - shlibpath_overrides_runpath=yes - fi -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH - ;; - - os2*) - libname_spec='$name' -+ shrext_cmds=".dll" - need_lib_prefix=no -- library_names_spec='$libname.dll $libname.a' -+ library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - - osf3* | osf4* | osf5*) - version_type=osf -+ need_lib_prefix=no - need_version=no -- soname_spec='${libname}${release}.so' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - --sco3.2v5*) -- version_type=osf -- soname_spec='${libname}${release}.so$major' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+rdos*) -+ dynamic_linker=no -+ ;; -+ -+solaris*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; -+ -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; -+ -+sysv4 | sysv4.3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; -+ -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - --solaris*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- # ldd complains unless libraries are executable -- postinstall_cmds='chmod +x $lib' -- ;; -+*) -+ dynamic_linker=no -+ ;; -+esac -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } -+test "$dynamic_linker" = no && can_build_shared=no -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+hardcode_action_GCJ= -+if test -n "$hardcode_libdir_flag_spec_GCJ" || \ -+ test -n "$runpath_var_GCJ" || \ -+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then -+ -+ # We can hardcode non-existant directories. -+ if test "$hardcode_direct_GCJ" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && -+ test "$hardcode_minus_L_GCJ" != no; then -+ # Linking always hardcodes the temporary library directory. -+ hardcode_action_GCJ=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action_GCJ=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action_GCJ=unsupported -+fi -+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -+echo "${ECHO_T}$hardcode_action_GCJ" >&6; } -+ -+if test "$hardcode_action_GCJ" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+ -+ -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_GCJ \ -+ CC_GCJ \ -+ LD_GCJ \ -+ lt_prog_compiler_wl_GCJ \ -+ lt_prog_compiler_pic_GCJ \ -+ lt_prog_compiler_static_GCJ \ -+ lt_prog_compiler_no_builtin_flag_GCJ \ -+ export_dynamic_flag_spec_GCJ \ -+ thread_safe_flag_spec_GCJ \ -+ whole_archive_flag_spec_GCJ \ -+ enable_shared_with_static_runtimes_GCJ \ -+ old_archive_cmds_GCJ \ -+ old_archive_from_new_cmds_GCJ \ -+ predep_objects_GCJ \ -+ postdep_objects_GCJ \ -+ predeps_GCJ \ -+ postdeps_GCJ \ -+ compiler_lib_search_path_GCJ \ -+ archive_cmds_GCJ \ -+ archive_expsym_cmds_GCJ \ -+ postinstall_cmds_GCJ \ -+ postuninstall_cmds_GCJ \ -+ old_archive_from_expsyms_cmds_GCJ \ -+ allow_undefined_flag_GCJ \ -+ no_undefined_flag_GCJ \ -+ export_symbols_cmds_GCJ \ -+ hardcode_libdir_flag_spec_GCJ \ -+ hardcode_libdir_flag_spec_ld_GCJ \ -+ hardcode_libdir_separator_GCJ \ -+ hardcode_automatic_GCJ \ -+ module_cmds_GCJ \ -+ module_expsym_cmds_GCJ \ -+ lt_cv_prog_compiler_c_o_GCJ \ -+ fix_srcfile_path_GCJ \ -+ exclude_expsyms_GCJ \ -+ include_expsyms_GCJ; do -+ -+ case $var in -+ old_archive_cmds_GCJ | \ -+ old_archive_from_new_cmds_GCJ | \ -+ archive_cmds_GCJ | \ -+ archive_expsym_cmds_GCJ | \ -+ module_cmds_GCJ | \ -+ module_expsym_cmds_GCJ | \ -+ old_archive_from_expsyms_cmds_GCJ | \ -+ export_symbols_cmds_GCJ | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ ;; -+ *) -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ;; -+ esac -+ done -+ -+ case $lt_echo in -+ *'\$0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -+ ;; -+ esac -+ -+cfgfile="$ofile" -+ -+ cat <<__EOF__ >> "$cfgfile" -+# ### BEGIN LIBTOOL TAG CONFIG: $tagname -+ -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL -+ -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared -+ -+# Whether or not to build static libraries. -+build_old_libs=$enable_static -+ -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc_GCJ -+ -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ -+ -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install -+ -+# The host system. -+host_alias=$host_alias -+host=$host -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os -+ -+# An echo program that does not interpret backslashes. -+echo=$lt_echo -+ -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS -+ -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ -+# A language-specific compiler. -+CC=$lt_compiler_GCJ -+ -+# Is the compiler the GNU C compiler? -+with_gcc=$GCC_GCJ -+ -+# An ERE matcher. -+EGREP=$lt_EGREP -+ -+# The linker used to build libraries. -+LD=$lt_LD_GCJ -+ -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S -+ -+# A BSD-compatible nm program. -+NM=$lt_NM -+ -+# A symbol stripping program -+STRIP=$lt_STRIP -+ -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD -+ -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" -+ -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" -+ -+# Used on cygwin: assembler. -+AS="$AS" -+ -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir -+ -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds -+ -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_GCJ -+ -+# Object file suffix (normally "o"). -+objext="$ac_objext" -+ -+# Old archive suffix (normally "a"). -+libext="$libext" -+ -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' -+ -+# Executable file suffix (normally ""). -+exeext="$exeext" -+ -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic_GCJ -+pic_mode=$pic_mode -+ -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len -+ -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ -+ -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks -+ -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix -+ -+# Do we need a version for libraries? -+need_version=$need_version -+ -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen - --sunos4*) -- version_type=sunos -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- fi -- need_version=yes -- ;; -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self - --sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- case $host_vendor in -- sni) -- shlibpath_overrides_runpath=no -- ;; -- motorola) -- need_lib_prefix=no -- need_version=no -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -- ;; -- esac -- ;; -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static - --uts4*) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static_GCJ - --dgux*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ - --sysv4*MP*) -- if test -d /usr/nec ;then -- version_type=linux -- library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' -- soname_spec='$libname.so.$major' -- shlibpath_var=LD_LIBRARY_PATH -- fi -- ;; -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ - --*) -- dynamic_linker=no -- ;; --esac --echo "$as_me:5359: result: $dynamic_linker" >&5 --echo "${ECHO_T}$dynamic_linker" >&6 --test "$dynamic_linker" = no && can_build_shared=no -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ - --# Report the final consequences. --echo "$as_me:5364: checking if libtool supports shared libraries" >&5 --echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 --echo "$as_me:5366: result: $can_build_shared" >&5 --echo "${ECHO_T}$can_build_shared" >&6 -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ - --echo "$as_me:5369: checking whether to build shared libraries" >&5 --echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 --test "$can_build_shared" = "no" && enable_shared=no -+# Library versioning type. -+version_type=$version_type - --# On AIX, shared libraries and static libraries use the same namespace, and --# are all built from PIC. --case "$host_os" in --aix3*) -- test "$enable_shared" = yes && enable_static=no -- if test -n "$RANLIB"; then -- archive_cmds="$archive_cmds~\$RANLIB \$lib" -- postinstall_cmds='$RANLIB $lib' -- fi -- ;; -+# Format of library name prefix. -+libname_spec=$lt_libname_spec - --aix4*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -- fi -- ;; --esac --echo "$as_me:5390: result: $enable_shared" >&5 --echo "${ECHO_T}$enable_shared" >&6 -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec - --echo "$as_me:5393: checking whether to build static libraries" >&5 --echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 --# Make sure either enable_shared or enable_static is yes. --test "$enable_shared" = yes || enable_static=yes --echo "$as_me:5397: result: $enable_static" >&5 --echo "${ECHO_T}$enable_static" >&6 -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec - --if test "$hardcode_action" = relink; then -- # Fast installation is not supported -- enable_fast_install=no --elif test "$shlibpath_overrides_runpath" = yes || -- test "$enable_shared" = no; then -- # Fast installation is not necessary -- enable_fast_install=needless --fi -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_old_archive_cmds_GCJ -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds - --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --if test "$GCC" = yes; then -- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" --fi -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ - --if test "x$enable_dlopen" != xyes; then -- enable_dlopen=unknown -- enable_dlopen_self=unknown -- enable_dlopen_self_static=unknown --else -- lt_cv_dlopen=no -- lt_cv_dlopen_libs= -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ - -- case $host_os in -- beos*) -- lt_cv_dlopen="load_add_on" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -- ;; -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_archive_cmds_GCJ -+archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds - -- cygwin* | mingw* | pw32*) -- lt_cv_dlopen="LoadLibrary" -- lt_cv_dlopen_libs= -- ;; -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds_GCJ -+module_expsym_cmds=$lt_module_expsym_cmds_GCJ - -- *) -- echo "$as_me:5435: checking for shl_load" >&5 --echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 --if test "${ac_cv_func_shl_load+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --#line 5441 "configure" --#include "confdefs.h" --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char shl_load (); below. */ --#include --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char shl_load (); --char (*f) (); -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib - --int --main () --{ --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_shl_load) || defined (__stub___shl_load) --choke me --#else --f = shl_load; --#endif -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_predep_objects_GCJ -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects_GCJ -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps_GCJ -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_postdeps_GCJ -+ -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5472: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:5475: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5478: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:5481: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_shl_load=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_func_shl_load=no --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --fi --echo "$as_me:5491: result: $ac_cv_func_shl_load" >&5 --echo "${ECHO_T}$ac_cv_func_shl_load" >&6 --if test $ac_cv_func_shl_load = yes; then -- lt_cv_dlopen="shl_load" --else -- echo "$as_me:5496: checking for shl_load in -ldld" >&5 --echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 --if test "${ac_cv_lib_dld_shl_load+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line 5504 "configure" --#include "confdefs.h" -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=$lt_deplibs_check_method - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char shl_load (); --int --main () --{ --shl_load (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5523: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:5526: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5529: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:5532: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_dld_shl_load=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_dld_shl_load=no --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:5543: result: $ac_cv_lib_dld_shl_load" >&5 --echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 --if test $ac_cv_lib_dld_shl_load = yes; then -- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" --else -- echo "$as_me:5548: checking for dlopen" >&5 --echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 --if test "${ac_cv_func_dlopen+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --#line 5554 "configure" --#include "confdefs.h" --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char dlopen (); below. */ --#include --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char dlopen (); --char (*f) (); -+# Command to use when deplibs_check_method == file_magic. -+file_magic_cmd=$lt_file_magic_cmd - --int --main () --{ --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_dlopen) || defined (__stub___dlopen) --choke me --#else --f = dlopen; --#endif -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag_GCJ - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5585: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:5588: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5591: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:5594: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_dlopen=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_func_dlopen=no --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --fi --echo "$as_me:5604: result: $ac_cv_func_dlopen" >&5 --echo "${ECHO_T}$ac_cv_func_dlopen" >&6 --if test $ac_cv_func_dlopen = yes; then -- lt_cv_dlopen="dlopen" --else -- echo "$as_me:5609: checking for dlopen in -ldl" >&5 --echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 --if test "${ac_cv_lib_dl_dlopen+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line 5617 "configure" --#include "confdefs.h" -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag_GCJ -+ -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char dlopen (); --int --main () --{ --dlopen (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5636: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:5639: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5642: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:5645: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_dl_dlopen=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_dl_dlopen=no --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:5656: result: $ac_cv_lib_dl_dlopen" >&5 --echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 --if test $ac_cv_lib_dl_dlopen = yes; then -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" --else -- echo "$as_me:5661: checking for dlopen in -lsvld" >&5 --echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 --if test "${ac_cv_lib_svld_dlopen+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lsvld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line 5669 "configure" --#include "confdefs.h" -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char dlopen (); --int --main () --{ --dlopen (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5688: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:5691: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5694: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:5697: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_svld_dlopen=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_svld_dlopen=no --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:5708: result: $ac_cv_lib_svld_dlopen" >&5 --echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 --if test $ac_cv_lib_svld_dlopen = yes; then -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" --else -- echo "$as_me:5713: checking for dld_link in -ldld" >&5 --echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 --if test "${ac_cv_lib_dld_dld_link+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line 5721 "configure" --#include "confdefs.h" -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char dld_link (); --int --main () --{ --dld_link (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5740: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:5743: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5746: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:5749: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_dld_dld_link=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_dld_dld_link=no --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:5760: result: $ac_cv_lib_dld_dld_link" >&5 --echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 --if test $ac_cv_lib_dld_dld_link = yes; then -- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" --fi -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - --fi -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - --fi -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var - --fi -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var - --fi -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath - --fi -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action_GCJ - -- ;; -- esac -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs - -- if test "x$lt_cv_dlopen" != xno; then -- enable_dlopen=yes -- else -- enable_dlopen=no -- fi -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ - -- case $lt_cv_dlopen in -- dlopen) -- save_CPPFLAGS="$CPPFLAGS" -- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ - -- save_LDFLAGS="$LDFLAGS" -- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ - -- save_LIBS="$LIBS" -- LIBS="$lt_cv_dlopen_libs $LIBS" -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$hardcode_direct_GCJ - -- echo "$as_me:5796: checking whether a program can dlopen itself" >&5 --echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 --if test "${lt_cv_dlopen_self+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test "$cross_compiling" = yes; then : -- lt_cv_dlopen_self=cross --else -- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -- lt_status=$lt_dlunknown -- cat > conftest.$ac_ext < --#endif -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ - --#include -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$hardcode_automatic_GCJ - --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif --#endif -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" - --/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -- find out it does not work in some platform. */ --#ifndef LT_DLLAZY_OR_NOW --# ifdef RTLD_LAZY --# define LT_DLLAZY_OR_NOW RTLD_LAZY --# else --# ifdef DL_LAZY --# define LT_DLLAZY_OR_NOW DL_LAZY --# else --# ifdef RTLD_NOW --# define LT_DLLAZY_OR_NOW RTLD_NOW --# else --# ifdef DL_NOW --# define LT_DLLAZY_OR_NOW DL_NOW --# else --# define LT_DLLAZY_OR_NOW 0 --# endif --# endif --# endif --# endif --#endif -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs_GCJ - --#ifdef __cplusplus --extern "C" void exit (int); --#endif -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - --void fnord() { int i=42;} --int main () --{ -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path - -- exit (status); --} --EOF -- if { (eval echo "$as_me:5868: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:5871: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) 2>/dev/null -- lt_status=$? -- case x$lt_status in -- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; -- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; -- x$lt_unknown|x*) lt_cv_dlopen_self=no ;; -- esac -- else : -- # compilation failed -- lt_cv_dlopen_self=no -+# Set to yes if exported symbols are required. -+always_export_symbols=$always_export_symbols_GCJ -+ -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds_GCJ -+ -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms_GCJ -+ -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms_GCJ -+ -+# ### END LIBTOOL TAG CONFIG: $tagname -+ -+__EOF__ -+ -+ -+else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" - fi - fi --rm -fr conftest* - --fi --echo "$as_me:5888: result: $lt_cv_dlopen_self" >&5 --echo "${ECHO_T}$lt_cv_dlopen_self" >&6 - -- if test "x$lt_cv_dlopen_self" = xyes; then -- LDFLAGS="$LDFLAGS $link_static_flag" -- echo "$as_me:5893: checking whether a statically linked program can dlopen itself" >&5 --echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 --if test "${lt_cv_dlopen_self_static+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test "$cross_compiling" = yes; then : -- lt_cv_dlopen_self_static=cross --else -- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -- lt_status=$lt_dlunknown -- cat > conftest.$ac_ext < --#endif -+CC="$lt_save_CC" -+ -+ else -+ tagname="" -+ fi -+ ;; - --#include -+ RC) - --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif --#endif - --/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -- find out it does not work in some platform. */ --#ifndef LT_DLLAZY_OR_NOW --# ifdef RTLD_LAZY --# define LT_DLLAZY_OR_NOW RTLD_LAZY --# else --# ifdef DL_LAZY --# define LT_DLLAZY_OR_NOW DL_LAZY --# else --# ifdef RTLD_NOW --# define LT_DLLAZY_OR_NOW RTLD_NOW --# else --# ifdef DL_NOW --# define LT_DLLAZY_OR_NOW DL_NOW --# else --# define LT_DLLAZY_OR_NOW 0 --# endif --# endif --# endif --# endif --#endif -+# Source file extension for RC test sources. -+ac_ext=rc - --#ifdef __cplusplus --extern "C" void exit (int); --#endif -+# Object file extension for compiled RC test sources. -+objext=o -+objext_RC=$objext - --void fnord() { int i=42;} --int main () --{ -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -+# Code to be used in simple compile tests -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -+# Code to be used in simple link tests -+lt_simple_link_test_code="$lt_simple_compile_test_code" - -- exit (status); --} --EOF -- if { (eval echo "$as_me:5965: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:5968: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) 2>/dev/null -- lt_status=$? -- case x$lt_status in -- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; -- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; -- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; -- esac -- else : -- # compilation failed -- lt_cv_dlopen_self_static=no -- fi --fi --rm -fr conftest* -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. - --fi --echo "$as_me:5985: result: $lt_cv_dlopen_self_static" >&5 --echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 -- fi -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} - -- CPPFLAGS="$save_CPPFLAGS" -- LDFLAGS="$save_LDFLAGS" -- LIBS="$save_LIBS" -- ;; -- esac -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -- case $lt_cv_dlopen_self in -- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -- *) enable_dlopen_self=unknown ;; -- esac -+# Allow CC to be a program name with arguments. -+compiler=$CC - -- case $lt_cv_dlopen_self_static in -- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -- *) enable_dlopen_self_static=unknown ;; -- esac --fi - --if test "$enable_shared" = yes && test "$GCC" = yes; then -- case $archive_cmds in -- *'~'*) -- # FIXME: we may have to deal with multi-command sequences. -- ;; -- '$CC '*) -- # Test whether the compiler implicitly links with -lc since on some -- # systems, -lgcc has to come before -lc. If gcc already passes -lc -- # to ld, don't add -lc before -lgcc. -- echo "$as_me:6015: checking whether -lc should be explicitly linked in" >&5 --echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 -- if test "${lt_cv_archive_cmds_need_lc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- $rm conftest* -- echo 'static int dummy;' > conftest.$ac_ext -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* - -- if { (eval echo "$as_me:6023: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:6026: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$lt_cv_prog_cc_wl -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- save_allow_undefined_flag=$allow_undefined_flag -- allow_undefined_flag= -- if { (eval echo "$as_me:6040: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -- (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -- ac_status=$? -- echo "$as_me:6043: \$? = $ac_status" >&5 -- (exit $ac_status); } -- then -- lt_cv_archive_cmds_need_lc=no -- else -- lt_cv_archive_cmds_need_lc=yes -- fi -- allow_undefined_flag=$save_allow_undefined_flag -- else -- cat conftest.err 1>&5 -- fi --fi - -- echo "$as_me:6056: result: $lt_cv_archive_cmds_need_lc" >&5 --echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 -- ;; -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${RC-"windres"} -+compiler=$CC -+compiler_RC=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; - esac --fi --need_lc=${lt_cv_archive_cmds_need_lc-yes} -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - --# The second clause should only fire when bootstrapping the -+lt_cv_prog_compiler_c_o_RC=yes -+ -+# The else clause should only fire when bootstrapping the - # libtool distribution, otherwise you forgot to ship ltmain.sh - # with your package, and you will get complaints that there are - # no rules to generate ltmain.sh. - if test -f "$ltmain"; then -- : --else -- # If there is no Makefile yet, we rely on a make rule to execute -- # `config.status --recheck' to rerun these tests and create the -- # libtool script then. -- test -f Makefile && make "$ltmain" --fi -- --if test -f "$ltmain"; then -- trap "$rm \"${ofile}T\"; exit 1" 1 2 15 -- $rm -f "${ofile}T" -- -- echo creating $ofile -- -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. -- for var in echo old_CC old_CFLAGS \ -- AR AR_FLAGS CC LD LN_S NM SHELL \ -- reload_flag reload_cmds wl \ -- pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ -- thread_safe_flag_spec whole_archive_flag_spec libname_spec \ -- library_names_spec soname_spec \ -- RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ -- old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \ -- postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \ -- old_striplib striplib file_magic_cmd export_symbols_cmds \ -- deplibs_check_method allow_undefined_flag no_undefined_flag \ -- finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ -- global_symbol_to_c_name_address \ -- hardcode_libdir_flag_spec hardcode_libdir_separator \ -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -- compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_RC \ -+ CC_RC \ -+ LD_RC \ -+ lt_prog_compiler_wl_RC \ -+ lt_prog_compiler_pic_RC \ -+ lt_prog_compiler_static_RC \ -+ lt_prog_compiler_no_builtin_flag_RC \ -+ export_dynamic_flag_spec_RC \ -+ thread_safe_flag_spec_RC \ -+ whole_archive_flag_spec_RC \ -+ enable_shared_with_static_runtimes_RC \ -+ old_archive_cmds_RC \ -+ old_archive_from_new_cmds_RC \ -+ predep_objects_RC \ -+ postdep_objects_RC \ -+ predeps_RC \ -+ postdeps_RC \ -+ compiler_lib_search_path_RC \ -+ archive_cmds_RC \ -+ archive_expsym_cmds_RC \ -+ postinstall_cmds_RC \ -+ postuninstall_cmds_RC \ -+ old_archive_from_expsyms_cmds_RC \ -+ allow_undefined_flag_RC \ -+ no_undefined_flag_RC \ -+ export_symbols_cmds_RC \ -+ hardcode_libdir_flag_spec_RC \ -+ hardcode_libdir_flag_spec_ld_RC \ -+ hardcode_libdir_separator_RC \ -+ hardcode_automatic_RC \ -+ module_cmds_RC \ -+ module_expsym_cmds_RC \ -+ lt_cv_prog_compiler_c_o_RC \ -+ fix_srcfile_path_RC \ -+ exclude_expsyms_RC \ -+ include_expsyms_RC; do - - case $var in -- reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ -- old_postinstall_cmds | old_postuninstall_cmds | \ -- export_symbols_cmds | archive_cmds | archive_expsym_cmds | \ -- extract_expsyms_cmds | old_archive_from_expsyms_cmds | \ -+ old_archive_cmds_RC | \ -+ old_archive_from_new_cmds_RC | \ -+ archive_cmds_RC | \ -+ archive_expsym_cmds_RC | \ -+ module_cmds_RC | \ -+ module_expsym_cmds_RC | \ -+ old_archive_from_expsyms_cmds_RC | \ -+ export_symbols_cmds_RC | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ -- finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; -@@ -6115,43 +19050,16 @@ - esac - done - -- cat <<__EOF__ > "${ofile}T" --#! $SHELL -- --# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. --# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) --# NOTE: Changes made to this file will be lost: look at ltmain.sh. --# --# Copyright (C) 1996-2000 Free Software Foundation, Inc. --# Originally by Gordon Matzigkeit , 1996 --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, but --# WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --# --# As a special exception to the GNU General Public License, if you --# distribute this file as part of a program that contains a --# configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- --# Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="sed -e s/^X//" -+ case $lt_echo in -+ *'\$0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -+ ;; -+ esac - --# The HP-UX ksh and POSIX shell print the target directory to stdout --# if CDPATH is set. --if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -+cfgfile="$ofile" - --# ### BEGIN LIBTOOL CONFIG -+ cat <<__EOF__ >> "$cfgfile" -+# ### BEGIN LIBTOOL TAG CONFIG: $tagname - - # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -@@ -6165,7 +19073,10 @@ - build_old_libs=$enable_static - - # Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$need_lc -+build_libtool_need_lc=$archive_cmds_need_lc_RC -+ -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC - - # Whether or not to optimize for fast installation. - fast_install=$enable_fast_install -@@ -6173,6 +19084,12 @@ - # The host system. - host_alias=$host_alias - host=$host -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - - # An echo program that does not interpret backslashes. - echo=$lt_echo -@@ -6181,14 +19098,23 @@ - AR=$lt_AR - AR_FLAGS=$lt_AR_FLAGS - --# The default C compiler. --CC=$lt_CC -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ -+# A language-specific compiler. -+CC=$lt_compiler_RC - - # Is the compiler the GNU C compiler? --with_gcc=$GCC -+with_gcc=$GCC_RC -+ -+# An ERE matcher. -+EGREP=$lt_EGREP - - # The linker used to build libraries. --LD=$lt_LD -+LD=$lt_LD_RC - - # Whether we need hard or soft links. - LN_S=$lt_LN_S -@@ -6197,7 +19123,7 @@ - NM=$lt_NM - - # A symbol stripping program --STRIP=$STRIP -+STRIP=$lt_STRIP - - # Used to examine libraries when file_magic_cmd begins "file" - MAGIC_CMD=$MAGIC_CMD -@@ -6219,7 +19145,7 @@ - reload_cmds=$lt_reload_cmds - - # How to pass a linker flag through the compiler. --wl=$lt_wl -+wl=$lt_lt_prog_compiler_wl_RC - - # Object file suffix (normally "o"). - objext="$ac_objext" -@@ -6227,20 +19153,23 @@ - # Old archive suffix (normally "a"). - libext="$libext" - -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' -+ - # Executable file suffix (normally ""). - exeext="$exeext" - - # Additional compiler flags for building library objects. --pic_flag=$lt_pic_flag -+pic_flag=$lt_lt_prog_compiler_pic_RC - pic_mode=$pic_mode - --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_compiler_c_o -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len - --# Can we write directly to a .lo ? --compiler_o_lo=$lt_compiler_o_lo -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -6259,19 +19188,19 @@ - dlopen_self_static=$enable_dlopen_self_static - - # Compiler flag to prevent dynamic linking. --link_static_flag=$lt_link_static_flag -+link_static_flag=$lt_lt_prog_compiler_static_RC - - # Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_no_builtin_flag -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC - - # Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_export_dynamic_flag_spec -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC - - # Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_whole_archive_flag_spec -+whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC - - # Compiler flag to generate thread-safe objects. --thread_safe_flag_spec=$lt_thread_safe_flag_spec -+thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC - - # Library versioning type. - version_type=$version_type -@@ -6288,26 +19217,50 @@ - - # Commands used to build and install an old-style archive. - RANLIB=$lt_RANLIB --old_archive_cmds=$lt_old_archive_cmds -+old_archive_cmds=$lt_old_archive_cmds_RC - old_postinstall_cmds=$lt_old_postinstall_cmds - old_postuninstall_cmds=$lt_old_postuninstall_cmds - - # Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_old_archive_from_new_cmds -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC - - # Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC - - # Commands used to build and install a shared archive. --archive_cmds=$lt_archive_cmds --archive_expsym_cmds=$lt_archive_expsym_cmds -+archive_cmds=$lt_archive_cmds_RC -+archive_expsym_cmds=$lt_archive_expsym_cmds_RC - postinstall_cmds=$lt_postinstall_cmds - postuninstall_cmds=$lt_postuninstall_cmds - -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds_RC -+module_expsym_cmds=$lt_module_expsym_cmds_RC -+ - # Commands to strip libraries. - old_striplib=$lt_old_striplib - striplib=$lt_striplib - -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_predep_objects_RC -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects_RC -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps_RC -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_postdeps_RC -+ -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path_RC -+ - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - -@@ -6315,10 +19268,10 @@ - file_magic_cmd=$lt_file_magic_cmd - - # Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_allow_undefined_flag -+allow_undefined_flag=$lt_allow_undefined_flag_RC - - # Flag that forces no undefined symbols. --no_undefined_flag=$lt_no_undefined_flag -+no_undefined_flag=$lt_no_undefined_flag_RC - - # Commands used to finish a libtool library installation in a directory. - finish_cmds=$lt_finish_cmds -@@ -6327,13 +19280,13 @@ - finish_eval=$lt_finish_eval - - # Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_global_symbol_pipe -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - - # Transform the output of nm in a proper C declaration --global_symbol_to_cdecl=$lt_global_symbol_to_cdecl -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - - # Transform the output of nm in a C name address pair --global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - - # This is the shared library runtime path variable. - runpath_var=$runpath_var -@@ -6345,36 +19298,45 @@ - shlibpath_overrides_runpath=$shlibpath_overrides_runpath - - # How to hardcode a shared library path into an executable. --hardcode_action=$hardcode_action -+hardcode_action=$hardcode_action_RC - - # Whether we should hardcode library paths into libraries. - hardcode_into_libs=$hardcode_into_libs - - # Flag to hardcode \$libdir into a binary during linking. - # This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC -+ -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC - - # Whether we need a single -rpath flag with a separated argument. --hardcode_libdir_separator=$lt_hardcode_libdir_separator -+hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC - --# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the - # resulting binary. --hardcode_direct=$hardcode_direct -+hardcode_direct=$hardcode_direct_RC - - # Set to yes if using the -LDIR flag during linking hardcodes DIR into the - # resulting binary. --hardcode_minus_L=$hardcode_minus_L -+hardcode_minus_L=$hardcode_minus_L_RC - - # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into - # the resulting binary. --hardcode_shlibpath_var=$hardcode_shlibpath_var -+hardcode_shlibpath_var=$hardcode_shlibpath_var_RC -+ -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$hardcode_automatic_RC - - # Variables whose values should be saved in libtool wrapper scripts and - # restored at relink time. - variables_saved_for_relink="$variables_saved_for_relink" - - # Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$link_all_deplibs -+link_all_deplibs=$link_all_deplibs_RC - - # Compile-time system search path for libraries - sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -@@ -6383,233 +19345,78 @@ - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. --always_export_symbols=$always_export_symbols -+always_export_symbols=$always_export_symbols_RC - - # The commands to list exported symbols. --export_symbols_cmds=$lt_export_symbols_cmds -+export_symbols_cmds=$lt_export_symbols_cmds_RC - - # The commands to extract the exported symbol list from a shared archive. - extract_expsyms_cmds=$lt_extract_expsyms_cmds - - # Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_exclude_expsyms -+exclude_expsyms=$lt_exclude_expsyms_RC - - # Symbols that must always be exported. --include_expsyms=$lt_include_expsyms -+include_expsyms=$lt_include_expsyms_RC - --# ### END LIBTOOL CONFIG -+# ### END LIBTOOL TAG CONFIG: $tagname - - __EOF__ - -- case $host_os in -- aix3*) -- cat <<\EOF >> "${ofile}T" - --# AIX sometimes has problems with the GCC collect2 program. For some --# reason, if we set the COLLECT_NAMES environment variable, the problems --# vanish in a puff of smoke. --if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES -+else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi --EOF -- ;; -- esac - -- case $host_os in -- cygwin* | mingw* | pw32* | os2*) -- cat <<'EOF' >> "${ofile}T" -- # This is a source program that is used to create dlls on Windows -- # Don't remove nor modify the starting and closing comments --# /* ltdll.c starts here */ --# #define WIN32_LEAN_AND_MEAN --# #include --# #undef WIN32_LEAN_AND_MEAN --# #include --# --# #ifndef __CYGWIN__ --# # ifdef __CYGWIN32__ --# # define __CYGWIN__ __CYGWIN32__ --# # endif --# #endif --# --# #ifdef __cplusplus --# extern "C" { --# #endif --# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); --# #ifdef __cplusplus --# } --# #endif --# --# #ifdef __CYGWIN__ --# #include --# DECLARE_CYGWIN_DLL( DllMain ); --# #endif --# HINSTANCE __hDllInstance_base; --# --# BOOL APIENTRY --# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) --# { --# __hDllInstance_base = hInst; --# return TRUE; --# } --# /* ltdll.c ends here */ -- # This is a source program that is used to create import libraries -- # on Windows for dlls which lack them. Don't remove nor modify the -- # starting and closing comments --# /* impgen.c starts here */ --# /* Copyright (C) 1999-2000 Free Software Foundation, Inc. --# --# This file is part of GNU libtool. --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --# */ --# --# #include /* for printf() */ --# #include /* for open(), lseek(), read() */ --# #include /* for O_RDONLY, O_BINARY */ --# #include /* for strdup() */ --# --# /* O_BINARY isn't required (or even defined sometimes) under Unix */ --# #ifndef O_BINARY --# #define O_BINARY 0 --# #endif --# --# static unsigned int --# pe_get16 (fd, offset) --# int fd; --# int offset; --# { --# unsigned char b[2]; --# lseek (fd, offset, SEEK_SET); --# read (fd, b, 2); --# return b[0] + (b[1]<<8); --# } --# --# static unsigned int --# pe_get32 (fd, offset) --# int fd; --# int offset; --# { --# unsigned char b[4]; --# lseek (fd, offset, SEEK_SET); --# read (fd, b, 4); --# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); --# } --# --# static unsigned int --# pe_as32 (ptr) --# void *ptr; --# { --# unsigned char *b = ptr; --# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); --# } --# --# int --# main (argc, argv) --# int argc; --# char *argv[]; --# { --# int dll; --# unsigned long pe_header_offset, opthdr_ofs, num_entries, i; --# unsigned long export_rva, export_size, nsections, secptr, expptr; --# unsigned long name_rvas, nexp; --# unsigned char *expdata, *erva; --# char *filename, *dll_name; --# --# filename = argv[1]; --# --# dll = open(filename, O_RDONLY|O_BINARY); --# if (dll < 1) --# return 1; --# --# dll_name = filename; --# --# for (i=0; filename[i]; i++) --# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':') --# dll_name = filename + i +1; --# --# pe_header_offset = pe_get32 (dll, 0x3c); --# opthdr_ofs = pe_header_offset + 4 + 20; --# num_entries = pe_get32 (dll, opthdr_ofs + 92); --# --# if (num_entries < 1) /* no exports */ --# return 1; --# --# export_rva = pe_get32 (dll, opthdr_ofs + 96); --# export_size = pe_get32 (dll, opthdr_ofs + 100); --# nsections = pe_get16 (dll, pe_header_offset + 4 +2); --# secptr = (pe_header_offset + 4 + 20 + --# pe_get16 (dll, pe_header_offset + 4 + 16)); --# --# expptr = 0; --# for (i = 0; i < nsections; i++) --# { --# char sname[8]; --# unsigned long secptr1 = secptr + 40 * i; --# unsigned long vaddr = pe_get32 (dll, secptr1 + 12); --# unsigned long vsize = pe_get32 (dll, secptr1 + 16); --# unsigned long fptr = pe_get32 (dll, secptr1 + 20); --# lseek(dll, secptr1, SEEK_SET); --# read(dll, sname, 8); --# if (vaddr <= export_rva && vaddr+vsize > export_rva) --# { --# expptr = fptr + (export_rva - vaddr); --# if (export_rva + export_size > vaddr + vsize) --# export_size = vsize - (export_rva - vaddr); --# break; --# } --# } --# --# expdata = (unsigned char*)malloc(export_size); --# lseek (dll, expptr, SEEK_SET); --# read (dll, expdata, export_size); --# erva = expdata - export_rva; --# --# nexp = pe_as32 (expdata+24); --# name_rvas = pe_as32 (expdata+32); --# --# printf ("EXPORTS\n"); --# for (i = 0; i> "${ofile}T" || (rm -f "${ofile}T"; exit 1) -+CC="$lt_save_CC" - -- mv -f "${ofile}T" "$ofile" || \ -- (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T") -- chmod +x "$ofile" -+ ;; -+ -+ *) -+ { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 -+echo "$as_me: error: Unsupported tag name: $tagname" >&2;} -+ { (exit 1); exit 1; }; } -+ ;; -+ esac -+ -+ # Append the new tag name to the list of available tags. -+ if test -n "$tagname" ; then -+ available_tags="$available_tags $tagname" -+ fi -+ fi -+ done -+ IFS="$lt_save_ifs" -+ -+ # Now substitute the updated list of available tags. -+ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then -+ mv "${ofile}T" "$ofile" -+ chmod +x "$ofile" -+ else -+ rm -f "${ofile}T" -+ { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 -+echo "$as_me: error: unable to update list of available tagged configurations." >&2;} -+ { (exit 1); exit 1; }; } -+ fi - fi - -+ -+ - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - -@@ -6618,120 +19425,186 @@ - - # Prevent multiple expansion - --ac_ext=cc -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test -n "$ac_tool_prefix"; then -- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -+if test -z "$CXX"; then -+ if test -n "$CCC"; then -+ CXX=$CCC -+ else -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:6631: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. - else -- ac_save_IFS=$IFS; IFS=$ac_path_separator --ac_dummy="$PATH" --for ac_dir in $ac_dummy; do -- IFS=$ac_save_IFS -- test -z "$ac_dir" && ac_dir=. -- $as_executable_p "$ac_dir/$ac_word" || continue --ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" --echo "$as_me:6646: found $ac_dir/$ac_word" >&5 --break -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi - done -+done -+IFS=$as_save_IFS - - fi - fi - CXX=$ac_cv_prog_CXX - if test -n "$CXX"; then -- echo "$as_me:6654: result: $CXX" >&5 --echo "${ECHO_T}$CXX" >&6 -+ { echo "$as_me:$LINENO: result: $CXX" >&5 -+echo "${ECHO_T}$CXX" >&6; } - else -- echo "$as_me:6657: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$CXX" && break - done - fi - if test -z "$CXX"; then - ac_ct_CXX=$CXX -- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:6670: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. - else -- ac_save_IFS=$IFS; IFS=$ac_path_separator --ac_dummy="$PATH" --for ac_dir in $ac_dummy; do -- IFS=$ac_save_IFS -- test -z "$ac_dir" && ac_dir=. -- $as_executable_p "$ac_dir/$ac_word" || continue --ac_cv_prog_ac_ct_CXX="$ac_prog" --echo "$as_me:6685: found $ac_dir/$ac_word" >&5 --break -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_CXX="$ac_prog" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi - done -+done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CXX=$ac_cv_prog_ac_ct_CXX - if test -n "$ac_ct_CXX"; then -- echo "$as_me:6693: result: $ac_ct_CXX" >&5 --echo "${ECHO_T}$ac_ct_CXX" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -+echo "${ECHO_T}$ac_ct_CXX" >&6; } - else -- echo "$as_me:6696: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$ac_ct_CXX" && break - done --test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - -- CXX=$ac_ct_CXX -+ if test "x$ac_ct_CXX" = x; then -+ CXX="g++" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CXX=$ac_ct_CXX -+ fi - fi - -+ fi -+fi - # Provide some information about the compiler. --echo "$as_me:6708:" \ -- "checking for C++ compiler version" >&5 -+echo "$as_me:$LINENO: checking for C++ compiler version" >&5 - ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:6711: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? -- echo "$as_me:6714: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:6716: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? -- echo "$as_me:6719: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:6721: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? -- echo "$as_me:6724: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - --echo "$as_me:6727: checking whether we are using the GNU C++ compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } - if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 6733 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - int - main () -@@ -6745,41 +19618,54 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6748: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:6751: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6754: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:6757: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_compiler_gnu=no -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_compiler_gnu=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:6769: result: $ac_cv_cxx_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } - GXX=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CXXFLAGS=${CXXFLAGS+set} - ac_save_CXXFLAGS=$CXXFLAGS --CXXFLAGS="-g" --echo "$as_me:6775: checking whether $CXX accepts -g" >&5 --echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } - if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --#line 6781 "configure" --#include "confdefs.h" -+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag -+ ac_cxx_werror_flag=yes -+ ac_cv_prog_cxx_g=no -+ CXXFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - int - main () -@@ -6790,121 +19676,133 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6793: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:6796: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6799: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:6802: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_prog_cxx_g=no --fi --rm -f conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:6812: result: $ac_cv_prog_cxx_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 --if test "$ac_test_CXXFLAGS" = set; then -- CXXFLAGS=$ac_save_CXXFLAGS --elif test $ac_cv_prog_cxx_g = yes; then -- if test "$GXX" = yes; then -- CXXFLAGS="-g -O2" -- else -- CXXFLAGS="-g" -- fi --else -- if test "$GXX" = yes; then -- CXXFLAGS="-O2" -- else -- CXXFLAGS= -- fi --fi --for ac_declaration in \ -- ''\ -- '#include ' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --#line 6839 "configure" --#include "confdefs.h" --#include --$ac_declaration -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ CXXFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ - int - main () - { --exit (42); -+ - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6852: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:6855: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6858: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:6861: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - : - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --continue --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --#line 6871 "configure" --#include "confdefs.h" --$ac_declaration -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+ CXXFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ - int - main () - { --exit (42); -+ - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6883: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:6886: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6889: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:6892: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cxx_g=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ - fi --rm -f conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } -+if test "$ac_test_CXXFLAGS" = set; then -+ CXXFLAGS=$ac_save_CXXFLAGS -+elif test $ac_cv_prog_cxx_g = yes; then -+ if test "$GXX" = yes; then -+ CXXFLAGS="-g -O2" -+ else -+ CXXFLAGS="-g" -+ fi -+else -+ if test "$GXX" = yes; then -+ CXXFLAGS="-O2" -+ else -+ CXXFLAGS= -+ fi -+fi - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -6913,8 +19811,8 @@ - - depcc="$CXX" am_compiler_list= - --echo "$as_me:6916: checking dependency style of $depcc" >&5 --echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } - if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -6929,18 +19827,34 @@ - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. -- echo '#include "conftest.h"' > conftest.c -- echo 'int i;' > conftest.h -- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) -@@ -6958,13 +19872,26 @@ - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ -- source=conftest.c object=conftest.o \ -- depfile=conftest.Po tmpdepfile=conftest.TPo \ -- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && -- grep conftest.h conftest.Po > /dev/null 2>&1 && -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- am_cv_CXX_dependencies_compiler_type=$depmode -- break -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_CXX_dependencies_compiler_type=$depmode -+ break -+ fi - fi - done - -@@ -6975,22 +19902,37 @@ - fi - - fi --echo "$as_me:6978: result: $am_cv_CXX_dependencies_compiler_type" >&5 --echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 --CXXDEPMODE="depmode=$am_cv_CXX_dependencies_compiler_type" -+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } -+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - --ac_ext=cc -+ if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then -+ am__fastdepCXX_TRUE= -+ am__fastdepCXX_FALSE='#' -+else -+ am__fastdepCXX_TRUE='#' -+ am__fastdepCXX_FALSE= -+fi -+ -+ -+ -+ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - --echo "$as_me:6988: checking whether $CXX works" >&5 --echo $ECHO_N "checking whether $CXX works... $ECHO_C" >&6 - -+{ echo "$as_me:$LINENO: checking whether $CXX works" >&5 -+echo $ECHO_N "checking whether $CXX works... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF --#line 6992 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - int - main () -@@ -7001,26 +19943,34 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7004: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:7007: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7010: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:7013: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- echo "$as_me:7015: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - LIBFCGIXX=libfcgi++.la - ECHO_CPP=echo-cpp${EXEEXT} -- echo "$as_me:7019: checking whether cin has a streambuf assignment operator" >&5 --echo $ECHO_N "checking whether cin has a streambuf assignment operator... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether cin has a streambuf assignment operator" >&5 -+echo $ECHO_N "checking whether cin has a streambuf assignment operator... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF --#line 7022 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - int - main () -@@ -7031,36 +19981,46 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7034: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:7037: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7040: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:7043: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- echo "$as_me:7045: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - --cat >>confdefs.h <<\EOF -+cat >>confdefs.h <<\_ACEOF - #define HAVE_IOSTREAM_WITHASSIGN_STREAMBUF 1 --EOF -+_ACEOF - - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --echo "$as_me:7055: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:7059: checking whether char_type is defined in the context of streambuf" >&5 --echo $ECHO_N "checking whether char_type is defined in the context of streambuf... $ECHO_C" >&6 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ { echo "$as_me:$LINENO: checking whether char_type is defined in the context of streambuf" >&5 -+echo $ECHO_N "checking whether char_type is defined in the context of streambuf... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF --#line 7062 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - int - main () -@@ -7071,38 +20031,49 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7074: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:7077: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7080: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:7083: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- echo "$as_me:7085: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - --cat >>confdefs.h <<\EOF -+cat >>confdefs.h <<\_ACEOF - #define HAVE_STREAMBUF_CHAR_TYPE 1 --EOF -+_ACEOF - - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --echo "$as_me:7095: result: no" >&5 --echo "${ECHO_T}no" >&6 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --echo "$as_me:7102: result: no" >&5 --echo "${ECHO_T}no" >&6 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+ - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -7110,169 +20081,289 @@ - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --echo "$as_me:7113: checking for gethostbyname in -lnsl" >&5 --echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 -+ -+ -+{ echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } - if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lnsl $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 7121 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char gethostbyname (); - int - main () - { --gethostbyname (); -+return gethostbyname (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7140: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:7143: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7146: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- echo "$as_me:7149: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_nsl_gethostbyname=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_nsl_gethostbyname=no -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_nsl_gethostbyname=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:7160: result: $ac_cv_lib_nsl_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } - if test $ac_cv_lib_nsl_gethostbyname = yes; then -- cat >>confdefs.h <>confdefs.h <<_ACEOF - #define HAVE_LIBNSL 1 --EOF -+_ACEOF - - LIBS="-lnsl $LIBS" - - fi - --echo "$as_me:7171: checking for socket in -lsocket" >&5 --echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 -+ -+{ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 -+echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; } - if test "${ac_cv_lib_socket_socket+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lsocket $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 7179 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char socket (); - int - main () - { --socket (); -+return socket (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7198: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:7201: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7204: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- echo "$as_me:7207: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_socket_socket=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_lib_socket_socket=no -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_socket_socket=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:7218: result: $ac_cv_lib_socket_socket" >&5 --echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 -+echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; } - if test $ac_cv_lib_socket_socket = yes; then -- cat >>confdefs.h <>confdefs.h <<_ACEOF - #define HAVE_LIBSOCKET 1 --EOF -+_ACEOF - - LIBS="-lsocket $LIBS" - - fi - -+ -+ -+ - acx_pthread_ok=no - - # First, check if the POSIX threads header, pthread.h, is available. - # If it isn't, don't bother looking for the threads libraries. --echo "$as_me:7233: checking for pthread.h" >&5 --echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 -+if test "${ac_cv_header_pthread_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for pthread.h" >&5 -+echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; } - if test "${ac_cv_header_pthread_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 -+echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; } - else -- cat >conftest.$ac_ext <<_ACEOF --#line 7239 "configure" --#include "confdefs.h" -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking pthread.h usability" >&5 -+echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default - #include - _ACEOF --if { (eval echo "$as_me:7243: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:7249: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes - else -- ac_cpp_err=yes -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no - fi --if test -z "$ac_cpp_err"; then -- ac_cv_header_pthread_h=yes -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ echo "$as_me:$LINENO: checking pthread.h presence" >&5 -+echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- ac_cv_header_pthread_h=no -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;} -+ -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for pthread.h" >&5 -+echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_pthread_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_header_pthread_h=$ac_header_preproc -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 -+echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; } -+ - fi --echo "$as_me:7268: result: $ac_cv_header_pthread_h" >&5 --echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 - if test $ac_cv_header_pthread_h = yes; then - : - else - acx_pthread_ok=noheader - fi - -+ -+ - # We must check for the threads library under a number of different - # names; the ordering is very important because some systems - # (e.g. DEC) have both -lpthread and -lpthreads, where one of the -@@ -7286,47 +20377,60 @@ - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" -- echo "$as_me:7289: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 --echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 -+echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF --#line 7292 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char pthread_join (); - int - main () - { --pthread_join (); -+return pthread_join (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7311: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:7314: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7317: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- echo "$as_me:7320: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - acx_pthread_ok=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -- echo "$as_me:7328: result: $acx_pthread_ok" >&5 --echo "${ECHO_T}$acx_pthread_ok" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 -+echo "${ECHO_T}$acx_pthread_ok" >&6; } - if test x"$acx_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -@@ -7379,19 +20483,19 @@ - - case $flag in - none) -- echo "$as_me:7382: checking whether pthreads work without any flags" >&5 --echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5 -+echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6; } - ;; - - -*) -- echo "$as_me:7387: checking whether pthreads work with $flag" >&5 --echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5 -+echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; } - PTHREAD_CFLAGS="$flag" - ;; - - *) -- echo "$as_me:7393: checking for the pthreads library -l$flag" >&5 --echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5 -+echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; } - PTHREAD_LIBS="-l$flag" - ;; - esac -@@ -7411,8 +20515,11 @@ - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - cat >conftest.$ac_ext <<_ACEOF --#line 7414 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - int - main () -@@ -7425,29 +20532,39 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7428: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:7431: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7434: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- echo "$as_me:7437: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - acx_pthread_ok=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - -- echo "$as_me:7449: result: $acx_pthread_ok" >&5 --echo "${ECHO_T}$acx_pthread_ok" >&6 -+ { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 -+echo "${ECHO_T}$acx_pthread_ok" >&6; } - if test "x$acx_pthread_ok" = xyes; then - break; - fi -@@ -7466,11 +20583,14 @@ - - # Detect AIX lossage: threads are created detached by default - # and the JOINABLE attribute has a nonstandard name (UNDETACHED). -- echo "$as_me:7469: checking for joinable pthread attribute" >&5 --echo $ECHO_N "checking for joinable pthread attribute... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5 -+echo $ECHO_N "checking for joinable pthread attribute... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF --#line 7472 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - int - main () -@@ -7481,28 +20601,40 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7484: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:7487: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7490: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- echo "$as_me:7493: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ok=PTHREAD_CREATE_JOINABLE - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ok=unknown -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ok=unknown - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - if test x"$ok" = xunknown; then - cat >conftest.$ac_ext <<_ACEOF --#line 7504 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - int - main () -@@ -7513,48 +20645,57 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7516: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:7519: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7522: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- echo "$as_me:7525: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ok=PTHREAD_CREATE_UNDETACHED - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ok=unknown -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ok=unknown - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi - if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then - --cat >>confdefs.h <<\EOF -+cat >>confdefs.h <<\_ACEOF - #define PTHREAD_CREATE_JOINABLE $ok --EOF -+_ACEOF - - fi -- echo "$as_me:7542: result: ${ok}" >&5 --echo "${ECHO_T}${ok}" >&6 -+ { echo "$as_me:$LINENO: result: ${ok}" >&5 -+echo "${ECHO_T}${ok}" >&6; } - if test x"$ok" = xunknown; then -- { echo "$as_me:7545: WARNING: we do not know how to create joinable pthreads" >&5 -+ { echo "$as_me:$LINENO: WARNING: we do not know how to create joinable pthreads" >&5 - echo "$as_me: WARNING: we do not know how to create joinable pthreads" >&2;} - fi - -- echo "$as_me:7549: checking if more special flags are required for pthreads" >&5 --echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5 -+echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; } - flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";; - *solaris* | alpha*-osf*) flag="-D_REENTRANT";; - esac -- echo "$as_me:7556: result: ${flag}" >&5 --echo "${ECHO_T}${flag}" >&6 -+ { echo "$as_me:$LINENO: result: ${flag}" >&5 -+echo "${ECHO_T}${flag}" >&6; } - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi -@@ -7565,41 +20706,50 @@ - # More AIX lossage: must compile with cc_r - # Extract the first word of "cc_r", so it can be a program name with args. - set dummy cc_r; ac_word=$2 --echo "$as_me:7568: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$PTHREAD_CC"; then - ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. - else -- ac_save_IFS=$IFS; IFS=$ac_path_separator --ac_dummy="$PATH" --for ac_dir in $ac_dummy; do -- IFS=$ac_save_IFS -- test -z "$ac_dir" && ac_dir=. -- $as_executable_p "$ac_dir/$ac_word" || continue --ac_cv_prog_PTHREAD_CC="cc_r" --echo "$as_me:7583: found $ac_dir/$ac_word" >&5 --break -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_PTHREAD_CC="cc_r" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done - done -+IFS=$as_save_IFS - - test -z "$ac_cv_prog_PTHREAD_CC" && ac_cv_prog_PTHREAD_CC="${CC}" - fi - fi - PTHREAD_CC=$ac_cv_prog_PTHREAD_CC - if test -n "$PTHREAD_CC"; then -- echo "$as_me:7592: result: $PTHREAD_CC" >&5 --echo "${ECHO_T}$PTHREAD_CC" >&6 -+ { echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5 -+echo "${ECHO_T}$PTHREAD_CC" >&6; } - else -- echo "$as_me:7595: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - else - PTHREAD_CC="$CC" - fi - -+ -+ -+ -+ - # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: - if test x"$acx_pthread_ok" = xyes; then - THREADED=threaded${EXEEXT} -@@ -7609,520 +20759,466 @@ - - fi - --echo "$as_me:7612: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 --if test "${ac_cv_header_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --#line 7618 "configure" --#include "confdefs.h" --#include --#include --#include --#include -- --_ACEOF --if { (eval echo "$as_me:7626: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:7632: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_cv_header_stdc=yes --else -- echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- ac_cv_header_stdc=no --fi --rm -f conftest.err conftest.$ac_ext -- --if test $ac_cv_header_stdc = yes; then -- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --#line 7654 "configure" --#include "confdefs.h" --#include -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "memchr" >/dev/null 2>&1; then -- : --else -- ac_cv_header_stdc=no --fi --rm -f conftest* -- --fi -- --if test $ac_cv_header_stdc = yes; then -- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --#line 7672 "configure" --#include "confdefs.h" --#include -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "free" >/dev/null 2>&1; then -- : --else -- ac_cv_header_stdc=no --fi --rm -f conftest* -- --fi -- --if test $ac_cv_header_stdc = yes; then -- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -- : --else -- cat >conftest.$ac_ext <<_ACEOF --#line 7693 "configure" --#include "confdefs.h" --#include --#if ((' ' & 0x0FF) == 0x020) --# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) --#else --# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ -- || ('j' <= (c) && (c) <= 'r') \ -- || ('s' <= (c) && (c) <= 'z')) --# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) --#endif -- --#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) --int --main () --{ -- int i; -- for (i = 0; i < 256; i++) -- if (XOR (islower (i), ISLOWER (i)) -- || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); --} --_ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:7719: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:7722: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:7724: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:7727: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_header_stdc=no --fi --rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi --fi --fi --echo "$as_me:7740: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6 --if test $ac_cv_header_stdc = yes; then -- --cat >>confdefs.h <<\EOF --#define STDC_HEADERS 1 --EOF -- --fi -- --# On IRIX 5.3, sys/types and inttypes.h are conflicting. -- --for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -- inttypes.h stdint.h unistd.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:7756: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --#line 7762 "configure" --#include "confdefs.h" --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:7768: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:7771: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7774: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:7777: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --eval "$as_ac_Header=no" --fi --rm -f conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:7787: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_prog_cc_stdc=no --ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --#line 7805 "configure" --#include "confdefs.h" --#include --#include --#include --#include --/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ --struct buf { int x; }; --FILE * (*rcsopen) (struct buf *, struct stat *, int); --static char *e (p, i) -- char **p; -- int i; --{ -- return p[i]; --} --static char *f (char * (*g) (char **, int), char **p, ...) --{ -- char *s; -- va_list v; -- va_start (v,p); -- s = g (p, va_arg (v,int)); -- va_end (v); -- return s; --} --int test (int i, double x); --struct s1 {int (*f) (int a);}; --struct s2 {int (*f) (double a);}; --int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); --int argc; --char **argv; --int --main () --{ --return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -- ; -- return 0; --} --_ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" --do -- CC="$ac_save_CC $ac_arg" -- rm -f conftest.$ac_objext --if { (eval echo "$as_me:7854: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:7857: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7860: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:7863: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --fi --rm -f conftest.$ac_objext --done --rm -f conftest.$ac_ext conftest.$ac_objext --CC=$ac_save_CC - --fi - --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:7880: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -- *) -- echo "$as_me:7883: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; --esac - -- echo "$as_me:7888: checking for ssize_t" >&5 --echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for ssize_t" >&5 -+echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; } - if test "${ac_cv_type_ssize_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 7894 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - $ac_includes_default -+typedef ssize_t ac__type_new_; - int - main () - { --if ((ssize_t *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (ssize_t)) -+if (sizeof (ac__type_new_)) - return 0; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7909: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:7912: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7915: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:7918: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_ssize_t=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_type_ssize_t=no -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_type_ssize_t=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:7928: result: $ac_cv_type_ssize_t" >&5 --echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 -+echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; } - if test $ac_cv_type_ssize_t = yes; then - : - else - --cat >>confdefs.h <>confdefs.h <<_ACEOF - #define ssize_t int --EOF -+_ACEOF - - fi - -- echo "$as_me:7940: checking for sun_len in sys/un.h" >&5 --echo $ECHO_N "checking for sun_len in sys/un.h... $ECHO_C" >&6 -+ -+ { echo "$as_me:$LINENO: checking for sun_len in sys/un.h" >&5 -+echo $ECHO_N "checking for sun_len in sys/un.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF --#line 7943 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "sun_len" >/dev/null 2>&1; then -- echo "$as_me:7950: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ $EGREP "sun_len" >/dev/null 2>&1; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - --cat >>confdefs.h <<\EOF -+cat >>confdefs.h <<\_ACEOF - #define HAVE_SOCKADDR_UN_SUN_LEN 1 --EOF -+_ACEOF - - else -- echo "$as_me:7958: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - rm -f conftest* - -- echo "$as_me:7963: checking for fpos_t in stdio.h" >&5 --echo $ECHO_N "checking for fpos_t in stdio.h... $ECHO_C" >&6 -+ -+ { echo "$as_me:$LINENO: checking for fpos_t in stdio.h" >&5 -+echo $ECHO_N "checking for fpos_t in stdio.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF --#line 7966 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "fpos_t" >/dev/null 2>&1; then -- echo "$as_me:7973: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ $EGREP "fpos_t" >/dev/null 2>&1; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - --cat >>confdefs.h <<\EOF -+cat >>confdefs.h <<\_ACEOF - #define HAVE_FPOS 1 --EOF -+_ACEOF - - else -- echo "$as_me:7981: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - rm -f conftest* - -+ -+ -+ -+ -+ - for ac_header in sys/socket.h netdb.h netinet/in.h arpa/inet.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:7989: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --#line 7995 "configure" --#include "confdefs.h" -+fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:7999: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:8005: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes - else -- ac_cpp_err=yes -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no - fi --if test -z "$ac_cpp_err"; then -- eval "$as_ac_Header=yes" -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- eval "$as_ac_Header=no" -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+ - fi --echo "$as_me:8024: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --EOF -+_ACEOF - - fi -+ - done - -+ -+ -+ -+ - for ac_header in sys/time.h limits.h sys/param.h unistd.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:8037: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --#line 8043 "configure" --#include "confdefs.h" -+fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:8047: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:8053: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes - else -- ac_cpp_err=yes -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no - fi --if test -z "$ac_cpp_err"; then -- eval "$as_ac_Header=yes" -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- eval "$as_ac_Header=no" -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+ - fi --echo "$as_me:8072: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --EOF -+_ACEOF - - fi -+ - done - -- echo "$as_me:8082: checking for a fileno() prototype in stdio.h" >&5 --echo $ECHO_N "checking for a fileno() prototype in stdio.h... $ECHO_C" >&6 -+ -+ { echo "$as_me:$LINENO: checking for a fileno() prototype in stdio.h" >&5 -+echo $ECHO_N "checking for a fileno() prototype in stdio.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF --#line 8085 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "fileno" >/dev/null 2>&1; then -- echo "$as_me:8092: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ $EGREP "fileno" >/dev/null 2>&1; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - --cat >>confdefs.h <<\EOF -+cat >>confdefs.h <<\_ACEOF - #define HAVE_FILENO_PROTO 1 --EOF -+_ACEOF - - else -- echo "$as_me:8100: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - rm -f conftest* - -+ - if test "$HAVE_SYS_SOCKET_H"; then -- echo "$as_me:8106: checking for socklen_t in sys/socket.h" >&5 --echo $ECHO_N "checking for socklen_t in sys/socket.h... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for socklen_t in sys/socket.h" >&5 -+echo $ECHO_N "checking for socklen_t in sys/socket.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF --#line 8109 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "socklen_t" >/dev/null 2>&1; then -- echo "$as_me:8116: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ $EGREP "socklen_t" >/dev/null 2>&1; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - --cat >>confdefs.h <<\EOF -+cat >>confdefs.h <<\_ACEOF - #define HAVE_SOCKLEN 1 --EOF -+_ACEOF - - else -- echo "$as_me:8124: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - rm -f conftest* - -@@ -8131,21 +21227,21 @@ - #-------------------------------------------------------------------- - # Do we need cross-process locking on this platform? - #-------------------------------------------------------------------- -- echo "$as_me:8134: checking whether cross-process locking is required by accept()" >&5 --echo $ECHO_N "checking whether cross-process locking is required by accept()... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether cross-process locking is required by accept()" >&5 -+echo $ECHO_N "checking whether cross-process locking is required by accept()... $ECHO_C" >&6; } - case "`uname -sr`" in - IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0) -- echo "$as_me:8138: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - --cat >>confdefs.h <<\EOF -+cat >>confdefs.h <<\_ACEOF - #define USE_LOCKING 1 --EOF -+_ACEOF - - ;; - *) -- echo "$as_me:8147: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - ;; - esac - -@@ -8153,11 +21249,14 @@ - # Does va_arg(arg, long double) crash the compiler? - # hpux 9.04 compiler does and so does Stratus FTX (uses HP's compiler) - #-------------------------------------------------------------------- -- echo "$as_me:8156: checking whether va_arg(arg, long double) crashes the compiler" >&5 --echo $ECHO_N "checking whether va_arg(arg, long double) crashes the compiler... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether va_arg(arg, long double) crashes the compiler" >&5 -+echo $ECHO_N "checking whether va_arg(arg, long double) crashes the compiler... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF --#line 8159 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - int - main () -@@ -8168,40 +21267,50 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8171: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:8174: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8177: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:8180: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- echo "$as_me:8182: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --echo "$as_me:8187: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - --cat >>confdefs.h <<\EOF -+cat >>confdefs.h <<\_ACEOF - #define HAVE_VA_ARG_LONG_DOUBLE_BUG 1 --EOF -+_ACEOF - - fi --rm -f conftest.$ac_objext conftest.$ac_ext - -- echo "$as_me:8197: checking for an ANSI C-conforming const" >&5 --echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+ { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } - if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 8203 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - - int - main () -@@ -8210,10 +21319,10 @@ - #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; -- const charset x; -+ const charset cs; - /* SunOS 4.1.1 cc rejects this. */ -- char const *const *ccp; -- char **p; -+ char const *const *pcpcc; -+ char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; -@@ -8222,16 +21331,17 @@ - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; -- ccp = &g + (g ? g-g : 0); -+ pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ -- ++ccp; -- p = (char**) ccp; -- ccp = (char const *const *) p; -+ ++pcpcc; -+ ppc = (char**) pcpcc; -+ pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; -+ if (s) return 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; -@@ -8250,7 +21360,9 @@ - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; -+ if (!foo) return 0; - } -+ return !cs[0] && !zero.x; - #endif - - ; -@@ -8258,158 +21370,217 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8261: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:8264: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8267: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:8270: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_c_const=yes - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_cv_c_const=no -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_c_const=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:8280: result: $ac_cv_c_const" >&5 --echo "${ECHO_T}$ac_cv_c_const" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -+echo "${ECHO_T}$ac_cv_c_const" >&6; } - if test $ac_cv_c_const = no; then - --cat >>confdefs.h <<\EOF -+cat >>confdefs.h <<\_ACEOF - #define const --EOF -+_ACEOF - - fi - -+ -+ -+ - for ac_func in strerror - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:8293: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 8299 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case declares $ac_func. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. */ --#include --/* Override any gcc2 internal prototype to avoid an error. */ -+ which can conflict with char $ac_func (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef $ac_func -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char $ac_func (); --char (*f) (); -- --int --main () --{ - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+#if defined __stub_$ac_func || defined __stub___$ac_func - choke me --#else --f = $ac_func; - #endif - -+int -+main () -+{ -+return $ac_func (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:8330: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:8333: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:8336: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- echo "$as_me:8339: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --eval "$as_ac_var=no" -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_var=no" - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:8349: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then -- cat >>confdefs.h <>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 --EOF -+_ACEOF - - else -- LIBOBJS="$LIBOBJS $ac_func.$ac_objext" -+ case " $LIBOBJS " in -+ *" $ac_func.$ac_objext "* ) ;; -+ *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" -+ ;; -+esac -+ - fi - done - --echo "$as_me:8361: checking for inline" >&5 --echo $ECHO_N "checking for inline... $ECHO_C" >&6 -+ -+ -+{ echo "$as_me:$LINENO: checking for inline" >&5 -+echo $ECHO_N "checking for inline... $ECHO_C" >&6; } - if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF --#line 8369 "configure" --#include "confdefs.h" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #ifndef __cplusplus --static $ac_kw int static_foo () {return 0; } --$ac_kw int foo () {return 0; } -+typedef int foo_t; -+static $ac_kw foo_t static_foo () {return 0; } -+$ac_kw foo_t foo () {return 0; } - #endif - - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8378: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:8381: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8384: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- echo "$as_me:8387: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_c_inline=$ac_kw; break -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_c_inline=$ac_kw - else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ test "$ac_cv_c_inline" != no && break - done - - fi --echo "$as_me:8398: result: $ac_cv_c_inline" >&5 --echo "${ECHO_T}$ac_cv_c_inline" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -+echo "${ECHO_T}$ac_cv_c_inline" >&6; } -+ -+ - case $ac_cv_c_inline in - inline | yes) ;; -- no) --cat >>confdefs.h <<\EOF --#define inline --EOF -- ;; -- *) cat >>confdefs.h <>confdefs.h <<_ACEOF -+#ifndef __cplusplus -+#define inline $ac_val -+#endif -+_ACEOF -+ ;; - esac - -+ - #-------------------------------------------------------------------- - # This is a little hokie in that it avoids including config.guess - # and config.sub in the distribution, but its been working so far. -@@ -8418,14 +21589,16 @@ - #-------------------------------------------------------------------- - SYSTEM=unix - -+ -+ - ansi= - if test -z "$ansi"; then - msg="for C compiler warning flags" - else - msg="for C compiler warning and ANSI conformance flags" - fi -- echo "$as_me:8427: checking $msg" >&5 --echo $ECHO_N "checking $msg... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking $msg" >&5 -+echo $ECHO_N "checking $msg... $ECHO_C" >&6; } - if test "${ac_cv_prog_cc_warnings+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -8496,11 +21669,13 @@ - fi - - fi --echo "$as_me:8499: result: $ac_cv_prog_cc_warnings" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_warnings" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_warnings" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_warnings" >&6; } -+ - - ac_config_files="$ac_config_files Makefile cgi-fcgi/Makefile include/Makefile libfcgi/Makefile examples/Makefile" - -+ - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure -@@ -8511,7 +21686,7 @@ - # config.status only pays attention to the cache file if you give it - # the --recheck option to rerun configure. - # --# `ac_cv_env_foo' variables (set or unset) will be overriden when -+# `ac_cv_env_foo' variables (set or unset) will be overridden when - # loading this file, other *unset* `ac_cv_foo' will be assigned the - # following values. - -@@ -8519,39 +21694,58 @@ - - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. -+# So, we kill variables containing newlines. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done -+ - (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ -- "s/'/'\\\\''/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -+ "s/'/'\\\\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -+ ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} | -+ esac | -+ sort -+) | - sed ' -+ /^ac_cv_env_/b end - t clear -- : clear -+ :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if cmp -s $cache_file confcache; then :; else -- if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ test "x$cache_file" != "x/dev/null" && -+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -+echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else -- echo "not updating unwritable cache $cache_file" -+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -8560,128 +21754,375 @@ - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# trailing colons and then remove the whole line if VPATH becomes empty --# (actually we leave an empty line to preserve line numbers). --if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' --fi -- - DEFS=-DHAVE_CONFIG_H - -+ac_libobjs= -+ac_ltlibobjs= -+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue -+ # 1. Remove the extension, and $U if already installed. -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' -+done -+LIBOBJS=$ac_libobjs -+ -+LTLIBOBJS=$ac_ltlibobjs -+ -+ -+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"AMDEP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ - : ${CONFIG_STATUS=./config.status} - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:8583: creating $CONFIG_STATUS" >&5 -+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 - echo "$as_me: creating $CONFIG_STATUS" >&6;} - cat >$CONFIG_STATUS <<_ACEOF - #! $SHELL --# Generated automatically by configure. -+# Generated by $as_me. - # Run this file to recreate the current configuration. - # Compiler output produced by configure, useful for debugging - # configure, is in config.log if it exists. - - debug=false -+ac_cs_recheck=false -+ac_cs_silent=false - SHELL=\${CONFIG_SHELL-$SHELL} --ac_cs_invocation="\$0 \$@" -- - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+cat >>$CONFIG_STATUS <<\_ACEOF -+## --------------------- ## -+## M4sh Initialization. ## -+## --------------------- ## -+ -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh -+fi -+ -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ -+ -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+as_nl=' -+' -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+for as_var in \ -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -+ LC_TELEPHONE LC_TIME -+do -+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ fi -+done -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+ -+# Name of the executable. -+as_me=`$as_basename -- "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ -+# CDPATH. -+$as_unset CDPATH -+ -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -+ -+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -+ # uniformly replaced by the line number. The first 'sed' inserts a -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. -+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | -+ sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno -+ N -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -+ t loop -+ s/-\n.*// -+ ' >$as_me.lineno && -+ chmod +x "$as_me.lineno" || -+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { (exit 1); exit 1; }; } -+ -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" -+ # Exit status is that of the last command. -+ exit -+} -+ -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false - fi - --# Name of the executable. --as_me=`echo "$0" |sed 's,.*[\\/],,'` -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; -+esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - - rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir -+fi - echo >conf$$.file - if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -- else -- as_ln_s='ln -s' -- fi - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - --as_executable_p="test -f" -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi - --# Support unset when possible. --if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -- as_unset=unset -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' - else -- as_unset=false -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' - fi -+as_executable_p=$as_test_x - --# NLS nuisances. --$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } --$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } --$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } --$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } --$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } --$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } --$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } --$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } -+# Sed expression to map a string onto a valid CPP name. -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - --# CDPATH. --$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } - - exec 6>&1 - --_ACEOF -+# Save the log message, to keep $[0] and so on meaningful, and to -+# report actual input values of CONFIG_FILES etc. instead of their -+# values after options handling. -+ac_log=" -+This file was extended by $as_me, which was -+generated by GNU Autoconf 2.61. Invocation command line was - --# Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -+ CONFIG_FILES = $CONFIG_FILES -+ CONFIG_HEADERS = $CONFIG_HEADERS -+ CONFIG_LINKS = $CONFIG_LINKS -+ CONFIG_COMMANDS = $CONFIG_COMMANDS -+ $ $0 $@ - --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" - --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi -+_ACEOF - --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -+cat >>$CONFIG_STATUS <<_ACEOF -+# Files that config.status was made for. -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" -+config_commands="$ac_config_commands" - --cat >>$CONFIG_STATUS <<\EOF -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF - ac_cs_usage="\ - \`$as_me' instantiates files from templates according to the - current configuration. -@@ -8689,13 +22130,14 @@ - Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit -- -V, --version print version number, then exit -+ -V, --version print version number and configuration settings, then exit -+ -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -+ instantiate the configuration file FILE - --header=FILE[:TEMPLATE] -- instantiate the configuration header FILE -+ instantiate the configuration header FILE - - Configuration files: - $config_files -@@ -8707,23 +22149,25 @@ - $config_commands - - Report bugs to ." --EOF - --cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.52, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.61, -+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - --Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 2006 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." --srcdir=$srcdir --INSTALL="$INSTALL" --EOF - --cat >>$CONFIG_STATUS <<\EOF -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+INSTALL='$INSTALL' -+MKDIR_P='$MKDIR_P' -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF - # If no file are specified by the user, then we need to provide default - # value. By we need to know if files were specified by the user. - ac_need_defaults=: -@@ -8731,108 +22175,113 @@ - do - case $1 in - --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -- shift -- set dummy "$ac_option" "$ac_optarg" ${1+"$@"} -- shift -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` -+ ac_shift=: -+ ;; -+ *) -+ ac_option=$1 -+ ac_optarg=$2 -+ ac_shift=shift - ;; -- -*);; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_need_defaults=false;; - esac - -- case $1 in -+ case $ac_option in - # Handling of the options. --EOF --cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:8759: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -+ ac_cs_recheck=: ;; -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ echo "$ac_cs_version"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) -- shift -- CONFIG_FILES="$CONFIG_FILES $1" -+ $ac_shift -+ CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) -- shift -- CONFIG_HEADERS="$CONFIG_HEADERS $1" -+ $ac_shift -+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; -+ --he | --h) -+ # Conflict between --help and --header -+ { echo "$as_me: error: ambiguous option: $1 -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; };; -+ --help | --hel | -h ) -+ echo "$ac_cs_usage"; exit ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil | --si | --s) -+ ac_cs_silent=: ;; - - # This is an error. -- -*) { { echo "$as_me:8778: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -+ -*) { echo "$as_me: error: unrecognized option: $1 -+Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; - -- *) ac_config_targets="$ac_config_targets $1" ;; -+ *) ac_config_targets="$ac_config_targets $1" -+ ac_need_defaults=false ;; - - esac - shift - done - --exec 5>>config.log --cat >&5 << _ACEOF -+ac_configure_extra_args= - --## ----------------------- ## --## Running config.status. ## --## ----------------------- ## -+if $ac_cs_silent; then -+ exec 6>/dev/null -+ ac_configure_extra_args="$ac_configure_extra_args --silent" -+fi - --This file was extended by $as_me 2.52, executed with -- CONFIG_FILES = $CONFIG_FILES -- CONFIG_HEADERS = $CONFIG_HEADERS -- CONFIG_LINKS = $CONFIG_LINKS -- CONFIG_COMMANDS = $CONFIG_COMMANDS -- > $ac_cs_invocation --on `(hostname || uname -n) 2>/dev/null | sed 1q` -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF -+if \$ac_cs_recheck; then -+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -+ CONFIG_SHELL=$SHELL -+ export CONFIG_SHELL -+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+fi - - _ACEOF --EOF -+cat >>$CONFIG_STATUS <<\_ACEOF -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ echo "$ac_log" -+} >&5 - --cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF - # --# INIT-COMMANDS section. -+# INIT-COMMANDS - # -+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - --AMDEP_TRUE="$AMDEP_TRUE" --ac_aux_dir="$ac_aux_dir" -+_ACEOF - --EOF -+cat >>$CONFIG_STATUS <<\_ACEOF - --cat >>$CONFIG_STATUS <<\EOF -+# Handling of arguments. - for ac_config_target in $ac_config_targets - do -- case "$ac_config_target" in -- # Handling of arguments. -- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; -- "cgi-fcgi/Makefile" ) CONFIG_FILES="$CONFIG_FILES cgi-fcgi/Makefile" ;; -- "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; -- "libfcgi/Makefile" ) CONFIG_FILES="$CONFIG_FILES libfcgi/Makefile" ;; -- "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; -- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; -- "fcgi_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS fcgi_config.h" ;; -- *) { { echo "$as_me:8830: error: invalid argument: $ac_config_target" >&5 -+ case $ac_config_target in -+ "fcgi_config.h") CONFIG_HEADERS="$CONFIG_HEADERS fcgi_config.h" ;; -+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ "cgi-fcgi/Makefile") CONFIG_FILES="$CONFIG_FILES cgi-fcgi/Makefile" ;; -+ "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; -+ "libfcgi/Makefile") CONFIG_FILES="$CONFIG_FILES libfcgi/Makefile" ;; -+ "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; -+ -+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac - done - -+ - # If the user did not use the arguments to specify the items to instantiate, - # then the envvar interface is used. Set only those that are not. - # We use the long form for the default assignment because of an extremely -@@ -8843,583 +22292,781 @@ - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands - fi - --# Create a temporary directory, and hook for its removal unless debugging. -+# Have a temporary directory for convenience. Make it in the build tree -+# simply because there is no reason against having it here, and in addition, -+# creating and moving files from /tmp can sometimes cause problems. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -+ tmp= -+ trap 'exit_status=$? -+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -+' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 - } -- - # Create a (secure) tmp directory for tmp files. --: ${TMPDIR=/tmp} -+ - { -- tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" - } || - { -- tmp=$TMPDIR/cs$$-$RANDOM -- (umask 077 && mkdir $tmp) -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") - } || - { -- echo "$me: cannot create a temporary directory in $TMPDIR" >&2 -+ echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } - } - --EOF -- --cat >>$CONFIG_STATUS <\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@DEFS@,$DEFS,;t t --s,@LIBS@,$LIBS,;t t --s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t --s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t --s,@INSTALL_DATA@,$INSTALL_DATA,;t t --s,@PACKAGE@,$PACKAGE,;t t --s,@VERSION@,$VERSION,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@ACLOCAL@,$ACLOCAL,;t t --s,@AUTOCONF@,$AUTOCONF,;t t --s,@AUTOMAKE@,$AUTOMAKE,;t t --s,@AUTOHEADER@,$AUTOHEADER,;t t --s,@MAKEINFO@,$MAKEINFO,;t t --s,@AMTAR@,$AMTAR,;t t --s,@install_sh@,$install_sh,;t t --s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t --s,@AWK@,$AWK,;t t --s,@SET_MAKE@,$SET_MAKE,;t t --s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t --s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t --s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t --s,@DEPDIR@,$DEPDIR,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@am__include@,$am__include,;t t --s,@am__quote@,$am__quote,;t t --s,@CCDEPMODE@,$CCDEPMODE,;t t --s,@CPP@,$CPP,;t t --s,@build@,$build,;t t --s,@build_cpu@,$build_cpu,;t t --s,@build_vendor@,$build_vendor,;t t --s,@build_os@,$build_os,;t t --s,@host@,$host,;t t --s,@host_cpu@,$host_cpu,;t t --s,@host_vendor@,$host_vendor,;t t --s,@host_os@,$host_os,;t t --s,@LN_S@,$LN_S,;t t --s,@ECHO@,$ECHO,;t t --s,@RANLIB@,$RANLIB,;t t --s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t --s,@STRIP@,$STRIP,;t t --s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t --s,@LIBTOOL@,$LIBTOOL,;t t --s,@CXX@,$CXX,;t t --s,@CXXFLAGS@,$CXXFLAGS,;t t --s,@ac_ct_CXX@,$ac_ct_CXX,;t t --s,@CXXDEPMODE@,$CXXDEPMODE,;t t --s,@LIBFCGIXX@,$LIBFCGIXX,;t t --s,@ECHO_CPP@,$ECHO_CPP,;t t --s,@PTHREAD_CC@,$PTHREAD_CC,;t t --s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t --s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t --s,@THREADED@,$THREADED,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@SYSTEM@,$SYSTEM,;t t --CEOF -+if test -n "$CONFIG_FILES"; then - --EOF -+_ACEOF - -- cat >>$CONFIG_STATUS <<\EOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (echo ':t -- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -- fi -- ac_sed_frag=`expr $ac_sed_frag + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_lines` -- fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -+ -+ -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+SHELL!$SHELL$ac_delim -+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -+PACKAGE_NAME!$PACKAGE_NAME$ac_delim -+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -+PACKAGE_STRING!$PACKAGE_STRING$ac_delim -+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -+exec_prefix!$exec_prefix$ac_delim -+prefix!$prefix$ac_delim -+program_transform_name!$program_transform_name$ac_delim -+bindir!$bindir$ac_delim -+sbindir!$sbindir$ac_delim -+libexecdir!$libexecdir$ac_delim -+datarootdir!$datarootdir$ac_delim -+datadir!$datadir$ac_delim -+sysconfdir!$sysconfdir$ac_delim -+sharedstatedir!$sharedstatedir$ac_delim -+localstatedir!$localstatedir$ac_delim -+includedir!$includedir$ac_delim -+oldincludedir!$oldincludedir$ac_delim -+docdir!$docdir$ac_delim -+infodir!$infodir$ac_delim -+htmldir!$htmldir$ac_delim -+dvidir!$dvidir$ac_delim -+pdfdir!$pdfdir$ac_delim -+psdir!$psdir$ac_delim -+libdir!$libdir$ac_delim -+localedir!$localedir$ac_delim -+mandir!$mandir$ac_delim -+DEFS!$DEFS$ac_delim -+ECHO_C!$ECHO_C$ac_delim -+ECHO_N!$ECHO_N$ac_delim -+ECHO_T!$ECHO_T$ac_delim -+LIBS!$LIBS$ac_delim -+build_alias!$build_alias$ac_delim -+host_alias!$host_alias$ac_delim -+target_alias!$target_alias$ac_delim -+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -+INSTALL_DATA!$INSTALL_DATA$ac_delim -+am__isrc!$am__isrc$ac_delim -+CYGPATH_W!$CYGPATH_W$ac_delim -+PACKAGE!$PACKAGE$ac_delim -+VERSION!$VERSION$ac_delim -+ACLOCAL!$ACLOCAL$ac_delim -+AUTOCONF!$AUTOCONF$ac_delim -+AUTOMAKE!$AUTOMAKE$ac_delim -+AUTOHEADER!$AUTOHEADER$ac_delim -+MAKEINFO!$MAKEINFO$ac_delim -+install_sh!$install_sh$ac_delim -+STRIP!$STRIP$ac_delim -+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -+mkdir_p!$mkdir_p$ac_delim -+AWK!$AWK$ac_delim -+SET_MAKE!$SET_MAKE$ac_delim -+am__leading_dot!$am__leading_dot$ac_delim -+AMTAR!$AMTAR$ac_delim -+am__tar!$am__tar$ac_delim -+am__untar!$am__untar$ac_delim -+CC!$CC$ac_delim -+CFLAGS!$CFLAGS$ac_delim -+LDFLAGS!$LDFLAGS$ac_delim -+CPPFLAGS!$CPPFLAGS$ac_delim -+ac_ct_CC!$ac_ct_CC$ac_delim -+EXEEXT!$EXEEXT$ac_delim -+OBJEXT!$OBJEXT$ac_delim -+DEPDIR!$DEPDIR$ac_delim -+am__include!$am__include$ac_delim -+am__quote!$am__quote$ac_delim -+AMDEP_TRUE!$AMDEP_TRUE$ac_delim -+AMDEP_FALSE!$AMDEP_FALSE$ac_delim -+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -+CCDEPMODE!$CCDEPMODE$ac_delim -+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -+CPP!$CPP$ac_delim -+build!$build$ac_delim -+build_cpu!$build_cpu$ac_delim -+build_vendor!$build_vendor$ac_delim -+build_os!$build_os$ac_delim -+host!$host$ac_delim -+host_cpu!$host_cpu$ac_delim -+host_vendor!$host_vendor$ac_delim -+host_os!$host_os$ac_delim -+SED!$SED$ac_delim -+GREP!$GREP$ac_delim -+EGREP!$EGREP$ac_delim -+LN_S!$LN_S$ac_delim -+ECHO!$ECHO$ac_delim -+AR!$AR$ac_delim -+RANLIB!$RANLIB$ac_delim -+CXX!$CXX$ac_delim -+CXXFLAGS!$CXXFLAGS$ac_delim -+ac_ct_CXX!$ac_ct_CXX$ac_delim -+CXXDEPMODE!$CXXDEPMODE$ac_delim -+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim -+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim -+_ACEOF -+ -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -+ break -+ elif $ac_last_try; then -+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+ -+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -+if test -n "$ac_eof"; then -+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -+ ac_eof=`expr $ac_eof + 1` -+fi -+ -+cat >>$CONFIG_STATUS <<_ACEOF -+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+_ACEOF -+sed ' -+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -+s/^/s,@/; s/!/@,|#_!!_#|/ -+:n -+t n -+s/'"$ac_delim"'$/,g/; t -+s/$/\\/; p -+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -+' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -+CEOF$ac_eof -+_ACEOF -+ -+ -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+CXXCPP!$CXXCPP$ac_delim -+F77!$F77$ac_delim -+FFLAGS!$FFLAGS$ac_delim -+ac_ct_F77!$ac_ct_F77$ac_delim -+LIBTOOL!$LIBTOOL$ac_delim -+LIBFCGIXX!$LIBFCGIXX$ac_delim -+ECHO_CPP!$ECHO_CPP$ac_delim -+PTHREAD_CC!$PTHREAD_CC$ac_delim -+PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim -+PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim -+THREADED!$THREADED$ac_delim -+LIBOBJS!$LIBOBJS$ac_delim -+SYSTEM!$SYSTEM$ac_delim -+LTLIBOBJS!$LTLIBOBJS$ac_delim -+_ACEOF -+ -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then -+ break -+ elif $ac_last_try; then -+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -+done -+ -+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -+if test -n "$ac_eof"; then -+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -+ ac_eof=`expr $ac_eof + 1` -+fi -+ -+cat >>$CONFIG_STATUS <<_ACEOF -+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -+_ACEOF -+sed ' -+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -+s/^/s,@/; s/!/@,|#_!!_#|/ -+:n -+t n -+s/'"$ac_delim"'$/,g/; t -+s/$/\\/; p -+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -+' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -+:end -+s/|#_!!_#|//g -+CEOF$ac_eof -+_ACEOF -+ -+ -+# VPATH may cause trouble with some makes, so we remove $(srcdir), -+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=/{ -+s/:*\$(srcdir):*/:/ -+s/:*\${srcdir}:*/:/ -+s/:*@srcdir@:*/:/ -+s/^\([^=]*=[ ]*\):*/\1/ -+s/:*$// -+s/^[^=]*=[ ]*$// -+}' -+fi -+ -+cat >>$CONFIG_STATUS <<\_ACEOF - fi # test -n "$CONFIG_FILES" - --EOF --cat >>$CONFIG_STATUS <<\EOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+ -+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -+echo "$as_me: error: Invalid tag $ac_tag." >&2;} -+ { (exit 1); exit 1; }; };; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then -- { case "$ac_dir" in -- [\\/]* | ?:[\\/]* ) as_incr_dir=;; -- *) as_incr_dir=.;; --esac --as_dummy="$ac_dir" --for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do -- case $as_mkdir_dir in -- # Skip DOS drivespec -- ?:) as_incr_dir=$as_mkdir_dir ;; -- *) -- as_incr_dir=$as_incr_dir/$as_mkdir_dir -- test -d "$as_incr_dir" || mkdir "$as_incr_dir" -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -+echo "$as_me: error: cannot find input file: $ac_f" >&2;} -+ { (exit 1); exit 1; }; };; -+ esac -+ ac_file_inputs="$ac_file_inputs $ac_f" -+ done -+ -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input="Generated from "`IFS=: -+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} -+ fi -+ -+ case $ac_tag in -+ *:-:* | *:-) cat >"$tmp/stdin";; -+ esac - ;; - esac --done; } -- -- ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" -- # A "../" for each directory in $ac_dir_suffix. -- ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` -- else -- ac_dir_suffix= ac_dots= -- fi - -- case $srcdir in -- .) ac_srcdir=. -- if test -z "$ac_dots"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_dots$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_dots$srcdir ;; -+ ac_dir=`$as_dirname -- "$ac_file" || -+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ { as_dir="$ac_dir" -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; - esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+echo "$as_me: error: cannot create directory $as_dir" >&2;} -+ { (exit 1); exit 1; }; }; } -+ ac_builddir=. -+ -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -- *) ac_INSTALL=$ac_dots$INSTALL ;; -+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; -+ esac -+ ac_MKDIR_P=$MKDIR_P -+ case $MKDIR_P in -+ [\\/$]* | ?:[\\/]* ) ;; -+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; - esac -+_ACEOF - -- if test x"$ac_file" != x-; then -- { echo "$as_me:9083: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated automatically by config.status. */ -- configure_input="Generated automatically from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -- -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:9101: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo $f;; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo $f -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo $srcdir/$f -- else -- # /dev/null tree -- { { echo "$as_me:9114: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } --EOF --cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= -+ -+case `sed -n '/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p -+' $ac_file_inputs` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac -+_ACEOF -+ -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub - $extrasub --EOF --cat >>$CONFIG_STATUS <<\EOF -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF - :t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@INSTALL@,$ac_INSTALL,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -- --done --EOF --cat >>$CONFIG_STATUS <<\EOF -- --# --# CONFIG_HEADER section. --# -+s&@configure_input@&$configure_input&;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+s&@INSTALL@&$ac_INSTALL&;t t -+s&@MKDIR_P@&$ac_MKDIR_P&;t t -+$ac_datarootdir_hack -+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out -+ -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&5 -+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&2;} - --# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where --# NAME is the cpp macro being defined and VALUE is the value it is being given. --# --# ac_d sets the value in "#define NAME VALUE" lines. --ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' --ac_dB='[ ].*$,\1#\2' --ac_dC=' ' --ac_dD=',;t' --# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". --ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' --ac_uB='$,\1#\2define\3' --ac_uC=' ' --ac_uD=',;t' -- --for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -+ rm -f "$tmp/stdin" - case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+ -) cat "$tmp/out"; rm -f "$tmp/out";; -+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac -+ ;; -+ :H) -+ # -+ # CONFIG_HEADER -+ # -+_ACEOF - -- test x"$ac_file" != x- && { echo "$as_me:9175: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:9186: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo $f;; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo $f -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo $srcdir/$f -- else -- # /dev/null tree -- { { echo "$as_me:9199: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -- # Remove the trailing spaces. -- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -- --EOF -+# Transform confdefs.h into a sed script `conftest.defines', that -+# substitutes the proper values into config.h.in to produce config.h. -+rm -f conftest.defines conftest.tail -+# First, append a space to every undef/define line, to ease matching. -+echo 's/$/ /' >conftest.defines -+# Then, protect against being on the right side of a sed subst, or in -+# an unquoted here document, in config.status. If some macros were -+# called several times there might be several #defines for the same -+# symbol, which is useless. But do not sort them, since the last -+# AC_DEFINE must be honored. -+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -+# NAME is the cpp macro being defined, VALUE is the value it is being given. -+# PARAMS is the parameter list in the macro definition--in most cases, it's -+# just an empty string. -+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -+ac_dB='\\)[ (].*,\\1define\\2' -+ac_dC=' ' -+ac_dD=' ,' - --# Transform confdefs.h into two sed scripts, `conftest.defines' and --# `conftest.undefs', that substitutes the proper values into --# config.h.in to produce config.h. The first handles `#define' --# templates, and the second `#undef' templates. --# And first: Protect against being on the right side of a sed subst in --# config.status. Protect against being in an unquoted here document --# in config.status. --rm -f conftest.defines conftest.undefs --# Using a here document instead of a string reduces the quoting nightmare. --# Putting comments in sed scripts is not portable. --# --# `end' is used to avoid that the second main sed command (meant for --# 0-ary CPP macros) applies to n-ary macro definitions. --# See the Autoconf documentation for `clear'. --cat >confdef2sed.sed <<\EOF --s/[\\&,]/\\&/g --s,[\\$`],\\&,g --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp --t end --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp --: end --EOF --# If some macros were called several times there might be several times --# the same #defines, which is useless. Nevertheless, we may not want to --# sort them, since we want the *last* AC-DEFINE to be honored. --uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines --sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs --rm -f confdef2sed.sed -+uniq confdefs.h | -+ sed -n ' -+ t rset -+ :rset -+ s/^[ ]*#[ ]*define[ ][ ]*// -+ t ok -+ d -+ :ok -+ s/[\\&,]/\\&/g -+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p -+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p -+ ' >>conftest.defines - --# This sed command replaces #undef with comments. This is necessary, for -+# Remove the space that was appended to ease matching. -+# Then replace #undef with comments. This is necessary, for - # example, in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. --cat >>conftest.undefs <<\EOF --s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, --EOF -+# (The regexp can be short, since the line contains either #define or #undef.) -+echo 's/ $// -+s,^[ #]*u.*,/* & */,' >>conftest.defines -+ -+# Break up conftest.defines: -+ac_max_sed_lines=50 -+ -+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -+# et cetera. -+ac_in='$ac_file_inputs' -+ac_out='"$tmp/out1"' -+ac_nxt='"$tmp/out2"' - --# Break up conftest.defines because some shells have a limit on the size --# of here documents, and old seds have small limits too (100 cmds). --echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS --echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS --echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS --echo ' :' >>$CONFIG_STATUS --rm -f conftest.tail --while grep . conftest.defines >/dev/null --do -- # Write a limited-size here document to $tmp/defines.sed. -- echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS -- # Speed up: don't consider the non `#define' lines. -- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS -- # Work around the forget-to-reset-the-flag bug. -- echo 't clr' >>$CONFIG_STATUS -- echo ': clr' >>$CONFIG_STATUS -- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS -+while : -+do -+ # Write a here document: -+ cat >>$CONFIG_STATUS <<_ACEOF -+ # First, check the format of the line: -+ cat >"\$tmp/defines.sed" <<\\CEOF -+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -+b -+:def -+_ACEOF -+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF -- sed -f $tmp/defines.sed $tmp/in >$tmp/out -- rm -f $tmp/in -- mv $tmp/out $tmp/in --' >>$CONFIG_STATUS -- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail -+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS -+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in -+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail -+ grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines - done --rm -f conftest.defines --echo ' fi # egrep' >>$CONFIG_STATUS --echo >>$CONFIG_STATUS -- --# Break up conftest.undefs because some shells have a limit on the size --# of here documents, and old seds have small limits too (100 cmds). --echo ' # Handle all the #undef templates' >>$CONFIG_STATUS --rm -f conftest.tail --while grep . conftest.undefs >/dev/null --do -- # Write a limited-size here document to $tmp/undefs.sed. -- echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS -- # Speed up: don't consider the non `#undef' -- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS -- # Work around the forget-to-reset-the-flag bug. -- echo 't clr' >>$CONFIG_STATUS -- echo ': clr' >>$CONFIG_STATUS -- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS -- echo 'CEOF -- sed -f $tmp/undefs.sed $tmp/in >$tmp/out -- rm -f $tmp/in -- mv $tmp/out $tmp/in --' >>$CONFIG_STATUS -- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail -- rm -f conftest.undefs -- mv conftest.tail conftest.undefs --done --rm -f conftest.undefs -- --cat >>$CONFIG_STATUS <<\EOF -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated automatically by config.status. */ -- if test x"$ac_file" = x-; then -- echo "/* Generated automatically by configure. */" >$tmp/config.h -- else -- echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h -- fi -- cat $tmp/in >>$tmp/config.h -- rm -f $tmp/in -+rm -f conftest.defines conftest.tail -+ -+echo "ac_result=$ac_in" >>$CONFIG_STATUS -+cat >>$CONFIG_STATUS <<\_ACEOF - if test x"$ac_file" != x-; then -- if cmp -s $ac_file $tmp/config.h 2>/dev/null; then -- { echo "$as_me:9316: $ac_file is unchanged" >&5 -+ echo "/* $configure_input */" >"$tmp/config.h" -+ cat "$ac_result" >>"$tmp/config.h" -+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then -+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 - echo "$as_me: $ac_file is unchanged" >&6;} - else -- ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then -- { case "$ac_dir" in -- [\\/]* | ?:[\\/]* ) as_incr_dir=;; -- *) as_incr_dir=.;; --esac --as_dummy="$ac_dir" --for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do -- case $as_mkdir_dir in -- # Skip DOS drivespec -- ?:) as_incr_dir=$as_mkdir_dir ;; -- *) -- as_incr_dir=$as_incr_dir/$as_mkdir_dir -- test -d "$as_incr_dir" || mkdir "$as_incr_dir" -- ;; -- esac --done; } -- -- fi - rm -f $ac_file -- mv $tmp/config.h $ac_file -+ mv "$tmp/config.h" $ac_file - fi - else -- cat $tmp/config.h -- rm -f $tmp/config.h -+ echo "/* $configure_input */" -+ cat "$ac_result" - fi -- # Run the commands associated with the file. -- case $ac_file in -- fcgi_config.h ) # update the timestamp --echo timestamp >"./stamp-h1" -- ;; -+ rm -f "$tmp/out12" -+# Compute $ac_file's index in $config_headers. -+_am_stamp_count=1 -+for _am_header in $config_headers :; do -+ case $_am_header in -+ $ac_file | $ac_file:* ) -+ break ;; -+ * ) -+ _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --EOF --cat >>$CONFIG_STATUS <<\EOF -+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X$ac_file : 'X\(//\)[^/]' \| \ -+ X$ac_file : 'X\(//\)$' \| \ -+ X$ac_file : 'X\(/\)' \| . 2>/dev/null || -+echo X$ac_file | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'`/stamp-h$_am_stamp_count -+ ;; - --# --# CONFIG_COMMANDS section. --# --for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue -- ac_dest=`echo "$ac_file" | sed 's,:.*,,'` -- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` -- -- case $ac_dest in -- default-1 ) --test x"$AMDEP_TRUE" != x"" || --for mf in $CONFIG_FILES; do -- case "$mf" in -- Makefile) dirpart=.;; -- */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; -- *) continue;; -- esac -- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue -- # Extract the definition of DEP_FILES from the Makefile without -- # running `make'. -- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` -+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -+echo "$as_me: executing $ac_file commands" >&6;} -+ ;; -+ esac -+ -+ -+ case $ac_file$ac_mode in -+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do -+ # Strip MF so we end up with the name of the file. -+ mf=`echo "$mf" | sed -e 's/:.*$//'` -+ # Check whether this is an Automake generated Makefile or not. -+ # We used to match only the files named `Makefile.in', but -+ # some people rename them; so instead we look at the file content. -+ # Grep'ing the first line is not enough: some people post-process -+ # each Makefile.in and add a new line on top of each file to say so. -+ # Grep'ing the whole file is not good either: AIX grep has a line -+ # limit of 2048, but all sed's we know have understand at least 4000. -+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ dirpart=`$as_dirname -- "$mf" || -+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$mf" : 'X\(//\)[^/]' \| \ -+ X"$mf" : 'X\(//\)$' \| \ -+ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$mf" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ else -+ continue -+ fi -+ # Extract the definition of DEPDIR, am__include, and am__quote -+ # from the Makefile without running `make'. -+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` -+ test -z "am__include" && continue -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n -e '/^U = / s///p' < "$mf"` -- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -- # We invoke sed twice because it is the simplest approach to -- # changing $(DEPDIR) to its actual value in the expansion. -- for file in `sed -n -e ' -- /^DEP_FILES = .*\\\\$/ { -- s/^DEP_FILES = // -- :loop -- s/\\\\$// -- p -- n -- /\\\\$/ b loop -- p -- } -- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ -+ U=`sed -n 's/^U = //p' < "$mf"` -+ # Find all dependency output files, they are included files with -+ # $(DEPDIR) in their names. We invoke sed twice because it is the -+ # simplest approach to changing $(DEPDIR) to its actual value in the -+ # expansion. -+ for file in `sed -n " -+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue -- fdir=`echo "$file" | sed -e 's|/[^/]*$||'` -- $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 -+ fdir=`$as_dirname -- "$file" || -+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$file" : 'X\(//\)[^/]' \| \ -+ X"$file" : 'X\(//\)$' \| \ -+ X"$file" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ { as_dir=$dirpart/$fdir -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+echo "$as_me: error: cannot create directory $as_dir" >&2;} -+ { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done - ;; -+ - esac --done --EOF -+done # for ac_tag - --cat >>$CONFIG_STATUS <<\EOF - - { (exit 0); exit 0; } --EOF -+_ACEOF - chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - -+ - # configure is writing to config.log, and then calls config.status. - # config.status does its own redirection, appending to config.log. - # Unfortunately, on DOS this fails, as config.log is still kept open -@@ -9430,8 +23077,11 @@ - # need to make the FD available again. - if test "$no_create" != yes; then - ac_cs_success=: -+ ac_config_status_args= -+ test "$silent" = yes && -+ ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null -- $SHELL $CONFIG_STATUS || ac_cs_success=false -+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. ---- libfcgi-2.4.0.orig/libfcgi/Makefile.in -+++ libfcgi-2.4.0/libfcgi/Makefile.in -@@ -1,7 +1,8 @@ --# Makefile.in generated automatically by automake 1.5 from Makefile.am. -+# Makefile.in generated by automake 1.10 from Makefile.am. -+# @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,93 +16,205 @@ - - # $Id: Makefile.am,v 1.9 2001/12/22 03:16:20 robs Exp $ - --SHELL = @SHELL@ -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. -- --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- --INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ -+build_triplet = @build@ - host_triplet = @host@ -+subdir = libfcgi -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/fcgi_config.h -+CONFIG_CLEAN_FILES = -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(libdir)" -+libLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(lib_LTLIBRARIES) -+libfcgi___la_LIBADD = -+am__objects_1 = -+am_libfcgi___la_OBJECTS = $(am__objects_1) fcgio.lo -+libfcgi___la_OBJECTS = $(am_libfcgi___la_OBJECTS) -+libfcgi___la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(libfcgi___la_LDFLAGS) $(LDFLAGS) -o $@ -+libfcgi_la_LIBADD = -+am_libfcgi_la_OBJECTS = $(am__objects_1) libfcgi_la-fcgiapp.lo \ -+ libfcgi_la-fcgi_stdio.lo libfcgi_la-os_@SYSTEM@.lo -+libfcgi_la_OBJECTS = $(am_libfcgi_la_OBJECTS) -+libfcgi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libfcgi_la_CFLAGS) \ -+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+CXXLD = $(CXX) -+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libfcgi___la_SOURCES) $(libfcgi_la_SOURCES) -+DIST_SOURCES = $(libfcgi___la_SOURCES) $(libfcgi_la_SOURCES) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ --AS = @AS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ - CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ - ECHO_CPP = @ECHO_CPP@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ - EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+GREP = @GREP@ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ - LIBFCGIXX = @LIBFCGIXX@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --OBJDUMP = @OBJDUMP@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - PTHREAD_CC = @PTHREAD_CC@ - PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ - PTHREAD_LIBS = @PTHREAD_LIBS@ - RANLIB = @RANLIB@ -+SED = @SED@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ - SYSTEM = @SYSTEM@ - THREADED = @THREADED@ - VERSION = @VERSION@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ - am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+builddir = @builddir@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+htmldir = @htmldir@ -+includedir = @includedir@ -+infodir = @infodir@ - install_sh = @install_sh@ -- -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+psdir = @psdir@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -- - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ - $(INCLUDEDIR)/fcgimisc.h \ - $(INCLUDEDIR)/fcgi_stdio.h \ - $(INCLUDEDIR)/fcgios.h - -- - lib_LTLIBRARIES = libfcgi.la @LIBFCGIXX@ - EXTRA_LTLIBRARIES = libfcgi++.la -- - libfcgi_la_SOURCES = $(INCLUDE_FILES) \ - fcgiapp.c \ - fcgi_stdio.c \ -@@ -109,259 +222,225 @@ - - libfcgi_la_CC = @PTHREAD_CC@ - libfcgi_la_CFLAGS = @PTHREAD_CFLAGS@ -- - libfcgi___la_SOURCES = $(INCLUDE_FILES) \ - $(INCLUDEDIR)/fcgio.h \ - fcgio.cpp - - libfcgi___la_CFLAGS = @PTHREAD_CFLAGS@ - libfcgi___la_LDFLAGS = -lfcgi -rpath @libdir@ --subdir = libfcgi --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/fcgi_config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(lib_LTLIBRARIES) -- --libfcgi___la_LIBADD = --am_libfcgi___la_OBJECTS = fcgio.lo --libfcgi___la_OBJECTS = $(am_libfcgi___la_OBJECTS) --libfcgi_la_LDFLAGS = --libfcgi_la_LIBADD = --am_libfcgi_la_OBJECTS = libfcgi_la-fcgiapp.lo libfcgi_la-fcgi_stdio.lo \ -- libfcgi_la-os_@SYSTEM@.lo --libfcgi_la_OBJECTS = $(am_libfcgi_la_OBJECTS) -- --DEFS = @DEFS@ --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ --depcomp = $(SHELL) $(top_srcdir)/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/fcgio.Plo \ --@AMDEP_TRUE@ $(DEPDIR)/libfcgi_la-fcgi_stdio.Plo \ --@AMDEP_TRUE@ $(DEPDIR)/libfcgi_la-fcgiapp.Plo \ --@AMDEP_TRUE@ $(DEPDIR)/libfcgi_la-os_@SYSTEM@.Plo --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --CFLAGS = @CFLAGS@ --CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CXXFLAGS) $(CXXFLAGS) --CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --CXXFLAGS = @CXXFLAGS@ --DIST_SOURCES = $(libfcgi___la_SOURCES) $(libfcgi_la_SOURCES) --DIST_COMMON = Makefile.am Makefile.in --SOURCES = $(libfcgi___la_SOURCES) $(libfcgi_la_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .cpp .lo .o .obj -- --mostlyclean-libtool: -- -rm -f *.lo -- --clean-libtool: -- -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libfcgi/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign libfcgi/Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && \ -- CONFIG_HEADERS= CONFIG_LINKS= \ -- CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status -+ $(AUTOMAKE) --gnu libfcgi/Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(libdir) -+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ -- $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - - uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - - clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) -+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -+ test "$$dir" != "$$p" || dir=.; \ -+ echo "rm -f \"$${dir}/so_locations\""; \ -+ rm -f "$${dir}/so_locations"; \ -+ done - libfcgi++.la: $(libfcgi___la_OBJECTS) $(libfcgi___la_DEPENDENCIES) -- $(CXXLINK) $(libfcgi___la_LDFLAGS) $(libfcgi___la_OBJECTS) $(libfcgi___la_LIBADD) $(LIBS) --libfcgi_la-fcgiapp.lo: fcgiapp.c --libfcgi_la-fcgi_stdio.lo: fcgi_stdio.c --libfcgi_la-os_@SYSTEM@.lo: os_@SYSTEM@.c -+ $(libfcgi___la_LINK) $(libfcgi___la_OBJECTS) $(libfcgi___la_LIBADD) $(LIBS) - libfcgi.la: $(libfcgi_la_OBJECTS) $(libfcgi_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libfcgi_la_LDFLAGS) $(libfcgi_la_OBJECTS) $(libfcgi_la_LIBADD) $(LIBS) -+ $(libfcgi_la_LINK) -rpath $(libdir) $(libfcgi_la_OBJECTS) $(libfcgi_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fcgio.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libfcgi_la-fcgi_stdio.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libfcgi_la-fcgiapp.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libfcgi_la-os_@SYSTEM@.Plo@am__quote@ -- --distclean-depend: -- -rm -rf $(DEPDIR) -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcgio.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfcgi_la-fcgi_stdio.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfcgi_la-fcgiapp.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfcgi_la-os_@SYSTEM@.Plo@am__quote@ - - .c.o: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(COMPILE) -c `cygpath -w $<` -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -- --libfcgi_la-fcgiapp.o: fcgiapp.c --@AMDEP_TRUE@ source='fcgiapp.c' object='libfcgi_la-fcgiapp.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/libfcgi_la-fcgiapp.Po' tmpdepfile='$(DEPDIR)/libfcgi_la-fcgiapp.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfcgi_la_CFLAGS) $(CFLAGS) -c -o libfcgi_la-fcgiapp.o `test -f fcgiapp.c || echo '$(srcdir)/'`fcgiapp.c -- --libfcgi_la-fcgiapp.obj: fcgiapp.c --@AMDEP_TRUE@ source='fcgiapp.c' object='libfcgi_la-fcgiapp.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/libfcgi_la-fcgiapp.Po' tmpdepfile='$(DEPDIR)/libfcgi_la-fcgiapp.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfcgi_la_CFLAGS) $(CFLAGS) -c -o libfcgi_la-fcgiapp.obj `cygpath -w fcgiapp.c` -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - libfcgi_la-fcgiapp.lo: fcgiapp.c --@AMDEP_TRUE@ source='fcgiapp.c' object='libfcgi_la-fcgiapp.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/libfcgi_la-fcgiapp.Plo' tmpdepfile='$(DEPDIR)/libfcgi_la-fcgiapp.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfcgi_la_CFLAGS) $(CFLAGS) -c -o libfcgi_la-fcgiapp.lo `test -f fcgiapp.c || echo '$(srcdir)/'`fcgiapp.c -- --libfcgi_la-fcgi_stdio.o: fcgi_stdio.c --@AMDEP_TRUE@ source='fcgi_stdio.c' object='libfcgi_la-fcgi_stdio.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/libfcgi_la-fcgi_stdio.Po' tmpdepfile='$(DEPDIR)/libfcgi_la-fcgi_stdio.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfcgi_la_CFLAGS) $(CFLAGS) -c -o libfcgi_la-fcgi_stdio.o `test -f fcgi_stdio.c || echo '$(srcdir)/'`fcgi_stdio.c -- --libfcgi_la-fcgi_stdio.obj: fcgi_stdio.c --@AMDEP_TRUE@ source='fcgi_stdio.c' object='libfcgi_la-fcgi_stdio.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/libfcgi_la-fcgi_stdio.Po' tmpdepfile='$(DEPDIR)/libfcgi_la-fcgi_stdio.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfcgi_la_CFLAGS) $(CFLAGS) -c -o libfcgi_la-fcgi_stdio.obj `cygpath -w fcgi_stdio.c` -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfcgi_la_CFLAGS) $(CFLAGS) -MT libfcgi_la-fcgiapp.lo -MD -MP -MF $(DEPDIR)/libfcgi_la-fcgiapp.Tpo -c -o libfcgi_la-fcgiapp.lo `test -f 'fcgiapp.c' || echo '$(srcdir)/'`fcgiapp.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libfcgi_la-fcgiapp.Tpo $(DEPDIR)/libfcgi_la-fcgiapp.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fcgiapp.c' object='libfcgi_la-fcgiapp.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfcgi_la_CFLAGS) $(CFLAGS) -c -o libfcgi_la-fcgiapp.lo `test -f 'fcgiapp.c' || echo '$(srcdir)/'`fcgiapp.c - - libfcgi_la-fcgi_stdio.lo: fcgi_stdio.c --@AMDEP_TRUE@ source='fcgi_stdio.c' object='libfcgi_la-fcgi_stdio.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/libfcgi_la-fcgi_stdio.Plo' tmpdepfile='$(DEPDIR)/libfcgi_la-fcgi_stdio.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfcgi_la_CFLAGS) $(CFLAGS) -c -o libfcgi_la-fcgi_stdio.lo `test -f fcgi_stdio.c || echo '$(srcdir)/'`fcgi_stdio.c -- --libfcgi_la-os_@SYSTEM@.o: os_@SYSTEM@.c --@AMDEP_TRUE@ source='os_@SYSTEM@.c' object='libfcgi_la-os_@SYSTEM@.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/libfcgi_la-os_@SYSTEM@.Po' tmpdepfile='$(DEPDIR)/libfcgi_la-os_@SYSTEM@.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfcgi_la_CFLAGS) $(CFLAGS) -c -o libfcgi_la-os_@SYSTEM@.o `test -f os_@SYSTEM@.c || echo '$(srcdir)/'`os_@SYSTEM@.c -- --libfcgi_la-os_@SYSTEM@.obj: os_@SYSTEM@.c --@AMDEP_TRUE@ source='os_@SYSTEM@.c' object='libfcgi_la-os_@SYSTEM@.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/libfcgi_la-os_@SYSTEM@.Po' tmpdepfile='$(DEPDIR)/libfcgi_la-os_@SYSTEM@.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfcgi_la_CFLAGS) $(CFLAGS) -c -o libfcgi_la-os_@SYSTEM@.obj `cygpath -w os_@SYSTEM@.c` -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfcgi_la_CFLAGS) $(CFLAGS) -MT libfcgi_la-fcgi_stdio.lo -MD -MP -MF $(DEPDIR)/libfcgi_la-fcgi_stdio.Tpo -c -o libfcgi_la-fcgi_stdio.lo `test -f 'fcgi_stdio.c' || echo '$(srcdir)/'`fcgi_stdio.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libfcgi_la-fcgi_stdio.Tpo $(DEPDIR)/libfcgi_la-fcgi_stdio.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fcgi_stdio.c' object='libfcgi_la-fcgi_stdio.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfcgi_la_CFLAGS) $(CFLAGS) -c -o libfcgi_la-fcgi_stdio.lo `test -f 'fcgi_stdio.c' || echo '$(srcdir)/'`fcgi_stdio.c - - libfcgi_la-os_@SYSTEM@.lo: os_@SYSTEM@.c --@AMDEP_TRUE@ source='os_@SYSTEM@.c' object='libfcgi_la-os_@SYSTEM@.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/libfcgi_la-os_@SYSTEM@.Plo' tmpdepfile='$(DEPDIR)/libfcgi_la-os_@SYSTEM@.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfcgi_la_CFLAGS) $(CFLAGS) -c -o libfcgi_la-os_@SYSTEM@.lo `test -f os_@SYSTEM@.c || echo '$(srcdir)/'`os_@SYSTEM@.c --CCDEPMODE = @CCDEPMODE@ -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfcgi_la_CFLAGS) $(CFLAGS) -MT libfcgi_la-os_@SYSTEM@.lo -MD -MP -MF $(DEPDIR)/libfcgi_la-os_@SYSTEM@.Tpo -c -o libfcgi_la-os_@SYSTEM@.lo `test -f 'os_@SYSTEM@.c' || echo '$(srcdir)/'`os_@SYSTEM@.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libfcgi_la-os_@SYSTEM@.Tpo $(DEPDIR)/libfcgi_la-os_@SYSTEM@.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='os_@SYSTEM@.c' object='libfcgi_la-os_@SYSTEM@.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfcgi_la_CFLAGS) $(CFLAGS) -c -o libfcgi_la-os_@SYSTEM@.lo `test -f 'os_@SYSTEM@.c' || echo '$(srcdir)/'`os_@SYSTEM@.c - - .cpp.o: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CXXCOMPILE) -c -o $@ `cygpath -w $<` -+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< --CXXDEPMODE = @CXXDEPMODE@ --uninstall-info-am: -+@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - --tags: TAGS -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- mkid -fID $$unique $(LISP) -+ mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique - - GTAGS: -- here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -- --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = .. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) -- @for file in $(DISTFILES); do \ -- if test -f $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- $(mkinstalldirs) "$(distdir)/$$dir"; \ -- fi; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ -- cp -pR $$d/$$file $(distdir) \ -- || exit 1; \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ -@@ -371,10 +450,10 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(libdir) -- -+ for dir in "$(DESTDIR)$(libdir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -386,6 +465,7 @@ - installcheck: installcheck-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -393,7 +473,7 @@ - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -404,30 +484,42 @@ - mostlyclean-am - - distclean: distclean-am -- --distclean-am: clean-am distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-tags -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: install-libLTLIBRARIES - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -- -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-am -@@ -435,19 +527,31 @@ - mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - --uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ -+uninstall-am: uninstall-libLTLIBRARIES -+ -+.MAKE: install-am install-strip - --.PHONY: GTAGS all all-am check check-am clean clean-generic \ -- clean-libLTLIBRARIES clean-libtool distclean distclean-compile \ -- distclean-depend distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am \ -- install-libLTLIBRARIES install-man install-strip installcheck \ -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -+ clean-libLTLIBRARIES clean-libtool ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am \ -+ install-libLTLIBRARIES install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool tags uninstall \ -- uninstall-am uninstall-info-am uninstall-libLTLIBRARIES -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags uninstall uninstall-am uninstall-libLTLIBRARIES - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. ---- libfcgi-2.4.0.orig/config.guess -+++ libfcgi-2.4.0/config.guess -@@ -1,9 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -+# Inc. - --timestamp='2001-07-30' -+timestamp='2007-07-22' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,15 +18,18 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --# Written by Per Bothner . --# Please send patches to . -+ -+# Originally written by Per Bothner . -+# Please send patches to . Submit a context -+# diff and a properly formatted ChangeLog entry. - # - # This script attempts to guess a canonical system name similar to - # config.sub. If it succeeds, it prints the system name on stdout, and -@@ -52,7 +56,7 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO -@@ -65,11 +69,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -87,30 +91,42 @@ - exit 1 - fi - -+trap 'exit 1' 1 2 15 - --dummy=dummy-$$ --trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 -+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -+# compiler to aid in system detection is discouraged as it requires -+# temporary files to be created and, as you can see below, it is a -+# headache to deal with in a portable fashion. - --# CC_FOR_BUILD -- compiler used by this script. - # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still - # use `HOST_CC' if defined, but it is deprecated. - --set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in -- ,,) echo "int dummy(){}" > $dummy.c ; -- for c in cc gcc c89 ; do -- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; -- if test $? = 0 ; then -+# Portable tmp directory creation inspired by the Autoconf team. -+ -+set_cc_for_build=' -+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -+: ${TMPDIR=/tmp} ; -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || -+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || -+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -+dummy=$tmp/dummy ; -+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -+case $CC_FOR_BUILD,$HOST_CC,$CC in -+ ,,) echo "int x;" > $dummy.c ; -+ for c in cc gcc c89 c99 ; do -+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; -- rm -f $dummy.c $dummy.o $dummy.rel ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; --esac' -+esac ; set_cc_for_build= ;' - - # This is needed to find uname on a Pyramid OSx when run in the BSD universe. - # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -127,29 +143,31 @@ - - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) -- # Netbsd (nbsd) targets should (where applicable) match one or -+ # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. -- # Determine the machine/vendor (is the vendor relevant). -- case "${UNAME_MACHINE}" in -- amiga) machine=m68k-unknown ;; -- arm32) machine=arm-unknown ;; -- atari*) machine=m68k-atari ;; -- sun3*) machine=m68k-sun ;; -- mac68k) machine=m68k-apple ;; -- macppc) machine=powerpc-apple ;; -- hp3[0-9][05]) machine=m68k-hp ;; -- ibmrt|romp-ibm) machine=romp-ibm ;; -- *) machine=${UNAME_MACHINE}-unknown ;; -+ # -+ # Note: NetBSD doesn't particularly care about the vendor -+ # portion of the name. We always set it to "unknown". -+ sysctl="sysctl -n hw.machine_arch" -+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ -+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)` -+ case "${UNAME_MACHINE_ARCH}" in -+ armeb) machine=armeb-unknown ;; -+ arm*) machine=arm-unknown ;; -+ sh3el) machine=shl-unknown ;; -+ sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; -+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. -- case "${UNAME_MACHINE}" in -- i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) -+ case "${UNAME_MACHINE_ARCH}" in -+ arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null -@@ -166,117 +184,128 @@ - ;; - esac - # The OS release -- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ # Debian GNU/NetBSD machines have a different userland, and -+ # thus, need a distinct triplet. However, they do not need -+ # kernel version information, so it can be replaced with a -+ # suitable tag, in the style of linux-gnu. -+ case "${UNAME_VERSION}" in -+ Debian*) -+ release='-gnu' -+ ;; -+ *) -+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ ;; -+ esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" -- exit 0 ;; -+ exit ;; -+ *:OpenBSD:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -+ exit ;; -+ *:ekkoBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -+ exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; -+ macppc:MirBSD:*:*) -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; -+ *:MirBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; - alpha:OSF1:*:*) -- if test $UNAME_RELEASE = "V4.0"; then -+ case $UNAME_RELEASE in -+ *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` -- fi -+ ;; -+ *5.*) -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ ;; -+ esac -+ # According to Compaq, /usr/sbin/psrinfo has been available on -+ # OSF/1 and Tru64 systems produced since 1995. I hope that -+ # covers most systems running today. This code pipes the CPU -+ # types through head -n 1, so we only detect the type of CPU 0. -+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` -+ case "$ALPHA_CPU_TYPE" in -+ "EV4 (21064)") -+ UNAME_MACHINE="alpha" ;; -+ "EV4.5 (21064)") -+ UNAME_MACHINE="alpha" ;; -+ "LCA4 (21066/21068)") -+ UNAME_MACHINE="alpha" ;; -+ "EV5 (21164)") -+ UNAME_MACHINE="alphaev5" ;; -+ "EV5.6 (21164A)") -+ UNAME_MACHINE="alphaev56" ;; -+ "EV5.6 (21164PC)") -+ UNAME_MACHINE="alphapca56" ;; -+ "EV5.7 (21164PC)") -+ UNAME_MACHINE="alphapca57" ;; -+ "EV6 (21264)") -+ UNAME_MACHINE="alphaev6" ;; -+ "EV6.7 (21264A)") -+ UNAME_MACHINE="alphaev67" ;; -+ "EV6.8CB (21264C)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.8AL (21264B)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.8CX (21264D)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.9A (21264/EV69A)") -+ UNAME_MACHINE="alphaev69" ;; -+ "EV7 (21364)") -+ UNAME_MACHINE="alphaev7" ;; -+ "EV7.9 (21364A)") -+ UNAME_MACHINE="alphaev79" ;; -+ esac -+ # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. -- cat <$dummy.s -- .data --\$Lformat: -- .byte 37,100,45,37,120,10,0 # "%d-%x\n" -- -- .text -- .globl main -- .align 4 -- .ent main --main: -- .frame \$30,16,\$26,0 -- ldgp \$29,0(\$27) -- .prologue 1 -- .long 0x47e03d80 # implver \$0 -- lda \$2,-1 -- .long 0x47e20c21 # amask \$2,\$1 -- lda \$16,\$Lformat -- mov \$0,\$17 -- not \$1,\$18 -- jsr \$26,printf -- ldgp \$29,0(\$26) -- mov 0,\$16 -- jsr \$26,exit -- .end main --EOF -- eval $set_cc_for_build -- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null -- if test "$?" = 0 ; then -- case `./$dummy` in -- 0-0) -- UNAME_MACHINE="alpha" -- ;; -- 1-0) -- UNAME_MACHINE="alphaev5" -- ;; -- 1-1) -- UNAME_MACHINE="alphaev56" -- ;; -- 1-101) -- UNAME_MACHINE="alphapca56" -- ;; -- 2-303) -- UNAME_MACHINE="alphaev6" -- ;; -- 2-307) -- UNAME_MACHINE="alphaev67" -- ;; -- esac -- fi -- rm -f $dummy.s $dummy -- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit 0 ;; -+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix -- exit 0 ;; -+ exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 -- exit 0 ;; -+ exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 -- exit 0;; -- amiga:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos -- exit 0 ;; -- arc64:OpenBSD:*:*) -- echo mips64el-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- arc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- hkmips:OpenBSD:*:*) -- echo mips-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pmax:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sgi:OpenBSD:*:*) -- echo mips-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- wgrisc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ *:[Mm]orph[Oo][Ss]:*:*) -+ echo ${UNAME_MACHINE}-unknown-morphos -+ exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition -- exit 0 ;; -+ exit ;; -+ *:z/VM:*:*) -+ echo s390-ibm-zvmoe -+ exit ;; -+ *:OS400:*:*) -+ echo powerpc-ibm-os400 -+ exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} -- exit 0;; -+ exit ;; -+ arm:riscos:*:*|arm:RISCOS:*:*) -+ echo arm-unknown-riscos -+ exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp -- exit 0;; -+ exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then -@@ -284,25 +313,32 @@ - else - echo pyramid-pyramid-bsd - fi -- exit 0 ;; -+ exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 -- exit 0 ;; -+ exit ;; -+ DRS?6000:unix:4.0:6*) -+ echo sparc-icl-nx6 -+ exit ;; -+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) -+ case `/usr/bin/uname -p` in -+ sparc) echo sparc-icl-nx7; exit ;; -+ esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -- i86pc:SunOS:5.*:*) -+ exit ;; -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) -@@ -311,12 +347,12 @@ - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` -- exit 0 ;; -+ exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sun*:*:4.2BSD:*) -- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` -+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) -@@ -326,13 +362,10 @@ - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac -- exit 0 ;; -+ exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} -- exit 0 ;; -- atari*:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor -@@ -343,50 +376,42 @@ - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} -- exit 0 ;; -- sun3*:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mac68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ m68k:machten:*:*) -+ echo m68k-apple-machten${UNAME_RELEASE} -+ exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 -- exit 0 ;; -+ exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) -+ eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __cplusplus - #include /* for printf() prototype */ -@@ -408,28 +433,33 @@ - exit (-1); - } - EOF -- eval $set_cc_for_build -- $CC_FOR_BUILD $dummy.c -o $dummy \ -- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ -- && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -+ $CC_FOR_BUILD -o $dummy $dummy.c && -+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && -+ SYSTEM_NAME=`$dummy $dummyarg` && -+ { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax -- exit 0 ;; -+ exit ;; -+ Motorola:*:4.3:PL8-*) -+ echo powerpc-harris-powermax -+ exit ;; -+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) -+ echo powerpc-harris-powermax -+ exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix -- exit 0 ;; -+ exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 -- exit 0 ;; -+ exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 -- exit 0 ;; -+ exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` -@@ -445,29 +475,29 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 -- exit 0 ;; -+ exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 -- exit 0 ;; -+ exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd -- exit 0 ;; -+ exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` -- exit 0 ;; -+ exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. -- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' -+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix -- exit 0 ;; -+ exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` -@@ -475,9 +505,10 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then -+ eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - -@@ -489,18 +520,20 @@ - exit(0); - } - EOF -- eval $set_cc_for_build -- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -- echo rs6000-ibm-aix3.2.5 -+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` -+ then -+ echo "$SYSTEM_NAME" -+ else -+ echo rs6000-ibm-aix3.2.5 -+ fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi -- exit 0 ;; -+ exit ;; - *:AIX:*:[45]) -- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` -+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else -@@ -512,38 +545,36 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix -- exit 0 ;; -+ exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 -- exit 0 ;; -+ exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to -- exit 0 ;; # report: romp-ibm BSD 4.3 -+ exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx -- exit 0 ;; -+ exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 -- exit 0 ;; -+ exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd -- exit 0 ;; -+ exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 -- exit 0 ;; -+ exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) -- case "${HPUX_REV}" in -- 11.[0-9][0-9]) -- if [ -x /usr/bin/getconf ]; then -- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -+ if [ -x /usr/bin/getconf ]; then -+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -@@ -552,12 +583,13 @@ - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; -+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac -- fi ;; -- esac -- if [ "${HP_ARCH}" = "" ]; then -- sed 's/^ //' << EOF >$dummy.c -+ fi -+ if [ "${HP_ARCH}" = "" ]; then -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include -@@ -590,19 +622,39 @@ - exit (0); - } - EOF -- eval $set_cc_for_build -- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` -- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi -- rm -f $dummy.c $dummy -- fi ;; -+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` -+ test -z "$HP_ARCH" && HP_ARCH=hppa -+ fi ;; - esac -+ if [ ${HP_ARCH} = "hppa2.0w" ] -+ then -+ eval $set_cc_for_build -+ -+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating -+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler -+ # generating 64-bit code. GNU and HP use different nomenclature: -+ # -+ # $ CC_FOR_BUILD=cc ./config.guess -+ # => hppa2.0w-hp-hpux11.23 -+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess -+ # => hppa64-hp-hpux11.23 -+ -+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ grep __LP64__ >/dev/null -+ then -+ HP_ARCH="hppa2.0w" -+ else -+ HP_ARCH="hppa64" -+ fi -+ fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - 3050*:HI-UX:*:*) -+ eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int -@@ -628,159 +680,237 @@ - exit (0); - } - EOF -- eval $set_cc_for_build -- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 -- exit 0 ;; -+ exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd -- exit 0 ;; -+ exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd -- exit 0 ;; -+ exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix -- exit 0 ;; -+ exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf -- exit 0 ;; -+ exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf -- exit 0 ;; -+ exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi -- exit 0 ;; -+ exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites -- exit 0 ;; -- hppa*:OpenBSD:*:*) -- echo hppa-unknown-openbsd -- exit 0 ;; -+ exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit 0 ;; -- CRAY*X-MP:*:*:*) -- echo xmp-cray-unicos -- exit 0 ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -- CRAY*T3D:*:*:*) -- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -- CRAY-2:*:*:*) -- echo cray2-cray-unicos -- exit 0 ;; -+ exit ;; -+ *:UNICOS/mp:*:*) -+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -- hp300:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ 5000:UNIX_System_V:4.*:*) -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:FreeBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -- exit 0 ;; -- *:OpenBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -- exit 0 ;; -+ case ${UNAME_MACHINE} in -+ pc98) -+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ *) -+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ esac -+ exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin -- exit 0 ;; -- i*:MINGW*:*) -+ exit ;; -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 -- exit 0 ;; -+ exit ;; -+ i*:windows32*:*) -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 -+ exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 -- exit 0 ;; -+ exit ;; -+ *:Interix*:[3456]*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ EM64T | authenticamd) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; -+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) -+ echo i${UNAME_MACHINE}-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? -- echo i386-pc-interix -- exit 0 ;; -+ echo i586-pc-interix -+ exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin -- exit 0 ;; -+ exit ;; -+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) -+ echo x86_64-unknown-cygwin -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin -- exit 0 ;; -+ exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - *:GNU:*:*) -+ # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -- exit 0 ;; -+ exit ;; -+ *:GNU/*:*:*) -+ # other systems with GNU libc and userland -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix -- exit 0 ;; -+ exit ;; - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ avr32*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ cris:Linux:*:*) -+ echo cris-axis-linux-gnu -+ exit ;; -+ crisv32:Linux:*:*) -+ echo crisv32-axis-linux-gnu -+ exit ;; -+ frv:Linux:*:*) -+ echo frv-unknown-linux-gnu -+ exit ;; - ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux -- exit 0 ;; -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - mips:Linux:*:*) -- case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in -- big) echo mips-unknown-linux-gnu && exit 0 ;; -- little) echo mipsel-unknown-linux-gnu && exit 0 ;; -- esac -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #undef CPU -+ #undef mips -+ #undef mipsel -+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -+ CPU=mipsel -+ #else -+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -+ CPU=mips -+ #else -+ CPU= -+ #endif -+ #endif -+EOF -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -+ ;; -+ mips64:Linux:*:*) -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #undef CPU -+ #undef mips64 -+ #undef mips64el -+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -+ CPU=mips64el -+ #else -+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -+ CPU=mips64 -+ #else -+ CPU= -+ #endif -+ #endif -+EOF -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; -+ or32:Linux:*:*) -+ echo or32-unknown-linux-gnu -+ exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -789,12 +919,12 @@ - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; -- EV68*) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -- exit 0 ;; -+ exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -@@ -802,27 +932,37 @@ - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac -- exit 0 ;; -+ exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux -- exit 0 ;; -+ exit ;; -+ sh64*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-gnu -+ exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ xtensa:Linux:*:*) -+ echo xtensa-unknown-linux-gnu -+ exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. -- ld_supported_targets=`cd /; ld --help 2>&1 \ -+ # Set LC_ALL=C to ensure ld outputs messages in English. -+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// -@@ -834,52 +974,58 @@ - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit 0 ;; -+ exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit 0 ;; -+ exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit 0 ;; -+ exit ;; - esac - # Determine whether the default compiler is a.out or elf -- cat >$dummy.c < --#ifdef __cplusplus --#include /* for printf() prototype */ -- int main (int argc, char *argv[]) { --#else -- int main (argc, argv) int argc; char *argv[]; { --#endif --#ifdef __ELF__ --# ifdef __GLIBC__ --# if __GLIBC__ >= 2 -- printf ("%s-pc-linux-gnu\n", argv[1]); --# else -- printf ("%s-pc-linux-gnulibc1\n", argv[1]); --# endif --# else -- printf ("%s-pc-linux-gnulibc1\n", argv[1]); --# endif --#else -- printf ("%s-pc-linux-gnuaout\n", argv[1]); --#endif -- return 0; --} --EOF - eval $set_cc_for_build -- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 -+ sed 's/^ //' << EOF >$dummy.c -+ #include -+ #ifdef __ELF__ -+ # ifdef __GLIBC__ -+ # if __GLIBC__ >= 2 -+ LIBC=gnu -+ # else -+ LIBC=gnulibc1 -+ # endif -+ # else -+ LIBC=gnulibc1 -+ # endif -+ #else -+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+ LIBC=gnu -+ #else -+ LIBC=gnuaout -+ #endif -+ #endif -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif -+EOF -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^LIBC/{ -+ s: ::g -+ p -+ }'`" -+ test x"${LIBC}" != x && { -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit -+ } -+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 -- exit 0 ;; -+ exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... -@@ -887,7 +1033,27 @@ - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} -- exit 0 ;; -+ exit ;; -+ i*86:OS/2:*:*) -+ # If we were able to find `uname', then EMX Unix compatibility -+ # is probably installed. -+ echo ${UNAME_MACHINE}-pc-os2-emx -+ exit ;; -+ i*86:XTS-300:*:STOP) -+ echo ${UNAME_MACHINE}-unknown-stop -+ exit ;; -+ i*86:atheos:*:*) -+ echo ${UNAME_MACHINE}-unknown-atheos -+ exit ;; -+ i*86:syllable:*:*) -+ echo ${UNAME_MACHINE}-pc-syllable -+ exit ;; -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ echo i386-unknown-lynxos${UNAME_RELEASE} -+ exit ;; -+ i*86:*DOS:*:*) -+ echo ${UNAME_MACHINE}-pc-msdosdjgpp -+ exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then -@@ -895,99 +1061,100 @@ - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi -- exit 0 ;; -- i*86:*:5:[78]*) -+ exit ;; -+ i*86:*:5:[678]*) -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then -- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` -- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 -- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ -+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` -+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 -+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 -- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ -+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 -- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ -+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi -- exit 0 ;; -- i*86:*DOS:*:*) -- echo ${UNAME_MACHINE}-pc-msdosdjgpp -- exit 0 ;; -+ exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp -- exit 0 ;; -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 -- exit 0 ;; -+ exit ;; - paragon:*:*:*) - echo i860-intel-osf1 -- exit 0 ;; -+ exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi -- exit 0 ;; -+ exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv -- exit 0 ;; -- M68*:*:R3V[567]*:*) -- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) -+ exit ;; -+ mc68k:UNIX:SYSTEM5:3.51m) -+ echo m68k-convergent-sysv -+ exit ;; -+ M680?0:D-NIX:5.3:*) -+ echo m68k-diab-dnix -+ exit ;; -+ M68*:*:R3V[5678]*:*) -+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; -+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4 && exit 0 ;; -+ && { echo i486-ncr-sysv4; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 -- exit 0 ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -- echo i386-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -995,78 +1162,107 @@ - else - echo ns32k-sni-sysv - fi -- exit 0 ;; -- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says -+ exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says - echo i586-unisys-sysv4 -- exit 0 ;; -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 -- exit 0 ;; -+ exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 -- exit 0 ;; -+ exit ;; -+ i*86:VOS:*:*) -+ # From Paul.Green@stratus.com. -+ echo ${UNAME_MACHINE}-stratus-vos -+ exit ;; -+ *:VOS:*:*) -+ # From Paul.Green@stratus.com. -+ echo hppa1.1-stratus-vos -+ exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 -- exit 0 ;; -+ exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos -- exit 0 ;; -+ exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos -- exit 0 ;; -+ exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos -- exit 0 ;; -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ SX-6:SUPER-UX:*:*) -+ echo sx6-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Darwin:*:*) -- echo `uname -p`-apple-darwin${UNAME_RELEASE} -- exit 0 ;; -+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -+ case $UNAME_PROCESSOR in -+ unknown) UNAME_PROCESSOR=powerpc ;; -+ esac -+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -+ exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) -- if test "${UNAME_MACHINE}" = "x86pc"; then -+ UNAME_PROCESSOR=`uname -p` -+ if test "$UNAME_PROCESSOR" = "x86"; then -+ UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi -- echo `uname -p`-${UNAME_MACHINE}-nto-qnx -- exit 0 ;; -+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} -+ exit ;; - *:QNX:*:4*) - echo i386-pc-qnx -- exit 0 ;; -- NSR-[KW]:NONSTOP_KERNEL:*:*) -+ exit ;; -+ NSE-?:NONSTOP_KERNEL:*:*) -+ echo nse-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux -- exit 0 ;; -+ exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv -- exit 0 ;; -+ exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 -@@ -1077,38 +1273,53 @@ - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 -- exit 0 ;; -- i*86:OS/2:*:*) -- # If we were able to find `uname', then EMX Unix compatibility -- # is probably installed. -- echo ${UNAME_MACHINE}-pc-os2-emx -- exit 0 ;; -+ exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 -- exit 0 ;; -+ exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex -- exit 0 ;; -+ exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 -- exit 0 ;; -+ exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 -- exit 0 ;; -+ exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 -- exit 0 ;; -+ exit ;; - *:ITS:*:*) - echo pdp10-unknown-its -- exit 0 ;; -- i*86:XTS-300:*:STOP) -- echo ${UNAME_MACHINE}-unknown-stop -- exit 0 ;; -+ exit ;; -+ SEI:*:*:SEIUX) -+ echo mips-sei-seiux${UNAME_RELEASE} -+ exit ;; -+ *:DragonFly:*:*) -+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ exit ;; -+ *:*VMS:*:*) -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ case "${UNAME_MACHINE}" in -+ A*) echo alpha-dec-vms ; exit ;; -+ I*) echo ia64-dec-vms ; exit ;; -+ V*) echo vax-dec-vms ; exit ;; -+ esac ;; -+ *:XENIX:*:SysV) -+ echo i386-pc-xenix -+ exit ;; -+ i*86:skyos:*:*) -+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' -+ exit ;; -+ i*86:rdos:*:*) -+ echo ${UNAME_MACHINE}-pc-rdos -+ exit ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 - #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -+eval $set_cc_for_build - cat >$dummy.c < -@@ -1134,7 +1345,7 @@ - #endif - - #if defined (__arm) && defined (__acorn) && defined (__unix) -- printf ("arm-acorn-riscix"); exit (0); -+ printf ("arm-acorn-riscix\n"); exit (0); - #endif - - #if defined (hp300) && !defined (hpux) -@@ -1223,13 +1434,12 @@ - } - EOF - --eval $set_cc_for_build --$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 --rm -f $dummy.c $dummy -+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - - # Apollos put the system type in the environment. - --test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } -+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - - # Convex versions that predate uname can use getsysinfo(1) - -@@ -1238,22 +1448,22 @@ - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - c34*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - c38*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - c4*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - esac - fi - -@@ -1264,7 +1474,9 @@ - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- ftp://ftp.gnu.org/pub/gnu/config/ -+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess -+and -+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be ---- libfcgi-2.4.0.orig/install-sh -+++ libfcgi-2.4.0/install-sh -@@ -1,36 +1,62 @@ - #!/bin/sh --# - # install - install a program, script, or datafile --# This comes from X11R5 (mit/util/scripts/install.sh). -+ -+scriptversion=2006-10-14.15 -+ -+# This originates from X11R5 (mit/util/scripts/install.sh), which was -+# later released in X11R6 (xc/config/util/install.sh) with the -+# following copyright and license. -+# -+# Copyright (C) 1994 X Consortium -+# -+# Permission is hereby granted, free of charge, to any person obtaining a copy -+# of this software and associated documentation files (the "Software"), to -+# deal in the Software without restriction, including without limitation the -+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -+# sell copies of the Software, and to permit persons to whom the Software is -+# furnished to do so, subject to the following conditions: - # --# Copyright 1991 by the Massachusetts Institute of Technology -+# The above copyright notice and this permission notice shall be included in -+# all copies or substantial portions of the Software. - # --# Permission to use, copy, modify, distribute, and sell this software and its --# documentation for any purpose is hereby granted without fee, provided that --# the above copyright notice appear in all copies and that both that --# copyright notice and this permission notice appear in supporting --# documentation, and that the name of M.I.T. not be used in advertising or --# publicity pertaining to distribution of the software without specific, --# written prior permission. M.I.T. makes no representations about the --# suitability of this software for any purpose. It is provided "as is" --# without express or implied warranty. -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+# -+# Except as contained in this notice, the name of the X Consortium shall not -+# be used in advertising or otherwise to promote the sale, use or other deal- -+# ings in this Software without prior written authorization from the X Consor- -+# tium. -+# -+# -+# FSF changes to this file are in the public domain. - # - # Calling this script install-sh is preferred over install.sh, to prevent - # `make' implicit rules from creating a file called install from it - # when there is no Makefile. - # - # This script is compatible with the BSD install script, but was written --# from scratch. It can only install one file at a time, a restriction --# shared with many OS's install programs. -+# from scratch. - -+nl=' -+' -+IFS=" "" $nl" - - # set DOITPROG to echo to test this script - - # Don't use :- since 4.3BSD and earlier shells don't like it. - doit="${DOITPROG-}" -+if test -z "$doit"; then -+ doit_exec=exec -+else -+ doit_exec=$doit -+fi - -- --# put in absolute paths if you don't have them in your path; or use env. vars. -+# Put in absolute file names if you don't have them in your path; -+# or use environment vars. - - mvprog="${MVPROG-mv}" - cpprog="${CPPROG-cp}" -@@ -41,211 +67,441 @@ - rmprog="${RMPROG-rm}" - mkdirprog="${MKDIRPROG-mkdir}" - --transformbasename="" --transform_arg="" --instcmd="$mvprog" --chmodcmd="$chmodprog 0755" --chowncmd="" --chgrpcmd="" --stripcmd="" --rmcmd="$rmprog -f" --mvcmd="$mvprog" --src="" --dst="" --dir_arg="" -- --while [ x"$1" != x ]; do -- case $1 in -- -c) instcmd="$cpprog" -- shift -- continue;; -- -- -d) dir_arg=true -- shift -- continue;; -- -- -m) chmodcmd="$chmodprog $2" -- shift -- shift -- continue;; -- -- -o) chowncmd="$chownprog $2" -- shift -- shift -- continue;; -- -- -g) chgrpcmd="$chgrpprog $2" -- shift -- shift -- continue;; -- -- -s) stripcmd="$stripprog" -- shift -- continue;; -- -- -t=*) transformarg=`echo $1 | sed 's/-t=//'` -- shift -- continue;; -- -- -b=*) transformbasename=`echo $1 | sed 's/-b=//'` -- shift -- continue;; -- -- *) if [ x"$src" = x ] -- then -- src=$1 -- else -- # this colon is to work around a 386BSD /bin/sh bug -- : -- dst=$1 -- fi -- shift -- continue;; -- esac --done -- --if [ x"$src" = x ] --then -- echo "install: no input file specified" -- exit 1 --else -- true --fi -+posix_glob= -+posix_mkdir= - --if [ x"$dir_arg" != x ]; then -- dst=$src -- src="" -- -- if [ -d $dst ]; then -- instcmd=: -- chmodcmd="" -- else -- instcmd=mkdir -- fi --else -+# Desired mode of installed file. -+mode=0755 - --# Waiting for this to be detected by the "$instcmd $src $dsttmp" command --# might cause directories to be created, which would be especially bad --# if $src (and thus $dsttmp) contains '*'. -- -- if [ -f $src -o -d $src ] -- then -- true -- else -- echo "install: $src does not exist" -- exit 1 -- fi -- -- if [ x"$dst" = x ] -- then -- echo "install: no destination specified" -- exit 1 -- else -- true -- fi -+chmodcmd=$chmodprog -+chowncmd= -+chgrpcmd= -+stripcmd= -+rmcmd="$rmprog -f" -+mvcmd="$mvprog" -+src= -+dst= -+dir_arg= -+dstarg= -+no_target_directory= -+ -+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE -+ or: $0 [OPTION]... SRCFILES... DIRECTORY -+ or: $0 [OPTION]... -t DIRECTORY SRCFILES... -+ or: $0 [OPTION]... -d DIRECTORIES... -+ -+In the 1st form, copy SRCFILE to DSTFILE. -+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -+In the 4th, create DIRECTORIES. -+ -+Options: -+-c (ignored) -+-d create directories instead of installing files. -+-g GROUP $chgrpprog installed files to GROUP. -+-m MODE $chmodprog installed files to MODE. -+-o USER $chownprog installed files to USER. -+-s $stripprog installed files. -+-t DIRECTORY install into DIRECTORY. -+-T report an error if DSTFILE is a directory. -+--help display this help and exit. -+--version display version info and exit. -+ -+Environment variables override the default commands: -+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG -+" -+ -+while test $# -ne 0; do -+ case $1 in -+ -c) shift -+ continue;; -+ -+ -d) dir_arg=true -+ shift -+ continue;; -+ -+ -g) chgrpcmd="$chgrpprog $2" -+ shift -+ shift -+ continue;; -+ -+ --help) echo "$usage"; exit $?;; -+ -+ -m) mode=$2 -+ shift -+ shift -+ case $mode in -+ *' '* | *' '* | *' -+'* | *'*'* | *'?'* | *'['*) -+ echo "$0: invalid mode: $mode" >&2 -+ exit 1;; -+ esac -+ continue;; -+ -+ -o) chowncmd="$chownprog $2" -+ shift -+ shift -+ continue;; -+ -+ -s) stripcmd=$stripprog -+ shift -+ continue;; - --# If destination is a directory, append the input filename; if your system --# does not like double slashes in filenames, you may need to add some logic -+ -t) dstarg=$2 -+ shift -+ shift -+ continue;; - -- if [ -d $dst ] -- then -- dst="$dst"/`basename $src` -- else -- true -- fi --fi -+ -T) no_target_directory=true -+ shift -+ continue;; - --## this sed command emulates the dirname command --dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` -+ --version) echo "$0 $scriptversion"; exit $?;; - --# Make sure that the destination directory exists. --# this part is taken from Noah Friedman's mkinstalldirs script -+ --) shift -+ break;; - --# Skip lots of stat calls in the usual case. --if [ ! -d "$dstdir" ]; then --defaultIFS=' --' --IFS="${IFS-${defaultIFS}}" -+ -*) echo "$0: invalid option: $1" >&2 -+ exit 1;; - --oIFS="${IFS}" --# Some sh's can't handle IFS=/ for some reason. --IFS='%' --set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` --IFS="${oIFS}" -+ *) break;; -+ esac -+done - --pathcomp='' -+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then -+ # When -d is used, all remaining arguments are directories to create. -+ # When -t is used, the destination is already specified. -+ # Otherwise, the last argument is the destination. Remove it from $@. -+ for arg -+ do -+ if test -n "$dstarg"; then -+ # $@ is not empty: it contains at least $arg. -+ set fnord "$@" "$dstarg" -+ shift # fnord -+ fi -+ shift # arg -+ dstarg=$arg -+ done -+fi - --while [ $# -ne 0 ] ; do -- pathcomp="${pathcomp}${1}" -- shift -+if test $# -eq 0; then -+ if test -z "$dir_arg"; then -+ echo "$0: no input file specified." >&2 -+ exit 1 -+ fi -+ # It's OK to call `install-sh -d' without argument. -+ # This can happen when creating conditional directories. -+ exit 0 -+fi - -- if [ ! -d "${pathcomp}" ] ; -- then -- $mkdirprog "${pathcomp}" -- else -- true -- fi -+if test -z "$dir_arg"; then -+ trap '(exit $?); exit' 1 2 13 15 - -- pathcomp="${pathcomp}/" --done -+ # Set umask so as not to create temps with too-generous modes. -+ # However, 'strip' requires both read and write access to temps. -+ case $mode in -+ # Optimize common cases. -+ *644) cp_umask=133;; -+ *755) cp_umask=22;; -+ -+ *[0-7]) -+ if test -z "$stripcmd"; then -+ u_plus_rw= -+ else -+ u_plus_rw='% 200' -+ fi -+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; -+ *) -+ if test -z "$stripcmd"; then -+ u_plus_rw= -+ else -+ u_plus_rw=,u+rw -+ fi -+ cp_umask=$mode$u_plus_rw;; -+ esac - fi - --if [ x"$dir_arg" != x ] --then -- $doit $instcmd $dst && -- -- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && -- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && -- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && -- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi --else -- --# If we're going to rename the final executable, determine the name now. -+for src -+do -+ # Protect names starting with `-'. -+ case $src in -+ -*) src=./$src ;; -+ esac -+ -+ if test -n "$dir_arg"; then -+ dst=$src -+ dstdir=$dst -+ test -d "$dstdir" -+ dstdir_status=$? -+ else -+ -+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command -+ # might cause directories to be created, which would be especially bad -+ # if $src (and thus $dsttmp) contains '*'. -+ if test ! -f "$src" && test ! -d "$src"; then -+ echo "$0: $src does not exist." >&2 -+ exit 1 -+ fi -+ -+ if test -z "$dstarg"; then -+ echo "$0: no destination specified." >&2 -+ exit 1 -+ fi -+ -+ dst=$dstarg -+ # Protect names starting with `-'. -+ case $dst in -+ -*) dst=./$dst ;; -+ esac - -- if [ x"$transformarg" = x ] -- then -- dstfile=`basename $dst` -+ # If destination is a directory, append the input filename; won't work -+ # if double slashes aren't ignored. -+ if test -d "$dst"; then -+ if test -n "$no_target_directory"; then -+ echo "$0: $dstarg: Is a directory" >&2 -+ exit 1 -+ fi -+ dstdir=$dst -+ dst=$dstdir/`basename "$src"` -+ dstdir_status=0 -+ else -+ # Prefer dirname, but fall back on a substitute if dirname fails. -+ dstdir=` -+ (dirname "$dst") 2>/dev/null || -+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$dst" : 'X\(//\)[^/]' \| \ -+ X"$dst" : 'X\(//\)$' \| \ -+ X"$dst" : 'X\(/\)' \| . 2>/dev/null || -+ echo X"$dst" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q' -+ ` -+ -+ test -d "$dstdir" -+ dstdir_status=$? -+ fi -+ fi -+ -+ obsolete_mkdir_used=false -+ -+ if test $dstdir_status != 0; then -+ case $posix_mkdir in -+ '') -+ # Create intermediate dirs using mode 755 as modified by the umask. -+ # This is like FreeBSD 'install' as of 1997-10-28. -+ umask=`umask` -+ case $stripcmd.$umask in -+ # Optimize common cases. -+ *[2367][2367]) mkdir_umask=$umask;; -+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; -+ -+ *[0-7]) -+ mkdir_umask=`expr $umask + 22 \ -+ - $umask % 100 % 40 + $umask % 20 \ -+ - $umask % 10 % 4 + $umask % 2 -+ `;; -+ *) mkdir_umask=$umask,go-w;; -+ esac -+ -+ # With -d, create the new directory with the user-specified mode. -+ # Otherwise, rely on $mkdir_umask. -+ if test -n "$dir_arg"; then -+ mkdir_mode=-m$mode - else -- dstfile=`basename $dst $transformbasename | -- sed $transformarg`$transformbasename -+ mkdir_mode= - fi - --# don't allow the sed command to completely eliminate the filename -+ posix_mkdir=false -+ case $umask in -+ *[123567][0-7][0-7]) -+ # POSIX mkdir -p sets u+wx bits regardless of umask, which -+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. -+ ;; -+ *) -+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ -+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - -- if [ x"$dstfile" = x ] -- then -- dstfile=`basename $dst` -+ if (umask $mkdir_umask && -+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 -+ then -+ if test -z "$dir_arg" || { -+ # Check for POSIX incompatibilities with -m. -+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or -+ # other-writeable bit of parent directory when it shouldn't. -+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. -+ ls_ld_tmpdir=`ls -ld "$tmpdir"` -+ case $ls_ld_tmpdir in -+ d????-?r-*) different_mode=700;; -+ d????-?--*) different_mode=755;; -+ *) false;; -+ esac && -+ $mkdirprog -m$different_mode -p -- "$tmpdir" && { -+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"` -+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" -+ } -+ } -+ then posix_mkdir=: -+ fi -+ rmdir "$tmpdir/d" "$tmpdir" -+ else -+ # Remove any dirs left behind by ancient mkdir implementations. -+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null -+ fi -+ trap '' 0;; -+ esac;; -+ esac -+ -+ if -+ $posix_mkdir && ( -+ umask $mkdir_umask && -+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" -+ ) -+ then : -+ else -+ -+ # The umask is ridiculous, or mkdir does not conform to POSIX, -+ # or it failed possibly due to a race condition. Create the -+ # directory the slow way, step by step, checking for races as we go. -+ -+ case $dstdir in -+ /*) prefix=/ ;; -+ -*) prefix=./ ;; -+ *) prefix= ;; -+ esac -+ -+ case $posix_glob in -+ '') -+ if (set -f) 2>/dev/null; then -+ posix_glob=true -+ else -+ posix_glob=false -+ fi ;; -+ esac -+ -+ oIFS=$IFS -+ IFS=/ -+ $posix_glob && set -f -+ set fnord $dstdir -+ shift -+ $posix_glob && set +f -+ IFS=$oIFS -+ -+ prefixes= -+ -+ for d -+ do -+ test -z "$d" && continue -+ -+ prefix=$prefix$d -+ if test -d "$prefix"; then -+ prefixes= - else -- true -+ if $posix_mkdir; then -+ (umask=$mkdir_umask && -+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break -+ # Don't fail if two instances are running concurrently. -+ test -d "$prefix" || exit 1 -+ else -+ case $prefix in -+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; -+ *) qprefix=$prefix;; -+ esac -+ prefixes="$prefixes '$qprefix'" -+ fi - fi -+ prefix=$prefix/ -+ done - --# Make a temp file name in the proper directory. -- -- dsttmp=$dstdir/#inst.$$# -- --# Move or copy the file name to the temp name -- -- $doit $instcmd $src $dsttmp && -- -- trap "rm -f ${dsttmp}" 0 && -- --# and set any options; do chmod last to preserve setuid bits -- --# If any of these fail, we abort the whole thing. If we want to --# ignore errors from any of these, just make sure not to ignore --# errors from the above "$doit $instcmd $src $dsttmp" command. -- -- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && -- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && -- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && -- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && -- --# Now rename the file to the real destination. -- -- $doit $rmcmd -f $dstdir/$dstfile && -- $doit $mvcmd $dsttmp $dstdir/$dstfile -- --fi && -+ if test -n "$prefixes"; then -+ # Don't fail if two instances are running concurrently. -+ (umask $mkdir_umask && -+ eval "\$doit_exec \$mkdirprog $prefixes") || -+ test -d "$dstdir" || exit 1 -+ obsolete_mkdir_used=true -+ fi -+ fi -+ fi -+ -+ if test -n "$dir_arg"; then -+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && -+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && -+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || -+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 -+ else -+ -+ # Make a couple of temp file names in the proper directory. -+ dsttmp=$dstdir/_inst.$$_ -+ rmtmp=$dstdir/_rm.$$_ -+ -+ # Trap to clean up those temp files at exit. -+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 -+ -+ # Copy the file name to the temp name. -+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && -+ -+ # and set any options; do chmod last to preserve setuid bits. -+ # -+ # If any of these fail, we abort the whole thing. If we want to -+ # ignore errors from any of these, just make sure not to ignore -+ # errors from the above "$doit $cpprog $src $dsttmp" command. -+ # -+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ -+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ -+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ -+ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && -+ -+ # Now rename the file to the real destination. -+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ -+ || { -+ # The rename failed, perhaps because mv can't rename something else -+ # to itself, or perhaps because mv is so ancient that it does not -+ # support -f. -+ -+ # Now remove or move aside any old file at destination location. -+ # We try this two ways since rm can't unlink itself on some -+ # systems and the destination file might be busy for other -+ # reasons. In this case, the final cleanup might fail but the new -+ # file should still install successfully. -+ { -+ if test -f "$dst"; then -+ $doit $rmcmd -f "$dst" 2>/dev/null \ -+ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ -+ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ -+ || { -+ echo "$0: cannot unlink or rename $dst" >&2 -+ (exit 1); exit 1 -+ } -+ else -+ : -+ fi -+ } && -+ -+ # Now rename the file to the real destination. -+ $doit $mvcmd "$dsttmp" "$dst" -+ } -+ } || exit 1 - -+ trap '' 0 -+ fi -+done - --exit 0 -+# Local variables: -+# eval: (add-hook 'write-file-hooks 'time-stamp) -+# time-stamp-start: "scriptversion=" -+# time-stamp-format: "%:y-%02m-%02d.%02H" -+# time-stamp-end: "$" -+# End: ---- libfcgi-2.4.0.orig/config.sub -+++ libfcgi-2.4.0/config.sub -@@ -1,9 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -+# Inc. - --timestamp='2001-07-27' -+timestamp='2007-06-28' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,15 +22,17 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, --# Boston, MA 02111-1307, USA. -- -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. -+# - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --# Please send patches to . -+ -+# Please send patches to . Submit a context -+# diff and a properly formatted ChangeLog entry. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. -@@ -69,7 +72,7 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO -@@ -82,11 +85,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -98,7 +101,7 @@ - *local*) - # First pass through any local machine types. - echo $1 -- exit 0;; -+ exit ;; - - * ) - break ;; -@@ -117,7 +120,9 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -143,7 +148,7 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis) -+ -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; -@@ -168,6 +173,10 @@ - -hiux*) - os=-hiuxwe2 - ;; -+ -sco6) -+ os=-sco5v6 -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -184,6 +193,10 @@ - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -223,26 +236,57 @@ - case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. -- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ -- | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \ -- | pyramid | mn10200 | mn10300 | tron | a29k \ -- | 580 | i960 | h8300 \ -- | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ -- | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ -- | hppa64 \ -- | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ -- | alphaev6[78] \ -- | we32k | ns16k | clipper | i370 | sh | sh[34] | sh[34]eb \ -- | powerpc | powerpcle \ -- | 1750a | dsp16xx | pdp10 | pdp11 \ -- | mips16 | mips64 | mipsel | mips64el \ -- | mips64orion | mips64orionel | mipstx39 | mipstx39el \ -- | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ -- | mips64vr5000 | mips64vr5000el | mcore | s390 | s390x \ -- | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \ -- | v850 | c4x \ -- | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ -- | pj | pjl | h8500 | z8k) -+ 1750a | 580 \ -+ | a29k \ -+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ -+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -+ | am33_2.0 \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | bfin \ -+ | c4x | clipper \ -+ | d10v | d30v | dlx | dsp16xx \ -+ | fido | fr30 | frv \ -+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | i370 | i860 | i960 | ia64 \ -+ | ip2k | iq2000 \ -+ | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | mcore | mep \ -+ | mips | mipsbe | mipseb | mipsel | mipsle \ -+ | mips16 \ -+ | mips64 | mips64el \ -+ | mips64vr | mips64vrel \ -+ | mips64orion | mips64orionel \ -+ | mips64vr4100 | mips64vr4100el \ -+ | mips64vr4300 | mips64vr4300el \ -+ | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ -+ | mipsisa32 | mipsisa32el \ -+ | mipsisa32r2 | mipsisa32r2el \ -+ | mipsisa64 | mipsisa64el \ -+ | mipsisa64r2 | mipsisa64r2el \ -+ | mipsisa64sb1 | mipsisa64sb1el \ -+ | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipstx39 | mipstx39el \ -+ | mn10200 | mn10300 \ -+ | mt \ -+ | msp430 \ -+ | nios | nios2 \ -+ | ns16k | ns32k \ -+ | or32 \ -+ | pdp10 | pdp11 | pj | pjl \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ -+ | pyramid \ -+ | score \ -+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -+ | sh64 | sh64le \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -+ | spu | strongarm \ -+ | tahoe | thumb | tic4x | tic80 | tron \ -+ | v850 | v850e \ -+ | we32k \ -+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | z8k) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) -@@ -252,6 +296,9 @@ - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; -+ ms1) -+ basic_machine=mt-unknown -+ ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and -@@ -265,31 +312,66 @@ - exit 1 - ;; - # Recognize the basic CPU types with company name. -- # FIXME: clean up the formatting here. -- vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ -- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ -- | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ -- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ -- | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ -- | xmp-* | ymp-* \ -- | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ -- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ -- | hppa2.0n-* | hppa64-* \ -- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ -- | alphaev6[78]-* \ -- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ -- | clipper-* | orion-* \ -- | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \ -- | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ -- | mips16-* | mips64-* | mipsel-* \ -- | mips64el-* | mips64orion-* | mips64orionel-* \ -- | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ -- | mipstx39-* | mipstx39el-* | mcore-* \ -- | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ -- | [cjt]90-* \ -- | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ -- | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \ -- | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*) -+ 580-* \ -+ | a29k-* \ -+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ -+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ -+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ -+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -+ | avr-* | avr32-* \ -+ | bfin-* | bs2000-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -+ | clipper-* | craynv-* | cydra-* \ -+ | d10v-* | d30v-* | dlx-* \ -+ | elxsi-* \ -+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ -+ | h8300-* | h8500-* \ -+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -+ | i*86-* | i860-* | i960-* | ia64-* \ -+ | ip2k-* | iq2000-* \ -+ | m32c-* | m32r-* | m32rle-* \ -+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* \ -+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -+ | mips16-* \ -+ | mips64-* | mips64el-* \ -+ | mips64vr-* | mips64vrel-* \ -+ | mips64orion-* | mips64orionel-* \ -+ | mips64vr4100-* | mips64vr4100el-* \ -+ | mips64vr4300-* | mips64vr4300el-* \ -+ | mips64vr5000-* | mips64vr5000el-* \ -+ | mips64vr5900-* | mips64vr5900el-* \ -+ | mipsisa32-* | mipsisa32el-* \ -+ | mipsisa32r2-* | mipsisa32r2el-* \ -+ | mipsisa64-* | mipsisa64el-* \ -+ | mipsisa64r2-* | mipsisa64r2el-* \ -+ | mipsisa64sb1-* | mipsisa64sb1el-* \ -+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -+ | mipstx39-* | mipstx39el-* \ -+ | mmix-* \ -+ | mt-* \ -+ | msp430-* \ -+ | nios-* | nios2-* \ -+ | none-* | np1-* | ns16k-* | ns32k-* \ -+ | orion-* \ -+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ -+ | pyramid-* \ -+ | romp-* | rs6000-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -+ | sparclite-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -+ | tahoe-* | thumb-* \ -+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tron-* \ -+ | v850-* | v850e-* | vax-* \ -+ | we32k-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | xstormy16-* | xtensa-* \ -+ | ymp-* \ -+ | z8k-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -@@ -307,6 +389,9 @@ - basic_machine=a29k-amd - os=-udi - ;; -+ abacus) -+ basic_machine=abacus-unknown -+ ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout -@@ -321,6 +406,12 @@ - basic_machine=a29k-none - os=-bsd - ;; -+ amd64) -+ basic_machine=x86_64-pc -+ ;; -+ amd64-*) -+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - amdahl) - basic_machine=580-amdahl - os=-sysv -@@ -352,6 +443,10 @@ - basic_machine=ns32k-sequent - os=-dynix - ;; -+ c90) -+ basic_machine=c90-cray -+ os=-unicos -+ ;; - convex-c1) - basic_machine=c1-convex - os=-bsd -@@ -372,30 +467,45 @@ - basic_machine=c38-convex - os=-bsd - ;; -- cray | ymp) -- basic_machine=ymp-cray -+ cray | j90) -+ basic_machine=j90-cray - os=-unicos - ;; -- cray2) -- basic_machine=cray2-cray -- os=-unicos -+ craynv) -+ basic_machine=craynv-cray -+ os=-unicosmp - ;; -- [cjt]90) -- basic_machine=${basic_machine}-cray -- os=-unicos -+ cr16) -+ basic_machine=cr16-unknown -+ os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; -+ crisv32 | crisv32-* | etraxfs*) -+ basic_machine=crisv32-axis -+ ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; -+ crx) -+ basic_machine=crx-unknown -+ os=-elf -+ ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; -+ decsystem10* | dec10*) -+ basic_machine=pdp10-dec -+ os=-tops10 -+ ;; -+ decsystem20* | dec20*) -+ basic_machine=pdp10-dec -+ os=-tops20 -+ ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola -@@ -404,6 +514,10 @@ - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ djgpp) -+ basic_machine=i586-pc -+ os=-msdosdjgpp -+ ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx -@@ -569,6 +683,10 @@ - basic_machine=i386-pc - os=-mingw32 - ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ os=-mingw32ce -+ ;; - miniframe) - basic_machine=m68000-convergent - ;; -@@ -576,32 +694,27 @@ - basic_machine=m68k-atari - os=-mint - ;; -- mipsel*-linux*) -- basic_machine=mipsel-unknown -- os=-linux-gnu -- ;; -- mips*-linux*) -- basic_machine=mips-unknown -- os=-linux-gnu -- ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; -- mmix*) -- basic_machine=mmix-knuth -- os=-mmixware -- ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; -+ morphos) -+ basic_machine=powerpc-unknown -+ os=-morphos -+ ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; -+ ms1-*) -+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs -@@ -677,6 +790,13 @@ - basic_machine=hppa1.1-oki - os=-proelf - ;; -+ openrisc | openrisc-*) -+ basic_machine=or32-unknown -+ ;; -+ os400) -+ basic_machine=powerpc-ibm -+ os=-os400 -+ ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose -@@ -699,42 +819,64 @@ - pbb) - basic_machine=m68k-tti - ;; -- pc532 | pc532-*) -+ pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -- pentium | p5 | k5 | k6 | nexgen) -+ pc98) -+ basic_machine=i386-pc -+ ;; -+ pc98-*) -+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; -- pentiumpro | p6 | 6x86 | athlon) -+ pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; -- pentiumii | pentium2) -+ pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; -- pentium-* | p5-* | k5-* | k6-* | nexgen-*) -+ pentium4) -+ basic_machine=i786-pc -+ ;; -+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -- pentiumii-* | pentium2-*) -+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -+ pentium4-*) -+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown -- ;; -+ ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -- ;; -+ ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -+ ppc64) basic_machine=powerpc64-unknown -+ ;; -+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ ppc64le | powerpc64little | ppc64-le | powerpc64-little) -+ basic_machine=powerpc64le-unknown -+ ;; -+ ppc64le-* | powerpc64little-*) -+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - ps2) - basic_machine=i386-ibm - ;; -@@ -742,6 +884,10 @@ - basic_machine=i586-unknown - os=-pw32 - ;; -+ rdos) -+ basic_machine=i386-pc -+ os=-rdos -+ ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff -@@ -752,10 +898,30 @@ - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; -+ s390 | s390-*) -+ basic_machine=s390-ibm -+ ;; -+ s390x | s390x-*) -+ basic_machine=s390x-ibm -+ ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; -+ sb1) -+ basic_machine=mipsisa64sb1-unknown -+ ;; -+ sb1el) -+ basic_machine=mipsisa64sb1el-unknown -+ ;; -+ sde) -+ basic_machine=mipsisa32-sde -+ os=-elf -+ ;; -+ sei) -+ basic_machine=mips-sei -+ os=-seiux -+ ;; - sequent) - basic_machine=i386-sequent - ;; -@@ -763,7 +929,13 @@ - basic_machine=sh-hitachi - os=-hms - ;; -- sparclite-wrs) -+ sh5el) -+ basic_machine=sh5le-unknown -+ ;; -+ sh64) -+ basic_machine=sh64-unknown -+ ;; -+ sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; -@@ -830,22 +1002,42 @@ - os=-dynix - ;; - t3e) -- basic_machine=t3e-cray -+ basic_machine=alphaev5-cray -+ os=-unicos -+ ;; -+ t90) -+ basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; -+ tic55x | c55x*) -+ basic_machine=tic55x-unknown -+ os=-coff -+ ;; -+ tic6x | c6x*) -+ basic_machine=tic6x-unknown -+ os=-coff -+ ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; -+ toad1) -+ basic_machine=pdp10-xkl -+ os=-tops20 -+ ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; -+ tpf) -+ basic_machine=s390x-ibm -+ os=-tpf -+ ;; - udi29k) - basic_machine=a29k-amd - os=-udi -@@ -867,8 +1059,8 @@ - os=-vms - ;; - vpp*|vx|vx-*) -- basic_machine=f301-fujitsu -- ;; -+ basic_machine=f301-fujitsu -+ ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks -@@ -889,17 +1081,17 @@ - basic_machine=hppa1.1-winbond - os=-proelf - ;; -- windows32) -- basic_machine=i386-pc -- os=-windows32-msvcrt -- ;; -- xmp) -- basic_machine=xmp-cray -- os=-unicos -+ xbox) -+ basic_machine=i686-pc -+ os=-mingw32 - ;; -- xps | xps100) -+ xps | xps100) - basic_machine=xps100-honeywell - ;; -+ ymp) -+ basic_machine=ymp-cray -+ os=-unicos -+ ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim -@@ -920,16 +1112,12 @@ - op60c) - basic_machine=hppa1.1-oki - ;; -- mips) -- if [ x$os = x-linux-gnu ]; then -- basic_machine=mips-unknown -- else -- basic_machine=mips-mips -- fi -- ;; - romp) - basic_machine=romp-ibm - ;; -+ mmix) -+ basic_machine=mmix-knuth -+ ;; - rs6000) - basic_machine=rs6000-ibm - ;; -@@ -946,13 +1134,13 @@ - we32k) - basic_machine=we32k-att - ;; -- sh3 | sh4 | sh3eb | sh4eb) -+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sparc | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; -- cydra) -+ cydra) - basic_machine=cydra-cydrome - ;; - orion) -@@ -967,10 +1155,6 @@ - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; -- c4x*) -- basic_machine=c4x-none -- os=-coff -- ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; -@@ -1026,16 +1210,23 @@ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ -- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -+ | -openbsd* | -solidbsd* \ -+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ -+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ -- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ -+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) -+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ -+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ -+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1047,16 +1238,21 @@ - ;; - esac - ;; -+ -nto-qnx*) -+ ;; - -nto*) -- os=-nto-qnx -+ os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ -- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ -+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; -+ -linux-dietlibc) -+ os=-linux-dietlibc -+ ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -@@ -1069,6 +1265,9 @@ - -opened*) - os=-openedition - ;; -+ -os400*) -+ os=-os400 -+ ;; - -wince*) - os=-wince - ;; -@@ -1087,14 +1286,23 @@ - -acis*) - os=-aos - ;; -+ -atheos*) -+ os=-atheos -+ ;; -+ -syllable*) -+ os=-syllable -+ ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; -+ -nova*) -+ os=-rtmk-nova -+ ;; - -ns2 ) -- os=-nextstep2 -+ os=-nextstep2 - ;; - -nsk*) - os=-nsk -@@ -1106,6 +1314,9 @@ - -sinix*) - os=-sysv4 - ;; -+ -tpf*) -+ os=-tpf -+ ;; - -triton*) - os=-sysv3 - ;; -@@ -1133,8 +1344,17 @@ - -xenix) - os=-xenix - ;; -- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -- os=-mint -+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -+ os=-mint -+ ;; -+ -aros*) -+ os=-aros -+ ;; -+ -kaos*) -+ os=-kaos -+ ;; -+ -zvmoe) -+ os=-zvmoe - ;; - -none) - ;; -@@ -1158,6 +1378,12 @@ - # system, and we'll never get to this point. - - case $basic_machine in -+ score-*) -+ os=-elf -+ ;; -+ spu-*) -+ os=-elf -+ ;; - *-acorn) - os=-riscix1.2 - ;; -@@ -1167,10 +1393,14 @@ - arm*-semi) - os=-aout - ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; -- pdp11-*) -+ pdp11-*) - os=-none - ;; - *-dec | vax-*) -@@ -1191,12 +1421,18 @@ - m68*-cisco) - os=-aout - ;; -+ mep-*) -+ os=-elf -+ ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; -+ or32-*) -+ os=-coff -+ ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; -@@ -1206,9 +1442,15 @@ - *-be) - os=-beos - ;; -+ *-haiku) -+ os=-haiku -+ ;; - *-ibm) - os=-aix - ;; -+ *-knuth) -+ os=-mmixware -+ ;; - *-wec) - os=-proelf - ;; -@@ -1260,19 +1502,19 @@ - *-next) - os=-nextstep3 - ;; -- *-gould) -+ *-gould) - os=-sysv - ;; -- *-highlevel) -+ *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; -- *-sgi) -+ *-sgi) - os=-irix - ;; -- *-siemens) -+ *-siemens) - os=-sysv4 - ;; - *-masscomp) -@@ -1341,10 +1583,16 @@ - -mvs* | -opened*) - vendor=ibm - ;; -+ -os400*) -+ vendor=ibm -+ ;; - -ptx*) - vendor=sequent - ;; -- -vxsim* | -vxworks*) -+ -tpf*) -+ vendor=ibm -+ ;; -+ -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) -@@ -1359,13 +1607,16 @@ - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; -+ -vos*) -+ vendor=stratus -+ ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; - esac - - echo $basic_machine$os --exit 0 -+exit - - # Local variables: - # eval: (add-hook 'write-file-hooks 'time-stamp) ---- libfcgi-2.4.0.orig/missing -+++ libfcgi-2.4.0/missing -@@ -1,6 +1,10 @@ - #! /bin/sh - # Common stub for a few missing GNU programs while installing. --# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc. -+ -+scriptversion=2006-05-10.23 -+ -+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -+# Free Software Foundation, Inc. - # Originally by Fran,cois Pinard , 1996. - - # This program is free software; you can redistribute it and/or modify -@@ -15,8 +19,8 @@ - - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+# 02110-1301, USA. - - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -29,6 +33,8 @@ - fi - - run=: -+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -+sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - - # In the cases where this matters, `missing' is being run in the - # srcdir already. -@@ -38,18 +44,24 @@ - configure_ac=configure.in - fi - --case "$1" in -+msg="missing on your system" -+ -+case $1 in - --run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 -+ # Exit code 63 means version mismatch. This often happens -+ # when the user try to use an ancient version of a tool on -+ # a file that requires a minimum version. In this case we -+ # we should proceed has if the program had been absent, or -+ # if --run hadn't been passed. -+ if test $? = 63; then -+ run=: -+ msg="probably too old" -+ fi - ;; --esac -- --# If it does not exist, or fails to run (possibly an outdated version), --# try to emulate it. --case "$1" in - - -h|--h|--he|--hel|--help) - echo "\ -@@ -67,6 +79,7 @@ - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' -+ autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c -@@ -74,11 +87,15 @@ - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags -- yacc create \`y.tab.[ch]', if possible, from existing .[ch]" -+ yacc create \`y.tab.[ch]', if possible, from existing .[ch] -+ -+Send bug reports to ." -+ exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) -- echo "missing 0.3 - GNU automake" -+ echo "missing $scriptversion (GNU Automake)" -+ exit $? - ;; - - -*) -@@ -87,9 +104,44 @@ - exit 1 - ;; - -- aclocal) -+esac -+ -+# Now exit if we have it, but it failed. Also exit now if we -+# don't have it and --version was passed (most likely to detect -+# the program). -+case $1 in -+ lex|yacc) -+ # Not GNU programs, they don't have --version. -+ ;; -+ -+ tar) -+ if test -n "$run"; then -+ echo 1>&2 "ERROR: \`tar' requires --run" -+ exit 1 -+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then -+ exit 1 -+ fi -+ ;; -+ -+ *) -+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then -+ # We have it, but it failed. -+ exit 1 -+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then -+ # Could not run --version or --help. This is probably someone -+ # running `$TOOL --version' or `$TOOL --help' to check whether -+ # $TOOL exists and not knowing $TOOL uses missing. -+ exit 1 -+ fi -+ ;; -+esac -+ -+# If it does not exist, or fails to run (possibly an outdated version), -+# try to emulate it. -+case $1 in -+ aclocal*) - echo 1>&2 "\ --WARNING: \`$1' is missing on your system. You should only need it if -+WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." -@@ -98,7 +150,7 @@ - - autoconf) - echo 1>&2 "\ --WARNING: \`$1' is missing on your system. You should only need it if -+WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." -@@ -107,7 +159,7 @@ - - autoheader) - echo 1>&2 "\ --WARNING: \`$1' is missing on your system. You should only need it if -+WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." -@@ -115,7 +167,7 @@ - test -z "$files" && files="config.h" - touch_files= - for f in $files; do -- case "$f" in -+ case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; -@@ -124,9 +176,9 @@ - touch $touch_files - ;; - -- automake) -+ automake*) - echo 1>&2 "\ --WARNING: \`$1' is missing on your system. You should only need it if -+WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." -@@ -135,71 +187,92 @@ - while read f; do touch "$f"; done - ;; - -+ autom4te) -+ echo 1>&2 "\ -+WARNING: \`$1' is needed, but is $msg. -+ You might have modified some files without having the -+ proper tools for further handling them. -+ You can get \`$1' as part of \`Autoconf' from any GNU -+ archive site." -+ -+ file=`echo "$*" | sed -n "$sed_output"` -+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` -+ if test -f "$file"; then -+ touch $file -+ else -+ test -z "$file" || exec >$file -+ echo "#! /bin/sh" -+ echo "# Created by GNU Automake missing as a replacement of" -+ echo "# $ $@" -+ echo "exit 0" -+ chmod +x $file -+ exit 1 -+ fi -+ ;; -+ - bison|yacc) - echo 1>&2 "\ --WARNING: \`$1' is missing on your system. You should only need it if -+WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h -- if [ $# -ne 1 ]; then -+ if test $# -ne 1; then - eval LASTARG="\${$#}" -- case "$LASTARG" in -+ case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` -- if [ -f "$SRCFILE" ]; then -+ if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` -- if [ -f "$SRCFILE" ]; then -+ if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi -- if [ ! -f y.tab.h ]; then -+ if test ! -f y.tab.h; then - echo >y.tab.h - fi -- if [ ! -f y.tab.c ]; then -+ if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ --WARNING: \`$1' is missing on your system. You should only need it if -+WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c -- if [ $# -ne 1 ]; then -+ if test $# -ne 1; then - eval LASTARG="\${$#}" -- case "$LASTARG" in -+ case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` -- if [ -f "$SRCFILE" ]; then -+ if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi -- if [ ! -f lex.yy.c ]; then -+ if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ --WARNING: \`$1' is missing on your system. You should only need it if -+WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - -- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` -- if test -z "$file"; then -- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` -- fi -- if [ -f "$file" ]; then -+ file=`echo "$*" | sed -n "$sed_output"` -+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` -+ if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file -@@ -209,54 +282,58 @@ - ;; - - makeinfo) -- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then -- # We have makeinfo, but it failed. -- exit 1 -- fi -- - echo 1>&2 "\ --WARNING: \`$1' is missing on your system. You should only need it if -+WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." -- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` -+ # The file to touch is that specified with -o ... -+ file=`echo "$*" | sed -n "$sed_output"` -+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then -- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` -- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` -- fi -+ # ... or it is the one specified with @setfilename ... -+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` -+ file=`sed -n ' -+ /^@setfilename/{ -+ s/.* \([^ ]*\) *$/\1/ -+ p -+ q -+ }' $infile` -+ # ... or it is derived from the source name (dir/f.texi becomes f.info) -+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info -+ fi -+ # If the file does not exist, the user really needs makeinfo; -+ # let's fail without touching anything. -+ test -f $file || exit 1 - touch $file - ;; - - tar) - shift -- if test -n "$run"; then -- echo 1>&2 "ERROR: \`tar' requires --run" -- exit 1 -- fi - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then -- gnutar ${1+"$@"} && exit 0 -+ gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then -- gtar ${1+"$@"} && exit 0 -+ gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then -- case "$firstarg" in -+ case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` -- tar "$firstarg" ${1+"$@"} && exit 0 -+ tar "$firstarg" "$@" && exit 0 - ;; - esac -- case "$firstarg" in -+ case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` -- tar "$firstarg" ${1+"$@"} && exit 0 -+ tar "$firstarg" "$@" && exit 0 - ;; - esac - fi -@@ -270,10 +347,10 @@ - - *) - echo 1>&2 "\ --WARNING: \`$1' is needed, and you do not seem to have it handy on your -- system. You might have modified some files without having the -+WARNING: \`$1' is needed, and is $msg. -+ You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, -- it often tells you about the needed prerequirements for installing -+ it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 -@@ -281,3 +358,10 @@ - esac - - exit 0 -+ -+# Local variables: -+# eval: (add-hook 'write-file-hooks 'time-stamp) -+# time-stamp-start: "scriptversion=" -+# time-stamp-format: "%:y-%02m-%02d.%02H" -+# time-stamp-end: "$" -+# End: ---- libfcgi-2.4.0.orig/stamp-h -+++ libfcgi-2.4.0/stamp-h -@@ -0,0 +1 @@ -+timestamp ---- libfcgi-2.4.0.orig/debian/dirs -+++ libfcgi-2.4.0/debian/dirs -@@ -0,0 +1 @@ -+lib ---- libfcgi-2.4.0.orig/debian/control -+++ libfcgi-2.4.0/debian/control -@@ -0,0 +1,26 @@ -+Source: libfcgi -+Priority: optional -+Maintainer: Tatsuki Sugiura -+Build-Depends: debhelper (>> 4.0.0) -+Standards-Version: 3.7.2 -+ -+Package: libfcgi-dev -+Section: libdevel -+Architecture: any -+Depends: libfcgi0ldbl (= ${binary:Version}) -+Description: Header files of FastCGI -+ FastCGI is a language independent, scalable, open extension -+ to CGI that provides high performance without the limitations -+ of server specific APIs. -+ -+Package: libfcgi0ldbl -+Provides: libfcgi -+Section: libs -+Architecture: any -+Depends: ${shlibs:Depends} -+Conflicts: libfcgi0, libfcgi0c2 -+Replaces: libfcgi0, libfcgi0c2 -+Description: Shared library of FastCGI -+ FastCGI is a language independent, scalable, open extension -+ to CGI that provides high performance without the limitations -+ of server specific APIs. ---- libfcgi-2.4.0.orig/debian/rules -+++ libfcgi-2.4.0/debian/rules -@@ -0,0 +1,114 @@ -+#!/usr/bin/make -f -+# Sample debian/rules that uses debhelper. -+# GNU copyright 1997 to 1999 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+ -+# These are used for cross-compiling and for saving the configure script -+# from having to guess our platform (since we know it already) -+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -+ -+ -+CFLAGS = -Wall -g -+ -+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -+ CFLAGS += -O0 -+else -+ CFLAGS += -O2 -+endif -+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -+ INSTALL_PROGRAM += -s -+endif -+ -+# shared library versions, option 1 -+version=2.0.5 -+major=2 -+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -+#version=`ls src/.libs/lib*.so.* | \ -+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -+#major=`ls src/.libs/lib*.so.* | \ -+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` -+ -+config.status: configure -+ dh_testdir -+ # Add here commands to configure the package. -+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info -+ -+ -+build: build-stamp -+build-stamp: config.status -+ dh_testdir -+ -+ # Add here commands to compile the package. -+ $(MAKE) -+ -+ touch build-stamp -+ -+clean: -+ dh_testdir -+ dh_testroot -+ rm -f build-stamp -+ -+ # Add here commands to clean up after the build process. -+ test ! -f Makefile || $(MAKE) distclean -+ifneq "$(wildcard /usr/share/misc/config.sub)" "" -+ cp -f /usr/share/misc/config.sub config.sub -+endif -+ifneq "$(wildcard /usr/share/misc/config.guess)" "" -+ cp -f /usr/share/misc/config.guess config.guess -+endif -+ -+ -+ dh_clean -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ -+ # Add here commands to install the package into debian/tmp -+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp -+ dh_movefiles -+ -+ -+# Build architecture-independent files here. -+binary-indep: build install -+# We have nothing to do by default. -+ -+# Build architecture-dependent files here. -+binary-arch: build install -+ dh_testdir -+ dh_testroot -+ dh_installchangelogs -+ dh_installdocs -+ dh_installexamples -+# dh_install -+# dh_installmenu -+# dh_installdebconf -+# dh_installlogrotate -+# dh_installemacsen -+# dh_installpam -+# dh_installmime -+# dh_installinit -+# dh_installcron -+# dh_installinfo -+ dh_installman -p libfcgi0ldbl debian/cgi-fcgi.1 -+ dh_link -+ dh_strip -+ dh_compress -+ dh_fixperms -+# dh_perl -+# d_python -+ dh_makeshlibs -+ dh_installdeb -+ dh_shlibdeps -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install ---- libfcgi-2.4.0.orig/debian/watch -+++ libfcgi-2.4.0/debian/watch -@@ -0,0 +1,6 @@ -+# Example watch control file for uscan -+# Rename this file to "watch" and then you can run the "uscan" command -+# to check for upstream updates and more. -+# Site Directory Pattern Version Script -+version=2 -+http://www.fastcgi.com/dist/ fcgi-([0-9\.-]*)\.tar\.gz debian uupdate ---- libfcgi-2.4.0.orig/debian/shlibs.local -+++ libfcgi-2.4.0/debian/shlibs.local -@@ -0,0 +1 @@ -+liblibfcgi 0.0.0 libfcgi0c0 (>> 2.4.0-0), libfcgi0c0 (<< 2.4.0-99) ---- libfcgi-2.4.0.orig/debian/changelog -+++ libfcgi-2.4.0/debian/changelog -@@ -0,0 +1,43 @@ -+libfcgi (2.4.0-7) unstable; urgency=low -+ -+ * rebuild for long double 128bit transition. (Closes: #430250) -+ * update autotools scripts -+ -+ -- Tatsuki Sugiura Tue, 5 Sep 2006 18:11:06 +0900 -+ -+libfcgi (2.4.0-6) unstable; urgency=low -+ -+ * rebuild for new libstdc++ -+ -+ -- Tatsuki Sugiura Tue, 5 Sep 2006 08:19:25 +0900 -+ -+libfcgi (2.4.0-5) unstable; urgency=low -+ -+ * fixed: package description (Closes: #226030) -+ -+ -- Tatsuki Sugiura Mon, 5 Jan 2004 18:40:30 +0900 -+ -+libfcgi (2.4.0-4) unstable; urgency=low -+ -+ * re-libtoolize for mips and mipsel (Closes: #213951) -+ -+ -- Tatsuki Sugiura Tue, 18 Nov 2003 05:39:33 +0900 -+ -+libfcgi (2.4.0-3) unstable; urgency=low -+ -+ * upload official debian archive agein (Closes: #203590) -+ -+ -- Tatsuki Sugiura Sun, 21 Sep 2003 04:45:12 +0900 -+ -+libfcgi (2.4.0-2) unstable; urgency=low -+ -+ * upload official debian archive (Closes: #203590) -+ -+ -- Tatsuki Sugiura Mon, 8 Sep 2003 16:11:52 +0900 -+ -+libfcgi (2.4.0-1) unstable; urgency=low -+ -+ * Initial Release. -+ -+ -- Tatsuki Sugiura Tue, 8 Jul 2003 13:58:36 +0900 -+ ---- libfcgi-2.4.0.orig/debian/libfcgi0ldbl.files -+++ libfcgi-2.4.0/debian/libfcgi0ldbl.files -@@ -0,0 +1,2 @@ -+usr/bin/* -+usr/lib/lib*.so.* ---- libfcgi-2.4.0.orig/debian/compat -+++ libfcgi-2.4.0/debian/compat -@@ -0,0 +1 @@ -+4 ---- libfcgi-2.4.0.orig/debian/libfcgi0ldbl.docs -+++ libfcgi-2.4.0/debian/libfcgi0ldbl.docs -@@ -0,0 +1,4 @@ -+README -+doc/fastcgi-prog-guide/* -+doc/fastcgi-whitepaper/* -+doc/* ---- libfcgi-2.4.0.orig/debian/cgi-fcgi.1 -+++ libfcgi-2.4.0/debian/cgi-fcgi.1 -@@ -0,0 +1,135 @@ -+.\" Hey, EMACS: -*- nroff -*- -+.\" First parameter, NAME, should be all caps -+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -+.\" other parameters are allowed: see man(7), man(1) -+.TH cgi-fcgi 1 1997-09-17 -+.\" Please adjust this date whenever revising the manpage. -+.\" -+.\" Some roff macros, for reference: -+.\" .nh disable hyphenation -+.\" .hy enable hyphenation -+.\" .ad l left justify -+.\" .ad b justify to both left and right margins -+.\" .nf disable filling -+.\" .fi enable filling -+.\" .br insert line break -+.\" .sp insert n+1 empty lines -+.\" for manpage-specific macros, see man(7) -+.SH NAME -+cgi-fcgi \- bridge from CGI to FastCGI -+.SH SYNOPSIS -+.B cgi-fcgi -+-f cmdPath -+.br -+.B cgi-fcgi -+-bind -connect connName -+.br -+.B cgi-fcgi -+-start -connect connName appPath [nServers] -+.br -+.B cgi-fcgi -+-connect connName appPath [nServers] -+.SH DESCRIPTION -+.PP -+cgi-fcgi is a CGI/1.1 program that communicates with an -+already-running FastCGI application in order to respond to an -+HTTP request. cgi-fcgi is also capable of starting a FastCGI -+application. -+.PP -+When you invoke cgi-fcgi as -+.IP -+.B cgi-fcgi -+-f cmdPath -+.PP -+then cgi-fcgi opens the file at cmdPath and reads its -+arguments from that file. cgi-fcgi will skip lines -+that begin with the comment character #. The first -+non-comment line should contain valid arguments in -+one of the other three forms. -+.PP -+The -f form of cgi-fcgi is designed for Unix systems -+whose exec(2) family of system calls supports the execution of -+command interpreter files. For instance, if a file with -+execute permission contains the text -+.IP -+#! /bin/cgi-fcgi -f -+.br -+-connect /httpd/root/sock/app /httpd/root/bin/app -+.PP -+the effect is the same as executing -+.IP -+/usr/bin/cgi-fcgi -connect /httpd/root/sock/app /httpd/root/bin/app -+.PP -+When you invoke cgi-fcgi as -+.IP -+cgi-fcgi -bind -connect connName -+.PP -+the connName argument is either the path name of a Unix domain -+listening socket or a host:port pair. If connName contains -+a colon, it is assumed to be host:port. cgi-fcgi performs -+a connect(2) using connName. If the connect succeeds, cgi-fcgi -+forwards the CGI environment variables and stdin data to the -+FastCGI application, and forwards the stdout and stderr data from -+the application to cgi-fcgi's stdout (most likely connected to -+a Web server). When the FastCGI application signals the end of -+its response, cgi-fcgi flushes its buffers and -+exits, and the Web server completes the http response. -+.PP -+When you invoke cgi-fcgi as -+.IP -+cgi-fcgi -start -connect connName appPath [nServers] -+.PP -+then cgi-fcgi performs the function of starting one or more -+FastCGI application processes. The connName argument specifies -+either the path name of the Unix domain listening socket that -+cgi-fcgi will create, or is "localhost:NNN" where NNN is the port -+number of the TCP/IP listening socket that cgi-fcgi will create -+on the local machine. (cgi-fcgi will not create processes -+on remote machines.) After cgi-fcgi creates the listening socket, -+it forks nServers copies of a process running the executable file -+appPath. If nServers is omitted, the effect is as if the value "1" -+had been specified. The processes share the single listening socket. -+.PP -+When you invoke cgi-fcgi as -+.IP -+cgi-fcgi -connect connName appPath [nServers] -+.PP -+cgi-fcgi performs -bind and then, if necssary, performs -start -+and repeats the -bind. That is, cgi-fcgi first operates as if -+the command had been -+.IP -+cgi-fcgi -bind -connect connName -+.PP -+If the connect fails, cgi-fcgi tries -+.IP -+cgi-fcgi -start -connect connName appPath [nServers] -+.PP -+and finally retries -+.IP -+cgi-fcgi -bind -connect connName -+.PP -+In this form, cgi-fcgi does not support TCP/IP connections. -+.SH ENVIRONMENT VARIABLES -+The usual CGI ones, but they are not interpreted by cgi-fcgi. -+.SH SEE ALSO -+.BR FGCI_accept (3). -+ (in Debian, /usr/share/doc/libfcgi?/*) -+.SH BUGS -+cgi-fcgi doesn't generate useful HTTP responses in case of error, -+and it generates no response at all when run as start-fcgi. -+.PP -+On Digital UNIX 3.0 systems the implementation of Unix Domain -+sockets does not work when such sockets are stored on NFS file -+systems. Symptom: cgi-fcgi may core dump or may exit with -+status 38. Work-around: store sockets in local file systems -+(/tmp often works) or use TCP/IP. -+.PP -+On AIX systems the implementation of listening sockets -+does not support socket sharing, and the standard FastCGI -+application libraries can't synchronize access to AIX listening -+sockets. Work-around: Don't use the nServers argument on AIX. -+.SH HISTORY -+Copyright (c) 1996 Open Market, Inc. -+See the file "LICENSE.TERMS" for information on usage and redistribution -+of this file, and for a DISCLAIMER OF ALL WARRANTIES. -+$Id: cgi-fcgi.1,v 1.1.1.1 1997/09/16 15:36:26 stanleyg Exp $ ---- libfcgi-2.4.0.orig/debian/copyright -+++ libfcgi-2.4.0/debian/copyright -@@ -0,0 +1,37 @@ -+This package was debianized by Tatsuki Sugiura on -+Tue, 8 Jul 2003 13:58:36 +0900. -+ -+It was downloaded from http://www.fastcgi.com/#TheDevKit -+ -+Upstream Author: Open Market, Inc. -+ -+Copyright: -+ -+This FastCGI application library source and object code (the -+"Software") and its documentation (the "Documentation") are -+copyrighted by Open Market, Inc ("Open Market"). The following terms -+apply to all files associated with the Software and Documentation -+unless explicitly disclaimed in individual files. -+ -+Open Market permits you to use, copy, modify, distribute, and license -+this Software and the Documentation for any purpose, provided that -+existing copyright notices are retained in all copies and that this -+notice is included verbatim in any distributions. No written -+agreement, license, or royalty fee is required for any of the -+authorized uses. Modifications to this Software and Documentation may -+be copyrighted by their authors and need not follow the licensing -+terms described here. If modifications to this Software and -+Documentation have new licensing terms, the new terms must be clearly -+indicated on the first page of each file where they apply. -+ -+OPEN MARKET MAKES NO EXPRESS OR IMPLIED WARRANTY WITH RESPECT TO THE -+SOFTWARE OR THE DOCUMENTATION, INCLUDING WITHOUT LIMITATION ANY -+WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. IN -+NO EVENT SHALL OPEN MARKET BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY -+DAMAGES ARISING FROM OR RELATING TO THIS SOFTWARE OR THE -+DOCUMENTATION, INCLUDING, WITHOUT LIMITATION, ANY INDIRECT, SPECIAL OR -+CONSEQUENTIAL DAMAGES OR SIMILAR DAMAGES, INCLUDING LOST PROFITS OR -+LOST DATA, EVEN IF OPEN MARKET HAS BEEN ADVISED OF THE POSSIBILITY OF -+SUCH DAMAGES. THE SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS". -+OPEN MARKET HAS NO LIABILITY IN CONTRACT, TORT, NEGLIGENCE OR -+OTHERWISE ARISING OUT OF THIS SOFTWARE OR THE DOCUMENTATION. ---- libfcgi-2.4.0.orig/debian/libfcgi-dev.files -+++ libfcgi-2.4.0/debian/libfcgi-dev.files -@@ -0,0 +1,5 @@ -+usr/include/* -+usr/lib/lib*.a -+usr/lib/lib*.so -+usr/lib/pkgconfig/* -+/usr/lib/*.la ---- libfcgi-2.4.0.orig/mkinstalldirs -+++ libfcgi-2.4.0/mkinstalldirs -@@ -1,40 +1,161 @@ - #! /bin/sh - # mkinstalldirs --- make directory hierarchy --# Author: Noah Friedman --# Created: 1993-05-16 --# Public domain - --# $Id: mkinstalldirs,v 1.1 2001/09/21 15:05:21 skimo Exp $ -+scriptversion=2006-05-11.19 - -+# Original author: Noah Friedman -+# Created: 1993-05-16 -+# Public domain. -+# -+# This file is maintained in Automake, please report -+# bugs to or send patches to -+# . -+ -+nl=' -+' -+IFS=" "" $nl" - errstatus=0 -+dirmode= -+ -+usage="\ -+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... -+ -+Create each directory DIR (with mode MODE, if specified), including all -+leading file name components. -+ -+Report bugs to ." -+ -+# process command line arguments -+while test $# -gt 0 ; do -+ case $1 in -+ -h | --help | --h*) # -h for help -+ echo "$usage" -+ exit $? -+ ;; -+ -m) # -m PERM arg -+ shift -+ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } -+ dirmode=$1 -+ shift -+ ;; -+ --version) -+ echo "$0 $scriptversion" -+ exit $? -+ ;; -+ --) # stop option processing -+ shift -+ break -+ ;; -+ -*) # unknown option -+ echo "$usage" 1>&2 -+ exit 1 -+ ;; -+ *) # first non-opt arg -+ break -+ ;; -+ esac -+done - - for file - do -- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` -- shift -+ if test -d "$file"; then -+ shift -+ else -+ break -+ fi -+done -+ -+case $# in -+ 0) exit 0 ;; -+esac -+ -+# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -+# mkdir -p a/c at the same time, both will detect that a is missing, -+# one will create a, then the other will try to create a and die with -+# a "File exists" error. This is a problem when calling mkinstalldirs -+# from a parallel make. We use --version in the probe to restrict -+# ourselves to GNU mkdir, which is thread-safe. -+case $dirmode in -+ '') -+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then -+ echo "mkdir -p -- $*" -+ exec mkdir -p -- "$@" -+ else -+ # On NextStep and OpenStep, the `mkdir' command does not -+ # recognize any option. It will interpret all options as -+ # directories to create, and then abort because `.' already -+ # exists. -+ test -d ./-p && rmdir ./-p -+ test -d ./--version && rmdir ./--version -+ fi -+ ;; -+ *) -+ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && -+ test ! -d ./--version; then -+ echo "mkdir -m $dirmode -p -- $*" -+ exec mkdir -m "$dirmode" -p -- "$@" -+ else -+ # Clean up after NextStep and OpenStep mkdir. -+ for d in ./-m ./-p ./--version "./$dirmode"; -+ do -+ test -d $d && rmdir $d -+ done -+ fi -+ ;; -+esac - -- pathcomp= -- for d -- do -- pathcomp="$pathcomp$d" -- case "$pathcomp" in -- -* ) pathcomp=./$pathcomp ;; -- esac -- -- if test ! -d "$pathcomp"; then -- echo "mkdir $pathcomp" -- -- mkdir "$pathcomp" || lasterr=$? -- -- if test ! -d "$pathcomp"; then -- errstatus=$lasterr -- fi -- fi -+for file -+do -+ case $file in -+ /*) pathcomp=/ ;; -+ *) pathcomp= ;; -+ esac -+ oIFS=$IFS -+ IFS=/ -+ set fnord $file -+ shift -+ IFS=$oIFS -+ -+ for d -+ do -+ test "x$d" = x && continue -+ -+ pathcomp=$pathcomp$d -+ case $pathcomp in -+ -*) pathcomp=./$pathcomp ;; -+ esac -+ -+ if test ! -d "$pathcomp"; then -+ echo "mkdir $pathcomp" -+ -+ mkdir "$pathcomp" || lasterr=$? -+ -+ if test ! -d "$pathcomp"; then -+ errstatus=$lasterr -+ else -+ if test ! -z "$dirmode"; then -+ echo "chmod $dirmode $pathcomp" -+ lasterr= -+ chmod "$dirmode" "$pathcomp" || lasterr=$? -+ -+ if test ! -z "$lasterr"; then -+ errstatus=$lasterr -+ fi -+ fi -+ fi -+ fi - -- pathcomp="$pathcomp/" -- done -+ pathcomp=$pathcomp/ -+ done - done - - exit $errstatus - --# mkinstalldirs ends here -+# Local Variables: -+# mode: shell-script -+# sh-indentation: 2 -+# eval: (add-hook 'write-file-hooks 'time-stamp) -+# time-stamp-start: "scriptversion=" -+# time-stamp-format: "%:y-%02m-%02d.%02H" -+# time-stamp-end: "$" -+# End: ---- libfcgi-2.4.0.orig/Makefile.in -+++ libfcgi-2.4.0/Makefile.in -@@ -1,6 +1,7 @@ --# Makefile.in generated automatically by automake 1.5 from Makefile.am. -+# Makefile.in generated by automake 1.6.3 from Makefile.am. -+# @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 - # Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -18,7 +19,6 @@ - # - # $Id: Makefile.am,v 1.7 2001/12/22 13:05:39 robs Exp $ - # -- - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -49,9 +49,13 @@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) - transform = @program_transform_name@ -@@ -63,6 +67,10 @@ - POST_UNINSTALL = : - host_alias = @host_alias@ - host_triplet = @host@ -+ -+EXEEXT = @EXEEXT@ -+OBJEXT = @OBJEXT@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - AMTAR = @AMTAR@ - AS = @AS@ - AWK = @AWK@ -@@ -73,13 +81,11 @@ - DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ - ECHO_CPP = @ECHO_CPP@ --EXEEXT = @EXEEXT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LIBFCGIXX = @LIBFCGIXX@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - OBJDUMP = @OBJDUMP@ --OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PTHREAD_CC = @PTHREAD_CC@ - PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -@@ -191,31 +197,23 @@ - uninstall-info-recursive all-recursive install-data-recursive \ - install-exec-recursive installdirs-recursive install-recursive \ - uninstall-recursive check-recursive installcheck-recursive --DIST_COMMON = README $(include_HEADERS) ./stamp-h.in Makefile.am \ -- Makefile.in acinclude.m4 aclocal.m4 compile config.guess \ -- config.sub configure configure.in depcomp fcgi_config.h.in \ -- install-sh ltmain.sh missing mkinstalldirs -+DIST_COMMON = README $(include_HEADERS) Makefile.am Makefile.in \ -+ acinclude.m4 aclocal.m4 compile config.guess config.sub \ -+ configure configure.in depcomp fcgi_config.h.in install-sh \ -+ ltmain.sh missing mkinstalldirs - DIST_SUBDIRS = $(SUBDIRS) - all: fcgi_config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: - --mostlyclean-libtool: -- -rm -f *.lo -- --clean-libtool: -- -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool -+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -+ configure.lineno - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign Makefile -+ $(AUTOMAKE) --gnu Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && \ -- CONFIG_HEADERS= CONFIG_LINKS= \ -- CONFIG_FILES=$@ $(SHELL) ./config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) - - $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck -@@ -224,40 +222,42 @@ - - $(ACLOCAL_M4): configure.in acinclude.m4 - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) --fcgi_config.h: stamp-h -- @if test ! -f $@; then \ -- rm -f stamp-h; \ -- $(MAKE) stamp-h; \ -- else :; fi --stamp-h: $(srcdir)/fcgi_config.h.in $(top_builddir)/config.status -- @rm -f stamp-h stamp-hT -- @echo timestamp > stamp-hT 2> /dev/null -- cd $(top_builddir) \ -- && CONFIG_FILES= CONFIG_HEADERS=fcgi_config.h \ -- $(SHELL) ./config.status -- @mv stamp-hT stamp-h --$(srcdir)/fcgi_config.h.in: $(srcdir)/./stamp-h.in -+ -+fcgi_config.h: stamp-h1 - @if test ! -f $@; then \ -- rm -f $(srcdir)/./stamp-h.in; \ -- $(MAKE) $(srcdir)/./stamp-h.in; \ -+ rm -f stamp-h1; \ -+ $(MAKE) stamp-h1; \ - else :; fi --$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) -- @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT -- @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null -+ -+stamp-h1: $(srcdir)/fcgi_config.h.in $(top_builddir)/config.status -+ @rm -f stamp-h1 -+ cd $(top_builddir) && $(SHELL) ./config.status fcgi_config.h -+ -+$(srcdir)/fcgi_config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) -- @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in -+ touch $(srcdir)/fcgi_config.h.in - - distclean-hdr: -- -rm -f fcgi_config.h -+ -rm -f fcgi_config.h stamp-h1 -+ -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool - uninstall-info-am: -+includeHEADERS_INSTALL = $(INSTALL_HEADER) - install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir) - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ -- $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f; \ -+ echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ -+ $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \ - done - - uninstall-includeHEADERS: -@@ -275,7 +275,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $(MAKEFLAGS); amf=$$2; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -295,7 +295,7 @@ - - mostlyclean-recursive clean-recursive distclean-recursive \ - maintainer-clean-recursive: -- @set fnord $(MAKEFLAGS); amf=$$2; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -323,16 +323,19 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- mkid -fID $$unique $(LISP) -+ mkid -fID $$unique - - TAGS: tags-recursive $(HEADERS) $(SOURCES) fcgi_config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -343,51 +346,61 @@ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ list='$(SOURCES) $(HEADERS) fcgi_config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)fcgi_config.h.in$$unique$(LISP)$$tags" \ -- || etags $(ETAGS_ARGS) $$tags fcgi_config.h.in $$unique $(LISP) -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique - - GTAGS: -- here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -- - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - top_distdir = . --# Avoid unsightly `./'. - distdir = $(PACKAGE)-$(VERSION) - -+am__remove_distdir = \ -+ { test ! -d $(distdir) \ -+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ -+ && rm -fr $(distdir); }; } -+ - GZIP_ENV = --best -+distcleancheck_listfiles = find . -type f -print - - distdir: $(DISTFILES) -- -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) -+ $(am__remove_distdir) - mkdir $(distdir) - $(mkinstalldirs) $(distdir)/Win32 $(distdir)/cgi-fcgi $(distdir)/doc $(distdir)/doc/fastcgi-prog-guide $(distdir)/doc/fastcgi-whitepaper $(distdir)/examples $(distdir)/images $(distdir)/include $(distdir)/java $(distdir)/libfcgi $(distdir)/perl -- @for file in $(DISTFILES); do \ -- if test -f $$file; then d=.; else d=$(srcdir); fi; \ -+ @list='$(DISTFILES)'; for file in $$list; do \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- $(mkinstalldirs) "$(distdir)/$$dir"; \ -+ dir="/$$dir"; \ -+ $(mkinstalldirs) "$(distdir)$$dir"; \ -+ else \ -+ dir=''; \ - fi; \ - if test -d $$d/$$file; then \ -- cp -pR $$d/$$file $(distdir) \ -- || exit 1; \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -- for subdir in $(SUBDIRS); do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ -@@ -405,23 +418,28 @@ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) --dist: distdir -+dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -- -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) -+ $(am__remove_distdir) -+ -+dist dist-all: distdir -+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ $(am__remove_distdir) - - # This target untars the dist file and tries a VPATH configuration. Then - # it guarantees that the distribution is self-contained by making another - # tarfile. - distcheck: dist -- -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) -+ $(am__remove_distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/=build - mkdir $(distdir)/=inst - chmod a-w $(distdir) -- dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \ -+ dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ - && cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ -+ $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ -@@ -429,17 +447,24 @@ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ -- || (echo "Error: files left after uninstall" 1>&2; \ -- exit 1) ) \ -- && $(MAKE) $(AM_MAKEFLAGS) dist \ -- && $(MAKE) $(AM_MAKEFLAGS) distclean \ -+ || { echo "ERROR: files left after uninstall:" ; \ -+ find $$dc_install_base -type f -print ; \ -+ exit 1; } >&2 ) \ -+ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ - && rm -f $(distdir).tar.gz \ -- && (test `find . -type f -print | wc -l` -eq 0 \ -- || (echo "Error: files left after distclean" 1>&2; \ -- exit 1) ) -- -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) -+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck -+ $(am__remove_distdir) - @echo "$(distdir).tar.gz is ready for distribution" | \ - sed 'h;s/./=/g;p;x;p;x' -+distcleancheck: distclean -+ if test '$(srcdir)' = . ; then \ -+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ -+ exit 1 ; \ -+ fi -+ test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ -+ || { echo "ERROR: files left after distclean:" ; \ -+ $(distcleancheck_listfiles) ; \ -+ exit 1; } >&2 - check-am: all-am - check: check-recursive - all-am: Makefile $(HEADERS) fcgi_config.h -@@ -458,6 +483,7 @@ - installcheck: installcheck-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -465,7 +491,7 @@ - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -+ -rm -f Makefile $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -474,11 +500,8 @@ - - clean-am: clean-generic clean-libtool mostlyclean-am - --dist-all: distdir -- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -- -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) - distclean: distclean-recursive -- -rm -f config.status config.cache config.log -+ -rm -f $(am__CONFIG_DISTCLEAN_FILES) - distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ - distclean-tags - -@@ -501,7 +524,8 @@ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -- -+ -rm -f $(am__CONFIG_DISTCLEAN_FILES) -+ -rm -rf autom4te.cache - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-recursive -@@ -514,20 +538,20 @@ - - .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ - clean-generic clean-libtool clean-recursive dist dist-all \ -- distcheck distclean distclean-generic distclean-hdr \ -- distclean-libtool distclean-recursive distclean-tags distdir \ -- dvi dvi-am dvi-recursive info info-am info-recursive install \ -- install-am install-data install-data-am install-data-recursive \ -- install-exec install-exec-am install-exec-recursive \ -- install-includeHEADERS install-info install-info-am \ -- install-info-recursive install-man install-recursive \ -- install-strip installcheck installcheck-am installdirs \ -- installdirs-am installdirs-recursive maintainer-clean \ -- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -- tags tags-recursive uninstall uninstall-am \ -- uninstall-includeHEADERS uninstall-info-am \ -- uninstall-info-recursive uninstall-recursive -+ dist-gzip distcheck distclean distclean-generic distclean-hdr \ -+ distclean-libtool distclean-recursive distclean-tags \ -+ distcleancheck distdir dvi dvi-am dvi-recursive info info-am \ -+ info-recursive install install-am install-data install-data-am \ -+ install-data-recursive install-exec install-exec-am \ -+ install-exec-recursive install-includeHEADERS install-info \ -+ install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-includeHEADERS \ -+ uninstall-info-am uninstall-info-recursive uninstall-recursive - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. ---- libfcgi-2.4.0.orig/examples/Makefile.in -+++ libfcgi-2.4.0/examples/Makefile.in -@@ -1,7 +1,8 @@ --# Makefile.in generated automatically by automake 1.5 from Makefile.am. -+# Makefile.in generated by automake 1.10 from Makefile.am. -+# @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,359 +16,437 @@ - - # $Id: Makefile.am,v 1.8 2001/12/22 03:16:21 robs Exp $ - --SHELL = @SHELL@ -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. -- --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- --INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ -+build_triplet = @build@ - host_triplet = @host@ -+noinst_PROGRAMS = authorizer$(EXEEXT) echo$(EXEEXT) echo-x$(EXEEXT) \ -+ log-dump$(EXEEXT) size$(EXEEXT) @THREADED@ @ECHO_CPP@ -+EXTRA_PROGRAMS = threaded$(EXEEXT) echo-cpp$(EXEEXT) -+subdir = examples -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/fcgi_config.h -+CONFIG_CLEAN_FILES = -+PROGRAMS = $(noinst_PROGRAMS) -+am__objects_1 = -+am_authorizer_OBJECTS = $(am__objects_1) authorizer.$(OBJEXT) -+authorizer_OBJECTS = $(am_authorizer_OBJECTS) -+authorizer_LDADD = $(LDADD) -+authorizer_DEPENDENCIES = $(LIBFCGI) -+am_echo_OBJECTS = $(am__objects_1) echo.$(OBJEXT) -+echo_OBJECTS = $(am_echo_OBJECTS) -+echo_LDADD = $(LDADD) -+echo_DEPENDENCIES = $(LIBFCGI) -+am_echo_cpp_OBJECTS = $(am__objects_1) echo-cpp.$(OBJEXT) -+echo_cpp_OBJECTS = $(am_echo_cpp_OBJECTS) -+echo_cpp_DEPENDENCIES = $(LIBDIR)/libfcgi++.la -+am_echo_x_OBJECTS = $(am__objects_1) echo-x.$(OBJEXT) -+echo_x_OBJECTS = $(am_echo_x_OBJECTS) -+echo_x_LDADD = $(LDADD) -+echo_x_DEPENDENCIES = $(LIBFCGI) -+am_log_dump_OBJECTS = $(am__objects_1) log-dump.$(OBJEXT) -+log_dump_OBJECTS = $(am_log_dump_OBJECTS) -+log_dump_LDADD = $(LDADD) -+log_dump_DEPENDENCIES = $(LIBFCGI) -+size_SOURCES = size.c -+size_OBJECTS = size.$(OBJEXT) -+size_LDADD = $(LDADD) -+size_DEPENDENCIES = $(LIBFCGI) -+am_threaded_OBJECTS = $(am__objects_1) threaded-threaded.$(OBJEXT) -+threaded_OBJECTS = $(am_threaded_OBJECTS) -+threaded_LDADD = $(LDADD) -+threaded_DEPENDENCIES = $(LIBFCGI) -+threaded_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(threaded_CFLAGS) $(CFLAGS) \ -+ $(threaded_LDFLAGS) $(LDFLAGS) -o $@ -+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+CXXLD = $(CXX) -+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(authorizer_SOURCES) $(echo_SOURCES) $(echo_cpp_SOURCES) \ -+ $(echo_x_SOURCES) $(log_dump_SOURCES) size.c \ -+ $(threaded_SOURCES) -+DIST_SOURCES = $(authorizer_SOURCES) $(echo_SOURCES) \ -+ $(echo_cpp_SOURCES) $(echo_x_SOURCES) $(log_dump_SOURCES) \ -+ size.c $(threaded_SOURCES) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ --AS = @AS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ - CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ - ECHO_CPP = @ECHO_CPP@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ - EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+GREP = @GREP@ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ - LIBFCGIXX = @LIBFCGIXX@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --OBJDUMP = @OBJDUMP@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - PTHREAD_CC = @PTHREAD_CC@ - PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ - PTHREAD_LIBS = @PTHREAD_LIBS@ - RANLIB = @RANLIB@ -+SED = @SED@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ - SYSTEM = @SYSTEM@ - THREADED = @THREADED@ - VERSION = @VERSION@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ - am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+builddir = @builddir@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+htmldir = @htmldir@ -+includedir = @includedir@ -+infodir = @infodir@ - install_sh = @install_sh@ -- --noinst_PROGRAMS = authorizer \ -- echo \ -- echo-x \ -- log-dump \ -- size \ -- @THREADED@ \ -- @ECHO_CPP@ -- -- --EXTRA_PROGRAMS = threaded echo-cpp -- -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+psdir = @psdir@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -- - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ - $(INCLUDEDIR)/fcgimisc.h \ - $(INCLUDEDIR)/fcgi_stdio.h - -- - LIBDIR = ../libfcgi - LIBFCGI = $(LIBDIR)/libfcgi.la -- - LDADD = $(LIBFCGI) -- - echo_SOURCES = $(INCLUDE_FILES) echo.c - echo_x_SOURCES = $(INCLUDE_FILES) echo-x.c - log_dump_SOURCES = $(INCLUDE_FILES) log-dump.c - authorizer_SOURCES = $(INCLUDE_FILES) authorizer.c -- - threaded_SOURCES = $(INCLUDE_FILES) threaded.c - threaded_CC = @PTHREAD_CC@ - threaded_CFLAGS = @PTHREAD_CFLAGS@ - threaded_LDFLAGS = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -- - echo_cpp_SOURCES = $(INCLUDE_FILES) $(INCLUDEDIR)/fcgio.h echo-cpp.cpp - echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la --subdir = examples --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/fcgi_config.h --CONFIG_CLEAN_FILES = --EXTRA_PROGRAMS = threaded$(EXEEXT) echo-cpp$(EXEEXT) --noinst_PROGRAMS = authorizer$(EXEEXT) echo$(EXEEXT) echo-x$(EXEEXT) \ -- log-dump$(EXEEXT) size$(EXEEXT) @THREADED@ @ECHO_CPP@ --PROGRAMS = $(noinst_PROGRAMS) -- --am_authorizer_OBJECTS = authorizer.$(OBJEXT) --authorizer_OBJECTS = $(am_authorizer_OBJECTS) --authorizer_LDADD = $(LDADD) --authorizer_DEPENDENCIES = $(LIBDIR)/libfcgi.la --authorizer_LDFLAGS = --am_echo_OBJECTS = echo.$(OBJEXT) --echo_OBJECTS = $(am_echo_OBJECTS) --echo_LDADD = $(LDADD) --echo_DEPENDENCIES = $(LIBDIR)/libfcgi.la --echo_LDFLAGS = --am_echo_cpp_OBJECTS = echo-cpp.$(OBJEXT) --echo_cpp_OBJECTS = $(am_echo_cpp_OBJECTS) --echo_cpp_DEPENDENCIES = $(LIBDIR)/libfcgi++.la --echo_cpp_LDFLAGS = --am_echo_x_OBJECTS = echo-x.$(OBJEXT) --echo_x_OBJECTS = $(am_echo_x_OBJECTS) --echo_x_LDADD = $(LDADD) --echo_x_DEPENDENCIES = $(LIBDIR)/libfcgi.la --echo_x_LDFLAGS = --am_log_dump_OBJECTS = log-dump.$(OBJEXT) --log_dump_OBJECTS = $(am_log_dump_OBJECTS) --log_dump_LDADD = $(LDADD) --log_dump_DEPENDENCIES = $(LIBDIR)/libfcgi.la --log_dump_LDFLAGS = --size_SOURCES = size.c --size_OBJECTS = size.$(OBJEXT) --size_LDADD = $(LDADD) --size_DEPENDENCIES = $(LIBDIR)/libfcgi.la --size_LDFLAGS = --am_threaded_OBJECTS = threaded-threaded.$(OBJEXT) --threaded_OBJECTS = $(am_threaded_OBJECTS) --threaded_LDADD = $(LDADD) --threaded_DEPENDENCIES = $(LIBDIR)/libfcgi.la -- --DEFS = @DEFS@ --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ --depcomp = $(SHELL) $(top_srcdir)/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/authorizer.Po $(DEPDIR)/echo-cpp.Po \ --@AMDEP_TRUE@ $(DEPDIR)/echo-x.Po $(DEPDIR)/echo.Po \ --@AMDEP_TRUE@ $(DEPDIR)/log-dump.Po $(DEPDIR)/size.Po \ --@AMDEP_TRUE@ $(DEPDIR)/threaded-threaded.Po --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --CFLAGS = @CFLAGS@ --CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CXXFLAGS) $(CXXFLAGS) --CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --CXXFLAGS = @CXXFLAGS@ --DIST_SOURCES = $(authorizer_SOURCES) $(echo_SOURCES) $(echo_cpp_SOURCES) \ -- $(echo_x_SOURCES) $(log_dump_SOURCES) size.c \ -- $(threaded_SOURCES) --DIST_COMMON = Makefile.am Makefile.in --SOURCES = $(authorizer_SOURCES) $(echo_SOURCES) $(echo_cpp_SOURCES) $(echo_x_SOURCES) $(log_dump_SOURCES) size.c $(threaded_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .cpp .lo .o .obj -- --mostlyclean-libtool: -- -rm -f *.lo -- --clean-libtool: -- -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign examples/Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && \ -- CONFIG_HEADERS= CONFIG_LINKS= \ -- CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status -+ $(AUTOMAKE) --gnu examples/Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstPROGRAMS: -- -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -+ @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ -+ echo " rm -f $$p $$f"; \ -+ rm -f $$p $$f ; \ -+ done - authorizer$(EXEEXT): $(authorizer_OBJECTS) $(authorizer_DEPENDENCIES) - @rm -f authorizer$(EXEEXT) -- $(LINK) $(authorizer_LDFLAGS) $(authorizer_OBJECTS) $(authorizer_LDADD) $(LIBS) -+ $(LINK) $(authorizer_OBJECTS) $(authorizer_LDADD) $(LIBS) - echo$(EXEEXT): $(echo_OBJECTS) $(echo_DEPENDENCIES) - @rm -f echo$(EXEEXT) -- $(LINK) $(echo_LDFLAGS) $(echo_OBJECTS) $(echo_LDADD) $(LIBS) -+ $(LINK) $(echo_OBJECTS) $(echo_LDADD) $(LIBS) - echo-cpp$(EXEEXT): $(echo_cpp_OBJECTS) $(echo_cpp_DEPENDENCIES) - @rm -f echo-cpp$(EXEEXT) -- $(CXXLINK) $(echo_cpp_LDFLAGS) $(echo_cpp_OBJECTS) $(echo_cpp_LDADD) $(LIBS) -+ $(CXXLINK) $(echo_cpp_OBJECTS) $(echo_cpp_LDADD) $(LIBS) - echo-x$(EXEEXT): $(echo_x_OBJECTS) $(echo_x_DEPENDENCIES) - @rm -f echo-x$(EXEEXT) -- $(LINK) $(echo_x_LDFLAGS) $(echo_x_OBJECTS) $(echo_x_LDADD) $(LIBS) -+ $(LINK) $(echo_x_OBJECTS) $(echo_x_LDADD) $(LIBS) - log-dump$(EXEEXT): $(log_dump_OBJECTS) $(log_dump_DEPENDENCIES) - @rm -f log-dump$(EXEEXT) -- $(LINK) $(log_dump_LDFLAGS) $(log_dump_OBJECTS) $(log_dump_LDADD) $(LIBS) -+ $(LINK) $(log_dump_OBJECTS) $(log_dump_LDADD) $(LIBS) - size$(EXEEXT): $(size_OBJECTS) $(size_DEPENDENCIES) - @rm -f size$(EXEEXT) -- $(LINK) $(size_LDFLAGS) $(size_OBJECTS) $(size_LDADD) $(LIBS) --threaded-threaded.$(OBJEXT): threaded.c -+ $(LINK) $(size_OBJECTS) $(size_LDADD) $(LIBS) - threaded$(EXEEXT): $(threaded_OBJECTS) $(threaded_DEPENDENCIES) - @rm -f threaded$(EXEEXT) -- $(LINK) $(threaded_LDFLAGS) $(threaded_OBJECTS) $(threaded_LDADD) $(LIBS) -+ $(threaded_LINK) $(threaded_OBJECTS) $(threaded_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/authorizer.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/echo-cpp.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/echo-x.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/echo.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/log-dump.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/size.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/threaded-threaded.Po@am__quote@ -- --distclean-depend: -- -rm -rf $(DEPDIR) -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authorizer.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/echo-cpp.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/echo-x.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/echo.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log-dump.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/size.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threaded-threaded.Po@am__quote@ - - .c.o: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(COMPILE) -c `cygpath -w $<` -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - threaded-threaded.o: threaded.c --@AMDEP_TRUE@ source='threaded.c' object='threaded-threaded.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/threaded-threaded.Po' tmpdepfile='$(DEPDIR)/threaded-threaded.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(threaded_CFLAGS) $(CFLAGS) -c -o threaded-threaded.o `test -f threaded.c || echo '$(srcdir)/'`threaded.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(threaded_CFLAGS) $(CFLAGS) -MT threaded-threaded.o -MD -MP -MF $(DEPDIR)/threaded-threaded.Tpo -c -o threaded-threaded.o `test -f 'threaded.c' || echo '$(srcdir)/'`threaded.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/threaded-threaded.Tpo $(DEPDIR)/threaded-threaded.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='threaded.c' object='threaded-threaded.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(threaded_CFLAGS) $(CFLAGS) -c -o threaded-threaded.o `test -f 'threaded.c' || echo '$(srcdir)/'`threaded.c - - threaded-threaded.obj: threaded.c --@AMDEP_TRUE@ source='threaded.c' object='threaded-threaded.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/threaded-threaded.Po' tmpdepfile='$(DEPDIR)/threaded-threaded.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(threaded_CFLAGS) $(CFLAGS) -c -o threaded-threaded.obj `cygpath -w threaded.c` -- --threaded-threaded.lo: threaded.c --@AMDEP_TRUE@ source='threaded.c' object='threaded-threaded.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/threaded-threaded.Plo' tmpdepfile='$(DEPDIR)/threaded-threaded.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(threaded_CFLAGS) $(CFLAGS) -c -o threaded-threaded.lo `test -f threaded.c || echo '$(srcdir)/'`threaded.c --CCDEPMODE = @CCDEPMODE@ -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(threaded_CFLAGS) $(CFLAGS) -MT threaded-threaded.obj -MD -MP -MF $(DEPDIR)/threaded-threaded.Tpo -c -o threaded-threaded.obj `if test -f 'threaded.c'; then $(CYGPATH_W) 'threaded.c'; else $(CYGPATH_W) '$(srcdir)/threaded.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/threaded-threaded.Tpo $(DEPDIR)/threaded-threaded.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='threaded.c' object='threaded-threaded.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(threaded_CFLAGS) $(CFLAGS) -c -o threaded-threaded.obj `if test -f 'threaded.c'; then $(CYGPATH_W) 'threaded.c'; else $(CYGPATH_W) '$(srcdir)/threaded.c'; fi` - - .cpp.o: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< -+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CXXCOMPILE) -c -o $@ `cygpath -w $<` -+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< --CXXDEPMODE = @CXXDEPMODE@ --uninstall-info-am: -+@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - --tags: TAGS -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- mkid -fID $$unique $(LISP) -+ mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique - - GTAGS: -- here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -- --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = .. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) -- @for file in $(DISTFILES); do \ -- if test -f $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- $(mkinstalldirs) "$(distdir)/$$dir"; \ -- fi; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ -- cp -pR $$d/$$file $(distdir) \ -- || exit 1; \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ -@@ -377,9 +456,7 @@ - check-am: all-am - check: check-am - all-am: Makefile $(PROGRAMS) -- - installdirs: -- - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -391,6 +468,7 @@ - installcheck: installcheck-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -398,7 +476,7 @@ - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -409,30 +487,42 @@ - mostlyclean-am - - distclean: distclean-am -- --distclean-am: clean-am distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-tags -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -- -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-am -@@ -440,18 +530,30 @@ - mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - --uninstall-am: uninstall-info-am -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ -+uninstall-am: -+ -+.MAKE: install-am install-strip - --.PHONY: GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-noinstPROGRAMS distclean distclean-compile \ -- distclean-depend distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am install-man \ -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-noinstPROGRAMS ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- tags uninstall uninstall-am uninstall-info-am -+ pdf pdf-am ps ps-am tags uninstall uninstall-am - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. ---- libfcgi-2.4.0.orig/fcgi_config.h.in -+++ libfcgi-2.4.0/fcgi_config.h.in -@@ -1,9 +1,9 @@ --/* fcgi_config.h.in. Generated automatically from configure.in by autoheader. */ -+/* fcgi_config.h.in. Generated from configure.in by autoheader. */ - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_ARPA_INET_H - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_DLFCN_H - - /* Define if there's a fileno() prototype in stdio.h */ -@@ -12,28 +12,28 @@ - /* Define if the fpos_t typedef is in stdio.h */ - #undef HAVE_FPOS - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_INTTYPES_H - - /* Define if cin/cout/cerr has a streambuf assignment operator */ - #undef HAVE_IOSTREAM_WITHASSIGN_STREAMBUF - --/* Define if you have the `nsl' library (-lnsl). */ -+/* Define to 1 if you have the `nsl' library (-lnsl). */ - #undef HAVE_LIBNSL - --/* Define if you have the `socket' library (-lsocket). */ -+/* Define to 1 if you have the `socket' library (-lsocket). */ - #undef HAVE_LIBSOCKET - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_LIMITS_H - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_MEMORY_H - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_NETDB_H - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_NETINET_IN_H - - /* Define if you have POSIX threads libraries and header files. */ -@@ -45,40 +45,40 @@ - /* Define if the socklen_t typedef is in sys/socket.h */ - #undef HAVE_SOCKLEN - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_STDINT_H - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_STDLIB_H - - /* Define if char_type is defined in the context of streambuf */ - #undef HAVE_STREAMBUF_CHAR_TYPE - --/* Define if you have the `strerror' function. */ -+/* Define to 1 if you have the `strerror' function. */ - #undef HAVE_STRERROR - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_STRINGS_H - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_STRING_H - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_SYS_PARAM_H - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_SYS_SOCKET_H - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_SYS_STAT_H - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_SYS_TIME_H - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_SYS_TYPES_H - --/* Define if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_UNISTD_H - - /* Define if va_arg(arg, long double) crashes the compiler */ -@@ -87,11 +87,26 @@ - /* Name of package */ - #undef PACKAGE - -+/* Define to the address where bug reports for this package should be sent. */ -+#undef PACKAGE_BUGREPORT -+ -+/* Define to the full name of this package. */ -+#undef PACKAGE_NAME -+ -+/* Define to the full name and version of this package. */ -+#undef PACKAGE_STRING -+ -+/* Define to the one symbol short name of this package. */ -+#undef PACKAGE_TARNAME -+ -+/* Define to the version of this package. */ -+#undef PACKAGE_VERSION -+ - /* Define to the necessary symbol if this constant uses a non-standard name on - your system. */ - #undef PTHREAD_CREATE_JOINABLE - --/* Define if you have the ANSI C header files. */ -+/* Define to 1 if you have the ANSI C header files. */ - #undef STDC_HEADERS - - /* Define if cross-process locking is required by accept() */ -@@ -103,9 +118,11 @@ - /* Define to empty if `const' does not conform to ANSI C. */ - #undef const - --/* Define as `__inline' if that's what the C compiler calls it, or to nothing -- if it is not supported. */ -+/* Define to `__inline__' or `__inline' if that's what the C compiler -+ calls it, or to nothing if 'inline' is not supported under any name. */ -+#ifndef __cplusplus - #undef inline -+#endif - - /* Define to `int' if does not define. */ - #undef ssize_t ---- libfcgi-2.4.0.orig/include/Makefile.in -+++ libfcgi-2.4.0/include/Makefile.in -@@ -1,7 +1,8 @@ --# Makefile.in generated automatically by automake 1.5 from Makefile.am. -+# Makefile.in generated by automake 1.10 from Makefile.am. -+# @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -13,82 +14,164 @@ - - @SET_MAKE@ - --# $Id: Makefile.am,v 1.2 2001/09/24 18:03:05 skimo Exp $ -- --SHELL = @SHELL@ -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. -- --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- --INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c - INSTALL_HEADER = $(INSTALL_DATA) --transform = @program_transform_name@ -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ -+build_triplet = @build@ - host_triplet = @host@ -+subdir = include -+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/fcgi_config.h -+CONFIG_CLEAN_FILES = -+SOURCES = -+DIST_SOURCES = -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(includedir)" -+includeHEADERS_INSTALL = $(INSTALL_HEADER) -+HEADERS = $(include_HEADERS) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ --AS = @AS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ - CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ - ECHO_CPP = @ECHO_CPP@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ - EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+GREP = @GREP@ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ - LIBFCGIXX = @LIBFCGIXX@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --OBJDUMP = @OBJDUMP@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - PTHREAD_CC = @PTHREAD_CC@ - PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ - PTHREAD_LIBS = @PTHREAD_LIBS@ - RANLIB = @RANLIB@ -+SED = @SED@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ - SYSTEM = @SYSTEM@ - THREADED = @THREADED@ - VERSION = @VERSION@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ - am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+builddir = @builddir@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+htmldir = @htmldir@ -+includedir = @includedir@ -+infodir = @infodir@ - install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+psdir = @psdir@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - -+# $Id: Makefile.am,v 1.2 2001/09/24 18:03:05 skimo Exp $ - include_HEADERS = \ - fastcgi.h \ - fcgi_stdio.h \ -@@ -97,99 +180,130 @@ - fcgio.h \ - fcgios.h - --subdir = include --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/fcgi_config.h --CONFIG_CLEAN_FILES = --DIST_SOURCES = --HEADERS = $(include_HEADERS) -- --DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in - all: all-am - - .SUFFIXES: -+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --gnu include/Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign include/Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && \ -- CONFIG_HEADERS= CONFIG_LINKS= \ -- CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status --uninstall-info-am: - install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(includedir) -+ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ -- $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ -+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ - done - - uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(include_HEADERS)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(includedir)/$$f"; \ -- rm -f $(DESTDIR)$(includedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(includedir)/$$f"; \ - done - --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- mkid -fID $$unique $(LISP) -+ mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique - - GTAGS: -- here=`CDPATH=: && cd $(top_builddir) && pwd` \ -+ here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -- --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = .. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) -- @for file in $(DISTFILES); do \ -- if test -f $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- $(mkinstalldirs) "$(distdir)/$$dir"; \ -- fi; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ -- cp -pR $$d/$$file $(distdir) \ -- || exit 1; \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ -@@ -199,10 +313,10 @@ - check-am: all-am - check: check-am - all-am: Makefile $(HEADERS) -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(includedir) -- -+ for dir in "$(DESTDIR)$(includedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -214,6 +328,7 @@ - installcheck: installcheck-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: -@@ -221,7 +336,7 @@ - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -231,48 +346,69 @@ - clean-am: clean-generic clean-libtool mostlyclean-am - - distclean: distclean-am -- --distclean-am: clean-am distclean-generic distclean-libtool \ -- distclean-tags -+ -rm -f Makefile -+distclean-am: clean-am distclean-generic distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: install-includeHEADERS - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -- -+ -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - - mostlyclean: mostlyclean-am - - mostlyclean-am: mostlyclean-generic mostlyclean-libtool - --uninstall-am: uninstall-includeHEADERS uninstall-info-am -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: - --.PHONY: GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool distclean distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-data install-data-am install-exec \ -- install-exec-am install-includeHEADERS install-info \ -- install-info-am install-man install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool tags uninstall uninstall-am \ -- uninstall-includeHEADERS uninstall-info-am -+uninstall-am: uninstall-includeHEADERS -+ -+.MAKE: install-am install-strip -+ -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -+ clean-libtool ctags distclean distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am \ -+ install-includeHEADERS install-info install-info-am \ -+ install-man install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/abs/core-testing/feh/PKGBUILD b/abs/core-testing/feh/PKGBUILD deleted file mode 100644 index ad38f8f..0000000 --- a/abs/core-testing/feh/PKGBUILD +++ /dev/null @@ -1,17 +0,0 @@ - -pkgname=feh -pkgver=1.3.4 -pkgrel=4 -pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" -depends=('libjpeg' 'libpng' 'libxinerama' 'giblib') -#source=(http://linuxbrit.co.uk/downloads/$pkgname-$pkgver.tar.gz) -source=(http://ftp.gva.es/mirror/debian/pool/main/f/feh/feh_1.3.4.orig.tar.gz) -url="http://www.linuxbrit.co.uk/feh/" -arch=('i686') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make prefix=$startdir/pkg/usr install -} diff --git a/abs/core-testing/ffmpeg-svn/PKGBUILD b/abs/core-testing/ffmpeg-svn/PKGBUILD deleted file mode 100644 index 0eafb3f..0000000 --- a/abs/core-testing/ffmpeg-svn/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Contributor: raubkopierer - -pkgname=ffmpeg-svn -pkgver=19483 -pkgrel=1 -pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" -arch=('i686' 'x86_64') -url="http://ffmpeg.mplayerhq.hu/" -license=('GPL') -depends=('lame' 'sdl' 'faad2' 'faac' 'zlib' 'imlib2' 'x264' 'libtheora') -makedepends=('subversion') -provides=("ffmpeg=`date +%Y%m%d`") -conflicts=('ffmpeg') -source=() -md5sums=() - -_svntrunk=svn://svn.ffmpeg.org/ffmpeg/trunk -_svnmod=ffmpeg - -build() { - cd "$srcdir" - - if [ -d $_svnmod/.svn ]; then - (cd $_svnmod && svn up -r $pkgver) - else - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - fi - - msg "SVN checkout done or server timeout" - msg "Starting make..." - - rm -rf "$_svnmod-build" - mkdir "$_svnmod-build" - cd "$_svnmod-build" - - "$srcdir/$_svnmod/configure" \ - --prefix=/usr \ - --enable-gpl \ - --enable-nonfree \ - --enable-libmp3lame \ - --enable-libfaac \ - --enable-libfaad \ - --enable-libx264 \ - --enable-libtheora \ - --enable-postproc \ - --enable-shared \ - --enable-pthreads \ - --enable-x11grab \ - --arch=`uname -m` \ - --enable-libxvid \ - || return 1 - - make || return 1 - make doc/ff{mpeg,play,server}.1 || return 1 - - make DESTDIR="$pkgdir" install || return 1 - make DESTDIR="$pkgdir" install-man || return 1 - -} diff --git a/abs/core-testing/fftw2/PKGBUILD b/abs/core-testing/fftw2/PKGBUILD deleted file mode 100644 index 18aa473..0000000 --- a/abs/core-testing/fftw2/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: damir - -pkgname=fftw2 -pkgver=2.1.5 -pkgrel=9 -pkgdesc="FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of both real and complex data, and of arbitrary input size. This is package is offering backwards compatibility version 2.x.y. of fftw." -arch=(i686 x86_64) -url="http://www.fftw.org/" -license=('GPL2') -depends=('glibc') -options=(!libtool !emptydirs !docs) -source=(http://www.fftw.org/fftw-${pkgver}.tar.gz) -md5sums=('8d16a84f3ca02a785ef9eb36249ba433') - -build() { - cd ${startdir}/src/fftw-${pkgver} - # build + install double precision - ./configure F77=gfortran --prefix=/usr \ - --enable-type-prefix --enable-shared \ - --enable-threads - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 - - make clean - - # build + install single precision - ./configure F77=gfortran --prefix=/usr \ - --enable-float --enable-type-prefix --enable-shared \ - --enable-threads - make || return 1 - #make prefix=$startdir/pkg/usr install || return 1 - make DESTDIR=${startdir}/pkg install || return 1 - cd $startdir/pkg/usr/include/ - ln -s sfftw.h fftw.h - ln -s sfftw_threads.h fftw_threads.h - ln -s srfftw.h rfftw.h - ln -s srfftw_threads.h rfftw_threads.h - cd $startdir/pkg/usr/lib - ln -s libsfftw.a libfftw.a - ln -s libsfftw.so libfftw.so - ln -s libsfftw.so.2 libfftw.so.2 - ln -s libsfftw.so.2.0.7 libfftw.so.2.0.7 - ln -s libsfftw_threads.a libfftw_threads.a - ln -s libsfftw_threads.so libfftw_threads.so - ln -s libsfftw_threads.so.2 libfftw_threads.so.2 - ln -s libsfftw_threads.so.2.0.7 libfftw_threads.so.2.0.7 - ln -s libsrfftw.a librfftw.a - ln -s libsrfftw.so librfftw.so - ln -s libsrfftw.so.2 librfftw.so.2 - ln -s libsrfftw.so.2.0.7 librfftw.so.2.0.7 - ln -s libsrfftw_threads.a librfftw_threads.a - ln -s libsrfftw_threads.so librfftw_threads.so - ln -s libsrfftw_threads.so.2 librfftw_threads.so.2 - ln -s libsrfftw_threads.so.2.0.7 librfftw_threads.so.2.0.7 -} diff --git a/abs/core-testing/fftw2/__changelog b/abs/core-testing/fftw2/__changelog deleted file mode 100644 index 014bc64..0000000 --- a/abs/core-testing/fftw2/__changelog +++ /dev/null @@ -1,2 +0,0 @@ -added !emptydir to options - diff --git a/abs/core-testing/file/PKGBUILD b/abs/core-testing/file/PKGBUILD deleted file mode 100644 index 63a224f..0000000 --- a/abs/core-testing/file/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 4745 2008-07-09 19:17:02Z andyrtr $ -# Maintainer: Andreas Radke - -pkgname=file -pkgver=4.25 -pkgrel=10 -pkgdesc="File type identification utility" -arch=('i686' 'x86_64') -license=('custom') -groups=('base') -url="http://www.darwinsys.com/file/" -depends=('glibc' 'zlib') -options=('!libtool') -source=(ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('cdf1f90d2704e71118353c16c19898ba') - -build() { - cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --datadir=/usr/share/misc - make || return 1 - make DESTDIR=${pkgdir} install - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING -} diff --git a/abs/core-testing/filesystem/PKGBUILD b/abs/core-testing/filesystem/PKGBUILD deleted file mode 100644 index 0345d29..0000000 --- a/abs/core-testing/filesystem/PKGBUILD +++ /dev/null @@ -1,114 +0,0 @@ -# $Id: PKGBUILD 90913 2010-09-18 23:00:51Z pierre $ -# Maintainer: Aaron Griffin -# Contributor: judd - -pkgname=filesystem -pkgver=2010.09 -pkgrel=2 -pkgdesc="Base filesystem" -arch=('any') -license=('GPL') -url="http://www.archlinux.org" -groups=('base') -install=filesystem.install -# These dependencies are not needed for initial installation. -# They are only required on upgrade to create missing groups. -#depends=('sh' 'coreutils') -depends=('iana-etc') -backup=(etc/fstab etc/crypttab etc/group etc/hosts etc/ld.so.conf etc/passwd - etc/shadow etc/gshadow etc/resolv.conf etc/motd etc/nsswitch.conf - etc/shells etc/host.conf etc/securetty etc/profile etc/issue) -source=(group issue nsswitch.conf securetty host.conf ld.so.conf - passwd shadow fstab crypttab hosts motd resolv.conf shells - gshadow profile modprobe.d.usb-load-ehci-first) -md5sums=('75c7e1770305e1f3b75c52785c137611' - '1bdc5dba66947d74866a5df8ce9ef3b1' - '13753e4e0964f3652b0cc60a28528bdf' - '933dee67c58d452334d342c294342910' - 'f28150d4c0b22a017be51b9f7f9977ed' - '6e488ffecc8ba142c0cf7e2d7aeb832e' - '8a9042a2cedf6b6b47eb8973f14289cb' - 'b8355d9d2782f424f4cedcf682651be0' - '57c5cc9da249c3b06a70fd7efb8c34a5' - 'e5d8323a4dbee7a6d0d2a19cbf4b819f' - '81b3cb42a6ddabc2ed2310511ee9c859' - 'd41d8cd98f00b204e9800998ecf8427e' - '6f48288b6fcaf0065fcb7b0e525413e0' - '40dac0de4c6b99c8ca97effbd7527c84' - '5340b9287b71ffe9d4d99510bffe933f' - 'f7ba22b78c5d2b53f86227aa2447e7ea' - '8098ffd9fbf890468d3198277596b85a') - -build() -{ - cd ${pkgdir} - mkdir -p bin boot dev etc home lib mnt proc root sbin tmp usr var opt srv sys - chmod 555 proc - mkdir -p media/{fl,cd,dvd} - mkdir -p usr/{bin,include,lib,sbin,share/misc,src} - - mkdir -p usr/share/man/man{1,2,3,4,5,6,7,8} - - # fhs compliance - mkdir -p usr/local/{bin,games,include,lib,man,sbin,share,src} - ln -s ../man ${pkgdir}/usr/local/share/man - mkdir -p var/{cache/man,local,lock,opt,run,spool/mail,tmp,games} - chmod 1777 var/lock - mkdir -p var/log/old - mkdir -p etc/{ld.so.conf.d,skel,profile.d} - mkdir -p lib/modules - mkdir -p var/lib/misc - (cd ${pkgdir}/var; ln -s spool/mail mail) - - # vsftpd won't run with write perms on /srv/ftp - mkdir -p srv/ftp - chown root.ftp srv/ftp - chmod 555 srv/ftp - - install -d -o root -g root -m 755 srv/http - - chmod 1777 var/spool/mail tmp var/tmp - chmod 0750 root - - #Allow setgid games to write scores: - chmod 775 ${pkgdir}/var/games - chown root:50 ${pkgdir}/var/games - - cd ${srcdir} - cp fstab crypttab group host.conf hosts ld.so.conf motd nsswitch.conf \ - passwd resolv.conf securetty shadow shells profile \ - ${pkgdir}/etc/ - install -m 600 ${srcdir}/gshadow ${pkgdir}/etc/gshadow - chmod 600 ${pkgdir}/etc/shadow - chmod 600 ${pkgdir}/etc/crypttab - - # re-add /etc/arch-release, some software uses it - # to check whether arch is running - touch ${pkgdir}/etc/arch-release - - # Add /etc/modprobe.d/ - install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first \ - ${pkgdir}/etc/modprobe.d/usb-load-ehci-first.conf - - # Prevent pacman from removing directory (FS#16886) - mkdir ${pkgdir}/var/empty - touch ${pkgdir}/var/empty/.keep -} - -md5sums=('75c7e1770305e1f3b75c52785c137611' - '1bdc5dba66947d74866a5df8ce9ef3b1' - '13753e4e0964f3652b0cc60a28528bdf' - 'f97799ef3d8990f2eda9166122d8d5aa' - 'f28150d4c0b22a017be51b9f7f9977ed' - '6e488ffecc8ba142c0cf7e2d7aeb832e' - '8a9042a2cedf6b6b47eb8973f14289cb' - 'b8355d9d2782f424f4cedcf682651be0' - '57c5cc9da249c3b06a70fd7efb8c34a5' - 'e5d8323a4dbee7a6d0d2a19cbf4b819f' - '81b3cb42a6ddabc2ed2310511ee9c859' - 'd41d8cd98f00b204e9800998ecf8427e' - '6f48288b6fcaf0065fcb7b0e525413e0' - '40dac0de4c6b99c8ca97effbd7527c84' - '5340b9287b71ffe9d4d99510bffe933f' - 'f7ba22b78c5d2b53f86227aa2447e7ea' - '8098ffd9fbf890468d3198277596b85a') diff --git a/abs/core-testing/filesystem/__CHANGELOG b/abs/core-testing/filesystem/__CHANGELOG deleted file mode 100644 index 87707ff..0000000 --- a/abs/core-testing/filesystem/__CHANGELOG +++ /dev/null @@ -1,2 +0,0 @@ -removed /etc/issue -added tty10 to securetty diff --git a/abs/core-testing/filesystem/crypttab b/abs/core-testing/filesystem/crypttab deleted file mode 100644 index dd6994b..0000000 --- a/abs/core-testing/filesystem/crypttab +++ /dev/null @@ -1,33 +0,0 @@ -# crypttab: Mappings for encrypted partitions -# -# Each mapped device will be created in /dev/mapper, so your /etc/fstab -# should use the /dev/mapper/{NAME} paths for encrypted devices. -# -# Each PASSWORD field can be an absolute pathname to a key file (starting -# with a slash, recommended) or a literal string that will be used as -# a passphrase. To use special characters in the passphrase, surround it -# by quotes, the usual bash quoting rules apply. -# There are two special keywords that cannot be used as passphrases: -# - ASK ask for a passphrase on boot -# - SWAP use a random key and create a swapspace afterwards -# WARNING: use the SWAP keyword carefully, as it overwrites the data -# on the specified partition -# -# To create a key file: -# hashalot -n 32 ripemd160 >/etc/crytfs.key -# or -# dd if=/dev/urandom of=/etc/cryptfs.key bs=256 count=1 -# -# To pass additional options to cryptsetup for non-LUKS partitions, use the -# fourth column. -# -# NOTE: Do not list your root (/) partition here, it must be set up -# beforehand by the initramfs (/etc/mkinitcpio.conf). - - -# NAME SOURCE DEVICE PASSWORD OPTIONS -#home /dev/hda4 mypassword -#data1 /dev/hda3 "my \"password\"" -#data2 /dev/hda5 /etc/cryptfs.key -#swap /dev/hdx4 SWAP -c aes-cbc-essiv:sha256 -s 256 -#vol /dev/hdb7 ASK diff --git a/abs/core-testing/filesystem/filesystem.install b/abs/core-testing/filesystem/filesystem.install deleted file mode 100644 index e0ce1e2..0000000 --- a/abs/core-testing/filesystem/filesystem.install +++ /dev/null @@ -1,74 +0,0 @@ -# arg 1: the new package version -post_install() { - [ -f var/log/lastlog ] || : >var/log/lastlog - [ -f var/log/wtmp ] || : >var/log/wtmp - [ -f var/run/utmp ] || : >var/run/utmp - [ -f var/log/btmp ] || (: >var/log/btmp && bin/chmod 600 var/log/btmp) - # workaround for bug #7194 - # readded due to bug #9465 - # please do not remove! - chmod 1777 var/spool/mail tmp var/tmp var/lock -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 - if [ ! "`grep ^optical: etc/group`" ]; then - echo "adding new groups: audio optical" - usr/sbin/groupadd -g 92 audio >/dev/null - usr/sbin/groupadd -g 93 optical >/dev/null - fi - if [ ! "`grep ^video: etc/group`" ]; then - echo "adding new groups: video floppy storage" - usr/sbin/groupadd -g 91 video >/dev/null - usr/sbin/groupadd -g 94 floppy >/dev/null - usr/sbin/groupadd -g 95 storage >/dev/null - fi - if [ ! "`grep ^log: etc/group`" ]; then - echo "adding new group: log" - usr/sbin/groupadd -g 19 log >/dev/null - fi - if [ ! "`grep ^power: etc/group`" ]; then - echo "adding new group: power" - usr/sbin/groupadd -g 98 power >/dev/null - fi - if [ ! "`grep ^network: etc/group`" ]; then - echo "adding new group: network" - usr/sbin/groupadd -g 90 network >/dev/null - fi - if [ ! "`grep ^games: etc/group`" ]; then - echo "adding new group: games" - usr/sbin/groupadd -g 50 games >/dev/null - fi - if [ ! "`grep ^uucp: etc/group`" ]; then - echo "adding new group: uucp" - usr/sbin/groupadd -g 14 uucp >/dev/null - fi - if [ ! "`grep ^http: etc/group`" ]; then - echo "adding new group: http" - usr/sbin/groupadd -g 33 http >/dev/null - fi - if [ ! "`grep ^http: etc/passwd`" ]; then - echo "adding new user http" - usr/sbin/useradd -u 33 -d /srv/http -g http -s /bin/false http >/dev/null - fi - if [ ! "`grep ^scanner: etc/group`" ]; then - echo "adding new group: scanner" - usr/sbin/groupadd -g 96 scanner >/dev/null - fi - if [ ! "`grep ^rfkill: etc/group`" ]; then - echo "adding new group: rfkill" - usr/sbin/groupadd -g 24 rfkill >/dev/null - fi - - grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf \ - || echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf - - # set "Last password change" > 0; otherwise su $user wont work - for user in bin daemon mail ftp http nobody; do - if LANG=C chage -l ${user} | grep -q 'password must be changed'; then - chage -d 14871 ${user} - fi - done -} diff --git a/abs/core-testing/filesystem/fstab b/abs/core-testing/filesystem/fstab deleted file mode 100644 index ee16ccc..0000000 --- a/abs/core-testing/filesystem/fstab +++ /dev/null @@ -1,11 +0,0 @@ -# -# /etc/fstab: static file system information -# -# -devpts /dev/pts devpts defaults 0 0 -shm /dev/shm tmpfs nodev,nosuid 0 0 - -/dev/cdrom /media/cd auto ro,user,noauto,unhide 0 0 -/dev/dvd /media/dvd auto ro,user,noauto,unhide 0 0 -/dev/fd0 /media/fl auto user,noauto 0 0 - diff --git a/abs/core-testing/filesystem/group b/abs/core-testing/filesystem/group deleted file mode 100644 index 4bd635c..0000000 --- a/abs/core-testing/filesystem/group +++ /dev/null @@ -1,30 +0,0 @@ -root:x:0:root -bin:x:1:root,bin,daemon -daemon:x:2:root,bin,daemon -sys:x:3:root,bin -adm:x:4:root,daemon -tty:x:5: -disk:x:6:root -lp:x:7:daemon -mem:x:8: -kmem:x:9: -wheel:x:10:root -ftp:x:11: -mail:x:12: -uucp:x:14: -log:x:19:root -locate:x:21: -rfkill:x:24: -smmsp:x:25: -http:x:33: -games:x:50: -network:x:90: -video:x:91: -audio:x:92: -optical:x:93: -floppy:x:94: -storage:x:95: -scanner:x:96: -power:x:98: -nobody:x:99: -users:x:100: diff --git a/abs/core-testing/filesystem/gshadow b/abs/core-testing/filesystem/gshadow deleted file mode 100644 index a6d78a3..0000000 --- a/abs/core-testing/filesystem/gshadow +++ /dev/null @@ -1,29 +0,0 @@ -root:::root -bin:::root,bin,daemon -daemon:::root,bin,daemon -sys:::root,bin -adm:::root,daemon -tty::: -disk:::root -lp:::daemon -mem::: -kmem::: -wheel:::root -ftp::: -mail::: -uucp::: -log:::root -locate::: -smmsp::: -http::: -games::: -network:x:: -video:x:: -audio::: -optical::: -floppy:x:: -storage:x:: -scanner:x:: -power:x:: -nobody::: -users::: diff --git a/abs/core-testing/filesystem/host.conf b/abs/core-testing/filesystem/host.conf deleted file mode 100644 index cf52fe5..0000000 --- a/abs/core-testing/filesystem/host.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/host.conf -# - -order hosts,bind -multi on - -# End of file diff --git a/abs/core-testing/filesystem/hosts b/abs/core-testing/filesystem/hosts deleted file mode 100644 index ec12849..0000000 --- a/abs/core-testing/filesystem/hosts +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/hosts: static lookup table for host names -# - -# -127.0.0.1 localhost.localdomain localhost - -# End of file diff --git a/abs/core-testing/filesystem/issue b/abs/core-testing/filesystem/issue deleted file mode 100644 index 3db753d..0000000 --- a/abs/core-testing/filesystem/issue +++ /dev/null @@ -1,3 +0,0 @@ - -Arch Linux \r (\n) (\l) - diff --git a/abs/core-testing/filesystem/ld.so.conf b/abs/core-testing/filesystem/ld.so.conf deleted file mode 100644 index dfac456..0000000 --- a/abs/core-testing/filesystem/ld.so.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# /etc/ld.so.conf -# - -include /etc/ld.so.conf.d/*.conf - -# End of file diff --git a/abs/core-testing/filesystem/modprobe.d.usb-load-ehci-first b/abs/core-testing/filesystem/modprobe.d.usb-load-ehci-first deleted file mode 100644 index 3b5db0e..0000000 --- a/abs/core-testing/filesystem/modprobe.d.usb-load-ehci-first +++ /dev/null @@ -1,2 +0,0 @@ -install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install ohci_hcd $CMDLINE_OPTS -install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install uhci_hcd $CMDLINE_OPTS diff --git a/abs/core-testing/filesystem/motd b/abs/core-testing/filesystem/motd deleted file mode 100644 index e69de29..0000000 diff --git a/abs/core-testing/filesystem/nsswitch.conf b/abs/core-testing/filesystem/nsswitch.conf deleted file mode 100644 index 6e459ad..0000000 --- a/abs/core-testing/filesystem/nsswitch.conf +++ /dev/null @@ -1,19 +0,0 @@ -# Begin /etc/nsswitch.conf - -passwd: files -group: files -shadow: files - -publickey: files - -hosts: files dns -networks: files - -protocols: files -services: files -ethers: files -rpc: files - -netgroup: files - -# End /etc/nsswitch.conf diff --git a/abs/core-testing/filesystem/passwd b/abs/core-testing/filesystem/passwd deleted file mode 100644 index a4a24e3..0000000 --- a/abs/core-testing/filesystem/passwd +++ /dev/null @@ -1,7 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -bin:x:1:1:bin:/bin:/bin/false -daemon:x:2:2:daemon:/sbin:/bin/false -mail:x:8:12:mail:/var/spool/mail:/bin/false -ftp:x:14:11:ftp:/srv/ftp:/bin/false -http:x:33:33:http:/srv/http:/bin/false -nobody:x:99:99:nobody:/:/bin/false diff --git a/abs/core-testing/filesystem/profile b/abs/core-testing/filesystem/profile deleted file mode 100644 index cf461f7..0000000 --- a/abs/core-testing/filesystem/profile +++ /dev/null @@ -1,60 +0,0 @@ -# -# /etc/profile -# -# This file is intended to be used for ALL common -# Bourne-compatible shells. Shell specifics should be -# handled in /etc/profile.$SHELL where $SHELL is the name -# of the binary being run (discounting symlinks) -# -# Sections taken from SuSe's /etc/profile -# Note the explicit use of 'test' to cover all bases -# and potentially incompatible shells - -#Determine our shell without using $SHELL, which may lie -shell="sh" -if test -f /proc/mounts; then - case $(/bin/ls -l /proc/$$/exe) in - *bash) shell=bash ;; - *dash) shell=dash ;; - *ash) shell=ash ;; - *ksh) shell=ksh ;; - *zsh) shell=zsh ;; - esac -fi - -# Load shell specific profile settings -test -f "/etc/profile.$shell" && . "/etc/profile.$shell" - -#Set our umask -umask 022 - -# Set our default path -PATH="/bin:/usr/bin:/sbin:/usr/sbin" -export PATH - -# Export default pkg-config path -PKG_CONFIG_PATH="/usr/lib/pkgconfig" -export PKG_CONFIG_PATH - -# Some readline stuff that is fairly common -HISTSIZE=1000 -HISTCONTROL="erasedups" - -INPUTRC="/etc/inputrc" -LESS="-R" - -export HISTSIZE HISTCONTROL INPUTRC LESS - -# Load profiles from /etc/profile.d -if test -d /etc/profile.d/; then - for profile in /etc/profile.d/*.sh; do - test -x $profile && . $profile - done - unset profile -fi - -# Termcap is outdated, old, and crusty, kill it. -unset TERMCAP - -# Man is much better than us at figuring this out -unset MANPATH diff --git a/abs/core-testing/filesystem/resolv.conf b/abs/core-testing/filesystem/resolv.conf deleted file mode 100644 index cecafba..0000000 --- a/abs/core-testing/filesystem/resolv.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/resolv.conf -# - -#search -#nameserver - -# End of file diff --git a/abs/core-testing/filesystem/securetty b/abs/core-testing/filesystem/securetty deleted file mode 100644 index 7fcd451..0000000 --- a/abs/core-testing/filesystem/securetty +++ /dev/null @@ -1,14 +0,0 @@ -# -# /etc/securetty -# - -console -tty1 -tty2 -tty3 -tty4 -tty5 -tty6 -hvc0 -tty10 -# End of file diff --git a/abs/core-testing/filesystem/shadow b/abs/core-testing/filesystem/shadow deleted file mode 100644 index ccab68d..0000000 --- a/abs/core-testing/filesystem/shadow +++ /dev/null @@ -1,7 +0,0 @@ -root::14871:::::: -bin:x:14871:::::: -daemon:x:14871:::::: -mail:x:14871:::::: -ftp:x:14871:::::: -http:x:14871:::::: -nobody:x:14871:::::: diff --git a/abs/core-testing/filesystem/shells b/abs/core-testing/filesystem/shells deleted file mode 100644 index ff9e383..0000000 --- a/abs/core-testing/filesystem/shells +++ /dev/null @@ -1,9 +0,0 @@ -# -# /etc/shells -# - -/bin/sh -/bin/bash -/bin/dash - -# End of file diff --git a/abs/core-testing/findutils/PKGBUILD b/abs/core-testing/findutils/PKGBUILD deleted file mode 100644 index 0027aca..0000000 --- a/abs/core-testing/findutils/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 2673 2008-06-11 02:45:30Z eric $ -# Maintainer: judd -pkgname=findutils -pkgver=4.4.0 -pkgrel=10 -pkgdesc="GNU utilities to locate files" -arch=(i686 x86_64) -license=('GPL3') -groups=('base') -depends=('glibc>=2.8') -url="http://www.gnu.org/software/findutils" -source=(ftp://ftp.gnu.org/pub/gnu/findutils/findutils-$pkgver.tar.gz) -md5sums=('49e769ac4382fae6f104f99d54d0a112') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - # believe it or not, the Makefile really wants to remove /usr/var, so - # we let it... - mkdir -p $startdir/pkg/usr/var - make DESTDIR=$startdir/pkg install - rm -rf $startdir/pkg/usr/libexec - - # remove locate utils (we use slocate instead) - rm -f $startdir/pkg/usr/bin/{locate,updatedb} - rm -f $startdir/pkg/usr/share/man/man1/{updatedb.1,locate.1} - rm -f $startdir/pkg/usr/share/man/man5/locatedb.5 - rmdir $startdir/pkg/usr/var -} diff --git a/abs/core-testing/fixesproto/PKGBUILD b/abs/core-testing/fixesproto/PKGBUILD deleted file mode 100644 index 6af302b..0000000 --- a/abs/core-testing/fixesproto/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 54646 2009-10-11 16:21:38Z andyrtr $ -#Maintainer: Jan de Groot - -pkgname=fixesproto -pkgver=4.1.1 -pkgrel=1 -pkgdesc="X11 Fixes extension wire protocol" -arch=(any) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('xproto' 'xextproto') -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -md5sums=('4c1cb4f2ed9f34de59f2f04783ca9483') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} - diff --git a/abs/core-testing/flac/PKGBUILD b/abs/core-testing/flac/PKGBUILD deleted file mode 100644 index f28b964..0000000 --- a/abs/core-testing/flac/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Paul Mattal -# Contributor: Tom Newsom -pkgname=flac -pkgver=1.2.1 -pkgrel=2 -pkgdesc="Free Lossless Audio Codec" -license=('custom:Xiph' 'LGPL' 'GPL' 'FDL') -url="http://flac.sourceforge.net/" -arch=(i686 x86_64) -options=('!libtool') -depends=('glibc' 'libogg' 'xmms') -makedepends=('nasm' 'xmms') -source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz \ - flac-1.2.1-gcc43.patch) -md5sums=('153c8b15a54da428d1f0fadc756c22c7' '4922379f33c86792630b624ddc83b236') - -build() { - # -j1 to get the xmms plugin working (from gentoo) - export MAKEFLAGS="-j1" - cd $startdir/src/$pkgname-$pkgver || return 1 - patch -Np1 -i $startdir/src/flac-1.2.1-gcc43.patch - ./configure --prefix=/usr --enable-shared --disable-sse \ - --disable-rpath --with-pic || return 1 - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - - # install license - install -Dm0644 $startdir/src/$pkgname-$pkgver/COPYING.Xiph \ - $startdir/pkg/usr/share/licenses/$pkgname/COPYING.Xiph -} - diff --git a/abs/core-testing/flac/flac-1.2.1-gcc43.patch b/abs/core-testing/flac/flac-1.2.1-gcc43.patch deleted file mode 100644 index d8e8ab9..0000000 --- a/abs/core-testing/flac/flac-1.2.1-gcc43.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43 2007-09-13 17:58:03.000000000 +0200 -+++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2008-01-08 10:27:39.000000000 +0100 -@@ -29,6 +29,7 @@ - #endif - - #include -+#include - #include - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" diff --git a/abs/core-testing/flac/flac-linking.diff b/abs/core-testing/flac/flac-linking.diff deleted file mode 100644 index 3f9f595..0000000 --- a/abs/core-testing/flac/flac-linking.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur flac-1.1.2-orig/configure flac-1.1.2/configure ---- flac-1.1.2-orig/configure 2005-07-24 17:58:19.180907080 +0100 -+++ flac-1.1.2/configure 2005-07-24 17:58:59.139832400 +0100 -@@ -3462,7 +3462,7 @@ - # This must be Linux ELF. - linux-gnu*) - case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) -+ alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* | x86_64* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM diff --git a/abs/core-testing/flac/xmms-plugin.patch b/abs/core-testing/flac/xmms-plugin.patch deleted file mode 100644 index e5fcf2e..0000000 --- a/abs/core-testing/flac/xmms-plugin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugin_xmms/configure.c.old 2005-04-08 12:16:17.000000000 +0200 -+++ src/plugin_xmms/configure.c 2005-04-08 12:16:41.000000000 +0200 -@@ -61,7 +61,7 @@ - "", /* proxy_user */ - "", /* proxy_pass */ - FALSE, /* save_http_stream */ -- "", /* save_http_path */ -+ FALSE, /* save_http_path */ - FALSE, /* cast_title_streaming */ - FALSE /* use_udp_channel */ - }, diff --git a/abs/core-testing/flex/PKGBUILD b/abs/core-testing/flex/PKGBUILD deleted file mode 100644 index f36300f..0000000 --- a/abs/core-testing/flex/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 3606 2008-06-26 00:29:52Z paul $ -# Maintainer: judd -pkgname=flex -pkgver=2.5.35 -pkgrel=1 -pkgdesc="A tool for generating text-scanning programs" -arch=(i686 x86_64) -url="http://flex.sourceforge.net" -license=('custom') -groups=('base-devel') -depends=('glibc' 'sh') -source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2 - lex.sh) -md5sums=('10714e50cea54dc7a227e3eddcd44d57' 'f725259ec23a9e87ee29e2ef82eda9a5') - -build() { - cd $startdir/src/$pkgname-$pkgver || return 1 - - # configure - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - - # build and install - make || return 1 - make prefix=$startdir/pkg/usr mandir=$startdir/pkg/usr/share/man install || return 1 - install -D -m755 $startdir/src/lex.sh $startdir/pkg/usr/bin/lex || return 1 - - # install license - install -D -m644 COPYING \ - $startdir/pkg/usr/share/licenses/$pkgname/license.txt || return 1 -} diff --git a/abs/core-testing/flex/flex-yytext.patch b/abs/core-testing/flex/flex-yytext.patch deleted file mode 100644 index 27cfaa4..0000000 --- a/abs/core-testing/flex/flex-yytext.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur flex-2.5.31-orig/flex.skl flex-2.5.31/flex.skl ---- flex-2.5.31-orig/flex.skl 2003-03-31 17:51:38.000000000 -0800 -+++ flex-2.5.31/flex.skl 2004-04-11 12:19:10.000000000 -0700 -@@ -3280,7 +3280,6 @@ - #undef yy_set_bol - #undef yy_new_buffer - #undef yy_set_interactive --#undef yytext_ptr - #undef YY_DO_BEFORE_ACTION - - #ifdef YY_DECL_IS_OURS -diff -Naur flex-2.5.31-orig/gen.c flex-2.5.31/gen.c ---- flex-2.5.31-orig/gen.c 2003-03-30 11:58:44.000000000 -0800 -+++ flex-2.5.31/gen.c 2004-04-11 12:19:38.000000000 -0700 -@@ -1812,7 +1812,6 @@ - if (yytext_is_array) { - if (!reentrant){ - indent_puts ("static int yy_more_offset = 0;"); -- }else{ - indent_puts ("static int yy_prev_more_offset = 0;"); - } - } diff --git a/abs/core-testing/flex/lex.sh b/abs/core-testing/flex/lex.sh deleted file mode 100644 index 13e7de6..0000000 --- a/abs/core-testing/flex/lex.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/bin/flex -l "$@" diff --git a/abs/core-testing/fltk/PKGBUILD b/abs/core-testing/fltk/PKGBUILD deleted file mode 100644 index f1bbbb1..0000000 --- a/abs/core-testing/fltk/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 1248 2008-05-02 22:01:06Z tobias $ -# Maintainer: roberto -# Contributor: Tom Newsom -# Updated to produce shared libs: Andrew Rose - -pkgname=fltk -pkgver=1.1.9 -pkgrel=1 -pkgdesc="Graphical user interface toolkit for X" -arch=(i686 x86_64) -license=('LGPL') -url="http://www.fltk.org/" -depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext') -makedepends=('mesa') -source=(http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2) -md5sums=('e146fd264e1001b1313acfd41ef75552') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared - make || return 1 - make DESTDIR=$startdir/pkg install -} diff --git a/abs/core-testing/fluxbox/ChangeLog b/abs/core-testing/fluxbox/ChangeLog deleted file mode 100644 index f2f2e81..0000000 --- a/abs/core-testing/fluxbox/ChangeLog +++ /dev/null @@ -1,10 +0,0 @@ -2008-09-19 Eric Belanger - - * fluxbox 1.1.1-1 - * Upstream update - -2008-09-05 Eric Belanger - - * fluxbox 1.1.0.1-1 - * Upstream update - * Added ChangeLog diff --git a/abs/core-testing/fluxbox/PKGBUILD b/abs/core-testing/fluxbox/PKGBUILD deleted file mode 100644 index 3873ff1..0000000 --- a/abs/core-testing/fluxbox/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 12779 2008-09-20 06:42:07Z eric $ -# Maintainer: Eric Belanger -# Contributor: John Proctor - -pkgname=fluxbox -pkgver=1.1.1 -pkgrel=11 -pkgdesc="A lightweight and highly-configurable window manager" -arch=('i686' 'x86_64') -url="http://www.fluxbox.org" -license=('MIT') -depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'bash' 'imlib2') -makedepends=('pkgconfig') -options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ - fluxbox.desktop keys fluxbox_fullscreen_focus.patch) - -build() { - echo "==> Patching Fluxbox with fullscreen focus patch..." - patch < fluxbox_fullscreen_focus.patch ${srcdir}/${pkgname}-${pkgver}/src/Window.cc || return 1 - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --enable-kde --enable-gnome \ - --enable-xft --enable-xinerama \ - --enable-imlib2 --enable-nls || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - # this is a fix to allow fluxbox to shutdown, but this can be changed by the user :-( - sed -i 's|^.*slit\.autoHide.*$|session.screen0.slit.autoHide: True|' ${pkgdir}/usr/share/fluxbox/init || return 1 - install -D -m644 ../fluxbox.desktop ${pkgdir}/etc/X11/sessions/fluxbox.desktop || return 1 - install -D -m644 ../keys ${pkgdir}/usr/share/fluxbox/keys || return 1 - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/COPYING || return 1 -} -md5sums=('fa9fa8fe9a44f86522de5754f8b285ca' - 'eeae9c88a2526ac0bd8afcd9ce97f9ed' - 'bb9f812c559263b4bf1d722628a11ca8' - '82dac089f2d42bb9592debc93291846d') diff --git a/abs/core-testing/fluxbox/fluxbox-1.0.0-gcc43.patch b/abs/core-testing/fluxbox/fluxbox-1.0.0-gcc43.patch deleted file mode 100644 index 2e7db28..0000000 --- a/abs/core-testing/fluxbox/fluxbox-1.0.0-gcc43.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- fluxbox-1.0.0-orig/src/main.cc 2007-08-11 14:22:20.000000000 -0400 -+++ fluxbox-1.0.0/src/main.cc 2008-05-05 15:14:59.000000000 -0400 -@@ -49,6 +49,7 @@ - #include - #include - #include -+#include - - using std::cout; - using std::cerr; diff --git a/abs/core-testing/fluxbox/fluxbox.desktop b/abs/core-testing/fluxbox/fluxbox.desktop deleted file mode 100644 index 418d29a..0000000 --- a/abs/core-testing/fluxbox/fluxbox.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=XSession -Exec=/usr/bin/startfluxbox -TryExec=/usr/bin/startfluxbox -Name=fluxbox diff --git a/abs/core-testing/fluxbox/fluxbox_fullscreen_focus.patch b/abs/core-testing/fluxbox/fluxbox_fullscreen_focus.patch deleted file mode 100644 index 1a8c233..0000000 --- a/abs/core-testing/fluxbox/fluxbox_fullscreen_focus.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/Window.cc.orig 2010-04-12 16:45:00.750585365 -0500 -+++ src/Window.cc 2010-04-12 16:45:38.719755786 -0500 -@@ -2042,8 +2042,7 @@ - FluxboxWindow *cur = FocusControl::focusedFbWindow(); - WinClient *client = FocusControl::focusedWindow(); - if (ret && cur && getRootTransientFor(&from) != getRootTransientFor(client)) -- ret = !(cur->isFullscreen() && getOnHead() == cur->getOnHead()) && -- !cur->isTyping(); -+ ret = !cur->isTyping(); - - if (!ret) - Fluxbox::instance()->attentionHandler().addAttention(from); diff --git a/abs/core-testing/fluxbox/keys b/abs/core-testing/fluxbox/keys deleted file mode 100644 index d0091eb..0000000 --- a/abs/core-testing/fluxbox/keys +++ /dev/null @@ -1,29 +0,0 @@ -OnDesktop Mouse1 :HideMenus -OnDesktop Mouse2 :WorkspaceMenu -OnDesktop Mouse3 :RootMenu -OnDesktop Mouse4 :NextWorkspace -OnDesktop Mouse5 :PrevWorkspace - -Mod1 Tab :NextWindow -Mod1 Shift Tab :PrevWindow -Mod1 F1 :Workspace 1 -Mod1 F2 :Workspace 2 -Mod1 F3 :Workspace 3 -Mod1 F4 :Workspace 4 -Mod1 F5 :Workspace 5 -Mod1 F6 :Workspace 6 -Mod1 F8 :Workspace 8 -Mod1 F9 :Workspace 9 -Mod1 F10 :Workspace 10 -Mod1 F11 :Workspace 11 -Mod1 F12 :Workspace 12 -Mod1 x :ExecCommand tvterm.sh -Mod1 s :ExecCommand sudo taskset -c 0 mythtv-setup -#Mod1 m :ExecCommand mythfrontend --logfile /var/log/mythtv/mythfrontend.log -Mod1 m :ExecCommand /usr/LH/bin/mythfrontend-start -Mod1 1 :ExecCommand sudo sv start mythbackend -Mod1 2 :ExecCommand sudo sv stop mythbackend -Mod1 3 :ExecCommand sudo sv restart mythbackend -Mod1 h :ExecCommand MythVantage -h -Mod1 Control u :ExecCommand /usr/LH/bin/unclutter-toggle.sh -Mod1 Escape :GotoWindow {1} diff --git a/abs/core-testing/fontcacheproto/PKGBUILD b/abs/core-testing/fontcacheproto/PKGBUILD deleted file mode 100644 index 5bc123b..0000000 --- a/abs/core-testing/fontcacheproto/PKGBUILD +++ /dev/null @@ -1,19 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -#Maintainer: Jan de Groot - -pkgname=fontcacheproto -pkgver=0.1.2 -pkgrel=1 -pkgdesc="X11 font cache extension wire protocol" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -md5sums=('60df6b625074a9790e28543dcea71651') -sha1sums=('6a531ef505ba2f7c1aa884bb4efdac3e32dfd99b') - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 -} diff --git a/abs/core-testing/fontconfig/29-replace-bitmap-fonts.conf b/abs/core-testing/fontconfig/29-replace-bitmap-fonts.conf deleted file mode 100644 index 7ac4483..0000000 --- a/abs/core-testing/fontconfig/29-replace-bitmap-fonts.conf +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - Helvetica - - - Arial - Liberation Sans - sans-serif - - - - - Courier - - - Courier New - Liberation Mono - monospace - - - - - Times - - - Times New Roman - Liberation Serif - serif - - - diff --git a/abs/core-testing/fontconfig/30-urw-aliases.patch b/abs/core-testing/fontconfig/30-urw-aliases.patch deleted file mode 100644 index 8077b86..0000000 --- a/abs/core-testing/fontconfig/30-urw-aliases.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/conf.d/30-urw-aliases.conf 2009-08-06 16:23:57.000000000 +0100 -+++ b/conf.d/30-urw-aliases.conf 2009-08-06 16:25:07.000000000 +0100 -@@ -29,6 +29,10 @@ - Zapf Dingbats - Dingbats - -+ -+ ZapfDingbats -+ Dingbats -+ - - - Symbol diff --git a/abs/core-testing/fontconfig/PKGBUILD b/abs/core-testing/fontconfig/PKGBUILD deleted file mode 100644 index ff2130a..0000000 --- a/abs/core-testing/fontconfig/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 59983 2009-11-29 20:25:27Z jgc $ -# Maintainer: Jan de Groot -pkgname=fontconfig -pkgver=2.8.0 -pkgrel=1 -pkgdesc="A library for configuring and customizing font access" -arch=(i686 x86_64) -url="http://www.fontconfig.org/release/" -license=('custom') -depends=('expat>=2.0.1' 'freetype2>=2.3.11') -options=('!libtool') -install=fontconfig.install -source=(http://www.fontconfig.org/release/${pkgname}-${pkgver}.tar.gz - 29-replace-bitmap-fonts.conf - 30-urw-aliases.patch) -md5sums=('77e15a92006ddc2adbb06f840d591c0e' - 'f6b67e8cc79197ed6abd4701911e83da' - '51bc6cb633b50f3c28793361738aac5b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/30-urw-aliases.patch" || return 1 - # enable Position Independent Code for prelinking - export CFLAGS="${CFLAGS} -fPIC" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m644 "${srcdir}/29-replace-bitmap-fonts.conf" \ - "${pkgdir}/etc/fonts/conf.avail" || return 1 - rm -f ${pkgdir}/etc/fonts/conf.d/*.conf - - #Install license - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 -} diff --git a/abs/core-testing/fontconfig/fontconfig.install b/abs/core-testing/fontconfig/fontconfig.install deleted file mode 100644 index 20feb6e..0000000 --- a/abs/core-testing/fontconfig/fontconfig.install +++ /dev/null @@ -1,100 +0,0 @@ -configs=('20-fix-globaladvance.conf' - '20-unhint-small-vera.conf' - '29-replace-bitmap-fonts.conf' - '30-metric-aliases.conf' - '30-urw-aliases.conf' - '40-nonlatin.conf' - '45-latin.conf' - '49-sansserif.conf' - '50-user.conf' - '51-local.conf' - '60-latin.conf' - '65-fonts-persian.conf' - '65-nonlatin.conf' - '69-unifont.conf' - '80-delicious.conf' - '90-synthetic.conf') - -post_install() { - echo -n "updating font cache... " - /sbin/ldconfig -r . - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - ln -sf ../conf.avail/${config} . - done - popd > /dev/null - /usr/bin/fc-cache -f - echo "done." -} - -post_upgrade() { - rm -f /etc/fonts/conf.d/10-bitmaps.conf - cat << _EOF - -===> Important Fontconfig configuration change <=== - - The way fontconfig is configured has been changed. - Configuration is done via /etc/fonts/conf.avail and conf.d. - Read /etc/fonts/conf.d/README for more information. - - Configuration via /etc/fonts/local.conf is still possible, - but is no longer recommended for options available in conf.avail. - -_EOF - - if [ `vercmp 2.4.1-1 $2` -gt 0 ]; then - # Upgrade from old version, place all symlinks. pre-symlink package version - echo -n "Linking configuration files... " - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - ln -sf ../conf.avail/${config} . - done - popd > /dev/null - echo "done." - fi - - if [ `vercmp 2.6.0-1 $2` -gt 0 ]; then - # pre-2.6.0 versions have missing config - echo -n "Adding missing configuration files... " - pushd /etc/fonts/conf.d > /dev/null - ln -sf ../conf.avail/30-metric-aliases.conf . - ln -sf ../conf.avail/40-nonlatin.conf . - ln -sf ../conf.avail/45-latin.conf . - popd > /dev/null - echo "done." - fi - - # Remove dead links - echo -n "Removing outdated configuration files... " - for config in /etc/fonts/conf.d/*; do - if [ ! -f ${config} ]; then - rm -f ${config} - fi - done - echo "done." - - echo -n "updating font cache... " - /usr/bin/fc-cache -f - echo "done." -} - -pre_upgrade() { - # Link new config files not present on system yet - echo -n "Symlinking new configuration files... " - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - if [ ! -f ../conf.avail/${config} ]; then - ln -sf ../conf.avail/${config} . - fi - done - popd > /dev/null - echo "done." -} - -post_remove() { - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - rm -f ${config} - done - popd > /dev/null -} diff --git a/abs/core-testing/fontsproto/PKGBUILD b/abs/core-testing/fontsproto/PKGBUILD deleted file mode 100644 index 595f2e3..0000000 --- a/abs/core-testing/fontsproto/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 51009 2009-09-04 13:55:55Z jgc $ -#Maintainer: Jan de Groot - -pkgname=fontsproto -pkgver=2.1.0 -pkgrel=1 -pkgdesc="X11 font extension wire protocol" -arch=(any) -url="http://xorg.freedesktop.org/" -license=('custom') -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('395b300fd5120a7ff90cb8fea4e2356b9632dc3e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 -} diff --git a/abs/core-testing/freeglut/PKGBUILD b/abs/core-testing/freeglut/PKGBUILD deleted file mode 100644 index 402ef70..0000000 --- a/abs/core-testing/freeglut/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Eric Belanger -# Contributor: Tom Newsom - -pkgname=freeglut -pkgver=2.4.0 -pkgrel=3 -pkgdesc="Provides functionality for small OpenGL programs" -arch=('i686' 'x86_64') -url="http://freeglut.sourceforge.net/" -license=('custom') -depends=('libxxf86vm' 'mesa') -replaces=('glut') -provides=('glut') -conflicts=('glut') -options=('!libtool') -source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz \ - glut-cursor-inherit.patch) -md5sums=('6d16873bd876fbf4980a927cfbc496a1' 'd6ba7e22ebb0fd7904b8e18c97475ba6') -sha1sums=('91a528aa72758b7288a0d69a964b1b7e3f322a12' '9353d7b811fdfd6f0c5766f0e93924ca63e9d6a9') - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - patch -Np1 -i ${startdir}/src/glut-cursor-inherit.patch || return 1 - sed -i 's/-Werror//' configure - ./configure --prefix=/usr - make all || return 1 - make DESTDIR=${startdir}/pkg install - install -D -m644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING -} diff --git a/abs/core-testing/freeglut/glut-cursor-inherit.patch b/abs/core-testing/freeglut/glut-cursor-inherit.patch deleted file mode 100644 index b56a37c..0000000 --- a/abs/core-testing/freeglut/glut-cursor-inherit.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- freeglut-2.4.0.orig/src/freeglut_cursor.c -+++ freeglut-2.4.0/src/freeglut_cursor.c -@@ -130,7 +130,9 @@ - XCreateFontCursor( fgDisplay.Display, entry->cursorShape ); - } - cursor = entry->cachedCursor; -- } else { -+ if (cursor == None) -+ fgError( "Failed to create cursor" ); -+ } else { - switch( cursorIDToUse ) - { - case GLUT_CURSOR_NONE: -@@ -147,9 +149,6 @@ - } - } - -- if ( ( cursorIDToUse != GLUT_CURSOR_NONE ) && ( cursor == None ) ) { -- fgError( "Failed to create cursor" ); -- } - XDefineCursor( fgDisplay.Display, - window->Window.Handle, cursor ); - } diff --git a/abs/core-testing/freetype2-static/PKGBUILD b/abs/core-testing/freetype2-static/PKGBUILD deleted file mode 100644 index 6288742..0000000 --- a/abs/core-testing/freetype2-static/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: Maskawanian -pkgname=freetype2-static -pkgver=2.3.9 -pkgrel=1 -pkgdesc="TrueType font rendering library" -arch=(i686 x86_64) -license=('GPL') -url="http://freetype.sourceforge.net" -depends=('zlib') -conflicts=('freetype2') -provides=('freetype2='${pkgver}) -replaces=('freetype2') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 - bytecode.patch - freetype-2.3.0-enable-spr.patch - freetype-2.2.1-enable-valid.patch - freetype-2.2.1-memcpy-fix.patch) -md5sums=('d76233108aca9c9606cdbd341562ad9a' '9ff19e742968c29e3ba52b08d6bf0a50' '816dc8619a6904a7385769433c0a8653' '214119610444c9b02766ccee5e220680' '6fb6606d28082ecb8e0c6d986b0b26aa') - -build() { - cd ${startdir}/src/freetype-${pkgver} - patch -Np0 -i ${startdir}/src/bytecode.patch || return 1 - patch -Np1 -i ${startdir}/src/freetype-2.3.0-enable-spr.patch || return 1 - patch -Np1 -i ${startdir}/src/freetype-2.2.1-enable-valid.patch || return 1 - patch -Np1 -i ${startdir}/src/freetype-2.2.1-memcpy-fix.patch || return 1 - ./configure --prefix=/usr --enable-static || return 1 - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 -} diff --git a/abs/core-testing/freetype2-static/bytecode.patch b/abs/core-testing/freetype2-static/bytecode.patch deleted file mode 100644 index dd901ad..0000000 --- a/abs/core-testing/freetype2-static/bytecode.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- include/freetype/config/ftoption.h.old 2006-05-12 02:05:49.000000000 +0800 -+++ include/freetype/config/ftoption.h 2006-10-02 01:22:50.000000000 +0800 -@@ -436,7 +436,7 @@ - /* Do not #undef this macro here, since the build system might */ - /* define it for certain configurations only. */ - /* */ --/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ -+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER - - - /*************************************************************************/ -@@ -448,7 +448,7 @@ - /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook */ - /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally activated. */ - /* */ --#define TT_CONFIG_OPTION_UNPATENTED_HINTING -+#undef TT_CONFIG_OPTION_UNPATENTED_HINTING - - - /*************************************************************************/ -@@ -480,7 +480,7 @@ - /* http://partners.adobe.com/asn/developer/opentype/glyf.html */ - /* http://fonts.apple.com/TTRefMan/RM06/Chap6glyf.html */ - /* */ --#undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED -+#define TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED - - - /*************************************************************************/ diff --git a/abs/core-testing/freetype2-static/freetype-2.2.1-enable-valid.patch b/abs/core-testing/freetype2-static/freetype-2.2.1-enable-valid.patch deleted file mode 100644 index c78b6b7..0000000 --- a/abs/core-testing/freetype2-static/freetype-2.2.1-enable-valid.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 -+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 -@@ -110,7 +110,7 @@ - AUX_MODULES += cache - - # TrueType GX/AAT table validation. Needs ftgxval.c below. --# AUX_MODULES += gxvalid -+AUX_MODULES += gxvalid - - # Support for streams compressed with gzip (files with suffix .gz). - # -@@ -124,7 +124,7 @@ - - # OpenType table validation. Needs ftotval.c below. - # --# AUX_MODULES += otvalid -+AUX_MODULES += otvalid - - # Auxiliary PostScript driver component to share common code. - # diff --git a/abs/core-testing/freetype2-static/freetype-2.2.1-memcpy-fix.patch b/abs/core-testing/freetype2-static/freetype-2.2.1-memcpy-fix.patch deleted file mode 100644 index 67a1c07..0000000 --- a/abs/core-testing/freetype2-static/freetype-2.2.1-memcpy-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- freetype-2.2.1/src/psaux/psobjs.c~ 2006-04-26 16:38:17.000000000 +0200 -+++ freetype-2.2.1/src/psaux/psobjs.c 2006-09-10 15:01:13.000000000 +0200 -@@ -165,6 +165,11 @@ - return PSaux_Err_Invalid_Argument; - } - -+ if ( length < 0 ) { -+ FT_ERROR(( "ps_table_add: invalid length\n" )); -+ return PSaux_Err_Invalid_Argument; -+ } -+ - /* grow the base block if needed */ - if ( table->cursor + length > table->capacity ) - { diff --git a/abs/core-testing/freetype2-static/freetype-2.3.0-enable-spr.patch b/abs/core-testing/freetype2-static/freetype-2.3.0-enable-spr.patch deleted file mode 100644 index 8432e28..0000000 --- a/abs/core-testing/freetype2-static/freetype-2.3.0-enable-spr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 -+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 -@@ -92,7 +92,7 @@ - /* This is done to allow FreeType clients to run unmodified, forcing */ - /* them to display normal gray-level anti-aliased glyphs. */ - /* */ --/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ -+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - - /*************************************************************************/ diff --git a/abs/core-testing/freetype2/PKGBUILD b/abs/core-testing/freetype2/PKGBUILD deleted file mode 100644 index 19f921d..0000000 --- a/abs/core-testing/freetype2/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 85761 2010-07-19 13:01:22Z jgc $ -# Maintainer: Jan de Groot - -pkgname=freetype2 -pkgver=2.4.1 -pkgrel=1 -pkgdesc="TrueType font rendering library" -arch=(i686 x86_64) -license=('GPL') -url="http://freetype.sourceforge.net" -depends=('zlib') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 - freetype-2.3.0-enable-spr.patch - freetype-2.2.1-enable-valid.patch) -md5sums=('567a27e5189ed581396f69fb51faf2d8' - '816dc8619a6904a7385769433c0a8653' - '214119610444c9b02766ccee5e220680') - -build() { - cd "${srcdir}/freetype-${pkgver}" - patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" || return 1 - patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" || return 1 - - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/abs/core-testing/freetype2/bytecode.patch b/abs/core-testing/freetype2/bytecode.patch deleted file mode 100644 index dd901ad..0000000 --- a/abs/core-testing/freetype2/bytecode.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- include/freetype/config/ftoption.h.old 2006-05-12 02:05:49.000000000 +0800 -+++ include/freetype/config/ftoption.h 2006-10-02 01:22:50.000000000 +0800 -@@ -436,7 +436,7 @@ - /* Do not #undef this macro here, since the build system might */ - /* define it for certain configurations only. */ - /* */ --/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ -+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER - - - /*************************************************************************/ -@@ -448,7 +448,7 @@ - /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook */ - /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally activated. */ - /* */ --#define TT_CONFIG_OPTION_UNPATENTED_HINTING -+#undef TT_CONFIG_OPTION_UNPATENTED_HINTING - - - /*************************************************************************/ -@@ -480,7 +480,7 @@ - /* http://partners.adobe.com/asn/developer/opentype/glyf.html */ - /* http://fonts.apple.com/TTRefMan/RM06/Chap6glyf.html */ - /* */ --#undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED -+#define TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED - - - /*************************************************************************/ diff --git a/abs/core-testing/freetype2/freetype-2.2.1-enable-valid.patch b/abs/core-testing/freetype2/freetype-2.2.1-enable-valid.patch deleted file mode 100644 index c78b6b7..0000000 --- a/abs/core-testing/freetype2/freetype-2.2.1-enable-valid.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 -+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 -@@ -110,7 +110,7 @@ - AUX_MODULES += cache - - # TrueType GX/AAT table validation. Needs ftgxval.c below. --# AUX_MODULES += gxvalid -+AUX_MODULES += gxvalid - - # Support for streams compressed with gzip (files with suffix .gz). - # -@@ -124,7 +124,7 @@ - - # OpenType table validation. Needs ftotval.c below. - # --# AUX_MODULES += otvalid -+AUX_MODULES += otvalid - - # Auxiliary PostScript driver component to share common code. - # diff --git a/abs/core-testing/freetype2/freetype-2.2.1-memcpy-fix.patch b/abs/core-testing/freetype2/freetype-2.2.1-memcpy-fix.patch deleted file mode 100644 index 67a1c07..0000000 --- a/abs/core-testing/freetype2/freetype-2.2.1-memcpy-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- freetype-2.2.1/src/psaux/psobjs.c~ 2006-04-26 16:38:17.000000000 +0200 -+++ freetype-2.2.1/src/psaux/psobjs.c 2006-09-10 15:01:13.000000000 +0200 -@@ -165,6 +165,11 @@ - return PSaux_Err_Invalid_Argument; - } - -+ if ( length < 0 ) { -+ FT_ERROR(( "ps_table_add: invalid length\n" )); -+ return PSaux_Err_Invalid_Argument; -+ } -+ - /* grow the base block if needed */ - if ( table->cursor + length > table->capacity ) - { diff --git a/abs/core-testing/freetype2/freetype-2.3.0-enable-spr.patch b/abs/core-testing/freetype2/freetype-2.3.0-enable-spr.patch deleted file mode 100644 index 8432e28..0000000 --- a/abs/core-testing/freetype2/freetype-2.3.0-enable-spr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 -+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 -@@ -92,7 +92,7 @@ - /* This is done to allow FreeType clients to run unmodified, forcing */ - /* them to display normal gray-level anti-aliased glyphs. */ - /* */ --/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ -+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - - /*************************************************************************/ diff --git a/abs/core-testing/freetype2/freetype-2.3.3-ftbitmap.patch b/abs/core-testing/freetype2/freetype-2.3.3-ftbitmap.patch deleted file mode 100644 index bbb8b2b..0000000 --- a/abs/core-testing/freetype2/freetype-2.3.3-ftbitmap.patch +++ /dev/null @@ -1,25 +0,0 @@ -=================================================================== -RCS file: /var/lib/cvs/sources/freetype/freetype2/src/base/ftbitmap.c,v -retrieving revision 1.17 -retrieving revision 1.18 -diff -u -r1.17 -r1.18 ---- freetype/freetype2/src/base/ftbitmap.c 2007/03/29 11:56:21 1.17 -+++ freetype/freetype2/src/base/ftbitmap.c 2007/04/06 08:19:04 1.18 -@@ -149,15 +149,15 @@ - if ( bit_last < bit_width ) - { - FT_Byte* line = bitmap->buffer + ( bit_last >> 3 ); -+ FT_Byte* end = bitmap->buffer + pitch; - FT_Int shift = bit_last & 7; - FT_UInt mask = 0xFF00U >> shift; - FT_Int count = height; - - -- for ( ; count > 0; count--, line += pitch ) -+ for ( ; count > 0; count--, line += pitch, end += pitch ) - { - FT_Byte* write = line; -- FT_Byte* end = line + pitch; - - - if ( shift > 0 ) diff --git a/abs/core-testing/freetype2/freetype2.install b/abs/core-testing/freetype2/freetype2.install deleted file mode 100644 index 704adac..0000000 --- a/abs/core-testing/freetype2/freetype2.install +++ /dev/null @@ -1,23 +0,0 @@ -# arg 1: the new package version -post_install() { - echo -n "updating font cache... " - /sbin/ldconfig -r . - /usr/bin/fc-cache -f - echo "done." -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -op=$1 -shift - -$op $* diff --git a/abs/core-testing/fribidi/ChangeLog b/abs/core-testing/fribidi/ChangeLog deleted file mode 100644 index 43b17a5..0000000 --- a/abs/core-testing/fribidi/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2008-02-16 Travis Willard - - * 0.10.9 - Added ChangeLog - New upstream release. diff --git a/abs/core-testing/fribidi/PKGBUILD b/abs/core-testing/fribidi/PKGBUILD deleted file mode 100644 index f8ecb19..0000000 --- a/abs/core-testing/fribidi/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Travis Willard -# Committer: Judd Vinet - -pkgname=fribidi -pkgver=0.10.9 -pkgrel=1 -pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm" -arch=(i686 x86_64) -license=('LGPL') -url="http://fribidi.org" -depends=('glibc') -options=('!libtool') -source=(http://fribidi.org/download/fribidi-${pkgver}.tar.gz) -md5sums=('647aee89079b056269ff0918dc1c6d28') - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${startdir}/pkg install -} - diff --git a/abs/core-testing/ftgl/PKGBUILD b/abs/core-testing/ftgl/PKGBUILD deleted file mode 100644 index 47c9eb4..0000000 --- a/abs/core-testing/ftgl/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Alexander Baldeck -# Contributor: tobias -pkgname=ftgl -pkgver=2.1.2 -pkgrel=4 -pkgdesc="OpenGL library to use arbitrary fonts" -arch=(i686 x86_64) -source=(http://superb-east.dl.sourceforge.net/sourceforge/ftgl/$pkgname-$pkgver.tar.gz ftgl-gcc411.patch) -url="http://homepages.paradise.net.nz/henryj/code/" -options=(!libtool) -depends=(freetype2 glut) -makedepends=(doxygen) - -build() { - cd $startdir/src/FTGL/ - patch -Np1 -i ${startdir}/src/ftgl-gcc411.patch || return 1 - cd unix - sed -i 's|^ \$| $|g' src/Makefile - ./configure --prefix=/usr --with-pic - make || return 1 - make prefix=$startdir/pkg/usr install - -} -md5sums=('f81c0a7128192ba11e036186f9a968f2' '2a4ad16c1bfae869a8bf0ddababfd25a') diff --git a/abs/core-testing/ftgl/ftgl-gcc411.patch b/abs/core-testing/ftgl/ftgl-gcc411.patch deleted file mode 100644 index f52d48b..0000000 --- a/abs/core-testing/ftgl/ftgl-gcc411.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN FTGL.org/include/FTTextureGlyph.h FTGL/include/FTTextureGlyph.h ---- FTGL.org/include/FTTextureGlyph.h 2006-07-11 17:49:42.000000000 +0200 -+++ FTGL/include/FTTextureGlyph.h 2006-07-11 17:50:23.000000000 +0200 -@@ -52,7 +52,7 @@ - * Reset the currently active texture to zero to get into a known state before - * drawing a string. This is to get round possible threading issues. - */ -- static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;} -+ static void ResetActiveTexture(){ activeTextureID = 0;} - - private: - /** diff --git a/abs/core-testing/fuse/PKGBUILD b/abs/core-testing/fuse/PKGBUILD deleted file mode 100644 index 62d8f81..0000000 --- a/abs/core-testing/fuse/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Mark Rosenstand -pkgname=fuse -pkgver=2.7.3 -pkgrel=1 -pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." -arch=(i686 x86_64) -url="http://fuse.sourceforge.net/" -license="GPL2" -depends=('glibc') -makedepends=('pkgconfig') -install=fuse.install -source=(http://mesh.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -options=(!libtool) -md5sums=('98563fc7b265b7479a3178181cbcf59a') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --disable-kernel-module --enable-lib \ - --enable-util --bindir=/bin - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - - # static device nodes will cause collision. - rm -rf $startdir/pkg/dev - # Remove init script in wrong path - # Don't add our own for now, as fusectl fs oopses on 2.6.18 - rm -rf $startdir/pkg/etc/init.d - #install -D -m755 $startdir/src/fuse.rc.d $startdir/pkg/etc/rc.d/fuse - - mkdir -p $startdir/pkg/lib - mv $startdir/pkg/usr/lib/libfuse.so.${pkgver} $startdir/pkg/lib/ || return 1 - ln -s ../../lib/libfuse.so.${pkgver} $startdir/pkg/usr/lib/libfuse.so.${pkgver} || return 1 - ln -s libfuse.so.${pkgver} $startdir/pkg/lib/libfuse.so.2 || return 1 - mv $startdir/pkg/usr/lib/libulockmgr.so.1.0.1 $startdir/pkg/lib/ || return 1 - ln -s ../../lib/libulockmgr.so.1.0.1 $startdir/pkg/usr/lib/libulockmgr.so.1.0.1 || return 1 - ln -s libulockmgr.so.1.0.1 $startdir/pkg/lib/libulockmgr.so.1 || return 1 -} diff --git a/abs/core-testing/fuse/fuse.install b/abs/core-testing/fuse/fuse.install deleted file mode 100644 index 595ac7c..0000000 --- a/abs/core-testing/fuse/fuse.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - cat << 'EOM' -==> You must load the fuse kernel module to use FUSE. - -> Run 'modprobe fuse' to load the module now. - -> Add fuse to $MODULES in /etc/rc.conf to load on every boot. -==> You will need a /dev/fuse device node to use FUSE. - -> If you use udev, nothing needs to be done - -> For a static /dev, run: mknod /dev/fuse -m 0666 c 10 229 -EOM -} - -op=$1 -shift -$op $* diff --git a/abs/core-testing/fuse/fuse.rc.d b/abs/core-testing/fuse/fuse.rc.d deleted file mode 100755 index 768da5b..0000000 --- a/abs/core-testing/fuse/fuse.rc.d +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# -# fuse Init script for Filesystem in Userspace -# Based on the script by Miklos Szeredi - -. /etc/rc.conf -. /etc/rc.d/functions -FUSECTL=/sys/fs/fuse/connections - -case "$1" in - start) - stat_busy "Starting fuse" - if ! grep -qw fuse /proc/filesystems; then - modprobe fuse >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - fi - if grep -qw fusectl /proc/filesystems && ! grep -qw $FUSECTL /proc/mounts; then - mount -t fusectl none $FUSECTL >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - fi - add_daemon fuse - stat_done - ;; - stop) - stat_busy "Stopping fuse" - umount $FUSECTL >/dev/null 2>&1 - rmmod fuse >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon fuse - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/core-testing/fxload/PKGBUILD b/abs/core-testing/fxload/PKGBUILD deleted file mode 100644 index d27f525..0000000 --- a/abs/core-testing/fxload/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# Contributor: Jochen Immend�fer -pkgname=fxload -pkgver=2002_04_11 -pkgrel=4 -pkgdesc="fxload firmware loader. Used with udev or devfs/hotplug." -url="http://linux-hotplug.sourceforge.net/" -depends=('glibc') -makedepends=('sed') -source=(http://easynews.dl.sourceforge.net/sourceforge/linux-hotplug/$pkgname-$pkgver.tar.gz) - arch=('i686') -build() { -C_INCLUDE_PATH=/usr/src/linux-2.6.24-STB - - cd $startdir/src/$pkgname-$pkgver - sed -i 's|CFLAGS =.*-O -Wall $(RPM_OPT_FLAGS)||' Makefile - sed -i 's/\linux\/usb.h/linux\/usb\/ch9.h/' ezusb.c ||return 1 - make || return 1 - sed -i 's|/usr/bin/install|/bin/install|' Makefile - make exec_prefix=$startdir/pkg/ prefix=$startdir/pkg/ install -} diff --git a/abs/core-testing/gawk/PKGBUILD b/abs/core-testing/gawk/PKGBUILD deleted file mode 100644 index 976a574..0000000 --- a/abs/core-testing/gawk/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: dorphell -# Contributor: Tom Newsom -pkgname=gawk -pkgver=3.1.6 -pkgrel=11 -pkgdesc="Gnu version of awk" -arch=(i686 x86_64) -url="http://www.gnu.org/directory/GNU/gawk.html" -license=('GPL') -groups=('base') -provides=('awk') -replaces=('mawk') -source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -depends=('bash' 'glibc') -md5sums=('b237751aef53c9ead9644e376bc53386') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install - mv $startdir/pkg/usr/libexec $startdir/pkg/usr/lib - mkdir $startdir/pkg/bin - mv $startdir/pkg/usr/bin/gawk* $startdir/pkg/bin/ - mv $startdir/pkg/usr/bin/awk $startdir/pkg/bin/ - # don't use hardlinks to manpages, it messes up our compression stuff - rm $startdir/pkg/usr/share/man/man1/pgawk.1 - ln -s gawk.1 $startdir/pkg/usr/share/man/man1/pgawk.1 - ln -s gawk.1 $startdir/pkg/usr/share/man/man1/awk.1 -} diff --git a/abs/core-testing/gawk/gawk-3.1.5-segfault_fix-1.patch b/abs/core-testing/gawk/gawk-3.1.5-segfault_fix-1.patch deleted file mode 100644 index aa2f17b..0000000 --- a/abs/core-testing/gawk/gawk-3.1.5-segfault_fix-1.patch +++ /dev/null @@ -1,43 +0,0 @@ -Submitted By: Matthew Burgess -Date: 2005-09-24 -Initial Package Version: 3.1.5 -Upstream Status: From Upstream -Origin: http://lists.gnu.org/archive/html/bug-gnu-utils/2005-08/msg00047.html -Description: Fixes a bug which causes gawk to segfault when operating on a non-existent file. - -diff -Naur gawk-3.1.5.orig/io.c gawk-3.1.5/io.c ---- gawk-3.1.5.orig/io.c 2005-07-26 18:07:43.000000000 +0000 -+++ gawk-3.1.5/io.c 2005-09-24 14:43:13.771380264 +0000 -@@ -2480,9 +2480,12 @@ - { - struct stat sbuf; - struct open_hook *oh; -+ int iop_malloced = FALSE; - -- if (iop == NULL) -+ if (iop == NULL) { - emalloc(iop, IOBUF *, sizeof(IOBUF), "iop_alloc"); -+ iop_malloced = TRUE; -+ } - memset(iop, '\0', sizeof(IOBUF)); - iop->flag = 0; - iop->fd = fd; -@@ -2495,7 +2498,8 @@ - } - - if (iop->fd == INVALID_HANDLE) { -- free(iop); -+ if (iop_malloced) -+ free(iop); - return NULL; - } - if (isatty(iop->fd)) -@@ -2503,7 +2507,7 @@ - iop->readsize = iop->size = optimal_bufsize(iop->fd, & sbuf); - iop->sbuf = sbuf; - if (do_lint && S_ISREG(sbuf.st_mode) && sbuf.st_size == 0) -- lintwarn(_("data file `%s' is empty"), name); -+ lintwarn(_("data file `%s' is empty"), name); - errno = 0; - iop->count = iop->scanoff = 0; - emalloc(iop->buf, char *, iop->size += 2, "iop_alloc"); diff --git a/abs/core-testing/gcc/PKGBUILD b/abs/core-testing/gcc/PKGBUILD deleted file mode 100644 index 1cec41a..0000000 --- a/abs/core-testing/gcc/PKGBUILD +++ /dev/null @@ -1,221 +0,0 @@ -# $Id: PKGBUILD 87242 2010-08-11 12:46:24Z allan $ -# Maintainer: Jan de Groot -# Maintainer: Allan McRae - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: libtool requires rebuilt with each new gcc version - -pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada') -pkgver=4.5.1 -pkgrel=2 -#_snapshot=4.5-20100610 -_libstdcppmanver=20100719 # Note: check source directory name when updating this -pkgdesc="The GNU Compiler Collection" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils>=2.20.1' 'libmpc>=0.8.2-2' 'cloog-ppl>=0.15.9-2' 'elfutils' 'gcc-ada') -options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada}-${pkgver}.tar.bz2 - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada}-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 - gcc_pure64.patch - gcc-hash-style-both.patch) -md5sums=('dc8959e31b01a65ce10d269614815054' - 'b294953ff0bb2f20c7acb2bf005d832a' - '7567c2f8df8a8bf61b48fe414b88de65' - '3c11b7037896e967eddf8178af2ddd98' - 'c92111e2e22fc60d1e0adb1b5c7fa4f9' - '226ae0c6364cfe2c1f7ac88d06088d5a' - '4030ee1c08dd1e843c0225b772360e76' - '6fd395bacbd7b6e47c7b74854b478363') - - -if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" -else - _basedir="${srcdir}/gcc-${pkgver}" -fi - -build() { - if ! locale -a | grep ^de_DE > /dev/null; then - echo "You need the de_DE locale to build gcc." - return 1 - fi - - cd ${_basedir} - - # "Add" ppl-0.11 compatibility - sed -i "/ppl_minor_version=/s#10#11#" configure - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - if [ "${CARCH}" = "x86_64" ]; then - patch -Np1 -i ../gcc_pure64.patch - fi - patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch - - echo ${pkgver} > gcc/BASE-VER - - mkdir build && cd build - ../configure --prefix=/usr --enable-languages=c,c++,fortran,objc,obj-c++,ada \ - --enable-shared --enable-threads=posix --enable-__cxa_atexit \ - --enable-clocale=gnu --enable-gnu-unique-object \ - --enable-lto --enable-plugin \ - --disable-multilib --disable-libstdcxx-pch \ - --with-system-zlib --with-ppl --with-cloog \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info - make -} - -package_gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC for C and C++ languages" - groups=('base') - depends=('glibc>=2.11.1-2') - install=gcc-libs.install - - cd ${_basedir}/build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install - make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - - make -j1 DESTDIR=${pkgdir} install-target-libobjc - # I thought I said to only install the lib... - rm -rf ${pkgdir}/usr/lib/gcc/ - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc() -{ - depends=('binutils>=2.20.1' 'libmpc>=0.8.1-2' 'cloog-ppl>=0.15.9-2' 'elfutils') - groups=('base-devel') - install=gcc.install - - cd ${_basedir}/build - - # much, much easier to install the lot and clean-up the mess - make -j1 DESTDIR=${pkgdir} install - rm $pkgdir/usr/bin/{*gfortran,gnat*} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}/* - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,libgfortranbegin.a} - rm $pkgdir/usr/lib/{*.so*,lib{gfortran,objc}.a} - rm $pkgdir/usr/share/info/{gfortran,gnat*,libgomp}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/gfortran.1 - - # many packages require these symlinks - install -dm755 ${pkgdir}/lib - ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp - ln -sf gcc ${pkgdir}/usr/bin/cc - ln -sf g++ ${pkgdir}/usr/bin/c++ - - # POSIX conformance launcher scripts for c89 and c99 - cat > $pkgdir/usr/bin/c89 <<"EOF" -#!/bin/sh -fl="-std=c89" -for opt; do - case "$opt" in - -ansi|-std=c89|-std=iso9899:1990) fl="";; - -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - cat > $pkgdir/usr/bin/c99 <<"EOF" -#!/bin/sh -fl="-std=c99" -for opt; do - case "$opt" in - -std=c99|-std=iso9899:1999) fl="";; - -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - chmod 755 $pkgdir/usr/bin/c{8,9}9 - - # install the libstdc++ man pages - install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/libstdc++-api-${_libstdcppmanver}.man/man3/* \ - ${pkgdir}/usr/share/man/man3/ - # deal with conflicts... - rm -f ${pkgdir}/usr/share/man/man3/{ctime,queue,random,regex,string}.3 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-fortran() -{ - pkgdesc="Fortran front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-fortran.install - - cd ${_basedir}/build - make -j1 DESTDIR=$pkgdir install-target-libgfortran - make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS - make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} - install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - - # remove libraries included in gcc-libs - rm -f ${pkgdir}/usr/lib/libgfortran.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-objc() -{ - pkgdesc="Objective-C front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - - cd ${_basedir}/build - make -j1 DESTDIR=$pkgdir install-target-libobjc - install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - - # remove libraries included in gcc-libs - rm -f ${pkgdir}/usr/lib/libobjc.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-ada() -{ - pkgdesc="Ada front-end for GCC (GNAT)" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-ada.install - - cd ${_basedir}/build/gcc - make -j1 DESTDIR=$pkgdir ada.install-{common,info} - install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION -} diff --git a/abs/core-testing/gcc/gcc-ada.install b/abs/core-testing/gcc/gcc-ada.install deleted file mode 100644 index 1c8e086..0000000 --- a/abs/core-testing/gcc/gcc-ada.install +++ /dev/null @@ -1,22 +0,0 @@ -infodir=/usr/share/info -filelist=(gnat-style.info gnat_rm.info gnat_ugn.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/core-testing/gcc/gcc-fortran.install b/abs/core-testing/gcc/gcc-fortran.install deleted file mode 100644 index acffc05..0000000 --- a/abs/core-testing/gcc/gcc-fortran.install +++ /dev/null @@ -1,18 +0,0 @@ -infodir=/usr/share/info -file="gfortran.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/core-testing/gcc/gcc-hash-style-both.patch b/abs/core-testing/gcc/gcc-hash-style-both.patch deleted file mode 100644 index fbb2105..0000000 --- a/abs/core-testing/gcc/gcc-hash-style-both.patch +++ /dev/null @@ -1,163 +0,0 @@ -#! /bin/sh -e - -# DP: Link using --hash-style=both (alpha, amd64, ia64, i386, powerpc, ppc64, s390, sparc) - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - #cd ${dir}gcc && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - #rm ${dir}gcc/configure - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -2006-07-11 Jakub Jelinek - - * config/i386/linux.h (LINK_SPEC): Add --hash-style=both. - * config/i386/linux64.h (LINK_SPEC): Likewise. - * config/rs6000/sysv4.h (LINK_OS_LINUX_SPEC): Likewise. - * config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32, - LINK_OS_LINUX_SPEC64): Likewise. - * config/s390/linux.h (LINK_SPEC): Likewise. - * config/ia64/linux.h (LINK_SPEC): Likewise. - * config/sparc/linux.h (LINK_SPEC): Likewise. - * config/sparc/linux64.h (LINK_SPEC, LINK_ARCH32_SPEC, - LINK_ARCH64_SPEC): Likewise. - * config/alpha/linux-elf.h (LINK_SPEC): Likewise. - ---- gcc/config/alpha/linux-elf.h.orig 2007-08-04 08:55:58.000000000 +0200 -+++ gcc/config/alpha/linux-elf.h 2007-09-01 15:47:26.605865578 +0200 -@@ -39,7 +39,7 @@ - - #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER - --#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ -+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \ - %{O*:-O3} %{!O*:-O1} \ - %{shared:-shared} \ - %{!shared: \ ---- gcc/config/s390/linux.h.orig 2007-08-04 08:55:59.000000000 +0200 -+++ gcc/config/s390/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -77,7 +77,7 @@ - - #undef LINK_SPEC - #define LINK_SPEC \ -- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ -+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{static:-static} \ ---- gcc/config/sparc/linux.h.orig 2007-08-04 08:56:01.000000000 +0200 -+++ gcc/config/sparc/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -132,7 +132,7 @@ - - - #undef LINK_SPEC --#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ - %{!mno-relax:%{!r:-relax}} \ - %{!shared: \ - %{!ibcs: \ ---- gcc/config/sparc/linux64.h.orig 2007-08-04 08:56:01.000000000 +0200 -+++ gcc/config/sparc/linux64.h 2007-09-01 15:47:26.605865578 +0200 -@@ -166,7 +166,7 @@ - { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ - { "link_arch", LINK_ARCH_SPEC }, - --#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ -+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ -@@ -175,7 +175,7 @@ - %{static:-static}}} \ - " - --#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ -@@ -256,7 +256,7 @@ - #else /* !SPARC_BI_ARCH */ - - #undef LINK_SPEC --#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ ---- gcc/config/i386/linux.h.orig 2007-08-04 08:56:07.000000000 +0200 -+++ gcc/config/i386/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -108,7 +108,7 @@ - { "dynamic_linker", LINUX_DYNAMIC_LINKER } - - #undef LINK_SPEC --#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ -+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ ---- gcc/config/i386/linux64.h.orig 2007-08-04 08:56:07.000000000 +0200 -+++ gcc/config/i386/linux64.h 2007-09-01 15:48:27.336781690 +0200 -@@ -65,7 +65,7 @@ - #endif - - #undef LINK_SPEC --#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ -+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/ia64/linux.h.orig 2006-12-12 18:59:53.000000000 +0100 -+++ gcc/config/ia64/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -40,7 +40,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "\ -+#define LINK_SPEC "--hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/rs6000/sysv4.h.orig 2007-08-08 23:37:49.000000000 +0200 -+++ gcc/config/rs6000/sysv4.h 2007-09-01 15:47:26.615865729 +0200 -@@ -901,7 +901,7 @@ - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - --#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}" - ---- gcc/config/rs6000/linux64.h.orig 2007-08-04 08:56:12.000000000 +0200 -+++ gcc/config/rs6000/linux64.h 2007-09-01 15:47:26.615865729 +0200 -@@ -354,11 +354,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) - - --#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}}" - --#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}" - diff --git a/abs/core-testing/gcc/gcc-libs.install b/abs/core-testing/gcc/gcc-libs.install deleted file mode 100644 index bd57efb..0000000 --- a/abs/core-testing/gcc/gcc-libs.install +++ /dev/null @@ -1,14 +0,0 @@ -infodir=/usr/share/info -file="libgomp.info" - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/core-testing/gcc/gcc.install b/abs/core-testing/gcc/gcc.install deleted file mode 100644 index 83d89b0..0000000 --- a/abs/core-testing/gcc/gcc.install +++ /dev/null @@ -1,22 +0,0 @@ -infodir=/usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/core-testing/gcc/gcc_pure64.patch b/abs/core-testing/gcc/gcc_pure64.patch deleted file mode 100644 index 8c0baf8..0000000 --- a/abs/core-testing/gcc/gcc_pure64.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h ---- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400 -@@ -49,8 +49,8 @@ - When the -shared link option is used a final link is not being - done. */ - --#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - - #undef LINK_SPEC - #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64 ---- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400 -@@ -6,7 +6,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = ../lib ../lib32 - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib diff --git a/abs/core-testing/gdb/PKGBUILD b/abs/core-testing/gdb/PKGBUILD deleted file mode 100644 index e4ee109..0000000 --- a/abs/core-testing/gdb/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 10684 2008-08-29 21:45:41Z eric $ -# Maintainer: Jan de Groot -pkgname=gdb -pkgver=6.8 -pkgrel=3 -pkgdesc="The GNU Debugger" -arch=(i686 x86_64) -url="http://sources.redhat.com/gdb/" -depends=('ncurses' 'expat') -options=('!libtool') -license=('GPL3') -install=gdb.install -source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2) -md5sums=('c9da266b884fb8fa54df786dfaadbc7a') - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-nls --mandir=/usr/share/man \ - --infodir=/usr/share/info - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 - rm -f ${pkgdir}/usr/share/info/dir - # resolve conflicts with binutils - rm -f ${startdir}/pkg/usr/include/{bfd,dis-asm,symcat,ansidecl,bfdlink}.h - rm -f ${startdir}/pkg/usr/lib/{libiberty,libbfd,libopcodes}.a - rm -f ${startdir}/pkg/usr/share/info/{bfd.info,configure.info,standards.info} -} diff --git a/abs/core-testing/gdb/gdb.install b/abs/core-testing/gdb/gdb.install deleted file mode 100644 index ca793a1..0000000 --- a/abs/core-testing/gdb/gdb.install +++ /dev/null @@ -1,18 +0,0 @@ -infodir=/usr/share/info -filelist=(annotate.info gdb.info gdb.info-1 gdb.info-2 gdb.info-3 gdb.info-4 gdbint.info gdbint.info-1 gdbint.info-2 stabs.info) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/abs/core-testing/gdbm/PKGBUILD b/abs/core-testing/gdbm/PKGBUILD deleted file mode 100644 index 1154818..0000000 --- a/abs/core-testing/gdbm/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: judd -pkgname=gdbm -pkgver=1.8.3 -pkgrel=14 -pkgdesc="GNU database library" -url="http://www.gnu.org/software/gdbm/gdbm.html" -license=('GPL') -arch=(i686 x86_64) -groups=('base') -depends=('glibc') -source=(ftp://ftp.gnu.org/gnu/gdbm/$pkgname-$pkgver.tar.gz) -md5sums=('1d1b1d5c0245b1c00aff92da751e9aa1') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make prefix=/usr || return 1 - make prefix=$startdir/pkg/usr install - make prefix=$startdir/pkg/usr install-compat - chown root.root $startdir/pkg/usr/include/{dbm.h,gdbm.h,ndbm.h} - chown root.root $startdir/pkg/usr/man/man3/gdbm.3 - find $startdir/pkg -name '*.la' -exec rm {} \; -} diff --git a/abs/core-testing/gdk-pixbuf/PKGBUILD b/abs/core-testing/gdk-pixbuf/PKGBUILD deleted file mode 100644 index 64b8b9a..0000000 --- a/abs/core-testing/gdk-pixbuf/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 20860 2008-12-07 04:28:44Z eric $ -# Maintainer: dorphell -# Committer: Judd Vinet - -pkgname=gdk-pixbuf -pkgver=0.22.0 -pkgrel=4 -pkgdesc="Image loading and manipulation library" -depends=(gtk libtiff libpng) -options=(!libtool) -arch=(i686 x86_64) -source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.22/${pkgname}-${pkgver}.tar.bz2 - gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch - gdk-pixbuf-0.22.0-bmp_secure.patch - gdk-pixbuf-0.22.0-loaders.patch - gdk-pixbuf-0.22.0-m4.patch) -md5sums=(05fcb68ceaa338614ab650c775efc2f2 d1fb93f1ae994875158a7e0c108c36f8 - 5f59d5772b1482d885a180dbc581cf84 3cf31ae0509747f72ac27a9fd96109c2 - 3edfa9fe9382fd8206d6238ec121a5af) - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - export SED=/bin/sed - patch -Np1 -i ${startdir}/src/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch || return 1 - patch -Np0 -i ${startdir}/src/gdk-pixbuf-0.22.0-bmp_secure.patch || return 1 - patch -Np1 -i ${startdir}/src/gdk-pixbuf-0.22.0-loaders.patch || return 1 - patch -Np1 -i ${startdir}/src/gdk-pixbuf-0.22.0-m4.patch || return 1 - libtoolize --force --copy --automake - ./configure --prefix=/usr --disable-gtk-doc - make || return 1 - make DESTDIR=${startdir}/pkg install - rm -rf ${startdir}/pkg/usr/share/gnome -} diff --git a/abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch b/abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch deleted file mode 100644 index ffb4378..0000000 --- a/abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c 2002-09-27 23:12:40.000000000 +0200 -+++ gdk-pixbuf-0.22.0.patched/gdk-pixbuf/io-bmp.c 2005-03-30 01:33:06.000000000 +0200 -@@ -31,8 +31,6 @@ - #include "gdk-pixbuf-private.h" - #include "gdk-pixbuf-io.h" - -- -- - #if 0 - /* If these structures were unpacked, they would define the two headers of the - * BMP file. After them comes the palette, and then the image data. -@@ -206,7 +204,7 @@ - - if (State == NULL) - return NULL; -- -+ - while (feof(f) == 0) { - length = fread(membuf, 1, sizeof (membuf), f); - if (length > 0) -@@ -245,11 +243,26 @@ - static gboolean - grow_buffer (struct bmp_progressive_state *State) - { -- guchar *tmp = realloc (State->buff, State->BufferSize); -+ guchar *tmp; -+ -+ if (State->BufferSize == 0) { -+#if 0 -+ g_set_error (error, -+ GDK_PIXBUF_ERROR, -+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE, -+ _("BMP image has bogus header data")); -+#endif -+ State->read_state = READ_STATE_ERROR; -+ return FALSE; -+ } -+ -+ tmp = realloc (State->buff, State->BufferSize); -+ - if (!tmp) { - State->read_state = READ_STATE_ERROR; - return FALSE; - } -+ - State->buff = tmp; - return TRUE; - } diff --git a/abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch b/abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch deleted file mode 100644 index 29471f1..0000000 --- a/abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: io-bmp.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-bmp.c,v -retrieving revision 1.41 -diff -u -p -r1.41 io-bmp.c ---- gdk-pixbuf/io-bmp.c 13 Aug 2004 02:26:57 -0000 1.41 -+++ gdk-pixbuf/io-bmp.c 20 Aug 2004 00:18:14 -0000 -@@ -876,8 +876,10 @@ DoCompressed(struct bmp_progressive_stat - guchar c; - gint idx; - -- if (context->compr.y >= context->Header.height) -+ if (context->compr.y >= context->Header.height) { -+ context->BufferDone = 0; - return TRUE; -+ } - - y = context->compr.y; - diff --git a/abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch b/abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch deleted file mode 100644 index 0686538..0000000 --- a/abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c ---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c 2002-09-27 17:19:15.000000000 -0500 -+++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c 2005-10-27 11:28:23.000000000 -0500 -@@ -330,6 +330,9 @@ - - State->HeaderSize+=I; - -+ if (State->HeaderSize < 0) -+ return FALSE; -+ - if (State->HeaderSize>State->BytesInHeaderBuf) { - guchar *tmp=realloc(State->HeaderBuf,State->HeaderSize); - if (!tmp) -diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c ---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c 2001-03-01 15:16:28.000000000 -0500 -+++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c 2005-10-27 11:29:14.000000000 -0500 -@@ -243,8 +243,8 @@ - break; - else { - if (numnames > 0) { -- space -= 1; -- strcat (color, " "); -+ strncat (color, " ", space); -+ space -= MIN (space, 1); - } - - strncat (color, temp, space); -@@ -281,7 +281,8 @@ - /* Fall through to the xpm_read_string. */ - - case op_body: -- xpm_read_string (h->infile, &h->buffer, &h->buffer_size); -+ if(!xpm_read_string (h->infile, &h->buffer, &h->buffer_size)) -+ return NULL; - return h->buffer; - - default: -@@ -317,13 +318,6 @@ - return NULL; - } - --/* Destroy notification function for the pixbuf */ --static void --free_buffer (guchar *pixels, gpointer data) --{ -- free (pixels); --} -- - static gboolean - xpm_color_parse (const char *spec, XColor *color) - { -@@ -342,7 +336,8 @@ - gchar pixel_str[32]; - GHashTable *color_hash; - _XPMColor *colors, *color, *fallbackcolor; -- guchar *pixels, *pixtmp; -+ guchar *pixtmp; -+ GdkPixbuf* pixbuf; - - fallbackcolor = NULL; - -@@ -352,16 +347,33 @@ - return NULL; - } - sscanf (buffer, "%d %d %d %d", &w, &h, &n_col, &cpp); -- if (cpp >= 32) { -- g_warning ("XPM has more than 31 chars per pixel."); -+ if (cpp <= 0 || cpp >= 32) { -+ g_warning ("XPM has invalid number of chars per pixel."); - return NULL; - } -+ if (n_col <= 0 || -+ n_col >= G_MAXINT / (cpp + 1) || -+ n_col >= G_MAXINT / sizeof (_XPMColor)) { -+ g_warning ("XPM file has invalid number of colors"); -+ return NULL; -+ } - - /* The hash is used for fast lookups of color from chars */ - color_hash = g_hash_table_new (g_str_hash, g_str_equal); - -- name_buf = g_new (gchar, n_col * (cpp + 1)); -- colors = g_new (_XPMColor, n_col); -+ name_buf = g_new (gchar, n_col * (cpp + 1)); -+ if (!name_buf) { -+ g_warning ("Cannot allocate memory for loading XPM image"); -+ g_hash_table_destroy (color_hash); -+ return NULL; -+ } -+ colors = g_new (_XPMColor, n_col); -+ if (!colors) { -+ g_warning ("Cannot allocate memory for loading XPM image"); -+ g_hash_table_destroy (color_hash); -+ g_free (name_buf); -+ return NULL; -+ } - - for (cnt = 0; cnt < n_col; cnt++) { - gchar *color_name; -@@ -397,12 +409,8 @@ - fallbackcolor = color; - } - -- if (is_trans) -- pixels = malloc (w * h * 4); -- else -- pixels = malloc (w * h * 3); -- -- if (!pixels) { -+ pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, is_trans, 8, w, h); -+ if (!pixbuf) { - g_hash_table_destroy (color_hash); - g_free (colors); - g_free (name_buf); -@@ -410,7 +418,7 @@ - } - - wbytes = w * cpp; -- pixtmp = pixels; -+ pixtmp = pixbuf->pixels; - - for (ycnt = 0; ycnt < h; ycnt++) { - buffer = (*get_buf) (op_body, handle); -@@ -443,9 +451,7 @@ - g_free (colors); - g_free (name_buf); - -- return gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, is_trans, 8, -- w, h, is_trans ? (w * 4) : (w * 3), -- free_buffer, NULL); -+ return pixbuf; - } - - /* Shared library entry point for file loading */ diff --git a/abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-m4.patch b/abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-m4.patch deleted file mode 100644 index 032976d..0000000 --- a/abs/core-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-m4.patch +++ /dev/null @@ -1,9 +0,0 @@ -Fix aclocal warning: -/usr/share/aclocal/gdk-pixbuf.m4:12: warning: underquoted definition of AM_PATH_GDK_PIXBUF ---- gdk-pixbuf-0.22.0/gdk-pixbuf.m4 -+++ gdk-pixbuf-0.22.0/gdk-pixbuf.m4 -@@ -11,3 +11,3 @@ - dnl --AC_DEFUN(AM_PATH_GDK_PIXBUF, -+AC_DEFUN([AM_PATH_GDK_PIXBUF], - [dnl diff --git a/abs/core-testing/gen-init-cpio/Makefile b/abs/core-testing/gen-init-cpio/Makefile deleted file mode 100644 index 1ebe763..0000000 --- a/abs/core-testing/gen-init-cpio/Makefile +++ /dev/null @@ -1,42 +0,0 @@ - -DESTDIR = -PREFIX = / - -MKDIR = /bin/mkdir -INSTALL = /bin/install -c -m 755 - -CC = /usr/bin/gcc -LD = /usr/bin/gcc - -CFLAGS += -Wall -Wstrict-prototypes -Wsign-compare -Wchar-subscripts \ - -Wpointer-arith -Wcast-align -Wsign-compare - -#pretty print! -E = @echo -Q = @ - -all: gen_init_cpio -.PHONY: all -.DEFAULT: all - -%.o: %.c - $(E) " compile " $@ - $(Q) $(CC) -c $(CFLAGS) $< -o $@ - -gen_init_cpio: gen_init_cpio.o - $(E) ">>build " $@ - $(Q) $(LD) $(LDFLAGS) $@.o -o $@ $(LIB_OBJS) - -clean: - $(E) " clean " - $(Q) rm -f gen_init_cpio *.o -.PHONY: clean - -install: all - $(MKDIR) -p $(DESTDIR)$(PREFIX)sbin/ - $(INSTALL) gen_init_cpio $(DESTDIR)$(PREFIX)sbin/ -.PHONY: install - -uninstall: - rm $(DESTDIR)$(PREFIX)sbin/gen_init_cpio -.PHONY: uninstall diff --git a/abs/core-testing/gen-init-cpio/PKGBUILD b/abs/core-testing/gen-init-cpio/PKGBUILD deleted file mode 100644 index ca1fa2e..0000000 --- a/abs/core-testing/gen-init-cpio/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer : Tobias Powalowski - -pkgname=gen-init-cpio -pkgver=2.6.17 -pkgrel=12 -pkgdesc="Program to compress initramfs images" -arch=(i686 x86_64) -license=('custom:none') -groups=('base') -url="http://www.kernel.org/" -depends=('glibc') -source=(Makefile gen_init_cpio.c) -md5sums=('8e3a142a522d65121c3bead41013be98' 'fe53a05f5fcfca9e4dd8d67d29190f6e') - -build() -{ - cd $startdir/src/ - make || return 1 - make DESTDIR=$startdir/pkg install -} diff --git a/abs/core-testing/gen-init-cpio/gen_init_cpio.c b/abs/core-testing/gen-init-cpio/gen_init_cpio.c deleted file mode 100644 index 83acd6c..0000000 --- a/abs/core-testing/gen-init-cpio/gen_init_cpio.c +++ /dev/null @@ -1,514 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Original work by Jeff Garzik - * - * External file lists, symlink, pipe and fifo support by Thayne Harbaugh - */ - -#define xstr(s) #s -#define str(s) xstr(s) - -static unsigned int offset; -static unsigned int ino = 721; - -struct file_handler { - const char *type; - int (*handler)(const char *line); -}; - -static void push_string(const char *name) -{ - unsigned int name_len = strlen(name) + 1; - - fputs(name, stdout); - putchar(0); - offset += name_len; -} - -static void push_pad (void) -{ - while (offset & 3) { - putchar(0); - offset++; - } -} - -static void push_rest(const char *name) -{ - unsigned int name_len = strlen(name) + 1; - unsigned int tmp_ofs; - - fputs(name, stdout); - putchar(0); - offset += name_len; - - tmp_ofs = name_len + 110; - while (tmp_ofs & 3) { - putchar(0); - offset++; - tmp_ofs++; - } -} - -static void push_hdr(const char *s) -{ - fputs(s, stdout); - offset += 110; -} - -static void cpio_trailer(void) -{ - char s[256]; - const char name[] = "TRAILER!!!"; - - sprintf(s, "%s%08X%08X%08lX%08lX%08X%08lX" - "%08X%08X%08X%08X%08X%08X%08X", - "070701", /* magic */ - 0, /* ino */ - 0, /* mode */ - (long) 0, /* uid */ - (long) 0, /* gid */ - 1, /* nlink */ - (long) 0, /* mtime */ - 0, /* filesize */ - 0, /* major */ - 0, /* minor */ - 0, /* rmajor */ - 0, /* rminor */ - (unsigned)strlen(name)+1, /* namesize */ - 0); /* chksum */ - push_hdr(s); - push_rest(name); - - while (offset % 512) { - putchar(0); - offset++; - } -} - -static int cpio_mkslink(const char *name, const char *target, - unsigned int mode, uid_t uid, gid_t gid) -{ - char s[256]; - time_t mtime = time(NULL); - - sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" - "%08X%08X%08X%08X%08X%08X%08X", - "070701", /* magic */ - ino++, /* ino */ - S_IFLNK | mode, /* mode */ - (long) uid, /* uid */ - (long) gid, /* gid */ - 1, /* nlink */ - (long) mtime, /* mtime */ - (unsigned)strlen(target)+1, /* filesize */ - 3, /* major */ - 1, /* minor */ - 0, /* rmajor */ - 0, /* rminor */ - (unsigned)strlen(name) + 1,/* namesize */ - 0); /* chksum */ - push_hdr(s); - push_string(name); - push_pad(); - push_string(target); - push_pad(); - return 0; -} - -static int cpio_mkslink_line(const char *line) -{ - char name[PATH_MAX + 1]; - char target[PATH_MAX + 1]; - unsigned int mode; - int uid; - int gid; - int rc = -1; - - if (5 != sscanf(line, "%" str(PATH_MAX) "s %" str(PATH_MAX) "s %o %d %d", name, target, &mode, &uid, &gid)) { - fprintf(stderr, "Unrecognized dir format '%s'", line); - goto fail; - } - rc = cpio_mkslink(name, target, mode, uid, gid); - fail: - return rc; -} - -static int cpio_mkgeneric(const char *name, unsigned int mode, - uid_t uid, gid_t gid) -{ - char s[256]; - time_t mtime = time(NULL); - - sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" - "%08X%08X%08X%08X%08X%08X%08X", - "070701", /* magic */ - ino++, /* ino */ - mode, /* mode */ - (long) uid, /* uid */ - (long) gid, /* gid */ - 2, /* nlink */ - (long) mtime, /* mtime */ - 0, /* filesize */ - 3, /* major */ - 1, /* minor */ - 0, /* rmajor */ - 0, /* rminor */ - (unsigned)strlen(name) + 1,/* namesize */ - 0); /* chksum */ - push_hdr(s); - push_rest(name); - return 0; -} - -enum generic_types { - GT_DIR, - GT_PIPE, - GT_SOCK -}; - -struct generic_type { - const char *type; - mode_t mode; -}; - -static struct generic_type generic_type_table[] = { - [GT_DIR] = { - .type = "dir", - .mode = S_IFDIR - }, - [GT_PIPE] = { - .type = "pipe", - .mode = S_IFIFO - }, - [GT_SOCK] = { - .type = "sock", - .mode = S_IFSOCK - } -}; - -static int cpio_mkgeneric_line(const char *line, enum generic_types gt) -{ - char name[PATH_MAX + 1]; - unsigned int mode; - int uid; - int gid; - int rc = -1; - - if (4 != sscanf(line, "%" str(PATH_MAX) "s %o %d %d", name, &mode, &uid, &gid)) { - fprintf(stderr, "Unrecognized %s format '%s'", - line, generic_type_table[gt].type); - goto fail; - } - mode |= generic_type_table[gt].mode; - rc = cpio_mkgeneric(name, mode, uid, gid); - fail: - return rc; -} - -static int cpio_mkdir_line(const char *line) -{ - return cpio_mkgeneric_line(line, GT_DIR); -} - -static int cpio_mkpipe_line(const char *line) -{ - return cpio_mkgeneric_line(line, GT_PIPE); -} - -static int cpio_mksock_line(const char *line) -{ - return cpio_mkgeneric_line(line, GT_SOCK); -} - -static int cpio_mknod(const char *name, unsigned int mode, - uid_t uid, gid_t gid, char dev_type, - unsigned int maj, unsigned int min) -{ - char s[256]; - time_t mtime = time(NULL); - - if (dev_type == 'b') - mode |= S_IFBLK; - else - mode |= S_IFCHR; - - sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" - "%08X%08X%08X%08X%08X%08X%08X", - "070701", /* magic */ - ino++, /* ino */ - mode, /* mode */ - (long) uid, /* uid */ - (long) gid, /* gid */ - 1, /* nlink */ - (long) mtime, /* mtime */ - 0, /* filesize */ - 3, /* major */ - 1, /* minor */ - maj, /* rmajor */ - min, /* rminor */ - (unsigned)strlen(name) + 1,/* namesize */ - 0); /* chksum */ - push_hdr(s); - push_rest(name); - return 0; -} - -static int cpio_mknod_line(const char *line) -{ - char name[PATH_MAX + 1]; - unsigned int mode; - int uid; - int gid; - char dev_type; - unsigned int maj; - unsigned int min; - int rc = -1; - - if (7 != sscanf(line, "%" str(PATH_MAX) "s %o %d %d %c %u %u", - name, &mode, &uid, &gid, &dev_type, &maj, &min)) { - fprintf(stderr, "Unrecognized nod format '%s'", line); - goto fail; - } - rc = cpio_mknod(name, mode, uid, gid, dev_type, maj, min); - fail: - return rc; -} - -/* Not marked static to keep the compiler quiet, as no one uses this yet... */ -static int cpio_mkfile(const char *name, const char *location, - unsigned int mode, uid_t uid, gid_t gid) -{ - char s[256]; - char *filebuf = NULL; - struct stat buf; - int file = -1; - int retval; - int rc = -1; - - mode |= S_IFREG; - - retval = stat (location, &buf); - if (retval) { - fprintf (stderr, "File %s could not be located\n", location); - goto error; - } - - file = open (location, O_RDONLY); - if (file < 0) { - fprintf (stderr, "File %s could not be opened for reading\n", location); - goto error; - } - - filebuf = malloc(buf.st_size); - if (!filebuf) { - fprintf (stderr, "out of memory\n"); - goto error; - } - - retval = read (file, filebuf, buf.st_size); - if (retval < 0) { - fprintf (stderr, "Can not read %s file\n", location); - goto error; - } - - sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" - "%08X%08X%08X%08X%08X%08X%08X", - "070701", /* magic */ - ino++, /* ino */ - mode, /* mode */ - (long) uid, /* uid */ - (long) gid, /* gid */ - 1, /* nlink */ - (long) buf.st_mtime, /* mtime */ - (int) buf.st_size, /* filesize */ - 3, /* major */ - 1, /* minor */ - 0, /* rmajor */ - 0, /* rminor */ - (unsigned)strlen(name) + 1,/* namesize */ - 0); /* chksum */ - push_hdr(s); - push_string(name); - push_pad(); - - fwrite(filebuf, buf.st_size, 1, stdout); - offset += buf.st_size; - push_pad(); - rc = 0; - -error: - if (filebuf) free(filebuf); - if (file >= 0) close(file); - return rc; -} - -static int cpio_mkfile_line(const char *line) -{ - char name[PATH_MAX + 1]; - char location[PATH_MAX + 1]; - unsigned int mode; - int uid; - int gid; - int rc = -1; - - if (5 != sscanf(line, "%" str(PATH_MAX) "s %" str(PATH_MAX) "s %o %d %d", name, location, &mode, &uid, &gid)) { - fprintf(stderr, "Unrecognized file format '%s'", line); - goto fail; - } - rc = cpio_mkfile(name, location, mode, uid, gid); - fail: - return rc; -} - -void usage(const char *prog) -{ - fprintf(stderr, "Usage:\n" - "\t%s \n" - "\n" - " is a file containing newline separated entries that\n" - "describe the files to be included in the initramfs archive:\n" - "\n" - "# a comment\n" - "file \n" - "dir \n" - "nod \n" - "slink \n" - "pipe \n" - "sock \n" - "\n" - " name of the file/dir/nod/etc in the archive\n" - " location of the file in the current filesystem\n" - " link target\n" - " mode/permissions of the file\n" - " user id (0=root)\n" - " group id (0=root)\n" - " device type (b=block, c=character)\n" - " major number of nod\n" - " minor number of nod\n" - "\n" - "example:\n" - "# A simple initramfs\n" - "dir /dev 0755 0 0\n" - "nod /dev/console 0600 0 0 c 5 1\n" - "dir /root 0700 0 0\n" - "dir /sbin 0755 0 0\n" - "file /sbin/kinit /usr/src/klibc/kinit/kinit 0755 0 0\n", - prog); -} - -struct file_handler file_handler_table[] = { - { - .type = "file", - .handler = cpio_mkfile_line, - }, { - .type = "nod", - .handler = cpio_mknod_line, - }, { - .type = "dir", - .handler = cpio_mkdir_line, - }, { - .type = "slink", - .handler = cpio_mkslink_line, - }, { - .type = "pipe", - .handler = cpio_mkpipe_line, - }, { - .type = "sock", - .handler = cpio_mksock_line, - }, { - .type = NULL, - .handler = NULL, - } -}; - -#define LINE_SIZE (2 * PATH_MAX + 50) - -int main (int argc, char *argv[]) -{ - FILE *cpio_list; - char line[LINE_SIZE]; - char *args, *type; - int ec = 0; - int line_nr = 0; - - if (2 != argc) { - usage(argv[0]); - exit(1); - } - - if (! (cpio_list = fopen(argv[1], "r"))) { - fprintf(stderr, "ERROR: unable to open '%s': %s\n\n", - argv[1], strerror(errno)); - usage(argv[0]); - exit(1); - } - - while (fgets(line, LINE_SIZE, cpio_list)) { - int type_idx; - size_t slen = strlen(line); - - line_nr++; - - if ('#' == *line) { - /* comment - skip to next line */ - continue; - } - - if (! (type = strtok(line, " \t"))) { - fprintf(stderr, - "ERROR: incorrect format, could not locate file type line %d: '%s'\n", - line_nr, line); - ec = -1; - break; - } - - if ('\n' == *type) { - /* a blank line */ - continue; - } - - if (slen == strlen(type)) { - /* must be an empty line */ - continue; - } - - if (! (args = strtok(NULL, "\n"))) { - fprintf(stderr, - "ERROR: incorrect format, newline required line %d: '%s'\n", - line_nr, line); - ec = -1; - } - - for (type_idx = 0; file_handler_table[type_idx].type; type_idx++) { - int rc; - if (! strcmp(line, file_handler_table[type_idx].type)) { - if ((rc = file_handler_table[type_idx].handler(args))) { - ec = rc; - fprintf(stderr, " line %d\n", line_nr); - } - break; - } - } - - if (NULL == file_handler_table[type_idx].type) { - fprintf(stderr, "unknown file type line %d: '%s'\n", - line_nr, line); - } - } - if (ec == 0) - cpio_trailer(); - - exit(ec); -} diff --git a/abs/core-testing/gettext/PKGBUILD b/abs/core-testing/gettext/PKGBUILD deleted file mode 100644 index fab83f2..0000000 --- a/abs/core-testing/gettext/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: judd -pkgname=gettext -pkgver=0.17 -pkgrel=10 -pkgdesc="GNU internationalization library" -arch=(i686 x86_64) -url="http://www.gnu.org/software/gettext" -license=('GPL') -groups=('base') -depends=('gcc-libs' 'acl') -options=(!libtool) -source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz) -md5sums=('58a2bc6d39c0ba57823034d55d65d606') - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - sed -i -e 's/libexpat.so.0/libexpat.so.1/' gettext-tools/src/x-glade.c - ./configure --prefix=/usr --enable-csharp - make || return 1 - make DESTDIR=${startdir}/pkg install -} diff --git a/abs/core-testing/ghostscript/PKGBUILD b/abs/core-testing/ghostscript/PKGBUILD deleted file mode 100644 index f4139ff..0000000 --- a/abs/core-testing/ghostscript/PKGBUILD +++ /dev/null @@ -1,79 +0,0 @@ -# $Id: PKGBUILD 73021 2010-03-21 21:20:23Z andyrtr $ -# Maintainer: AndyRTR - -pkgname=ghostscript -pkgver=8.71 -pkgrel=3 -pkgdesc="An interpreter for the PostScript language" -arch=('i686' 'x86_64') -license=('GPL3' 'custom') -depends=('libxext' 'libxt' 'libcups>=1.4.2-3' 'fontconfig>=2.8.0' 'gnutls>=2.8.5' 'cairo>=1.8.8-2' - 'jasper>=1.900.1-4' 'zlib' 'libpng>=1.4.0' 'libjpeg>=8') -makedepends=('automake' 'autoconf' 'gtk2>=2.18.6') -optdepends=('texlive-core: dvipdf' - 'gtk2: gsx') -replaces=('ghostscript-lrpng') -provides=('ghostscript-lprng') -url="http://www.ghostscript.com/" -source=(http://ghostscript.com/releases/ghostscript-${pkgver}.tar.xz - ghostscript-fPIC.patch - ghostscript-system-jasper.patch - libpng14.patch - ghostscript-pdf2dsc.patch - svn_r10890.patch) -options=('!libtool' '!makeflags') -md5sums=('5005d68f7395c2bfc4b05c1a60d9b6ba' - '1a8fcacf0005214db823225c870f093d' - '03e27cd02471ab3b642c344fa06b623e' - 'be94ee357986f7f63d1b470da5bdc99e' - 'f88f3764fc11e3ae2a86b17d2502da2f' - 'fe0888a74d7870af234ad53a2f74380a') - -build() { - cd ${srcdir}/ghostscript-${pkgver} - # force it to use system-libs - rm -rf jpeg libpng zlib jasper expat - - patch -Np1 -i ${srcdir}/libpng14.patch || return 1 - - # fix build with systems jasper - patch -Np1 -i ${srcdir}/ghostscript-system-jasper.patch || return 1 - - # fix PDF viewing with gv - from Fedora - patch -Np1 -i ${srcdir}/ghostscript-pdf2dsc.patch || return 1 - - # fix segfaults - http://bugs.archlinux.org/task/18339 - patch -Np1 -i ${srcdir}/svn_r10890.patch || return 1 - - - if [ "$CARCH" = "x86_64" ]; then - patch -Np1 -i ${srcdir}/ghostscript-fPIC.patch || return 1 - fi - - # Build IJS - cd ${srcdir}/ghostscript-${pkgver}/ijs - ./autogen.sh - ./configure --prefix=/usr --enable-shared --disable-static - make || return 1 - make -j1 DESTDIR=${pkgdir} install || return 1 - - cd .. - ./autogen.sh - ./configure --prefix=/usr --enable-dynamic --with-ijs \ - --with-jbig2dec --with-omni --with-x --with-drivers=ALL\ - --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ - --disable-compile-inits # needed for linking with system-zlib - make || return 1 - make -j1 DESTDIR=${pkgdir} \ - cups_serverroot=${pkgdir}/etc/cups \ - cups_serverbin=${pkgdir}/usr/lib/cups install soinstall - - # install a missing doc files # http://bugs.archlinux.org/task/18023 - install -m 644 ${srcdir}/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/ghostscript/$pkgver/doc/ - - mkdir -p ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/ - - # remove unwanted localized man-pages - rm -rf $pkgdir/usr/share/man/[^man1]* -} diff --git a/abs/core-testing/ghostscript/ghostscript-fPIC.patch b/abs/core-testing/ghostscript/ghostscript-fPIC.patch deleted file mode 100644 index f5b1b30..0000000 --- a/abs/core-testing/ghostscript/ghostscript-fPIC.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- ghostscript-8.60-r8112/base/lib.mak.fPIC 2007-07-10 17:03:11.000000000 +0100 -+++ ghostscript-8.60-r8112/base/lib.mak 2007-07-10 17:05:56.000000000 +0100 -@@ -874,7 +874,7 @@ - $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\ - $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\ - $(gstypes_h) -- $(GLCC) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c -+ $(GLCCSHARED) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c - - # Future replacement for gsparams.c - $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(GXERR) $(memory__h)\ -@@ -1077,7 +1077,7 @@ - - # Provide a mapping between StandardEncoding and ISOLatin1Encoding. - $(GLOBJ)gdevemap.$(OBJ) : $(GLSRC)gdevemap.c $(AK) $(std_h) -- $(GLCC) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c -+ $(GLCCSHARED) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c - - ###### Create a pseudo-"feature" for the entire graphics library. - ---- ghostscript-8.60-r8112/base/devs.mak.fPIC 2007-07-10 17:05:00.000000000 +0100 -+++ ghostscript-8.60-r8112/base/devs.mak 2007-07-10 17:05:07.000000000 +0100 -@@ -464,7 +464,7 @@ - $(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevx.$(OBJ) $(C_) $(GLSRC)gdevx.c - - $(GLOBJ)gdevxcmp.$(OBJ) : $(GLSRC)gdevxcmp.c $(GDEVX) $(math__h) -- $(GLCC) $(XINCLUDE) $(GLO_)gdevxcmp.$(OBJ) $(C_) $(GLSRC)gdevxcmp.c -+ $(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevxcmp.$(OBJ) $(C_) $(GLSRC)gdevxcmp.c - - $(GLOBJ)gdevxini.$(OBJ) : $(GLSRC)gdevxini.c $(GDEVX) $(memory__h)\ - $(gserrors_h) $(gsparamx_h) $(gxdevmem_h) $(gdevbbox_h) diff --git a/abs/core-testing/ghostscript/ghostscript-pdf2dsc.patch b/abs/core-testing/ghostscript/ghostscript-pdf2dsc.patch deleted file mode 100644 index 31b6b54..0000000 --- a/abs/core-testing/ghostscript/ghostscript-pdf2dsc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ghostscript-8.71/lib/pdf2dsc.ps.pdf2dsc ghostscript-8.71/lib/pdf2dsc.ps ---- ghostscript-8.71/lib/pdf2dsc.ps.pdf2dsc 2010-02-20 15:50:51.287734970 +0000 -+++ ghostscript-8.71/lib/pdf2dsc.ps 2010-02-20 15:51:02.902609964 +0000 -@@ -116,7 +116,7 @@ systemdict /.setsafe known { .setsafe } - DSCfile PDFname write==only - ( \(r\) file { DELAYSAFER { .setsafe } if } stopped pop\n) puts - ( pdfopen begin\n) puts -- ( copy_trailer_attrs\n) puts -+ ( process_trailer_attrs\n) puts - (%%EndSetup\n) puts - - /.hasPageLabels false def % see "Page Labels" in the PDF Reference diff --git a/abs/core-testing/ghostscript/ghostscript-system-jasper.patch b/abs/core-testing/ghostscript/ghostscript-system-jasper.patch deleted file mode 100644 index 444b760..0000000 --- a/abs/core-testing/ghostscript/ghostscript-system-jasper.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up ghostscript-8.64/base/sjpx.c.system-jasper ghostscript-8.64/base/sjpx.c ---- ghostscript-8.64/base/sjpx.c.system-jasper 2008-08-21 00:22:49.000000000 +0100 -+++ ghostscript-8.64/base/sjpx.c 2009-02-04 11:35:56.000000000 +0000 -@@ -34,14 +34,6 @@ static void s_jpxd_set_defaults(stream_s - private_st_jpxd_state(); /* creates a gc object for our state, - defined in sjpx.h */ - --/* error reporting callback for the jpx library */ --static void --s_jpx_jas_error_cb(jas_error_t err, char *msg) --{ -- dprintf2("jasper (code %d) %s", (int)err, msg); --} -- -- - /* initialize the steam. - this involves allocating the stream and image structures, and - initializing the decoder. -@@ -59,7 +51,6 @@ s_jpxd_init(stream_state * ss) - } - - status = jas_init(); -- jas_set_error_cb(s_jpx_jas_error_cb); - #ifdef JPX_DEBUG - /* raise the error reporting threshold from the default (0) */ - jas_setdbglevel(1); diff --git a/abs/core-testing/ghostscript/libpng14.patch b/abs/core-testing/ghostscript/libpng14.patch deleted file mode 100644 index 7ee08af..0000000 --- a/abs/core-testing/ghostscript/libpng14.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur ghostscript-8.70.orig/base/configure.ac ghostscript-8.70/base/configure.ac ---- ghostscript-8.70.orig/base/configure.ac 2009-07-27 19:59:50.000000000 +0300 -+++ ghostscript-8.70/base/configure.ac 2010-01-17 02:20:52.000000000 +0200 -@@ -402,7 +402,7 @@ - PNGDEVS="$PNGDEVS_ALL" - else - AC_MSG_RESULT([no]) -- AC_CHECK_LIB(png, png_check_sig, [ -+ AC_CHECK_LIB(png, png_sig_cmp, [ - AC_CHECK_HEADERS(png.h, [ - SHARE_LIBPNG=1 - PNGDEVS="$PNGDEVS_ALL" -diff -Nur ghostscript-8.70.orig/jbig2dec/configure.ac ghostscript-8.70/jbig2dec/configure.ac ---- ghostscript-8.70.orig/jbig2dec/configure.ac 2009-05-29 09:48:44.000000000 +0300 -+++ ghostscript-8.70/jbig2dec/configure.ac 2010-01-17 02:21:25.000000000 +0200 -@@ -34,7 +34,7 @@ - fi - dnl libpng requires pow() which may be in libm - AC_SEARCH_LIBS([pow], [m]) -- AC_CHECK_LIB([png], [png_check_sig], [ -+ AC_CHECK_LIB([png], [png_sig_cmp], [ - AC_CHECK_LIB([z], [deflate], [ - AC_DEFINE(HAVE_LIBPNG, 1, [Define if libpng is available (-lpng)]) - LIBS="-lpng -lz $LIBS" diff --git a/abs/core-testing/ghostscript/svn_r10890.patch b/abs/core-testing/ghostscript/svn_r10890.patch deleted file mode 100644 index afcbf47..0000000 --- a/abs/core-testing/ghostscript/svn_r10890.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 6d26e9b1c38d8c0f0ab4af42c513cb23f3ae1656 Mon Sep 17 00:00:00 2001 -From: till -Date: Tue, 9 Mar 2010 16:35:06 +0000 -Subject: [PATCH] Fixes on CUPS Raster output device: - - Fixed memory reallocation on bitmap size change. Reallocation is not only - needed when dimendions and margins change, but also when the color depth - changes. Fixes bugs #691029 and #691108. - - Fixed arrayoption() macro in cups_put_params() function. Array values did - not get actually set in cups.header data structure. Bug only showed via - a compiler warning. - - Silenced compiler warning by presetting c0..c3 in cups_map_cmyk() to zero. - -git-svn-id: http://svn.ghostscript.com/ghostscript/trunk/gs@10890 a1074d23-0009-0410-80fe-cf8c14f379e6 ---- - cups/gdevcups.c | 32 +++++++++++++++++++++++--------- - 1 files changed, 23 insertions(+), 9 deletions(-) - -diff --git a/cups/gdevcups.c b/cups/gdevcups.c -index 551b806..4000abf 100644 ---- a/cups/gdevcups.c -+++ b/cups/gdevcups.c -@@ -975,7 +975,8 @@ cups_map_cmyk(gx_device *pdev, /* I - Device info */ - frac k, /* I - Black value */ - frac *out) /* O - Device colors */ - { -- int c0, c1, c2, c3; /* Temporary color values */ -+ int c0 = 0, c1 = 0, -+ c2 = 0, c3 = 0; /* Temporary color values */ - float rr, rg, rb, /* Real RGB colors */ - ciex, ciey, ciez, /* CIE XYZ colors */ - ciey_yn, /* Normalized luminance */ -@@ -2703,9 +2704,13 @@ cups_put_params(gx_device *pdev, /* I - Device info */ - int color_set; /* Were the color attrs set? */ - gdev_prn_space_params sp; /* Space parameter data */ - int width, /* New width of page */ -- height; /* New height of page */ -+ height, /* New height of page */ -+ colorspace, /* New color space */ -+ bitspercolor; /* New bits per color */ - static int width_old = 0, /* Previous width */ -- height_old = 0; /* Previous height */ -+ height_old = 0, /* Previous height */ -+ colorspace_old = 0,/* Previous color space */ -+ bitspercolor_old = 0;/* Previous bits per color */ - ppd_attr_t *backside = NULL, - *backsiderequiresflippedmargins = NULL; - float swap; -@@ -2800,9 +2805,10 @@ cups_put_params(gx_device *pdev, /* I - Device info */ - else if (code == 0) \ - { \ - dprintf1("DEBUG: Setting %s to", sname); \ -- for (i = 0; i < count; i ++) \ -- dprintf1(" %d", (unsigned)(arrayval.data[i])); \ -- cups->header.name[i] = (unsigned)arrayval.data[i]; \ -+ for (i = 0; i < count; i ++) { \ -+ dprintf1(" %d", (unsigned)(arrayval.data[i])); \ -+ cups->header.name[i] = (unsigned)(arrayval.data[i]); \ -+ } \ - dprintf("...\n"); \ - } - -@@ -3243,23 +3249,31 @@ cups_put_params(gx_device *pdev, /* I - Device info */ - } - #endif /* CUPS_RASTER_SYNCv1 */ - -+ colorspace = cups->header.cupsColorSpace; -+ bitspercolor = cups->header.cupsBitsPerColor; -+ - /* - * Don't reallocate memory unless the device has been opened... - * Also reallocate only if the size has actually changed... - */ - -- if (pdev->is_open && (width != width_old || height != height_old)) -+ if (pdev->is_open && -+ (width != width_old || height != height_old || -+ colorspace != colorspace_old || bitspercolor != bitspercolor_old)) - { - - width_old = width; - height_old = height; -+ colorspace_old = colorspace; -+ bitspercolor_old = bitspercolor; - - /* - * Device is open and size has changed, so reallocate... - */ - -- dprintf4("DEBUG2: Reallocating memory, [%.0f %.0f] = %dx%d pixels...\n", -- pdev->MediaSize[0], pdev->MediaSize[1], width, height); -+ dprintf6("DEBUG2: Reallocating memory, [%.0f %.0f] = %dx%d pixels, color space: %d, bits per color: %d...\n", -+ pdev->MediaSize[0], pdev->MediaSize[1], width, height, -+ colorspace, bitspercolor); - - sp = ((gx_device_printer *)pdev)->space_params; - --- -1.6.6.1 - diff --git a/abs/core-testing/giblib/PKGBUILD b/abs/core-testing/giblib/PKGBUILD deleted file mode 100644 index 413711c..0000000 --- a/abs/core-testing/giblib/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: arjan -# Contributor: Tom Newsom - -pkgname=giblib -pkgver=1.2.4 -pkgrel=3 -pkgdesc="Giblib is a library that feh uses as a wrapper to imlib2" -depends=('imlib2' 'libxext' 'freetype2') -#source=(http://linuxbrit.co.uk/downloads/$pkgname-$pkgver.tar.gz) -source=(http://ftp.gva.es/mirror/debian/pool/main/g/giblib/giblib_1.2.4.orig.tar.gz) -url="http://linuxbrit.co.uk/giblib/" - arch=('i686') -build() { -cd $startdir/src/$pkgname-$pkgver.orig -./configure --prefix=/usr -make || return 1 -make prefix=$startdir/pkg/usr install -find $startdir/pkg -name '*.la' -exec rm {} \; -} diff --git a/abs/core-testing/giflib/PKGBUILD b/abs/core-testing/giflib/PKGBUILD deleted file mode 100644 index ef32328..0000000 --- a/abs/core-testing/giflib/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Jan de Groot -# Contributor: Baptiste Daroussin -# Contributor: Grigorios Bouzakis -# Contributor: mightyjaym - -pkgname=giflib -pkgver=4.1.6 -pkgrel=4 -pkgdesc="A library for reading and writing gif images" -url="http://sourceforge.net/projects/giflib/" -arch=('i686' 'x86_64') -license=('MIT') -depends=('libx11' 'libsm') -provides=("libungif=${pkgver}") -conflicts=('libungif') -replaces=('libungif') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2) -md5sums=('7125644155ae6ad33dbc9fc15a14735f') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 - - # libungif compatibility - instructions taken from Redhat specfile - MAJOR=`echo ${pkgver} | sed 's/\([0-9]\+\)\..*/\1/'` - gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.${pkgver} || return 1 - install -m755 libungif.so.${pkgver} ${pkgdir}/usr/lib/ || return 1 - ln -sf libungif.so.${pkgver} ${pkgdir}/usr/lib/libungif.so.4 || return 1 - ln -sf libungif.so.4 ${pkgdir}/usr/lib/libungif.so || return 1 -} diff --git a/abs/core-testing/git/ChangeLog b/abs/core-testing/git/ChangeLog deleted file mode 100644 index 8ed0884..0000000 --- a/abs/core-testing/git/ChangeLog +++ /dev/null @@ -1,36 +0,0 @@ -Simple version bumps are ommitted from the following ChangeLog. - -2010-06-29 Dan McGee - Version 1.7.1.1-1 - * Add emacs completion files (FS#17968) - * Add git-daemon RC scripts (FS#19291) - -2009-06-05 Dan McGee - Version 1.6.3.2-1 - * Remove gitweb from /usr/share; it needs customization to be helpful - * Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683) - -2008-09-14 Dan McGee - Version 1.6.0.2-1 - * Moved optional depends from install file to optdepends array - -2008-06-15 Dan McGee - Version 1.5.6-1 - * Removed 'cpio' dependency, clone is now a builtin and no longer needs it - -2008-02-02 Dan McGee - Version 1.5.4-1 - * Upstream version 1.5.4 - * Enable pthreads support in pack-objects. To use, set the pack.threads - git config option. Read manpages of pack-objects and config for more - details. - * Changelog added (with entries going back a bit). - -2008-01-28 Kevin Piche - Version 1.5.3.7-2 - * Updated for new perl policy (vendor dirs) - * Change license to GPL2 - -2007-11-01 Eric Belanger - Version 1.5.3.5-2 - * Fix Perl module location diff --git a/abs/core-testing/git/PKGBUILD b/abs/core-testing/git/PKGBUILD deleted file mode 100644 index 5b281a2..0000000 --- a/abs/core-testing/git/PKGBUILD +++ /dev/null @@ -1,78 +0,0 @@ -# $Id: PKGBUILD 90230 2010-09-09 13:16:45Z dan $ -# Maintainer: Dan McGee - -pkgname=git -pkgver=1.7.2.3 -pkgrel=2 -pkgdesc="the fast distributed version control system" -arch=(i686 x86_64) -url="http://git-scm.com/" -license=('GPL2') -depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.10.0') -makedepends=('python2') -optdepends=('tk: gitk and git gui' - 'perl-libwww: git svn' - 'perl-term-readkey: git svn' - 'perl-net-smtp-ssl: git send-email TLS support' - 'subversion: git svn' - 'cvsps: git cvsimport') -replaces=('git-core') -provides=('git-core') -backup=('etc/conf.d/git-daemon.conf') -source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2" \ - "http://kernel.org/pub/software/scm/git/git-manpages-${pkgver}.tar.bz2" - git-daemon - git-daemon.conf) - -build() { - export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr gitexecdir=/usr/lib/git-core || return 1 -} - -package() { - export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr gitexecdir=/usr/lib/git-core \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ - INSTALLDIRS=vendor DESTDIR=${pkgdir} install || return 1 - - # bash completion - mkdir -p $pkgdir/etc/bash_completion.d/ - install -m644 ./contrib/completion/git-completion.bash $pkgdir/etc/bash_completion.d/git || return 1 - - # more contrib stuff - cp -a ./contrib $pkgdir/usr/share/git/ || return 1 - - # scripts are for python 2.x - find "$pkgdir" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' - sed -i 's|#!/usr/bin/python|#!/usr/bin/env python2|' "$pkgdir"/usr/lib/git-core/git-remote-testgit - - # emacs interface - mkdir -p $pkgdir/usr/share/emacs/site-lisp - mv $pkgdir/usr/share/git/emacs $pkgdir/usr/share/emacs/site-lisp/git - rm $pkgdir/usr/share/emacs/site-lisp/git/.gitignore - - # how 'bout some manpages? - for mansect in man1 man5 man7; do - for manpage in $srcdir/$mansect/*; do - install -D -m644 $manpage $pkgdir/usr/share/man/$mansect/$(basename $manpage) - done - done - - # remove perllocal.pod, .packlist, and empty directories. - rm -rf $pkgdir/usr/lib/perl5 - - # git daemon script - install -D -m755 $srcdir/git-daemon $pkgdir/etc/rc.d/git-daemon - install -D -m644 $srcdir/git-daemon.conf $pkgdir/etc/conf.d/git-daemon.conf -} - -md5sums=('d88c06f6442156686deb4b4fbab0954c' - '2ef8d3959c832347c29885627ebc0682' - 'd777ff1a239b3d810dcf5d89f9d894af' - '9d065134210aa0dd3f2b40d12d915040') -sha256sums=('6139ec31d0a79cae04f469e73cc1f912162bb8f84ef7621ecc8630989fc81ba1' - '87e00245e10472ee5acdd75bb5a6e2e89c12638b498e0df9edca6201439d47d7' - 'd2741714a477029ca1ed63f8584040bcba6a53b2332028f9005feef4ae500113' - '6e1475974fae315c55da344c0527923061ad7d9478d39396d147aea497f501b7') diff --git a/abs/core-testing/git/git-daemon b/abs/core-testing/git/git-daemon deleted file mode 100644 index 83e41a3..0000000 --- a/abs/core-testing/git/git-daemon +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash - -daemon_bin="/usr/lib/git-core/git-daemon" -daemon_name=$(basename $daemon_bin) -PIDF="/var/run/$daemon_name.pid" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f $PIDF ] && rm -f $PIDF - # RUN - $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS $GIT_REPO - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > $PIDF - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f $PIDF &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/abs/core-testing/git/git-daemon.conf b/abs/core-testing/git/git-daemon.conf deleted file mode 100644 index a183733..0000000 --- a/abs/core-testing/git/git-daemon.conf +++ /dev/null @@ -1,4 +0,0 @@ -# path to git repositories served -GIT_REPO="/srv/git/" -# see `man git-daemon` for all available options -GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO" diff --git a/abs/core-testing/glib/PKGBUILD b/abs/core-testing/glib/PKGBUILD deleted file mode 100644 index 42f4420..0000000 --- a/abs/core-testing/glib/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Eric Belanger -# Contributor: dorphell - -pkgname=glib -pkgver=1.2.10 -pkgrel=10 -pkgdesc="Common C routines used by Gtk+ and other libs" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -license=('LGPL') -depends=('glibc') -options=('!libtool' '!emptydirs' '!docs' ) -source=(ftp://ftp.gtk.org/pub/gtk/v1.2/$pkgname-$pkgver.tar.gz \ - gcc340.patch \ - aclocal-fixes.patch) -md5sums=('6fe30dad87c77b91b632def29dd69ef9' '877b3330e822a4be69a0f8a8c268cfd7'\ - 'e52c4b88427b9785bb8049dbdc9ff6fb') -sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa'\ - 'a2cc224a66aeffdcac16ebd9e8af18143cf54918'\ - 'ae4438cf56c0c9264ee36f6973fb445f9a820be0') - -build() { - cd $startdir/src/$pkgname-$pkgver - patch -Np1 -i ../gcc340.patch || return 1 - patch -Np0 -i ../aclocal-fixes.patch || return 1 - - #Arch64 fixes --build/host - ./configure --prefix=/usr #--host=i686-pc-linux-gnu - make || return 1 - make DESTDIR=$startdir/pkg install -} diff --git a/abs/core-testing/glib/__changelog b/abs/core-testing/glib/__changelog deleted file mode 100644 index f2439db..0000000 --- a/abs/core-testing/glib/__changelog +++ /dev/null @@ -1 +0,0 @@ -added !emptydir !docs to options diff --git a/abs/core-testing/glib/aclocal-fixes.patch b/abs/core-testing/glib/aclocal-fixes.patch deleted file mode 100644 index b064074..0000000 --- a/abs/core-testing/glib/aclocal-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glib.m4.orig 2006-03-05 13:13:24.000000000 +0000 -+++ glib.m4 2006-03-05 13:13:35.000000000 +0000 -@@ -5,7 +5,7 @@ - dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or - dnl gthread is specified in MODULES, pass to glib-config - dnl --AC_DEFUN(AM_PATH_GLIB, -+AC_DEFUN([AM_PATH_GLIB], - [dnl - dnl Get the cflags and libraries from the glib-config script - dnl diff --git a/abs/core-testing/glib/gcc340.patch b/abs/core-testing/glib/gcc340.patch deleted file mode 100644 index 941111a..0000000 --- a/abs/core-testing/glib/gcc340.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur glib-1.2.10.orig/glib.h glib-1.2.10/glib.h ---- glib-1.2.10.orig/glib.h 2001-02-27 04:44:38.000000000 +0100 -+++ glib-1.2.10/glib.h 2004-05-27 15:50:32.436527848 +0200 -@@ -271,8 +271,10 @@ - - /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with - * macros, so we can refer to them as strings unconditionally. -+ * -+ * Unfortunately these are _not_ treated as strings anymore in GCC3.4. - */ --#ifdef __GNUC__ -+#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4) - #define G_GNUC_FUNCTION __FUNCTION__ - #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ - #else /* !__GNUC__ */ diff --git a/abs/core-testing/glib2/PKGBUILD b/abs/core-testing/glib2/PKGBUILD deleted file mode 100644 index 32cf552..0000000 --- a/abs/core-testing/glib2/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 79346 2010-05-03 10:44:26Z ibiru $ -# Maintainer: Jan de Groot - -pkgname=glib2 -pkgver=2.24.1 -pkgrel=1 -pkgdesc="Common C routines used by GTK+ 2.4 and other libs" -url="http://www.gtk.org/" -arch=(i686 x86_64) -license=('LGPL') -depends=('pcre>=8.02') -makedepends=('pkgconfig') -options=('!libtool' '!docs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-${pkgver}.tar.bz2 - glib2.sh - glib2.csh) -sha256sums=('014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04' - '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' - '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') - -build() { - cd "${srcdir}/glib-${pkgver}" - ./configure --prefix=/usr --enable-static --enable-shared \ - --with-pcre=system --disable-fam || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - install -d "${pkgdir}/etc/profile.d" - install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/" || return 1 - install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/" || return 1 - - chmod 755 ${pkgdir}/usr/bin/gtester-report || return 1 -} diff --git a/abs/core-testing/glib2/gkeyfile-bool-nocase.patch b/abs/core-testing/glib2/gkeyfile-bool-nocase.patch deleted file mode 100644 index 133f135..0000000 --- a/abs/core-testing/glib2/gkeyfile-bool-nocase.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: glib/gkeyfile.c -=================================================================== ---- glib/gkeyfile.c (revision 5714) -+++ glib/gkeyfile.c (working copy) -@@ -3639,9 +3639,9 @@ - { - gchar *value_utf8; - -- if (strcmp (value, "true") == 0 || strcmp (value, "1") == 0) -+ if (g_ascii_strcasecmp (value, "true") == 0 || strcmp (value, "1") == 0) - return TRUE; -- else if (strcmp (value, "false") == 0 || strcmp (value, "0") == 0) -+ else if (g_ascii_strcasecmp (value, "false") == 0 || strcmp (value, "0") == 0) - return FALSE; - - value_utf8 = _g_utf8_make_valid (value); diff --git a/abs/core-testing/glib2/glib2.csh b/abs/core-testing/glib2/glib2.csh deleted file mode 100644 index 7aa3a2f..0000000 --- a/abs/core-testing/glib2/glib2.csh +++ /dev/null @@ -1 +0,0 @@ -setenv G_BROKEN_FILENAMES 1 diff --git a/abs/core-testing/glib2/glib2.sh b/abs/core-testing/glib2/glib2.sh deleted file mode 100644 index 96a056e..0000000 --- a/abs/core-testing/glib2/glib2.sh +++ /dev/null @@ -1 +0,0 @@ -export G_BROKEN_FILENAMES=1 diff --git a/abs/core-testing/glibc/PKGBUILD b/abs/core-testing/glibc/PKGBUILD deleted file mode 100644 index 673951b..0000000 --- a/abs/core-testing/glibc/PKGBUILD +++ /dev/null @@ -1,138 +0,0 @@ -# $Id: PKGBUILD 87193 2010-08-11 00:55:29Z allan $ -# Maintainer: Jan de Groot -# Maintainer: Allan McRae - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: valgrind requires rebuilt with each new glibc version - -pkgname=glibc -pkgver=2.12.1 -pkgrel=1 -_glibcdate=20100811 -pkgdesc="GNU C Library" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/libc" -license=('GPL' 'LGPL') -groups=('base') -depends=('linux-api-headers>=2.6.34' 'tzdata') -makedepends=('gcc>=4.4') -replaces=('glibc-xen') -backup=(etc/locale.gen - etc/nscd.conf) -options=('!strip') -install=glibc.install -source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz - glibc-2.10-dont-build-timezone.patch - glibc-2.10-bz4781.patch - glibc-__i686.patch - nscd - locale.gen.txt - locale-gen) -md5sums=('3f0d64de5a9fc5614d8acc0f1d5846ed' - '4dadb9203b69a3210d53514bb46f41c3' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'b587ee3a70c9b3713099295609afde49' - '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') - -mksource() { - git clone git://sourceware.org/git/glibc.git - pushd glibc - git checkout -b glibc-2.12-arch origin/release/2.12/master - popd - tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/* -} - -build() { - cd ${srcdir}/glibc - - # timezone data is in separate package (tzdata) - patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 - patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 - # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html - patch -Np1 -i ${srcdir}/glibc-__i686.patch - - install -dm755 ${pkgdir}/etc - touch ${pkgdir}/etc/ld.so.conf - - mkdir glibc-build - cd glibc-build - - if [[ ${CARCH} = "i686" ]]; then - # Hack to fix NPTL issues with Xen, only required on 32bit platforms - export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" - fi - - echo "slibdir=/lib" >> configparms - - ../configure --prefix=/usr \ - --enable-add-ons=nptl,libidn --without-cvs \ - --enable-kernel=2.6.18 --disable-profile \ - --with-headers=/usr/include --libexecdir=/usr/lib \ - --enable-bind-now --with-tls --with-__thread \ - --libdir=/usr/lib --without-gd --disable-multi-arch - - make -} - -package() { - cd ${srcdir}/glibc/glibc-build - make install_root=${pkgdir} install - - # provided by kernel-headers - rm ${pkgdir}/usr/include/scsi/scsi.h - - rm ${pkgdir}/etc/ld.so.conf - - install -dm755 ${pkgdir}/etc/rc.d - install -dm755 ${pkgdir}/usr/sbin - install -dm755 ${pkgdir}/usr/lib/locale - install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf - install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd - install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin - - sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf - - # create /etc/locale.gen - install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen - sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED - sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED - sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED - cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen - sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen - - if [[ ${CARCH} = "x86_64" ]]; then - # fix for the linker - sed -i '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' ${pkgdir}/usr/bin/ldd - #Comply with multilib binaries, they look for the linker in /lib64 - mkdir ${pkgdir}/lib64 - cd ${pkgdir}/lib64 - ln -v -s ../lib/ld* . - fi - - # manually strip files as stripping libpthread-*.so and libthread_db.so - # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks - # valgrind on x86_64 - - cd $pkgdir - strip $STRIP_BINARIES sbin/{ldconfig,sln} \ - usr/bin/{gencat,getconf,getent,iconv,locale} \ - usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \ - usr/lib/getconf/* \ - usr/sbin/{iconvconfig,nscd,rpcinfo} - [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 - - strip $STRIP_STATIC usr/lib/*.a \ - lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so - - strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \ - lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ - lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ - lib/{libmemusage,libpcprofile,libSegFault}.so \ - usr/lib/{pt_chown,gconv/*.so} -} diff --git a/abs/core-testing/glibc/glibc-2.10-bz4781.patch b/abs/core-testing/glibc/glibc-2.10-bz4781.patch deleted file mode 100644 index cf1a97a..0000000 --- a/abs/core-testing/glibc/glibc-2.10-bz4781.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -120,9 +120,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (eip); - /* Note: %esi is zero. */ - movl %esi,%ebp /* terminate the stack frame */ - #ifdef RESET_PID -@@ -155,7 +152,6 @@ - jmp L(haspid) - .previous - #endif -- cfi_endproc; - - cfi_startproc - PSEUDO_END (BP_SYM (__clone)) -diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -89,9 +89,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (rip); - /* Clear the frame pointer. The ABI suggests this be done, to mark - the outermost frame obviously. */ - xorl %ebp, %ebp -@@ -116,7 +113,6 @@ - /* Call exit with return value from function call. */ - movq %rax, %rdi - call HIDDEN_JUMPTARGET (_exit) -- cfi_endproc; - - cfi_startproc; - PSEUDO_END (BP_SYM (__clone)) diff --git a/abs/core-testing/glibc/glibc-2.10-dont-build-timezone.patch b/abs/core-testing/glibc/glibc-2.10-dont-build-timezone.patch deleted file mode 100644 index d3abeff..0000000 --- a/abs/core-testing/glibc/glibc-2.10-dont-build-timezone.patch +++ /dev/null @@ -1,13 +0,0 @@ -timezone data has been split into the package sys-libs/timezone-data - ---- glibc-2.4/Makeconfig -+++ glibc-2.4/Makeconfig -@@ -931,7 +931,7 @@ - stdlib stdio-common libio malloc string wcsmbs time dirent \ - grp pwd posix io termios resource misc socket sysvipc gmon \ - gnulib iconv iconvdata wctype manual shadow gshadow po argp \ -- crypt nss localedata timezone rt conform debug \ -+ crypt nss localedata rt conform debug \ - $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) - - ifndef avoid-generated diff --git a/abs/core-testing/glibc/glibc-__i686.patch b/abs/core-testing/glibc/glibc-__i686.patch deleted file mode 100644 index 28d5dd4..0000000 --- a/abs/core-testing/glibc/glibc-__i686.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile ---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 -+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 -@@ -1,6 +1,7 @@ - # The mpn functions need a #define for asm syntax flavor. --# Every i386 port in use uses gas syntax (I think). --asm-CPPFLAGS += -DGAS_SYNTAX -+# Every i386 port in use uses gas syntax (I think). Don't replace -+# __i686 in __i686.get_pc_thunk.bx. -+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 - - # The i386 `long double' is a distinct type we support. - long-double-fcts = yes diff --git a/abs/core-testing/glibc/glibc.install b/abs/core-testing/glibc/glibc.install deleted file mode 100644 index 5e15c81..0000000 --- a/abs/core-testing/glibc/glibc.install +++ /dev/null @@ -1,21 +0,0 @@ -infodir=/usr/share/info -filelist=(libc.info libc.info-1 libc.info-2 libc.info-3 libc.info-4 libc.info-5 libc.info-6 libc.info-7 - libc.info-8 libc.info-9 libc.info-10 libc.info-11) - -post_upgrade() { - sbin/ldconfig -r . - [ -x sbin/init ] && sbin/init u - usr/sbin/locale-gen - - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/abs/core-testing/glibc/locale-gen b/abs/core-testing/glibc/locale-gen deleted file mode 100755 index 5aff344..0000000 --- a/abs/core-testing/glibc/locale-gen +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -LOCALEGEN=/etc/locale.gen -LOCALES=/usr/share/i18n/locales -if [ -n "$POSIXLY_CORRECT" ]; then - unset POSIXLY_CORRECT -fi - - -[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; - -# Remove all old locale dir and locale-archive before generating new -# locale data. -rm -rf /usr/lib/locale/* || true - -umask 022 - -is_entry_ok() { - if [ -n "$locale" -a -n "$charset" ] ; then - true - else - echo "error: Bad entry '$locale $charset'" - false - fi -} - -echo "Generating locales..." -while read locale charset; do \ - case $locale in \#*) continue;; "") continue;; esac; \ - is_entry_ok || continue - echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ - echo -n ".$charset"; \ - echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ - echo -n '...'; \ - if [ -f $LOCALES/$locale ]; then input=$locale; else \ - input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ - localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ - echo ' done'; \ -done < $LOCALEGEN -echo "Generation complete." diff --git a/abs/core-testing/glibc/locale.gen.txt b/abs/core-testing/glibc/locale.gen.txt deleted file mode 100644 index ccdd817..0000000 --- a/abs/core-testing/glibc/locale.gen.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Configuration file for locale-gen -# -# lists of locales that are to be generated by the locale-gen command. -# -# Each line is of the form: -# -# -# -# where is one of the locales given in /usr/share/i18n/locales -# and is one of the character sets listed in /usr/share/i18n/charmaps -# -# Examples: -# en_US ISO-8859-1 -# en_US.UTF-8 UTF-8 -# de_DE ISO-8859-1 -# de_DE@euro ISO-8859-15 -# -# The locale-gen command will generate all the locales, -# placing them in /usr/lib/locale. -# -# A list of supported locales is included in this file. -# Uncomment the ones you need. -# diff --git a/abs/core-testing/glibc/nscd b/abs/core-testing/glibc/nscd deleted file mode 100755 index 8b14f2a..0000000 --- a/abs/core-testing/glibc/nscd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/nscd` -case "$1" in - start) - stat_busy "Starting nscd" - # create necessary directories if they don't already exist - mkdir -p /var/run/nscd /var/db/nscd 2>/dev/null - # remove stale files - rm -f /var/db/nscd/* /var/run/nscd/* 2>/dev/null - [ -z "$PID" ] && /usr/sbin/nscd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon nscd - stat_done - fi - ;; - stop) - stat_busy "Stopping nscd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon nscd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/core-testing/glproto/PKGBUILD b/abs/core-testing/glproto/PKGBUILD deleted file mode 100644 index fe75df2..0000000 --- a/abs/core-testing/glproto/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Alexander Baldeck -# Contributor: Jan de Groot -pkgname=glproto -pkgver=1.4.9 -pkgrel=1 -pkgdesc="X11 OpenGL extension wire protocol" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -source=(http://xorg.freedesktop.org/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 -} - -md5sums=('e60951628422663e60faeb400f27bac1') diff --git a/abs/core-testing/gmp/PKGBUILD b/abs/core-testing/gmp/PKGBUILD deleted file mode 100644 index 0eee2df..0000000 --- a/abs/core-testing/gmp/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 72634 2010-03-19 02:57:15Z allan $ -# Maintainer: Allan McRae -# Maintainer: Jan de Groot - -pkgname=gmp -pkgver=5.0.1 -pkgrel=1 -pkgdesc="A free library for arbitrary precision arithmetic" -arch=('i686' 'x86_64') -url="http://gmplib.org/" -depends=('gcc-libs' 'sh') -license=('LGPL3') -options=(!libtool) -install=gmp.install -source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2) -md5sums=('6bac6df75c192a13419dfd71d19240a7') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - [ "${CARCH}" = "i686" ] && export ABI="32" - ./configure --build=$CHOST \ - --prefix=/usr --infodir=/usr/share/info \ - --enable-cxx || return 1 - make || return 1 - make check || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/abs/core-testing/gmp/gmp.install b/abs/core-testing/gmp/gmp.install deleted file mode 100644 index 1c31ab3..0000000 --- a/abs/core-testing/gmp/gmp.install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=/usr/share/info -info_files=(gmp.info gmp.info-1 gmp.info-2) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/abs/core-testing/gnutls/PKGBUILD b/abs/core-testing/gnutls/PKGBUILD deleted file mode 100644 index ea0c443..0000000 --- a/abs/core-testing/gnutls/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 72984 2010-03-21 17:04:24Z jgc $ -# Maintainer: Jan de Groot - -pkgname=gnutls -pkgver=2.8.6 -pkgrel=4 -pkgdesc="A library which provides a secure layer over a reliable transport layer" -arch=(i686 x86_64) -license=('GPL3' 'LGPL') -url="http://www.gnu.org/software/gnutls/" -install=gnutls.install -options=('libtool') -depends=('gcc-libs>=4.4.3' 'libtasn1>=2.6' 'readline>=6.0' 'zlib' 'libgcrypt>=1.4.5' 'texinfo') -source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2) -md5sums=('eb0a6d7d3cb9ac684d971c14f9f6d3ba') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-zlib --disable-guile || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/abs/core-testing/gnutls/gnutls.install b/abs/core-testing/gnutls/gnutls.install deleted file mode 100644 index b9a5bae..0000000 --- a/abs/core-testing/gnutls/gnutls.install +++ /dev/null @@ -1,18 +0,0 @@ -infodir=/usr/share/info -filelist=(gnutls.info gnutls.info-1 gnutls.info-2 gnutls.info-3) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/abs/core-testing/gobject-introspection/PKGBUILD b/abs/core-testing/gobject-introspection/PKGBUILD deleted file mode 100644 index 179c5bf..0000000 --- a/abs/core-testing/gobject-introspection/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 81938 2010-06-07 11:01:46Z jgc $ -# Maintainer: Jan de Groot -pkgname=gobject-introspection -pkgver=0.6.14 -pkgrel=1 -pkgdesc="Introspection system for GObject-based libraries" -url="http://live.gnome.org/GObjectInstrospection" -arch=('x86_64' 'i686') -license=('LGPL' 'GPL') -depends=('libffi>=3.0.8' 'glib2>=2.24.1' 'python' 'cairo>=1.8.10') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c4713bcbcebb06861738a8f630ab05289666e631f42f7abbf2e836978db7eba6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/abs/core-testing/gperf/PKGBUILD b/abs/core-testing/gperf/PKGBUILD deleted file mode 100644 index 0521eb9..0000000 --- a/abs/core-testing/gperf/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -#$Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -#Maintainer: Jan de Groot - -pkgname=gperf -pkgver=3.0.3 -pkgrel=1 -pkgdesc="Perfect hash function generator." -arch=('x86_64' 'i686') -url="http://www.gnu.org/software/gperf/" -license=('GPL') -depends=('gcc-libs') -source=(ftp://ftp.gnu.org/gnu/gperf/${pkgname}-${pkgver}.tar.gz) -md5sums=('cc20e58975a38075440423c8fb85fd00') - -build() { - cd $startdir/src/${pkgname}-${pkgver} - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${startdir}/pkg install -} diff --git a/abs/core-testing/gpm/ChangeLog b/abs/core-testing/gpm/ChangeLog deleted file mode 100644 index 847bb4d..0000000 --- a/abs/core-testing/gpm/ChangeLog +++ /dev/null @@ -1,39 +0,0 @@ -2009-12-05 Eric Belanger - - * gpm 1.20.6-5 - * Fixed gpm.sh such that disable-paste is only run when gpm is running - -2009-12-05 Eric Belanger - - * gpm 1.20.6-4 - * Added profile for extra security on multi-user-console (close FS#17243) - * Removed the need of texinfo depends - -2009-09-20 Eric Belanger - - * gpm 1.20.6-3 - * Updated /dev/psaux to /dev/input/mice in stock config (close FS#16289) - -2009-09-20 Eric Belanger - - * gpm 1.20.6-2 - * Updated stock config and fixed rc.d script (close FS#16126) - * Removed array in install scriptlet - -2009-02-09 Eric Belanger - - * gpm 1.20.6-1 - * Upstream update - * Added info file support - -2008-06-16 Eric Belanger - - * gpm 1.20.5-1 - * Upstream update - * Added sanity checks - -2008-04-17 Eric Belanger - - * gpm 1.20.3-1 - * Upstream update - * Added missing /usr/lib/libgpm.so.1 symlink (close FS#9949) diff --git a/abs/core-testing/gpm/PKGBUILD b/abs/core-testing/gpm/PKGBUILD deleted file mode 100644 index 12ecf4d..0000000 --- a/abs/core-testing/gpm/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 60782 2009-12-07 00:52:55Z eric $ -# Maintainer: Eric Belanger -# Contributor: Tom Newsom - -pkgname=gpm -pkgver=1.20.6 -pkgrel=5 -pkgdesc="A mouse server for the console and xterm" -arch=('i686' 'x86_64') -url="http://unix.schottelius.org/gpm/" -license=('GPL') -depends=('ncurses') -backup=('etc/conf.d/gpm') -options=('!makeflags') -install=gpm.install -source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.bz2 \ - gpm gpm.conf.d gpm.sh) -md5sums=('6b534da16dc1b28ba828dea89e520f6f' '945ecde0836687e05c13ea837092ea6c'\ - '63e599950946e5f5a649432510aacf4c' 'e391fe4599ce102615f9cd449c380d41') -sha1sums=('f3bb9272878b7934968381c8b25edab359114150' '19e1feb1493373512a77801699df012d186336ea'\ - 'e483f893b4e6b9e1221a208527d728ffefe5438e' '88fe5ff10916c68a87abc8418a56eb0073f69fa9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -D -m755 ../gpm "${pkgdir}/etc/rc.d/gpm" || return 1 - install -D -m644 ../gpm.conf.d "${pkgdir}/etc/conf.d/gpm" || return 1 - install -D -m755 ../gpm.sh "${pkgdir}/etc/profile.d/gpm.sh" || return 1 - -# library fixes - cd "${pkgdir}/usr/lib/" - ln -s libgpm.so.2.* libgpm.so || return 1 - chmod 755 "${pkgdir}"/usr/lib/libgpm.so.* || return 1 -} diff --git a/abs/core-testing/gpm/gpm b/abs/core-testing/gpm/gpm deleted file mode 100755 index 7b5213d..0000000 --- a/abs/core-testing/gpm/gpm +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# source application-specific settings -GPM_ARGS= -[ -f /etc/conf.d/gpm ] && . /etc/conf.d/gpm - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/sbin/gpm) -case "$1" in - start) - stat_busy "Starting GPM Daemon" - [ -z "$PID" ] && /usr/sbin/gpm ${GPM_ARGS} - PID=$(pidof -o %PPID /usr/sbin/gpm) - if [ -z "$PID" ]; then - stat_fail - else - add_daemon gpm - stat_done - fi - ;; - stop) - stat_busy "Stopping GPM Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon gpm - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/core-testing/gpm/gpm.conf.d b/abs/core-testing/gpm/gpm.conf.d deleted file mode 100644 index 9d8c981..0000000 --- a/abs/core-testing/gpm/gpm.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to gpm -# -GPM_ARGS="-m /dev/input/mice" diff --git a/abs/core-testing/gpm/gpm.install b/abs/core-testing/gpm/gpm.install deleted file mode 100644 index 2a1519a..0000000 --- a/abs/core-testing/gpm/gpm.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=/usr/share/info -file=gpm.info.gz - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file $infodir/dir 2> /dev/null -} diff --git a/abs/core-testing/gpm/gpm.sh b/abs/core-testing/gpm/gpm.sh deleted file mode 100755 index af35a5f..0000000 --- a/abs/core-testing/gpm/gpm.sh +++ /dev/null @@ -1,3 +0,0 @@ -case $( /usr/bin/tty ) in - /dev/tty[0-9]*) [ -n "$(pgrep gpm)" ] && /usr/bin/disable-paste ;; -esac diff --git a/abs/core-testing/grep/01-fgrep.patch b/abs/core-testing/grep/01-fgrep.patch deleted file mode 100644 index c7f8f96..0000000 --- a/abs/core-testing/grep/01-fgrep.patch +++ /dev/null @@ -1,145 +0,0 @@ ---- grep-2.5.1/src/search.c.fgrep 2001-04-19 04:42:14.000000000 +0100 -+++ grep-2.5.1/src/search.c 2004-02-26 13:09:32.000000000 +0000 -@@ -360,13 +360,7 @@ - /* Find a possible match using the KWset matcher. */ - size_t offset = kwsexec (kwset, beg, buflim - beg, &kwsm); - if (offset == (size_t) -1) -- { --#ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1) -- free(mb_properties); --#endif -- return (size_t)-1; -- } -+ goto failure; - beg += offset; - /* Narrow down to the line containing the candidate, and - run it through DFA. */ -@@ -379,7 +373,7 @@ - while (beg > buf && beg[-1] != eol) - --beg; - if (kwsm.index < kwset_exact_matches) -- goto success; -+ goto success_in_beg_and_end; - if (dfaexec (&dfa, beg, end - beg, &backref) == (size_t) -1) - continue; - } -@@ -398,7 +392,7 @@ - } - /* Successful, no backreferences encountered! */ - if (!backref) -- goto success; -+ goto success_in_beg_and_end; - } - else - end = beg + size; -@@ -413,14 +407,11 @@ - end - beg - 1, &(patterns[i].regs)))) - { - len = patterns[i].regs.end[0] - start; -- if (exact) -- { -- *match_size = len; -- return start; -- } -+ if (exact && !match_words) -+ goto success_in_start_and_len; - if ((!match_lines && !match_words) - || (match_lines && len == end - beg - 1)) -- goto success; -+ goto success_in_beg_and_end; - /* If -w, check if the match aligns with word boundaries. - We do this iteratively because: - (a) the line may contain more than one occurence of the -@@ -434,7 +425,7 @@ - if ((start == 0 || !WCHAR ((unsigned char) beg[start - 1])) - && (len == end - beg - 1 - || !WCHAR ((unsigned char) beg[start + len]))) -- goto success; -+ goto success_in_beg_and_end; - if (len > 0) - { - /* Try a shorter length anchored at the same place. */ -@@ -461,19 +452,26 @@ - } - } /* for Regex patterns. */ - } /* for (beg = end ..) */ -+ -+ failure: - #ifdef MBS_SUPPORT - if (MB_CUR_MAX > 1 && mb_properties) - free (mb_properties); - #endif /* MBS_SUPPORT */ - return (size_t) -1; - -- success: -+ success_in_beg_and_end: -+ len = end - beg; -+ start = beg - buf; -+ /* FALLTHROUGH */ -+ -+ success_in_start_and_len: - #ifdef MBS_SUPPORT - if (MB_CUR_MAX > 1 && mb_properties) - free (mb_properties); - #endif /* MBS_SUPPORT */ -- *match_size = end - beg; -- return beg - buf; -+ *match_size = len; -+ return start; - } - - static void -@@ -516,28 +514,15 @@ - { - size_t offset = kwsexec (kwset, beg, buf + size - beg, &kwsmatch); - if (offset == (size_t) -1) -- { --#ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1) -- free(mb_properties); --#endif /* MBS_SUPPORT */ -- return offset; -- } -+ goto failure; - #ifdef MBS_SUPPORT - if (MB_CUR_MAX > 1 && mb_properties[offset+beg-buf] == 0) - continue; /* It is a part of multibyte character. */ - #endif /* MBS_SUPPORT */ - beg += offset; - len = kwsmatch.size[0]; -- if (exact) -- { -- *match_size = len; --#ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1) -- free (mb_properties); --#endif /* MBS_SUPPORT */ -- return beg - buf; -- } -+ if (exact && !match_words) -+ goto success_in_beg_and_len; - if (match_lines) - { - if (beg > buf && beg[-1] != eol) -@@ -551,6 +536,7 @@ - goto success; - } - -+ failure: - #ifdef MBS_SUPPORT - if (MB_CUR_MAX > 1) - free (mb_properties); -@@ -583,7 +569,11 @@ - end++; - while (buf < beg && beg[-1] != eol) - --beg; -- *match_size = end - beg; -+ len = end - beg; -+ /* FALLTHROUGH */ -+ -+ success_in_beg_and_len: -+ *match_size = len; - #ifdef MBS_SUPPORT - if (MB_CUR_MAX > 1) - free (mb_properties); diff --git a/abs/core-testing/grep/02-bracket.patch b/abs/core-testing/grep/02-bracket.patch deleted file mode 100644 index f99571c..0000000 --- a/abs/core-testing/grep/02-bracket.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- grep-2.5.1/src/dfa.c.bracket 2003-10-30 16:21:14.000000000 +0000 -+++ grep-2.5.1/src/dfa.c 2003-10-30 16:22:38.000000000 +0000 -@@ -586,7 +586,7 @@ - work_mbc->coll_elems[work_mbc->ncoll_elems++] = elem; - } - } -- wc = -1; -+ wc1 = wc = -1; - } - else - /* We treat '[' as a normal character here. */ diff --git a/abs/core-testing/grep/03-i18n.patch b/abs/core-testing/grep/03-i18n.patch deleted file mode 100644 index 8dc3dfe..0000000 --- a/abs/core-testing/grep/03-i18n.patch +++ /dev/null @@ -1,303 +0,0 @@ ---- grep-2.5.1/src/dfa.c 2004-02-26 13:09:54.000000000 +0000 -+++ grep-2.5.1/src/dfa.c 2004-05-18 16:43:31.189200479 +0100 -@@ -414,7 +414,7 @@ - - /* This function fetch a wide character, and update cur_mb_len, - used only if the current locale is a multibyte environment. */ --static wchar_t -+static wint_t - fetch_wc (char const *eoferr) - { - wchar_t wc; -@@ -423,7 +423,7 @@ - if (eoferr != 0) - dfaerror (eoferr); - else -- return -1; -+ return WEOF; - } - - cur_mb_len = mbrtowc(&wc, lexptr, lexleft, &mbs); -@@ -459,7 +459,7 @@ - static void - parse_bracket_exp_mb () - { -- wchar_t wc, wc1, wc2; -+ wint_t wc, wc1, wc2; - - /* Work area to build a mb_char_classes. */ - struct mb_char_classes *work_mbc; -@@ -496,7 +496,7 @@ - work_mbc->invert = 0; - do - { -- wc1 = -1; /* mark wc1 is not initialized". */ -+ wc1 = WEOF; /* mark wc1 is not initialized". */ - - /* Note that if we're looking at some other [:...:] construct, - we just treat it as a bunch of ordinary characters. We can do -@@ -586,7 +586,7 @@ - work_mbc->coll_elems[work_mbc->ncoll_elems++] = elem; - } - } -- wc1 = wc = -1; -+ wc1 = wc = WEOF; - } - else - /* We treat '[' as a normal character here. */ -@@ -600,7 +600,7 @@ - wc = fetch_wc(("Unbalanced [")); - } - -- if (wc1 == -1) -+ if (wc1 == WEOF) - wc1 = fetch_wc(_("Unbalanced [")); - - if (wc1 == L'-') -@@ -630,17 +630,17 @@ - } - REALLOC_IF_NECESSARY(work_mbc->range_sts, wchar_t, - range_sts_al, work_mbc->nranges + 1); -- work_mbc->range_sts[work_mbc->nranges] = wc; -+ work_mbc->range_sts[work_mbc->nranges] = (wchar_t)wc; - REALLOC_IF_NECESSARY(work_mbc->range_ends, wchar_t, - range_ends_al, work_mbc->nranges + 1); -- work_mbc->range_ends[work_mbc->nranges++] = wc2; -+ work_mbc->range_ends[work_mbc->nranges++] = (wchar_t)wc2; - } -- else if (wc != -1) -+ else if (wc != WEOF) - /* build normal characters. */ - { - REALLOC_IF_NECESSARY(work_mbc->chars, wchar_t, chars_al, - work_mbc->nchars + 1); -- work_mbc->chars[work_mbc->nchars++] = wc; -+ work_mbc->chars[work_mbc->nchars++] = (wchar_t)wc; - } - } - while ((wc = wc1) != L']'); -@@ -2552,6 +2552,8 @@ - } - - /* match with a character? */ -+ if (case_fold) -+ wc = towlower (wc); - for (i = 0; inchars; i++) - { - if (wc == work_mbc->chars[i]) ---- grep-2.5.1/src/grep.c.i18n 2002-03-26 15:54:12.000000000 +0000 -+++ grep-2.5.1/src/grep.c 2004-02-26 13:09:54.000000000 +0000 -@@ -30,6 +30,12 @@ - # include - # include - #endif -+#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC -+/* We can handle multibyte string. */ -+# define MBS_SUPPORT -+# include -+# include -+#endif - #include - #include "system.h" - #include "getopt.h" -@@ -1697,6 +1703,37 @@ - if (!install_matcher (matcher) && !install_matcher ("default")) - abort (); - -+#ifdef MBS_SUPPORT -+ if (MB_CUR_MAX != 1 && match_icase) -+ { -+ wchar_t wc; -+ mbstate_t cur_state, prev_state; -+ int i, len = strlen(keys); -+ -+ memset(&cur_state, 0, sizeof(mbstate_t)); -+ for (i = 0; i <= len ;) -+ { -+ size_t mbclen; -+ mbclen = mbrtowc(&wc, keys + i, len - i, &cur_state); -+ if (mbclen == (size_t) -1 || mbclen == (size_t) -2 || mbclen == 0) -+ { -+ /* An invalid sequence, or a truncated multibyte character. -+ We treat it as a singlebyte character. */ -+ mbclen = 1; -+ } -+ else -+ { -+ if (iswupper((wint_t)wc)) -+ { -+ wc = towlower((wint_t)wc); -+ wcrtomb(keys + i, wc, &cur_state); -+ } -+ } -+ i += mbclen; -+ } -+ } -+#endif /* MBS_SUPPORT */ -+ - (*compile)(keys, keycc); - - if ((argc - optind > 1 && !no_filenames) || with_filenames) ---- grep-2.5.1/src/search.c.i18n 2004-02-26 13:09:54.000000000 +0000 -+++ grep-2.5.1/src/search.c 2004-02-26 13:17:12.000000000 +0000 -@@ -149,15 +149,16 @@ - static char* - check_multibyte_string(char const *buf, size_t size) - { -- char *mb_properties = malloc(size); -+ char *mb_properties = xmalloc(size); - mbstate_t cur_state; -+ wchar_t wc; - int i; - memset(&cur_state, 0, sizeof(mbstate_t)); - memset(mb_properties, 0, sizeof(char)*size); - for (i = 0; i < size ;) - { - size_t mbclen; -- mbclen = mbrlen(buf + i, size - i, &cur_state); -+ mbclen = mbrtowc(&wc, buf + i, size - i, &cur_state); - - if (mbclen == (size_t) -1 || mbclen == (size_t) -2 || mbclen == 0) - { -@@ -165,6 +166,14 @@ - We treat it as a singlebyte character. */ - mbclen = 1; - } -+ else if (match_icase) -+ { -+ if (iswupper((wint_t)wc)) -+ { -+ wc = towlower((wint_t)wc); -+ wcrtomb(buf + i, wc, &cur_state); -+ } -+ } - mb_properties[i] = mbclen; - i += mbclen; - } -@@ -233,7 +242,7 @@ - static char const line_end[] = "\\)$"; - static char const word_beg[] = "\\(^\\|[^[:alnum:]_]\\)\\("; - static char const word_end[] = "\\)\\([^[:alnum:]_]\\|$\\)"; -- char *n = malloc (sizeof word_beg - 1 + size + sizeof word_end); -+ char *n = xmalloc (sizeof word_beg - 1 + size + sizeof word_end); - size_t i; - strcpy (n, match_lines ? line_beg : word_beg); - i = strlen (n); -@@ -316,7 +325,7 @@ - static char const line_end[] = ")$"; - static char const word_beg[] = "(^|[^[:alnum:]_])("; - static char const word_end[] = ")([^[:alnum:]_]|$)"; -- char *n = malloc (sizeof word_beg - 1 + size + sizeof word_end); -+ char *n = xmalloc (sizeof word_beg - 1 + size + sizeof word_end); - size_t i; - strcpy (n, match_lines ? line_beg : word_beg); - i = strlen(n); -@@ -339,14 +348,20 @@ - char eol = eolbyte; - int backref, start, len; - struct kwsmatch kwsm; -- size_t i; -+ size_t i, ret_val; - #ifdef MBS_SUPPORT - char *mb_properties = NULL; --#endif /* MBS_SUPPORT */ -- --#ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1 && kwset) -- mb_properties = check_multibyte_string(buf, size); -+ if (MB_CUR_MAX > 1) -+ { -+ if (match_icase) -+ { -+ char *case_buf = xmalloc(size); -+ memcpy(case_buf, buf, size); -+ buf = case_buf; -+ } -+ if (kwset) -+ mb_properties = check_multibyte_string(buf, size); -+ } - #endif /* MBS_SUPPORT */ - - buflim = buf + size; -@@ -455,8 +470,13 @@ - - failure: - #ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1 && mb_properties) -- free (mb_properties); -+ if (MB_CUR_MAX > 1) -+ { -+ if (mb_properties) -+ free (mb_properties); -+ if (match_icase) -+ free ((char *) buf); -+ } - #endif /* MBS_SUPPORT */ - return (size_t) -1; - -@@ -467,8 +487,13 @@ - - success_in_start_and_len: - #ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1 && mb_properties) -- free (mb_properties); -+ if (MB_CUR_MAX > 1) -+ { -+ if (mb_properties) -+ free (mb_properties); -+ if (match_icase) -+ free ((char *) buf); -+ } - #endif /* MBS_SUPPORT */ - *match_size = len; - return start; -@@ -504,10 +529,19 @@ - register size_t len; - char eol = eolbyte; - struct kwsmatch kwsmatch; -+ size_t ret_val; - #ifdef MBS_SUPPORT -- char *mb_properties; -+ char *mb_properties = NULL; - if (MB_CUR_MAX > 1) -- mb_properties = check_multibyte_string (buf, size); -+ { -+ if (match_icase) -+ { -+ char *case_buf = xmalloc(size); -+ memcpy(case_buf, buf, size); -+ buf = case_buf; -+ } -+ mb_properties = check_multibyte_string(buf, size); -+ } - #endif /* MBS_SUPPORT */ - - for (beg = buf; beg <= buf + size; ++beg) -@@ -565,7 +599,12 @@ - failure: - #ifdef MBS_SUPPORT - if (MB_CUR_MAX > 1) -- free (mb_properties); -+ { -+ if (match_icase) -+ free((char *) buf); -+ if (mb_properties) -+ free(mb_properties); -+ } - #endif /* MBS_SUPPORT */ - return -1; - -@@ -581,7 +620,12 @@ - *match_size = len; - #ifdef MBS_SUPPORT - if (MB_CUR_MAX > 1) -- free (mb_properties); -+ { -+ if (mb_properties) -+ free (mb_properties); -+ if (match_icase) -+ free ((char *) buf); -+ } - #endif /* MBS_SUPPORT */ - return beg - buf; - } diff --git a/abs/core-testing/grep/04-oi.patch b/abs/core-testing/grep/04-oi.patch deleted file mode 100644 index eb997ad..0000000 --- a/abs/core-testing/grep/04-oi.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- grep-2.5.1/lib/posix/regex.h.oi 2004-01-05 12:09:12.984391131 +0000 -+++ grep-2.5.1/lib/posix/regex.h 2004-01-05 12:09:24.717990622 +0000 -@@ -109,6 +109,10 @@ - If not set, \{, \}, {, and } are literals. */ - #define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1) - -+/* If this bit is set, then ignore case when matching. -+ If not set, then case is significant. */ -+#define RE_ICASE (RE_INVALID_INTERVAL_ORD << 1) -+ - /* If this bit is set, +, ? and | aren't recognized as operators. - If not set, they are. */ - #define RE_LIMITED_OPS (RE_INTERVALS << 1) ---- grep-2.5.1/src/search.c.oi 2004-01-05 12:07:00.550199415 +0000 -+++ grep-2.5.1/src/search.c 2004-01-05 12:07:00.566197505 +0000 -@@ -31,7 +31,7 @@ - - #include "system.h" - #include "grep.h" --#include "regex.h" -+#include - #include "dfa.h" - #include "kwset.h" - #include "error.h" -@@ -190,7 +190,7 @@ - size_t total = size; - char const *motif = pattern; - -- re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE); -+ re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE | (match_icase ? RE_ICASE : 0)); - dfasyntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE, match_icase, eolbyte); - - /* For GNU regex compiler we have to pass the patterns separately to detect -@@ -268,12 +268,12 @@ - - if (strcmp (matcher, "awk") == 0) - { -- re_set_syntax (RE_SYNTAX_AWK); -+ re_set_syntax (RE_SYNTAX_AWK | (match_icase ? RE_ICASE : 0)); - dfasyntax (RE_SYNTAX_AWK, match_icase, eolbyte); - } - else - { -- re_set_syntax (RE_SYNTAX_POSIX_EGREP); -+ re_set_syntax (RE_SYNTAX_POSIX_EGREP | (match_icase ? RE_ICASE : 0)); - dfasyntax (RE_SYNTAX_POSIX_EGREP, match_icase, eolbyte); - } - diff --git a/abs/core-testing/grep/05-manpage.patch b/abs/core-testing/grep/05-manpage.patch deleted file mode 100644 index 284f0c4..0000000 --- a/abs/core-testing/grep/05-manpage.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- grep-2.5.1/doc/grep.1.manpage 2002-01-22 13:20:04.000000000 +0000 -+++ grep-2.5.1/doc/grep.1 2003-10-08 09:37:32.000000000 +0100 -@@ -191,6 +191,7 @@ - .I PATTERN - as a list of fixed strings, separated by newlines, - any of which is to be matched. -+.TP - .BR \-P ", " \-\^\-perl-regexp - Interpret - .I PATTERN -@@ -302,7 +303,7 @@ - This is especially useful for tools like zgrep, e.g. - .B "gzip -cd foo.gz |grep --label=foo something" - .TP --.BR \-\^\-line-buffering -+.BR \-\^\-line-buffered - Use line buffering, it can be a performance penality. - .TP - .BR \-q ", " \-\^\-quiet ", " \-\^\-silent diff --git a/abs/core-testing/grep/06-color.patch b/abs/core-testing/grep/06-color.patch deleted file mode 100644 index f54c258..0000000 --- a/abs/core-testing/grep/06-color.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- grep-2.5.1/src/grep.c.color 2004-11-16 16:46:22.845505847 +0000 -+++ grep-2.5.1/src/grep.c 2004-11-16 16:46:27.961530537 +0000 -@@ -607,6 +607,7 @@ - fputs ("\33[00m", stdout); - beg = b + match_size; - } -+ fputs ("\33[K", stdout); - } - fwrite (beg, 1, lim - beg, stdout); - if (ferror (stdout)) diff --git a/abs/core-testing/grep/07-icolor.patch b/abs/core-testing/grep/07-icolor.patch deleted file mode 100644 index 14b2617..0000000 --- a/abs/core-testing/grep/07-icolor.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- grep-2.5.1a/src/grep.c.icolor 2005-01-07 12:05:20.877785250 +0000 -+++ grep-2.5.1a/src/grep.c 2005-01-07 12:05:44.690194388 +0000 -@@ -564,33 +564,6 @@ - { - size_t match_size; - size_t match_offset; -- if(match_icase) -- { -- /* Yuck, this is tricky */ -- char *buf = (char*) xmalloc (lim - beg); -- char *ibeg = buf; -- char *ilim = ibeg + (lim - beg); -- int i; -- for (i = 0; i < lim - beg; i++) -- ibeg[i] = tolower (beg[i]); -- while ((match_offset = (*execute) (ibeg, ilim-ibeg, &match_size, 1)) -- != (size_t) -1) -- { -- char const *b = beg + match_offset; -- if (b == lim) -- break; -- fwrite (beg, sizeof (char), match_offset, stdout); -- printf ("\33[%sm", grep_color); -- fwrite (b, sizeof (char), match_size, stdout); -- fputs ("\33[00m", stdout); -- beg = b + match_size; -- ibeg = ibeg + match_offset + match_size; -- } -- fwrite (beg, 1, lim - beg, stdout); -- free (buf); -- lastout = lim; -- return; -- } - while (lim-beg && (match_offset = (*execute) (beg, lim - beg, &match_size, 1)) - != (size_t) -1) - { diff --git a/abs/core-testing/grep/08-skip.patch b/abs/core-testing/grep/08-skip.patch deleted file mode 100644 index fb6645f..0000000 --- a/abs/core-testing/grep/08-skip.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- grep-2.5.1a/src/grep.c.skip 2006-05-31 09:26:58.000000000 +0100 -+++ grep-2.5.1a/src/grep.c 2006-05-31 09:28:24.000000000 +0100 -@@ -261,19 +261,6 @@ - bufbeg[-1] = eolbyte; - bufdesc = fd; - -- if (fstat (fd, &stats->stat) != 0) -- { -- error (0, errno, "fstat"); -- return 0; -- } -- if (directories == SKIP_DIRECTORIES && S_ISDIR (stats->stat.st_mode)) -- return 0; --#ifndef DJGPP -- if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode) || S_ISSOCK(stats->stat.st_mode))) --#else -- if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode))) --#endif -- return 0; - if (S_ISREG (stats->stat.st_mode)) - { - if (file) -@@ -875,6 +862,19 @@ - } - else - { -+ if (stat (file, &stats->stat) != 0) -+ { -+ suppressible_error (file, errno); -+ return 1; -+ } -+ if (directories == SKIP_DIRECTORIES && S_ISDIR (stats->stat.st_mode)) -+ return 1; -+#ifndef DJGPP -+ if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode) || S_ISSOCK(stats->stat.st_mode) || S_ISFIFO(stats->stat.st_mode))) -+#else -+ if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode))) -+#endif -+ return 1; - while ((desc = open (file, O_RDONLY)) < 0 && errno == EINTR) - continue; - diff --git a/abs/core-testing/grep/09-egf-speedup.patch b/abs/core-testing/grep/09-egf-speedup.patch deleted file mode 100644 index 08e92c7..0000000 --- a/abs/core-testing/grep/09-egf-speedup.patch +++ /dev/null @@ -1,823 +0,0 @@ ---- grep-2.5.1/src/search.c 2004-12-31 15:28:35.720391036 +0000 -+++ grep-2.5.1a/src/search.c 2005-01-07 14:53:10.308860193 +0000 -@@ -18,9 +18,13 @@ - - /* Written August 1992 by Mike Haertel. */ - -+#ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+#endif - #ifdef HAVE_CONFIG_H - # include - #endif -+#include - #include - #if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC - /* We can handle multibyte string. */ -@@ -39,6 +43,9 @@ - #ifdef HAVE_LIBPCRE - # include - #endif -+#ifdef HAVE_LANGINFO_CODESET -+# include -+#endif - - #define NCHAR (UCHAR_MAX + 1) - -@@ -70,9 +77,10 @@ - call the regexp matcher at all. */ - static int kwset_exact_matches; - --#if defined(MBS_SUPPORT) --static char* check_multibyte_string PARAMS ((char const *buf, size_t size)); --#endif -+/* UTF-8 encoding allows some optimizations that we can't otherwise -+ assume in a multibyte encoding. */ -+static int using_utf8; -+ - static void kwsinit PARAMS ((void)); - static void kwsmusts PARAMS ((void)); - static void Gcompile PARAMS ((char const *, size_t)); -@@ -84,6 +92,15 @@ - static size_t Pexecute PARAMS ((char const *, size_t, size_t *, int)); - - void -+check_utf8 (void) -+{ -+#ifdef HAVE_LANGINFO_CODESET -+ if (strcmp (nl_langinfo (CODESET), "UTF-8") == 0) -+ using_utf8 = 1; -+#endif -+} -+ -+void - dfaerror (char const *mesg) - { - error (2, 0, mesg); -@@ -141,47 +158,6 @@ - } - } - --#ifdef MBS_SUPPORT --/* This function allocate the array which correspond to "buf". -- Then this check multibyte string and mark on the positions which -- are not singlebyte character nor the first byte of a multibyte -- character. Caller must free the array. */ --static char* --check_multibyte_string(char const *buf, size_t size) --{ -- char *mb_properties = xmalloc(size); -- mbstate_t cur_state; -- wchar_t wc; -- int i; -- memset(&cur_state, 0, sizeof(mbstate_t)); -- memset(mb_properties, 0, sizeof(char)*size); -- for (i = 0; i < size ;) -- { -- size_t mbclen; -- mbclen = mbrtowc(&wc, buf + i, size - i, &cur_state); -- -- if (mbclen == (size_t) -1 || mbclen == (size_t) -2 || mbclen == 0) -- { -- /* An invalid sequence, or a truncated multibyte character. -- We treat it as a singlebyte character. */ -- mbclen = 1; -- } -- else if (match_icase) -- { -- if (iswupper((wint_t)wc)) -- { -- wc = towlower((wint_t)wc); -- wcrtomb(buf + i, wc, &cur_state); -- } -- } -- mb_properties[i] = mbclen; -- i += mbclen; -- } -- -- return mb_properties; --} --#endif -- - static void - Gcompile (char const *pattern, size_t size) - { -@@ -190,6 +166,7 @@ - size_t total = size; - char const *motif = pattern; - -+ check_utf8 (); - re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE | (match_icase ? RE_ICASE : 0)); - dfasyntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE, match_icase, eolbyte); - -@@ -266,6 +243,7 @@ - size_t total = size; - char const *motif = pattern; - -+ check_utf8 (); - if (strcmp (matcher, "awk") == 0) - { - re_set_syntax (RE_SYNTAX_AWK | (match_icase ? RE_ICASE : 0)); -@@ -350,18 +328,9 @@ - struct kwsmatch kwsm; - size_t i, ret_val; - #ifdef MBS_SUPPORT -- char *mb_properties = NULL; -- if (MB_CUR_MAX > 1) -- { -- if (match_icase) -- { -- char *case_buf = xmalloc(size); -- memcpy(case_buf, buf, size); -- buf = case_buf; -- } -- if (kwset) -- mb_properties = check_multibyte_string(buf, size); -- } -+ int mb_cur_max = MB_CUR_MAX; -+ mbstate_t mbs; -+ memset (&mbs, '\0', sizeof (mbstate_t)); - #endif /* MBS_SUPPORT */ - - buflim = buf + size; -@@ -373,21 +342,63 @@ - if (kwset) - { - /* Find a possible match using the KWset matcher. */ -- size_t offset = kwsexec (kwset, beg, buflim - beg, &kwsm); -+#ifdef MBS_SUPPORT -+ size_t bytes_left = 0; -+#endif /* MBS_SUPPORT */ -+ size_t offset; -+#ifdef MBS_SUPPORT -+ /* kwsexec doesn't work with match_icase and multibyte input. */ -+ if (match_icase && mb_cur_max > 1) -+ /* Avoid kwset */ -+ offset = 0; -+ else -+#endif /* MBS_SUPPORT */ -+ offset = kwsexec (kwset, beg, buflim - beg, &kwsm); - if (offset == (size_t) -1) - goto failure; -+#ifdef MBS_SUPPORT -+ if (mb_cur_max > 1 && !using_utf8) -+ { -+ bytes_left = offset; -+ while (bytes_left) -+ { -+ size_t mlen = mbrlen (beg, bytes_left, &mbs); -+ if (mlen == (size_t) -1 || mlen == 0) -+ { -+ /* Incomplete character: treat as single-byte. */ -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ beg++; -+ bytes_left--; -+ continue; -+ } -+ -+ if (mlen == (size_t) -2) -+ /* Offset points inside multibyte character: -+ * no good. */ -+ break; -+ -+ beg += mlen; -+ bytes_left -= mlen; -+ } -+ } -+ else -+#endif /* MBS_SUPPORT */ - beg += offset; - /* Narrow down to the line containing the candidate, and - run it through DFA. */ - end = memchr(beg, eol, buflim - beg); - end++; - #ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1 && mb_properties[beg - buf] == 0) -+ if (mb_cur_max > 1 && bytes_left) - continue; --#endif -+#endif /* MBS_SUPPORT */ - while (beg > buf && beg[-1] != eol) - --beg; -- if (kwsm.index < kwset_exact_matches) -+ if ( -+#ifdef MBS_SUPPORT -+ !(match_icase && mb_cur_max > 1) && -+#endif /* MBS_SUPPORT */ -+ (kwsm.index < kwset_exact_matches)) - goto success_in_beg_and_end; - if (dfaexec (&dfa, beg, end - beg, &backref) == (size_t) -1) - continue; -@@ -395,13 +406,47 @@ - else - { - /* No good fixed strings; start with DFA. */ -+#ifdef MBS_SUPPORT -+ size_t bytes_left = 0; -+#endif /* MBS_SUPPORT */ - size_t offset = dfaexec (&dfa, beg, buflim - beg, &backref); - if (offset == (size_t) -1) - break; - /* Narrow down to the line we've found. */ -+#ifdef MBS_SUPPORT -+ if (mb_cur_max > 1 && !using_utf8) -+ { -+ bytes_left = offset; -+ while (bytes_left) -+ { -+ size_t mlen = mbrlen (beg, bytes_left, &mbs); -+ if (mlen == (size_t) -1 || mlen == 0) -+ { -+ /* Incomplete character: treat as single-byte. */ -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ beg++; -+ bytes_left--; -+ continue; -+ } -+ -+ if (mlen == (size_t) -2) -+ /* Offset points inside multibyte character: -+ * no good. */ -+ break; -+ -+ beg += mlen; -+ bytes_left -= mlen; -+ } -+ } -+ else -+#endif /* MBS_SUPPORT */ - beg += offset; - end = memchr (beg, eol, buflim - beg); - end++; -+#ifdef MBS_SUPPORT -+ if (mb_cur_max > 1 && bytes_left) -+ continue; -+#endif /* MBS_SUPPORT */ - while (beg > buf && beg[-1] != eol) - --beg; - } -@@ -469,15 +514,6 @@ - } /* for (beg = end ..) */ - - failure: --#ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1) -- { -- if (mb_properties) -- free (mb_properties); -- if (match_icase) -- free ((char *) buf); -- } --#endif /* MBS_SUPPORT */ - return (size_t) -1; - - success_in_beg_and_end: -@@ -486,24 +522,144 @@ - /* FALLTHROUGH */ - - success_in_start_and_len: --#ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1) -- { -- if (mb_properties) -- free (mb_properties); -- if (match_icase) -- free ((char *) buf); -- } --#endif /* MBS_SUPPORT */ - *match_size = len; - return start; - } - -+#ifdef MBS_SUPPORT -+static int f_i_multibyte; /* whether we're using the new -Fi MB method */ -+static struct -+{ -+ wchar_t **patterns; -+ size_t count, maxlen; -+ unsigned char *match; -+} Fimb; -+#endif -+ - static void - Fcompile (char const *pattern, size_t size) - { -+ int mb_cur_max = MB_CUR_MAX; - char const *beg, *lim, *err; - -+ check_utf8 (); -+#ifdef MBS_SUPPORT -+ /* Support -F -i for UTF-8 input. */ -+ if (match_icase && mb_cur_max > 1) -+ { -+ mbstate_t mbs; -+ wchar_t *wcpattern = xmalloc ((size + 1) * sizeof (wchar_t)); -+ const char *patternend = pattern; -+ size_t wcsize; -+ kwset_t fimb_kwset = NULL; -+ char *starts = NULL; -+ wchar_t *wcbeg, *wclim; -+ size_t allocated = 0; -+ -+ memset (&mbs, '\0', sizeof (mbs)); -+# ifdef __GNU_LIBRARY__ -+ wcsize = mbsnrtowcs (wcpattern, &patternend, size, size, &mbs); -+ if (patternend != pattern + size) -+ wcsize = (size_t) -1; -+# else -+ { -+ char *patterncopy = xmalloc (size + 1); -+ -+ memcpy (patterncopy, pattern, size); -+ patterncopy[size] = '\0'; -+ patternend = patterncopy; -+ wcsize = mbsrtowcs (wcpattern, &patternend, size, &mbs); -+ if (patternend != patterncopy + size) -+ wcsize = (size_t) -1; -+ free (patterncopy); -+ } -+# endif -+ if (wcsize + 2 <= 2) -+ { -+fimb_fail: -+ free (wcpattern); -+ free (starts); -+ if (fimb_kwset) -+ kwsfree (fimb_kwset); -+ free (Fimb.patterns); -+ Fimb.patterns = NULL; -+ } -+ else -+ { -+ if (!(fimb_kwset = kwsalloc (NULL))) -+ error (2, 0, _("memory exhausted")); -+ -+ starts = xmalloc (mb_cur_max * 3); -+ wcbeg = wcpattern; -+ do -+ { -+ int i; -+ size_t wclen; -+ -+ if (Fimb.count >= allocated) -+ { -+ if (allocated == 0) -+ allocated = 128; -+ else -+ allocated *= 2; -+ Fimb.patterns = xrealloc (Fimb.patterns, -+ sizeof (wchar_t *) * allocated); -+ } -+ Fimb.patterns[Fimb.count++] = wcbeg; -+ for (wclim = wcbeg; -+ wclim < wcpattern + wcsize && *wclim != L'\n'; ++wclim) -+ *wclim = towlower (*wclim); -+ *wclim = L'\0'; -+ wclen = wclim - wcbeg; -+ if (wclen > Fimb.maxlen) -+ Fimb.maxlen = wclen; -+ if (wclen > 3) -+ wclen = 3; -+ if (wclen == 0) -+ { -+ if ((err = kwsincr (fimb_kwset, "", 0)) != 0) -+ error (2, 0, err); -+ } -+ else -+ for (i = 0; i < (1 << wclen); i++) -+ { -+ char *p = starts; -+ int j, k; -+ -+ for (j = 0; j < wclen; ++j) -+ { -+ wchar_t wc = wcbeg[j]; -+ if (i & (1 << j)) -+ { -+ wc = towupper (wc); -+ if (wc == wcbeg[j]) -+ continue; -+ } -+ k = wctomb (p, wc); -+ if (k <= 0) -+ goto fimb_fail; -+ p += k; -+ } -+ if ((err = kwsincr (fimb_kwset, starts, p - starts)) != 0) -+ error (2, 0, err); -+ } -+ if (wclim < wcpattern + wcsize) -+ ++wclim; -+ wcbeg = wclim; -+ } -+ while (wcbeg < wcpattern + wcsize); -+ f_i_multibyte = 1; -+ kwset = fimb_kwset; -+ free (starts); -+ Fimb.match = xmalloc (Fimb.count); -+ if ((err = kwsprep (kwset)) != 0) -+ error (2, 0, err); -+ return; -+ } -+ } -+#endif /* MBS_SUPPORT */ -+ -+ - kwsinit (); - beg = pattern; - do -@@ -522,6 +678,76 @@ - error (2, 0, err); - } - -+#ifdef MBS_SUPPORT -+static int -+Fimbexec (const char *buf, size_t size, size_t *plen, int exact) -+{ -+ size_t len, letter, i; -+ int ret = -1; -+ mbstate_t mbs; -+ wchar_t wc; -+ int patterns_left; -+ -+ assert (match_icase && f_i_multibyte == 1); -+ assert (MB_CUR_MAX > 1); -+ -+ memset (&mbs, '\0', sizeof (mbs)); -+ memset (Fimb.match, '\1', Fimb.count); -+ letter = len = 0; -+ patterns_left = 1; -+ while (patterns_left && len <= size) -+ { -+ size_t c; -+ -+ patterns_left = 0; -+ if (len < size) -+ { -+ c = mbrtowc (&wc, buf + len, size - len, &mbs); -+ if (c + 2 <= 2) -+ return ret; -+ -+ wc = towlower (wc); -+ } -+ else -+ { -+ c = 1; -+ wc = L'\0'; -+ } -+ -+ for (i = 0; i < Fimb.count; i++) -+ { -+ if (Fimb.match[i]) -+ { -+ if (Fimb.patterns[i][letter] == L'\0') -+ { -+ /* Found a match. */ -+ *plen = len; -+ if (!exact && !match_words) -+ return 0; -+ else -+ { -+ /* For -w or exact look for longest match. */ -+ ret = 0; -+ Fimb.match[i] = '\0'; -+ continue; -+ } -+ } -+ -+ if (Fimb.patterns[i][letter] == wc) -+ patterns_left = 1; -+ else -+ Fimb.match[i] = '\0'; -+ } -+ } -+ -+ len += c; -+ letter++; -+ } -+ -+ return ret; -+} -+#endif /* MBS_SUPPORT */ -+ - static size_t - Fexecute (char const *buf, size_t size, size_t *match_size, int exact) - { -@@ -531,80 +757,258 @@ - struct kwsmatch kwsmatch; - size_t ret_val; - #ifdef MBS_SUPPORT -- char *mb_properties = NULL; -- if (MB_CUR_MAX > 1) -- { -- if (match_icase) -- { -- char *case_buf = xmalloc(size); -- memcpy(case_buf, buf, size); -- buf = case_buf; -- } -- mb_properties = check_multibyte_string(buf, size); -- } -+ int mb_cur_max = MB_CUR_MAX; -+ mbstate_t mbs; -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ const char *last_char = NULL; - #endif /* MBS_SUPPORT */ - - for (beg = buf; beg <= buf + size; ++beg) - { -- size_t offset = kwsexec (kwset, beg, buf + size - beg, &kwsmatch); -+ size_t offset; -+ offset = kwsexec (kwset, beg, buf + size - beg, &kwsmatch); -+ - if (offset == (size_t) -1) - goto failure; - #ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1 && mb_properties[offset+beg-buf] == 0) -- continue; /* It is a part of multibyte character. */ -+ if (mb_cur_max > 1 && !using_utf8) -+ { -+ size_t bytes_left = offset; -+ while (bytes_left) -+ { -+ size_t mlen = mbrlen (beg, bytes_left, &mbs); -+ -+ last_char = beg; -+ if (mlen == (size_t) -1 || mlen == 0) -+ { -+ /* Incomplete character: treat as single-byte. */ -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ beg++; -+ bytes_left--; -+ continue; -+ } -+ -+ if (mlen == (size_t) -2) -+ /* Offset points inside multibyte character: no good. */ -+ break; -+ -+ beg += mlen; -+ bytes_left -= mlen; -+ } -+ -+ if (bytes_left) -+ continue; -+ } -+ else - #endif /* MBS_SUPPORT */ - beg += offset; -+#ifdef MBS_SUPPORT -+ /* For f_i_multibyte, the string at beg now matches first 3 chars of -+ one of the search strings (less if there are shorter search strings). -+ See if this is a real match. */ -+ if (f_i_multibyte -+ && Fimbexec (beg, buf + size - beg, &kwsmatch.size[0], exact)) -+ goto next_char; -+#endif /* MBS_SUPPORT */ - len = kwsmatch.size[0]; - if (exact && !match_words) - goto success_in_beg_and_len; - if (match_lines) - { - if (beg > buf && beg[-1] != eol) -- continue; -+ goto next_char; - if (beg + len < buf + size && beg[len] != eol) -- continue; -+ goto next_char; - goto success; - } - else if (match_words) -- for (try = beg; len; ) -- { -- if (try > buf && WCHAR((unsigned char) try[-1])) -- break; -- if (try + len < buf + size && WCHAR((unsigned char) try[len])) -- { -- offset = kwsexec (kwset, beg, --len, &kwsmatch); -- if (offset == (size_t) -1) -- { -+ { -+ while (len) -+ { -+ int word_match = 0; -+ if (beg > buf) -+ { - #ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1) -- free (mb_properties); -+ if (mb_cur_max > 1) -+ { -+ const char *s; -+ int mr; -+ wchar_t pwc; -+ -+ if (using_utf8) -+ { -+ s = beg - 1; -+ while (s > buf -+ && (unsigned char) *s >= 0x80 -+ && (unsigned char) *s <= 0xbf) -+ --s; -+ } -+ else -+ s = last_char; -+ mr = mbtowc (&pwc, s, beg - s); -+ if (mr <= 0) -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ else if ((iswalnum (pwc) || pwc == L'_') -+ && mr == (int) (beg - s)) -+ goto next_char; -+ } -+ else - #endif /* MBS_SUPPORT */ -- return offset; -- } -- try = beg + offset; -- len = kwsmatch.size[0]; -- } -- else -- goto success; -- } -+ if (WCHAR ((unsigned char) beg[-1])) -+ goto next_char; -+ } -+#ifdef MBS_SUPPORT -+ if (mb_cur_max > 1) -+ { -+ wchar_t nwc; -+ int mr; -+ -+ mr = mbtowc (&nwc, beg + len, buf + size - beg - len); -+ if (mr <= 0) -+ { -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ word_match = 1; -+ } -+ else if (!iswalnum (nwc) && nwc != L'_') -+ word_match = 1; -+ } -+ else -+#endif /* MBS_SUPPORT */ -+ if (beg + len >= buf + size || !WCHAR ((unsigned char) beg[len])) -+ word_match = 1; -+ if (word_match) -+ { -+ if (!exact) -+ /* Returns the whole line now we know there's a word match. */ -+ goto success; -+ else -+ /* Returns just this word match. */ -+ goto success_in_beg_and_len; -+ } -+ if (len > 0) -+ { -+ /* Try a shorter length anchored at the same place. */ -+ --len; -+ offset = kwsexec (kwset, beg, len, &kwsmatch); -+ -+ if (offset == -1) -+ goto next_char; /* Try a different anchor. */ -+#ifdef MBS_SUPPORT -+ if (mb_cur_max > 1 && !using_utf8) -+ { -+ size_t bytes_left = offset; -+ while (bytes_left) -+ { -+ size_t mlen = mbrlen (beg, bytes_left, &mbs); -+ -+ last_char = beg; -+ if (mlen == (size_t) -1 || mlen == 0) -+ { -+ /* Incomplete character: treat as single-byte. */ -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ beg++; -+ bytes_left--; -+ continue; -+ } -+ -+ if (mlen == (size_t) -2) -+ { -+ /* Offset points inside multibyte character: -+ * no good. */ -+ break; -+ } -+ -+ beg += mlen; -+ bytes_left -= mlen; -+ } -+ -+ if (bytes_left) -+ { -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ goto next_char; /* Try a different anchor. */ -+ } -+ } -+ else -+#endif /* MBS_SUPPORT */ -+ beg += offset; -+#ifdef MBS_SUPPORT -+ /* The string at beg now matches first 3 chars of one of -+ the search strings (less if there are shorter search -+ strings). See if this is a real match. */ -+ if (f_i_multibyte -+ && Fimbexec (beg, len - offset, &kwsmatch.size[0], -+ exact)) -+ goto next_char; -+#endif /* MBS_SUPPORT */ -+ len = kwsmatch.size[0]; -+ } -+ } -+ } - else - goto success; -+next_char:; -+#ifdef MBS_SUPPORT -+ /* Advance to next character. For MB_CUR_MAX == 1 case this is handled -+ by ++beg above. */ -+ if (mb_cur_max > 1) -+ { -+ if (using_utf8) -+ { -+ unsigned char c = *beg; -+ if (c >= 0xc2) -+ { -+ if (c < 0xe0) -+ ++beg; -+ else if (c < 0xf0) -+ beg += 2; -+ else if (c < 0xf8) -+ beg += 3; -+ else if (c < 0xfc) -+ beg += 4; -+ else if (c < 0xfe) -+ beg += 5; -+ } -+ } -+ else -+ { -+ size_t l = mbrlen (beg, buf + size - beg, &mbs); -+ -+ last_char = beg; -+ if (l + 2 >= 2) -+ beg += l - 1; -+ else -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ } -+ } -+#endif /* MBS_SUPPORT */ - } - - failure: -+ return -1; -+ -+ success: - #ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1) -+ if (mb_cur_max > 1 && !using_utf8) - { -- if (match_icase) -- free((char *) buf); -- if (mb_properties) -- free(mb_properties); -+ end = beg + len; -+ while (end < buf + size) -+ { -+ size_t mlen = mbrlen (end, buf + size - end, &mbs); -+ if (mlen == (size_t) -1 || mlen == (size_t) -2 || mlen == 0) -+ { -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ mlen = 1; -+ } -+ if (mlen == 1 && *end == eol) -+ break; -+ -+ end += mlen; -+ } - } -+ else - #endif /* MBS_SUPPORT */ -- return -1; -- -- success: - end = memchr (beg + len, eol, (buf + size) - (beg + len)); -+ - end++; - while (buf < beg && beg[-1] != eol) - --beg; -@@ -613,15 +1017,6 @@ - - success_in_beg_and_len: - *match_size = len; --#ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1) -- { -- if (mb_properties) -- free (mb_properties); -- if (match_icase) -- free ((char *) buf); -- } --#endif /* MBS_SUPPORT */ - return beg - buf; - } - diff --git a/abs/core-testing/grep/10-dfa-optional.patch b/abs/core-testing/grep/10-dfa-optional.patch deleted file mode 100644 index 784eba9..0000000 --- a/abs/core-testing/grep/10-dfa-optional.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- grep-2.5.1a/src/search.c.dfa-optional 2005-01-07 14:58:45.714869815 +0000 -+++ grep-2.5.1a/src/search.c 2005-01-07 14:58:45.725867716 +0000 -@@ -327,12 +327,34 @@ - int backref, start, len; - struct kwsmatch kwsm; - size_t i, ret_val; -+ static int use_dfa; -+ static int use_dfa_checked = 0; - #ifdef MBS_SUPPORT - int mb_cur_max = MB_CUR_MAX; - mbstate_t mbs; - memset (&mbs, '\0', sizeof (mbstate_t)); - #endif /* MBS_SUPPORT */ - -+ if (!use_dfa_checked) -+ { -+ char *grep_use_dfa = getenv ("GREP_USE_DFA"); -+ if (!grep_use_dfa) -+ { -+#ifdef MBS_SUPPORT -+ /* Turn off DFA when processing multibyte input. */ -+ use_dfa = (MB_CUR_MAX == 1); -+#else -+ use_dfa = 1; -+#endif /* MBS_SUPPORT */ -+ } -+ else -+ { -+ use_dfa = atoi (grep_use_dfa); -+ } -+ -+ use_dfa_checked = 1; -+ } -+ - buflim = buf + size; - - for (beg = end = buf; end < buflim; beg = end) -@@ -400,7 +422,8 @@ - #endif /* MBS_SUPPORT */ - (kwsm.index < kwset_exact_matches)) - goto success_in_beg_and_end; -- if (dfaexec (&dfa, beg, end - beg, &backref) == (size_t) -1) -+ if (use_dfa && -+ dfaexec (&dfa, beg, end - beg, &backref) == (size_t) -1) - continue; - } - else -@@ -409,7 +432,9 @@ - #ifdef MBS_SUPPORT - size_t bytes_left = 0; - #endif /* MBS_SUPPORT */ -- size_t offset = dfaexec (&dfa, beg, buflim - beg, &backref); -+ size_t offset = 0; -+ if (use_dfa) -+ offset = dfaexec (&dfa, beg, buflim - beg, &backref); - if (offset == (size_t) -1) - break; - /* Narrow down to the line we've found. */ -@@ -451,7 +476,7 @@ - --beg; - } - /* Successful, no backreferences encountered! */ -- if (!backref) -+ if (use_dfa && !backref) - goto success_in_beg_and_end; - } - else diff --git a/abs/core-testing/grep/11-tests.patch b/abs/core-testing/grep/11-tests.patch deleted file mode 100644 index 2934a21..0000000 --- a/abs/core-testing/grep/11-tests.patch +++ /dev/null @@ -1,138 +0,0 @@ ---- grep-2.5.1/tests/Makefile.am.jj 2001-03-07 05:11:27.000000000 +0100 -+++ grep-2.5.1/tests/Makefile.am 2004-12-31 11:42:41.595492300 +0100 -@@ -3,7 +3,8 @@ - AWK=@AWK@ - - TESTS = warning.sh khadafy.sh spencer1.sh bre.sh ere.sh \ -- status.sh empty.sh options.sh backref.sh file.sh -+ status.sh empty.sh options.sh backref.sh file.sh \ -+ fmbtest.sh - EXTRA_DIST = $(TESTS) \ - khadafy.lines khadafy.regexp \ - spencer1.awk spencer1.tests \ ---- grep-2.5.1/tests/fmbtest.sh 2004-12-31 13:30:23.942871250 +0100 -+++ grep-2.5.1/tests/fmbtest.sh 2004-12-31 14:09:13.219463855 +0100 -@@ -0,0 +1,111 @@ -+#!/bin/sh -+ -+: ${srcdir=.} -+ -+# If cs_CZ.UTF-8 locale doesn't work, skip this test silently -+LC_ALL=cs_CZ.UTF-8 locale -k LC_CTYPE 2>/dev/null | ${GREP} -q charmap.*UTF-8 \ -+ || exit 77 -+ -+failures=0 -+ -+cat > csinput < cspatfile <= 0) - { -- if ((start == 0 || !WCHAR ((unsigned char) beg[start - 1])) -- && (len == end - beg - 1 -- || !WCHAR ((unsigned char) beg[start + len]))) -- goto success_in_beg_and_end; -+ int lword_match = 0; -+ if (start == 0) -+ lword_match = 1; -+ else -+ { -+ assert (start > 0); -+#ifdef MBS_SUPPORT -+ if (mb_cur_max > 1) -+ { -+ const char *s; -+ size_t mr; -+ wchar_t pwc; -+ -+ /* Locate the start of the multibyte character -+ before the match position (== beg + start). */ -+ if (using_utf8) -+ { -+ /* UTF-8 is a special case: scan backwards -+ until we find a 7-bit character or a -+ lead byte. */ -+ s = beg + start - 1; -+ while (s > buf -+ && (unsigned char) *s >= 0x80 -+ && (unsigned char) *s <= 0xbf) -+ --s; -+ } -+ else -+ { -+ /* Scan forwards to find the start of the -+ last complete character before the -+ match position. */ -+ size_t bytes_left = start - 1; -+ s = beg; -+ while (bytes_left > 0) -+ { -+ mr = mbrlen (s, bytes_left, &mbs); -+ if (mr == (size_t) -1 || mr == 0) -+ { -+ memset (&mbs, '\0', sizeof (mbs)); -+ s++; -+ bytes_left--; -+ continue; -+ } -+ if (mr == (size_t) -2) -+ { -+ memset (&mbs, '\0', sizeof (mbs)); -+ break; -+ } -+ s += mr; -+ bytes_left -= mr; -+ } -+ } -+ mr = mbrtowc (&pwc, s, beg + start - s, &mbs); -+ if (mr == (size_t) -2 || mr == (size_t) -1 || -+ mr == 0) -+ { -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ lword_match = 1; -+ } -+ else if (!(iswalnum (pwc) || pwc == L'_') -+ && mr == beg + start - s) -+ lword_match = 1; -+ } -+ else -+#endif /* MBS_SUPPORT */ -+ if (!WCHAR ((unsigned char) beg[start - 1])) -+ lword_match = 1; -+ } -+ -+ if (lword_match) -+ { -+ int rword_match = 0; -+ if (start + len == end - beg - 1) -+ rword_match = 1; -+ else -+ { -+#ifdef MBS_SUPPORT -+ if (mb_cur_max > 1) -+ { -+ wchar_t nwc; -+ int mr; -+ -+ mr = mbtowc (&nwc, beg + start + len, -+ end - beg - start - len - 1); -+ if (mr <= 0) -+ { -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ rword_match = 1; -+ } -+ else if (!iswalnum (nwc) && nwc != L'_') -+ rword_match = 1; -+ } -+ else -+#endif /* MBS_SUPPORT */ -+ if (!WCHAR ((unsigned char) beg[start + len])) -+ rword_match = 1; -+ } -+ -+ if (rword_match) -+ { -+ if (!exact) -+ /* Returns the whole line. */ -+ goto success_in_beg_and_end; -+ else -+ /* Returns just this word match. */ -+ goto success_in_start_and_len; -+ } -+ } - if (len > 0) - { - /* Try a shorter length anchored at the same place. */ diff --git a/abs/core-testing/grep/13-P.patch b/abs/core-testing/grep/13-P.patch deleted file mode 100644 index 9dca4ad..0000000 --- a/abs/core-testing/grep/13-P.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- grep-2.5.1a/src/search.c.P 2006-02-03 14:08:00.000000000 +0000 -+++ grep-2.5.1a/src/search.c 2006-02-03 14:11:20.000000000 +0000 -@@ -1234,8 +1234,9 @@ - char eol = eolbyte; - if (!exact) - { -- end = memchr (end, eol, buflim - end); -- end++; -+ while (end < buflim) -+ if (*end++ == eol) -+ break; - while (buf < beg && beg[-1] != eol) - --beg; - } diff --git a/abs/core-testing/grep/14-mem-exhausted.patch b/abs/core-testing/grep/14-mem-exhausted.patch deleted file mode 100644 index d6a996d..0000000 --- a/abs/core-testing/grep/14-mem-exhausted.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- grep-2.5.1a/src/grep.c.mem-exhausted 2006-11-22 14:49:35.000000000 +0000 -+++ grep-2.5.1a/src/grep.c 2006-11-22 14:53:12.000000000 +0000 -@@ -299,6 +299,12 @@ - int cc = 1; - char *readbuf; - size_t readsize; -+ const size_t max_save = 200 * 1024 * 1024; -+ -+ /* Limit the amount of saved data to 200Mb so we don't fail on -+ * large files. */ -+ if (save > max_save) -+ save = max_save; - - /* Offset from start of buffer to start of old stuff - that we want to save. */ diff --git a/abs/core-testing/grep/15-empty-pattern.patch b/abs/core-testing/grep/15-empty-pattern.patch deleted file mode 100644 index acb702a..0000000 --- a/abs/core-testing/grep/15-empty-pattern.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- grep-2.5.1a/src/grep.c.empty-pattern 2006-11-22 19:05:43.000000000 +0000 -+++ grep-2.5.1a/src/grep.c 2006-11-22 19:22:04.000000000 +0000 -@@ -1667,9 +1667,6 @@ - out_invert ^= 1; - match_lines = match_words = 0; - } -- else -- /* Strip trailing newline. */ -- --keycc; - } - else - if (optind < argc) ---- grep-2.5.1a/src/search.c.empty-pattern 2006-11-22 19:21:11.000000000 +0000 -+++ grep-2.5.1a/src/search.c 2006-11-22 19:35:06.000000000 +0000 -@@ -204,6 +204,10 @@ - motif = sep; - } while (sep && total != 0); - -+ /* Strip trailing newline. */ -+ if (size && pattern[size - 1] == '\n') -+ size--; -+ - /* In the match_words and match_lines cases, we use a different pattern - for the DFA matcher that will quickly throw out cases that won't work. - Then if DFA succeeds we do some hairy stuff using the regex matcher -@@ -288,6 +292,10 @@ - motif = sep; - } while (sep && total != 0); - -+ /* Strip trailing newline. */ -+ if (size && pattern[size - 1] == '\n') -+ size--; -+ - /* In the match_words and match_lines cases, we use a different pattern - for the DFA matcher that will quickly throw out cases that won't work. - Then if DFA succeeds we do some hairy stuff using the regex matcher diff --git a/abs/core-testing/grep/64-egf-speedup.patch b/abs/core-testing/grep/64-egf-speedup.patch deleted file mode 100644 index a1fa024..0000000 --- a/abs/core-testing/grep/64-egf-speedup.patch +++ /dev/null @@ -1,791 +0,0 @@ ---- a/src/search.c.orig -+++ b/src/search.c -@@ -18,10 +18,15 @@ - - /* Written August 1992 by Mike Haertel. */ - -+#ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+#endif - #ifdef HAVE_CONFIG_H - # include - #endif - -+#include -+ - #include - - #include "mbsupport.h" -@@ -43,6 +48,9 @@ - #ifdef HAVE_LIBPCRE - # include - #endif -+#ifdef HAVE_LANGINFO_CODESET -+# include -+#endif - - #define NCHAR (UCHAR_MAX + 1) - -@@ -68,6 +76,19 @@ - error (2, 0, _("memory exhausted")); - } - -+/* UTF-8 encoding allows some optimizations that we can't otherwise -+ assume in a multibyte encoding. */ -+static int using_utf8; -+ -+void -+check_utf8 (void) -+{ -+#ifdef HAVE_LANGINFO_CODESET -+ if (strcmp (nl_langinfo (CODESET), "UTF-8") == 0) -+ using_utf8 = 1; -+#endif -+} -+ - #ifndef FGREP_PROGRAM - /* DFA compiled regexp. */ - static struct dfa dfa; -@@ -134,49 +155,6 @@ - } - #endif /* !FGREP_PROGRAM */ - --#ifdef MBS_SUPPORT --/* This function allocate the array which correspond to "buf". -- Then this check multibyte string and mark on the positions which -- are not single byte character nor the first byte of a multibyte -- character. Caller must free the array. */ --static char* --check_multibyte_string(char const *buf, size_t size) --{ -- char *mb_properties = xmalloc(size); -- mbstate_t cur_state; -- wchar_t wc; -- int i; -- -- memset(&cur_state, 0, sizeof(mbstate_t)); -- memset(mb_properties, 0, sizeof(char)*size); -- -- for (i = 0; i < size ;) -- { -- size_t mbclen; -- mbclen = mbrtowc(&wc, buf + i, size - i, &cur_state); -- -- if (mbclen == (size_t) -1 || mbclen == (size_t) -2 || mbclen == 0) -- { -- /* An invalid sequence, or a truncated multibyte character. -- We treat it as a single byte character. */ -- mbclen = 1; -- } -- else if (match_icase) -- { -- if (iswupper((wint_t)wc)) -- { -- wc = towlower((wint_t)wc); -- wcrtomb(buf + i, wc, &cur_state); -- } -- } -- mb_properties[i] = mbclen; -- i += mbclen; -- } -- -- return mb_properties; --} --#endif /* MBS_SUPPORT */ -- - #if defined(GREP_PROGRAM) || defined(EGREP_PROGRAM) - #ifdef EGREP_PROGRAM - COMPILE_FCT(Ecompile) -@@ -193,6 +171,7 @@ - size_t total = size; - char const *motif = pattern; - -+ check_utf8 (); - #if 0 - if (match_icase) - syntax_bits |= RE_ICASE; -@@ -303,20 +282,9 @@ hunk6 - struct kwsmatch kwsm; - size_t i, ret_val; - #ifdef MBS_SUPPORT -- char *mb_properties = NULL; -- if (MB_CUR_MAX > 1) -- { -- if (match_icase) -- { -- char *case_buf = xmalloc(size); -- memcpy(case_buf, buf, size); -- if (start_ptr) -- start_ptr = case_buf + (start_ptr - buf); -- buf = case_buf; -- } -- if (kwset) -- mb_properties = check_multibyte_string(buf, size); -- } -+ int mb_cur_max = MB_CUR_MAX; -+ mbstate_t mbs; -+ memset (&mbs, '\0', sizeof (mbstate_t)); - #endif /* MBS_SUPPORT */ - - buflim = buf + size; -@@ -329,21 +282,63 @@ hunk6 - if (kwset) - { - /* Find a possible match using the KWset matcher. */ -- size_t offset = kwsexec (kwset, beg, buflim - beg, &kwsm); -+#ifdef MBS_SUPPORT -+ size_t bytes_left = 0; -+#endif /* MBS_SUPPORT */ -+ size_t offset; -+#ifdef MBS_SUPPORT -+ /* kwsexec doesn't work with match_icase and multibyte input. */ -+ if (match_icase && mb_cur_max > 1) -+ /* Avoid kwset */ -+ offset = 0; -+ else -+#endif /* MBS_SUPPORT */ -+ offset = kwsexec (kwset, beg, buflim - beg, &kwsm); - if (offset == (size_t) -1) -- goto failure; -+ return (size_t)-1; -+#ifdef MBS_SUPPORT -+ if (mb_cur_max > 1 && !using_utf8) -+ { -+ bytes_left = offset; -+ while (bytes_left) -+ { -+ size_t mlen = mbrlen (beg, bytes_left, &mbs); -+ if (mlen == (size_t) -1 || mlen == 0) -+ { -+ /* Incomplete character: treat as single-byte. */ -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ beg++; -+ bytes_left--; -+ continue; -+ } -+ -+ if (mlen == (size_t) -2) -+ /* Offset points inside multibyte character: -+ * no good. */ -+ break; -+ -+ beg += mlen; -+ bytes_left -= mlen; -+ } -+ } -+ else -+#endif /* MBS_SUPPORT */ - beg += offset; - /* Narrow down to the line containing the candidate, and - run it through DFA. */ - end = memchr(beg, eol, buflim - beg); - end++; - #ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1 && mb_properties[beg - buf] == 0) -+ if (mb_cur_max > 1 && bytes_left) - continue; - #endif - while (beg > buf && beg[-1] != eol) - --beg; -- if (kwsm.index < kwset_exact_matches) -+ if ( -+#ifdef MBS_SUPPORT -+ !(match_icase && mb_cur_max > 1) && -+#endif /* MBS_SUPPORT */ -+ (kwsm.index < kwset_exact_matches)) - goto success; - if (dfaexec (&dfa, beg, end - beg, &backref) == (size_t) -1) - continue; -@@ -351,13 +363,47 @@ - else - { - /* No good fixed strings; start with DFA. */ -+#ifdef MBS_SUPPORT -+ size_t bytes_left = 0; -+#endif /* MBS_SUPPORT */ - size_t offset = dfaexec (&dfa, beg, buflim - beg, &backref); - if (offset == (size_t) -1) - break; - /* Narrow down to the line we've found. */ -+#ifdef MBS_SUPPORT -+ if (mb_cur_max > 1 && !using_utf8) -+ { -+ bytes_left = offset; -+ while (bytes_left) -+ { -+ size_t mlen = mbrlen (beg, bytes_left, &mbs); -+ if (mlen == (size_t) -1 || mlen == 0) -+ { -+ /* Incomplete character: treat as single-byte. */ -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ beg++; -+ bytes_left--; -+ continue; -+ } -+ -+ if (mlen == (size_t) -2) -+ /* Offset points inside multibyte character: -+ * no good. */ -+ break; -+ -+ beg += mlen; -+ bytes_left -= mlen; -+ } -+ } -+ else -+#endif /* MBS_SUPPORT */ - beg += offset; - end = memchr (beg, eol, buflim - beg); - end++; -+#ifdef MBS_SUPPORT -+ if (mb_cur_max > 1 && bytes_left) -+ continue; -+#endif /* MBS_SUPPORT */ - while (beg > buf && beg[-1] != eol) - --beg; - } -@@ -475,24 +521,144 @@ - *match_size = len; - ret_val = beg - buf; - out: --#ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1) -- { -- if (match_icase) -- free((char*)buf); -- if (mb_properties) -- free(mb_properties); -- } --#endif /* MBS_SUPPORT */ - return ret_val; - } - #endif /* defined(GREP_PROGRAM) || defined(EGREP_PROGRAM) */ - -+#ifdef MBS_SUPPORT -+static int f_i_multibyte; /* whether we're using the new -Fi MB method */ -+static struct -+{ -+ wchar_t **patterns; -+ size_t count, maxlen; -+ unsigned char *match; -+} Fimb; -+#endif -+ - #if defined(GREP_PROGRAM) || defined(FGREP_PROGRAM) - COMPILE_FCT(Fcompile) - { -+ int mb_cur_max = MB_CUR_MAX; - char const *beg, *lim, *err; - -+ check_utf8 (); -+#ifdef MBS_SUPPORT -+ /* Support -F -i for UTF-8 input. */ -+ if (match_icase && mb_cur_max > 1) -+ { -+ mbstate_t mbs; -+ wchar_t *wcpattern = xmalloc ((size + 1) * sizeof (wchar_t)); -+ const char *patternend = pattern; -+ size_t wcsize; -+ kwset_t fimb_kwset = NULL; -+ char *starts = NULL; -+ wchar_t *wcbeg, *wclim; -+ size_t allocated = 0; -+ -+ memset (&mbs, '\0', sizeof (mbs)); -+# ifdef __GNU_LIBRARY__ -+ wcsize = mbsnrtowcs (wcpattern, &patternend, size, size, &mbs); -+ if (patternend != pattern + size) -+ wcsize = (size_t) -1; -+# else -+ { -+ char *patterncopy = xmalloc (size + 1); -+ -+ memcpy (patterncopy, pattern, size); -+ patterncopy[size] = '\0'; -+ patternend = patterncopy; -+ wcsize = mbsrtowcs (wcpattern, &patternend, size, &mbs); -+ if (patternend != patterncopy + size) -+ wcsize = (size_t) -1; -+ free (patterncopy); -+ } -+# endif -+ if (wcsize + 2 <= 2) -+ { -+fimb_fail: -+ free (wcpattern); -+ free (starts); -+ if (fimb_kwset) -+ kwsfree (fimb_kwset); -+ free (Fimb.patterns); -+ Fimb.patterns = NULL; -+ } -+ else -+ { -+ if (!(fimb_kwset = kwsalloc (NULL))) -+ error (2, 0, _("memory exhausted")); -+ -+ starts = xmalloc (mb_cur_max * 3); -+ wcbeg = wcpattern; -+ do -+ { -+ int i; -+ size_t wclen; -+ -+ if (Fimb.count >= allocated) -+ { -+ if (allocated == 0) -+ allocated = 128; -+ else -+ allocated *= 2; -+ Fimb.patterns = xrealloc (Fimb.patterns, -+ sizeof (wchar_t *) * allocated); -+ } -+ Fimb.patterns[Fimb.count++] = wcbeg; -+ for (wclim = wcbeg; -+ wclim < wcpattern + wcsize && *wclim != L'\n'; ++wclim) -+ *wclim = towlower (*wclim); -+ *wclim = L'\0'; -+ wclen = wclim - wcbeg; -+ if (wclen > Fimb.maxlen) -+ Fimb.maxlen = wclen; -+ if (wclen > 3) -+ wclen = 3; -+ if (wclen == 0) -+ { -+ if ((err = kwsincr (fimb_kwset, "", 0)) != 0) -+ error (2, 0, err); -+ } -+ else -+ for (i = 0; i < (1 << wclen); i++) -+ { -+ char *p = starts; -+ int j, k; -+ -+ for (j = 0; j < wclen; ++j) -+ { -+ wchar_t wc = wcbeg[j]; -+ if (i & (1 << j)) -+ { -+ wc = towupper (wc); -+ if (wc == wcbeg[j]) -+ continue; -+ } -+ k = wctomb (p, wc); -+ if (k <= 0) -+ goto fimb_fail; -+ p += k; -+ } -+ if ((err = kwsincr (fimb_kwset, starts, p - starts)) != 0) -+ error (2, 0, err); -+ } -+ if (wclim < wcpattern + wcsize) -+ ++wclim; -+ wcbeg = wclim; -+ } -+ while (wcbeg < wcpattern + wcsize); -+ f_i_multibyte = 1; -+ kwset = fimb_kwset; -+ free (starts); -+ Fimb.match = xmalloc (Fimb.count); -+ if ((err = kwsprep (kwset)) != 0) -+ error (2, 0, err); -+ return; -+ } -+ } -+#endif /* MBS_SUPPORT */ -+ -+ - kwsinit (); - beg = pattern; - do -@@ -511,6 +677,76 @@ - error (2, 0, err); - } - -+#ifdef MBS_SUPPORT -+static int -+Fimbexec (const char *buf, size_t size, size_t *plen, int exact) -+{ -+ size_t len, letter, i; -+ int ret = -1; -+ mbstate_t mbs; -+ wchar_t wc; -+ int patterns_left; -+ -+ assert (match_icase && f_i_multibyte == 1); -+ assert (MB_CUR_MAX > 1); -+ -+ memset (&mbs, '\0', sizeof (mbs)); -+ memset (Fimb.match, '\1', Fimb.count); -+ letter = len = 0; -+ patterns_left = 1; -+ while (patterns_left && len <= size) -+ { -+ size_t c; -+ -+ patterns_left = 0; -+ if (len < size) -+ { -+ c = mbrtowc (&wc, buf + len, size - len, &mbs); -+ if (c + 2 <= 2) -+ return ret; -+ -+ wc = towlower (wc); -+ } -+ else -+ { -+ c = 1; -+ wc = L'\0'; -+ } -+ -+ for (i = 0; i < Fimb.count; i++) -+ { -+ if (Fimb.match[i]) -+ { -+ if (Fimb.patterns[i][letter] == L'\0') -+ { -+ /* Found a match. */ -+ *plen = len; -+ if (!exact && !match_words) -+ return 0; -+ else -+ { -+ /* For -w or exact look for longest match. */ -+ ret = 0; -+ Fimb.match[i] = '\0'; -+ continue; -+ } -+ } -+ -+ if (Fimb.patterns[i][letter] == wc) -+ patterns_left = 1; -+ else -+ Fimb.match[i] = '\0'; -+ } -+ } -+ -+ len += c; -+ letter++; -+ } -+ -+ return ret; -+} -+#endif /* MBS_SUPPORT */ -+ - EXECUTE_FCT(Fexecute) - { - register char const *beg, *try, *end; -@@ -519,69 +755,256 @@ - struct kwsmatch kwsmatch; - size_t ret_val; - #ifdef MBS_SUPPORT -- char *mb_properties = NULL; -- if (MB_CUR_MAX > 1) -- { -- if (match_icase) -- { -- char *case_buf = xmalloc(size); -- memcpy(case_buf, buf, size); -- if (start_ptr) -- start_ptr = case_buf + (start_ptr - buf); -- buf = case_buf; -- } -- mb_properties = check_multibyte_string(buf, size); -- } -+ int mb_cur_max = MB_CUR_MAX; -+ mbstate_t mbs; -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ const char *last_char = NULL; - #endif /* MBS_SUPPORT */ - - for (beg = start_ptr ? start_ptr : buf; beg <= buf + size; beg++) - { - size_t offset = kwsexec (kwset, beg, buf + size - beg, &kwsmatch); - if (offset == (size_t) -1) -- goto failure; -+ return offset; - #ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1 && mb_properties[offset+beg-buf] == 0) -- continue; /* It is a part of multibyte character. */ -+ if (mb_cur_max > 1 && !using_utf8) -+ { -+ size_t bytes_left = offset; -+ while (bytes_left) -+ { -+ size_t mlen = mbrlen (beg, bytes_left, &mbs); -+ -+ last_char = beg; -+ if (mlen == (size_t) -1 || mlen == 0) -+ { -+ /* Incomplete character: treat as single-byte. */ -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ beg++; -+ bytes_left--; -+ continue; -+ } -+ -+ if (mlen == (size_t) -2) -+ /* Offset points inside multibyte character: no good. */ -+ break; -+ -+ beg += mlen; -+ bytes_left -= mlen; -+ } -+ -+ if (bytes_left) -+ continue; -+ } -+ else - #endif /* MBS_SUPPORT */ - beg += offset; -+#ifdef MBS_SUPPORT -+ /* For f_i_multibyte, the string at beg now matches first 3 chars of -+ one of the search strings (less if there are shorter search strings). -+ See if this is a real match. */ -+ if (f_i_multibyte -+ && Fimbexec (beg, buf + size - beg, &kwsmatch.size[0], start_ptr == NULL)) -+ goto next_char; -+#endif /* MBS_SUPPORT */ - len = kwsmatch.size[0]; - if (start_ptr && !match_words) - goto success_in_beg_and_len; - if (match_lines) - { - if (beg > buf && beg[-1] != eol) -- continue; -+ goto next_char; - if (beg + len < buf + size && beg[len] != eol) -- continue; -+ goto next_char; - goto success; - } - else if (match_words) -- for (try = beg; len; ) -- { -- if (try > buf && WCHAR((unsigned char) try[-1])) -- break; -- if (try + len < buf + size && WCHAR((unsigned char) try[len])) -- { -- offset = kwsexec (kwset, beg, --len, &kwsmatch); -- if (offset == (size_t) -1) -- break; -- try = beg + offset; -- len = kwsmatch.size[0]; -- } -- else if (!start_ptr) -- goto success; -- else -- goto success_in_beg_and_len; -- } /* for (try) */ -- else -- goto success; -- } /* for (beg in buf) */ -+ { -+ while (len) -+ { -+ int word_match = 0; -+ if (beg > buf) -+ { -+#ifdef MBS_SUPPORT -+ if (mb_cur_max > 1) -+ { -+ const char *s; -+ int mr; -+ wchar_t pwc; -+ -+ if (using_utf8) -+ { -+ s = beg - 1; -+ while (s > buf -+ && (unsigned char) *s >= 0x80 -+ && (unsigned char) *s <= 0xbf) -+ --s; -+ } -+ else -+ s = last_char; -+ mr = mbtowc (&pwc, s, beg - s); -+ if (mr <= 0) -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ else if ((iswalnum (pwc) || pwc == L'_') -+ && mr == (int) (beg - s)) -+ goto next_char; -+ } -+ else -+#endif /* MBS_SUPPORT */ -+ if (WCHAR ((unsigned char) beg[-1])) -+ goto next_char; -+ } -+#ifdef MBS_SUPPORT -+ if (mb_cur_max > 1) -+ { -+ wchar_t nwc; -+ int mr; - -- failure: -- ret_val = -1; -- goto out; -+ mr = mbtowc (&nwc, beg + len, buf + size - beg - len); -+ if (mr <= 0) -+ { -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ word_match = 1; -+ } -+ else if (!iswalnum (nwc) && nwc != L'_') -+ word_match = 1; -+ } -+ else -+#endif /* MBS_SUPPORT */ -+ if (beg + len >= buf + size || !WCHAR ((unsigned char) beg[len])) -+ word_match = 1; -+ if (word_match) -+ { -+ if (start_ptr == NULL) -+ /* Returns the whole line now we know there's a word match. */ -+ goto success; -+ else { -+ /* Returns just this word match. */ -+ *match_size = len; -+ return beg - buf; -+ } -+ } -+ if (len > 0) -+ { -+ /* Try a shorter length anchored at the same place. */ -+ --len; -+ offset = kwsexec (kwset, beg, len, &kwsmatch); -+ -+ if (offset == -1) -+ goto next_char; /* Try a different anchor. */ -+#ifdef MBS_SUPPORT -+ -+ if (mb_cur_max > 1 && !using_utf8) -+ { -+ size_t bytes_left = offset; -+ while (bytes_left) -+ { -+ size_t mlen = mbrlen (beg, bytes_left, &mbs); -+ -+ last_char = beg; -+ if (mlen == (size_t) -1 || mlen == 0) -+ { -+ /* Incomplete character: treat as single-byte. */ -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ beg++; -+ bytes_left--; -+ continue; -+ } -+ -+ if (mlen == (size_t) -2) -+ { -+ /* Offset points inside multibyte character: -+ * no good. */ -+ break; -+ } -+ -+ beg += mlen; -+ bytes_left -= mlen; -+ } -+ -+ if (bytes_left) -+ { -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ goto next_char; /* Try a different anchor. */ -+ } -+ } -+ else -+#endif /* MBS_SUPPORT */ -+ beg += offset; -+#ifdef MBS_SUPPORT -+ /* The string at beg now matches first 3 chars of one of -+ the search strings (less if there are shorter search -+ strings). See if this is a real match. */ -+ if (f_i_multibyte -+ && Fimbexec (beg, len - offset, &kwsmatch.size[0], -+ start_ptr == NULL)) -+ goto next_char; -+#endif /* MBS_SUPPORT */ -+ len = kwsmatch.size[0]; -+ } -+ } -+ } -+ else -+ goto success; -+next_char:; -+#ifdef MBS_SUPPORT -+ /* Advance to next character. For MB_CUR_MAX == 1 case this is handled -+ by ++beg above. */ -+ if (mb_cur_max > 1) -+ { -+ if (using_utf8) -+ { -+ unsigned char c = *beg; -+ if (c >= 0xc2) -+ { -+ if (c < 0xe0) -+ ++beg; -+ else if (c < 0xf0) -+ beg += 2; -+ else if (c < 0xf8) -+ beg += 3; -+ else if (c < 0xfc) -+ beg += 4; -+ else if (c < 0xfe) -+ beg += 5; -+ } -+ } -+ else -+ { -+ size_t l = mbrlen (beg, buf + size - beg, &mbs); -+ -+ last_char = beg; -+ if (l + 2 >= 2) -+ beg += l - 1; -+ else -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ } -+ } -+#endif /* MBS_SUPPORT */ -+ } -+ -+ return -1; - - success: -+#ifdef MBS_SUPPORT -+ if (mb_cur_max > 1 && !using_utf8) -+ { -+ end = beg + len; -+ while (end < buf + size) -+ { -+ size_t mlen = mbrlen (end, buf + size - end, &mbs); -+ if (mlen == (size_t) -1 || mlen == (size_t) -2 || mlen == 0) -+ { -+ memset (&mbs, '\0', sizeof (mbstate_t)); -+ mlen = 1; -+ } -+ if (mlen == 1 && *end == eol) -+ break; -+ -+ end += mlen; -+ } -+ } -+ else -+ #endif /* MBS_SUPPORT */ - end = memchr (beg + len, eol, (buf + size) - (beg + len)); - end++; - while (buf < beg && beg[-1] != eol) -@@ -591,15 +1016,6 @@ - *match_size = len; - ret_val = beg - buf; - out: --#ifdef MBS_SUPPORT -- if (MB_CUR_MAX > 1) -- { -- if (match_icase) -- free((char*)buf); -- if (mb_properties) -- free(mb_properties); -- } --#endif /* MBS_SUPPORT */ - return ret_val; - } - #endif /* defined(GREP_PROGRAM) || defined(FGREP_PROGRAM) */ diff --git a/abs/core-testing/grep/PKGBUILD b/abs/core-testing/grep/PKGBUILD deleted file mode 100644 index 168d2d3..0000000 --- a/abs/core-testing/grep/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: judd -pkgname=grep -pkgver=2.5.3 -pkgrel=12 -pkgdesc="A string search utility" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnu.org/software/grep/grep.html" -groups=('base') -depends=('glibc' 'pcre') -makedepends=('texinfo>=4.8a') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz - # patches from fedora cvs - #01-fgrep.patch - #02-bracket.patch - #03-i18n.patch - #04-oi.patch - #05-manpage.patch - #06-color.patch - #07-icolor.patch - #08-skip.patch - #09-egf-speedup.patch - #10-dfa-optional.patch - #11-tests.patch - #12-w.patch - #13-P.patch - 14-mem-exhausted.patch - 15-empty-pattern.patch - 64-egf-speedup.patch -) -md5sums=('4f371f25f413f700fb1984b878421f9d' - 'bc937da562d468f32c1fef2894610283' - 'f421415b679ebcc9152797caaa0b1d51' - 'efbe9d49d71a74092db6b86224b09fdd') - - - -build() { - cd $startdir/src/$pkgname-$pkgver - for i in ../*.patch; do - patch -Np1 -i ../$i - done - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install - mkdir $startdir/pkg/bin - mv $startdir/pkg/usr/bin/*grep $startdir/pkg/bin/ - rmdir $startdir/pkg/usr/bin -} diff --git a/abs/core-testing/groff/PKGBUILD b/abs/core-testing/groff/PKGBUILD deleted file mode 100644 index 5183acc..0000000 --- a/abs/core-testing/groff/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: judd -pkgname=groff -pkgver=1.19.2 -pkgrel=13 -pkgdesc="GNU troff text-formatting system" -arch=(i686 x86_64) -url="http://www.gnu.org/software/groff/groff.html" -license=('GPL') -groups=('base') -depends=('perl' 'gcc-libs') -source=(ftp://ftp.gnu.org/gnu/groff/groff-$pkgver.tar.gz - man-utf8.tmac) -md5sums=('f7c9cf2e4b9967d3af167d7c9fadaae4' - 'faefbef2b05ee5438b632464607c6cc4') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --without-x - mkdir -p $startdir/pkg/usr - make -j1 || return 1 - make prefix=$startdir/pkg/usr install - cd $startdir/pkg/usr/bin - # needed for xman - ln -s eqn geqn - ln -s tbl gtbl - ln -s soelim zsoelim - rm -rf $startdir/pkg/usr/lib - - # Fix some issues when encoding to utf8 man pages - # The output chars don't match keyboard chars... - cat $startdir/src/man-utf8.tmac >> \ - $startdir/pkg/usr/share/groff/site-tmac/man.local -} diff --git a/abs/core-testing/groff/man-utf8.tmac b/abs/core-testing/groff/man-utf8.tmac deleted file mode 100644 index 17c0983..0000000 --- a/abs/core-testing/groff/man-utf8.tmac +++ /dev/null @@ -1,9 +0,0 @@ -.\" This file is loaded after an-old.tmac. -.\" Put any local modifications to an-old.tmac here. - -.if '\*[.T]'utf8' \ -. char \- \N'45' -. char - \N'45' -. char ' \N'39' -.. - diff --git a/abs/core-testing/grub-gfx.tar.gz b/abs/core-testing/grub-gfx.tar.gz deleted file mode 100644 index 68f9e8a..0000000 Binary files a/abs/core-testing/grub-gfx.tar.gz and /dev/null differ diff --git a/abs/core-testing/grub-gfx/040_all_grub-0.96-nxstack.patch b/abs/core-testing/grub-gfx/040_all_grub-0.96-nxstack.patch deleted file mode 100644 index 121941c..0000000 --- a/abs/core-testing/grub-gfx/040_all_grub-0.96-nxstack.patch +++ /dev/null @@ -1,623 +0,0 @@ -Fix NX segfaulting on amd64. - -Patch by Peter Jones. - -http://lists.gnu.org/archive/html/bug-grub/2005-03/msg00011.html - ---- grub-0.97/grub/asmstub.c -+++ grub-0.97/grub/asmstub.c -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - #ifdef __linux__ - # include /* ioctl */ -@@ -79,7 +80,7 @@ - struct apm_info apm_bios_info; - - /* Emulation requirements. */ --char *grub_scratch_mem = 0; -+void *grub_scratch_mem = 0; - - struct geometry *disks = 0; - -@@ -103,14 +104,62 @@ - static unsigned int serial_speed; - #endif /* SIMULATE_SLOWNESS_OF_SERIAL */ - -+/* This allocates page-aligned storage of the specified size, which must be -+ * a multiple of the page size as determined by calling sysconf(_SC_PAGESIZE) -+ */ -+#ifdef __linux__ -+static void * -+grub_mmap_alloc(size_t len) -+{ -+ int mmap_flags = MAP_ANONYMOUS|MAP_PRIVATE|MAP_EXECUTABLE; -+ -+#ifdef MAP_32BIT -+ mmap_flags |= MAP_32BIT; -+#endif -+ /* Mark the simulated stack executable, as GCC uses stack trampolines -+ * to implement nested functions. */ -+ return mmap(NULL, len, PROT_READ|PROT_WRITE|PROT_EXEC, mmap_flags, -1, 0); -+} -+#else /* !defined(__linux__) */ -+static void * -+grub_mmap_alloc(size_t len) -+{ -+ int fd = 0, offset = 0, ret = 0; -+ void *pa = MAP_FAILED; -+ char template[] = "/tmp/grub_mmap_alloc_XXXXXX"; -+ errno_t e; -+ -+ fd = mkstemp(template); -+ if (fd < 0) -+ return pa; -+ -+ unlink(template); -+ -+ ret = ftruncate(fd, len); -+ if (ret < 0) -+ return pa; -+ -+ /* Mark the simulated stack executable, as GCC uses stack trampolines -+ * to implement nested functions. */ -+ pa = mmap(NULL, len, PROT_READ|PROT_WRITE|PROT_EXEC, -+ MAP_PRIVATE|MAP_EXECUTABLE, fd, offset); -+ -+ e = errno; -+ close(fd); -+ errno = e; -+ return pa; -+} -+#endif /* defined(__linux__) */ -+ - /* The main entry point into this mess. */ - int - grub_stage2 (void) - { - /* These need to be static, because they survive our stack transitions. */ - static int status = 0; -- static char *realstack; -- char *scratch, *simstack; -+ static void *realstack; -+ void *simstack_alloc_base, *simstack; -+ size_t simstack_size, page_size; - int i; - - /* We need a nested function so that we get a clean stack frame, -@@ -140,9 +189,35 @@ - } - - assert (grub_scratch_mem == 0); -- scratch = malloc (0x100000 + EXTENDED_MEMSIZE + 15); -- assert (scratch); -- grub_scratch_mem = (char *) ((((int) scratch) >> 4) << 4); -+ -+ /* Allocate enough pages for 0x100000 + EXTENDED_SIZE + 15, and -+ * make sure the memory is aligned to a multiple of the system's -+ * page size */ -+ page_size = sysconf (_SC_PAGESIZE); -+ simstack_size = ( 0x100000 + EXTENDED_MEMSIZE + 15); -+ if (simstack_size % page_size) -+ { -+ /* If we're not on a page_size boundary, round up to the next one */ -+ simstack_size &= ~(page_size-1); -+ simstack_size += page_size; -+ } -+ -+ /* Add one for a PROT_NONE boundary page at each end. */ -+ simstack_size += 2 * page_size; -+ -+ simstack_alloc_base = grub_mmap_alloc(simstack_size); -+ assert (simstack_alloc_base != MAP_FAILED); -+ -+ /* mark pages above and below our simstack area as innaccessable. -+ * If the implementation we're using doesn't support that, then the -+ * new protection modes are undefined. It's safe to just ignore -+ * them, though. It'd be nice if we knew that we'd get a SEGV for -+ * touching the area, but that's all. it'd be nice to have. */ -+ mprotect (simstack_alloc_base, page_size, PROT_NONE); -+ mprotect ((void *)((unsigned long)simstack_alloc_base + -+ simstack_size - page_size), page_size, PROT_NONE); -+ -+ grub_scratch_mem = (void *)((unsigned long)simstack_alloc_base + page_size); - - /* FIXME: simulate the memory holes using mprot, if available. */ - -@@ -215,7 +290,7 @@ - device_map = 0; - free (disks); - disks = 0; -- free (scratch); -+ munmap(simstack_alloc_base, simstack_size); - grub_scratch_mem = 0; - - if (serial_device) ---- grub-0.97/stage2/builtins.c -+++ grub-0.97/stage2/builtins.c -@@ -131,63 +131,98 @@ - } - - -+/* blocklist_read_helper nee disk_read_blocklist_func was a nested -+ * function, to which pointers were taken and exposed globally. Even -+ * in the GNU-C nested functions extension, they have local linkage, -+ * and aren't guaranteed to be accessable *at all* outside of their -+ * containing scope. -+ * -+ * Above and beyond all of that, the variables within blocklist_func_context -+ * are originally local variables, with local (not even static) linkage, -+ * from within blocklist_func. These were each referenced by -+ * disk_read_blocklist_func, which is only called from other functions -+ * through a globally scoped pointer. -+ * -+ * The documentation in GCC actually uses the words "all hell will break -+ * loose" to describe this scenario. -+ * -+ * Also, "start_sector" was also used uninitialized, but gcc doesn't warn -+ * about it (possibly because of the scoping madness?) -+ */ -+ -+static struct { -+ int start_sector; -+ int num_sectors; -+ int num_entries; -+ int last_length; -+} blocklist_func_context = { -+ .start_sector = 0, -+ .num_sectors = 0, -+ .num_entries = 0, -+ .last_length = 0 -+}; -+ -+/* Collect contiguous blocks into one entry as many as possible, -+ and print the blocklist notation on the screen. */ -+static void -+blocklist_read_helper (int sector, int offset, int length) -+{ -+ int *start_sector = &blocklist_func_context.start_sector; -+ int *num_sectors = &blocklist_func_context.num_sectors; -+ int *num_entries = &blocklist_func_context.num_entries; -+ int *last_length = &blocklist_func_context.last_length; -+ -+ if (*num_sectors > 0) -+ { -+ if (*start_sector + *num_sectors == sector -+ && offset == 0 && *last_length == SECTOR_SIZE) -+ { -+ *num_sectors++; -+ *last_length = length; -+ return; -+ } -+ else -+ { -+ if (*last_length == SECTOR_SIZE) -+ grub_printf ("%s%d+%d", *num_entries ? "," : "", -+ *start_sector - part_start, *num_sectors); -+ else if (*num_sectors > 1) -+ grub_printf ("%s%d+%d,%d[0-%d]", *num_entries ? "," : "", -+ *start_sector - part_start, *num_sectors-1, -+ *start_sector + *num_sectors-1 - part_start, -+ *last_length); -+ else -+ grub_printf ("%s%d[0-%d]", *num_entries ? "," : "", -+ *start_sector - part_start, *last_length); -+ *num_entries++; -+ *num_sectors = 0; -+ } -+ } -+ -+ if (offset > 0) -+ { -+ grub_printf("%s%d[%d-%d]", *num_entries ? "," : "", -+ sector-part_start, offset, offset+length); -+ *num_entries++; -+ } -+ else -+ { -+ *start_sector = sector; -+ *num_sectors = 1; -+ *last_length = length; -+ } -+} -+ - /* blocklist */ - static int - blocklist_func (char *arg, int flags) - { - char *dummy = (char *) RAW_ADDR (0x100000); -- int start_sector; -- int num_sectors = 0; -- int num_entries = 0; -- int last_length = 0; -- -- auto void disk_read_blocklist_func (int sector, int offset, int length); -- -- /* Collect contiguous blocks into one entry as many as possible, -- and print the blocklist notation on the screen. */ -- auto void disk_read_blocklist_func (int sector, int offset, int length) -- { -- if (num_sectors > 0) -- { -- if (start_sector + num_sectors == sector -- && offset == 0 && last_length == SECTOR_SIZE) -- { -- num_sectors++; -- last_length = length; -- return; -- } -- else -- { -- if (last_length == SECTOR_SIZE) -- grub_printf ("%s%d+%d", num_entries ? "," : "", -- start_sector - part_start, num_sectors); -- else if (num_sectors > 1) -- grub_printf ("%s%d+%d,%d[0-%d]", num_entries ? "," : "", -- start_sector - part_start, num_sectors-1, -- start_sector + num_sectors-1 - part_start, -- last_length); -- else -- grub_printf ("%s%d[0-%d]", num_entries ? "," : "", -- start_sector - part_start, last_length); -- num_entries++; -- num_sectors = 0; -- } -- } -- -- if (offset > 0) -- { -- grub_printf("%s%d[%d-%d]", num_entries ? "," : "", -- sector-part_start, offset, offset+length); -- num_entries++; -- } -- else -- { -- start_sector = sector; -- num_sectors = 1; -- last_length = length; -- } -- } - -+ int *start_sector = &blocklist_func_context.start_sector; -+ int *num_sectors = &blocklist_func_context.num_sectors; -+ int *num_entries = &blocklist_func_context.num_entries; -+ - /* Open the file. */ - if (! grub_open (arg)) - return 1; -@@ -204,15 +241,15 @@ - grub_printf (")"); - - /* Read in the whole file to DUMMY. */ -- disk_read_hook = disk_read_blocklist_func; -+ disk_read_hook = blocklist_read_helper; - if (! grub_read (dummy, -1)) - goto fail; - - /* The last entry may not be printed yet. Don't check if it is a - * full sector, since it doesn't matter if we read too much. */ -- if (num_sectors > 0) -- grub_printf ("%s%d+%d", num_entries ? "," : "", -- start_sector - part_start, num_sectors); -+ if (*num_sectors > 0) -+ grub_printf ("%s%d+%d", *num_entries ? "," : "", -+ *start_sector - part_start, *num_sectors); - - grub_printf ("\n"); - -@@ -1868,6 +1905,77 @@ - - - /* install */ -+static struct { -+ int saved_sector; -+ int installaddr; -+ int installlist; -+ char *stage2_first_buffer; -+} install_func_context = { -+ .saved_sector = 0, -+ .installaddr = 0, -+ .installlist = 0, -+ .stage2_first_buffer = NULL, -+}; -+ -+/* Save the first sector of Stage2 in STAGE2_SECT. */ -+/* Formerly disk_read_savesect_func with local scope inside install_func */ -+static void -+install_savesect_helper(int sector, int offset, int length) -+{ -+ if (debug) -+ printf ("[%d]", sector); -+ -+ /* ReiserFS has files which sometimes contain data not aligned -+ on sector boundaries. Returning an error is better than -+ silently failing. */ -+ if (offset != 0 || length != SECTOR_SIZE) -+ errnum = ERR_UNALIGNED; -+ -+ install_func_context.saved_sector = sector; -+} -+ -+/* Write SECTOR to INSTALLLIST, and update INSTALLADDR and INSTALLSECT. */ -+/* Formerly disk_read_blocklist_func with local scope inside install_func */ -+static void -+install_blocklist_helper (int sector, int offset, int length) -+{ -+ int *installaddr = &install_func_context.installaddr; -+ int *installlist = &install_func_context.installlist; -+ char **stage2_first_buffer = &install_func_context.stage2_first_buffer; -+ /* Was the last sector full? */ -+ static int last_length = SECTOR_SIZE; -+ -+ if (debug) -+ printf("[%d]", sector); -+ -+ if (offset != 0 || last_length != SECTOR_SIZE) -+ { -+ /* We found a non-sector-aligned data block. */ -+ errnum = ERR_UNALIGNED; -+ return; -+ } -+ -+ last_length = length; -+ -+ if (*((unsigned long *) (*installlist - 4)) -+ + *((unsigned short *) *installlist) != sector -+ || *installlist == (int) *stage2_first_buffer + SECTOR_SIZE + 4) -+ { -+ *installlist -= 8; -+ -+ if (*((unsigned long *) (*installlist - 8))) -+ errnum = ERR_WONT_FIT; -+ else -+ { -+ *((unsigned short *) (*installlist + 2)) = (*installaddr >> 4); -+ *((unsigned long *) (*installlist - 4)) = sector; -+ } -+ } -+ -+ *((unsigned short *) *installlist) += 1; -+ *installaddr += 512; -+} -+ - static int - install_func (char *arg, int flags) - { -@@ -1875,8 +1983,12 @@ - char *stage1_buffer = (char *) RAW_ADDR (0x100000); - char *stage2_buffer = stage1_buffer + SECTOR_SIZE; - char *old_sect = stage2_buffer + SECTOR_SIZE; -- char *stage2_first_buffer = old_sect + SECTOR_SIZE; -- char *stage2_second_buffer = stage2_first_buffer + SECTOR_SIZE; -+ /* stage2_first_buffer used to be defined as: -+ * char *stage2_first_buffer = old_sect + SECTOR_SIZE; */ -+ char **stage2_first_buffer = &install_func_context.stage2_first_buffer; -+ /* and stage2_second_buffer was: -+ * char *stage2_second_buffer = stage2_first_buffer + SECTOR_SIZE; */ -+ char *stage2_second_buffer = old_sect + SECTOR_SIZE + SECTOR_SIZE; - /* XXX: Probably SECTOR_SIZE is reasonable. */ - char *config_filename = stage2_second_buffer + SECTOR_SIZE; - char *dummy = config_filename + SECTOR_SIZE; -@@ -1885,10 +1997,11 @@ - int src_drive, src_partition, src_part_start; - int i; - struct geometry dest_geom, src_geom; -- int saved_sector; -+ int *saved_sector = &install_func_context.saved_sector; - int stage2_first_sector, stage2_second_sector; - char *ptr; -- int installaddr, installlist; -+ int *installaddr = &install_func_context.installaddr; -+ int *installlist = &install_func_context.installlist; - /* Point to the location of the name of a configuration file in Stage 2. */ - char *config_file_location; - /* If FILE is a Stage 1.5? */ -@@ -1897,67 +2010,13 @@ - int is_open = 0; - /* If LBA is forced? */ - int is_force_lba = 0; -- /* Was the last sector full? */ -- int last_length = SECTOR_SIZE; -- -+ -+ *stage2_first_buffer = old_sect + SECTOR_SIZE; - #ifdef GRUB_UTIL - /* If the Stage 2 is in a partition mounted by an OS, this will store - the filename under the OS. */ - char *stage2_os_file = 0; - #endif /* GRUB_UTIL */ -- -- auto void disk_read_savesect_func (int sector, int offset, int length); -- auto void disk_read_blocklist_func (int sector, int offset, int length); -- -- /* Save the first sector of Stage2 in STAGE2_SECT. */ -- auto void disk_read_savesect_func (int sector, int offset, int length) -- { -- if (debug) -- printf ("[%d]", sector); -- -- /* ReiserFS has files which sometimes contain data not aligned -- on sector boundaries. Returning an error is better than -- silently failing. */ -- if (offset != 0 || length != SECTOR_SIZE) -- errnum = ERR_UNALIGNED; -- -- saved_sector = sector; -- } -- -- /* Write SECTOR to INSTALLLIST, and update INSTALLADDR and -- INSTALLSECT. */ -- auto void disk_read_blocklist_func (int sector, int offset, int length) -- { -- if (debug) -- printf("[%d]", sector); -- -- if (offset != 0 || last_length != SECTOR_SIZE) -- { -- /* We found a non-sector-aligned data block. */ -- errnum = ERR_UNALIGNED; -- return; -- } -- -- last_length = length; -- -- if (*((unsigned long *) (installlist - 4)) -- + *((unsigned short *) installlist) != sector -- || installlist == (int) stage2_first_buffer + SECTOR_SIZE + 4) -- { -- installlist -= 8; -- -- if (*((unsigned long *) (installlist - 8))) -- errnum = ERR_WONT_FIT; -- else -- { -- *((unsigned short *) (installlist + 2)) = (installaddr >> 4); -- *((unsigned long *) (installlist - 4)) = sector; -- } -- } -- -- *((unsigned short *) installlist) += 1; -- installaddr += 512; -- } - - /* First, check the GNU-style long option. */ - while (1) -@@ -1987,10 +2049,10 @@ - addr = skip_to (0, file); - - /* Get the installation address. */ -- if (! safe_parse_maxint (&addr, &installaddr)) -+ if (! safe_parse_maxint (&addr, installaddr)) - { - /* ADDR is not specified. */ -- installaddr = 0; -+ *installaddr = 0; - ptr = addr; - errnum = 0; - } -@@ -2084,17 +2146,17 @@ - = (dest_drive & BIOS_FLAG_FIXED_DISK); - - /* Read the first sector of Stage 2. */ -- disk_read_hook = disk_read_savesect_func; -- if (grub_read (stage2_first_buffer, SECTOR_SIZE) != SECTOR_SIZE) -+ disk_read_hook = install_savesect_helper; -+ if (grub_read (*stage2_first_buffer, SECTOR_SIZE) != SECTOR_SIZE) - goto fail; - -- stage2_first_sector = saved_sector; -+ stage2_first_sector = *saved_sector; - - /* Read the second sector of Stage 2. */ - if (grub_read (stage2_second_buffer, SECTOR_SIZE) != SECTOR_SIZE) - goto fail; - -- stage2_second_sector = saved_sector; -+ stage2_second_sector = *saved_sector; - - /* Check for the version of Stage 2. */ - if (*((short *) (stage2_second_buffer + STAGE2_VER_MAJ_OFFS)) -@@ -2110,27 +2172,27 @@ - - /* If INSTALLADDR is not specified explicitly in the command-line, - determine it by the Stage 2 id. */ -- if (! installaddr) -+ if (! *installaddr) - { - if (! is_stage1_5) - /* Stage 2. */ -- installaddr = 0x8000; -+ *installaddr = 0x8000; - else - /* Stage 1.5. */ -- installaddr = 0x2000; -+ *installaddr = 0x2000; - } - - *((unsigned long *) (stage1_buffer + STAGE1_STAGE2_SECTOR)) - = stage2_first_sector; - *((unsigned short *) (stage1_buffer + STAGE1_STAGE2_ADDRESS)) -- = installaddr; -+ = *installaddr; - *((unsigned short *) (stage1_buffer + STAGE1_STAGE2_SEGMENT)) -- = installaddr >> 4; -+ = *installaddr >> 4; - -- i = (int) stage2_first_buffer + SECTOR_SIZE - 4; -+ i = (int) *stage2_first_buffer + SECTOR_SIZE - 4; - while (*((unsigned long *) i)) - { -- if (i < (int) stage2_first_buffer -+ if (i < (int) *stage2_first_buffer - || (*((int *) (i - 4)) & 0x80000000) - || *((unsigned short *) i) >= 0xA00 - || *((short *) (i + 2)) == 0) -@@ -2144,13 +2206,13 @@ - i -= 8; - } - -- installlist = (int) stage2_first_buffer + SECTOR_SIZE + 4; -- installaddr += SECTOR_SIZE; -+ *installlist = (int) *stage2_first_buffer + SECTOR_SIZE + 4; -+ *installaddr += SECTOR_SIZE; - - /* Read the whole of Stage2 except for the first sector. */ - grub_seek (SECTOR_SIZE); - -- disk_read_hook = disk_read_blocklist_func; -+ disk_read_hook = install_blocklist_helper; - if (! grub_read (dummy, -1)) - goto fail; - -@@ -2233,7 +2295,7 @@ - /* Skip the first sector. */ - grub_seek (SECTOR_SIZE); - -- disk_read_hook = disk_read_savesect_func; -+ disk_read_hook = install_savesect_helper; - if (grub_read (stage2_buffer, SECTOR_SIZE) != SECTOR_SIZE) - goto fail; - -@@ -2303,7 +2365,7 @@ - else - #endif /* GRUB_UTIL */ - { -- if (! devwrite (saved_sector - part_start, 1, stage2_buffer)) -+ if (! devwrite (*saved_sector - part_start, 1, stage2_buffer)) - goto fail; - } - } -@@ -2325,7 +2387,7 @@ - goto fail; - } - -- if (fwrite (stage2_first_buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE) -+ if (fwrite (*stage2_first_buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE) - { - fclose (fp); - errnum = ERR_WRITE; -@@ -2352,7 +2414,7 @@ - goto fail; - - if (! devwrite (stage2_first_sector - src_part_start, 1, -- stage2_first_buffer)) -+ *stage2_first_buffer)) - goto fail; - - if (! devwrite (stage2_second_sector - src_part_start, 1, ---- grub-0.97/stage2/shared.h -+++ grub-0.97/stage2/shared.h -@@ -36,8 +36,8 @@ - - /* Maybe redirect memory requests through grub_scratch_mem. */ - #ifdef GRUB_UTIL --extern char *grub_scratch_mem; --# define RAW_ADDR(x) ((x) + (int) grub_scratch_mem) -+extern void *grub_scratch_mem; -+# define RAW_ADDR(x) ((x) + (unsigned long) grub_scratch_mem) - # define RAW_SEG(x) (RAW_ADDR ((x) << 4) >> 4) - #else - # define RAW_ADDR(x) (x) diff --git a/abs/core-testing/grub-gfx/05-grub-0.97-initrdaddr.diff b/abs/core-testing/grub-gfx/05-grub-0.97-initrdaddr.diff deleted file mode 100644 index ccf5f3e..0000000 --- a/abs/core-testing/grub-gfx/05-grub-0.97-initrdaddr.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- grub-0.96/stage2/boot.c -+++ grub-0.96/stage2/boot.c -@@ -824,8 +824,11 @@ - moveto = (mbi.mem_upper + 0x400) << 10; - - moveto = (moveto - len) & 0xfffff000; -- max_addr = (lh->header == LINUX_MAGIC_SIGNATURE && lh->version >= 0x0203 -- ? lh->initrd_addr_max : LINUX_INITRD_MAX_ADDRESS); -+ max_addr = LINUX_INITRD_MAX_ADDRESS; -+ if (lh->header == LINUX_MAGIC_SIGNATURE && -+ lh->version >= 0x0203 && -+ lh->initrd_addr_max < max_addr) -+ max_addr = lh->initrd_addr_max; - if (moveto + len >= max_addr) - moveto = (max_addr - len) & 0xfffff000; - diff --git a/abs/core-testing/grub-gfx/PKGBUILD b/abs/core-testing/grub-gfx/PKGBUILD deleted file mode 100644 index 5d95294..0000000 --- a/abs/core-testing/grub-gfx/PKGBUILD +++ /dev/null @@ -1,106 +0,0 @@ -# Maintainer: Douglas Soares de Andrade -# Contributor: judd -# Contributor: Mario A. Vazquez -# Contributor: Jerzy Goca - -pkgname=grub -pkgver=0.97 -pkgrel=43 -pkgdesc="A GNU multiboot boot loader" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnu.org/software/grub/" -depends=('ncurses') -makedepends=('automake>=1.10' 'autoconf>=2.61' 'patch') -#conflicts=('grub') -groups=('base') -provides=('grub') -source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz \ - menu.lst install-grub grub-0.97-graphics.patch \ - splash.xpm.gz grub-inode-size.patch \ - 040_all_grub-0.96-nxstack.patch \ - 05-grub-0.97-initrdaddr.diff ext4.patch \ - i2o.patch special-devices.patch more-raid.patch intelmac.patch) -backup=('boot/grub/menu.lst') -install=grub-gfx.install - -build() { - cd $startdir/src/grub-$pkgver - - #set destination architecture here - DESTARCH="i686" - #DESTARCH="x86_64" - - # graphics patch - patch -p1 < ../grub-0.97-graphics.patch || return 1 - - # optimizations break the build -- disable them - # adding special devices to grub, patches are from fedora - patch -Np1 -i ../special-devices.patch || return 1 - patch -Np1 -i ../i2o.patch || return 1 - patch -Np1 -i ../more-raid.patch || return 1 - patch -Np1 -i ../intelmac.patch || return 1 - patch -Np1 -i ../grub-inode-size.patch || return 1 - patch -Np1 -i ../ext4.patch || return 1 - - # correcting problems for new wersion of autotools - sed -i -e'/^AC_PROG_CC/ a\AM_PROG_CC_C_O\ ' configure.ac - sed -i -e'/^AC_PROG_CC/ a\AM_PROG_AS\ ' configure.ac - aclocal - autoconf - automake - - #arch64 fixes for static build - if [ "$CARCH" = "x86_64" ]; then - echo "this package has to be build on i686, won't compile on x86_64" - sleep 5 - else - if [ "$DESTARCH" = "x86_64" ]; then - # patch from gentoo for fixing a segfault - patch -Np1 -i ../040_all_grub-0.96-nxstack.patch || return 1 - # patch from frugalware to make it boot when more than 2GB ram installed - patch -Np1 -i ../05-grub-0.97-initrdaddr.diff || return 1 - CFLAGS="-static" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin - else - CFLAGS= ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin - fi - fi - - CFLAGS= make || return 1 - make DESTDIR=$startdir/pkg install - install -D -m644 ../menu.lst $startdir/pkg/boot/grub/menu.lst - install -D -m755 ../install-grub $startdir/pkg/sbin/install-grub - - # symlink for compatibility with the <=0.7 installer - mkdir -p $startdir/pkg/usr/share - ln -s ../lib/grub $startdir/pkg/usr/share/grub - - # splashimage xpm install - install -D -m644 $startdir/splash.xpm.gz $startdir/pkg/boot/grub/splash.xpm.gz - - # Create a symlink to people that was using it - pushd $startdir/pkg/boot/grub/ - ln -s splash.xpm.gz arch.xpm.gz - popd - - rm -f $pkgdir/usr/share/info/dir || return 1 - - if [ "$DESTARCH" = "x86_64" ]; then - # fool makepkg into building a x86_64 package - export CARCH="x86_64" - fi - -} -md5sums=('cd3f3eb54446be6003156158d51f4884' - '58cfec4abda85307f779147ab9a6be48' - '3182c4ae4963a16930bc772bba89dacf' - '12f043616b51ce2ba82e46c9186a528d' - '342f59f24cf5de5f013eacda68e617eb' - 'ada26cbc681907823cc4ff2a55b97866' - 'eb9d69c46af3a0667c1f651817d7f075' - 'ccd2d757e79e3a03dc19ede7391ed328' - '39e0f9a05b7e04aceb24fc7bc4893e3d' - '826fdbf446067f9861baf9f6a69a4583' - '49f6d4bcced0bc8bbcff273f3254bbfa' - 'f41f702014a064918d7afc6fc23baa6e' - '175dc6b9f4ab94e8056c3afb3e34460a') diff --git a/abs/core-testing/grub-gfx/ext4.patch b/abs/core-testing/grub-gfx/ext4.patch deleted file mode 100644 index 8a2f9bd..0000000 --- a/abs/core-testing/grub-gfx/ext4.patch +++ /dev/null @@ -1,263 +0,0 @@ -diff -ruNp grub-0.97/stage2/fsys_ext2fs.c grub-0.97-patch/stage2/fsys_ext2fs.c ---- grub-0.97/stage2/fsys_ext2fs.c 2004-08-08 20:19:18.000000000 +0200 -+++ grub-0.97-patch/stage2/fsys_ext2fs.c 2007-12-29 16:25:19.000000000 -+0100 -@@ -51,6 +51,9 @@ typedef unsigned int __u32; - #define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1) - #define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1) - -+/* Inode flags */ -+#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ -+ - /* include/linux/ext2_fs.h */ - struct ext2_super_block - { -@@ -191,6 +194,42 @@ struct ext2_dir_entry - #define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ - ~EXT2_DIR_ROUND) - -+/* linux/ext4_fs_extents.h */ -+/* -+ * This is the extent on-disk structure. -+ * It's used at the bottom of the tree. -+ */ -+struct ext4_extent { -+ __u32 ee_block; /* first logical block extent covers */ -+ __u16 ee_len; /* number of blocks covered by extent */ -+ __u16 ee_start_hi; /* high 16 bits of physical block */ -+ __u32 ee_start; /* low 32 bits of physical block */ -+}; -+ -+/* -+ * This is index on-disk structure. -+ * It's used at all the levels except the bottom. -+ */ -+struct ext4_extent_idx { -+ __u32 ei_block; /* index covers logical blocks from 'block' */ -+ __u32 ei_leaf; /* pointer to the physical block of the next * -+ * level. leaf or next index could be there */ -+ __u16 ei_leaf_hi; /* high 16 bits of physical block */ -+ __u16 ei_unused; -+}; -+ -+/* -+ * Each block (leaves and indexes), even inode-stored has header. -+ */ -+struct ext4_extent_header { -+ __u16 eh_magic; /* probably will support different formats */ -+ __u16 eh_entries; /* number of valid entries */ -+ __u16 eh_max; /* capacity of store in entries */ -+ __u16 eh_depth; /* has tree real underlying blocks? */ -+ __u32 eh_generation; /* generation of the tree */ -+}; -+ -+#define EXT4_EXT_MAGIC 0xf30a - - /* ext2/super.c */ - #define log2(n) ffz(~(n)) -@@ -279,6 +318,26 @@ ext2_rdfsb (int fsblock, int buffer) - EXT2_BLOCK_SIZE (SUPERBLOCK), (char *) buffer); - } - -+/* Walk through extents index tree to find the good leaf */ -+static struct ext4_extent_header * -+ext4_recurse_extent_index(struct ext4_extent_header *extent_block, int logical_block) -+{ -+ int i; -+ struct ext4_extent_idx *index = (struct ext4_extent_idx *) (extent_block + 1); -+ if (extent_block->eh_magic != EXT4_EXT_MAGIC) -+ return NULL; -+ if (extent_block->eh_depth == 0) -+ return extent_block; -+ for (i = 0; i < extent_block->eh_entries; i++) -+ { -+ if (logical_block < index[i].ei_block) -+ break; -+ } -+ if (i == 0 || !ext2_rdfsb(index[i-1].ei_leaf, DATABLOCK1)) -+ return NULL; -+ return (ext4_recurse_extent_index((struct ext4_extent_header *) DATABLOCK1, logical_block)); -+} -+ - /* from - ext2/inode.c:ext2_bmap() - */ ---- grub-0.97/stage2/fsys_ext2fs.c~ 2008-12-28 20:19:00.000000000 +0100 -+++ grub-0.97/stage2/fsys_ext2fs.c 2008-12-28 20:19:00.000000000 +0100 -@@ -366,83 +366,106 @@ - } - printf ("logical block %d\n", logical_block); - #endif /* E2DEBUG */ -- -- /* if it is directly pointed to by the inode, return that physical addr */ -- if (logical_block < EXT2_NDIR_BLOCKS) -- { --#ifdef E2DEBUG -- printf ("returning %d\n", (unsigned char *) (INODE->i_block[logical_block])); -- printf ("returning %d\n", INODE->i_block[logical_block]); --#endif /* E2DEBUG */ -- return INODE->i_block[logical_block]; -- } -- /* else */ -- logical_block -= EXT2_NDIR_BLOCKS; -- /* try the indirect block */ -- if (logical_block < EXT2_ADDR_PER_BLOCK (SUPERBLOCK)) -+ /* standard ext2 inode */ -+ if (!(INODE->i_flags & EXT4_EXTENTS_FL)) - { -- if (mapblock1 != 1 -- && !ext2_rdfsb (INODE->i_block[EXT2_IND_BLOCK], DATABLOCK1)) -- { -- errnum = ERR_FSYS_CORRUPT; -- return -1; -- } -- mapblock1 = 1; -- return ((__u32 *) DATABLOCK1)[logical_block]; -- } -- /* else */ -- logical_block -= EXT2_ADDR_PER_BLOCK (SUPERBLOCK); -- /* now try the double indirect block */ -- if (logical_block < (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2))) -- { -- int bnum; -- if (mapblock1 != 2 -- && !ext2_rdfsb (INODE->i_block[EXT2_DIND_BLOCK], DATABLOCK1)) -- { -- errnum = ERR_FSYS_CORRUPT; -- return -1; -- } -- mapblock1 = 2; -- if ((bnum = (((__u32 *) DATABLOCK1) -- [logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)])) -- != mapblock2 -- && !ext2_rdfsb (bnum, DATABLOCK2)) -- { -- errnum = ERR_FSYS_CORRUPT; -- return -1; -- } -- mapblock2 = bnum; -+ /* if it is directly pointed to by the inode, return that physical addr */ -+ if (logical_block < EXT2_NDIR_BLOCKS) -+ { -+#ifdef E2DEBUG -+ printf ("returning %d\n", (unsigned char *) (INODE->i_block[logical_block])); -+ printf ("returning %d\n", INODE->i_block[logical_block]); -+#endif /* E2DEBUG */ -+ return INODE->i_block[logical_block]; -+ } -+ /* else */ -+ logical_block -= EXT2_NDIR_BLOCKS; -+ /* try the indirect block */ -+ if (logical_block < EXT2_ADDR_PER_BLOCK (SUPERBLOCK)) -+ { -+ if (mapblock1 != 1 -+ && !ext2_rdfsb (INODE->i_block[EXT2_IND_BLOCK], DATABLOCK1)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ mapblock1 = 1; -+ return ((__u32 *) DATABLOCK1)[logical_block]; -+ } -+ /* else */ -+ logical_block -= EXT2_ADDR_PER_BLOCK (SUPERBLOCK); -+ /* now try the double indirect block */ -+ if (logical_block < (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2))) -+ { -+ int bnum; -+ if (mapblock1 != 2 -+ && !ext2_rdfsb (INODE->i_block[EXT2_DIND_BLOCK], DATABLOCK1)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ mapblock1 = 2; -+ if ((bnum = (((__u32 *) DATABLOCK1) -+ [logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)])) -+ != mapblock2 -+ && !ext2_rdfsb (bnum, DATABLOCK2)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ mapblock2 = bnum; -+ return ((__u32 *) DATABLOCK2) -+ [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)]; -+ } -+ /* else */ -+ mapblock2 = -1; -+ logical_block -= (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2)); -+ if (mapblock1 != 3 -+ && !ext2_rdfsb (INODE->i_block[EXT2_TIND_BLOCK], DATABLOCK1)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ mapblock1 = 3; -+ if (!ext2_rdfsb (((__u32 *) DATABLOCK1) -+ [logical_block >> (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) -+ * 2)], -+ DATABLOCK2)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ if (!ext2_rdfsb (((__u32 *) DATABLOCK2) -+ [(logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)) -+ & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)], -+ DATABLOCK2)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } - return ((__u32 *) DATABLOCK2) -- [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)]; -- } -- /* else */ -- mapblock2 = -1; -- logical_block -= (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2)); -- if (mapblock1 != 3 -- && !ext2_rdfsb (INODE->i_block[EXT2_TIND_BLOCK], DATABLOCK1)) -- { -- errnum = ERR_FSYS_CORRUPT; -- return -1; -+ [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)]; - } -- mapblock1 = 3; -- if (!ext2_rdfsb (((__u32 *) DATABLOCK1) -- [logical_block >> (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) -- * 2)], -- DATABLOCK2)) -- { -- errnum = ERR_FSYS_CORRUPT; -- return -1; -- } -- if (!ext2_rdfsb (((__u32 *) DATABLOCK2) -- [(logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)) -- & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)], -- DATABLOCK2)) -+ /* inode is in extents format */ -+ else - { -+ int i; -+ struct ext4_extent_header *extent_hdr = ext4_recurse_extent_index((struct ext4_extent_header *) INODE->i_block, logical_block); -+ struct ext4_extent *extent = (struct ext4_extent *) (extent_hdr + 1); -+ if ( extent_hdr == NULL || extent_hdr->eh_magic != EXT4_EXT_MAGIC) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ for (i = 0; ieh_entries; i++) -+ { -+ if (extent[i].ee_block <= logical_block && logical_block < extent[i].ee_block + extent[i].ee_len && !(extent[i].ee_len>>15)) -+ return (logical_block - extent[i].ee_block + extent[i].ee_start); -+ } -+ /* We should not arrive here */ - errnum = ERR_FSYS_CORRUPT; - return -1; - } -- return ((__u32 *) DATABLOCK2) -- [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)]; - } - - /* preconditions: all preconds of ext2fs_block_map */ diff --git a/abs/core-testing/grub-gfx/grub-0.97-graphics.patch b/abs/core-testing/grub-gfx/grub-0.97-graphics.patch deleted file mode 100644 index e0baa90..0000000 --- a/abs/core-testing/grub-gfx/grub-0.97-graphics.patch +++ /dev/null @@ -1,1293 +0,0 @@ -diff -urpN grub-0.97/configure.ac grub-0.97-gfx/configure.ac ---- grub-0.97/configure.ac 2005-10-13 16:27:23.000000000 -0400 -+++ grub-0.97-gfx/configure.ac 2005-10-13 16:27:35.000000000 -0400 -@@ -595,6 +595,11 @@ AC_ARG_ENABLE(diskless, - [ --enable-diskless enable diskless support]) - AM_CONDITIONAL(DISKLESS_SUPPORT, test "x$enable_diskless" = xyes) - -+dnl Graphical splashscreen support -+AC_ARG_ENABLE(graphics, -+ [ --disable-graphics disable graphics terminal support]) -+AM_CONDITIONAL(GRAPHICS_SUPPORT, test "x$enable_graphics" != xno) -+ - dnl Hercules terminal - AC_ARG_ENABLE(hercules, - [ --disable-hercules disable hercules terminal support]) -diff -urpN grub-0.97/stage2/Makefile.am grub-0.97-gfx/stage2/Makefile.am ---- grub-0.97/stage2/Makefile.am 2005-10-13 16:27:23.000000000 -0400 -+++ grub-0.97-gfx/stage2/Makefile.am 2005-10-13 16:27:35.000000000 -0400 -@@ -7,7 +7,7 @@ noinst_HEADERS = apic.h defs.h dir.h dis - fat.h filesys.h freebsd.h fs.h hercules.h i386-elf.h \ - imgact_aout.h iso9660.h jfs.h mb_header.h mb_info.h md5.h \ - nbi.h pc_slice.h serial.h shared.h smp-imps.h term.h \ -- terminfo.h tparm.h nbi.h ufs2.h vstafs.h xfs.h -+ terminfo.h tparm.h nbi.h ufs2.h vstafs.h xfs.h graphics.h - EXTRA_DIST = setjmp.S apm.S $(noinst_SCRIPTS) - - # For . -@@ -19,7 +19,7 @@ libgrub_a_SOURCES = boot.c builtins.c ch - disk_io.c fsys_ext2fs.c fsys_fat.c fsys_ffs.c fsys_iso9660.c \ - fsys_jfs.c fsys_minix.c fsys_reiserfs.c fsys_ufs2.c \ - fsys_vstafs.c fsys_xfs.c gunzip.c md5.c serial.c stage2.c \ -- terminfo.c tparm.c -+ terminfo.c tparm.c graphics.c - libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \ - -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \ - -DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \ -@@ -79,8 +79,14 @@ else - HERCULES_FLAGS = - endif - -+if GRAPHICS_SUPPORT -+GRAPHICS_FLAGS = -DSUPPORT_GRAPHICS=1 -+else -+GRAPHICS_FLAGS = -+endif -+ - STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \ -- $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) -+ $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) $(GRAPHICS_FLAGS) - - STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000 - STAGE1_5_COMPILE = $(STAGE2_COMPILE) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1 -@@ -90,7 +96,8 @@ pre_stage2_exec_SOURCES = asm.S bios.c b - cmdline.c common.c console.c disk_io.c fsys_ext2fs.c \ - fsys_fat.c fsys_ffs.c fsys_iso9660.c fsys_jfs.c fsys_minix.c \ - fsys_reiserfs.c fsys_ufs2.c fsys_vstafs.c fsys_xfs.c gunzip.c \ -- hercules.c md5.c serial.c smp-imps.c stage2.c terminfo.c tparm.c -+ hercules.c md5.c serial.c smp-imps.c stage2.c terminfo.c tparm.c \ -+ graphics.c - pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) - pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) - pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK) -diff -urpN grub-0.97/stage2/asm.S grub-0.97-gfx/stage2/asm.S ---- grub-0.97/stage2/asm.S 2005-10-13 16:27:23.000000000 -0400 -+++ grub-0.97-gfx/stage2/asm.S 2005-10-13 16:27:35.000000000 -0400 -@@ -2216,6 +2216,156 @@ ENTRY(console_setcursor) - pop %ebx - pop %ebp - ret -+ -+/* graphics mode functions */ -+#ifdef SUPPORT_GRAPHICS -+VARIABLE(cursorX) -+.word 0 -+VARIABLE(cursorY) -+.word 0 -+VARIABLE(cursorCount) -+.word 0 -+VARIABLE(cursorBuf) -+.byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -+ -+ -+/* -+ * int set_videomode(mode) -+ * BIOS call "INT 10H Function 0h" to set video mode -+ * Call with %ah = 0x0 -+ * %al = video mode -+ * Returns old videomode. -+ */ -+ENTRY(set_videomode) -+ push %ebp -+ push %ebx -+ push %ecx -+ -+ movb 0x10(%esp), %cl -+ -+ call EXT_C(prot_to_real) -+ .code16 -+ -+ xorw %bx, %bx -+ movb $0xf, %ah -+ int $0x10 /* Get Current Video mode */ -+ movb %al, %ch -+ xorb %ah, %ah -+ movb %cl, %al -+ int $0x10 /* Set Video mode */ -+ -+ DATA32 call EXT_C(real_to_prot) -+ .code32 -+ -+ xorb %ah, %ah -+ movb %ch, %al -+ -+ pop %ecx -+ pop %ebx -+ pop %ebp -+ ret -+ -+ -+/* -+ * unsigned char * graphics_get_font() -+ * BIOS call "INT 10H Function 11h" to set font -+ * Call with %ah = 0x11 -+ */ -+ENTRY(graphics_get_font) -+ push %ebp -+ push %ebx -+ push %ecx -+ push %edx -+ -+ call EXT_C(prot_to_real) -+ .code16 -+ -+ movw $0x1130, %ax -+ movb $6, %bh /* font 8x16 */ -+ int $0x10 -+ movw %bp, %dx -+ movw %es, %cx -+ -+ DATA32 call EXT_C(real_to_prot) -+ .code32 -+ -+ xorl %eax, %eax -+ movw %cx, %ax -+ shll $4, %eax -+ movw %dx, %ax -+ -+ pop %edx -+ pop %ecx -+ pop %ebx -+ pop %ebp -+ ret -+ -+ -+ -+/* -+ * graphics_set_palette(index, red, green, blue) -+ * BIOS call "INT 10H Function 10h" to set individual dac register -+ * Call with %ah = 0x10 -+ * %bx = register number -+ * %ch = new value for green (0-63) -+ * %cl = new value for blue (0-63) -+ * %dh = new value for red (0-63) -+ */ -+ -+ENTRY(graphics_set_palette) -+ push %ebp -+ push %eax -+ push %ebx -+ push %ecx -+ push %edx -+ -+ movw $0x3c8, %bx /* address write mode register */ -+ -+ /* wait vertical retrace */ -+ -+ movw $0x3da, %dx -+l1b: inb %dx, %al /* wait vertical active display */ -+ test $8, %al -+ jnz l1b -+ -+l2b: inb %dx, %al /* wait vertical retrace */ -+ test $8, %al -+ jnz l2b -+ -+ mov %bx, %dx -+ movb 0x18(%esp), %al /* index */ -+ outb %al, %dx -+ inc %dx -+ -+ movb 0x1c(%esp), %al /* red */ -+ outb %al, %dx -+ -+ movb 0x20(%esp), %al /* green */ -+ outb %al, %dx -+ -+ movb 0x24(%esp), %al /* blue */ -+ outb %al, %dx -+ -+ movw 0x18(%esp), %bx -+ -+ call EXT_C(prot_to_real) -+ .code16 -+ -+ movb %bl, %bh -+ movw $0x1000, %ax -+ int $0x10 -+ -+ DATA32 call EXT_C(real_to_prot) -+ .code32 -+ -+ pop %edx -+ pop %ecx -+ pop %ebx -+ pop %eax -+ pop %ebp -+ ret -+ -+#endif /* SUPPORT_GRAPHICS */ - - /* - * getrtsecs() -diff -urpN grub-0.97/stage2/builtins.c grub-0.97-gfx/stage2/builtins.c ---- grub-0.97/stage2/builtins.c 2005-10-13 16:27:23.000000000 -0400 -+++ grub-0.97-gfx/stage2/builtins.c 2005-10-13 16:27:35.000000000 -0400 -@@ -852,6 +852,138 @@ static struct builtin builtin_dhcp = - }; - #endif /* SUPPORT_NETBOOT */ - -+static int terminal_func (char *arg, int flags); -+ -+#ifdef SUPPORT_GRAPHICS -+ -+static int splashimage_func(char *arg, int flags) { -+ char splashimage[64]; -+ int i; -+ -+ /* filename can only be 64 characters due to our buffer size */ -+ if (strlen(arg) > 63) -+ return 1; -+ if (flags == BUILTIN_CMDLINE) { -+ if (!grub_open(arg)) -+ return 1; -+ grub_close(); -+ } -+ -+ strcpy(splashimage, arg); -+ -+ /* get rid of TERM_NEED_INIT from the graphics terminal. */ -+ for (i = 0; term_table[i].name; i++) { -+ if (grub_strcmp (term_table[i].name, "graphics") == 0) { -+ term_table[i].flags &= ~TERM_NEED_INIT; -+ break; -+ } -+ } -+ -+ graphics_set_splash(splashimage); -+ -+ if (flags == BUILTIN_CMDLINE && graphics_inited) { -+ graphics_end(); -+ graphics_init(); -+ graphics_cls(); -+ } -+ -+ /* FIXME: should we be explicitly switching the terminal as a -+ * side effect here? */ -+ terminal_func("graphics", flags); -+ -+ return 0; -+} -+ -+static struct builtin builtin_splashimage = -+{ -+ "splashimage", -+ splashimage_func, -+ BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_HELP_LIST, -+ "splashimage FILE", -+ "Load FILE as the background image when in graphics mode." -+}; -+ -+ -+/* foreground */ -+static int -+foreground_func(char *arg, int flags) -+{ -+ if (grub_strlen(arg) == 6) { -+ int r = ((hex(arg[0]) << 4) | hex(arg[1])) >> 2; -+ int g = ((hex(arg[2]) << 4) | hex(arg[3])) >> 2; -+ int b = ((hex(arg[4]) << 4) | hex(arg[5])) >> 2; -+ -+ foreground = (r << 16) | (g << 8) | b; -+ if (graphics_inited) -+ graphics_set_palette(15, r, g, b); -+ -+ return (0); -+ } -+ -+ return (1); -+} -+ -+static struct builtin builtin_foreground = -+{ -+ "foreground", -+ foreground_func, -+ BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_HELP_LIST, -+ "foreground RRGGBB", -+ "Sets the foreground color when in graphics mode." -+ "RR is red, GG is green, and BB blue. Numbers must be in hexadecimal." -+}; -+ -+ -+/* background */ -+static int -+background_func(char *arg, int flags) -+{ -+ if (grub_strlen(arg) == 6) { -+ int r = ((hex(arg[0]) << 4) | hex(arg[1])) >> 2; -+ int g = ((hex(arg[2]) << 4) | hex(arg[3])) >> 2; -+ int b = ((hex(arg[4]) << 4) | hex(arg[5])) >> 2; -+ -+ background = (r << 16) | (g << 8) | b; -+ if (graphics_inited) -+ graphics_set_palette(0, r, g, b); -+ return (0); -+ } -+ -+ return (1); -+} -+ -+static struct builtin builtin_background = -+{ -+ "background", -+ background_func, -+ BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_HELP_LIST, -+ "background RRGGBB", -+ "Sets the background color when in graphics mode." -+ "RR is red, GG is green, and BB blue. Numbers must be in hexadecimal." -+}; -+ -+#endif /* SUPPORT_GRAPHICS */ -+ -+ -+/* clear */ -+static int -+clear_func() -+{ -+ if (current_term->cls) -+ current_term->cls(); -+ -+ return 0; -+} -+ -+static struct builtin builtin_clear = -+{ -+ "clear", -+ clear_func, -+ BUILTIN_CMDLINE | BUILTIN_HELP_LIST, -+ "clear", -+ "Clear the screen" -+}; -+ - - /* displayapm */ - static int -@@ -4085,7 +4217,7 @@ static struct builtin builtin_setup = - }; - - --#if defined(SUPPORT_SERIAL) || defined(SUPPORT_HERCULES) -+#if defined(SUPPORT_SERIAL) || defined(SUPPORT_HERCULES) || defined(SUPPORT_GRAPHICS) - /* terminal */ - static int - terminal_func (char *arg, int flags) -@@ -4244,17 +4376,21 @@ terminal_func (char *arg, int flags) - end: - current_term = term_table + default_term; - current_term->flags = term_flags; -- -+ - if (lines) - max_lines = lines; - else -- /* 24 would be a good default value. */ -- max_lines = 24; -- -+ max_lines = current_term->max_lines; -+ - /* If the interface is currently the command-line, - restart it to repaint the screen. */ -- if (current_term != prev_term && (flags & BUILTIN_CMDLINE)) -+ if ((current_term != prev_term) && (flags & BUILTIN_CMDLINE)){ -+ if (prev_term->shutdown) -+ prev_term->shutdown(); -+ if (current_term->startup) -+ current_term->startup(); - grub_longjmp (restart_cmdline_env, 0); -+ } - - return 0; - } -@@ -4264,7 +4400,7 @@ static struct builtin builtin_terminal = - "terminal", - terminal_func, - BUILTIN_MENU | BUILTIN_CMDLINE | BUILTIN_HELP_LIST, -- "terminal [--dumb] [--no-echo] [--no-edit] [--timeout=SECS] [--lines=LINES] [--silent] [console] [serial] [hercules]", -+ "terminal [--dumb] [--no-echo] [--no-edit] [--timeout=SECS] [--lines=LINES] [--silent] [console] [serial] [hercules] [graphics]", - "Select a terminal. When multiple terminals are specified, wait until" - " you push any key to continue. If both console and serial are specified," - " the terminal to which you input a key first will be selected. If no" -@@ -4276,7 +4412,7 @@ static struct builtin builtin_terminal = - " seconds. The option --lines specifies the maximum number of lines." - " The option --silent is used to suppress messages." - }; --#endif /* SUPPORT_SERIAL || SUPPORT_HERCULES */ -+#endif /* SUPPORT_SERIAL || SUPPORT_HERCULES || SUPPORT_GRAPHICS */ - - - #ifdef SUPPORT_SERIAL -@@ -4795,6 +4931,9 @@ static struct builtin builtin_vbeprobe = - /* The table of builtin commands. Sorted in dictionary order. */ - struct builtin *builtin_table[] = - { -+#ifdef SUPPORT_GRAPHICS -+ &builtin_background, -+#endif - &builtin_blocklist, - &builtin_boot, - #ifdef SUPPORT_NETBOOT -@@ -4802,6 +4941,7 @@ struct builtin *builtin_table[] = - #endif /* SUPPORT_NETBOOT */ - &builtin_cat, - &builtin_chainloader, -+ &builtin_clear, - &builtin_cmp, - &builtin_color, - &builtin_configfile, -@@ -4821,6 +4961,9 @@ struct builtin *builtin_table[] = - &builtin_embed, - &builtin_fallback, - &builtin_find, -+#ifdef SUPPORT_GRAPHICS -+ &builtin_foreground, -+#endif - &builtin_fstest, - &builtin_geometry, - &builtin_halt, -@@ -4864,9 +5007,12 @@ struct builtin *builtin_table[] = - #endif /* SUPPORT_SERIAL */ - &builtin_setkey, - &builtin_setup, --#if defined(SUPPORT_SERIAL) || defined(SUPPORT_HERCULES) -+#ifdef SUPPORT_GRAPHICS -+ &builtin_splashimage, -+#endif /* SUPPORT_GRAPHICS */ -+#if defined(SUPPORT_SERIAL) || defined(SUPPORT_HERCULES) || defined(SUPPORT_GRAPHICS) - &builtin_terminal, --#endif /* SUPPORT_SERIAL || SUPPORT_HERCULES */ -+#endif /* SUPPORT_SERIAL || SUPPORT_HERCULES || SUPPORT_GRAPHICS */ - #ifdef SUPPORT_SERIAL - &builtin_terminfo, - #endif /* SUPPORT_SERIAL */ -diff -urpN grub-0.97/stage2/char_io.c grub-0.97-gfx/stage2/char_io.c ---- grub-0.97/stage2/char_io.c 2005-10-13 16:27:23.000000000 -0400 -+++ grub-0.97-gfx/stage2/char_io.c 2005-10-13 16:27:35.000000000 -0400 -@@ -35,6 +35,7 @@ struct term_entry term_table[] = - { - "console", - 0, -+ 24, - console_putchar, - console_checkkey, - console_getkey, -@@ -43,13 +44,16 @@ struct term_entry term_table[] = - console_cls, - console_setcolorstate, - console_setcolor, -- console_setcursor -+ console_setcursor, -+ 0, -+ 0 - }, - #ifdef SUPPORT_SERIAL - { - "serial", - /* A serial device must be initialized. */ - TERM_NEED_INIT, -+ 24, - serial_putchar, - serial_checkkey, - serial_getkey, -@@ -58,6 +62,8 @@ struct term_entry term_table[] = - serial_cls, - serial_setcolorstate, - 0, -+ 0, -+ 0, - 0 - }, - #endif /* SUPPORT_SERIAL */ -@@ -65,6 +71,7 @@ struct term_entry term_table[] = - { - "hercules", - 0, -+ 24, - hercules_putchar, - console_checkkey, - console_getkey, -@@ -73,9 +80,28 @@ struct term_entry term_table[] = - hercules_cls, - hercules_setcolorstate, - hercules_setcolor, -- hercules_setcursor -+ hercules_setcursor, -+ 0, -+ 0 - }, - #endif /* SUPPORT_HERCULES */ -+#ifdef SUPPORT_GRAPHICS -+ { "graphics", -+ TERM_NEED_INIT, /* flags */ -+ 30, /* number of lines */ -+ graphics_putchar, /* putchar */ -+ console_checkkey, /* checkkey */ -+ console_getkey, /* getkey */ -+ graphics_getxy, /* getxy */ -+ graphics_gotoxy, /* gotoxy */ -+ graphics_cls, /* cls */ -+ graphics_setcolorstate, /* setcolorstate */ -+ graphics_setcolor, /* setcolor */ -+ graphics_setcursor, /* nocursor */ -+ graphics_init, /* initialize */ -+ graphics_end /* shutdown */ -+ }, -+#endif /* SUPPORT_GRAPHICS */ - /* This must be the last entry. */ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } - }; -@@ -1046,13 +1072,15 @@ grub_putchar (int c) - the following grub_printf call will print newlines. */ - count_lines = -1; - -+ grub_printf("\n"); - if (current_term->setcolorstate) - current_term->setcolorstate (COLOR_STATE_HIGHLIGHT); - -- grub_printf ("\n[Hit return to continue]"); -+ grub_printf ("[Hit return to continue]"); - - if (current_term->setcolorstate) - current_term->setcolorstate (COLOR_STATE_NORMAL); -+ - - do - { -@@ -1090,7 +1118,7 @@ void - cls (void) - { - /* If the terminal is dumb, there is no way to clean the terminal. */ -- if (current_term->flags & TERM_DUMB) -+ if (current_term->flags & TERM_DUMB) - grub_putchar ('\n'); - else - current_term->cls (); -@@ -1217,6 +1245,16 @@ memcheck (int addr, int len) - return ! errnum; - } - -+void -+grub_memcpy(void *dest, const void *src, int len) -+{ -+ int i; -+ register char *d = (char*)dest, *s = (char*)src; -+ -+ for (i = 0; i < len; i++) -+ d[i] = s[i]; -+} -+ - void * - grub_memmove (void *to, const void *from, int len) - { -diff -urpN grub-0.97/stage2/graphics.c grub-0.97-gfx/stage2/graphics.c ---- grub-0.97/stage2/graphics.c 1969-12-31 20:00:00.000000000 -0400 -+++ grub-0.97-gfx/stage2/graphics.c 2005-10-13 16:27:35.000000000 -0400 -@@ -0,0 +1,552 @@ -+/* graphics.c - graphics mode support for GRUB */ -+/* Implemented as a terminal type by Jeremy Katz based -+ * on a patch by Paulo César Pereira de Andrade -+ */ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2001,2002 Red Hat, Inc. -+ * Portions copyright (C) 2000 Conectiva, Inc. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ */ -+ -+ -+ -+#ifdef SUPPORT_GRAPHICS -+ -+#include -+#include -+#include -+ -+int saved_videomode; -+unsigned char *font8x16; -+ -+int graphics_inited = 0; -+static char splashimage[64]; -+ -+#define VSHADOW VSHADOW1 -+unsigned char VSHADOW1[38400]; -+unsigned char VSHADOW2[38400]; -+unsigned char VSHADOW4[38400]; -+unsigned char VSHADOW8[38400]; -+ -+/* constants to define the viewable area */ -+const int x0 = 0; -+const int x1 = 80; -+const int y0 = 0; -+const int y1 = 30; -+ -+/* text buffer has to be kept around so that we can write things as we -+ * scroll and the like */ -+unsigned short text[80 * 30]; -+ -+/* why do these have to be kept here? */ -+int foreground = (63 << 16) | (63 << 8) | (63), background = 0, border = 0; -+ -+/* current position */ -+static int fontx = 0; -+static int fonty = 0; -+ -+/* global state so that we don't try to recursively scroll or cursor */ -+static int no_scroll = 0; -+ -+/* color state */ -+static int graphics_standard_color = A_NORMAL; -+static int graphics_normal_color = A_NORMAL; -+static int graphics_highlight_color = A_REVERSE; -+static int graphics_current_color = A_NORMAL; -+static color_state graphics_color_state = COLOR_STATE_STANDARD; -+ -+ -+/* graphics local functions */ -+static void graphics_setxy(int col, int row); -+static void graphics_scroll(); -+ -+/* FIXME: where do these really belong? */ -+static inline void outb(unsigned short port, unsigned char val) -+{ -+ __asm __volatile ("outb %0,%1"::"a" (val), "d" (port)); -+} -+ -+static void MapMask(int value) { -+ outb(0x3c4, 2); -+ outb(0x3c5, value); -+} -+ -+/* bit mask register */ -+static void BitMask(int value) { -+ outb(0x3ce, 8); -+ outb(0x3cf, value); -+} -+ -+ -+ -+/* Set the splash image */ -+void graphics_set_splash(char *splashfile) { -+ grub_strcpy(splashimage, splashfile); -+} -+ -+/* Get the current splash image */ -+char *graphics_get_splash(void) { -+ return splashimage; -+} -+ -+/* Initialize a vga16 graphics display with the palette based off of -+ * the image in splashimage. If the image doesn't exist, leave graphics -+ * mode. */ -+int graphics_init() -+{ -+ if (!graphics_inited) { -+ saved_videomode = set_videomode(0x12); -+ } -+ -+ if (!read_image(splashimage)) { -+ set_videomode(saved_videomode); -+ grub_printf("failed to read image\n"); -+ return 0; -+ } -+ -+ font8x16 = (unsigned char*)graphics_get_font(); -+ -+ graphics_inited = 1; -+ -+ /* make sure that the highlight color is set correctly */ -+ graphics_highlight_color = ((graphics_normal_color >> 4) | -+ ((graphics_normal_color & 0xf) << 4)); -+ -+ return 1; -+} -+ -+/* Leave graphics mode */ -+void graphics_end(void) -+{ -+ if (graphics_inited) { -+ set_videomode(saved_videomode); -+ graphics_inited = 0; -+ } -+} -+ -+/* Print ch on the screen. Handle any needed scrolling or the like */ -+void graphics_putchar(int ch) { -+ ch &= 0xff; -+ -+ graphics_cursor(0); -+ -+ if (ch == '\n') { -+ if (fonty + 1 < y1) -+ graphics_setxy(fontx, fonty + 1); -+ else -+ graphics_scroll(); -+ graphics_cursor(1); -+ return; -+ } else if (ch == '\r') { -+ graphics_setxy(x0, fonty); -+ graphics_cursor(1); -+ return; -+ } -+ -+ graphics_cursor(0); -+ -+ text[fonty * 80 + fontx] = ch; -+ text[fonty * 80 + fontx] &= 0x00ff; -+ if (graphics_current_color & 0xf0) -+ text[fonty * 80 + fontx] |= 0x100; -+ -+ graphics_cursor(0); -+ -+ if ((fontx + 1) >= x1) { -+ graphics_setxy(x0, fonty); -+ if (fonty + 1 < y1) -+ graphics_setxy(x0, fonty + 1); -+ else -+ graphics_scroll(); -+ } else { -+ graphics_setxy(fontx + 1, fonty); -+ } -+ -+ graphics_cursor(1); -+} -+ -+/* get the current location of the cursor */ -+int graphics_getxy(void) { -+ return (fontx << 8) | fonty; -+} -+ -+void graphics_gotoxy(int x, int y) { -+ graphics_cursor(0); -+ -+ graphics_setxy(x, y); -+ -+ graphics_cursor(1); -+} -+ -+void graphics_cls(void) { -+ int i; -+ unsigned char *mem, *s1, *s2, *s4, *s8; -+ -+ graphics_cursor(0); -+ graphics_gotoxy(x0, y0); -+ -+ mem = (unsigned char*)VIDEOMEM; -+ s1 = (unsigned char*)VSHADOW1; -+ s2 = (unsigned char*)VSHADOW2; -+ s4 = (unsigned char*)VSHADOW4; -+ s8 = (unsigned char*)VSHADOW8; -+ -+ for (i = 0; i < 80 * 30; i++) -+ text[i] = ' '; -+ graphics_cursor(1); -+ -+ BitMask(0xff); -+ -+ /* plano 1 */ -+ MapMask(1); -+ grub_memcpy(mem, s1, 38400); -+ -+ /* plano 2 */ -+ MapMask(2); -+ grub_memcpy(mem, s2, 38400); -+ -+ /* plano 3 */ -+ MapMask(4); -+ grub_memcpy(mem, s4, 38400); -+ -+ /* plano 4 */ -+ MapMask(8); -+ grub_memcpy(mem, s8, 38400); -+ -+ MapMask(15); -+ -+} -+ -+void graphics_setcolorstate (color_state state) { -+ switch (state) { -+ case COLOR_STATE_STANDARD: -+ graphics_current_color = graphics_standard_color; -+ break; -+ case COLOR_STATE_NORMAL: -+ graphics_current_color = graphics_normal_color; -+ break; -+ case COLOR_STATE_HIGHLIGHT: -+ graphics_current_color = graphics_highlight_color; -+ break; -+ default: -+ graphics_current_color = graphics_standard_color; -+ break; -+ } -+ -+ graphics_color_state = state; -+} -+ -+void graphics_setcolor (int normal_color, int highlight_color) { -+ graphics_normal_color = normal_color; -+ graphics_highlight_color = highlight_color; -+ -+ graphics_setcolorstate (graphics_color_state); -+} -+ -+void graphics_setcursor (int on) { -+ /* FIXME: we don't have a cursor in graphics */ -+ return; -+} -+ -+/* Read in the splashscreen image and set the palette up appropriately. -+ * Format of splashscreen is an xpm (can be gzipped) with 16 colors and -+ * 640x480. */ -+int read_image(char *s) -+{ -+ char buf[32], pal[16]; -+ unsigned char c, base, mask, *s1, *s2, *s4, *s8; -+ unsigned i, len, idx, colors, x, y, width, height; -+ -+ if (!grub_open(s)) -+ return 0; -+ -+ /* read header */ -+ if (!grub_read((char*)&buf, 10) || grub_memcmp(buf, "/* XPM */\n", 10)) { -+ grub_close(); -+ return 0; -+ } -+ -+ /* parse info */ -+ while (grub_read(&c, 1)) { -+ if (c == '"') -+ break; -+ } -+ -+ while (grub_read(&c, 1) && (c == ' ' || c == '\t')) -+ ; -+ -+ i = 0; -+ width = c - '0'; -+ while (grub_read(&c, 1)) { -+ if (c >= '0' && c <= '9') -+ width = width * 10 + c - '0'; -+ else -+ break; -+ } -+ while (grub_read(&c, 1) && (c == ' ' || c == '\t')) -+ ; -+ -+ height = c - '0'; -+ while (grub_read(&c, 1)) { -+ if (c >= '0' && c <= '9') -+ height = height * 10 + c - '0'; -+ else -+ break; -+ } -+ while (grub_read(&c, 1) && (c == ' ' || c == '\t')) -+ ; -+ -+ colors = c - '0'; -+ while (grub_read(&c, 1)) { -+ if (c >= '0' && c <= '9') -+ colors = colors * 10 + c - '0'; -+ else -+ break; -+ } -+ -+ base = 0; -+ while (grub_read(&c, 1) && c != '"') -+ ; -+ -+ /* palette */ -+ for (i = 0, idx = 1; i < colors; i++) { -+ len = 0; -+ -+ while (grub_read(&c, 1) && c != '"') -+ ; -+ grub_read(&c, 1); /* char */ -+ base = c; -+ grub_read(buf, 4); /* \t c # */ -+ -+ while (grub_read(&c, 1) && c != '"') { -+ if (len < sizeof(buf)) -+ buf[len++] = c; -+ } -+ -+ if (len == 6 && idx < 15) { -+ int r = ((hex(buf[0]) << 4) | hex(buf[1])) >> 2; -+ int g = ((hex(buf[2]) << 4) | hex(buf[3])) >> 2; -+ int b = ((hex(buf[4]) << 4) | hex(buf[5])) >> 2; -+ -+ pal[idx] = base; -+ graphics_set_palette(idx, r, g, b); -+ ++idx; -+ } -+ } -+ -+ x = y = len = 0; -+ -+ s1 = (unsigned char*)VSHADOW1; -+ s2 = (unsigned char*)VSHADOW2; -+ s4 = (unsigned char*)VSHADOW4; -+ s8 = (unsigned char*)VSHADOW8; -+ -+ for (i = 0; i < 38400; i++) -+ s1[i] = s2[i] = s4[i] = s8[i] = 0; -+ -+ /* parse xpm data */ -+ while (y < height) { -+ while (1) { -+ if (!grub_read(&c, 1)) { -+ grub_close(); -+ return 0; -+ } -+ if (c == '"') -+ break; -+ } -+ -+ while (grub_read(&c, 1) && c != '"') { -+ for (i = 1; i < 15; i++) -+ if (pal[i] == c) { -+ c = i; -+ break; -+ } -+ -+ mask = 0x80 >> (x & 7); -+ if (c & 1) -+ s1[len + (x >> 3)] |= mask; -+ if (c & 2) -+ s2[len + (x >> 3)] |= mask; -+ if (c & 4) -+ s4[len + (x >> 3)] |= mask; -+ if (c & 8) -+ s8[len + (x >> 3)] |= mask; -+ -+ if (++x >= 640) { -+ x = 0; -+ -+ if (y < 480) -+ len += 80; -+ ++y; -+ } -+ } -+ } -+ -+ grub_close(); -+ -+ graphics_set_palette(0, (background >> 16), (background >> 8) & 63, -+ background & 63); -+ graphics_set_palette(15, (foreground >> 16), (foreground >> 8) & 63, -+ foreground & 63); -+ graphics_set_palette(0x11, (border >> 16), (border >> 8) & 63, -+ border & 63); -+ -+ return 1; -+} -+ -+ -+/* Convert a character which is a hex digit to the appropriate integer */ -+int hex(int v) -+{ -+ if (v >= 'A' && v <= 'F') -+ return (v - 'A' + 10); -+ if (v >= 'a' && v <= 'f') -+ return (v - 'a' + 10); -+ return (v - '0'); -+} -+ -+ -+/* move the graphics cursor location to col, row */ -+static void graphics_setxy(int col, int row) { -+ if (col >= x0 && col < x1) { -+ fontx = col; -+ cursorX = col << 3; -+ } -+ if (row >= y0 && row < y1) { -+ fonty = row; -+ cursorY = row << 4; -+ } -+} -+ -+/* scroll the screen */ -+static void graphics_scroll() { -+ int i, j; -+ -+ /* we don't want to scroll recursively... that would be bad */ -+ if (no_scroll) -+ return; -+ no_scroll = 1; -+ -+ /* move everything up a line */ -+ for (j = y0 + 1; j < y1; j++) { -+ graphics_gotoxy(x0, j - 1); -+ for (i = x0; i < x1; i++) { -+ graphics_putchar(text[j * 80 + i]); -+ } -+ } -+ -+ /* last line should be blank */ -+ graphics_gotoxy(x0, y1 - 1); -+ for (i = x0; i < x1; i++) -+ graphics_putchar(' '); -+ graphics_setxy(x0, y1 - 1); -+ -+ no_scroll = 0; -+} -+ -+ -+void graphics_cursor(int set) { -+ unsigned char *pat, *mem, *ptr, chr[16 << 2]; -+ int i, ch, invert, offset; -+ -+ if (set && no_scroll) -+ return; -+ -+ offset = cursorY * 80 + fontx; -+ ch = text[fonty * 80 + fontx] & 0xff; -+ invert = (text[fonty * 80 + fontx] & 0xff00) != 0; -+ pat = font8x16 + (ch << 4); -+ -+ mem = (unsigned char*)VIDEOMEM + offset; -+ -+ if (!set) { -+ for (i = 0; i < 16; i++) { -+ unsigned char mask = pat[i]; -+ -+ if (!invert) { -+ chr[i ] = ((unsigned char*)VSHADOW1)[offset]; -+ chr[16 + i] = ((unsigned char*)VSHADOW2)[offset]; -+ chr[32 + i] = ((unsigned char*)VSHADOW4)[offset]; -+ chr[48 + i] = ((unsigned char*)VSHADOW8)[offset]; -+ -+ /* FIXME: if (shade) */ -+ if (1) { -+ if (ch == DISP_VERT || ch == DISP_LL || -+ ch == DISP_UR || ch == DISP_LR) { -+ unsigned char pmask = ~(pat[i] >> 1); -+ -+ chr[i ] &= pmask; -+ chr[16 + i] &= pmask; -+ chr[32 + i] &= pmask; -+ chr[48 + i] &= pmask; -+ } -+ if (i > 0 && ch != DISP_VERT) { -+ unsigned char pmask = ~(pat[i - 1] >> 1); -+ -+ chr[i ] &= pmask; -+ chr[16 + i] &= pmask; -+ chr[32 + i] &= pmask; -+ chr[48 + i] &= pmask; -+ if (ch == DISP_HORIZ || ch == DISP_UR || ch == DISP_LR) { -+ pmask = ~pat[i - 1]; -+ -+ chr[i ] &= pmask; -+ chr[16 + i] &= pmask; -+ chr[32 + i] &= pmask; -+ chr[48 + i] &= pmask; -+ } -+ } -+ } -+ chr[i ] |= mask; -+ chr[16 + i] |= mask; -+ chr[32 + i] |= mask; -+ chr[48 + i] |= mask; -+ -+ offset += 80; -+ } -+ else { -+ chr[i ] = mask; -+ chr[16 + i] = mask; -+ chr[32 + i] = mask; -+ chr[48 + i] = mask; -+ } -+ } -+ } -+ else { -+ MapMask(15); -+ ptr = mem; -+ for (i = 0; i < 16; i++, ptr += 80) { -+ cursorBuf[i] = pat[i]; -+ *ptr = ~pat[i]; -+ } -+ return; -+ } -+ -+ offset = 0; -+ for (i = 1; i < 16; i <<= 1, offset += 16) { -+ int j; -+ -+ MapMask(i); -+ ptr = mem; -+ for (j = 0; j < 16; j++, ptr += 80) -+ *ptr = chr[j + offset]; -+ } -+ -+ MapMask(15); -+} -+ -+#endif /* SUPPORT_GRAPHICS */ -diff -urpN grub-0.97/stage2/graphics.h grub-0.97-gfx/stage2/graphics.h ---- grub-0.97/stage2/graphics.h 1969-12-31 20:00:00.000000000 -0400 -+++ grub-0.97-gfx/stage2/graphics.h 2005-10-13 16:27:35.000000000 -0400 -@@ -0,0 +1,42 @@ -+/* graphics.h - graphics console interface */ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2002 Free Software Foundation, Inc. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ */ -+ -+#ifndef GRAPHICS_H -+#define GRAPHICS_H -+ -+/* magic constant */ -+#define VIDEOMEM 0xA0000 -+ -+/* function prototypes */ -+char *graphics_get_splash(void); -+ -+int read_image(char *s); -+void graphics_cursor(int set); -+ -+/* function prototypes for asm functions */ -+void * graphics_get_font(); -+void graphics_set_palette(int idx, int red, int green, int blue); -+void set_int1c_handler(); -+void unset_int1c_handler(); -+ -+extern short cursorX, cursorY; -+extern char cursorBuf[16]; -+ -+#endif /* GRAPHICS_H */ -diff -urpN grub-0.97/stage2/shared.h grub-0.97-gfx/stage2/shared.h ---- grub-0.97/stage2/shared.h 2005-10-13 16:27:23.000000000 -0400 -+++ grub-0.97-gfx/stage2/shared.h 2005-10-13 16:27:35.000000000 -0400 -@@ -871,6 +871,7 @@ int grub_sprintf (char *buffer, const ch - int grub_tolower (int c); - int grub_isspace (int c); - int grub_strncat (char *s1, const char *s2, int n); -+void grub_memcpy(void *dest, const void *src, int len); - void *grub_memmove (void *to, const void *from, int len); - void *grub_memset (void *start, int c, int len); - int grub_strncat (char *s1, const char *s2, int n); -diff -urpN grub-0.97/stage2/stage2.c grub-0.97-gfx/stage2/stage2.c ---- grub-0.97/stage2/stage2.c 2005-10-13 16:27:23.000000000 -0400 -+++ grub-0.97-gfx/stage2/stage2.c 2005-10-13 16:27:35.000000000 -0400 -@@ -233,6 +233,7 @@ run_menu (char *menu_entries, char *conf - { - int c, time1, time2 = -1, first_entry = 0; - char *cur_entry = 0; -+ struct term_entry *prev_term = NULL; - - /* - * Main loop for menu UI. -@@ -714,6 +715,15 @@ restart: - - cls (); - setcursor (1); -+ /* if our terminal needed initialization, we should shut it down -+ * before booting the kernel, but we want to save what it was so -+ * we can come back if needed */ -+ prev_term = current_term; -+ if (current_term->shutdown) -+ { -+ (*current_term->shutdown)(); -+ current_term = term_table; /* assumption: console is first */ -+ } - - while (1) - { -@@ -748,6 +758,13 @@ restart: - break; - } - -+ /* if we get back here, we should go back to what our term was before */ -+ current_term = prev_term; -+ if (current_term->startup) -+ /* if our terminal fails to initialize, fall back to console since -+ * it should always work */ -+ if ((*current_term->startup)() == 0) -+ current_term = term_table; /* we know that console is first */ - show_menu = 1; - goto restart; - } -@@ -1050,6 +1067,10 @@ cmain (void) - while (is_preset); - } - -+ /* go ahead and make sure the terminal is setup */ -+ if (current_term->startup) -+ (*current_term->startup)(); -+ - if (! num_entries) - { - /* If no acceptable config file, goto command-line, starting -diff -urpN grub-0.97/stage2/term.h grub-0.97-gfx/stage2/term.h ---- grub-0.97/stage2/term.h 2005-10-13 16:27:23.000000000 -0400 -+++ grub-0.97-gfx/stage2/term.h 2005-10-13 16:27:35.000000000 -0400 -@@ -60,6 +60,8 @@ struct term_entry - const char *name; - /* The feature flags defined above. */ - unsigned long flags; -+ /* Default for maximum number of lines if not specified */ -+ unsigned short max_lines; - /* Put a character. */ - void (*putchar) (int c); - /* Check if any input character is available. */ -@@ -79,6 +81,11 @@ struct term_entry - void (*setcolor) (int normal_color, int highlight_color); - /* Turn on/off the cursor. */ - int (*setcursor) (int on); -+ -+ /* function to start a terminal */ -+ int (*startup) (void); -+ /* function to use to shutdown a terminal */ -+ void (*shutdown) (void); - }; - - /* This lists up available terminals. */ -@@ -124,4 +131,23 @@ void hercules_setcolor (int normal_color - int hercules_setcursor (int on); - #endif - -+#ifdef SUPPORT_GRAPHICS -+extern int foreground, background, border, graphics_inited; -+ -+void graphics_set_splash(char *splashfile); -+int set_videomode (int mode); -+void graphics_putchar (int c); -+int graphics_getxy(void); -+void graphics_gotoxy(int x, int y); -+void graphics_cls(void); -+void graphics_setcolorstate (color_state state); -+void graphics_setcolor (int normal_color, int highlight_color); -+void graphics_setcursor (int on); -+int graphics_init(void); -+void graphics_end(void); -+ -+int hex(int v); -+void graphics_set_palette(int idx, int red, int green, int blue); -+#endif /* SUPPORT_GRAPHICS */ -+ - #endif /* ! GRUB_TERM_HEADER */ diff --git a/abs/core-testing/grub-gfx/grub-gfx.install b/abs/core-testing/grub-gfx/grub-gfx.install deleted file mode 100644 index 6c73b15..0000000 --- a/abs/core-testing/grub-gfx/grub-gfx.install +++ /dev/null @@ -1,46 +0,0 @@ -# arg 1: the new package version -pre_install() { - /bin/true -} - -# arg 1: the new package version -post_install() { - echo - echo "*********************************************************************" - echo "You need to run install-grub /dev/device or grub-install /dev/device " - echo "to update grub loader." - echo "Note: Device should be any of these (sda, sdb, hda, hdb, sda1, hda1) " - echo "If you are in doubt, see your old grub config file (menu.lst.pacsave)" - echo "********************************************************************" - echo -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - /bin/true -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - echo - echo "*********************************************************************" - echo "You need to run install-grub /dev/device or grub-install /dev/device " - echo "to update grub loader." - echo "Note: Device should be any of these (sda, sdb, hda, hdb, sda1, hda1) " - echo "If you are in doubt, see your old grub config file (menu.lst.pacsave)" - echo "********************************************************************" - echo -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - diff --git a/abs/core-testing/grub-gfx/grub-inode-size.patch b/abs/core-testing/grub-gfx/grub-inode-size.patch deleted file mode 100644 index bef3bc1..0000000 --- a/abs/core-testing/grub-gfx/grub-inode-size.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -Nrup a/stage2/fsys_ext2fs.c b/stage2/fsys_ext2fs.c ---- a/stage2/fsys_ext2fs.c 2004-08-08 20:19:18.000000000 +0200 -+++ b/stage2/fsys_ext2fs.c 2008-01-30 14:27:20.000000000 +0100 -@@ -79,7 +79,52 @@ struct ext2_super_block - __u32 s_rev_level; /* Revision level */ - __u16 s_def_resuid; /* Default uid for reserved blocks */ - __u16 s_def_resgid; /* Default gid for reserved blocks */ -- __u32 s_reserved[235]; /* Padding to the end of the block */ -+ /* -+ * These fields are for EXT2_DYNAMIC_REV superblocks only. -+ * -+ * Note: the difference between the compatible feature set and -+ * the incompatible feature set is that if there is a bit set -+ * in the incompatible feature set that the kernel doesn't -+ * know about, it should refuse to mount the filesystem. -+ * -+ * e2fsck's requirements are more strict; if it doesn't know -+ * about a feature in either the compatible or incompatible -+ * feature set, it must abort and not try to meddle with -+ * things it doesn't understand... -+ */ -+ __u32 s_first_ino; /* First non-reserved inode */ -+ __u16 s_inode_size; /* size of inode structure */ -+ __u16 s_block_group_nr; /* block group # of this superblock */ -+ __u32 s_feature_compat; /* compatible feature set */ -+ __u32 s_feature_incompat; /* incompatible feature set */ -+ __u32 s_feature_ro_compat; /* readonly-compatible feature set */ -+ __u8 s_uuid[16]; /* 128-bit uuid for volume */ -+ char s_volume_name[16]; /* volume name */ -+ char s_last_mounted[64]; /* directory where last mounted */ -+ __u32 s_algorithm_usage_bitmap; /* For compression */ -+ /* -+ * Performance hints. Directory preallocation should only -+ * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on. -+ */ -+ __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/ -+ __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */ -+ __u16 s_reserved_gdt_blocks;/* Per group table for online growth */ -+ /* -+ * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set. -+ */ -+ __u8 s_journal_uuid[16]; /* uuid of journal superblock */ -+ __u32 s_journal_inum; /* inode number of journal file */ -+ __u32 s_journal_dev; /* device number of journal file */ -+ __u32 s_last_orphan; /* start of list of inodes to delete */ -+ __u32 s_hash_seed[4]; /* HTREE hash seed */ -+ __u8 s_def_hash_version; /* Default hash version to use */ -+ __u8 s_jnl_backup_type; /* Default type of journal backup */ -+ __u16 s_reserved_word_pad; -+ __u32 s_default_mount_opts; -+ __u32 s_first_meta_bg; /* First metablock group */ -+ __u32 s_mkfs_time; /* When the filesystem was created */ -+ __u32 s_jnl_blocks[17]; /* Backup of the journal inode */ -+ __u32 s_reserved[172]; /* Padding to the end of the block */ - }; - - struct ext2_group_desc -@@ -218,6 +263,9 @@ struct ext2_dir_entry - #define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32)) - #define EXT2_ADDR_PER_BLOCK_BITS(s) (log2(EXT2_ADDR_PER_BLOCK(s))) - -+#define EXT2_INODE_SIZE(s) (SUPERBLOCK->s_inode_size) -+#define EXT2_INODES_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s)) -+ - /* linux/ext2_fs.h */ - #define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) - /* kind of from ext2/super.c */ -@@ -553,7 +601,7 @@ ext2fs_dir (char *dirname) - gdp = GROUP_DESC; - ino_blk = gdp[desc].bg_inode_table + - (((current_ino - 1) % (SUPERBLOCK->s_inodes_per_group)) -- >> log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode))); -+ >> log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK))); - #ifdef E2DEBUG - printf ("inode table fsblock=%d\n", ino_blk); - #endif /* E2DEBUG */ -@@ -565,13 +613,12 @@ ext2fs_dir (char *dirname) - /* reset indirect blocks! */ - mapblock2 = mapblock1 = -1; - -- raw_inode = INODE + -- ((current_ino - 1) -- & (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode) - 1)); -+ raw_inode = (struct ext2_inode *)((char *)INODE + -+ ((current_ino - 1) & (EXT2_INODES_PER_BLOCK (SUPERBLOCK) - 1)) * -+ EXT2_INODE_SIZE (SUPERBLOCK)); - #ifdef E2DEBUG - printf ("ipb=%d, sizeof(inode)=%d\n", -- (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode)), -- sizeof (struct ext2_inode)); -+ EXT2_INODES_PER_BLOCK (SUPERBLOCK), EXT2_INODE_SIZE (SUPERBLOCK)); - printf ("inode=%x, raw_inode=%x\n", INODE, raw_inode); - printf ("offset into inode table block=%d\n", (int) raw_inode - (int) INODE); - for (i = (unsigned char *) INODE; i <= (unsigned char *) raw_inode; diff --git a/abs/core-testing/grub-gfx/i2o.patch b/abs/core-testing/grub-gfx/i2o.patch deleted file mode 100644 index 2af846c..0000000 --- a/abs/core-testing/grub-gfx/i2o.patch +++ /dev/null @@ -1,45 +0,0 @@ -Only in grub-0.94/docs: grub.info -Only in grub-0.94/docs: multiboot.info -diff -ur grub-0.94/lib/device.c grub-0.94.new/lib/device.c ---- grub-0.94/lib/device.c 2004-05-07 04:50:36.375238696 +0200 -+++ grub-0.94.new/lib/device.c 2004-05-07 04:48:57.611253104 +0200 -@@ -419,6 +419,12 @@ - { - sprintf (name, "/dev/rd/c%dd%d", controller, drive); - } -+ -+static void -+get_i2o_disk_name (char *name, int unit) -+{ -+ sprintf (name, "/dev/i2o/hd%c", unit + 'a'); -+} - #endif - - /* Check if DEVICE can be read. If an error occurs, return zero, -@@ -789,6 +795,26 @@ - } - } - } -+ -+ /* I2O disks. */ -+ for (i = 0; i < 8; i++) -+ { -+ char name[16]; -+ -+ get_i2o_disk_name (name, i); -+ if (check_device (name)) -+ { -+ (*map)[num_hd + 0x80] = strdup (name); -+ assert ((*map)[num_hd + 0x80]); -+ -+ /* If the device map file is opened, write the map. */ -+ if (fp) -+ fprintf (fp, "(hd%d)\t%s\n", num_hd, name); -+ -+ num_hd++; -+ } -+ } -+ - #endif /* __linux__ */ - - /* OK, close the device map file if opened. */ diff --git a/abs/core-testing/grub-gfx/install-grub b/abs/core-testing/grub-gfx/install-grub deleted file mode 100755 index 3eb7ce5..0000000 --- a/abs/core-testing/grub-gfx/install-grub +++ /dev/null @@ -1,187 +0,0 @@ -#!/bin/bash - -# -# This is a little helper script that tries to convert linux-style device -# names to grub-style. It's not very smart, so it -# probably won't work for more complicated setups. -# -# If it doesn't work for you, try installing grub manually: -# -# # mkdir -p /boot/grub -# # cp /usr/lib/grub/i386-pc/* /boot/grub/ -# -# Then start up the 'grub' shell and run something like the following: -# -# grub> root(hd0,0) -# grub> setup(hd0) -# -# The "root" line should point to the partition your kernel is located on, -# /boot if you have a separate boot partition, otherwise your root (/). -# -# The "setup" line tells grub which disc/partition to install the -# bootloader to. In the example above, it will install to the MBR of the -# primary master hard drive. -# - -usage() { - echo "usage: install-grub [boot_device]" - echo - echo "where is the device where Grub will be installed" - echo "and [boot_device] is the partition that contains the /boot" - echo "directory (auto-detected if omitted)" - echo - echo "examples: install-grub /dev/hda" - echo " install-grub /dev/hda /dev/hda1" - echo - exit 0 -} - -## new install-grub, code was taken from setup script -ROOTDEV=$1 -PART_ROOT=$2 -VMLINUZ=vmlinuz26 - -if [ "$ROOTDEV" = "" ]; then - usage -fi -if [ "$PART_ROOT" = "" ]; then - PART_ROOT=$(mount | grep "on /boot type" | cut -d' ' -f 1) -fi -if [ "$PART_ROOT" = "" ]; then - PART_ROOT=$(mount | grep "on / type" | cut -d' ' -f 1) -fi -if [ "$PART_ROOT" = "" ]; then - echo "error: could not determine BOOT_DEVICE, please specify manually" >&2 - exit 1 -fi - - -get_grub_map() { - [ -e /tmp/dev.map ] && rm /tmp/dev.map - /sbin/grub --no-floppy --device-map /tmp/dev.map >/tmp/grub.log 2>&1 </boot/grub/menu.lst - rm -f /tmp/.menu.lst - echo "" >>/boot/grub/menu.lst - echo "# (0) Arch Linux" >>/boot/grub/menu.lst - echo "title Arch Linux" >>/boot/grub/menu.lst - subdir= - if [ "$bootdev" != "" ]; then - grubdev=$(mapdev $bootdev) - else - subdir="/boot" - fi - echo "root $grubdev" >>/boot/grub/menu.lst - echo "kernel $subdir/$VMLINUZ root=$PART_ROOT ro" >>/boot/grub/menu.lst - if [ "$VMLINUZ" = "vmlinuz26" ]; then - echo "initrd $subdir/kernel26.img" >>/boot/grub/menu.lst - fi - echo "" >>/boot/grub/menu.lst - # adding fallback/full image - echo "# (1) Arch Linux" >>/boot/grub/menu.lst - echo "title Arch Linux Fallback" >>/boot/grub/menu.lst - echo "root $grubdev" >>/boot/grub/menu.lst - echo "kernel $subdir/$VMLINUZ root=$PART_ROOT ro" >>/boot/grub/menu.lst - if [ "$VMLINUZ" = "vmlinuz26" ]; then - echo "initrd $subdir/kernel26-fallback.img" >>/boot/grub/menu.lst - fi - echo "" >>/boot/grub/menu.lst - fi - fi - - echo "Installing the GRUB bootloader..." - cp -a /usr/lib/grub/i386-pc/* /boot/grub/ - sync - # freeze xfs filesystems to enable grub installation on xfs filesystems - if [ -x /usr/sbin/xfs_freeze ]; then - /usr/sbin/xfs_freeze -f /boot > /dev/null 2>&1 - /usr/sbin/xfs_freeze -f / > /dev/null 2>&1 - fi - # look for a separately-mounted /boot partition - bootpart=$(mount | grep /boot | cut -d' ' -f 1) - if [ "$bootpart" = "" ]; then - bootpart=$PART_ROOT - fi - bootpart=$(mapdev $bootpart) - bootdev=$(mapdev $ROOTDEV) - if [ "$bootpart" = "" ]; then - echo "Error: Missing/Invalid root device: $bootpart" - exit 1 - fi - /sbin/grub --no-floppy --batch >/tmp/grub.log 2>&1 < /dev/null 2>&1 - /usr/sbin/xfs_freeze -u / > /dev/null 2>&1 - fi - - if grep "Error [0-9]*: " /tmp/grub.log >/dev/null; then - echo "Error installing GRUB. (see /tmp/grub.log for output)" - exit 1 - fi - echo "GRUB was successfully installed." - -rm -f /tmp/grub.log - -exit 0 -} - -dogrub \ No newline at end of file diff --git a/abs/core-testing/grub-gfx/intelmac.patch b/abs/core-testing/grub-gfx/intelmac.patch deleted file mode 100644 index a3fabc7..0000000 --- a/abs/core-testing/grub-gfx/intelmac.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- grub-0.97.orig/stage2/asm.S 2004-06-19 18:55:22.000000000 +0200 -+++ grub-0.97/stage2/asm.S 2006-04-21 11:10:52.000000000 +0200 -@@ -1651,7 +1651,29 @@ - jnz 3f - ret - --3: /* use keyboard controller */ -+3: /* -+ * try to switch gateA20 using PORT92, the "Fast A20 and Init" -+ * register -+ */ -+ mov $0x92, %dx -+ inb %dx, %al -+ /* skip the port92 code if it's unimplemented (read returns 0xff) */ -+ cmpb $0xff, %al -+ jz 6f -+ -+ /* set or clear bit1, the ALT_A20_GATE bit */ -+ movb 4(%esp), %ah -+ testb %ah, %ah -+ jz 4f -+ orb $2, %al -+ jmp 5f -+4: and $0xfd, %al -+ -+ /* clear the INIT_NOW bit don't accidently reset the machine */ -+5: and $0xfe, %al -+ outb %al, %dx -+ -+6: /* use keyboard controller */ - pushl %eax - - call gloop1 -@@ -1661,9 +1683,12 @@ - - gloopint1: - inb $K_STATUS -+ cmpb $0xff, %al -+ jz gloopint1_done - andb $K_IBUF_FUL, %al - jnz gloopint1 - -+gloopint1_done: - movb $KB_OUTPUT_MASK, %al - cmpb $0, 0x8(%esp) - jz gdoit -@@ -1684,6 +1709,8 @@ - - gloop1: - inb $K_STATUS -+ cmpb $0xff, %al -+ jz gloop2ret - andb $K_IBUF_FUL, %al - jnz gloop1 - -@@ -1991,6 +2018,11 @@ - ENTRY(console_getkey) - push %ebp - -+wait_for_key: -+ call EXT_C(console_checkkey) -+ incl %eax -+ jz wait_for_key -+ - call EXT_C(prot_to_real) - .code16 - diff --git a/abs/core-testing/grub-gfx/menu.lst b/abs/core-testing/grub-gfx/menu.lst deleted file mode 100644 index cc2f0a8..0000000 --- a/abs/core-testing/grub-gfx/menu.lst +++ /dev/null @@ -1,47 +0,0 @@ -# Config file for GRUB - The GNU GRand Unified Bootloader -# /boot/grub/menu.lst - -# DEVICE NAME CONVERSIONS -# -# Linux Grub -# ------------------------- -# /dev/fd0 (fd0) -# /dev/hda (hd0) -# /dev/hdb2 (hd1,1) -# /dev/hda3 (hd0,2) -# - -# FRAMEBUFFER RESOLUTION SETTINGS -# +-------------------------------------------------+ -# | 640x480 800x600 1024x768 1280x1024 -# ----+-------------------------------------------- -# 256 | 0x301=769 0x303=771 0x305=773 0x307=775 -# 32K | 0x310=784 0x313=787 0x316=790 0x319=793 -# 64K | 0x311=785 0x314=788 0x317=791 0x31A=794 -# 16M | 0x312=786 0x315=789 0x318=792 0x31B=795 -# +-------------------------------------------------+ - -# general configuration: -timeout 5 -default 0 -color light-blue/black light-cyan/blue -splashimage /boot/grub/splash.xpm.gz - -# boot sections follow -# each is implicitly numbered from 0 in the order of appearance below -# -# TIP: If you want a 1024x768 framebuffer, add "vga=773" to your kernel line. -# -#-* - -# (0) Arch Linux -title Arch Linux [/boot/vmlinuz26] -root (hd0,0) -kernel /vmlinuz26 root=/dev/hda3 ro -initrd /kernel26.img - -# (1) Windows -#title Windows -#rootnoverify (hd0,0) -#makeactive -#chainloader +1 diff --git a/abs/core-testing/grub-gfx/more-raid.patch b/abs/core-testing/grub-gfx/more-raid.patch deleted file mode 100644 index 39db234..0000000 --- a/abs/core-testing/grub-gfx/more-raid.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- grub-0.95/lib/device.c.moreraid 2004-11-30 17:09:36.736099360 -0500 -+++ grub-0.95/lib/device.c 2004-11-30 17:12:17.319686944 -0500 -@@ -544,6 +544,17 @@ - } - - static void -+get_cciss_disk_name (char * name, int controller, int drive) -+{ -+ sprintf (name, "/dev/cciss/c%dd%d", controller, drive); -+} -+ -+static void -+get_cpqarray_disk_name (char * name, int controller, int drive) -+{ -+ sprintf (name, "/dev/ida/c%dd%d", controller, drive); -+} -+static void - get_ataraid_disk_name (char *name, int unit) - { - sprintf (name, "/dev/ataraid/d%c", unit + '0'); -@@ -920,7 +931,7 @@ - - for (controller = 0; controller < 8; controller++) - { -- for (drive = 0; drive < 15; drive++) -+ for (drive = 0; drive < 32; drive++) - { - char name[24]; - -@@ -940,6 +951,70 @@ - } - } - #endif /* __linux__ */ -+ -+#ifdef __linux__ -+ /* This is for cciss - we have -+ /dev/cciss/cdp. -+ -+ cciss driver currently supports up to 8 controllers, 16 logical -+ drives, and 7 partitions. */ -+ { -+ int controller, drive; -+ -+ for (controller = 0; controller < 8; controller++) -+ { -+ for (drive = 0; drive < 16; drive++) -+ { -+ char name[24]; -+ -+ get_cciss_disk_name (name, controller, drive); -+ if (check_device (name)) -+ { -+ (*map)[num_hd + 0x80] = strdup (name); -+ assert ((*map)[num_hd + 0x80]); -+ -+ /* If the device map file is opened, write the map. */ -+ if (fp) -+ fprintf (fp, "(hd%d)\t%s\n", num_hd, name); -+ -+ num_hd++; -+ } -+ } -+ } -+ } -+#endif /* __linux__ */ -+ -+#ifdef __linux__ -+ /* This is for cpqarray - we have -+ /dev/ida/cdp. -+ -+ cpqarray driver currently supports up to 8 controllers, 16 logical -+ drives, and 15 partitions. */ -+ { -+ int controller, drive; -+ -+ for (controller = 0; controller < 8; controller++) -+ { -+ for (drive = 0; drive < 15; drive++) -+ { -+ char name[24]; -+ -+ get_cpqarray_disk_name (name, controller, drive); -+ if (check_device (name)) -+ { -+ (*map)[num_hd + 0x80] = strdup (name); -+ assert ((*map)[num_hd + 0x80]); -+ -+ /* If the device map file is opened, write the map. */ -+ if (fp) -+ fprintf (fp, "(hd%d)\t%s\n", num_hd, name); -+ -+ num_hd++; -+ } -+ } -+ } -+ } -+#endif /* __linux__ */ - - /* OK, close the device map file if opened. */ - if (fp) diff --git a/abs/core-testing/grub-gfx/special-devices.patch b/abs/core-testing/grub-gfx/special-devices.patch deleted file mode 100644 index 894f3e8..0000000 --- a/abs/core-testing/grub-gfx/special-devices.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- grub-0.93/lib/device.c.raid 2002-05-20 05:53:46.000000000 -0400 -+++ grub-0.93/lib/device.c 2002-12-28 23:24:10.000000000 -0500 -@@ -689,7 +689,14 @@ - if (strcmp (dev + strlen(dev) - 5, "/disc") == 0) - strcpy (dev + strlen(dev) - 5, "/part"); - } -- sprintf (dev + strlen(dev), "%d", ((partition >> 16) & 0xFF) + 1); -+ -+ sprintf (dev + strlen(dev), "%s%d", -+ /* Compaq smart and others */ -+ (strncmp(dev, "/dev/ida/", 9) == 0 || -+ strncmp(dev, "/dev/ataraid/", 13) == 0 || -+ strncmp(dev, "/dev/cciss/", 11) == 0 || -+ strncmp(dev, "/dev/rd/", 8) == 0) ? "p" : "", -+ ((partition >> 16) & 0xFF) + 1); - - /* Open the partition. */ - fd = open (dev, O_RDWR); diff --git a/abs/core-testing/grub-gfx/splash.xpm.gz b/abs/core-testing/grub-gfx/splash.xpm.gz deleted file mode 100644 index e44af43..0000000 Binary files a/abs/core-testing/grub-gfx/splash.xpm.gz and /dev/null differ diff --git a/abs/core-testing/grub/040_all_grub-0.96-nxstack.patch b/abs/core-testing/grub/040_all_grub-0.96-nxstack.patch deleted file mode 100644 index 121941c..0000000 --- a/abs/core-testing/grub/040_all_grub-0.96-nxstack.patch +++ /dev/null @@ -1,623 +0,0 @@ -Fix NX segfaulting on amd64. - -Patch by Peter Jones. - -http://lists.gnu.org/archive/html/bug-grub/2005-03/msg00011.html - ---- grub-0.97/grub/asmstub.c -+++ grub-0.97/grub/asmstub.c -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - #ifdef __linux__ - # include /* ioctl */ -@@ -79,7 +80,7 @@ - struct apm_info apm_bios_info; - - /* Emulation requirements. */ --char *grub_scratch_mem = 0; -+void *grub_scratch_mem = 0; - - struct geometry *disks = 0; - -@@ -103,14 +104,62 @@ - static unsigned int serial_speed; - #endif /* SIMULATE_SLOWNESS_OF_SERIAL */ - -+/* This allocates page-aligned storage of the specified size, which must be -+ * a multiple of the page size as determined by calling sysconf(_SC_PAGESIZE) -+ */ -+#ifdef __linux__ -+static void * -+grub_mmap_alloc(size_t len) -+{ -+ int mmap_flags = MAP_ANONYMOUS|MAP_PRIVATE|MAP_EXECUTABLE; -+ -+#ifdef MAP_32BIT -+ mmap_flags |= MAP_32BIT; -+#endif -+ /* Mark the simulated stack executable, as GCC uses stack trampolines -+ * to implement nested functions. */ -+ return mmap(NULL, len, PROT_READ|PROT_WRITE|PROT_EXEC, mmap_flags, -1, 0); -+} -+#else /* !defined(__linux__) */ -+static void * -+grub_mmap_alloc(size_t len) -+{ -+ int fd = 0, offset = 0, ret = 0; -+ void *pa = MAP_FAILED; -+ char template[] = "/tmp/grub_mmap_alloc_XXXXXX"; -+ errno_t e; -+ -+ fd = mkstemp(template); -+ if (fd < 0) -+ return pa; -+ -+ unlink(template); -+ -+ ret = ftruncate(fd, len); -+ if (ret < 0) -+ return pa; -+ -+ /* Mark the simulated stack executable, as GCC uses stack trampolines -+ * to implement nested functions. */ -+ pa = mmap(NULL, len, PROT_READ|PROT_WRITE|PROT_EXEC, -+ MAP_PRIVATE|MAP_EXECUTABLE, fd, offset); -+ -+ e = errno; -+ close(fd); -+ errno = e; -+ return pa; -+} -+#endif /* defined(__linux__) */ -+ - /* The main entry point into this mess. */ - int - grub_stage2 (void) - { - /* These need to be static, because they survive our stack transitions. */ - static int status = 0; -- static char *realstack; -- char *scratch, *simstack; -+ static void *realstack; -+ void *simstack_alloc_base, *simstack; -+ size_t simstack_size, page_size; - int i; - - /* We need a nested function so that we get a clean stack frame, -@@ -140,9 +189,35 @@ - } - - assert (grub_scratch_mem == 0); -- scratch = malloc (0x100000 + EXTENDED_MEMSIZE + 15); -- assert (scratch); -- grub_scratch_mem = (char *) ((((int) scratch) >> 4) << 4); -+ -+ /* Allocate enough pages for 0x100000 + EXTENDED_SIZE + 15, and -+ * make sure the memory is aligned to a multiple of the system's -+ * page size */ -+ page_size = sysconf (_SC_PAGESIZE); -+ simstack_size = ( 0x100000 + EXTENDED_MEMSIZE + 15); -+ if (simstack_size % page_size) -+ { -+ /* If we're not on a page_size boundary, round up to the next one */ -+ simstack_size &= ~(page_size-1); -+ simstack_size += page_size; -+ } -+ -+ /* Add one for a PROT_NONE boundary page at each end. */ -+ simstack_size += 2 * page_size; -+ -+ simstack_alloc_base = grub_mmap_alloc(simstack_size); -+ assert (simstack_alloc_base != MAP_FAILED); -+ -+ /* mark pages above and below our simstack area as innaccessable. -+ * If the implementation we're using doesn't support that, then the -+ * new protection modes are undefined. It's safe to just ignore -+ * them, though. It'd be nice if we knew that we'd get a SEGV for -+ * touching the area, but that's all. it'd be nice to have. */ -+ mprotect (simstack_alloc_base, page_size, PROT_NONE); -+ mprotect ((void *)((unsigned long)simstack_alloc_base + -+ simstack_size - page_size), page_size, PROT_NONE); -+ -+ grub_scratch_mem = (void *)((unsigned long)simstack_alloc_base + page_size); - - /* FIXME: simulate the memory holes using mprot, if available. */ - -@@ -215,7 +290,7 @@ - device_map = 0; - free (disks); - disks = 0; -- free (scratch); -+ munmap(simstack_alloc_base, simstack_size); - grub_scratch_mem = 0; - - if (serial_device) ---- grub-0.97/stage2/builtins.c -+++ grub-0.97/stage2/builtins.c -@@ -131,63 +131,98 @@ - } - - -+/* blocklist_read_helper nee disk_read_blocklist_func was a nested -+ * function, to which pointers were taken and exposed globally. Even -+ * in the GNU-C nested functions extension, they have local linkage, -+ * and aren't guaranteed to be accessable *at all* outside of their -+ * containing scope. -+ * -+ * Above and beyond all of that, the variables within blocklist_func_context -+ * are originally local variables, with local (not even static) linkage, -+ * from within blocklist_func. These were each referenced by -+ * disk_read_blocklist_func, which is only called from other functions -+ * through a globally scoped pointer. -+ * -+ * The documentation in GCC actually uses the words "all hell will break -+ * loose" to describe this scenario. -+ * -+ * Also, "start_sector" was also used uninitialized, but gcc doesn't warn -+ * about it (possibly because of the scoping madness?) -+ */ -+ -+static struct { -+ int start_sector; -+ int num_sectors; -+ int num_entries; -+ int last_length; -+} blocklist_func_context = { -+ .start_sector = 0, -+ .num_sectors = 0, -+ .num_entries = 0, -+ .last_length = 0 -+}; -+ -+/* Collect contiguous blocks into one entry as many as possible, -+ and print the blocklist notation on the screen. */ -+static void -+blocklist_read_helper (int sector, int offset, int length) -+{ -+ int *start_sector = &blocklist_func_context.start_sector; -+ int *num_sectors = &blocklist_func_context.num_sectors; -+ int *num_entries = &blocklist_func_context.num_entries; -+ int *last_length = &blocklist_func_context.last_length; -+ -+ if (*num_sectors > 0) -+ { -+ if (*start_sector + *num_sectors == sector -+ && offset == 0 && *last_length == SECTOR_SIZE) -+ { -+ *num_sectors++; -+ *last_length = length; -+ return; -+ } -+ else -+ { -+ if (*last_length == SECTOR_SIZE) -+ grub_printf ("%s%d+%d", *num_entries ? "," : "", -+ *start_sector - part_start, *num_sectors); -+ else if (*num_sectors > 1) -+ grub_printf ("%s%d+%d,%d[0-%d]", *num_entries ? "," : "", -+ *start_sector - part_start, *num_sectors-1, -+ *start_sector + *num_sectors-1 - part_start, -+ *last_length); -+ else -+ grub_printf ("%s%d[0-%d]", *num_entries ? "," : "", -+ *start_sector - part_start, *last_length); -+ *num_entries++; -+ *num_sectors = 0; -+ } -+ } -+ -+ if (offset > 0) -+ { -+ grub_printf("%s%d[%d-%d]", *num_entries ? "," : "", -+ sector-part_start, offset, offset+length); -+ *num_entries++; -+ } -+ else -+ { -+ *start_sector = sector; -+ *num_sectors = 1; -+ *last_length = length; -+ } -+} -+ - /* blocklist */ - static int - blocklist_func (char *arg, int flags) - { - char *dummy = (char *) RAW_ADDR (0x100000); -- int start_sector; -- int num_sectors = 0; -- int num_entries = 0; -- int last_length = 0; -- -- auto void disk_read_blocklist_func (int sector, int offset, int length); -- -- /* Collect contiguous blocks into one entry as many as possible, -- and print the blocklist notation on the screen. */ -- auto void disk_read_blocklist_func (int sector, int offset, int length) -- { -- if (num_sectors > 0) -- { -- if (start_sector + num_sectors == sector -- && offset == 0 && last_length == SECTOR_SIZE) -- { -- num_sectors++; -- last_length = length; -- return; -- } -- else -- { -- if (last_length == SECTOR_SIZE) -- grub_printf ("%s%d+%d", num_entries ? "," : "", -- start_sector - part_start, num_sectors); -- else if (num_sectors > 1) -- grub_printf ("%s%d+%d,%d[0-%d]", num_entries ? "," : "", -- start_sector - part_start, num_sectors-1, -- start_sector + num_sectors-1 - part_start, -- last_length); -- else -- grub_printf ("%s%d[0-%d]", num_entries ? "," : "", -- start_sector - part_start, last_length); -- num_entries++; -- num_sectors = 0; -- } -- } -- -- if (offset > 0) -- { -- grub_printf("%s%d[%d-%d]", num_entries ? "," : "", -- sector-part_start, offset, offset+length); -- num_entries++; -- } -- else -- { -- start_sector = sector; -- num_sectors = 1; -- last_length = length; -- } -- } - -+ int *start_sector = &blocklist_func_context.start_sector; -+ int *num_sectors = &blocklist_func_context.num_sectors; -+ int *num_entries = &blocklist_func_context.num_entries; -+ - /* Open the file. */ - if (! grub_open (arg)) - return 1; -@@ -204,15 +241,15 @@ - grub_printf (")"); - - /* Read in the whole file to DUMMY. */ -- disk_read_hook = disk_read_blocklist_func; -+ disk_read_hook = blocklist_read_helper; - if (! grub_read (dummy, -1)) - goto fail; - - /* The last entry may not be printed yet. Don't check if it is a - * full sector, since it doesn't matter if we read too much. */ -- if (num_sectors > 0) -- grub_printf ("%s%d+%d", num_entries ? "," : "", -- start_sector - part_start, num_sectors); -+ if (*num_sectors > 0) -+ grub_printf ("%s%d+%d", *num_entries ? "," : "", -+ *start_sector - part_start, *num_sectors); - - grub_printf ("\n"); - -@@ -1868,6 +1905,77 @@ - - - /* install */ -+static struct { -+ int saved_sector; -+ int installaddr; -+ int installlist; -+ char *stage2_first_buffer; -+} install_func_context = { -+ .saved_sector = 0, -+ .installaddr = 0, -+ .installlist = 0, -+ .stage2_first_buffer = NULL, -+}; -+ -+/* Save the first sector of Stage2 in STAGE2_SECT. */ -+/* Formerly disk_read_savesect_func with local scope inside install_func */ -+static void -+install_savesect_helper(int sector, int offset, int length) -+{ -+ if (debug) -+ printf ("[%d]", sector); -+ -+ /* ReiserFS has files which sometimes contain data not aligned -+ on sector boundaries. Returning an error is better than -+ silently failing. */ -+ if (offset != 0 || length != SECTOR_SIZE) -+ errnum = ERR_UNALIGNED; -+ -+ install_func_context.saved_sector = sector; -+} -+ -+/* Write SECTOR to INSTALLLIST, and update INSTALLADDR and INSTALLSECT. */ -+/* Formerly disk_read_blocklist_func with local scope inside install_func */ -+static void -+install_blocklist_helper (int sector, int offset, int length) -+{ -+ int *installaddr = &install_func_context.installaddr; -+ int *installlist = &install_func_context.installlist; -+ char **stage2_first_buffer = &install_func_context.stage2_first_buffer; -+ /* Was the last sector full? */ -+ static int last_length = SECTOR_SIZE; -+ -+ if (debug) -+ printf("[%d]", sector); -+ -+ if (offset != 0 || last_length != SECTOR_SIZE) -+ { -+ /* We found a non-sector-aligned data block. */ -+ errnum = ERR_UNALIGNED; -+ return; -+ } -+ -+ last_length = length; -+ -+ if (*((unsigned long *) (*installlist - 4)) -+ + *((unsigned short *) *installlist) != sector -+ || *installlist == (int) *stage2_first_buffer + SECTOR_SIZE + 4) -+ { -+ *installlist -= 8; -+ -+ if (*((unsigned long *) (*installlist - 8))) -+ errnum = ERR_WONT_FIT; -+ else -+ { -+ *((unsigned short *) (*installlist + 2)) = (*installaddr >> 4); -+ *((unsigned long *) (*installlist - 4)) = sector; -+ } -+ } -+ -+ *((unsigned short *) *installlist) += 1; -+ *installaddr += 512; -+} -+ - static int - install_func (char *arg, int flags) - { -@@ -1875,8 +1983,12 @@ - char *stage1_buffer = (char *) RAW_ADDR (0x100000); - char *stage2_buffer = stage1_buffer + SECTOR_SIZE; - char *old_sect = stage2_buffer + SECTOR_SIZE; -- char *stage2_first_buffer = old_sect + SECTOR_SIZE; -- char *stage2_second_buffer = stage2_first_buffer + SECTOR_SIZE; -+ /* stage2_first_buffer used to be defined as: -+ * char *stage2_first_buffer = old_sect + SECTOR_SIZE; */ -+ char **stage2_first_buffer = &install_func_context.stage2_first_buffer; -+ /* and stage2_second_buffer was: -+ * char *stage2_second_buffer = stage2_first_buffer + SECTOR_SIZE; */ -+ char *stage2_second_buffer = old_sect + SECTOR_SIZE + SECTOR_SIZE; - /* XXX: Probably SECTOR_SIZE is reasonable. */ - char *config_filename = stage2_second_buffer + SECTOR_SIZE; - char *dummy = config_filename + SECTOR_SIZE; -@@ -1885,10 +1997,11 @@ - int src_drive, src_partition, src_part_start; - int i; - struct geometry dest_geom, src_geom; -- int saved_sector; -+ int *saved_sector = &install_func_context.saved_sector; - int stage2_first_sector, stage2_second_sector; - char *ptr; -- int installaddr, installlist; -+ int *installaddr = &install_func_context.installaddr; -+ int *installlist = &install_func_context.installlist; - /* Point to the location of the name of a configuration file in Stage 2. */ - char *config_file_location; - /* If FILE is a Stage 1.5? */ -@@ -1897,67 +2010,13 @@ - int is_open = 0; - /* If LBA is forced? */ - int is_force_lba = 0; -- /* Was the last sector full? */ -- int last_length = SECTOR_SIZE; -- -+ -+ *stage2_first_buffer = old_sect + SECTOR_SIZE; - #ifdef GRUB_UTIL - /* If the Stage 2 is in a partition mounted by an OS, this will store - the filename under the OS. */ - char *stage2_os_file = 0; - #endif /* GRUB_UTIL */ -- -- auto void disk_read_savesect_func (int sector, int offset, int length); -- auto void disk_read_blocklist_func (int sector, int offset, int length); -- -- /* Save the first sector of Stage2 in STAGE2_SECT. */ -- auto void disk_read_savesect_func (int sector, int offset, int length) -- { -- if (debug) -- printf ("[%d]", sector); -- -- /* ReiserFS has files which sometimes contain data not aligned -- on sector boundaries. Returning an error is better than -- silently failing. */ -- if (offset != 0 || length != SECTOR_SIZE) -- errnum = ERR_UNALIGNED; -- -- saved_sector = sector; -- } -- -- /* Write SECTOR to INSTALLLIST, and update INSTALLADDR and -- INSTALLSECT. */ -- auto void disk_read_blocklist_func (int sector, int offset, int length) -- { -- if (debug) -- printf("[%d]", sector); -- -- if (offset != 0 || last_length != SECTOR_SIZE) -- { -- /* We found a non-sector-aligned data block. */ -- errnum = ERR_UNALIGNED; -- return; -- } -- -- last_length = length; -- -- if (*((unsigned long *) (installlist - 4)) -- + *((unsigned short *) installlist) != sector -- || installlist == (int) stage2_first_buffer + SECTOR_SIZE + 4) -- { -- installlist -= 8; -- -- if (*((unsigned long *) (installlist - 8))) -- errnum = ERR_WONT_FIT; -- else -- { -- *((unsigned short *) (installlist + 2)) = (installaddr >> 4); -- *((unsigned long *) (installlist - 4)) = sector; -- } -- } -- -- *((unsigned short *) installlist) += 1; -- installaddr += 512; -- } - - /* First, check the GNU-style long option. */ - while (1) -@@ -1987,10 +2049,10 @@ - addr = skip_to (0, file); - - /* Get the installation address. */ -- if (! safe_parse_maxint (&addr, &installaddr)) -+ if (! safe_parse_maxint (&addr, installaddr)) - { - /* ADDR is not specified. */ -- installaddr = 0; -+ *installaddr = 0; - ptr = addr; - errnum = 0; - } -@@ -2084,17 +2146,17 @@ - = (dest_drive & BIOS_FLAG_FIXED_DISK); - - /* Read the first sector of Stage 2. */ -- disk_read_hook = disk_read_savesect_func; -- if (grub_read (stage2_first_buffer, SECTOR_SIZE) != SECTOR_SIZE) -+ disk_read_hook = install_savesect_helper; -+ if (grub_read (*stage2_first_buffer, SECTOR_SIZE) != SECTOR_SIZE) - goto fail; - -- stage2_first_sector = saved_sector; -+ stage2_first_sector = *saved_sector; - - /* Read the second sector of Stage 2. */ - if (grub_read (stage2_second_buffer, SECTOR_SIZE) != SECTOR_SIZE) - goto fail; - -- stage2_second_sector = saved_sector; -+ stage2_second_sector = *saved_sector; - - /* Check for the version of Stage 2. */ - if (*((short *) (stage2_second_buffer + STAGE2_VER_MAJ_OFFS)) -@@ -2110,27 +2172,27 @@ - - /* If INSTALLADDR is not specified explicitly in the command-line, - determine it by the Stage 2 id. */ -- if (! installaddr) -+ if (! *installaddr) - { - if (! is_stage1_5) - /* Stage 2. */ -- installaddr = 0x8000; -+ *installaddr = 0x8000; - else - /* Stage 1.5. */ -- installaddr = 0x2000; -+ *installaddr = 0x2000; - } - - *((unsigned long *) (stage1_buffer + STAGE1_STAGE2_SECTOR)) - = stage2_first_sector; - *((unsigned short *) (stage1_buffer + STAGE1_STAGE2_ADDRESS)) -- = installaddr; -+ = *installaddr; - *((unsigned short *) (stage1_buffer + STAGE1_STAGE2_SEGMENT)) -- = installaddr >> 4; -+ = *installaddr >> 4; - -- i = (int) stage2_first_buffer + SECTOR_SIZE - 4; -+ i = (int) *stage2_first_buffer + SECTOR_SIZE - 4; - while (*((unsigned long *) i)) - { -- if (i < (int) stage2_first_buffer -+ if (i < (int) *stage2_first_buffer - || (*((int *) (i - 4)) & 0x80000000) - || *((unsigned short *) i) >= 0xA00 - || *((short *) (i + 2)) == 0) -@@ -2144,13 +2206,13 @@ - i -= 8; - } - -- installlist = (int) stage2_first_buffer + SECTOR_SIZE + 4; -- installaddr += SECTOR_SIZE; -+ *installlist = (int) *stage2_first_buffer + SECTOR_SIZE + 4; -+ *installaddr += SECTOR_SIZE; - - /* Read the whole of Stage2 except for the first sector. */ - grub_seek (SECTOR_SIZE); - -- disk_read_hook = disk_read_blocklist_func; -+ disk_read_hook = install_blocklist_helper; - if (! grub_read (dummy, -1)) - goto fail; - -@@ -2233,7 +2295,7 @@ - /* Skip the first sector. */ - grub_seek (SECTOR_SIZE); - -- disk_read_hook = disk_read_savesect_func; -+ disk_read_hook = install_savesect_helper; - if (grub_read (stage2_buffer, SECTOR_SIZE) != SECTOR_SIZE) - goto fail; - -@@ -2303,7 +2365,7 @@ - else - #endif /* GRUB_UTIL */ - { -- if (! devwrite (saved_sector - part_start, 1, stage2_buffer)) -+ if (! devwrite (*saved_sector - part_start, 1, stage2_buffer)) - goto fail; - } - } -@@ -2325,7 +2387,7 @@ - goto fail; - } - -- if (fwrite (stage2_first_buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE) -+ if (fwrite (*stage2_first_buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE) - { - fclose (fp); - errnum = ERR_WRITE; -@@ -2352,7 +2414,7 @@ - goto fail; - - if (! devwrite (stage2_first_sector - src_part_start, 1, -- stage2_first_buffer)) -+ *stage2_first_buffer)) - goto fail; - - if (! devwrite (stage2_second_sector - src_part_start, 1, ---- grub-0.97/stage2/shared.h -+++ grub-0.97/stage2/shared.h -@@ -36,8 +36,8 @@ - - /* Maybe redirect memory requests through grub_scratch_mem. */ - #ifdef GRUB_UTIL --extern char *grub_scratch_mem; --# define RAW_ADDR(x) ((x) + (int) grub_scratch_mem) -+extern void *grub_scratch_mem; -+# define RAW_ADDR(x) ((x) + (unsigned long) grub_scratch_mem) - # define RAW_SEG(x) (RAW_ADDR ((x) << 4) >> 4) - #else - # define RAW_ADDR(x) (x) diff --git a/abs/core-testing/grub/05-grub-0.97-initrdaddr.diff b/abs/core-testing/grub/05-grub-0.97-initrdaddr.diff deleted file mode 100644 index ccf5f3e..0000000 --- a/abs/core-testing/grub/05-grub-0.97-initrdaddr.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- grub-0.96/stage2/boot.c -+++ grub-0.96/stage2/boot.c -@@ -824,8 +824,11 @@ - moveto = (mbi.mem_upper + 0x400) << 10; - - moveto = (moveto - len) & 0xfffff000; -- max_addr = (lh->header == LINUX_MAGIC_SIGNATURE && lh->version >= 0x0203 -- ? lh->initrd_addr_max : LINUX_INITRD_MAX_ADDRESS); -+ max_addr = LINUX_INITRD_MAX_ADDRESS; -+ if (lh->header == LINUX_MAGIC_SIGNATURE && -+ lh->version >= 0x0203 && -+ lh->initrd_addr_max < max_addr) -+ max_addr = lh->initrd_addr_max; - if (moveto + len >= max_addr) - moveto = (max_addr - len) & 0xfffff000; - diff --git a/abs/core-testing/grub/PKGBUILD b/abs/core-testing/grub/PKGBUILD deleted file mode 100644 index 38c6a28..0000000 --- a/abs/core-testing/grub/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 22874 2008-12-29 18:25:08Z tpowa $ -# Maintainer: Ronald van Haren - -pkgname=grub -pkgver=0.97 -pkgrel=31 -pkgdesc="A GNU multiboot boot loader" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnu.org/software/grub/" -groups=('base') -depends=('ncurses' 'diffutils' 'sed') -source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz - menu.lst - install-grub - 040_all_grub-0.96-nxstack.patch - 05-grub-0.97-initrdaddr.diff - i2o.patch - special-devices.patch - more-raid.patch - intelmac.patch - grub-inode-size.patch - ext4.patch) -backup=('boot/grub/menu.lst') -install=grub.install - -build() { - cd $srcdir/$pkgname-$pkgver - - #set destination architecture here - DESTARCH="i686" - #DESTARCH="x86_64" - # optimizations break the build -- disable them - # adding special devices to grub, patches are from fedora - patch -Np1 -i ../special-devices.patch || return 1 - patch -Np1 -i ../i2o.patch || return 1 - patch -Np1 -i ../more-raid.patch || return 1 - patch -Np1 -i ../intelmac.patch || return 1 - # Add support for bigger inode size to e2fs_stage1_5 - patch -Np1 -i ../grub-inode-size.patch || return 1 - # Add ext4 support - # http://www.mail-archive.com/bug-grub@gnu.org/msg11458.html - patch -Np1 -i ../ext4.patch || return 1 - - #arch64 fixes for static build - if [ "$CARCH" = "x86_64" ]; then - echo "this package has to be built on i686, won't compile on x86_64" - sleep 5 - else - if [ "$DESTARCH" = "x86_64" ]; then - # patch from gentoo for fixing a segfault - patch -Np1 -i ../040_all_grub-0.96-nxstack.patch || return 1 - # patch from frugalware to make it boot when more than 2GB ram installed - patch -Np1 -i ../05-grub-0.97-initrdaddr.diff || return 1 - CFLAGS="-static" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \ - --mandir=/usr/share/man --infodir=/usr/share/info - else - CFLAGS= ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \ - --mandir=/usr/share/man --infodir=/usr/share/info - fi - fi - - CFLAGS= make || return 1 - make DESTDIR=$pkgdir install || return 1 - install -D -m644 ../menu.lst $startdir/pkg/boot/grub/menu.lst - install -D -m755 ../install-grub $startdir/pkg/sbin/install-grub - - rm -f $pkgdir/usr/share/info/dir || return 1 - gzip /$pkgdir/usr/share/info/* - - if [ "$DESTARCH" = "x86_64" ]; then - # fool makepkg into building a x86_64 package - export CARCH="x86_64" - fi -} diff --git a/abs/core-testing/grub/ext4.patch b/abs/core-testing/grub/ext4.patch deleted file mode 100644 index 8a2f9bd..0000000 --- a/abs/core-testing/grub/ext4.patch +++ /dev/null @@ -1,263 +0,0 @@ -diff -ruNp grub-0.97/stage2/fsys_ext2fs.c grub-0.97-patch/stage2/fsys_ext2fs.c ---- grub-0.97/stage2/fsys_ext2fs.c 2004-08-08 20:19:18.000000000 +0200 -+++ grub-0.97-patch/stage2/fsys_ext2fs.c 2007-12-29 16:25:19.000000000 -+0100 -@@ -51,6 +51,9 @@ typedef unsigned int __u32; - #define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1) - #define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1) - -+/* Inode flags */ -+#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ -+ - /* include/linux/ext2_fs.h */ - struct ext2_super_block - { -@@ -191,6 +194,42 @@ struct ext2_dir_entry - #define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ - ~EXT2_DIR_ROUND) - -+/* linux/ext4_fs_extents.h */ -+/* -+ * This is the extent on-disk structure. -+ * It's used at the bottom of the tree. -+ */ -+struct ext4_extent { -+ __u32 ee_block; /* first logical block extent covers */ -+ __u16 ee_len; /* number of blocks covered by extent */ -+ __u16 ee_start_hi; /* high 16 bits of physical block */ -+ __u32 ee_start; /* low 32 bits of physical block */ -+}; -+ -+/* -+ * This is index on-disk structure. -+ * It's used at all the levels except the bottom. -+ */ -+struct ext4_extent_idx { -+ __u32 ei_block; /* index covers logical blocks from 'block' */ -+ __u32 ei_leaf; /* pointer to the physical block of the next * -+ * level. leaf or next index could be there */ -+ __u16 ei_leaf_hi; /* high 16 bits of physical block */ -+ __u16 ei_unused; -+}; -+ -+/* -+ * Each block (leaves and indexes), even inode-stored has header. -+ */ -+struct ext4_extent_header { -+ __u16 eh_magic; /* probably will support different formats */ -+ __u16 eh_entries; /* number of valid entries */ -+ __u16 eh_max; /* capacity of store in entries */ -+ __u16 eh_depth; /* has tree real underlying blocks? */ -+ __u32 eh_generation; /* generation of the tree */ -+}; -+ -+#define EXT4_EXT_MAGIC 0xf30a - - /* ext2/super.c */ - #define log2(n) ffz(~(n)) -@@ -279,6 +318,26 @@ ext2_rdfsb (int fsblock, int buffer) - EXT2_BLOCK_SIZE (SUPERBLOCK), (char *) buffer); - } - -+/* Walk through extents index tree to find the good leaf */ -+static struct ext4_extent_header * -+ext4_recurse_extent_index(struct ext4_extent_header *extent_block, int logical_block) -+{ -+ int i; -+ struct ext4_extent_idx *index = (struct ext4_extent_idx *) (extent_block + 1); -+ if (extent_block->eh_magic != EXT4_EXT_MAGIC) -+ return NULL; -+ if (extent_block->eh_depth == 0) -+ return extent_block; -+ for (i = 0; i < extent_block->eh_entries; i++) -+ { -+ if (logical_block < index[i].ei_block) -+ break; -+ } -+ if (i == 0 || !ext2_rdfsb(index[i-1].ei_leaf, DATABLOCK1)) -+ return NULL; -+ return (ext4_recurse_extent_index((struct ext4_extent_header *) DATABLOCK1, logical_block)); -+} -+ - /* from - ext2/inode.c:ext2_bmap() - */ ---- grub-0.97/stage2/fsys_ext2fs.c~ 2008-12-28 20:19:00.000000000 +0100 -+++ grub-0.97/stage2/fsys_ext2fs.c 2008-12-28 20:19:00.000000000 +0100 -@@ -366,83 +366,106 @@ - } - printf ("logical block %d\n", logical_block); - #endif /* E2DEBUG */ -- -- /* if it is directly pointed to by the inode, return that physical addr */ -- if (logical_block < EXT2_NDIR_BLOCKS) -- { --#ifdef E2DEBUG -- printf ("returning %d\n", (unsigned char *) (INODE->i_block[logical_block])); -- printf ("returning %d\n", INODE->i_block[logical_block]); --#endif /* E2DEBUG */ -- return INODE->i_block[logical_block]; -- } -- /* else */ -- logical_block -= EXT2_NDIR_BLOCKS; -- /* try the indirect block */ -- if (logical_block < EXT2_ADDR_PER_BLOCK (SUPERBLOCK)) -+ /* standard ext2 inode */ -+ if (!(INODE->i_flags & EXT4_EXTENTS_FL)) - { -- if (mapblock1 != 1 -- && !ext2_rdfsb (INODE->i_block[EXT2_IND_BLOCK], DATABLOCK1)) -- { -- errnum = ERR_FSYS_CORRUPT; -- return -1; -- } -- mapblock1 = 1; -- return ((__u32 *) DATABLOCK1)[logical_block]; -- } -- /* else */ -- logical_block -= EXT2_ADDR_PER_BLOCK (SUPERBLOCK); -- /* now try the double indirect block */ -- if (logical_block < (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2))) -- { -- int bnum; -- if (mapblock1 != 2 -- && !ext2_rdfsb (INODE->i_block[EXT2_DIND_BLOCK], DATABLOCK1)) -- { -- errnum = ERR_FSYS_CORRUPT; -- return -1; -- } -- mapblock1 = 2; -- if ((bnum = (((__u32 *) DATABLOCK1) -- [logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)])) -- != mapblock2 -- && !ext2_rdfsb (bnum, DATABLOCK2)) -- { -- errnum = ERR_FSYS_CORRUPT; -- return -1; -- } -- mapblock2 = bnum; -+ /* if it is directly pointed to by the inode, return that physical addr */ -+ if (logical_block < EXT2_NDIR_BLOCKS) -+ { -+#ifdef E2DEBUG -+ printf ("returning %d\n", (unsigned char *) (INODE->i_block[logical_block])); -+ printf ("returning %d\n", INODE->i_block[logical_block]); -+#endif /* E2DEBUG */ -+ return INODE->i_block[logical_block]; -+ } -+ /* else */ -+ logical_block -= EXT2_NDIR_BLOCKS; -+ /* try the indirect block */ -+ if (logical_block < EXT2_ADDR_PER_BLOCK (SUPERBLOCK)) -+ { -+ if (mapblock1 != 1 -+ && !ext2_rdfsb (INODE->i_block[EXT2_IND_BLOCK], DATABLOCK1)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ mapblock1 = 1; -+ return ((__u32 *) DATABLOCK1)[logical_block]; -+ } -+ /* else */ -+ logical_block -= EXT2_ADDR_PER_BLOCK (SUPERBLOCK); -+ /* now try the double indirect block */ -+ if (logical_block < (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2))) -+ { -+ int bnum; -+ if (mapblock1 != 2 -+ && !ext2_rdfsb (INODE->i_block[EXT2_DIND_BLOCK], DATABLOCK1)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ mapblock1 = 2; -+ if ((bnum = (((__u32 *) DATABLOCK1) -+ [logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)])) -+ != mapblock2 -+ && !ext2_rdfsb (bnum, DATABLOCK2)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ mapblock2 = bnum; -+ return ((__u32 *) DATABLOCK2) -+ [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)]; -+ } -+ /* else */ -+ mapblock2 = -1; -+ logical_block -= (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2)); -+ if (mapblock1 != 3 -+ && !ext2_rdfsb (INODE->i_block[EXT2_TIND_BLOCK], DATABLOCK1)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ mapblock1 = 3; -+ if (!ext2_rdfsb (((__u32 *) DATABLOCK1) -+ [logical_block >> (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) -+ * 2)], -+ DATABLOCK2)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ if (!ext2_rdfsb (((__u32 *) DATABLOCK2) -+ [(logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)) -+ & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)], -+ DATABLOCK2)) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } - return ((__u32 *) DATABLOCK2) -- [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)]; -- } -- /* else */ -- mapblock2 = -1; -- logical_block -= (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2)); -- if (mapblock1 != 3 -- && !ext2_rdfsb (INODE->i_block[EXT2_TIND_BLOCK], DATABLOCK1)) -- { -- errnum = ERR_FSYS_CORRUPT; -- return -1; -+ [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)]; - } -- mapblock1 = 3; -- if (!ext2_rdfsb (((__u32 *) DATABLOCK1) -- [logical_block >> (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) -- * 2)], -- DATABLOCK2)) -- { -- errnum = ERR_FSYS_CORRUPT; -- return -1; -- } -- if (!ext2_rdfsb (((__u32 *) DATABLOCK2) -- [(logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)) -- & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)], -- DATABLOCK2)) -+ /* inode is in extents format */ -+ else - { -+ int i; -+ struct ext4_extent_header *extent_hdr = ext4_recurse_extent_index((struct ext4_extent_header *) INODE->i_block, logical_block); -+ struct ext4_extent *extent = (struct ext4_extent *) (extent_hdr + 1); -+ if ( extent_hdr == NULL || extent_hdr->eh_magic != EXT4_EXT_MAGIC) -+ { -+ errnum = ERR_FSYS_CORRUPT; -+ return -1; -+ } -+ for (i = 0; ieh_entries; i++) -+ { -+ if (extent[i].ee_block <= logical_block && logical_block < extent[i].ee_block + extent[i].ee_len && !(extent[i].ee_len>>15)) -+ return (logical_block - extent[i].ee_block + extent[i].ee_start); -+ } -+ /* We should not arrive here */ - errnum = ERR_FSYS_CORRUPT; - return -1; - } -- return ((__u32 *) DATABLOCK2) -- [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)]; - } - - /* preconditions: all preconds of ext2fs_block_map */ diff --git a/abs/core-testing/grub/grub-0.97-gpt.patch b/abs/core-testing/grub/grub-0.97-gpt.patch deleted file mode 100644 index 7b1a55c..0000000 --- a/abs/core-testing/grub/grub-0.97-gpt.patch +++ /dev/null @@ -1,315 +0,0 @@ -diff -ruBbd --unidirectional-new-file grub-0.96/stage2/builtins.c grub-0.96-patched/stage2/builtins.c ---- grub-0.96/stage2/builtins.c 2004-06-20 09:33:04.000000000 -0400 -+++ grub-0.96-patched/stage2/builtins.c 2007-01-04 13:56:06.000000000 -0500 -@@ -1229,14 +1229,15 @@ - for (drive = 0x80; drive < 0x88; drive++) - { - unsigned long part = 0xFFFFFF; -- unsigned long start, len, offset, ext_offset; -- int type, entry; -+ unsigned long start, len, offset, ext_offset, gpt_offset; -+ int type, entry, gpt_count, gpt_size; - char buf[SECTOR_SIZE]; - - current_drive = drive; - while (next_partition (drive, 0xFFFFFF, &part, &type, - &start, &len, &offset, &entry, -- &ext_offset, buf)) -+ &ext_offset, &gpt_offset, -+ &gpt_count, &gpt_size, buf)) - { - if (type != PC_SLICE_TYPE_NONE - && ! IS_PC_SLICE_TYPE_BSD (type) -@@ -2806,8 +2807,8 @@ - { - int new_type; - unsigned long part = 0xFFFFFF; -- unsigned long start, len, offset, ext_offset; -- int entry, type; -+ unsigned long start, len, offset, ext_offset, gpt_offset; -+ int entry, type, gpt_count, gpt_size; - char mbr[512]; - - /* Get the drive and the partition. */ -@@ -2844,7 +2845,14 @@ - /* Look for the partition. */ - while (next_partition (current_drive, 0xFFFFFF, &part, &type, - &start, &len, &offset, &entry, -- &ext_offset, mbr)) -+ &ext_offset, &gpt_offset, &gpt_count, &gpt_size, mbr)) -+ /* The partition may not be a GPT partition. */ -+ if (gpt_offset != 0) -+ { -+ errnum = ERR_BAD_ARGUMENT; -+ return 1; -+ } -+ - { - if (part == current_partition) - { -diff -ruBbd --unidirectional-new-file grub-0.96/stage2/disk_io.c grub-0.96-patched/stage2/disk_io.c ---- grub-0.96/stage2/disk_io.c 2004-05-23 12:35:24.000000000 -0400 -+++ grub-0.96-patched/stage2/disk_io.c 2007-01-04 14:01:08.000000000 -0500 -@@ -21,6 +21,7 @@ - - #include - #include -+#include - - #ifdef SUPPORT_NETBOOT - # define GRUB 1 -@@ -502,8 +503,8 @@ - set_partition_hidden_flag (int hidden) - { - unsigned long part = 0xFFFFFF; -- unsigned long start, len, offset, ext_offset; -- int entry, type; -+ unsigned long start, len, offset, ext_offset, gpt_offset; -+ int entry, type, gpt_count, gpt_size; - char mbr[512]; - - /* The drive must be a hard disk. */ -@@ -524,7 +525,14 @@ - /* Look for the partition. */ - while (next_partition (current_drive, 0xFFFFFF, &part, &type, - &start, &len, &offset, &entry, -- &ext_offset, mbr)) -+ &ext_offset, &gpt_offset, &gpt_count, &gpt_size, mbr)) -+ /* The partition may not be a GPT partition. */ -+ if (gpt_offset != 0) -+ { -+ errnum = ERR_BAD_ARGUMENT; -+ return 1; -+ } -+ - { - if (part == current_partition) - { -@@ -577,11 +585,14 @@ - unsigned long *partition, int *type, - unsigned long *start, unsigned long *len, - unsigned long *offset, int *entry, -- unsigned long *ext_offset, char *buf) -+ unsigned long *ext_offset, -+ unsigned long *gpt_offset, int *gpt_count, -+ int *gpt_size, char *buf) - { - /* Forward declarations. */ - auto int next_bsd_partition (void); - auto int next_pc_slice (void); -+ auto int next_gpt_slice(void); - - /* Get next BSD partition in current PC slice. */ - int next_bsd_partition (void) -@@ -666,6 +677,40 @@ - return 0; - } - -+ /* If this is a GPT partition table, read it as such. */ -+ if (*entry == -1 && *offset == 0 && PC_SLICE_TYPE (buf, 0) == PC_SLICE_TYPE_GPT) -+ { -+ struct grub_gpt_header *hdr = (struct grub_gpt_header *) buf; -+ -+ /* Read in the GPT Partition table header. */ -+ if (! rawread (drive, 1, 0, SECTOR_SIZE, buf)) -+ return 0; -+ -+ if (hdr->magic == GPT_HEADER_MAGIC && hdr->version == 0x10000) -+ { -+ /* Let gpt_offset point to the first entry in the GPT -+ partition table. This can also be used by callers of -+ next_partition to determine if a entry comes from a -+ GPT partition table or not. */ -+ *gpt_offset = hdr->partitions; -+ *gpt_count = hdr->maxpart; -+ *gpt_size = hdr->partentry_size; -+ -+ return next_gpt_slice(); -+ } -+ else -+ { -+ /* This is not a valid header for a GPT partition table. -+ Re-read the MBR or the boot sector of the extended -+ partition. */ -+ if (! rawread (drive, *offset, 0, SECTOR_SIZE, buf)) -+ return 0; -+ } -+ } -+ -+ /* Not a GPT partition. */ -+ *gpt_offset = 0; -+ - /* Increase the entry number. */ - (*entry)++; - -@@ -710,6 +755,43 @@ - return 1; - } - -+ /* Get the next GPT slice. */ -+ int next_gpt_slice (void) -+ { -+ struct grub_gpt_partentry *gptentry = (struct grub_gpt_partentry *) buf; -+ /* Make GPT partitions show up as PC slices. */ -+ int pc_slice_no = (*partition & 0xFF0000) >> 16; -+ -+ /* If this is the first time... */ -+ if (pc_slice_no == 0xFF) -+ { -+ pc_slice_no = -1; -+ *entry = -1; -+ } -+ -+ do { -+ (*entry)++; -+ -+ if (*entry >= *gpt_count) -+ { -+ errnum = ERR_NO_PART; -+ return 0; -+ } -+ /* Read in the GPT Partition table entry. */ -+ if (! rawread (drive, (*gpt_offset) + GPT_ENTRY_SECTOR (*gpt_size, *entry), GPT_ENTRY_INDEX (*gpt_size, *entry), *gpt_size, buf)) -+ return 0; -+ } while (! (gptentry->type1 && gptentry->type2)); -+ -+ pc_slice_no++; -+ *start = gptentry->start; -+ *len = gptentry->end - gptentry->start + 1; -+ *type = PC_SLICE_TYPE_EXT2FS; -+ *entry = pc_slice_no; -+ *partition = (*entry << 16) | 0xFFFF; -+ -+ return 1; -+ } -+ - /* Start the body of this function. */ - - #ifndef STAGE1_5 -@@ -717,6 +799,9 @@ - return 0; - #endif - -+ if (*partition != 0xFFFFFF && *gpt_offset != 0) -+ return next_gpt_slice (); -+ - /* If previous partition is a BSD partition or a PC slice which - contains BSD partitions... */ - if ((*partition != 0xFFFFFF && IS_PC_SLICE_TYPE_BSD (*type & 0xff)) -@@ -755,6 +840,9 @@ - unsigned long dest_partition = current_partition; - unsigned long part_offset; - unsigned long ext_offset; -+ unsigned long gpt_offset; -+ int gpt_count; -+ int gpt_size; - int entry; - char buf[SECTOR_SIZE]; - int bsd_part, pc_slice; -@@ -766,7 +854,8 @@ - int ret = next_partition (current_drive, dest_partition, - ¤t_partition, ¤t_slice, - &part_start, &part_length, -- &part_offset, &entry, &ext_offset, buf); -+ &part_offset, &entry, &ext_offset, -+ &gpt_offset, &gpt_count, &gpt_size, buf); - bsd_part = (current_partition >> 8) & 0xFF; - pc_slice = current_partition >> 16; - return ret; -diff -ruBbd --unidirectional-new-file grub-0.96/stage2/gpt.h grub-0.96-patched/stage2/gpt.h ---- grub-0.96/stage2/gpt.h 1969-12-31 19:00:00.000000000 -0500 -+++ grub-0.96-patched/stage2/gpt.h 2007-01-04 13:52:14.000000000 -0500 -@@ -0,0 +1,68 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2002,2005,2006 Free Software Foundation, Inc. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ */ -+ -+#ifndef _GPT_H -+#define _GPT_H -+ -+typedef signed char grub_int8_t; -+typedef signed short grub_int16_t; -+typedef signed int grub_int32_t; -+typedef signed long long int grub_int64_t; -+typedef unsigned char grub_uint8_t; -+typedef unsigned short grub_uint16_t; -+typedef unsigned int grub_uint32_t; -+typedef unsigned long long int grub_uint64_t; -+ -+struct grub_gpt_header -+{ -+ grub_uint64_t magic; -+ grub_uint32_t version; -+ grub_uint32_t headersize; -+ grub_uint32_t crc32; -+ grub_uint32_t unused1; -+ grub_uint64_t primary; -+ grub_uint64_t backup; -+ grub_uint64_t start; -+ grub_uint64_t end; -+ grub_uint8_t guid[16]; -+ grub_uint64_t partitions; -+ grub_uint32_t maxpart; -+ grub_uint32_t partentry_size; -+ grub_uint32_t partentry_crc32; -+} __attribute__ ((packed)); -+ -+struct grub_gpt_partentry -+{ -+ grub_uint64_t type1; -+ grub_uint64_t type2; -+ grub_uint8_t guid[16]; -+ grub_uint64_t start; -+ grub_uint64_t end; -+ grub_uint8_t attrib; -+ char name[72]; -+} __attribute__ ((packed)); -+ -+#define GPT_HEADER_MAGIC 0x5452415020494645UL -+ -+#define GPT_ENTRY_SECTOR(size,entry) \ -+ ((((entry) * (size) + 1) & ~(SECTOR_SIZE - 1)) >> SECTOR_BITS) -+#define GPT_ENTRY_INDEX(size,entry) \ -+ ((((entry) * (size) + 1) & (SECTOR_SIZE - 1)) - 1) -+ -+#endif /* _GPT_H */ -diff -ruBbd --unidirectional-new-file grub-0.96/stage2/pc_slice.h grub-0.96-patched/stage2/pc_slice.h ---- grub-0.96/stage2/pc_slice.h 2003-07-09 07:45:53.000000000 -0400 -+++ grub-0.96-patched/stage2/pc_slice.h 2007-01-04 13:52:14.000000000 -0500 -@@ -115,6 +115,7 @@ - #define PC_SLICE_TYPE_LINUX_EXTENDED 0x85 - #define PC_SLICE_TYPE_VSTAFS 0x9e - #define PC_SLICE_TYPE_DELL_UTIL 0xde -+#define PC_SLICE_TYPE_GPT 0xee - #define PC_SLICE_TYPE_LINUX_RAID 0xfd - - -diff -ruBbd --unidirectional-new-file grub-0.96/stage2/shared.h grub-0.96-patched/stage2/shared.h ---- grub-0.96/stage2/shared.h 2004-06-19 12:40:09.000000000 -0400 -+++ grub-0.96-patched/stage2/shared.h 2007-01-04 13:52:15.000000000 -0500 -@@ -934,7 +934,9 @@ - unsigned long *partition, int *type, - unsigned long *start, unsigned long *len, - unsigned long *offset, int *entry, -- unsigned long *ext_offset, char *buf); -+ unsigned long *ext_offset, -+ unsigned long *gpt_offset, int *gpt_count, -+ int *gpt_size, char *buf); - - /* Sets device to the one represented by the SAVED_* parameters. */ - int make_saved_active (void); diff --git a/abs/core-testing/grub/grub-inode-size.patch b/abs/core-testing/grub/grub-inode-size.patch deleted file mode 100644 index bef3bc1..0000000 --- a/abs/core-testing/grub/grub-inode-size.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -Nrup a/stage2/fsys_ext2fs.c b/stage2/fsys_ext2fs.c ---- a/stage2/fsys_ext2fs.c 2004-08-08 20:19:18.000000000 +0200 -+++ b/stage2/fsys_ext2fs.c 2008-01-30 14:27:20.000000000 +0100 -@@ -79,7 +79,52 @@ struct ext2_super_block - __u32 s_rev_level; /* Revision level */ - __u16 s_def_resuid; /* Default uid for reserved blocks */ - __u16 s_def_resgid; /* Default gid for reserved blocks */ -- __u32 s_reserved[235]; /* Padding to the end of the block */ -+ /* -+ * These fields are for EXT2_DYNAMIC_REV superblocks only. -+ * -+ * Note: the difference between the compatible feature set and -+ * the incompatible feature set is that if there is a bit set -+ * in the incompatible feature set that the kernel doesn't -+ * know about, it should refuse to mount the filesystem. -+ * -+ * e2fsck's requirements are more strict; if it doesn't know -+ * about a feature in either the compatible or incompatible -+ * feature set, it must abort and not try to meddle with -+ * things it doesn't understand... -+ */ -+ __u32 s_first_ino; /* First non-reserved inode */ -+ __u16 s_inode_size; /* size of inode structure */ -+ __u16 s_block_group_nr; /* block group # of this superblock */ -+ __u32 s_feature_compat; /* compatible feature set */ -+ __u32 s_feature_incompat; /* incompatible feature set */ -+ __u32 s_feature_ro_compat; /* readonly-compatible feature set */ -+ __u8 s_uuid[16]; /* 128-bit uuid for volume */ -+ char s_volume_name[16]; /* volume name */ -+ char s_last_mounted[64]; /* directory where last mounted */ -+ __u32 s_algorithm_usage_bitmap; /* For compression */ -+ /* -+ * Performance hints. Directory preallocation should only -+ * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on. -+ */ -+ __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/ -+ __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */ -+ __u16 s_reserved_gdt_blocks;/* Per group table for online growth */ -+ /* -+ * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set. -+ */ -+ __u8 s_journal_uuid[16]; /* uuid of journal superblock */ -+ __u32 s_journal_inum; /* inode number of journal file */ -+ __u32 s_journal_dev; /* device number of journal file */ -+ __u32 s_last_orphan; /* start of list of inodes to delete */ -+ __u32 s_hash_seed[4]; /* HTREE hash seed */ -+ __u8 s_def_hash_version; /* Default hash version to use */ -+ __u8 s_jnl_backup_type; /* Default type of journal backup */ -+ __u16 s_reserved_word_pad; -+ __u32 s_default_mount_opts; -+ __u32 s_first_meta_bg; /* First metablock group */ -+ __u32 s_mkfs_time; /* When the filesystem was created */ -+ __u32 s_jnl_blocks[17]; /* Backup of the journal inode */ -+ __u32 s_reserved[172]; /* Padding to the end of the block */ - }; - - struct ext2_group_desc -@@ -218,6 +263,9 @@ struct ext2_dir_entry - #define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32)) - #define EXT2_ADDR_PER_BLOCK_BITS(s) (log2(EXT2_ADDR_PER_BLOCK(s))) - -+#define EXT2_INODE_SIZE(s) (SUPERBLOCK->s_inode_size) -+#define EXT2_INODES_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s)) -+ - /* linux/ext2_fs.h */ - #define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) - /* kind of from ext2/super.c */ -@@ -553,7 +601,7 @@ ext2fs_dir (char *dirname) - gdp = GROUP_DESC; - ino_blk = gdp[desc].bg_inode_table + - (((current_ino - 1) % (SUPERBLOCK->s_inodes_per_group)) -- >> log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode))); -+ >> log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK))); - #ifdef E2DEBUG - printf ("inode table fsblock=%d\n", ino_blk); - #endif /* E2DEBUG */ -@@ -565,13 +613,12 @@ ext2fs_dir (char *dirname) - /* reset indirect blocks! */ - mapblock2 = mapblock1 = -1; - -- raw_inode = INODE + -- ((current_ino - 1) -- & (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode) - 1)); -+ raw_inode = (struct ext2_inode *)((char *)INODE + -+ ((current_ino - 1) & (EXT2_INODES_PER_BLOCK (SUPERBLOCK) - 1)) * -+ EXT2_INODE_SIZE (SUPERBLOCK)); - #ifdef E2DEBUG - printf ("ipb=%d, sizeof(inode)=%d\n", -- (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode)), -- sizeof (struct ext2_inode)); -+ EXT2_INODES_PER_BLOCK (SUPERBLOCK), EXT2_INODE_SIZE (SUPERBLOCK)); - printf ("inode=%x, raw_inode=%x\n", INODE, raw_inode); - printf ("offset into inode table block=%d\n", (int) raw_inode - (int) INODE); - for (i = (unsigned char *) INODE; i <= (unsigned char *) raw_inode; diff --git a/abs/core-testing/grub/grub.install b/abs/core-testing/grub/grub.install deleted file mode 100644 index bf52382..0000000 --- a/abs/core-testing/grub/grub.install +++ /dev/null @@ -1,22 +0,0 @@ -info_dir=/usr/share/info -info_files=(grub.info multiboot.info) - -post_install() { - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install -} - -pre_remove() { - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - - - - diff --git a/abs/core-testing/grub/i2o.patch b/abs/core-testing/grub/i2o.patch deleted file mode 100644 index 2af846c..0000000 --- a/abs/core-testing/grub/i2o.patch +++ /dev/null @@ -1,45 +0,0 @@ -Only in grub-0.94/docs: grub.info -Only in grub-0.94/docs: multiboot.info -diff -ur grub-0.94/lib/device.c grub-0.94.new/lib/device.c ---- grub-0.94/lib/device.c 2004-05-07 04:50:36.375238696 +0200 -+++ grub-0.94.new/lib/device.c 2004-05-07 04:48:57.611253104 +0200 -@@ -419,6 +419,12 @@ - { - sprintf (name, "/dev/rd/c%dd%d", controller, drive); - } -+ -+static void -+get_i2o_disk_name (char *name, int unit) -+{ -+ sprintf (name, "/dev/i2o/hd%c", unit + 'a'); -+} - #endif - - /* Check if DEVICE can be read. If an error occurs, return zero, -@@ -789,6 +795,26 @@ - } - } - } -+ -+ /* I2O disks. */ -+ for (i = 0; i < 8; i++) -+ { -+ char name[16]; -+ -+ get_i2o_disk_name (name, i); -+ if (check_device (name)) -+ { -+ (*map)[num_hd + 0x80] = strdup (name); -+ assert ((*map)[num_hd + 0x80]); -+ -+ /* If the device map file is opened, write the map. */ -+ if (fp) -+ fprintf (fp, "(hd%d)\t%s\n", num_hd, name); -+ -+ num_hd++; -+ } -+ } -+ - #endif /* __linux__ */ - - /* OK, close the device map file if opened. */ diff --git a/abs/core-testing/grub/install-grub b/abs/core-testing/grub/install-grub deleted file mode 100644 index 0015a31..0000000 --- a/abs/core-testing/grub/install-grub +++ /dev/null @@ -1,543 +0,0 @@ -#! /bin/sh - -# Install GRUB on your drive. -# Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. -# -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# Initialize some variables. -prefix=/ -exec_prefix=${prefix} -sbindir=${exec_prefix}/sbin -libdir=${exec_prefix}/lib -PACKAGE=grub -VERSION=0.95 -host_cpu=i386 -host_os=linux-gnu -host_vendor=pc -pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor} - -grub_shell=${sbindir}/grub -log_file=/tmp/grub-install.log.$$ -img_file=/tmp/grub-install.img.$$ -rootdir= -grub_prefix=/boot/grub - -install_device= -no_floppy= -force_lba= -recheck=no -sync_sleep=20 -debug=no - -# look for secure tempfile creation wrappers on this platform -if test -x /bin/tempfile; then - mklog="/bin/tempfile --prefix=grub" - mkimg="/bin/tempfile --prefix=grub" -elif test -x /bin/mktemp; then - mklog="/bin/mktemp /tmp/grub-install.log.XXXXXX" - mkimg="/bin/mktemp /tmp/grub-install.img.XXXXXX" -else - mklog="" - mkimg="" -fi - -# Usage: usage -# Print the usage. -usage () { - cat <. -EOF -} - -# Usage: getraid_mdadm mddevice -# Routine to find a physical device from an md device -# If found, the first grub BIOS device (from device.map) is returned -# If no BIOS drives match the RAID devices, the first device returned -# from mdadm -D is returned -getraid_mdadm() { - device=$1 - mdadm=$(mdadm -D "$device") || { - echo "$PROG: mdadm -D $device failed" >&2 - exit 1 - } - eval "$( - echo "$mdadm" | awk ' - $1 == "Number" && $2 == "Major" { start = 1; next } - $1 == "UUID" { print "uuid=" $3; start = 0; next } - !start { next } - $2 == 0 && $3 == 0 { next } - { devices = devices "\n" $NF } - END { print "devices='\''" devices "'\''" } - ' - )" - - # Convert RAID devices list into a list of disks - tmp_disks=`echo "$devices" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \ - -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \ - -e 's%\(fd[0-9]*\)$%\1%' \ - -e 's%/part[0-9]*$%/disc%' \ - -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \ - -e '/^$/d' | - sed -n '1h;2,$H;${g;s/\n/|/g;p}'` - - # Find first BIOS disk that's a member of the RAID array - # Default to first RAID member if no tmp_disks are BIOS devices - set -- `egrep $tmp_disks $device_map | \ - sort | \ - sed -n 1p ` - device=${2:-${tmp_disks%%|*}} - - # Return first partition on BIOS disk that's part of the RAID - echo "$devices" | \ - sed -n "\:${device}:p" | \ - sed -n 1p -} - -# Usage: xfs_hack -# Routine to flush xfs filesystem log (sync doesn't do this) -# sleep is needed to give time for the log to be flushed -xfs_hack () { - sync - if which xfs_freeze >/dev/null ; then - echo "Trying to sync filesystem, do not interrupt until complete." - xfs_freeze -f ${grubdir} 2>/dev/null - sleep $sync_sleep - xfs_freeze -u ${grubdir} 2>/dev/null - echo "Trying to sync filesystem is complete." - fi -} - -# Usage: convert os_device -# Convert an OS device to the corresponding GRUB drive. -# This part is OS-specific. -convert () { - # First, check if the device file exists. - if test -e "$1"; then - : - else - echo "$1: Not found or not a block device." 1>&2 - exit 1 - fi - - # Break the device name into the disk part and the partition part. - case "$host_os" in - linux*) - # Find an actual physical device if we're passed a RAID device - case $1 in - /dev/md*) set -- `getraid_mdadm $1` - esac - tmp_disk=`echo "$1" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \ - -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \ - -e 's%\(fd[0-9]*\)$%\1%' \ - -e 's%/part[0-9]*$%/disc%' \ - -e 's%\(c[0-7]d[0-9]*\).*$%\1%'` - tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \ - -e 's%.*d[0-9]*p*%%' \ - -e 's%.*/fd[0-9]*$%%' \ - -e 's%.*/floppy/[0-9]*$%%' \ - -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \ - -e 's%.*c[0-7]d[0-9]*p*%%'` - ;; - gnu*) - tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'` - tmp_part=`echo "$1" | sed "s%$tmp_disk%%"` ;; - freebsd*) - tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([saw]d[0-9]*\).*$%r\1%' \ - | sed 's%r\{0,1\}\(da[0-9]*\).*$%r\1%'` - tmp_part=`echo "$1" \ - | sed "s%.*/r\{0,1\}[saw]d[0-9]\(s[0-9]*[a-h]\)%\1%" \ - | sed "s%.*/r\{0,1\}da[0-9]\(s[0-9]*[a-h]\)%\1%"` - ;; - netbsd*) - tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([sw]d[0-9]*\).*$%r\1d%' \ - | sed 's%r\{0,1\}\(fd[0-9]*\).*$%r\1a%'` - tmp_part=`echo "$1" \ - | sed "s%.*/r\{0,1\}[sw]d[0-9]\([abe-p]\)%\1%"` - ;; - *) - echo "grub-install does not support your OS yet." 1>&2 - exit 1 ;; - esac - - # Get the drive name. - tmp_drive=`grep -v '^#' $device_map | grep "$tmp_disk *$" \ - | sed 's%.*\(([hf]d[0-9][a-g0-9,]*)\).*%\1%'` - - # If not found, print an error message and exit. - if test "x$tmp_drive" = x; then - echo "$1 does not have any corresponding BIOS drive." 1>&2 - exit 1 - fi - - if test "x$tmp_part" != x; then - # If a partition is specified, we need to translate it into the - # GRUB's syntax. - case "$host_os" in - linux*) - echo "$tmp_drive" | sed "s%)$%,`expr $tmp_part - 1`)%" ;; - gnu*) - if echo $tmp_part | grep "^s" >/dev/null; then - tmp_pc_slice=`echo $tmp_part \ - | sed "s%s\([0-9]*\)[a-g]*$%\1%"` - tmp_drive=`echo "$tmp_drive" \ - | sed "s%)%,\`expr "$tmp_pc_slice" - 1\`)%"` - fi - if echo $tmp_part | grep "[a-g]$" >/dev/null; then - tmp_bsd_partition=`echo "$tmp_part" \ - | sed "s%[^a-g]*\([a-g]\)$%\1%"` - tmp_drive=`echo "$tmp_drive" \ - | sed "s%)%,$tmp_bsd_partition)%"` - fi - echo "$tmp_drive" ;; - freebsd*) - if echo $tmp_part | grep "^s" >/dev/null; then - tmp_pc_slice=`echo $tmp_part \ - | sed "s%s\([0-9]*\)[a-h]*$%\1%"` - tmp_drive=`echo "$tmp_drive" \ - | sed "s%)%,\`expr "$tmp_pc_slice" - 1\`)%"` - fi - if echo $tmp_part | grep "[a-h]$" >/dev/null; then - tmp_bsd_partition=`echo "$tmp_part" \ - | sed "s%s\{0,1\}[0-9]*\([a-h]\)$%\1%"` - tmp_drive=`echo "$tmp_drive" \ - | sed "s%)%,$tmp_bsd_partition)%"` - fi - echo "$tmp_drive" ;; - netbsd*) - if echo $tmp_part | grep "^[abe-p]$" >/dev/null; then - tmp_bsd_partition=`echo "$tmp_part" \ - | sed "s%\([a-p]\)$%\1%"` - tmp_drive=`echo "$tmp_drive" \ - | sed "s%)%,$tmp_bsd_partition)%"` - fi - echo "$tmp_drive" ;; - esac - else - # If no partition is specified, just print the drive name. - echo "$tmp_drive" - fi -} - -# Usage: resolve_symlink file -# Find the real file/device that file points at -resolve_symlink () { - tmp_fname=$1 - # Resolve symlinks - while test -L $tmp_fname; do - tmp_new_fname=`ls -al $tmp_fname | sed -n 's%.*-> \(.*\)%\1%p'` - if test -z "$tmp_new_fname"; then - echo "Unrecognized ls output" 2>&1 - exit 1 - fi - - # Convert relative symlinks - case $tmp_new_fname in - /*) tmp_fname="$tmp_new_fname" - ;; - *) tmp_fname="`echo $tmp_fname | sed 's%/[^/]*$%%'`/$tmp_new_fname" - ;; - esac - done - echo "$tmp_fname" -} - -# Usage: find_device file -# Find block device on which the file resides. -find_device () { - # For now, this uses the program `df' to get the device name, but is - # this really portable? - tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^ ]*\).*%\1%p'` - - if test -z "$tmp_fname"; then - echo "Could not find device for $1" 2>&1 - exit 1 - fi - - tmp_fname=`resolve_symlink $tmp_fname` - - echo "$tmp_fname" -} - -# Check the arguments. -for option in "$@"; do - case "$option" in - -h | --help) - usage - exit 0 ;; - -v | --version) - echo "grub-install (GNU GRUB ${VERSION})" - exit 0 ;; - --root-directory=*) - rootdir=`echo "$option" | sed 's/--root-directory=//'` ;; - --grub-shell=*) - grub_shell=`echo "$option" | sed 's/--grub-shell=//'` ;; - --no-floppy) - no_floppy="--no-floppy" ;; - --force-lba) - force_lba="--force-lba" ;; - --recheck) - recheck=yes ;; - --sync-sleep=*) - sync_sleep=`echo "$option" | sed 's/--sync-sleep=//'` ;; - # This is an undocumented feature... - --debug) - debug=yes ;; - -*) - echo "Unrecognized option \`$option'" 1>&2 - usage - exit 1 - ;; - *) - if test "x$install_device" != x; then - echo "More than one install_devices?" 1>&2 - usage - exit 1 - fi - install_device="${option}" ;; - esac -done - -if test "x$install_device" = x; then - echo "install_device not specified." 1>&2 - usage - exit 1 -fi - -# If the debugging feature is enabled, print commands. -if test $debug = yes; then - set -x -fi - -# Initialize these directories here, since ROOTDIR was initialized. -case "$host_os" in -netbsd*) - # Because /boot is used for the boot block in NetBSD, use /grub - # instead of /boot/grub. - grub_prefix=/grub - bootdir=${rootdir} - ;; -*) - # Use /boot/grub by default. - bootdir=${rootdir}/boot - ;; -esac - -grubdir=${bootdir}/grub -device_map=${grubdir}/device.map - -# Check if GRUB is installed. -# This is necessary, because the user can specify "grub --read-only". -set $grub_shell dummy -if test -f "$1"; then - : -else - echo "$1: Not found." 1>&2 - exit 1 -fi - -if test -f "$pkglibdir/stage1"; then - : -else - echo "${pkglibdir}/stage1: Not found." 1>&2 - exit 1 -fi - -if test -f "$pkglibdir/stage2"; then - : -else - echo "${pkglibdir}/stage2: Not found." 1>&2 - exit 1 -fi - -# Don't check for *stage1_5, because it is not fatal even if any -# Stage 1.5 does not exist. - -# Create the GRUB directory if it is not present. -test -d "$bootdir" || mkdir "$bootdir" || exit 1 -test -d "$grubdir" || mkdir "$grubdir" || exit 1 - -# If --recheck is specified, remove the device map, if present. -if test $recheck = yes; then - rm -f $device_map -fi - -# Create the device map file if it is not present. -if test -f "$device_map"; then - : -else - # Create a safe temporary file. - test -n "$mklog" && log_file=`$mklog` - - xfs_hack - $grub_shell --batch $no_floppy --device-map=$device_map <$log_file -quit -EOF - if grep "Error [0-9]*: " $log_file >/dev/null; then - cat $log_file 1>&2 - exit 1 - fi - - rm -f $log_file -fi - -# Make sure that there is no duplicated entry. -tmp=`sed -n '/^([fh]d[0-9]*)/s/\(^(.*)\).*/\1/p' $device_map \ - | sort | uniq -d | sed -n 1p` -if test -n "$tmp"; then - echo "The drive $tmp is defined multiple times in the device map $device_map" 1>&2 - exit 1 -fi - -# Check for INSTALL_DEVICE. -case "$install_device" in -/dev/*) - install_device=`resolve_symlink "$install_device"` - install_drive=`convert "$install_device"` - # I don't know why, but some shells wouldn't die if exit is - # called in a function. - if test "x$install_drive" = x; then - exit 1 - fi ;; -\([hf]d[0-9]*\)) - install_drive="$install_device" ;; -[hf]d[0-9]*) - # The GRUB format with no parenthesis. - install_drive="($install_device)" ;; -*) - echo "Format of install_device not recognized." 1>&2 - usage - exit 1 ;; -esac - -# Get the root drive. -root_device=`find_device ${rootdir}` -bootdir_device=`find_device ${bootdir}` - -# Check if the boot directory is in the same device as the root directory. -if test "x$root_device" != "x$bootdir_device"; then - # Perhaps the user has a separate boot partition. - root_device=$bootdir_device - grub_prefix="/grub" -fi - -# Convert the root device to a GRUB drive. -root_drive=`convert "$root_device"` -if test "x$root_drive" = x; then - exit 1 -fi - -# Check if the root directory exists in the same device as the grub -# directory. -grubdir_device=`find_device ${grubdir}` - -if test "x$grubdir_device" != "x$root_device"; then - # For now, cannot deal with this situation. - cat <&2 -You must set the root directory by the option --root-directory, because -$grubdir does not exist in the root device $root_device. -EOF - exit 1 -fi - -# Copy the GRUB images to the GRUB directory. -for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do - rm -f $file || exit 1 -done -for file in \ - ${pkglibdir}/stage1 ${pkglibdir}/stage2 ${pkglibdir}/*stage1_5; do - cp -f $file ${grubdir} || exit 1 -done -xfs_hack - -# Make sure that GRUB reads the same images as the host OS. -test -n "$mkimg" && img_file=`$mkimg` -test -n "$mklog" && log_file=`$mklog` - -for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do - count=5 - tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"` - while test $count -gt 0; do - $grub_shell --batch $no_floppy --device-map=$device_map <$log_file -dump ${root_drive}${tmp} ${img_file} -quit -EOF - if grep "Error [0-9]*: " $log_file >/dev/null; then - : - elif cmp $file $img_file >/dev/null; then - break - fi - sleep 1 - count=`expr $count - 1` - done - if test $count -eq 0; then - echo "The file $file not read correctly." 1>&2 - exit 1 - fi -done - -rm -f $img_file -rm -f $log_file - -# Create a safe temporary file. -test -n "$mklog" && log_file=`$mklog` - -# Now perform the installation. -xfs_hack -$grub_shell --batch $no_floppy --device-map=$device_map <$log_file -root $root_drive -setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $install_drive -quit -EOF - -if grep "Error [0-9]*: " $log_file >/dev/null || test $debug = yes; then - cat $log_file 1>&2 - exit 1 -fi - -rm -f $log_file - -# Prompt the user to check if the device map is correct. -echo "Installation finished. No error reported." -echo "This is the contents of the device map $device_map." -echo "Check if this is correct or not. If any of the lines is incorrect," -echo "fix it and re-run the script \`grub-install'." -echo - -cat $device_map - -# Bye. -exit 0 diff --git a/abs/core-testing/grub/install-grub.orig b/abs/core-testing/grub/install-grub.orig deleted file mode 100755 index 3eb7ce5..0000000 --- a/abs/core-testing/grub/install-grub.orig +++ /dev/null @@ -1,187 +0,0 @@ -#!/bin/bash - -# -# This is a little helper script that tries to convert linux-style device -# names to grub-style. It's not very smart, so it -# probably won't work for more complicated setups. -# -# If it doesn't work for you, try installing grub manually: -# -# # mkdir -p /boot/grub -# # cp /usr/lib/grub/i386-pc/* /boot/grub/ -# -# Then start up the 'grub' shell and run something like the following: -# -# grub> root(hd0,0) -# grub> setup(hd0) -# -# The "root" line should point to the partition your kernel is located on, -# /boot if you have a separate boot partition, otherwise your root (/). -# -# The "setup" line tells grub which disc/partition to install the -# bootloader to. In the example above, it will install to the MBR of the -# primary master hard drive. -# - -usage() { - echo "usage: install-grub [boot_device]" - echo - echo "where is the device where Grub will be installed" - echo "and [boot_device] is the partition that contains the /boot" - echo "directory (auto-detected if omitted)" - echo - echo "examples: install-grub /dev/hda" - echo " install-grub /dev/hda /dev/hda1" - echo - exit 0 -} - -## new install-grub, code was taken from setup script -ROOTDEV=$1 -PART_ROOT=$2 -VMLINUZ=vmlinuz26 - -if [ "$ROOTDEV" = "" ]; then - usage -fi -if [ "$PART_ROOT" = "" ]; then - PART_ROOT=$(mount | grep "on /boot type" | cut -d' ' -f 1) -fi -if [ "$PART_ROOT" = "" ]; then - PART_ROOT=$(mount | grep "on / type" | cut -d' ' -f 1) -fi -if [ "$PART_ROOT" = "" ]; then - echo "error: could not determine BOOT_DEVICE, please specify manually" >&2 - exit 1 -fi - - -get_grub_map() { - [ -e /tmp/dev.map ] && rm /tmp/dev.map - /sbin/grub --no-floppy --device-map /tmp/dev.map >/tmp/grub.log 2>&1 </boot/grub/menu.lst - rm -f /tmp/.menu.lst - echo "" >>/boot/grub/menu.lst - echo "# (0) Arch Linux" >>/boot/grub/menu.lst - echo "title Arch Linux" >>/boot/grub/menu.lst - subdir= - if [ "$bootdev" != "" ]; then - grubdev=$(mapdev $bootdev) - else - subdir="/boot" - fi - echo "root $grubdev" >>/boot/grub/menu.lst - echo "kernel $subdir/$VMLINUZ root=$PART_ROOT ro" >>/boot/grub/menu.lst - if [ "$VMLINUZ" = "vmlinuz26" ]; then - echo "initrd $subdir/kernel26.img" >>/boot/grub/menu.lst - fi - echo "" >>/boot/grub/menu.lst - # adding fallback/full image - echo "# (1) Arch Linux" >>/boot/grub/menu.lst - echo "title Arch Linux Fallback" >>/boot/grub/menu.lst - echo "root $grubdev" >>/boot/grub/menu.lst - echo "kernel $subdir/$VMLINUZ root=$PART_ROOT ro" >>/boot/grub/menu.lst - if [ "$VMLINUZ" = "vmlinuz26" ]; then - echo "initrd $subdir/kernel26-fallback.img" >>/boot/grub/menu.lst - fi - echo "" >>/boot/grub/menu.lst - fi - fi - - echo "Installing the GRUB bootloader..." - cp -a /usr/lib/grub/i386-pc/* /boot/grub/ - sync - # freeze xfs filesystems to enable grub installation on xfs filesystems - if [ -x /usr/sbin/xfs_freeze ]; then - /usr/sbin/xfs_freeze -f /boot > /dev/null 2>&1 - /usr/sbin/xfs_freeze -f / > /dev/null 2>&1 - fi - # look for a separately-mounted /boot partition - bootpart=$(mount | grep /boot | cut -d' ' -f 1) - if [ "$bootpart" = "" ]; then - bootpart=$PART_ROOT - fi - bootpart=$(mapdev $bootpart) - bootdev=$(mapdev $ROOTDEV) - if [ "$bootpart" = "" ]; then - echo "Error: Missing/Invalid root device: $bootpart" - exit 1 - fi - /sbin/grub --no-floppy --batch >/tmp/grub.log 2>&1 < /dev/null 2>&1 - /usr/sbin/xfs_freeze -u / > /dev/null 2>&1 - fi - - if grep "Error [0-9]*: " /tmp/grub.log >/dev/null; then - echo "Error installing GRUB. (see /tmp/grub.log for output)" - exit 1 - fi - echo "GRUB was successfully installed." - -rm -f /tmp/grub.log - -exit 0 -} - -dogrub \ No newline at end of file diff --git a/abs/core-testing/grub/intelmac.patch b/abs/core-testing/grub/intelmac.patch deleted file mode 100644 index a3fabc7..0000000 --- a/abs/core-testing/grub/intelmac.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- grub-0.97.orig/stage2/asm.S 2004-06-19 18:55:22.000000000 +0200 -+++ grub-0.97/stage2/asm.S 2006-04-21 11:10:52.000000000 +0200 -@@ -1651,7 +1651,29 @@ - jnz 3f - ret - --3: /* use keyboard controller */ -+3: /* -+ * try to switch gateA20 using PORT92, the "Fast A20 and Init" -+ * register -+ */ -+ mov $0x92, %dx -+ inb %dx, %al -+ /* skip the port92 code if it's unimplemented (read returns 0xff) */ -+ cmpb $0xff, %al -+ jz 6f -+ -+ /* set or clear bit1, the ALT_A20_GATE bit */ -+ movb 4(%esp), %ah -+ testb %ah, %ah -+ jz 4f -+ orb $2, %al -+ jmp 5f -+4: and $0xfd, %al -+ -+ /* clear the INIT_NOW bit don't accidently reset the machine */ -+5: and $0xfe, %al -+ outb %al, %dx -+ -+6: /* use keyboard controller */ - pushl %eax - - call gloop1 -@@ -1661,9 +1683,12 @@ - - gloopint1: - inb $K_STATUS -+ cmpb $0xff, %al -+ jz gloopint1_done - andb $K_IBUF_FUL, %al - jnz gloopint1 - -+gloopint1_done: - movb $KB_OUTPUT_MASK, %al - cmpb $0, 0x8(%esp) - jz gdoit -@@ -1684,6 +1709,8 @@ - - gloop1: - inb $K_STATUS -+ cmpb $0xff, %al -+ jz gloop2ret - andb $K_IBUF_FUL, %al - jnz gloop1 - -@@ -1991,6 +2018,11 @@ - ENTRY(console_getkey) - push %ebp - -+wait_for_key: -+ call EXT_C(console_checkkey) -+ incl %eax -+ jz wait_for_key -+ - call EXT_C(prot_to_real) - .code16 - diff --git a/abs/core-testing/grub/menu.lst b/abs/core-testing/grub/menu.lst deleted file mode 100644 index 1c19f8a..0000000 --- a/abs/core-testing/grub/menu.lst +++ /dev/null @@ -1,48 +0,0 @@ -# Config file for GRUB - The GNU GRand Unified Bootloader -# /boot/grub/menu.lst - -# DEVICE NAME CONVERSIONS -# -# Linux Grub -# ------------------------- -# /dev/fd0 (fd0) -# /dev/sda (hd0) -# /dev/sdb2 (hd1,1) -# /dev/sda3 (hd0,2) -# - -# FRAMEBUFFER RESOLUTION SETTINGS -# +-------------------------------------------------+ -# | 640x480 800x600 1024x768 1280x1024 -# ----+-------------------------------------------- -# 256 | 0x301=769 0x303=771 0x305=773 0x307=775 -# 32K | 0x310=784 0x313=787 0x316=790 0x319=793 -# 64K | 0x311=785 0x314=788 0x317=791 0x31A=794 -# 16M | 0x312=786 0x315=789 0x318=792 0x31B=795 -# +-------------------------------------------------+ -# for more details and different resolutions see -# http://wiki.archlinux.org/index.php/GRUB#Framebuffer_Resolution - -# general configuration: -timeout 5 -default 0 -color light-blue/black light-cyan/blue - -# boot sections follow -# each is implicitly numbered from 0 in the order of appearance below -# -# TIP: If you want a 1024x768 framebuffer, add "vga=773" to your kernel line. -# -#-* - -# (0) Arch Linux -title Arch Linux [/boot/vmlinuz26] -root (hd0,0) -kernel /vmlinuz26 root=/dev/sda3 ro -initrd /kernel26.img - -# (1) Windows -#title Windows -#rootnoverify (hd0,0) -#makeactive -#chainloader +1 diff --git a/abs/core-testing/grub/more-raid.patch b/abs/core-testing/grub/more-raid.patch deleted file mode 100644 index 39db234..0000000 --- a/abs/core-testing/grub/more-raid.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- grub-0.95/lib/device.c.moreraid 2004-11-30 17:09:36.736099360 -0500 -+++ grub-0.95/lib/device.c 2004-11-30 17:12:17.319686944 -0500 -@@ -544,6 +544,17 @@ - } - - static void -+get_cciss_disk_name (char * name, int controller, int drive) -+{ -+ sprintf (name, "/dev/cciss/c%dd%d", controller, drive); -+} -+ -+static void -+get_cpqarray_disk_name (char * name, int controller, int drive) -+{ -+ sprintf (name, "/dev/ida/c%dd%d", controller, drive); -+} -+static void - get_ataraid_disk_name (char *name, int unit) - { - sprintf (name, "/dev/ataraid/d%c", unit + '0'); -@@ -920,7 +931,7 @@ - - for (controller = 0; controller < 8; controller++) - { -- for (drive = 0; drive < 15; drive++) -+ for (drive = 0; drive < 32; drive++) - { - char name[24]; - -@@ -940,6 +951,70 @@ - } - } - #endif /* __linux__ */ -+ -+#ifdef __linux__ -+ /* This is for cciss - we have -+ /dev/cciss/cdp. -+ -+ cciss driver currently supports up to 8 controllers, 16 logical -+ drives, and 7 partitions. */ -+ { -+ int controller, drive; -+ -+ for (controller = 0; controller < 8; controller++) -+ { -+ for (drive = 0; drive < 16; drive++) -+ { -+ char name[24]; -+ -+ get_cciss_disk_name (name, controller, drive); -+ if (check_device (name)) -+ { -+ (*map)[num_hd + 0x80] = strdup (name); -+ assert ((*map)[num_hd + 0x80]); -+ -+ /* If the device map file is opened, write the map. */ -+ if (fp) -+ fprintf (fp, "(hd%d)\t%s\n", num_hd, name); -+ -+ num_hd++; -+ } -+ } -+ } -+ } -+#endif /* __linux__ */ -+ -+#ifdef __linux__ -+ /* This is for cpqarray - we have -+ /dev/ida/cdp. -+ -+ cpqarray driver currently supports up to 8 controllers, 16 logical -+ drives, and 15 partitions. */ -+ { -+ int controller, drive; -+ -+ for (controller = 0; controller < 8; controller++) -+ { -+ for (drive = 0; drive < 15; drive++) -+ { -+ char name[24]; -+ -+ get_cpqarray_disk_name (name, controller, drive); -+ if (check_device (name)) -+ { -+ (*map)[num_hd + 0x80] = strdup (name); -+ assert ((*map)[num_hd + 0x80]); -+ -+ /* If the device map file is opened, write the map. */ -+ if (fp) -+ fprintf (fp, "(hd%d)\t%s\n", num_hd, name); -+ -+ num_hd++; -+ } -+ } -+ } -+ } -+#endif /* __linux__ */ - - /* OK, close the device map file if opened. */ - if (fp) diff --git a/abs/core-testing/grub/special-devices.patch b/abs/core-testing/grub/special-devices.patch deleted file mode 100644 index 894f3e8..0000000 --- a/abs/core-testing/grub/special-devices.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- grub-0.93/lib/device.c.raid 2002-05-20 05:53:46.000000000 -0400 -+++ grub-0.93/lib/device.c 2002-12-28 23:24:10.000000000 -0500 -@@ -689,7 +689,14 @@ - if (strcmp (dev + strlen(dev) - 5, "/disc") == 0) - strcpy (dev + strlen(dev) - 5, "/part"); - } -- sprintf (dev + strlen(dev), "%d", ((partition >> 16) & 0xFF) + 1); -+ -+ sprintf (dev + strlen(dev), "%s%d", -+ /* Compaq smart and others */ -+ (strncmp(dev, "/dev/ida/", 9) == 0 || -+ strncmp(dev, "/dev/ataraid/", 13) == 0 || -+ strncmp(dev, "/dev/cciss/", 11) == 0 || -+ strncmp(dev, "/dev/rd/", 8) == 0) ? "p" : "", -+ ((partition >> 16) & 0xFF) + 1); - - /* Open the partition. */ - fd = open (dev, O_RDWR); diff --git a/abs/core-testing/gsfonts/PKGBUILD b/abs/core-testing/gsfonts/PKGBUILD deleted file mode 100644 index 01bb023..0000000 --- a/abs/core-testing/gsfonts/PKGBUILD +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: dorphell -pkgname=gsfonts -pkgver=8.11 -pkgrel=4 -pkgdesc="Ghostscript standard Type1 fonts" -arch=(i686 x86_64) -depends=('xorg-font-utils' 'fontconfig') -install=xfonts.install -url="http://sourceforge.net/projects/ghostscript" -source=(http://superb-east.dl.sourceforge.net/sourceforge/gs-fonts/ghostscript-fonts-std-8.11.tar.gz) -md5sums=('6865682b095f8c4500c54b285ff05ef6') - -build() { - mkdir -p ${startdir}/pkg/usr/share/fonts/Type1 - install -m644 ${startdir}/src/fonts/*.{pfb,pfm,afm} \ - ${startdir}/pkg/usr/share/fonts/Type1/ || return 1 -} diff --git a/abs/core-testing/gsfonts/xfonts.install b/abs/core-testing/gsfonts/xfonts.install deleted file mode 100644 index 3eb0455..0000000 --- a/abs/core-testing/gsfonts/xfonts.install +++ /dev/null @@ -1,20 +0,0 @@ -post_install() { - echo -n "Updating font cache... " - fc-cache -f > /dev/null - mkfontscale /usr/share/fonts/Type1 - mkfontdir /usr/share/fonts/Type1 - echo "done." -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - -op=$1 -shift - -$op $* diff --git a/abs/core-testing/gtk/PKGBUILD b/abs/core-testing/gtk/PKGBUILD deleted file mode 100644 index 48c4972..0000000 --- a/abs/core-testing/gtk/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Eric Belanger -# Contributor: Judd Vinet - -pkgname=gtk -pkgver=1.2.10 -pkgrel=11 -pkgdesc="The GTK+ toolkit" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -license=('LGPL') -depends=('libxi' 'glib') -options=('!libtool' '!emptydirs') -source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-$pkgver.tar.gz \ - aclocal-fixes.patch) -md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' 'c59d4906602d99a7468f7334b6fc3b4e') -sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' 'b034e33efb85d27f3f3fb082c404e3b6ea79259f') - -build() { - cd $startdir/src/gtk+-$pkgver - if [ "$CARCH" == "x86_64" ]; then - rm config.guess config.sub - ln -s /usr/share/libtool/config.guess config.guess - ln -s /usr/share/libtool/config.sub config.sub - fi - patch -Np0 -i ${startdir}/src/aclocal-fixes.patch || return 1 - ./configure --prefix=/usr --sysconfdir=/etc --with-xinput=xfree - make || return 1 - make DESTDIR=$startdir/pkg install - cd $startdir/pkg/usr/include - ln -s gtk-1.2/gtk gtk -} diff --git a/abs/core-testing/gtk/__changelog b/abs/core-testing/gtk/__changelog deleted file mode 100644 index 5d6d4d6..0000000 --- a/abs/core-testing/gtk/__changelog +++ /dev/null @@ -1,3 +0,0 @@ -added !emptydir to options -!docs - diff --git a/abs/core-testing/gtk/aclocal-fixes.patch b/abs/core-testing/gtk/aclocal-fixes.patch deleted file mode 100644 index dd2ffbd..0000000 --- a/abs/core-testing/gtk/aclocal-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk.m4.orig 2006-03-05 13:18:09.000000000 +0000 -+++ gtk.m4 2006-03-05 13:18:20.000000000 +0000 -@@ -4,7 +4,7 @@ - dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) - dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS - dnl --AC_DEFUN(AM_PATH_GTK, -+AC_DEFUN([AM_PATH_GTK], - [dnl - dnl Get the cflags and libraries from the gtk-config script - dnl diff --git a/abs/core-testing/gtk2/PKGBUILD b/abs/core-testing/gtk2/PKGBUILD deleted file mode 100644 index 819001d..0000000 --- a/abs/core-testing/gtk2/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 79610 2010-05-04 20:23:20Z ibiru $ -# Maintainer: Jan de Groot - -pkgname=gtk2 -pkgver=2.20.1 -pkgrel=3 -pkgdesc="The GTK+ Toolkit (v2)" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -install=gtk2.install -depends=('atk>=1.30.0' 'pango>=1.28.0' 'libxcursor' 'libxinerama' 'libxrandr>=1.3.0' 'libxi>=1.3' 'libxcomposite' 'libxdamage' 'heimdal>=1.3.2' 'gnutls>=2.8.6' 'shared-mime-info' 'cairo>=1.8.10' 'libtiff>=3.9.2-2' ) -makedepends=('pkgconfig' 'gtk-doc' 'gobject-introspection') -replaces=('gtkprint-cups' 'gail') -conflicts=('gtkprint-cups' 'gail') -provides=('gail=1.22.3') -options=('!libtool' '!docs') -backup=(etc/gtk-2.0/gtkrc) -license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.20/gtk+-${pkgver}.tar.bz2 - xid-collision-debug.patch - revert_64bit_fix.patch) -sha256sums=('0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '20f3a03760f765b68b85b614810e5df4a689b609da1ae200aa30072475121b4c') - -build() { - cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 -i "${srcdir}/xid-collision-debug.patch" || return 1 - patch -RNp1 -i ${srcdir}/revert_64bit_fix.patch || retun 1 - - CXX=/bin/false ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --with-xinput=yes \ - --without-libjasper --without-cups\ - --with-included-loaders=png || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc" || return 1 -} diff --git a/abs/core-testing/gtk2/__changelog b/abs/core-testing/gtk2/__changelog deleted file mode 100644 index 1384183..0000000 --- a/abs/core-testing/gtk2/__changelog +++ /dev/null @@ -1 +0,0 @@ -removed cups support -jm diff --git a/abs/core-testing/gtk2/gtk2-emit-size-change.patch b/abs/core-testing/gtk2/gtk2-emit-size-change.patch deleted file mode 100644 index 34053a8..0000000 --- a/abs/core-testing/gtk2/gtk2-emit-size-change.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur gtk+-2.14.5-old/gdk/x11/gdkscreen-x11.c gtk+-2.14.5/gdk/x11/gdkscreen-x11.c ---- gtk+-2.14.5-old/gdk/x11/gdkscreen-x11.c 2008-11-24 16:36:03.000000000 +1000 -+++ gtk+-2.14.5/gdk/x11/gdkscreen-x11.c 2008-12-03 00:39:38.000000000 +1000 -@@ -894,11 +894,6 @@ - _gdk_x11_screen_size_changed (GdkScreen *screen, - XEvent *event) - { -- gint width, height; -- -- width = gdk_screen_get_width (screen); -- height = gdk_screen_get_height (screen); -- - #ifdef HAVE_RANDR - if (!XRRUpdateConfiguration (event)) - return; -@@ -915,10 +910,6 @@ - return; - #endif - -- if (width == gdk_screen_get_width (screen) && -- height == gdk_screen_get_height (screen)) -- return; -- - _gdk_x11_screen_process_monitors_change (screen); - g_signal_emit_by_name (screen, "size_changed"); - } diff --git a/abs/core-testing/gtk2/gtk2.install b/abs/core-testing/gtk2/gtk2.install deleted file mode 100644 index 6d415ad..0000000 --- a/abs/core-testing/gtk2/gtk2.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - usr/bin/gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f etc/gtk-2.0/gtk.immodules &>/dev/null - rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null -} diff --git a/abs/core-testing/gtk2/gtkclipboard-check.patch b/abs/core-testing/gtk2/gtkclipboard-check.patch deleted file mode 100644 index 48894fb..0000000 --- a/abs/core-testing/gtk2/gtkclipboard-check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.11.6/gtk/gtkclipboard.c.orig 2007-08-18 13:48:22.000000000 +0000 -+++ gtk+-2.11.6/gtk/gtkclipboard.c 2007-08-18 13:49:08.000000000 +0000 -@@ -287,6 +287,8 @@ - gtk_clipboard_get_for_display (GdkDisplay *display, - GdkAtom selection) - { -+ if (display == NULL) -+ return NULL; - g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); - g_return_val_if_fail (!display->closed, NULL); - diff --git a/abs/core-testing/gtk2/revert_64bit_fix.patch b/abs/core-testing/gtk2/revert_64bit_fix.patch deleted file mode 100644 index a6453e3..0000000 --- a/abs/core-testing/gtk2/revert_64bit_fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a0f23e1706b34bca6a65183040d1f1498cce2a50 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Thu, 25 Mar 2010 04:55:15 +0000 -Subject: Fix a 64bit issue - -Thank you libpng, for typedef unsigned long png_uint_32. ---- -diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c -index c0374ca..43db70a 100644 ---- a/gdk-pixbuf/io-png.c -+++ b/gdk-pixbuf/io-png.c -@@ -261,7 +261,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error) - gchar *icc_profile_base64; - const gchar *icc_profile_title; - const gchar *icc_profile; -- guint icc_profile_size; -+ gulong icc_profile_size; - guint32 retval; - gint compression_type; - -@@ -607,7 +607,7 @@ png_info_callback (png_structp png_read_ptr, - gchar *icc_profile_base64; - const gchar *icc_profile_title; - const gchar *icc_profile; -- guint icc_profile_size; -+ gulong icc_profile_size; - guint32 retval; - gint compression_type; - --- -cgit v0.8.3.1 diff --git a/abs/core-testing/gtk2/xid-collision-debug.patch b/abs/core-testing/gtk2/xid-collision-debug.patch deleted file mode 100644 index d61238c..0000000 --- a/abs/core-testing/gtk2/xid-collision-debug.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200 -+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200 -@@ -56,10 +56,10 @@ - if (!display_x11->xid_ht) - display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash, - (GEqualFunc) gdk_xid_equal); -- -+/* - if (g_hash_table_lookup (display_x11->xid_ht, xid)) - g_warning ("XID collision, trouble ahead"); -- -+*/ - g_hash_table_insert (display_x11->xid_ht, xid, data); - } - diff --git a/abs/core-testing/gzip/PKGBUILD b/abs/core-testing/gzip/PKGBUILD deleted file mode 100644 index dea881c..0000000 --- a/abs/core-testing/gzip/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: judd -pkgname=gzip -pkgver=1.3.12 -pkgrel=13 -pkgdesc="GNU compression utility" -arch=(i686 x86_64) -url="http://www.gzip.org" -license=('GPL') -groups=('base') -depends=('glibc' 'bash') -makedepends=('patch') -source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.gz - gzip-fixutimens.patch) - -build() { - cd $startdir/src/$pkgname-$pkgver - patch -Np1 -i ${startdir}/src/gzip-fixutimens.patch || return 1 - - ./configure --prefix=/usr - make || return 1 - mkdir -p $startdir/pkg/bin $startdir/pkg/usr/bin - make prefix=$startdir/pkg/usr install - cd $startdir/pkg/usr/bin - mv $pkgname $startdir/pkg/bin - mv gunzip zcat uncompress $startdir/pkg/bin - cd $startdir/pkg/bin - ln -sf $pkgname compress -} -md5sums=('b5bac2d21840ae077e0217bc5e4845b1' - 'cb592761476921018386031d91625153') diff --git a/abs/core-testing/gzip/gzip-fixpaths.patch b/abs/core-testing/gzip/gzip-fixpaths.patch deleted file mode 100644 index c95dc67..0000000 --- a/abs/core-testing/gzip/gzip-fixpaths.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur gzip-1.2.4a-orig/Makefile.in gzip-1.2.4a/Makefile.in ---- gzip-1.2.4a-orig/Makefile.in 1993-08-17 10:12:40.000000000 -0700 -+++ gzip-1.2.4a/Makefile.in 2005-04-21 11:45:27.000000000 -0700 -@@ -348,27 +348,27 @@ - rm -f _match.s - - $(G)zdiff: zdiff.in -- sed -e "$(SEDCMD)" -e "s|BINDIR|$(bindir)|" $(srcdir)/zdiff.in > $@ -+ sed -e "$(SEDCMD)" -e "s|BINDIR|/bin|" $(srcdir)/zdiff.in > $@ - chmod 755 $@ - - $(G)zgrep: zgrep.in -- sed -e "$(SEDCMD)" -e "s|BINDIR|$(bindir)|" $(srcdir)/zgrep.in > $@ -+ sed -e "$(SEDCMD)" -e "s|BINDIR|/bin|" $(srcdir)/zgrep.in > $@ - chmod 755 $@ - - $(G)zmore: zmore.in -- sed -e "$(SEDCMD)" -e "s|BINDIR|$(bindir)|" $(srcdir)/zmore.in > $@ -+ sed -e "$(SEDCMD)" -e "s|BINDIR|/bin|" $(srcdir)/zmore.in > $@ - chmod 755 $@ - - $(G)znew: znew.in -- sed -e "$(SEDCMD)" -e "s|BINDIR|$(bindir)|" $(srcdir)/znew.in > $@ -+ sed -e "$(SEDCMD)" -e "s|BINDIR|/bin|" $(srcdir)/znew.in > $@ - chmod 755 $@ - - $(G)zforce: zforce.in -- sed -e "$(SEDCMD)" -e "s|BINDIR|$(bindir)|" $(srcdir)/zforce.in > $@ -+ sed -e "$(SEDCMD)" -e "s|BINDIR|/bin|" $(srcdir)/zforce.in > $@ - chmod 755 $@ - - gzexe: gzexe.in -- sed -e "$(SEDCMD)" -e "s|BINDIR|$(bindir)|" $(srcdir)/gzexe.in > $@ -+ sed -e "$(SEDCMD)" -e "s|BINDIR|/bin|" $(srcdir)/gzexe.in > $@ - chmod 755 $@ - - gzip.info: gzip.texi diff --git a/abs/core-testing/gzip/gzip-fixutimens.patch b/abs/core-testing/gzip/gzip-fixutimens.patch deleted file mode 100644 index a78aa79..0000000 --- a/abs/core-testing/gzip/gzip-fixutimens.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- gzip-1.3.12.orig/gzip.c -+++ gzip-1.3.12/gzip.c -@@ -1637,7 +1642,7 @@ - } - } - -- if (futimens (ofd, ofname, timespec) != 0) -+ if (gz_futimens (ofd, ofname, timespec) != 0) - { - int e = errno; - WARN ((stderr, "%s: ", program_name)); ---- gzip-1.3.12.orig/lib/utimens.h -+++ gzip-1.3.12/lib/utimens.h -@@ -1,3 +1,3 @@ - #include --int futimens (int, char const *, struct timespec const [2]); -+int gz_futimens (int, char const *, struct timespec const [2]); - int utimens (char const *, struct timespec const [2]); ---- gzip-1.3.12.orig/lib/utimens.c -+++ gzip-1.3.12/lib/utimens.c -@@ -75,7 +75,7 @@ - Return 0 on success, -1 (setting errno) on failure. */ - - int --futimens (int fd ATTRIBUTE_UNUSED, -+gz_futimens (int fd ATTRIBUTE_UNUSED, - char const *file, struct timespec const timespec[2]) - { - /* Some Linux-based NFS clients are buggy, and mishandle time stamps -@@ -185,5 +185,5 @@ - int - utimens (char const *file, struct timespec const timespec[2]) - { -- return futimens (-1, file, timespec); -+ return gz_futimens (-1, file, timespec); - } diff --git a/abs/core-testing/gzip/gzip-security-update.patch b/abs/core-testing/gzip/gzip-security-update.patch deleted file mode 100644 index 2fff599..0000000 --- a/abs/core-testing/gzip/gzip-security-update.patch +++ /dev/null @@ -1,186 +0,0 @@ -Only in gzip-1.3.5: cscope.out -diff -ru gzip-1.3.5.orig/gzip.h gzip-1.3.5/gzip.h ---- gzip-1.3.5.orig/gzip.h 2001-10-01 07:53:41.000000000 +0100 -+++ gzip-1.3.5/gzip.h 2006-08-18 22:44:38.755598000 +0100 -@@ -198,6 +198,8 @@ - extern int to_stdout; /* output to stdout (-c) */ - extern int save_orig_name; /* set if original name must be saved */ - -+#define MIN(a,b) ((a) <= (b) ? (a) : (b)) -+ - #define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0)) - #define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1)) - -diff -ru gzip-1.3.5.orig/inflate.c gzip-1.3.5/inflate.c ---- gzip-1.3.5.orig/inflate.c 2002-09-25 22:20:13.000000000 +0100 -+++ gzip-1.3.5/inflate.c 2006-07-21 09:10:43.350376000 +0100 -@@ -337,7 +337,7 @@ - { - *t = (struct huft *)NULL; - *m = 0; -- return 0; -+ return 2; - } - - -Only in gzip-1.3.5: testcases -diff -ru gzip-1.3.5.orig/unlzh.c gzip-1.3.5/unlzh.c ---- gzip-1.3.5.orig/unlzh.c 1999-10-06 06:00:00.000000000 +0100 -+++ gzip-1.3.5/unlzh.c 2006-08-18 22:56:19.446997000 +0100 -@@ -149,13 +149,17 @@ - unsigned i, k, len, ch, jutbits, avail, nextcode, mask; - - for (i = 1; i <= 16; i++) count[i] = 0; -- for (i = 0; i < (unsigned)nchar; i++) count[bitlen[i]]++; -+ for (i = 0; i < (unsigned)nchar; i++) { -+ if (bitlen[i] > 16) -+ error("Bad table (case a)\n"); -+ else count[bitlen[i]]++; -+ } - - start[1] = 0; - for (i = 1; i <= 16; i++) - start[i + 1] = start[i] + (count[i] << (16 - i)); -- if ((start[17] & 0xffff) != 0) -- error("Bad table\n"); -+ if ((start[17] & 0xffff) != 0 || tablebits > 16) /* 16 for weight below */ -+ error("Bad table (case b)\n"); - - jutbits = 16 - tablebits; - for (i = 1; i <= (unsigned)tablebits; i++) { -@@ -169,15 +173,15 @@ - - i = start[tablebits + 1] >> jutbits; - if (i != 0) { -- k = 1 << tablebits; -- while (i != k) table[i++] = 0; -+ k = MIN(1 << tablebits, DIST_BUFSIZE); -+ while (i < k) table[i++] = 0; - } - - avail = nchar; - mask = (unsigned) 1 << (15 - tablebits); - for (ch = 0; ch < (unsigned)nchar; ch++) { - if ((len = bitlen[ch]) == 0) continue; -- nextcode = start[len] + weight[len]; -+ nextcode = MIN(start[len] + weight[len], DIST_BUFSIZE); - if (len <= (unsigned)tablebits) { - for (i = start[len]; i < nextcode; i++) table[i] = ch; - } else { -@@ -218,7 +222,7 @@ - for (i = 0; i < 256; i++) pt_table[i] = c; - } else { - i = 0; -- while (i < n) { -+ while (i < MIN(n,NPT)) { - c = bitbuf >> (BITBUFSIZ - 3); - if (c == 7) { - mask = (unsigned) 1 << (BITBUFSIZ - 1 - 3); -@@ -228,7 +232,7 @@ - pt_len[i++] = c; - if (i == i_special) { - c = getbits(2); -- while (--c >= 0) pt_len[i++] = 0; -+ while (--c >= 0 && i < NPT) pt_len[i++] = 0; - } - } - while (i < nn) pt_len[i++] = 0; -@@ -248,7 +252,7 @@ - for (i = 0; i < 4096; i++) c_table[i] = c; - } else { - i = 0; -- while (i < n) { -+ while (i < MIN(n,NC)) { - c = pt_table[bitbuf >> (BITBUFSIZ - 8)]; - if (c >= NT) { - mask = (unsigned) 1 << (BITBUFSIZ - 1 - 8); -@@ -256,14 +260,14 @@ - if (bitbuf & mask) c = right[c]; - else c = left [c]; - mask >>= 1; -- } while (c >= NT); -+ } while (c >= NT && (mask || c != left[c])); - } - fillbuf((int) pt_len[c]); - if (c <= 2) { - if (c == 0) c = 1; - else if (c == 1) c = getbits(4) + 3; - else c = getbits(CBIT) + 20; -- while (--c >= 0) c_len[i++] = 0; -+ while (--c >= 0 && i < NC) c_len[i++] = 0; - } else c_len[i++] = c - 2; - } - while (i < NC) c_len[i++] = 0; -@@ -292,7 +296,7 @@ - if (bitbuf & mask) j = right[j]; - else j = left [j]; - mask >>= 1; -- } while (j >= NC); -+ } while (j >= NC && (mask || j != left[j])); - } - fillbuf((int) c_len[j]); - return j; -@@ -309,7 +313,7 @@ - if (bitbuf & mask) j = right[j]; - else j = left [j]; - mask >>= 1; -- } while (j >= NP); -+ } while (j >= NP && (mask || j != left[j])); - } - fillbuf((int) pt_len[j]); - if (j != 0) j = ((unsigned) 1 << (j - 1)) + getbits((int) (j - 1)); -@@ -356,7 +360,7 @@ - while (--j >= 0) { - buffer[r] = buffer[i]; - i = (i + 1) & (DICSIZ - 1); -- if (++r == count) return r; -+ if (++r >= count) return r; - } - for ( ; ; ) { - c = decode_c(); -@@ -366,14 +370,14 @@ - } - if (c <= UCHAR_MAX) { - buffer[r] = c; -- if (++r == count) return r; -+ if (++r >= count) return r; - } else { - j = c - (UCHAR_MAX + 1 - THRESHOLD); - i = (r - decode_p() - 1) & (DICSIZ - 1); - while (--j >= 0) { - buffer[r] = buffer[i]; - i = (i + 1) & (DICSIZ - 1); -- if (++r == count) return r; -+ if (++r >= count) return r; - } - } - } -diff -ru gzip-1.3.5.orig/unpack.c gzip-1.3.5/unpack.c ---- gzip-1.3.5.orig/unpack.c 1999-10-06 06:00:00.000000000 +0100 -+++ gzip-1.3.5/unpack.c 2006-07-21 15:49:48.615190000 +0100 -@@ -13,7 +13,6 @@ - #include "gzip.h" - #include "crypt.h" - --#define MIN(a,b) ((a) <= (b) ? (a) : (b)) - /* The arguments must not have side effects. */ - - #define MAX_BITLEN 25 -@@ -133,7 +132,7 @@ - /* Remember where the literals of this length start in literal[] : */ - lit_base[len] = base; - /* And read the literals: */ -- for (n = leaves[len]; n > 0; n--) { -+ for (n = leaves[len]; n > 0 && base < LITERALS; n--) { - literal[base++] = (uch)get_byte(); - } - } -@@ -169,7 +168,7 @@ - prefixp = &prefix_len[1< prefix_len) *--prefixp = (uch)len; - } - /* The length of all other codes is unknown: */ - while (prefixp > prefix_len) *--prefixp = 0; diff --git a/abs/core-testing/hal-info/PKGBUILD b/abs/core-testing/hal-info/PKGBUILD deleted file mode 100644 index ca6f5ad..0000000 --- a/abs/core-testing/hal-info/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 61557 2009-12-19 19:17:15Z jgc $ -# Maintainer: Jan de Groot - -pkgname=hal-info -_date=20091130 -pkgver=0.${_date} -pkgrel=1 -pkgdesc="Hardware Abstraction Layer information files" -arch=(any) -license=('GPL' 'custom') -url="http://www.freedesktop.org/wiki/Software/hal" -source=(http://hal.freedesktop.org/releases/hal-info-${_date}.tar.gz) -md5sums=('34375489a02a00b250fdc0b280be11b8') - -build() { - cd "${srcdir}/${pkgname}-${_date}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --enable-killswitch-dell-wlan=no --enable-killswitch-dell-bluetooth=no \ - --enable-killswitch-dell-wwan=no || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 -} diff --git a/abs/core-testing/hal/PKGBUILD b/abs/core-testing/hal/PKGBUILD deleted file mode 100644 index 6e928fd..0000000 --- a/abs/core-testing/hal/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 82401 2010-06-10 21:48:17Z thomas $ -# Maintainer: Jan de Groot -# Contributor: Link Dupont - -pkgname=hal -pkgver=0.5.14 -pkgrel=4 -pkgdesc="Hardware Abstraction Layer" -arch=(i686 x86_64) -license=('GPL' 'custom') -url="http://www.freedesktop.org/wiki/Software/hal" -depends=('dbus-glib>=0.82' 'libusb>=0.1.12' 'udev>=146' 'filesystem>=0.7.1-5' 'hal-info>=0.20090716' 'eject' 'dmidecode' 'pciutils>=3.0.2' 'usbutils>=0.73-5' 'pm-utils>=1.2.5' 'consolekit>=0.4.1' 'util-linux-ng>=2.16') -makedepends=('pkgconfig' 'gperf') -options=('!libtool' '!makeflags') -install=hal.install -source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz - hal - hal-0.5.9-hide-diagnostic.patch - hal-remove-dell-killswitch.patch - hal-KVM-evdev.patch - hal-HDAPS-blacklist.patch - hal-xen-unignore-axes.patch - hal-use-at-console.patch - fix-libusb-detection.patch - dbus-error-init.patch - path-max.patch - handle-input-touchpad.patch - macbook-fix-ioperm.patch) -md5sums=('e9163df591a6f38f59fdbfe33e73bf20' - '277e96ac130d7bfce0b30f0b80db8782' - '4d4b6801a1cedca22b8bdd9db73b16fb' - '6d87c3e63184ae3a69caafc846f538a3' - '6507e5091ee2d11a87ae738a8e2caecb' - '1171c2d83b76059f2da7a3538e08fa4e' - '52bd305299aa22ae07f1a862c22d30fa' - '3f11234fb5e5044fbfc5199ec65b182c' - 'da088f12cfc2d190bbf95b747e19ab9e' - '634f4ec2203eff7de8fa2ed2c6b9cbe0' - 'f8c9b3a40d03907b498feef571d42466' - '0575677614db0632b17b1a719798c7e0' - '46a5db3ff896ee37762aa8d7e70942c4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch" || return 1 - patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch" || return 1 - patch -Np1 -i "${srcdir}/hal-KVM-evdev.patch" || return 1 - patch -Np1 -i "${srcdir}/hal-HDAPS-blacklist.patch" || return 1 - patch -Np1 -i "${srcdir}/hal-xen-unignore-axes.patch" || return 1 - patch -Np1 -i "${srcdir}/hal-use-at-console.patch" || return 1 - patch -Np1 -i "${srcdir}/fix-libusb-detection.patch" || return 1 - patch -Np1 -i "${srcdir}/dbus-error-init.patch" || return 1 - patch -Np1 -i "${srcdir}/path-max.patch" || return 1 - patch -Np1 -i "${srcdir}/handle-input-touchpad.patch" || return 1 - patch -Np1 -i "${srcdir}/macbook-fix-ioperm.patch" || return 1 - - libtoolize --force || return 1 - aclocal || return 1 - autoconf || return 1 - automake || return 1 - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/hal --with-udev-prefix=/etc \ - --enable-static=no --disable-acpi-ibm \ - --disable-docbook-docs --disable-console-kit \ - --disable-policy-kit --disable-acl-management \ - --enable-umount-helper --disable-smbios \ - --with-hal-user=hal --with-hal-group=hal \ - --with-pid-file=/var/run/hald.pid \ - --disable-gtk-doc || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 -d "${pkgdir}/media" || return 1 - install -m755 "${srcdir}/hal" "${pkgdir}/etc/rc.d/" || return 1 - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 - - # Fix udev rule location - install -d -m755 "${pkgdir}/lib" - mv "${pkgdir}/etc/udev" "${pkgdir}/lib/" -} diff --git a/abs/core-testing/hal/cryptsetup_location.patch b/abs/core-testing/hal/cryptsetup_location.patch deleted file mode 100644 index 1e4f5ef..0000000 --- a/abs/core-testing/hal/cryptsetup_location.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur hal-0.5.8.1/tools/linux/hal-luks-remove-linux hal-0.5.8.1-new/tools/linux/hal-luks-remove-linux ---- hal-0.5.8.1/tools/linux/hal-luks-remove-linux 2006-09-19 22:23:25.000000000 +0200 -+++ hal-0.5.8.1-new/tools/linux/hal-luks-remove-linux 2007-02-11 13:04:46.000000000 +0100 -@@ -6,7 +6,7 @@ - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License version 2. - --CRYPTSETUP=/sbin/cryptsetup -+CRYPTSETUP=/usr/sbin/cryptsetup - - echo LUKS cryptotext device $HAL_PROP_INFO_UDI is going away - -diff -Naur hal-0.5.8.1/tools/linux/hal-luks-setup-linux hal-0.5.8.1-new/tools/linux/hal-luks-setup-linux ---- hal-0.5.8.1/tools/linux/hal-luks-setup-linux 2006-09-19 22:23:25.000000000 +0200 -+++ hal-0.5.8.1-new/tools/linux/hal-luks-setup-linux 2007-02-11 13:04:45.000000000 +0100 -@@ -9,7 +9,7 @@ - read password - PASSWORD=${PASSWORD//[^[:alnum:]_=[:space:]:.+-]/@} - --CRYPTSETUP=/sbin/cryptsetup -+CRYPTSETUP=/usr/sbin/cryptsetup - - if [ ! -f $CRYPTSETUP ]; then - echo org.freedesktop.Hal.Device.Volume.Crypto.SetupError >&2 -diff -Naur hal-0.5.8.1/tools/linux/hal-luks-teardown-linux hal-0.5.8.1-new/tools/linux/hal-luks-teardown-linux ---- hal-0.5.8.1/tools/linux/hal-luks-teardown-linux 2006-09-19 22:23:25.000000000 +0200 -+++ hal-0.5.8.1-new/tools/linux/hal-luks-teardown-linux 2007-02-11 13:04:44.000000000 +0100 -@@ -6,7 +6,7 @@ - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License version 2. - --CRYPTSETUP=/sbin/cryptsetup -+CRYPTSETUP=/usr/sbin/cryptsetup - - if [ ! -f $CRYPTSETUP ]; then - echo org.freedesktop.Hal.Device.Volume.Crypto.TeardownError >&2 diff --git a/abs/core-testing/hal/dbus-error-init.patch b/abs/core-testing/hal/dbus-error-init.patch deleted file mode 100644 index fb3ad02..0000000 --- a/abs/core-testing/hal/dbus-error-init.patch +++ /dev/null @@ -1,231 +0,0 @@ -From dcb2829b8eff61463b0869614ddb07b1c86cecaa Mon Sep 17 00:00:00 2001 -From: Sebastian Andrzej Siewior -Date: Wed, 30 Dec 2009 11:42:52 +0000 -Subject: linux/probe-input: don't use error prio init - -it may happen in the out: case that LIBHAL_FREE_DBUS_ERROR (&error) is -called before the error structure is initialized via -dbus_error_init (&error). This could lead to a segfault during startup -as seen in dmesg: - -|Intel AES-NI instructions are not detected. -|padlock: VIA PadLock not detected. -|hald-probe-inpu[1793]: segfault at 2 ip 00007f656fb68969 sp 00007fff39eeb950 error 4 in libc-2.10.2.so[7f656faf3000+14a000] -|hald-probe-inpu[1796]: segfault at 2 ip 00007fa2c3293969 sp 00007fffd92a5dd0 error 4 in libc-2.10.2.so[7fa2c321e000+14a000] -|hald-probe-inpu[1797]: segfault at 2 ip 00007f1d08ba2969 sp 00007fff34244e30 error 4 in libc-2.10.2.so[7f1d08b2d000+14a000] -|hald-probe-inpu[1799]: segfault at 2 ip 00007f35c0e3d969 sp 00007fffe5ec7ee0 error 4 in libc-2.10.2.so[7f35c0dc8000+14a000] -|hald-probe-inpu[1800]: segfault at 2 ip 00007f931c556969 sp 00007fffe1825b60 error 4 in libc-2.10.2.so[7f931c4e1000+14a000] -|hald-probe-inpu[1801]: segfault at 2 ip 00007f5156d9a969 sp 00007fff4e620af0 error 4 in libc-2.10.2.so[7f5156d25000+14a000] -|RPC: Registered udp transport module. -|RPC: Registered tcp transport module. - -What I run into seems to be reported as Debian #562068 [0]. This patch -makes the segfault go away on my machine. - -[0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=562068 - -Signed-off-by: Sebastian Andrzej Siewior -Signed-off-by: Martin Pitt ---- -diff --git a/hald/linux/probing/probe-input.c b/hald/linux/probing/probe-input.c -index 94e9929..cad47d3 100644 ---- a/hald/linux/probing/probe-input.c -+++ b/hald/linux/probing/probe-input.c -@@ -70,6 +70,7 @@ main (int argc, char *argv[]) - fd = -1; - - setup_logger (); -+ dbus_error_init (&error); - - button_type = getenv ("HAL_PROP_BUTTON_TYPE"); - if (button_type == NULL) -@@ -96,7 +97,6 @@ main (int argc, char *argv[]) - if (udi == NULL) - goto out; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - --- -cgit v0.8.3-6-g21f6 -From baa61a879985d63f549854518ef14efd40e62e8c Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Wed, 24 Feb 2010 16:19:28 +0000 -Subject: Make sure dbus_error_init() is called before LIBHAL_FREE_DBUS_ERROR() - -If dbus_error_init() is not called before LIBHAL_FREE_DBUS_ERROR() is -called on that error, then it is uninitialized and may segfault. This -means that dbus_error_init() must be called before any "goto out" if -"out:" calls LIBHAL_FREE_DBUS_ERROR(). - -Signed-off-by: Martin Pitt ---- -diff --git a/hald/linux/probing/probe-hiddev.c b/hald/linux/probing/probe-hiddev.c -index 45d2084..bffc040 100644 ---- a/hald/linux/probing/probe-hiddev.c -+++ b/hald/linux/probing/probe-hiddev.c -@@ -57,11 +57,12 @@ main (int argc, char *argv[]) - /* assume failure */ - ret = 1; - -+ dbus_error_init (&error); -+ - udi = getenv ("UDI"); - if (udi == NULL) - goto out; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-ieee1394-unit.c b/hald/linux/probing/probe-ieee1394-unit.c -index 70b0f86..aaa92e2 100644 ---- a/hald/linux/probing/probe-ieee1394-unit.c -+++ b/hald/linux/probing/probe-ieee1394-unit.c -@@ -388,6 +388,8 @@ int main (int argc, char *argv[]) - - setup_logger (); - -+ dbus_error_init (&error); -+ - udi = getenv ("UDI"); - if (udi == NULL) - goto out; -@@ -396,7 +398,6 @@ int main (int argc, char *argv[]) - if (ieee1394_udi == NULL) - goto out; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-net-bluetooth.c b/hald/linux/probing/probe-net-bluetooth.c -index 0b1b912..e911eea 100644 ---- a/hald/linux/probing/probe-net-bluetooth.c -+++ b/hald/linux/probing/probe-net-bluetooth.c -@@ -141,6 +141,8 @@ main (int argc, char *argv[]) - DBusMessage *reply = NULL; - DBusError error; - -+ dbus_error_init (&error); -+ - udi = getenv ("UDI"); - if (udi == NULL) - goto out; -@@ -151,8 +153,6 @@ main (int argc, char *argv[]) - - HAL_INFO (("Investigating '%s'", iface)); - -- dbus_error_init (&error); -- - if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-printer.c b/hald/linux/probing/probe-printer.c -index 91ed7bc..7c6d1c6 100644 ---- a/hald/linux/probing/probe-printer.c -+++ b/hald/linux/probing/probe-printer.c -@@ -66,6 +66,8 @@ main (int argc, char *argv[]) - ret = 1; - - setup_logger (); -+ -+ dbus_error_init (&error); - - udi = getenv ("UDI"); - if (udi == NULL) { -@@ -73,7 +75,6 @@ main (int argc, char *argv[]) - goto out; - } - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) { - HAL_ERROR (("ctx init failed")); - goto out; -diff --git a/hald/linux/probing/probe-smbios.c b/hald/linux/probing/probe-smbios.c -index 0bc9689..15c0d4f 100644 ---- a/hald/linux/probing/probe-smbios.c -+++ b/hald/linux/probing/probe-smbios.c -@@ -129,6 +129,8 @@ main (int argc, char *argv[]) - ret = 1; - - setup_logger (); -+ -+ dbus_error_init (&error); - - udi = getenv ("UDI"); - if (udi == NULL) { -@@ -136,7 +138,6 @@ main (int argc, char *argv[]) - goto out; - } - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) { - HAL_ERROR (("ctx init failed")); - goto out; -diff --git a/hald/linux/probing/probe-storage.c b/hald/linux/probing/probe-storage.c -index 824a82e..dd524ca 100644 ---- a/hald/linux/probing/probe-storage.c -+++ b/hald/linux/probing/probe-storage.c -@@ -109,6 +109,8 @@ main (int argc, char *argv[]) - /* assume failure */ - ret = 1; - -+ dbus_error_init (&error); -+ - if ((udi = getenv ("UDI")) == NULL) - goto out; - if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL) -@@ -127,7 +129,6 @@ main (int argc, char *argv[]) - else - only_check_for_fs = FALSE; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c -index cf913c0..7bc13e8 100644 ---- a/hald/linux/probing/probe-video4linux.c -+++ b/hald/linux/probing/probe-video4linux.c -@@ -58,6 +58,8 @@ main (int argc, char *argv[]) - - setup_logger (); - -+ dbus_error_init (&error); -+ - device_file = getenv ("HAL_PROP_VIDEO4LINUX_DEVICE"); - if (device_file == NULL) - goto out; -@@ -66,7 +68,6 @@ main (int argc, char *argv[]) - if (udi == NULL) - goto out; - -- dbus_error_init (&error); - ctx = libhal_ctx_init_direct (&error); - if (ctx == NULL) - goto out; -diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c -index 0de1b91..7268fff 100644 ---- a/hald/linux/probing/probe-volume.c -+++ b/hald/linux/probing/probe-volume.c -@@ -318,6 +318,8 @@ main (int argc, char *argv[]) - /* assume failure */ - ret = 1; - -+ dbus_error_init (&error); -+ - if ((udi = getenv ("UDI")) == NULL) - goto out; - if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL) -@@ -346,7 +348,6 @@ main (int argc, char *argv[]) - - fsusage = getenv ("HAL_PROP_VOLUME_FSUSAGE"); - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - --- -cgit v0.8.3-6-g21f6 diff --git a/abs/core-testing/hal/fix-libusb-detection.patch b/abs/core-testing/hal/fix-libusb-detection.patch deleted file mode 100644 index d4f966d..0000000 --- a/abs/core-testing/hal/fix-libusb-detection.patch +++ /dev/null @@ -1,66 +0,0 @@ -From fce91df8ba7f305c624baf1f06961c040b088ecc Mon Sep 17 00:00:00 2001 -From: Joe Marcus Clarke -Date: Tue, 08 Dec 2009 00:05:27 +0000 -Subject: Fix libusb detection on Linux - -Adjust the FreeBSD libusb20 code so that it does not interfere with the -Linux libusb detection. - -Reported by: Robby Workman ---- -diff --git a/configure.in b/configure.in -index a8fda51..8363595 100644 ---- a/configure.in -+++ b/configure.in -@@ -479,9 +479,6 @@ if test "x$with_libpci" != xno ; then - fi - AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"]) - --USE_LIBUSB20=no --USE_LIBUSB=no --LIBUSB20_LIBS="" - AC_ARG_WITH([backend], - AS_HELP_STRING([--with-backend=], - [backend to use (linux/solaris/freebsd/dummy)]), -@@ -510,21 +507,25 @@ AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compilin - AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris]) - AC_SUBST(HALD_BACKEND) - if test "x$HALD_BACKEND" = "xfreebsd"; then -- AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no]) --fi --if test "x$USE_LIBUSB20" = "xno"; then -- AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no]) --fi --AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"]) --AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"]) --if test "x$USE_LIBUSB20" = "xyes"; then -- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20]) -- LIBUSB20_LIBS="-lusb20" --elif test "x$USE_LIBUSB" = "xyes"; then -- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20]) -- LIBUSB20_LIBS="-lusb" -+ USE_BSDLIBUSB20=no -+ USE_BSDLIBUSB=no -+ LIBUSB20_LIBS="" -+ AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_BSDLIBUSB20=yes], [USE_BSDLIBUSB20=no]) -+ if test "x$USE_BSDLIBUSB20" = "xno"; then -+ AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_BSDLIBUSB=yes], [USE_BSDLIBUSB=no]) -+ fi -+ AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"]) -+ if test "x$USE_BSDLIBUSB20" = "xyes"; then -+ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20]) -+ LIBUSB20_LIBS="-lusb20" -+ elif test "x$USE_BSDLIBUSB" = "xyes"; then -+ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20]) -+ LIBUSB20_LIBS="-lusb" -+ fi -+ AC_SUBST(LIBUSB20_LIBS) -+else -+ AM_CONDITIONAL([HAVE_LIBUSB20], [false]) - fi --AC_SUBST(LIBUSB20_LIBS) - - dnl DBUS API is subject to changes - AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change]) --- -cgit v0.8.3-6-g21f6 diff --git a/abs/core-testing/hal/fix-udev-compatibility.patch b/abs/core-testing/hal/fix-udev-compatibility.patch deleted file mode 100644 index 2cfa3ad..0000000 --- a/abs/core-testing/hal/fix-udev-compatibility.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Nur hal-0.5.11.orig/hald/linux/blockdev.c hal-0.5.11/hald/linux/blockdev.c ---- hal-0.5.11.orig/hald/linux/blockdev.c 2008-05-08 01:23:41.000000000 +0200 -+++ hal-0.5.11/hald/linux/blockdev.c 2008-09-12 19:38:36.000000000 +0200 -@@ -1750,11 +1750,11 @@ - char *ret; - char *u_stdout; - int u_exit_status; -- const char *argv[] = {"/usr/bin/udevinfo", "--root", "--query", "name", "--path", NULL, NULL}; -+ const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL}; - GError *g_error; - - ret = NULL; -- argv[5] = sysfs_path; -+ argv[6] = sysfs_path; - - g_error = NULL; - -diff -Nur hal-0.5.11.orig/hald/linux/coldplug.c hal-0.5.11/hald/linux/coldplug.c ---- hal-0.5.11.orig/hald/linux/coldplug.c 2008-05-08 01:23:32.000000000 +0200 -+++ hal-0.5.11/hald/linux/coldplug.c 2008-09-12 19:37:47.000000000 +0200 -@@ -149,8 +149,8 @@ - static gboolean - hal_util_init_sysfs_to_udev_map (void) - { -- char *udevdb_export_argv[] = { "/usr/bin/udevinfo", "-e", NULL }; -- char *udevroot_argv[] = { "/usr/bin/udevinfo", "-r", NULL }; -+ char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL }; -+ char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL }; - int udevinfo_exitcode; - UdevInfo *info = NULL; - char *p; diff --git a/abs/core-testing/hal/hal b/abs/core-testing/hal/hal deleted file mode 100644 index 012d456..0000000 --- a/abs/core-testing/hal/hal +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - #Check for running dbus, start when not running - ck_daemon dbus && /etc/rc.d/dbus start - if [ -x /etc/rc.d/acpid ]; then - ck_daemon acpid && /etc/rc.d/acpid start - fi - stat_busy "Starting Hardware Abstraction Layer" - if [ ! -x /var/cache/hald ] ; then - install -m755 -g 82 -o 82 -d /var/cache/hald - fi - if [ ! -x /var/run/hald ]; then - install -m755 -g 82 -o 82 -d /var/run/hald - fi - if [ ! -x /var/run/hald/hald-local ]; then - install -m755 -g 0 -o 0 -d /var/run/hald/hald-local - fi - if [ ! -x /var/run/hald/hald-runner ]; then - install -m755 -g 0 -o 0 -d /var/run/hald/hald-runner - fi - /usr/sbin/hald - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon hal - stat_done - fi - ;; - stop) - stat_busy "Stopping Hardware Abstraction Layer" - [ -f /var/run/hald.pid ] && kill `cat /var/run/hald.pid` &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon hal - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/abs/core-testing/hal/hal-0.5.9-hide-diagnostic.patch b/abs/core-testing/hal/hal-0.5.9-hide-diagnostic.patch deleted file mode 100644 index 58c882d..0000000 --- a/abs/core-testing/hal/hal-0.5.9-hide-diagnostic.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi.orig 2007-05-01 21:39:31.000000000 +0000 -+++ hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi 2007-05-01 21:51:14.000000000 +0000 -@@ -100,6 +100,11 @@ - - - -+ -+ -+ true -+ -+ - - - diff --git a/abs/core-testing/hal/hal-HDAPS-blacklist.patch b/abs/core-testing/hal/hal-HDAPS-blacklist.patch deleted file mode 100644 index 8a68228..0000000 --- a/abs/core-testing/hal/hal-HDAPS-blacklist.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e1f85fe0cdfa7e4d4ce7a811d0b0c90bf38fba0c Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 25 Jun 2009 09:47:27 +1000 -Subject: [PATCH] Blacklist HDAPS accelerometer device from being picked up in X. - -This device posts accelerometer data through ABS_X/ABS_Y, making X unusable -if it's controlling the pointer. ---- - fdi/policy/10osvendor/10-x11-input.fdi | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi -index a342421..89ba672 100644 ---- a/fdi/policy/10osvendor/10-x11-input.fdi -+++ b/fdi/policy/10osvendor/10-x11-input.fdi -@@ -38,5 +38,11 @@ - evdev - - -+ -+ -+ -+ -+ - - --- -1.6.3.rc1.2.g0164.dirty - diff --git a/abs/core-testing/hal/hal-KVM-evdev.patch b/abs/core-testing/hal/hal-KVM-evdev.patch deleted file mode 100644 index 917655e..0000000 --- a/abs/core-testing/hal/hal-KVM-evdev.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7618498eec840cb26474dc47821e083957772706 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 20 Mar 2009 14:37:24 +1000 -Subject: [PATCH] Add x11_driver for American Megatrends KVM. - -This device exposes only ABS_X, ABS_Y and buttons. It gets input.joystick -assigned but not input.mouse, hence the default evdev mapping doesn't pick up -on it. - -Red Hat Bug 484776 - -Signed-off-by: Peter Hutterer ---- - fdi/policy/10osvendor/10-x11-input.fdi | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi -index 769f75b..eb9767e 100644 ---- a/fdi/policy/10osvendor/10-x11-input.fdi -+++ b/fdi/policy/10osvendor/10-x11-input.fdi -@@ -2,6 +2,12 @@ - - - -+ -+ -+ evdev -+ -+ - - - evdev --- -1.6.0.6 - diff --git a/abs/core-testing/hal/hal-policy.patch b/abs/core-testing/hal/hal-policy.patch deleted file mode 100644 index 96528b5..0000000 --- a/abs/core-testing/hal/hal-policy.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- hal-0.5.11/hal.conf.in 2008-05-27 16:09:25.000000000 +0200 -+++ hal-0.5.11/hal.conf.in 2008-05-27 16:21:28.000000000 +0200 -@@ -37,9 +37,27 @@ - receive_sender="org.freedesktop.Hal"/> - - -- -+ - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - diff --git a/abs/core-testing/hal/hal-remove-dell-killswitch.patch b/abs/core-testing/hal/hal-remove-dell-killswitch.patch deleted file mode 100644 index ae0cf7a..0000000 --- a/abs/core-testing/hal/hal-remove-dell-killswitch.patch +++ /dev/null @@ -1,201 +0,0 @@ -diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux ---- hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux 2008-08-22 07:34:47.000000000 +0100 -+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux 2009-03-03 10:45:20.000000000 +0000 -@@ -8,11 +8,6 @@ - # the Free Software Foundation; either version 2 of the License, or - # (at your option) any later version. - --DELL_WCTL=/usr/bin/dellWirelessCtl --if [ -x "/usr/sbin/dellWirelessCtl" ]; then -- DELL_WCTL=/usr/sbin/dellWirelessCtl --fi -- - if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then - if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then - value="`hal-system-sonypic getbluetooth`" -@@ -22,25 +17,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue - exit 1 - fi - exit ${value} -- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # TODO: write our own binary that links with libsmbios? -- $DELL_WCTL --st_bt -- value=$? -- if [ "$value" = "0" ]; then -- exit 1 -- elif [ "$value" = "1" ]; then -- exit 0 -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $value" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi - elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -r "$HAL_PROP_LINUX_SYSFS_PATH" ]; then - read value < $HAL_PROP_LINUX_SYSFS_PATH 2> /dev/null - if [ $? -eq 0 ]; then -@@ -55,56 +31,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue - echo "Access type not supported" >&2 - exit 1 - fi --elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then -- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # TODO: write our own binary that links with libsmbios? -- $DELL_WCTL --st_wlan -- value=$? -- if [ "$value" = "0" ]; then -- exit 1 -- elif [ "$value" = "1" ]; then -- exit 0 -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $value" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "Access type not supported" >&2 -- exit 1 -- fi --elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then -- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # TODO: write our own binary that links with libsmbios? -- $DELL_WCTL --st_wwan -- value=$? -- if [ "$value" = "0" ]; then -- exit 1 -- elif [ "$value" = "1" ]; then -- exit 0 -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $value" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "Access type not supported" >&2 -- exit 1 -- fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "Killswitch type not supported" >&2 -diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux ---- hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux 2008-10-24 09:45:54.000000000 +0100 -+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux 2009-03-03 10:44:49.000000000 +0000 -@@ -8,11 +8,6 @@ - # the Free Software Foundation; either version 2 of the License, or - # (at your option) any later version. - --DELL_WCTL=/usr/bin/dellWirelessCtl --if [ -x "/usr/sbin/dellWirelessCtl" ]; then -- DELL_WCTL=/usr/sbin/dellWirelessCtl --fi -- - if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then - if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then - hal-system-sonypic setbluetooth $value -@@ -23,26 +18,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue - exit 1 - fi - exit 0 -- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # TODO: write our own binary that links with libsmbios? -- if [ "$value" = "true" ]; then -- $DELL_WCTL --bt 1 -- ret=$? -- else -- $DELL_WCTL --bt 0 -- ret=$? -- fi -- if [ "$ret" != "0" ]; then -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $ret" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi - elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -w "$HAL_PROP_LINUX_SYSFS_PATH" ]; then - if [ "$value" = "true" ]; then - bit=1; -@@ -61,60 +36,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue - echo "Access type not supported" >&2 - exit 1 - fi --elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then -- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # As a side effect we disable the physical kill switch -- # TODO: write our own binary that links with libsmbios? -- if [ "$value" = "true" ]; then -- $DELL_WCTL --sw_wlan 0 --wlan 1 -- ret=$? -- else -- $DELL_WCTL --sw_wlan 0 --wlan 0 -- ret=$? -- fi -- if [ "$ret" != "0" ]; then -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $ret" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "Access type not supported" >&2 -- exit 1 -- fi --elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then -- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # As a side effect we disable the physical kill switch -- # TODO: write our own binary that links with libsmbios? -- if [ "$value" = "true" ]; then -- $DELL_WCTL --sw_wwan 0 --wwan 1 -- ret=$? -- else -- $DELL_WCTL --sw_wwan 0 --wwan 0 -- ret=$? -- fi -- if [ "$ret" != "0" ]; then -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $ret" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "Access type not supported" >&2 -- exit 1 -- fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "Killswitch type not supported" >&2 diff --git a/abs/core-testing/hal/hal-use-at-console.patch b/abs/core-testing/hal/hal-use-at-console.patch deleted file mode 100644 index 0b32f17..0000000 --- a/abs/core-testing/hal/hal-use-at-console.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up hal-0.5.13/hal.conf.in.drop-polkit hal-0.5.13/hal.conf.in ---- hal-0.5.13/hal.conf.in.drop-polkit 2009-02-04 17:07:23.000000000 -0500 -+++ hal-0.5.13/hal.conf.in 2009-07-29 23:15:16.866766074 -0400 -@@ -25,7 +25,41 @@ - send_interface="org.freedesktop.Hal.Device"/> - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -+ -+ - - -Date: Mon, 19 Oct 2009 14:27:20 +1000 -Subject: [PATCH] Un-ignore absolute axes for the Xen Virtual Pointer. - -The evdev-internal axis type picking fails for the Xen Virtual Pointer as it -exposes both relative and absolute axes. Evdev picks the relative axes by -default, leading to a immovable pointer if the Xen backend only sends -absolute coordinates. - -Explicitly tell evdev to not ignore the absolute axes. - -https://bugzilla.redhat.com/show_bug.cgi?id=523914 - -Signed-off-by: Peter Hutterer ---- - fdi/policy/10osvendor/10-x11-input.fdi | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi -index 89ba672..752c4ab 100644 ---- a/fdi/policy/10osvendor/10-x11-input.fdi -+++ b/fdi/policy/10osvendor/10-x11-input.fdi -@@ -44,5 +44,12 @@ - - - -+ -+ -+ -+ false -+ false -+ - - --- -1.6.2.5 - diff --git a/abs/core-testing/hal/hal.install b/abs/core-testing/hal/hal.install deleted file mode 100644 index d6afee3..0000000 --- a/abs/core-testing/hal/hal.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() { - getent group hal >/dev/null || usr/sbin/groupadd -g 82 hal - getent group optical >/dev/null || usr/sbin/groupadd -g 93 optical - getent group floppy >/dev/null || usr/sbin/groupadd -g 94 floppy - getent group storage >/dev/null || usr/sbin/groupadd -g 95 storage - getent passwd hal >/dev/null || usr/sbin/useradd -c 'HAL daemon' -u 82 -g hal -G optical,floppy,storage -d '/' -s /bin/false hal - usr/bin/passwd -l hal &>/dev/null -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -post_remove() { - if getent passwd hal &>/dev/null; then - usr/sbin/userdel hal - fi - if getent group hal &>/dev/null; then - usr/sbin/groupdel hal - fi -} diff --git a/abs/core-testing/hal/handle-input-touchpad.patch b/abs/core-testing/hal/handle-input-touchpad.patch deleted file mode 100644 index 9cd6464..0000000 --- a/abs/core-testing/hal/handle-input-touchpad.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 6dccf8e3ad181e8f56b1d2a994ec50a1953a1c2d Mon Sep 17 00:00:00 2001 -From: Michael Witten -Date: Wed, 06 Jan 2010 00:53:17 +0000 -Subject: Policy: handle `input.touchpad' explicitly - -This commit essentially duplicates the policy for: - - - -and then changes `input.mouse' to `input.touchpad'. This -is necessary because in Linus Torvalds's Linux repo: - - git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git - -the following commit: - - commit 7105d2ea73e1391b681d0e1212c42f561c64d429 - Author: Dmitry Torokhov - Date: Fri Dec 11 23:54:54 2009 -0800 - - Input: ALPS - do not set REL_X/REL_Y capabilities on the touchpad - - Relative events are only reported via secondary device therefore device - associated with the touchpad should not advertise these capabilities. - - Signed-off-by: Dmitry Torokhov - -made these few changes: - - diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c - index a3f492a..b03e7e0 100644 - /--- a/drivers/input/mouse/alps.c - /+++ b/drivers/input/mouse/alps.c - /@@ -487,6 +487,17 @@ int alps_init(struct psmouse *psmouse) - if (alps_hw_init(psmouse)) - goto init_fail; - - + /* - + * Undo part of setup done for us by psmouse core since touchpad - + * is not a relative device. - + */ - + __clear_bit(EV_REL, dev1->evbit); - + __clear_bit(REL_X, dev1->relbit); - + __clear_bit(REL_Y, dev1->relbit); - + - + /* - + * Now set up our capabilities. - + */ - dev1->evbit[BIT_WORD(EV_KEY)] |= BIT_MASK(EV_KEY); - dev1->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH); - dev1->keybit[BIT_WORD(BTN_TOOL_FINGER)] |= BIT_MASK(BTN_TOOL_FINGER); - -so that HAL no longer adds: - - input.mouse - -to an ALPS touchpad's: - - info.capabilities - -so that HAL no longer marks the ALPS touchpad with: - - input.x11_driver = 'evdev' - -because the policy file: - - fdi/policy/10osvendor/10-x11-input.fdi - -doesn't define the policy for: - - - -which was previous unnecessary because everything used to -be caught by the policy for: - - - -Signed-off-by: Michael Witten -Signed-off-by: Martin Pitt ---- -diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi -index cff8fc5..8bbe263 100644 ---- a/fdi/policy/10osvendor/10-x11-input.fdi -+++ b/fdi/policy/10osvendor/10-x11-input.fdi -@@ -16,6 +16,14 @@ - - - -+ -+ mouse -+ -+ evdev -+ -+ -+ - - --- -cgit v0.8.3-6-g21f6 diff --git a/abs/core-testing/hal/macbook-fix-ioperm.patch b/abs/core-testing/hal/macbook-fix-ioperm.patch deleted file mode 100644 index 14d0b39..0000000 --- a/abs/core-testing/hal/macbook-fix-ioperm.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 597c1ffffd61a15a334ce42f2a569c59f0270bcb Mon Sep 17 00:00:00 2001 -From: Dmitry Torokhov -Date: Thu, 25 Feb 2010 10:25:18 +0000 -Subject: Fix incorrect arguments to ioperm() call - -The second argument of ioperm() is not the last port to be accessed -but rather length of the port range [port, port + len). - -Signed-off-by: Dmitry Torokhov -Signed-off-by: Martin Pitt ---- -diff --git a/hald/linux/addons/addon-imac-backlight.c b/hald/linux/addons/addon-imac-backlight.c -index e869192..54e4ea3 100644 ---- a/hald/linux/addons/addon-imac-backlight.c -+++ b/hald/linux/addons/addon-imac-backlight.c -@@ -158,7 +158,8 @@ main (int argc, char **argv) - goto out; - } - -- if (ioperm(0xB2, 0xB3, 1) < 0) -+ /* Allow access to ports 0xB2 and 0xB3 */ -+ if (ioperm(0xB2, 2, 1) < 0) - { - HAL_ERROR (("ioperm failed (you should be root).")); - exit(1); -diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c -index 2a6fef6..c1bbbac 100644 ---- a/hald/linux/addons/addon-macbookpro-backlight.c -+++ b/hald/linux/addons/addon-macbookpro-backlight.c -@@ -507,7 +507,8 @@ main (int argc, char *argv[]) - state = INREG(0x7ae4); - OUTREG(0x7ae4, state); - -- if (ioperm (0x300, 0x304, 1) < 0) { -+ /* Allow access to porta 0x300 through 0x304 */ -+ if (ioperm (0x300, 5, 1) < 0) { - HAL_ERROR (("ioperm failed (you should be root).")); - exit(1); - } --- -cgit v0.8.3-6-g21f6 diff --git a/abs/core-testing/hal/ntfs-mount-fix.patch b/abs/core-testing/hal/ntfs-mount-fix.patch deleted file mode 100644 index 13597f2..0000000 --- a/abs/core-testing/hal/ntfs-mount-fix.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- tools/hal-storage-mount.c.orig 2008-04-21 01:48:27.000000000 +0200 -+++ tools/hal-storage-mount.c 2008-04-21 01:47:44.000000000 +0200 -@@ -769,13 +769,13 @@ - - if (pol_is_fixed) { - if (pol_change_uid) { -- action = NULL; /* "hal-storage-mount-fixed-extra-options"; TODO: rethink */ -+ action = "hal-storage-mount-fixed-extra-options"; /*TODO: rethink */ - } else { - action = "org.freedesktop.hal.storage.mount-fixed"; - } - } else { - if (pol_change_uid) { -- action = NULL; /* "hal-storage-mount-removable-extra-options"; TODO: rethink "extra-options" */ -+ action = "hal-storage-mount-removable-extra-options"; /*TODO: rethink "extra-options" */ - } else { - action = "org.freedesktop.hal.storage.mount-removable"; - } diff --git a/abs/core-testing/hal/ntfs3g-valid-options.patch b/abs/core-testing/hal/ntfs3g-valid-options.patch deleted file mode 100644 index 4731442..0000000 --- a/abs/core-testing/hal/ntfs3g-valid-options.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- fdi/policy/10osvendor/20-storage-methods.fdi.orig 2007-10-28 19:40:22.000000000 +0000 -+++ fdi/policy/10osvendor/20-storage-methods.fdi 2007-10-28 19:40:58.000000000 +0000 -@@ -240,6 +240,8 @@ - uid= - gid= - umask= -+ dmask= -+ fmask= - locale= - utf8 - diff --git a/abs/core-testing/hal/path-max.patch b/abs/core-testing/hal/path-max.patch deleted file mode 100644 index 304185d..0000000 --- a/abs/core-testing/hal/path-max.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a2c3dd5a04d79265772c09c4280606d5c2ed72c6 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Mon, 04 Jan 2010 15:56:13 +0000 -Subject: Bump HAL_PATH_MAX to 4096 - -Some bits in the code use realpath() with destination paths of size -HAL_PATH_MAX. This potentially breaks on systems where PATH_MAX is bigger than -HAL_PATH_MAX (which was 512 until now). - -Since we can't use PATH_MAX directly (due to platforms like GNU/Hurd, which -apparently don't have it), just bump HAL_PATH_MAX to 4096 (as PATH_MAX is on -Linux), to avoid potential buffer overflows and also fix hal on Linux when -enabling FORTIFY in gcc. - -https://bugs.freedesktop.org/show_bug.cgi?id=25888 ---- -diff --git a/hald/util.h b/hald/util.h -index c2a1584..7883333 100644 ---- a/hald/util.h -+++ b/hald/util.h -@@ -38,7 +38,7 @@ - #endif - - #define HAL_NAME_MAX 256 --#define HAL_PATH_MAX 512 -+#define HAL_PATH_MAX 4096 - - gboolean hal_util_remove_trailing_slash (gchar *path); - --- -cgit v0.8.3-6-g21f6 diff --git a/abs/core-testing/hauppauge-hvr-firmware/PKGBUILD b/abs/core-testing/hauppauge-hvr-firmware/PKGBUILD deleted file mode 100755 index f9a488d..0000000 --- a/abs/core-testing/hauppauge-hvr-firmware/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=hauppauge-hvr-firmware -pkgver=1 -pkgrel=3 -pkgdesc="firmware needed for the hvr cards" -arch=(i686 x86_64) -url="" -makedepends='unzip' -source=("http://steventoth.net/linux/hvr1800/HVR-12x0-14x0-17x0_1_25_25271_WHQL.zip" - "http://steventoth.net/linux/hvr1400/xc3028L-v36.fw") -md5sums=('7fe395c1a398f079d98e416ee7be3777' - '5260975b76ade7a1d37270129b6d6372') - -build() { - cd $startdir || return 1 - mkdir -p $startdir/pkg/lib/firmware - unzip -jo HVR-12x0-14x0-17x0_1_25_25271_WHQL.zip Driver85/hcw85enc.rom - unzip -jo HVR-12x0-14x0-17x0_1_25_25271_WHQL.zip Driver85/hcw85mlC.rom - cd $startdir/src/Driver85 - mv hcw85enc.rom v4l-cx23885-enc.fw - mv hcw85mlC.rom v4l-cx23885-avcore-01.fw - cp -rp *.fw $startdir/pkg/lib/firmware - cd $startdir/src/ - cp *.fw $startdir/pkg/lib/firmware -} diff --git a/abs/core-testing/hd3000firmware/PKGBUILD b/abs/core-testing/hd3000firmware/PKGBUILD deleted file mode 100755 index 745fd5f..0000000 --- a/abs/core-testing/hd3000firmware/PKGBUILD +++ /dev/null @@ -1,15 +0,0 @@ -pkgname=hd3000firmware -pkgver=0.1 -pkgrel=1 -pkgdesc="firmware needed for the hd3000 card" -arch=(i686 x86_64) -url="http://www.pchdtv.com" - -source=("http://www.pchdtv.com/downloads/firmware.tar.gz") - - -build() { - cd $startdir/src || return 1 - mkdir -p $startdir/pkg/lib/firmware - cp -rp firmware/* $startdir/pkg/lib/firmware -} diff --git a/abs/core-testing/hdhomerun/PKGBUILD b/abs/core-testing/hdhomerun/PKGBUILD deleted file mode 100755 index 51186e0..0000000 --- a/abs/core-testing/hdhomerun/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -pkgname=hdhomerun -pkgver=20100213 -pkgrel=1 -pkgdesc="utils and firmware needed for the hdhomerun" -arch=(i686 x86_64) -url="http://www.silicondust.com" -firmware=hdhomerun_atsc_firmware_$pkgver.bin -firmware2=hdhomerun_dvbt_firmware_$pkgver.bin -firmware3=hdhomerun_tech_atsc_firmware_$pkgver.bin -url=http://download.silicondust.com/hdhomerun -source=("$url/libhdhomerun_$pkgver.tgz" "$url/$firmware" "$url/$firmware2" "$url/$firmware3" ) - - -build() { - cd $startdir/src || return 1 - cd libhdhomerun - make || return 1 - install -D -m755 hdhomerun_config $startdir/pkg/usr/bin/hdhomerun_config - cd .. - mkdir -p $startdir/pkg/lib/firmware - cp $startdir/src/*.bin $startdir/pkg/lib/firmware/ -} -md5sums=('c69f46d0a671e3d7aaacc82ad393644a' - '8b23724c2afb04cd909d3c1ff392d287' - '369be2b2c95c2c93e0f2b09fcc01edfb' - '9e83fbf8a74d6b8f746cc9f1414e9167') diff --git a/abs/core-testing/hdparm/PKGBUILD b/abs/core-testing/hdparm/PKGBUILD deleted file mode 100644 index 2e1a441..0000000 --- a/abs/core-testing/hdparm/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 7862 2008-08-04 20:16:21Z tpowa $ -# Maintainer: Paul Mattal - -pkgname=hdparm -pkgver=9.29 -pkgrel=1 -pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters" -arch=(i686 x86_64) -depends=('glibc') -groups=('base') -source=(http://heanet.dl.sourceforge.net/sourceforge/hdparm/${pkgname}-${pkgver}.tar.gz) -license=('BSD') -url="http://sourceforge.net/projects/hdparm/" - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} || return 1 - - # build - make || return 1 - - # install - mkdir -p ${startdir}/pkg/{usr,sbin} || return 1 - make DESTDIR=${startdir}/pkg install || return 1 - install -m755 contrib/idectl ${startdir}/pkg/sbin || return 1 - install -m755 contrib/ultrabayd ${startdir}/pkg/sbin || return 1 - - #install license file - install -D -m 644 LICENSE.TXT $startdir/pkg/usr/share/licenses/hdparm/LICENSE.TXT - - # installs empty /usr/share, which we let it do since it causes - # no harm and it might put something there someday -} -md5sums=('6575aba60e5adee628414cac76549c9b') diff --git a/abs/core-testing/heimdal/001_all_heimdal-no_libedit.patch b/abs/core-testing/heimdal/001_all_heimdal-no_libedit.patch deleted file mode 100644 index a551bdc..0000000 --- a/abs/core-testing/heimdal/001_all_heimdal-no_libedit.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- cf/krb-readline.m4 2005-06-16 18:28:32.000000000 +0200 -+++ cf/krb-readline.m4 2005-06-27 23:17:06.000000000 +0200 -@@ -6,7 +6,6 @@ - dnl el_init - - AC_DEFUN([KRB_READLINE],[ --AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent]) - if test "$ac_cv_func_el_init" = yes ; then - AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include diff --git a/abs/core-testing/heimdal/002_all_heimal-fPIC.patch b/abs/core-testing/heimdal/002_all_heimal-fPIC.patch deleted file mode 100644 index c67dbae..0000000 --- a/abs/core-testing/heimdal/002_all_heimal-fPIC.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/editline/Makefile.am 2005-06-16 18:28:44.000000000 +0200 -+++ lib/editline/Makefile.am 2005-06-27 23:21:02.000000000 +0200 -@@ -41,6 +41,9 @@ - - EXTRA_DIST = $(man_MANS) - -+$(libeditline_la_OBJECTS): %.lo: %.c -+ $(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+ - snprintf.c: - $(LN_S) $(srcdir)/../roken/snprintf.c . - strdup.c: diff --git a/abs/core-testing/heimdal/002_all_heimdal-no_libedit.patch b/abs/core-testing/heimdal/002_all_heimdal-no_libedit.patch deleted file mode 100644 index 7806597..0000000 --- a/abs/core-testing/heimdal/002_all_heimdal-no_libedit.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- cf/krb-readline.m4 2004-09-15 13:24:15.000000000 +0000 -+++ cf/krb-readline.m4 2004-09-17 16:11:39.610756024 +0000 -@@ -6,7 +6,6 @@ - dnl el_init - - AC_DEFUN([KRB_READLINE],[ --AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent]) - if test "$ac_cv_func_el_init" = yes ; then - AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[ - AC_TRY_COMPILE([#include diff --git a/abs/core-testing/heimdal/003_all_heimdal-fPIC.patch b/abs/core-testing/heimdal/003_all_heimdal-fPIC.patch deleted file mode 100644 index ee01e34..0000000 --- a/abs/core-testing/heimdal/003_all_heimdal-fPIC.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/editline/Makefile.am 2004-05-10 09:27:21.442490749 +0000 -+++ lib/editline/Makefile.am 2004-05-10 09:27:38.876209101 +0000 -@@ -47,6 +47,9 @@ - - EXTRA_DIST = $(man_MANS) - -+$(libeditline_la_OBJECTS): %.lo: %.c -+ $(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+ - snprintf.c: - $(LN_S) $(srcdir)/../roken/snprintf.c . - strdup.c: diff --git a/abs/core-testing/heimdal/003_all_heimdal-rxapps.patch b/abs/core-testing/heimdal/003_all_heimdal-rxapps.patch deleted file mode 100644 index 40fc05f..0000000 --- a/abs/core-testing/heimdal/003_all_heimdal-rxapps.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- appl/kx/rxtelnet.in 2005-06-16 18:29:10.000000000 +0200 -+++ appl/kx/rxtelnet.in 2005-06-27 23:21:34.000000000 +0200 -@@ -2,7 +2,7 @@ - # $Id: rxtelnet.in,v 1.31 2004/03/07 17:22:06 lha Exp $ - # - usage="Usage: $0 [-l username] [-k] [-fF] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]" --binary=telnet -+binary=ktelnet - term= - kx_args=-P - while true ---- appl/kx/rxterm.in 2005-06-16 18:29:10.000000000 +0200 -+++ appl/kx/rxterm.in 2005-06-27 23:21:55.000000000 +0200 -@@ -2,7 +2,7 @@ - # $Id: rxterm.in,v 1.23 2002/03/18 17:37:34 joda Exp $ - # - usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host" --binary=rsh -+binary=krsh - term=xterm - while true - do diff --git a/abs/core-testing/heimdal/004_all_heimdal-rxapps.patch b/abs/core-testing/heimdal/004_all_heimdal-rxapps.patch deleted file mode 100644 index d6142a7..0000000 --- a/abs/core-testing/heimdal/004_all_heimdal-rxapps.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- appl/kx/rxterm.in 2004-02-21 21:49:23.893934354 +0000 -+++ appl/kx/rxterm.in 2004-02-21 21:49:34.617299076 +0000 -@@ -2,6 +2,6 @@ - # - usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host" --binary=rsh -+binary=krsh - term=xterm - while true - do ---- appl/kx/rxtelnet.in 2005-06-16 16:29:10.000000000 +0000 -+++ appl/kx/rxtelnet.in 2005-07-11 20:33:10.000000000 +0000 -@@ -2,7 +2,7 @@ - # - usage="Usage: $0 [-l username] [-k] [-fF] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]" --binary=telnet -+binary=ktelnet - term= - kx_args=-P diff --git a/abs/core-testing/heimdal/005_all_heimdal-suid_fix.patch b/abs/core-testing/heimdal/005_all_heimdal-suid_fix.patch deleted file mode 100644 index 35a9ed9..0000000 --- a/abs/core-testing/heimdal/005_all_heimdal-suid_fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- appl/su/Makefile.am 2005-06-16 18:27:46.000000000 +0200 -+++ appl/su/Makefile.am 2005-06-27 23:25:21.000000000 +0200 -@@ -7,6 +7,7 @@ - bin_PROGRAMS = su - bin_SUIDS = su - su_SOURCES = su.c supaths.h -+su_LDFLAGS = -Wl,-z,now - man_MANS = su.1 - - LDADD = $(LIB_kafs) \ ---- appl/otp/Makefile.am 2005-06-16 18:28:46.000000000 +0200 -+++ appl/otp/Makefile.am 2005-06-27 23:25:40.000000000 +0200 -@@ -8,6 +8,7 @@ - bin_SUIDS = otp - otp_SOURCES = otp.c otp_locl.h - otpprint_SOURCES = otpprint.c otp_locl.h -+otp_LDFLAGS = -Wl,-z,now - - man_MANS = otp.1 otpprint.1 - diff --git a/abs/core-testing/heimdal/006_all_heimdal-suid_fix.patch b/abs/core-testing/heimdal/006_all_heimdal-suid_fix.patch deleted file mode 100644 index 0f7d281..0000000 --- a/abs/core-testing/heimdal/006_all_heimdal-suid_fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- appl/otp/Makefile.am 2004-09-17 22:22:54.046301075 +0000 -+++ appl/otp/Makefile.am 2004-09-17 22:23:15.293145945 +0000 -@@ -8,6 +8,7 @@ - bin_SUIDS = otp - otp_SOURCES = otp.c otp_locl.h - otpprint_SOURCES = otpprint.c otp_locl.h -+otp_LDFLAGS = -Wl,-z,now - - man_MANS = otp.1 otpprint.1 - ---- appl/su/Makefile.am 2005-06-16 16:27:46.000000000 +0000 -+++ appl/su/Makefile.am 2005-07-11 20:34:21.000000000 +0000 -@@ -7,6 +7,7 @@ - bin_PROGRAMS = su - bin_SUIDS = su - su_SOURCES = su.c -+su_LDFLAGS = -Wl,-z,now - man_MANS = su.1 - - LDADD = $(LIB_kafs) \ diff --git a/abs/core-testing/heimdal/010_all_heimdal-system-libss.patch b/abs/core-testing/heimdal/010_all_heimdal-system-libss.patch deleted file mode 100644 index 5cd4d9d..0000000 --- a/abs/core-testing/heimdal/010_all_heimdal-system-libss.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- lib/sl/Makefile.am~ 2007-06-01 09:48:09.000000000 +0200 -+++ lib/sl/Makefile.am 2007-06-01 09:49:30.000000000 +0200 -@@ -12,36 +12,24 @@ - - include_HEADERS = sl.h - --lib_LTLIBRARIES = libsl.la libss.la -+lib_LTLIBRARIES = libsl.la - libsl_la_LDFLAGS = -version-info 2:0:2 --libss_la_LDFLAGS = -version-info 1:5:1 - - libsl_la_LIBADD = @LIB_readline@ --libss_la_LIBADD = @LIB_readline@ @LIB_com_err@ - - libsl_la_SOURCES = sl_locl.h sl.c $(ES) --libss_la_SOURCES = $(libsl_la_SOURCES) ss.c ss.h - - TESTS = test_sl - check_PROGRAMS = $(TESTS) - - # install these? - --bin_PROGRAMS = mk_cmds - noinst_PROGRAMS = slc - --mk_cmds_SOURCES = make_cmds.c make_cmds.h parse.y lex.l --mk_cmds_LDADD = libsl.la $(LDADD) -- - slc_SOURCES = slc-gram.y slc-lex.l slc.h - --ssincludedir = $(includedir)/ss --ssinclude_HEADERS = ss.h -- - CLEANFILES = lex.c parse.c parse.h snprintf.c strtok_r.c strdup.c strupr.c getprogname.c - --$(mk_cmds_OBJECTS): parse.h parse.c -- - LDADD = \ - libsl.la \ - $(LIB_roken) \ diff --git a/abs/core-testing/heimdal/012_all_heimdal-berkdb.patch b/abs/core-testing/heimdal/012_all_heimdal-berkdb.patch deleted file mode 100644 index 46762c2..0000000 --- a/abs/core-testing/heimdal/012_all_heimdal-berkdb.patch +++ /dev/null @@ -1,124 +0,0 @@ -Binary files heimdal-0.7-old/cf/.find-func-no-libs2.m4.swp and heimdal-0.7/cf/.find-func-no-libs2.m4.swp differ -Index: heimdal/cf/db.m4 -=================================================================== ---- heimdal.orig/cf/db.m4 -+++ heimdal/cf/db.m4 -@@ -18,24 +18,13 @@ db_type=unknown - - if test "$enable_berkeley_db" != no; then - -- AC_CHECK_HEADERS([ \ -- db4/db.h \ -- db3/db.h \ -- db.h \ -- db_185.h \ -- ]) -+ AC_CHECK_HEADERS([db.h]) - - dnl db_create is used by db3 and db4 - -- AC_FIND_FUNC_NO_LIBS(db_create, db4 db3 db, [ -+ AC_FIND_FUNC_NO_LIBS(db_create, db, [ - #include -- #ifdef HAVE_DB4_DB_H -- #include -- #elif defined(HAVE_DB3_DB_H) -- #include -- #else - #include -- #endif - ],[NULL, NULL, 0]) - - if test "$ac_cv_func_db_create" = "yes"; then -@@ -50,17 +39,9 @@ dnl db_create is used by db3 and db4 - - dnl dbopen is used by db1/db2 - -- AC_FIND_FUNC_NO_LIBS(dbopen, db2 db, [ -+ AC_FIND_FUNC_NO_LIBS(dbopen, db, [ - #include -- #if defined(HAVE_DB2_DB_H) -- #include -- #elif defined(HAVE_DB_185_H) -- #include -- #elif defined(HAVE_DB_H) - #include -- #else -- #error no db.h -- #endif - ],[NULL, 0, 0, 0, NULL]) - - if test "$ac_cv_func_dbopen" = "yes"; then -Index: heimdal/lib/hdb/db.c -=================================================================== ---- heimdal.orig/lib/hdb/db.c -+++ heimdal/lib/hdb/db.c -@@ -37,11 +37,7 @@ RCSID("$Id: db.c 20215 2007-02-09 21:59: - - #if HAVE_DB1 - --#if defined(HAVE_DB_185_H) --#include --#elif defined(HAVE_DB_H) - #include --#endif - - static krb5_error_code - DB_close(krb5_context context, HDB *db) -Index: heimdal/lib/hdb/db3.c -=================================================================== ---- heimdal.orig/lib/hdb/db3.c -+++ heimdal/lib/hdb/db3.c -@@ -37,13 +37,7 @@ RCSID("$Id: db3.c 21610 2007-07-17 07:10 - - #if HAVE_DB3 - --#ifdef HAVE_DB4_DB_H --#include --#elif defined(HAVE_DB3_DB_H) --#include --#else - #include --#endif - - static krb5_error_code - DB_close(krb5_context context, HDB *db) -Index: heimdal/lib/roken/getcap.c -=================================================================== ---- heimdal.orig/lib/roken/getcap.c -+++ heimdal/lib/roken/getcap.c -@@ -38,11 +38,13 @@ - #include "roken.h" - RCSID("$Id: getcap.c 16561 2006-01-13 14:25:32Z lha $"); - -+#if defined(HAVE_DBOPEN) && defined(HAVE_DB_H) -+#define USE_DB -+#endif -+ - #include - #include --#if defined(HAVE_DB_185_H) --#include --#elif defined(HAVE_DB_H) -+#ifdef USE_DB - #include - #endif - #include -Index: heimdal/lib/roken/ndbm_wrap.c -=================================================================== ---- heimdal.orig/lib/roken/ndbm_wrap.c -+++ heimdal/lib/roken/ndbm_wrap.c -@@ -37,13 +37,7 @@ RCSID("$Id: ndbm_wrap.c 21634 2007-07-17 - #endif - - #include "ndbm_wrap.h" --#if defined(HAVE_DB4_DB_H) --#include --#elif defined(HAVE_DB3_DB_H) --#include --#else - #include --#endif - - #include - #include diff --git a/abs/core-testing/heimdal/013_all_heimdal-pthread-lib.patch b/abs/core-testing/heimdal/013_all_heimdal-pthread-lib.patch deleted file mode 100644 index 19f8794..0000000 --- a/abs/core-testing/heimdal/013_all_heimdal-pthread-lib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- heimdal-0.7.1/cf/pthreads.m4.old 2005-09-09 12:12:28.000000000 +0000 -+++ heimdal-0.7.1/cf/pthreads.m4 2005-09-17 22:23:23.000000000 +0000 -@@ -32,7 +32,7 @@ - 2.*) - native_pthread_support=yes - PTHREADS_CFLAGS=-pthread -- PTHREADS_LIBS=-pthread -+ PTHREADS_LIBS=-lpthread - ;; - esac - ;; diff --git a/abs/core-testing/heimdal/014_all_heimdal-path.patch b/abs/core-testing/heimdal/014_all_heimdal-path.patch deleted file mode 100644 index 36a86f1..0000000 --- a/abs/core-testing/heimdal/014_all_heimdal-path.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- appl/rcp/rcp.c.old 2006-05-03 13:31:59.398493625 +0200 -+++ appl/rcp/rcp.c 2006-05-03 13:32:04.494485981 +0200 -@@ -34,7 +34,7 @@ - #include "rcp_locl.h" - #include - --#define RSH_PROGRAM "rsh" -+#define RSH_PROGRAM "krsh" - - struct passwd *pwd; - uid_t userid; ---- appl/rcp/rcp_locl.h.old 2006-05-03 02:30:31.602025409 +0200 -+++ appl/rcp/rcp_locl.h 2006-05-03 02:30:35.886018983 +0200 -@@ -64,4 +64,4 @@ - #define _PATH_CP "/bin/cp" - #endif - #undef _PATH_RSH --#define _PATH_RSH BINDIR "/rsh" -+#define _PATH_RSH BINDIR "/krsh" ---- appl/telnet/telnetd/telnetd.h.old 2006-05-03 02:23:14.582680939 +0200 -+++ appl/telnet/telnetd/telnetd.h 2006-05-03 02:23:23.746667193 +0200 -@@ -192,7 +192,7 @@ - #endif - - #undef _PATH_LOGIN --#define _PATH_LOGIN BINDIR "/login" -+#define _PATH_LOGIN BINDIR "/klogin" - - /* fallbacks */ - ---- appl/login/shadow.c.old 2006-05-05 06:31:29.517138115 +0200 -+++ appl/login/shadow.c 2006-05-05 06:32:26.433052741 +0200 -@@ -38,7 +38,7 @@ - #ifdef HAVE_SHADOW_H - - #ifndef _PATH_CHPASS --#define _PATH_CHPASS "/usr/bin/passwd" -+#define _PATH_CHPASS "/usr/bin/kpasswd" - #endif - - static int -@@ -52,7 +52,7 @@ - printf("fork /bin/passwd"); - exit(1); - case 0: -- execlp(_PATH_CHPASS, "passwd", who->pw_name, (char *) 0); -+ execlp(_PATH_CHPASS, "kpasswd", who->pw_name, (char *) 0); - exit(1); - default: - waitpid(pid, &status, 0); diff --git a/abs/core-testing/heimdal/PKGBUILD b/abs/core-testing/heimdal/PKGBUILD deleted file mode 100644 index 2074973..0000000 --- a/abs/core-testing/heimdal/PKGBUILD +++ /dev/null @@ -1,106 +0,0 @@ -# $Id: PKGBUILD 81228 2010-05-27 15:14:39Z allan $ -# Maintainer: Allan McRae -# Contributor: Jan de Groot - -# -### Attention: remove old pkg before building - it links against itself! ### -# - -pkgname=heimdal -pkgver=1.3.3 -pkgrel=1 -pkgdesc="Implementation of Kerberos V5 libraries" -arch=('i686' 'x86_64') -url="http://www.h5l.org/" -license=('custom') -depends=('db' 'openssl' 'sqlite3' 'e2fsprogs') -backup=(etc/krb5.conf) -options=('!libtool' '!emptydirs') -install=heimdal.install -source=(http://www.h5l.org/dist/src/${pkgname}-${pkgver}.tar.gz - 001_all_heimdal-no_libedit.patch - 002_all_heimal-fPIC.patch - 003_all_heimdal-rxapps.patch - 005_all_heimdal-suid_fix.patch - 012_all_heimdal-berkdb.patch - 013_all_heimdal-pthread-lib.patch - 014_all_heimdal-path.patch - heimdal-kdc.rc - kadmind.rc - kpasswd.rc) -md5sums=('963c09f1b14c41660be70b55fae9f163' - '98e28f11f906c967aac22d6184102c9e' - '6d5571bdedba2e2423b90bccdbac2c0a' - '2feec3924ee5230b54175b4d4000c872' - '45aeb207f360f9f4e9e0fabc8bfeecbc' - '56f5d10d0ec40f2fda82ef144ffac1e0' - '1b8665b771c4eb6b56ea8582c96e56e3' - '8208ae8c0b6ff5ab4f64af1693e9e396' - 'e59650992b9541a30dfce727a194f6e0' - '1f2f86a67bbfddb7af581d35fdca9627' - 'f8f1eca95b9d3f2b4ebf2417b71b81cf') - -build() { - cd ${srcdir}/heimdal-${pkgver} - patch -Np0 -i ${srcdir}/001_all_heimdal-no_libedit.patch || return 1 - patch -Np0 -i ${srcdir}/002_all_heimal-fPIC.patch || return 1 - patch -Np0 -i ${srcdir}/003_all_heimdal-rxapps.patch || return 1 - patch -Np0 -i ${srcdir}/005_all_heimdal-suid_fix.patch || return 1 - patch -Np1 -i ${srcdir}/012_all_heimdal-berkdb.patch || return 1 - patch -Np1 -i ${srcdir}/013_all_heimdal-pthread-lib.patch || return 1 - patch -Np0 -i ${srcdir}/014_all_heimdal-path.patch || return 1 - - sed -i -e 's|var/heimdal|var/lib/heimdal|g' configure.in \ - doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \ - lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5 - - libtoolize --force || return 1 - aclocal -I cf || return 1 - autoconf || return 1 - automake || return 1 - - ./configure --prefix=/usr --enable-shared=yes --without-x \ - --sysconfdir=/etc --mandir=/usr/share/man \ - --datadir=/var/lib/heimdal \ - --localstatedir=/var/lib/heimdal \ - --with-openssl=/usr \ - --with-readline-lib=/usr/lib \ - --with-readline-include=/usr/include/readline \ - --with-sqlite3-lib=/usr/lib \ - --with-sqlite3-include=/usr/include \ - --libexecdir=/usr/sbin - - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - - # Rename daemons and their manpages - for i in telnetd ftpd rshd; do - mv ${pkgdir}/usr/share/man/man8/{,k}${i}.8 || return 1 - mv ${pkgdir}/usr/sbin/{,k}${i} || return 1 - done - - # Rename clients and their manpages - for i in rcp rsh telnet ftp su login; do - if [ -f ${pkgdir}/usr/share/man/man1/${i}.1 ]; then - mv ${pkgdir}/usr/share/man/man1/{,k}${i}.1 || return 1 - fi - mv ${pkgdir}/usr/bin/{,k}${i} || return 1 - done - rm -rf ${pkgdir}/usr/share/man/cat{1,3,5,8} - - # Arch could be a KDC too - install -d ${pkgdir}/etc/rc.d - install -m644 ${srcdir}/heimdal-${pkgver}/krb5.conf ${pkgdir}/etc/ || return 1 - for i in heimdal-kdc kadmind kpasswd; do - install -m755 ${srcdir}/${i}.rc ${pkgdir}/etc/rc.d/${i} || return 1 - done - - # Remove conflicts - rm ${pkgdir}/usr/share/man/man5/ftpusers.5* # man-pages - rm ${pkgdir}/usr/share/man/man3/{DES,DH,EVP,OpenSSL,RAND,RSA}* # openssl (a bit overzealous...) - rm ${pkgdir}/usr/share/man/man3/os.3* # erlang - - # Install the license - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 -} diff --git a/abs/core-testing/heimdal/heimdal-kdc.rc b/abs/core-testing/heimdal/heimdal-kdc.rc deleted file mode 100644 index b2a3b5f..0000000 --- a/abs/core-testing/heimdal/heimdal-kdc.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/kdc` -case "$1" in - start) - stat_busy "Starting heimdal kdc" - if [ -z "$PID" ]; then - /usr/sbin/kdc --detach - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon heimdal-kdc - stat_done - fi - ;; - stop) - stat_busy "Stopping heimdal kdc" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon heimdal-kdc - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/abs/core-testing/heimdal/heimdal.install b/abs/core-testing/heimdal/heimdal.install deleted file mode 100644 index 499d216..0000000 --- a/abs/core-testing/heimdal/heimdal.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(heimdal hx509) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file.info.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.info.gz $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/core-testing/heimdal/kadmind.rc b/abs/core-testing/heimdal/kadmind.rc deleted file mode 100644 index 0f3b8c7..0000000 --- a/abs/core-testing/heimdal/kadmind.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/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 heimdal admin server" - 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 heimdal admin server" - [ ! -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 diff --git a/abs/core-testing/heimdal/kpasswd.rc b/abs/core-testing/heimdal/kpasswd.rc deleted file mode 100644 index 3697322..0000000 --- a/abs/core-testing/heimdal/kpasswd.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/kpasswdd` -case "$1" in - start) - stat_busy "Starting heimdal kpasswdd" - if [ -z "$PID" ]; then - /usr/sbin/kpasswdd & - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon kpasswd - stat_done - fi - ;; - stop) - stat_busy "Stopping heimdal kpasswdd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon kpasswd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/abs/core-testing/hwd/PKGBUILD b/abs/core-testing/hwd/PKGBUILD deleted file mode 100644 index 6073e2b..0000000 --- a/abs/core-testing/hwd/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 3106 2008-06-19 18:56:52Z damir $ -# Maintainer: damir -# Contributor: Markku (rasat at Arch Linux Forums) - -pkgname=hwd -pkgver=5.3.4 -pkgrel=1 -pkgdesc="Hardware detect for Arch Linux (devfs and udev)." -url="http://user-contributions.org/projects/hwd/hwd.html" -arch=('i686' 'x86_64') -license=('GPL') -depends=('bash' 'pciutils' 'usbutils' 'ddcxinfo-arch' 'wget') -install=hwd.install -source=(http://user-contributions.org/projects/hwd/src/$pkgname-$pkgver.bin.tar.gz) - - -build() { - cd $startdir/src/$pkgname-$pkgver - cp -R $startdir/src/$pkgname-$pkgver/{etc,usr} $startdir/pkg/ || return 1 -} - -md5sums=('002cfb6de516442203073084b6c1a7f9') diff --git a/abs/core-testing/hwd/hwd.install b/abs/core-testing/hwd/hwd.install deleted file mode 100644 index e4c28cb..0000000 --- a/abs/core-testing/hwd/hwd.install +++ /dev/null @@ -1,15 +0,0 @@ -# arg 1: the new package version -post_install() { - echo "==> Run 'hwd -u' to update xorgtable, pci-, and usb.ids." -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - echo "==> Run 'hwd -u' to update xorgtable, pci-, and usb.ids." -} - -# arg 1: the old package version -pre_remove() { - rm -R /etc/hwd >/dev/null 2>&1 -} diff --git a/abs/core-testing/hwdetect/PKGBUILD b/abs/core-testing/hwdetect/PKGBUILD deleted file mode 100644 index 14fd6a9..0000000 --- a/abs/core-testing/hwdetect/PKGBUILD +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Tobias Powalowski -pkgname=hwdetect -pkgver=0.9 -pkgrel=10 -pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support" -arch=(i686 x86_64) -license=('custom:none') -groups=('base') -backup=() -depends=('sh' 'awk' 'grep' 'coreutils' 'sed') -source=(hwdetect) -md5sums=('bae2a26062c1ae8036b3a2173c8e3b51') - -build() { - install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect -} - diff --git a/abs/core-testing/hwdetect/hwdetect b/abs/core-testing/hwdetect/hwdetect deleted file mode 100755 index 4991210..0000000 --- a/abs/core-testing/hwdetect/hwdetect +++ /dev/null @@ -1,482 +0,0 @@ -#! /bin/sh -# Autodetection script for scanning /sys for hardware -# for Archlinux by Tobias Powalowski -usage () { - echo "$0 [options]" - echo "" - echo " This is a tool that detects/lists modules that are exported by /sys" - echo "" - echo " Options:" - echo " --kernel_version= use kernel version (no autodetect)" - echo " --ide-legacy use old ide modules instead of pata" - echo " --load-modules load all detected modules" - echo " --unload-modules unload all detected modules" - echo " --show-modules show all detected modules" - echo " --show-modules-order shows load order of detected modules" - echo " --show-agp show AGP modules" - echo " --show-acpi show ACPI modules" - echo " --show-ide show IDE modules" - echo " --show-scsi show SCSI modules" - echo " --show-sata show SATA modules" - echo " --show-usb show USB modules" - echo " --show-fw show FIREWIRE modules" - echo " --show-net show NETWORK modules" - echo " --show-input show INPUT modules" - echo " --show-irda show IRDA modules" - echo " --show-isdn show ISDN modules" - echo " --show-pcmcia show PCMCIA modules" - echo " --show-sound show SOUND modules" - echo " --show-video show VIDEO modules" - echo " --show-other show OTHER modules" - echo "" - echo " For /etc/mkinitcpio.conf use:" - echo " --hostcontroller show MODULES= for all hostcontrollers" - echo " --vmware add BusLogic to MODULES for vmware" - echo "" - echo " --hooks show HOOKS=" - echo " --hooks-dir use this directory for HOOKS check" - echo " --dsdt add dsdt to HOOKS=" - echo " --raid add raid to HOOKS=" - echo " --raid-partitions add raid-partitions to HOOKS=" - echo " --encrypt add encrypt to HOOKS=" - echo " --lvm2 add lvm2 to HOOKS=" - echo " --keymap add keymap to HOOKS=" - echo " --usb add usb to HOOKS=" - echo " --fw add fw to HOOKS=" - echo " --pcmcia add pcmcia to HOOKS=" - echo " --nfs add net to HOOKS=" - echo "" - echo " For /etc/rc.conf use:" - echo " --net show network MODULES" - echo " --sound show sound MODULES" - echo " --modules show all detected MODULES" - echo "" - exit 1 -} - -[ "$1" = "" ] && usage -[ "$1" = "--help" ] && usage -[ "$1" = "-h" ] && usage - -# setting kernel version -case $1 in - --kernel_version=*) - KERNEL_VERSION="`echo $1 | awk -F= '{print $2;}'`" - ;; -esac - -if [ "$KERNEL_VERSION" = "" ]; then - KERNEL_VERSION="`uname -r`" -fi - -# IDE/PATA switch -[ "$(echo $* | grep '\-ide-legacy')" ] && IDE_LEGACY=1 - -# dsdt switch -[ "$(echo $* | grep '\-dsdt')" ] && DSDT=1 - -# raid switch -[ "$(echo $* | grep '\-raid-partition')" ] && RAID_PARTITIONS=1 -if ! [ "$RAID_PARTITIONS" = "1" ]; then - [ "$(echo $* | grep '\-raid')" ] && RAID=1 -fi - -# encrypt switch -[ "$(echo $* | grep '\-encrypt')" ] && ENCRYPT=1 - -# lvm2 switch -[ "$(echo $* | grep '\-lvm2')" ] && LVM2=1 - -# keymap switch -[ "$(echo $* | grep '\-keymap')" ] && KEYMAP=1 - -# usb switch -[ "$(echo $* | grep '\-usb')" ] && USB=1 - -# fw switch -[ "$(echo $* | grep '\-fw')" ] && FW=1 - -# pcmcia switch -[ "$(echo $* | grep '\-pcmcia')" ] && PCMCIA=1 - -# nfs switch -[ "$(echo $* | grep '\-nfs')" ] && NFS=1 - -# vmware switch -[ "$(echo $* | grep '\-vmware')" ] && VMWARE=1 - -# checking /sys -if ! [ -d /sys/ ]; then - echo "/sys/ is not present -- mount /sys first" >&2 - exit 1 -fi - -: >/tmp/modules-plain -: >/tmp/modules-stripped -: >/tmp/modules-sorted -: >/tmp/moduleslist - -# find pci aliases -aliases=`find /sys/ -noleaf -name modalias -exec cat {} +` - -# check for empty aliases -if [ "$aliases" = "" ]; then - echo "hwdetect aborted -- you need a kernel >= 2.6.12" >&2 - exit 1 -fi - -# generate files for the different actions -modprobe -a --set-version=$KERNEL_VERSION --show-depends $aliases >> /tmp/modules-plain 2>/dev/null - -# fix evdev detection -#if [ "`echo $aliases | grep 'serio:ty06pr*[id]*[ex]*'`" ]; then -# modprobe -i --set-version=$KERNEL_VERSION --show-depends evdev >> /tmp/modules-plain 2>/dev/null -#fi -# fix Intel536ep detection -#if [ "`echo $aliases | grep 'pci:v00008086d00001040sv000016BEsd00001040bc07sc80i00'`" ]; then -# modprobe -i --set-version=$KERNEL_VERSION --show-depends Intel536 >> /tmp/modules-plain 2>/dev/null -#fi - -# fix ide cdrom detection on proliant 1600 -if [ "`echo $aliases | grep 'pci:v00000E11d00000001sv00000000sd00000000bc06sc02i00'`" ]; then - modprobe -i --set-version=$KERNEL_VERSION --show-depends ide-generic >> /tmp/modules-plain 2>/dev/null -fi - -# find PNP devices like parports, soundcards etc. -# (workaround for rtc, pcspkr, irtty-sir and analog are included) -if [ "`find /sys/devices -noleaf -name 'id' | grep /pnp`" ]; then - for i in `find /sys/devices -noleaf -name "id" | grep /pnp`; do - devid=`cat $i | grep PNP` - [ "$devid" ] || continue - - modprobe -i --set-version=$KERNEL_VERSION --show-depends pnp:d${devid} >> /tmp/modules-plain 2>/dev/null - - [ "$devid" = "PNP0800" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends pcspkr 2>/dev/null >> /tmp/modules-plain 2>/dev/null - #[ "$devid" = "PNP0b00" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends rtc >> /tmp/modules-plain 2>/dev/null - [ "$devid" = "PNP0b00" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends rtc_proc 2>/dev/null >> /tmp/modules-plain 2>/dev/null - [ "$devid" = "PNP0b00" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends rtc_sysfs 2>/dev/null >> /tmp/modules-plain - [ "$devid" = "PNP0b00" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends rtc_dev 2>/dev/null >> /tmp/modules-plain - [ "$devid" = "PNP0510" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends irtty-sir 2>/dev/null >> /tmp/modules-plain 2>/dev/null - [ "$devid" = "PNP0511" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends irtty-sir 2>/dev/null >> /tmp/modules-plain 2>/dev/null - [ "$devid" = "PNPb02f" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends analog 2>/dev/null >> /tmp/modules-plain 2>/dev/null - - # load ppp-generic if serial ports are detected for modems - [ "$devid" = "PNP0501" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends ppp-generic 2>/dev/null >> /tmp/modules-plain 2>/dev/null - done -fi - -# IDE disks/cdroms/floppy/tape -#if [ "`find /proc/ide -noleaf -name 'media'`" ]; then -# for i in $(cat `find /proc/ide -noleaf -name "media"`); do -# case $i in -# cdrom) modprobe -i --set-version=$KERNEL_VERSION --show-depends ide-cd >> /tmp/modules-plain 2>/dev/null ;; -# floppy) modprobe -i --set-version=$KERNEL_VERSION --show-depends ide-floppy >> /tmp/modules-plain 2>/dev/null ;; -# disk) modprobe -i --set-version=$KERNEL_VERSION --show-depends ide-disk >> /tmp/modules-plain 2>/dev/null ;; -# tape) modprobe -i --set-version=$KERNEL_VERSION --show-depends ide-tape >> /tmp/modules-plain 2>/dev/null ;; -# esac -# done -#fi - -# SCSI disks/cdroms/tapes/generic devices -if [ "`find /sys/devices -noleaf -name 'type'`" ]; then - for i in $(cat `find /sys/devices -noleaf -name "type"`); do - case $i in (4|5) modprobe -i --set-version=$KERNEL_VERSION --show-depends sr-mod >> /tmp/modules-plain 2>/dev/null ;; esac - case $i in (2|3|6|8|9) modprobe -i --set-version=$KERNEL_VERSION --show-depends sg >> /tmp/modules-plain 2>/dev/null ;; esac - case $i in (0|7|14) modprobe -i --set-version=$KERNEL_VERSION --show-depends sd-mod >> /tmp/modules-plain 2>/dev/null ;; esac - case $i in (1) modprobe -i --set-version=$KERNEL_VERSION --show-depends st >> /tmp/modules-plain 2>/dev/null ;; esac - done -fi - -# add Buslogic for vmware -if [ "$VMWARE" = "1" ]; then - modprobe -i --set-version=$KERNEL_VERSION --show-depends BusLogic >> /tmp/modules-plain 2>/dev/null -fi - -# Firewire disks/cdroms/network -#if [ "`grep 'ohci1394' /tmp/modules-plain`" ]; then -# modprobe -i --set-version=$KERNEL_VERSION --show-depends sbp2 >> /tmp/modules-plain 2>/dev/null -# modprobe -i --set-version=$KERNEL_VERSION --show-depends eth1394 >> /tmp/modules-plain 2>/dev/null -#fi - -# Modem devices -#case $i in (Intel536|Intel537|ltmodem|ltserial|slamr|slusb) \ -# grep "$i" /tmp/modules-plain && modprobe -i --set-version=$KERNEL_VERSION --show-depends ppp-generic >> /tmp/modules-plain 2>/dev/null ;; \ -# esac - -# Parport modules -if [ "`grep 'parport' /tmp/modules-plain`" ]; then - modprobe -i --set-version=$KERNEL_VERSION --show-depends lp >> /tmp/modules-plain 2>/dev/null - modprobe -i --set-version=$KERNEL_VERSION --show-depends ppdev >> /tmp/modules-plain 2>/dev/null -fi - -# Sound OSS compat modules -if [ "`grep 'snd-pcm' /tmp/modules-plain`" ]; then - modprobe -i --set-version=$KERNEL_VERSION --show-depends snd-pcm-oss >> /tmp/modules-plain 2>/dev/null -fi -if [ "`grep 'snd-seq' /tmp/modules-plain`" ]; then - modprobe -i --set-version=$KERNEL_VERSION --show-depends snd-seq-oss >> /tmp/modules-plain 2>/dev/null -fi - -# USB modules -#if [ "`grep 'usb/' /tmp/modules-plain`" ]; then -# modprobe -i --set-version=$KERNEL_VERSION --show-depends usbhid >> /tmp/modules-plain 2>/dev/null -# modprobe -i --set-version=$KERNEL_VERSION --show-depends usb-storage >> /tmp/modules-plain 2>/dev/null -# modprobe -i --set-version=$KERNEL_VERSION --show-depends usblp >> /tmp/modules-plain 2>/dev/null -#fi - -sort -u /tmp/modules-plain >> /tmp/modules-stripped - -# OTHER modules loading first for speed up! -grep -v "ide/" /tmp/modules-stripped | grep -v "scsi/" | grep -v "fusion/" | grep -v "block/sx8" | grep -v "message/fusion" | \ - grep -v "block/cciss" | grep -v "block/cpqarray" | grep -v "block/DAC960" | grep -v "ata/" | \ - grep -v "net/" | grep -v "pcmcia/" | grep -v "usb/" | \ - grep -v "ieee1394/" >> /tmp/modules-sorted -# make a correct order for the modules, internal devices have priority! -# only use old ide modules if boot parameter 'ide-legacy' is given -if [ "$IDE_LEGACY" = "1" ]; then - grep "ide/" /tmp/modules-stripped >> /tmp/modules-sorted -else - grep "ata/pata" /tmp/modules-stripped >> /tmp/modules-sorted - grep "ata/ata_generic" /tmp/modules-stripped >> /tmp/modules-sorted -fi -grep "scsi/" /tmp/modules-stripped | grep -v "sd_mod" | grep -v "sr_mod" | grep -v "/sg.ko" | grep -v "/st.ko" >> /tmp/modules-sorted -grep "block/" /tmp/modules-stripped | grep -v "sx8" | grep -v "nbd" | grep -v "pktcdvd" | grep -v "floppy" >> /tmp/modules-sorted -grep "fusion/" /tmp/modules-stripped >> /tmp/modules-sorted -grep "ata/" /tmp/modules-stripped| grep -v "pata" | grep -v "ata_generic" | grep -v "libata" >> /tmp/modules-sorted -grep "block/" /tmp/modules-stripped | grep "sx8" >> /tmp/modules-sorted -grep "net/" /tmp/modules-stripped | grep -v "wireless/" | grep -v "usb/" >> /tmp/modules-sorted -grep "wireless/" /tmp/modules-stripped >> /tmp/modules-sorted -grep "pcmcia/" /tmp/modules-stripped >> /tmp/modules-sorted - -# speed up usb module loading -grep "usb-storage" /tmp/modules-stripped >> /tmp/modules-sorted -grep "usblp" /tmp/modules-stripped >> /tmp/modules-sorted -grep "usbhid" /tmp/modules-stripped >> /tmp/modules-sorted -grep "usb/" /tmp/modules-stripped | grep -v "usb-storage" | grep -v "usbhid" | grep -v "usblp" >> /tmp/modules-sorted -grep "firewire/" /tmp/modules-stripped >> /tmp/modules-sorted -grep "ieee1394/" /tmp/modules-stripped >> /tmp/modules-sorted - -# add scsi device modules at the end -grep "sd_mod" /tmp/modules-stripped >> /tmp/modules-sorted -grep "sr_mod" /tmp/modules-stripped >> /tmp/modules-sorted -grep "/st.ko" /tmp/modules-stripped >> /tmp/modules-sorted -grep "/sg.ko" /tmp/modules-stripped >> /tmp/modules-sorted - - -sed -ne "s#^insmod.*/\(.*\)\.ko.*#\1#p" /tmp/modules-sorted >> /tmp/moduleslist - -# blacklist framebuffer modules -for x in $(echo /lib/modules/$(uname -r)/kernel/drivers/video/*/*fb*); do - BLACKLIST="$BLACKLIST $(/usr/bin/basename $x .ko)" -done -for x in $(echo /lib/modules/$(uname -r)/kernel/drivers/video/*fb*); do - BLACKLIST="$BLACKLIST $(/usr/bin/basename $x .ko)" -done -# delete modules that are blacklisted -BLACKLIST="${BLACKLIST} $(echo ${disablemodules} | sed 's|-|_|g' | sed 's|,| |g')" -for i in $BLACKLIST; do - [ "$i" ] || continue - sed -i -e "/^$i$/d" /tmp/moduleslist - # since '-' and '_' are interchangeable, we have to cover both - if [ "`echo $i | grep '-'`" ]; then - i="`echo $i | sed 's|-|_|g'`" - sed -i -e "/^$i$/d" /tmp/moduleslist - elif [ "`echo $i | grep '_'`" ]; then - i="`echo $i | sed 's|_|-|g'`" - sed -i -e "/^$i$/d" /tmp/moduleslist - fi -done - -listmods() { - key=$1 ; shift - ex= - while [ "$1" ]; do - [ "$ex" ] && ex="$ex|$1" || ex="$1" - shift - done - for ln in `grep "$key" /tmp/modules-sorted | sed 's|^insmod ||g'`; do - if [ "$ex" ]; then - echo $ln | egrep -v "$ex" | sed -ne "s#^/.*/\(.*\)\.ko.*#\1#p" - else - echo $ln | sed -ne "s#^/.*/\(.*\)\.ko.*#\1#p" - fi - done -} -showlist() { - cat=$1 ; shift - [ $# -gt 0 ] || return - echo -n "$cat: " - for i in $*; do echo -n "$i "; done - echo "" -} - -showlist2() { - cat=$1 ; shift - [ $# -gt 0 ] || return - echo -n "$cat=" - for i in $*; do echo -n "$i "; done - echo "" -} - -showlist3() { - cat=$1 ; shift - [ $# -gt 0 ] || return - for i in $*; do echo -n "$i "; done - echo "" -} - -# starting different actions -while [ $# -gt 0 ]; do - case $1 in - -hooks-dir=*|--hooks-dir=*) - HOOKS_DIR="$(echo $1 | awk -F= '{print $2;}')" - ;; - --load-modules) - # load all detected pci modules - for i in `cat /tmp/moduleslist`; do - modprobe $i > /dev/null 2>&1 - done - ;; - - --unload-modules) - # load all detected pci modules - for i in `cat /tmp/moduleslist`; do - modprobe -r $i > /dev/null 2>&1 - done - ;; - - --show-modules) - showlist "AGP " `listmods agp/` - showlist "ACPI " `listmods acpi/` - showlist "IDE " `listmods ide/` - showlist "PATA " `listmods ata/pata` `listmods ata/ata_generic` - showlist "SCSI " `listmods scsi/` `listmods message/fusion/` `listmods drivers/block/ nbd pktcdvd sx8 floppy` - showlist "SATA " `listmods ata/ pata ata_generic` `listmods drivers/block/sx8` - showlist "USB " `listmods usb/ usb/input` - showlist "FW " `listmods firewire/` `listmods ieee1394/` - showlist "NET " `listmods net/ irda/` - showlist "INPUT " `listmods input/` `listmods hid/` - showlist "IRDA " `listmods irda/` - showlist "ISDN " `listmods isdn/` - showlist "PCMCIA " `listmods pcmcia/` - showlist "SOUND " `listmods sound/` - showlist "VIDEO " `listmods video/` - showlist "OTHER " `listmods modules/ agp/ acpi/ ide/ scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 ata/ usb/ ieee1394 net/ isdn/ input/ irda/ pcmcia/ sound/ video/ firewire/ hid/` - ;; - - --show-modules-order) - showlist "MODULES ORDER" `listmods modules/` - ;; - - --show-agp) showlist "AGP " `listmods agp/` ;; - --show-acpi) showlist "ACPI " `listmods acpi/` ;; - --show-ide) showlist "IDE " `listmods ide/` ;; - --show-pata) showlist "PATA " `listmods ata/pata` `listmods ata/ata_generic`;; - --show-scsi) showlist "SCSI " `listmods scsi/` `listmods message/fusion/` `listmods drivers/block/ nbd pktcdvd sx8 floppy`;; - --show-sata) showlist "SATA " `listmods ata/ pata ata_generic` `listmods drivers/block/sx8` ;; - --show-usb) showlist "USB " `listmods usb/ usb/input` ;; - --show-fw) showlist "FW " `listmods firewire/` `listmods ieee1394/` ;; - --show-net) showlist "NET " `listmods net/ irda/` ;; - --show-input) showlist "INPUT " `listmods input/` `listmods hid/` ;; - --show-irda) showlist "IRDA " `listmods irda/` ;; - --show-isdn) showlist "ISDN " `listmods isdn/` ;; - --show-pcmcia) showlist "PCMCIA " `listmods pcmcia/` ;; - --show-sound) showlist "SOUND " `listmods sound/` ;; - --show-video) showlist "VIDEO " `listmods video/` ;; - --show-other) showlist "OTHER " `listmods .ko agp/ acpi/ ide/ scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 ata/ usb/ ieee1394 net/ isdn/ input/ irda/ pcmcia/ sound/ video/ firewire/ hid/` ;; - --hostcontroller) showlist2 "MODULES" \"`listmods ide/pci` `listmods ata/pata` `listmods ata/ata_generic` `listmods scsi/ /sg.ko /st.ko sr_mod sd_mod` `listmods message/fusion/` `listmods drivers/block/ nbd pktcdvd sx8 floppy` `listmods ata/ pata ata_generic` `listmods drivers/block/sx8`\" | sed -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g' - ;; - --net) if [ "$(showlist2 "MODULES" \(`listmods drivers/net/ irda ppp_generic slhc` `listmods drivers/usb/net/`\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g' | grep '8139cp')" ] ; then - if [ "$(dmesg | grep '"8139too"')" ]; then - MODULES_EXPORTED="$MODULES_EXPORTED $(listmods drivers/net/ irda ppp_generic slhc` `listmods drivers/usb/net/)" - showlist2 "MODULES" \($MODULES_EXPORTED\) | sed -e 's/8139cp//g' -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g' - else - MODULES_EXPORTED="$MODULES_EXPORTED $(listmods drivers/net/ irda ppp_generic slhc` `listmods drivers/usb/net/)" - showlist2 "MODULES" \($MODULES_EXPORTED\) | sed -e 's/8139too//g' -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g' - fi - else - MODULES_EXPORTED="$MODULES_EXPORTED $(listmods drivers/net/ irda ppp_generic slhc` `listmods drivers/usb/net/)" - showlist2 "MODULES" \($MODULES_EXPORTED\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g' - fi - ;; - --sound) MODULES_EXPORTED="$MODULES_EXPORTED $(listmods sound/)" - showlist2 "MODULES" \($MODULES_EXPORTED\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g' - ;; - --modules) showlist2 "MODULES" \(`listmods modules/`\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g' - ;; - --hooks) - if [ "$HOOKS_DIR" = "" ]; then - HOOKS_DIR="/lib/initcpio/install" - fi - START_HOOKS="base udev dsdt autodetect ide pata scsi sata usb fw pcmcia net raid raid-partitions usbinput keymap encrypt lvm2 filesystems" - # remove the ones that don't exist on the system - for i in ${START_HOOKS}; do - if ! [ -e "${HOOKS_DIR}/$i" ]; then - START_HOOKS=$(echo $START_HOOKS | sed -e "s/${i}\ //g") - fi - done - # ide/pata check - if [ "${IDE_LEGACY}" = "1" ]; then - START_HOOKS=$(echo $START_HOOKS | sed -e "s/pata//g") - else - START_HOOKS=$(echo $START_HOOKS | sed -e "s/ide//g") - fi - # usbinput, check for usbhid - if ! [ "$(cat /proc/modules | grep usbhid)" ]; then - START_HOOKS=$(echo $START_HOOKS | sed -e "s/usbinput//g") - fi - # keymap, check rc.conf for KEYMAP="us" - if [ "$(grep '^KEYMAP="us"' /etc/rc.conf)" ]; then - if ! [ "${KEYMAP}" = "1" ]; then - START_HOOKS=$(echo $START_HOOKS | sed -e "s/keymap//g") - fi - fi - ### TODO raid, check for presence of md devices in /dev - #if ! [ "$(ls /dev/md* > /dev/null 2>&1 )" ]; then - # START_HOOKS=$(echo $START_HOOKS | sed -e "s/raid//g") - #fi - if ! [ "$RAID" = "1" ] ; then - START_HOOKS=$(echo $START_HOOKS | sed -e "s/raid\ //g") - fi - if ! [ "$RAID_PARTITIONS" = "1" ] ; then - START_HOOKS=$(echo $START_HOOKS | sed -e "s/raid-partitions\ //g") - fi - ### TODO lvm2, encrypt check - # encrypt, check for presence of mapper/root - #if ! [ "$(ls /dev/mapper/root > /dev/null 2>&1 )" ]; then - # START_HOOKS=$(echo $START_HOOKS | sed -e "s/encrypt//g") - #fi - if ! [ "$ENCRYPT" = "1" ] ; then - START_HOOKS=$(echo $START_HOOKS | sed -e "s/encrypt//g") - fi - if ! [ "$LVM2" = "1" ]; then - START_HOOKS=$(echo $START_HOOKS | sed -e "s/lvm2//g") - fi - if ! [ "$USB" = "1" ]; then - START_HOOKS=$(echo $START_HOOKS | sed -e "s/usb\ //g") - fi - if ! [ "$FW" = "1" ]; then - START_HOOKS=$(echo $START_HOOKS | sed -e "s/fw//g") - fi - if ! [ "$PCMCIA" = "1" ]; then - START_HOOKS=$(echo $START_HOOKS | sed -e "s/pcmcia//g") - fi - if ! [ "$NFS" = "1" ]; then - START_HOOKS=$(echo $START_HOOKS | sed -e "s/net//g") - fi - if ! [ "$DSDT" = "1" ]; then - START_HOOKS=$(echo $START_HOOKS | sed -e "s/dsdt//g") - fi - echo "HOOKS=\"$START_HOOKS\"" | sed -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g' - ;; - esac - shift -done - -# cleanup -rm /tmp/modules-plain -rm /tmp/modules-sorted -rm /tmp/modules-stripped -rm /tmp/moduleslist - -# vim: set ts=2 sw=2 noet: diff --git a/abs/core-testing/iana-etc/Makefile.patch b/abs/core-testing/iana-etc/Makefile.patch deleted file mode 100644 index b25bc26..0000000 --- a/abs/core-testing/iana-etc/Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.old 2010-07-23 04:16:11.000000000 -0300 -+++ Makefile 2010-07-23 04:16:11.000000000 -0300 -@@ -42,7 +42,7 @@ - protocol-numbers.iana port-numbers.iana - - protocol-numbers.iana: -- $(AWK) -f get.gawk -v file=protocol-numbers >protocol-numbers.iana -+ $(AWK) -f get.gawk -v file=protocol-numbers/protocol-numbers.txt >protocol-numbers.iana - rm -f protocol-numbers - - port-numbers.iana: diff --git a/abs/core-testing/iana-etc/PKGBUILD b/abs/core-testing/iana-etc/PKGBUILD deleted file mode 100644 index 1c528a6..0000000 --- a/abs/core-testing/iana-etc/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 86037 2010-07-23 23:13:34Z thomas $ -# Maintainer: Thomas Bächler -pkgname=iana-etc -pkgver=2.30 -pkgrel=1 -pkgdesc="/etc/protocols and /etc/services provided by IANA" -arch=('any') -url="http://sethwklein.net/iana-etc" -license=('custom') -makedepends=('awk') -source=(http://sethwklein.net/$pkgname-$pkgver.tar.bz2 - Makefile.patch) -sha256sums=('b9a6874fb20012836efef75452ef2acae624022d680feeb1994d73facba3f20d' - '3e6db7adb8a67b765b8be65825f2a0e6c525eb42367385193c678af6b75d0321') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -p0 -i "$srcdir/Makefile.patch" - make get - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - install -D -m644 COPYING "$pkgdir/usr/share/licenses/iana-etc/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/core-testing/iguanair/PKGBUILD b/abs/core-testing/iguanair/PKGBUILD deleted file mode 100755 index 18a02a6..0000000 --- a/abs/core-testing/iguanair/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -pkgname=iguanaIR -#pkgver=0.8.0.20061009 -pkgver=0.99 -pkgrel=3 -# leaving kernver dynamic ensures compatibility with srcpac -_kernver=2.6.28-LinHES -pkgdesc="Linux Infrared Remote Control usb from iguanaworks" -arch=(i686 x86_64) -depends=('swig' ) -source=(http://iguanaworks.net/downloads/iguanaIR-0.99.tar.bz2) -url="http://iguanaworks.net" -#install=$pkgname.install - - -build() { - # configure - cd $startdir/src/$pkgname-$pkgver || return 1 - ./configure - make || return 1 - make PREFIX=$startdir/pkg/usr DESTDIR=$startdir/pkg install || return 1 - mkdir $startdir/pkg/usr/bin/ - ls -la ig* - #cp -f igclient $startdir/pkg/usr/bin/ - #cp -f igd* $startdir/pkg/usr/bin/ -} diff --git a/abs/core-testing/ilmbase/PKGBUILD b/abs/core-testing/ilmbase/PKGBUILD deleted file mode 100644 index b8930a5..0000000 --- a/abs/core-testing/ilmbase/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Tobias Powalowski - -pkgname=ilmbase -pkgver=1.0.1 -pkgrel=1 -depends=('gcc-libs') -pkgdesc="IlmThread is a thread abstraction library for use with OpenEXR" -arch=(i686 x86_64) -license=('custom') -options=('!libtool') -source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz) -url="http://www.openexr.org" -md5sums=('f76f094e69a6079b0beb93d97e2a217e') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install - install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING -} diff --git a/abs/core-testing/imagemagick/PKGBUILD b/abs/core-testing/imagemagick/PKGBUILD deleted file mode 100644 index 2a797c7..0000000 --- a/abs/core-testing/imagemagick/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 90849 2010-09-18 00:00:00Z eric $ -# Contributor: Eric Belanger -# Maintainer: DAniel J Griffiths - -pkgname=imagemagick -pkgver=6.6.4.3 -pkgrel=1 -pkgdesc="An image viewing/manipulation program" -arch=('i686' 'x86_64') -url="http://www.imagemagick.org/" -license=('custom') -depends=('libtool' 'lcms' 'libxt' 'gcc-libs' 'bzip2' 'freetype2' 'fontconfig' 'libxext') -makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper') -optdepends=('ghostscript: for Ghostscript support' - 'openexr: for OpenEXR support' - 'libwmf: for WMF support' - 'librsvg: for SVG support' - 'libxml2: for XML support' - 'jasper: for JPEG-2000 support') -options=('!makeflags' '!docs' 'force') -source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ - libpng_mmx_patch_x86_64.patch - perlmagick.rpath.patch) -md5sums=('be87050ec143205326f2e9fbbc7da03a' '069980fc2590c02aed86420996259302'\ - 'ff9974decbfe9846f8e347239d87e4eb') -sha1sums=('9f6c800560998b6a5e96b1a62d2b13140de9d1d7' 'e42f3acbe85b6098af75c5cecc9a254baaa0482c'\ - '23405f80904b1de94ebd7bd6fe2a332471b8c283') - -build() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - - if [ "${CARCH}" = 'x86_64' ]; then - patch -Np1 < ../libpng_mmx_patch_x86_64.patch - fi - - patch -p0 < ../perlmagick.rpath.patch - - ./configure --prefix=/usr --with-modules --disable-static \ - --enable-openmp --with-x --with-wmf --with-openexr --with-xml \ - --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ - --with-perl --with-perl-options="INSTALLDIRS=vendor" \ - --without-gvc --without-djvu --without-autotrace --with-jp2 \ - --without-jbig --without-fpx --without-dps - make -} - -package() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - - make DESTDIR="${pkgdir}" install - - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE" - - #Cleaning - find "${pkgdir}" -name '*.bs' -exec rm {} \; - rm -f "${pkgdir}"/usr/lib/*.la -} diff --git a/abs/core-testing/imagemagick/libpng_mmx_patch_x86_64.patch b/abs/core-testing/imagemagick/libpng_mmx_patch_x86_64.patch deleted file mode 100644 index d86449a..0000000 --- a/abs/core-testing/imagemagick/libpng_mmx_patch_x86_64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ImageMagick-6.2.7.orig/coders/png.c ImageMagick-6.2.7/coders/png.c ---- ImageMagick-6.2.7.orig/coders/png.c 2006-05-21 12:35:55.784852536 +0200 -+++ ImageMagick-6.2.7/coders/png.c 2006-05-21 12:36:50.698504392 +0200 -@@ -164,6 +164,8 @@ - #define PNG_MAX_UINT (png_uint_32) 0x7fffffffL - #endif - -+#undef PNG_ASSEMBLER_CODE_SUPPORTED -+ - /* - Constant strings for known chunk types. If you need to add a chunk, - add a string holding the name here. To make the code more diff --git a/abs/core-testing/imagemagick/perlmagick.rpath.patch b/abs/core-testing/imagemagick/perlmagick.rpath.patch deleted file mode 100644 index 958c0f2..0000000 --- a/abs/core-testing/imagemagick/perlmagick.rpath.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2009-05-26 16:22:11.000000000 -0300 -+++ Makefile.in 2009-05-26 16:23:27.000000000 -0300 -@@ -10067,6 +10067,7 @@ - - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER) - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) -+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile - - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE) - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install diff --git a/abs/core-testing/imake/PKGBUILD b/abs/core-testing/imake/PKGBUILD deleted file mode 100644 index ba2dc4c..0000000 --- a/abs/core-testing/imake/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Alexander Baldeck -# Contributor: Jan de Groot -pkgname=imake -pkgver=1.0.2 -pkgrel=3 -force=y -pkgdesc="X.Org imake program and related utilities" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -depends=(glibc) -makedepends=(pkgconfig xproto perl) -source=(http://xorg.freedesktop.org/releases/individual/util/imake-1.0.2.tar.bz2 - http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2 - http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.1.tar.bz2 - http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.1.tar.bz2 - http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.2.tar.bz2 - linuxconfig.patch) - -build() { - cd ${startdir}/src/xorg-cf-files-* - patch -Np1 -i ${startdir}/src/linuxconfig.patch || return 1 - cd ${startdir}/src - for i in *; do - if [ -d "${i}" ]; then - pushd "${i}" - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 - popd - fi - done -} -md5sums=('02fea5a02ba2857c7d81820c8e8b8e6f' - 'b533c0771dbbaf9b041ff35bb941d3a2' - 'e274ea9f55dfd62afa0a7b1e1ab4ba96' - '54ab2549d723e51ff2b9cff4d8bf44d1' - '5f62dd5545b782c74f6e4e70d0e6552c' - '1b1d7653ac95d4b479784afcd61a889f') diff --git a/abs/core-testing/imake/linuxconfig.patch b/abs/core-testing/imake/linuxconfig.patch deleted file mode 100644 index 8e1c5a0..0000000 --- a/abs/core-testing/imake/linuxconfig.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- xorg-cf-files-1.0.1/linux.cf.orig 2006-03-04 18:40:43.000000000 +0000 -+++ xorg-cf-files-1.0.1/linux.cf 2006-03-04 18:41:48.000000000 +0000 -@@ -193,6 +193,13 @@ - #define FSUseSyslog YES - #endif - -+#define FSUseSyslog YES -+#define BuildRman NO -+#define BuildHtmlManPages NO -+#define ProjectRoot /usr -+#define ManPath /usr/man -+#define XappLoadDir /usr/share/X11/app-defaults -+ - #ifndef HasDevRandom - # define HasDevRandom YES - # ifndef RandomDeviceName ---- xorg-cf-files-1.0.2/X11.tmpl.orig 2006-07-15 10:45:23.000000000 +0000 -+++ xorg-cf-files-1.0.2/X11.tmpl 2006-07-15 10:46:19.000000000 +0000 -@@ -1502,10 +1502,10 @@ - #define DocPdfDir $(DOCDIR)/PDF - #endif - #ifndef FontDir --#define FontDir $(LIBDIR)/fonts -+#define FontDir /usr/share/fonts - #endif - #ifndef FontEncDir --#define FontEncDir $(LIBDIR)/fonts/encodings -+#define FontEncDir /usr/share/fonts/encodings - #endif - #ifndef AdmDir - #define AdmDir /usr/adm diff --git a/abs/core-testing/imlib2/PKGBUILD b/abs/core-testing/imlib2/PKGBUILD deleted file mode 100644 index 0307519..0000000 --- a/abs/core-testing/imlib2/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 79752 2010-05-06 13:39:04Z ronald $ -# Maintainer: Ronald van Haren -# Contributor: Arjan Timmerman -# Contributor: Tom Newsom - -pkgname=imlib2 -pkgver=1.4.4 -pkgrel=1 -pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" -url="http://sourceforge.net/projects/enlightenment/" -arch=('i686' 'x86_64') -license=('BSD') -depends=('libtiff>=3.9.2-2' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng>=1.4.0' 'libid3tag' 'libjpeg>=8') -options=('!libtool') -source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2") -sha1sums=('aca2cf5d40ddcd8a3acfde605f319fccce7c2a2b') - -build() { - cd $srcdir/$pkgname-$pkgver - - # disable optimizations, they cause problems (e.g. FS#12268) - [ $CARCH = "i686" ] && EXTRAOPTS="--disable-mmx" - [ $CARCH = "x86_64" ] && EXTRAOPTS="--disable-amd64" - - # Configure and Build - ./configure --prefix=/usr \ - --sysconfdir=/etc/imlib2 \ - --x-libraries=/usr/lib $EXTRAOPTS || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 - - # Install License - install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING -} diff --git a/abs/core-testing/initscripts/ChangeLog b/abs/core-testing/initscripts/ChangeLog deleted file mode 100644 index a8c7a23..0000000 --- a/abs/core-testing/initscripts/ChangeLog +++ /dev/null @@ -1,2194 +0,0 @@ -commit 2c5e306be0bcc8d91662176bfcfb55ec95777bc3 -Author: Aaron Griffin -Date: Wed Jan 21 13:10:34 2009 -0800 - - Adjust copyright year to 2009 - - Signed-off-by: Aaron Griffin - -commit ad81ddafabd95ee1ea7169880a6a80f04babf9a6 -Author: Aaron Griffin -Date: Tue Dec 23 14:45:30 2008 -0800 - - Add some simple status display functions - - This is useful for displaying daemon status in functions - like /etc/rc.d/$DAEMON status - - Signed-off-by: Aaron Griffin - -commit fa4f2f14870500eeab3233da07647a7c2c5e1648 -Author: Aaron Griffin -Date: Tue Dec 23 14:43:51 2008 -0800 - - Adjust minilogd's maximums - - A max of 200000 lines stored, at 8K per line, was a little - ridiculous and soaked up way to much memory if a syslogger - was not started. Drop the max to 10000 so that we don't kill - the user's system. - - Signed-off-by: Aaron Griffin - -commit 0e4ff39e5a5c72b7d4e8d251d029d4342f68b7b6 -Author: Aaron Griffin -Date: Tue Dec 23 14:41:09 2008 -0800 - - chmod /var/run/utmp to 664 when creating - - This allows X terminals to write to /var/run/utmp - so that they are reported properly to commands like - who and w - - Signed-off-by: Aaron Griffin - -commit af3ac0dc954d96855555aa8cb12633494d465a77 -Author: Aaron Griffin -Date: Thu Dec 4 09:40:14 2008 -0800 - - unset the TZ envvar in 'functions' - - This prevents a local TZ variable from breaking - daemon's when started by root. Daemon's should always - respect the system's /etc/localtime - - Signed-off-by: Aaron Griffin - -commit 9ac428a113d5dee2b4d5469fdfdb383eda90d4c6 -Author: Aaron Griffin -Date: Mon Nov 24 07:50:45 2008 -0800 - - Switch commented kdm path - - Signed-off-by: Aaron Griffin - -commit 572019c5a188d22a1e833c1a27081227a65133f9 -Author: Roman Kyrylych -Date: Thu Sep 25 00:33:32 2008 -0500 - - Added missing slash - - Signed-off-by: Roman Kyrylych - Signed-off-by: Aaron Griffin - -commit af5516dc690a3b2fab88188cfcde898ca0efbf4b -Author: Thomas Bächler -Date: Thu Sep 18 22:21:39 2008 +0200 - - Fix bug #11229 - -commit 8f1628613cc5746b7c85c6f84776b365833f1dad -Author: Thomas Bächler -Date: Thu Sep 18 18:55:14 2008 +0200 - - Respawn udev properly when running 'init s'. Fixes #9739 - -commit ce600eea3b9383f167cb91d784aff04821fa0528 -Author: Thomas Bächler -Date: Sun Sep 14 19:46:14 2008 +0200 - - Remove references to start_udev from rc.sysinit - -commit d399979d08be1ae2cc8e4ab60a68c57b120d08a0 -Author: Thomas Bächler -Date: Sun Sep 14 19:41:14 2008 +0200 - - Revert "Create udev required device nodes if missing" - - This reverts commit 119b8df1fb1258231750309f01e747e72f382493. - These nodes are created like 10 lines above, the [ -f ... ] check would always return false anyway (-f == regular file) - -commit 119b8df1fb1258231750309f01e747e72f382493 -Author: Aaron Griffin -Date: Sat Aug 30 21:11:39 2008 -0500 - - Create udev required device nodes if missing - - Udev requires /dev/console, /dev/null, and /dev/zero to exist - before running. Create these on init if they're missing - - Signed-off-by: Aaron Griffin - -commit d2ae38c8b06d057c7593b7ba836bf24a1f8f6c4f -Author: Aaron Griffin -Date: Tue Aug 5 14:34:53 2008 -0400 - - Set kbd_mode on all virtual consoles - - Previous behavior only set the mode for vc0. - See FS#11093 - - Signed-off-by: Aaron Griffin - -commit b7d66decca5117aaba3b73d2eccb97594ef1ea98 -Author: Daniel Kaminski -Date: Tue Jul 22 17:50:02 2008 -0400 - - ipv6 over ipv4 tunneling support in /etc/rc.d/network - - This is done by checking the route config for a double colon - - Signed-off-by: Aaron Griffin - -commit 04899c1b829f1a4708a04e2188b256901845770f -Author: Aaron Griffin -Date: Fri Jul 18 11:47:22 2008 -0400 - - Remount filesystems RO if umounting fails - - Just a safeguard, suggested by FS#10947 - - Signed-off-by: Aaron Griffin - -commit e13ee23fd2d0035150d178fc683079696fb446fc -Author: James Rayner -Date: Mon Jul 14 21:24:33 2008 +1000 - - Add some useful error messages to wireless code - - Additionally add optional WIRELESS_TIMEOUT parameter - - Signed-off-by: Aaron Griffin - -commit 84f76aafc5f6d7f3d2c2141d2930e42dcb82def0 -Author: Aaron Griffin -Date: Mon Jun 30 12:35:21 2008 -0400 - - Decouple ISO release name from initscripts - - This should aleviate some gripes - - Signed-off-by: Aaron Griffin - -commit 9dcd7a9fed510dacd14e4cf4497e73a98f847fac -Author: Natanael Copa -Date: Fri Jun 20 13:46:10 2008 -0400 - - Minor simplication for /etc/rc.d/functions.d/ - - Trivial simplification to make code more readable. - Removes one fork so booting should be "faster". Probably not mesureable - - Signed-off-by: Aaron Griffin - -commit fa73767d19ea505ec32533b8856122968207db2f -Author: Anton Fiuman -Date: Sun May 25 00:55:56 2008 +0200 - - Allow users to ovverride daemon start and stop in rc.multi and rc.shutdown - - Signed-off-by: Anton Fiuman - -commit 63db98c2a8e256f9219c5c6501b40846040bf089 -Author: Aaron Griffin -Date: Thu May 22 13:02:55 2008 -0400 - - Remove source_functions in favor of always sourcing the dir - - This is an obvious oversight on my part - this change allows - the overridden functions to work in daemon scripts and - anything else that uses /etc/rc.d/functions by itself. - - Signed-off-by: Aaron Griffin - -commit de031161e02772aaeaefed1398f8ad59621bd8bc -Author: Thomas Bächler -Date: Wed May 14 13:49:16 2008 +0200 - - Fix commit 521d7678cecb3018923f7c869bc8a5f74dc29268, this makes more sense - -commit af36e8dd3c025d7593bda4f310612989927149d1 -Author: Thomas Bächler -Date: Sun Apr 13 18:32:43 2008 +0200 - - Always quote $TIMEZONE to fix FS#10178 - -commit 521d7678cecb3018923f7c869bc8a5f74dc29268 -Author: Pierre Schmitz -Date: Sat Apr 12 13:37:22 2008 +0200 - - fixing udev hotplugging Some devices like scanners do not work with recent udev/initscript changes. This patch seems to fix such issues. - -commit 42c5f304ad361fd9e16d08a5230043e47437c399 -Author: Thomas Bächler -Date: Tue Apr 8 20:12:55 2008 +0200 - - Just some whitespace fixes - -commit 391cfa71285cfca49aed0d6d2a05c9a949cb9857 -Author: Thomas Bächler -Date: Mon Apr 7 15:33:20 2008 +0200 - - Remove setterm screen blanking from rc.sysinit - Contrary to what one may think, screen blanking not only affects the - console, but also the X server. This line may lead to unwanted blank screens - although one has DPMS disabled in X. Furthermore, it adds a hardcoded, - non-configurable default setting to Arch. - This should either be made configurable (but IMO, we don't need more stuff - in rc.conf) or added to rc.local by the user if needed. As this is a - one-liner, the second solution sounds good to me. - -commit a58228bfe3764008ecf971d420fb7fa0bb704b54 -Author: Thomas Bächler -Date: Sun Apr 6 23:37:17 2008 +0200 - - Remove extra newline from udev status output - -commit 307c850a0c345a092a21fff50da2f0658c3c03c4 -Author: Thomas Bächler -Date: Sun Apr 6 23:30:48 2008 +0200 - - Remove the "interface is already up" check from ifup - As stated in commit f589387f0b9ef56de8ab30f50a3c562e010baeeb, even an - interface that is 'UP' may need configuring. However, the check introduced - in this commit is nonsense (causing bug #9960, possibly others). The best - idea is to remove the check altogether: This may cause duplicate dhcpcd - processes to run (should be fixed), but otherwise ensures the interface is - brought up when it should be. - -commit 89355a468670983476d29b415c12e097d5d79ca5 -Author: Thomas Bächler -Date: Sun Apr 6 23:20:37 2008 +0200 - - Fix USEDIRECTISA in rc.shutdown as well - -commit b55845f7d0e3c81f1936d471370dcb40822463b0 -Author: Thomas Bächler -Date: Sun Apr 6 15:55:23 2008 +0200 - - Remove old initrd hacks - We haven't been using initrd for a while, so these hacks are unnecessary. - The "encrypted root device hack" was obsoleted by proper udev rules long - ago. The code to umount and free the initrd is not critical, so if somebody - insists on using initrd, it can be done in rc.local. - -commit 4c493ec5599b1a30dadc51567e2546a63feb87ef -Author: Thomas Bächler -Date: Sun Apr 6 15:50:57 2008 +0200 - - Make USEDIRECTISA default to no, which is a sane default according to hwlock's manpage. This is contrary to the behaviour in older initscripts. - -commit 4a4cb51a138d73753bb967c27a9f7ea8bf9f88b3 -Author: Thomas Bächler -Date: Sun Apr 6 15:48:22 2008 +0200 - - Move /sys mounting to the beginning, together with /proc and /dev and clean up some comments - -commit f3e064ec822b3dae191e1ae5d2bb921a970af86e -Author: Thomas Bächler -Date: Sun Apr 6 15:40:08 2008 +0200 - - Remove any special handling of usbfs from rc.sysinit - libusb has migrated to /dev/bus/usb, which is managed by udev and thus more - flexible. Some legacy applications (like VirtualBox) still use it. However, - since users need special permissions to access usbfs, they have to be - specified via mount options in fstab. So there are two cases: - 1) a user does not need usbfs - 2) a user needs it, but must add it to fstab to force the right permissions - Our old special handling in rc.sysinit is thus obsolete (and it was ugly - anyway). - -commit 5386d7332dd77ecf4113dfc10773b529f583e797 -Author: Roman Kyrylych -Date: Wed Mar 19 11:12:19 2008 +0200 - - Use actual device number for creating /dev/misc/rtc0 - - Signed-off-by: Roman Kyrylych - -commit 6e37620983c107e13120d1e249a37b3be6d0b12d -Author: Roman Kyrylych -Date: Tue Mar 18 22:43:38 2008 +0200 - - Do not try to create /dev/pts and /dev/shm twice - - Signed-off-by: Roman Kyrylych - -commit a71b075e90154073e3ba331de9b74b8bc088ec45 -Author: Aaron Griffin -Date: Tue Mar 18 12:33:24 2008 -0500 - - Fix a directory typo - - Looks like a 'bin/' slipped in there somewhere. Whoops - - Signed-off-by: Aaron Griffin - -commit 52a6990bc7ab0b48d6d227a8dcb782cb1d419dd5 -Author: Aaron Griffin -Date: Mon Mar 17 11:34:12 2008 -0500 - - Variable expansion quoting - - This was missed, and caused some gross output if a user - mistakenly had a space in their timezone (we should fail - gracefully here, not let bash error). - - Signed-off-by: Aaron Griffin - -commit 15647a9f42a00406ec1c1c02515fe1e90825bd9b -Author: Roman Kyrylych -Date: Tue Mar 11 00:02:22 2008 +0200 - - Remove the 'makedevs' script - - * last touched somewhere in 2005 - * not used by anything - * sits in /sbin but uses software from /usr/bin - * makedev in Extra exists - * if one wants a static /dev - just use mknod - - Signed-off-by: Roman Kyrylych - -commit 12ee0a4fe0108fe952dc31c5f42648037b9c5cde -Author: Roman Kyrylych -Date: Mon Mar 10 17:58:48 2008 +0200 - - Fix a typo in /dev/rtc creation steps - - Signed-off-by: Roman Kyrylych - -commit 7526db5d0405188fee94d16fbcfbdf13a17e6a45 -Author: Roman Kyrylych -Date: Sun Mar 9 17:22:11 2008 +0200 - - More full-path fixes - - Signed-off-by: Roman Kyrylych - -commit 2c9681f461a0cde98a88de65e232369df68ed859 -Author: Roman Kyrylych -Date: Sat Mar 8 20:02:09 2008 +0200 - - Add basic support for dependencies in rc.d scripts - - Example of use: - DEPENDS=('dbus' 'acpid') - . . . - ck_depends ${DEPENDS[@]} - and those daemons will be started if not running already - - Signed-off-by: Roman Kyrylych - -commit 45e331302268490cfb532ea6fe827cba1351ec5b -Author: Roman Kyrylych -Date: Sat Mar 8 19:22:48 2008 +0200 - - Use full path to binaries everywhere - - Signed-off-by: Roman Kyrylych - -commit 6214a05ea023b8bc3014d8032af18b2404276d00 -Author: Roman Kyrylych -Date: Sat Mar 8 18:45:24 2008 +0200 - - Create /dev/rtc before running hwclock (FS#9636) - - Signed-off-by: Roman Kyrylych - -commit 973c1b65ad9fb92c6a0e017a7b8bfb40c38b3bcd -Author: Roman Kyrylych -Date: Sat Mar 8 19:28:08 2008 +0200 - - Fix indentation in rc.d/functions - - Signed-off-by: Roman Kyrylych - -commit 646862aa989d82c35d267d5771c6cc620275bf4c -Author: Aaron Griffin -Date: Fri Mar 7 14:35:31 2008 -0600 - - Additional /dev/ setup that udev doesn't do - - These nodes are not covered by default udev, so lets make - sure they're added properly. - - Ref: FS#9726 - - Signed-off-by: Aaron Griffin - -commit abe6dcb83d16c6e40fed99c202085c78cb356fa1 -Author: Aaron Griffin -Date: Fri Mar 7 14:34:26 2008 -0600 - - Add my name to the copyright output - - Signed-off-by: Aaron Griffin - -commit 91b86efedd70e6b83232057fbf2b089a47b76333 -Author: Roman Kyrylych -Date: Thu Mar 6 00:24:20 2008 +0200 - - Revert back to not loading defkeymap - - * There is a patch for the kernel now, so no need to workaround the bug - * Add a missing check for an empty KEYMAP - - Signed-off-by: Roman Kyrylych - -commit 56fffa9954db654c1731e07f753c3de105896455 -Author: Roman Kyrylych -Date: Sun Mar 2 16:31:34 2008 +0200 - - Always load defkeymap - - It seems that there's a bug in the kernel 2.6.24, - which makes the built-in defkeymap to produce incorrect composite chars. - Thus keymaps that don't have 'include "compose.latin1"' have issues (FS#9593). - While it is better to fix this bug in kernel and all affected keymaps - loading defkeymaps before other keymaps seems to not hurt anyway. - - Signed-off-by: Roman Kyrylych - -commit f94f52e5ab877ffc3160d0bf20c70be9865d45b2 -Author: Roman Kyrylych -Date: Sat Mar 1 00:40:02 2008 +0200 - - Set up vc/0 as well - - Signed-off-by: Roman Kyrylych - -commit 1b5eeefa5a859a9c26a717603bd4c0e9fb74de82 -Author: Roman Kyrylych -Date: Sat Mar 1 00:04:01 2008 +0200 - - Do not mount /proc/bus/usb if commented in fstab - - Fixes FS#9451 - - Signed-off-by: Roman Kyrylych - -commit 4d0920ede7ce9c3d67e03c67b9ee584cf1a3fe9d -Author: Roman Kyrylych -Date: Thu Feb 28 13:55:41 2008 +0200 - - Make non-UTF-8 consoles work correctly in .24+ kernels - - * Since 2.6.24 the virtual terminal is in UTF-8 mode - and the keyboard is in Unicode mode by default, - and configurable only at run-time. - - * To make non-UTF-8 consoles work correctly: - - the non-UTF-8 mode is set for the virtual terminal, - - the XLATE mode is set for the keyboard. - - * UTF-8 mode is still set explicitly (not relying on default), - so console works correctly even in a case when user set vt.default_utf8=0 - in kernel commandline, but LOCALE in rc.conf is *.UTF-8. - - * % is a special symbol for printf, so it should be written twice. - - Signed-off-by: Roman Kyrylych - -commit ef86e38e9fd750db35e23aa949aa60e4c9f60f0c -Author: Roman Kyrylych -Date: Thu Feb 21 18:07:44 2008 +0200 - - Remove trailing whitespaces and do some little reformatting - - Signed-off-by: Roman Kyrylych - -commit bb639b33167e13602aacf34bab6032992e7b3d6a -Author: Aaron Griffin -Date: Wed Feb 20 23:46:57 2008 -0600 - - Add some udev stats output - - So we can see timing and all that jazz - - Signed-off-by: Aaron Griffin - -commit e658f681e1d36a75b527d182ce28ee0781ed4492 -Author: Dan McGee -Date: Thu Feb 14 20:16:49 2008 -0600 - - rc.shutdown: Fix hwclock double calls - - Commit 9673449ac0af77751eab62423114f27e7dbc497c added --directisa - configuration to rc.shutdown, but didn't remove the old hwclock calls and - instead just added a second call. Remove the original calls. - - Signed-off-by: Dan McGee - -commit e16e2d17c97f91cdb9eda0ad3525ee7977ad40a6 -Merge: 626037f... fbb8d26... -Author: Dan McGee -Date: Thu Feb 14 19:56:02 2008 -0600 - - Merge branch 'posix' into working - -commit 626037f6043596f21511b76b088dca86fc079f42 -Author: Dan McGee -Date: Thu Feb 14 19:53:03 2008 -0600 - - functions:source_functions(): don't fail on empty dir - - Instead of using globbing which will fail on an empty directory, use an ls - call similar to other places in the initscripts which is not prone to - failure. (See rc.single in the daemon shutdown for example.) - - Signed-off-by: Dan McGee - -commit fbb8d26a81dc220d7795be871e09c89fd0e03a76 -Author: Dan McGee -Date: Fri Nov 30 09:30:05 2007 -0600 - - Remove echo -e usage from rc.sysinit - - Use the always available (in sh) printf method instead. - - Signed-off-by: Dan McGee - -commit 7b6fddfb12106c9485a9ceb8fa1876a501d1f181 -Author: Dan McGee -Date: Fri Nov 30 09:23:02 2007 -0600 - - Remove some bashisms from network, even though we cannot convert it - - Since netfs and network source rc.conf, we cannot fully convert it to an sh - script. However, we can get rid of a few things that are not sh compatible. - - Signed-off-by: Dan McGee - -commit e3985084056bb80c886ea649674c3da5b906ccab -Author: Dan McGee -Date: Fri Nov 30 09:18:26 2007 -0600 - - Make install.sh sh compatible - - Signed-off-by: Dan McGee - -commit 980791fd888b6efff6319c77363aab473166ca6b -Author: Dan McGee -Date: Fri Nov 30 09:17:15 2007 -0600 - - Make functions sh compatible - - There is no reason to use bashisms in functions, so eliminate any and use - printf instead of echo options which are not guaranteed to be implemented in - a POSIX sh. - - Signed-off-by: Dan McGee - -commit dc4cee8f5987098a07a8b272573424b599a52598 -Author: Dan McGee -Date: Sat Nov 17 12:03:59 2007 -0600 - - Don't assume sh == bash - - Signed-off-by: Dan McGee - -commit ccc90d4d211a61a21c835c1e51c807ddd485a136 -Author: Roman Kyrylych -Date: Thu Feb 14 14:51:40 2008 -0600 - - Add support for (un)mounting nfs4 - - Signed-off-by: Roman Kyrylych - Signed-off-by: Aaron Griffin - -commit 9673449ac0af77751eab62423114f27e7dbc497c -Author: Roman Kyrylych -Date: Wed Jan 23 17:46:03 2008 -0600 - - Use --directisa configuration in rc.shutdown as well - - Signed-off-by: Roman Kyrylych - Signed-off-by: Aaron Griffin - -commit f589387f0b9ef56de8ab30f50a3c562e010baeeb -Author: Loic Nageleisen -Date: Tue Jan 8 09:14:42 2008 -0600 - - Enhance interface 'up' state checking - - Using the 'UP' state to imply operational status is wrong and even if a - device is 'UP' we may still need to run ifconfig/dhcp - - Signed-off-by: Aaron Griffin - -commit 9e341d31cd15172941268412d258c38591ff4988 -Author: Aaron Griffin -Date: Tue Jan 8 09:09:46 2008 -0600 - - network script logic cleanups/enhancements - - Signed-off-by: Aaron Griffin - -commit 7719cd7c0ac6d3f316ed8595becf29ef418d9af9 -Author: Aaron Griffin -Date: Tue Jan 8 09:07:05 2008 -0600 - - Remove the hotplug functionality from the network script - - Hotplug hasn't been supported in Arch for ages - - Signed-off-by: Aaron Griffin - -commit c2d7f40b2e0837f5544e6e2bfc22dc12e994ed16 -Author: Aaron Griffin -Date: Tue Jan 8 03:35:05 2008 -0600 - - Create some basic device nodes on initialization - - We need, at the very least, these three device nodes - (null, console, and zero) created before we get udev - up and running - - Signed-off-by: Aaron Griffin - -commit cd0b3911131ee0eddc32c5e3992036c2e769948f -Author: Jonathan Frazier -Date: Tue Jan 8 03:26:12 2008 -0600 - - minilogd cleanup and warning fixes - - gcc gives a warning about signed/unsigned ints, and it tries to write to - syslog's /dev/log with a dgram socket which gives an EPROTOCOL error. - - Signed-off-by: Aaron Griffin - -commit 9bf2014b750579d9720c13c9dfb9d358e0c27665 -Author: Aaron Griffin -Date: Tue Jan 8 03:06:56 2008 -0600 - - Allow --directisa configuration for hwclock calls - - Signed-off-by: Aaron Griffin - -commit ab5595c4f8cdea8e6b1813701828576cbfee2fc2 -Author: Aaron Griffin -Date: Thu Dec 20 12:32:12 2007 -0600 - - Deprecate MOD_BLACKLIST via some comments - - Signed-off-by: Aaron Griffin - -commit 2694f1224dfb5b5c734a781fc813e639139feb39 -Author: Aaron Griffin -Date: Thu Dec 20 12:19:56 2007 -0600 - - Mount our ram /dev as soon as possible - - On readonly root systems, lots of fdup calls fail on device nodes, for - instance in minilogd. So we'll mount /dev as early as we can - - Signed-off-by: Aaron Griffin - -commit 25811badce84cd157a8b66c84e78f931cad1d129 -Author: Aaron Griffin -Date: Thu Dec 20 12:15:26 2007 -0600 - - Set hwclock *before* udev is loaded - - This prevents /dev/ timestamps from being 'in the future' when the hwclock - is not in UTC. - - Closes FS#8665 - - Signed-off-by: Aaron Griffin - -commit b82f9d580d1ab70e78de4c81c180c5a308bd1238 -Author: James Rayner -Date: Thu Dec 20 10:53:25 2007 -0600 - - Tidy up rc.conf - - Signed-off-by: Aaron Griffin - -commit a4a35bda6ef3fd3e444e90ab362369f0b1f511dc -Author: Simo Leone -Date: Thu Dec 20 01:30:59 2007 -0600 - - Make the background black on all status text - - This is the easiest way to cleanup the script output on white terminals - without resorting to shutting off color. - - It won't make everyone happy, though. - - Ref: FS#1186 - - Signed-off-by: Aaron Griffin - -commit 5ccb8edb591213e03fc3909aa7db7242b9f54b30 -Author: Aaron Griffin -Date: Mon Dec 17 16:16:38 2007 -0600 - - Modify comment above MOD_AUTOLOAD to indicate that it autoloads - - Some people thought the comment was unclear - - Signed-off-by: Aaron Griffin - -commit 20d6e1081ec7105207c01e9d8d2a58bb4a145331 -Author: Aaron Griffin -Date: Mon Dec 17 16:08:05 2007 -0600 - - Save dmesg output at the end of the boot process - - Signed-off-by: Aaron Griffin - -commit 9d86b8814583509069ad6707688e2b41fc0d292f -Author: Roman Kyrylych -Date: Wed Dec 12 10:28:37 2007 -0600 - - Fix FS#8843 (no colors in rc.sysinit output with separate /usr) - - when tput returns exit code 3 - assume it output '8' - (as written in the /usr/share/terminfo/l/linux file) - - Signed-off-by: Roman Kyrylych - - Converted to if/elsif form - - Signed-off-by: Aaron Griffin - -commit 662a52c15343338e9d843c6f70d39acefd3a2c4c -Author: Dan McGee -Date: Sun Nov 18 11:47:54 2007 -0600 - - Move start_udev actions to rc.sysinit - - start_udev has been deprecated upstream for some time. We shouldn't use - some hacked up version of it either. - - Signed-off-by: Dan McGee - Signed-off-by: Aaron Griffin - -commit b1d0ec7cb6e8cea9f2fd7b0c11a0b607467615bd -Author: James Rayner -Date: Sat Nov 10 13:26:39 2007 +1100 - - Removing netcfg from initscripts - - Signed-off-by: Aaron Griffin - -commit b8e558d5784c8054a91dcefd8495b739a664dbae -Author: Aaron Griffin -Date: Wed Nov 28 14:47:09 2007 -0600 - - Source /etc/rc.d/functions.d/ for additional initscript functions - - Signed-off-by: Aaron Griffin - -commit 57879c6d6c51918b8106142e70643b53a9a8c7da -Author: Roman Kyrylych -Date: Fri Nov 9 16:47:44 2007 +0200 - - Improve error handling and allow multiple keymaps to be loaded - - Signed-off-by: Roman Kyrylych - -commit 9af6022b841c84283a061d6a7a5be943057ac3ae -Author: Dan McGee -Date: Sun Oct 21 20:29:16 2007 -0500 - - Add a few more comments and examples to inittab - - Signed-off-by: Dan McGee - -commit c5cffb501763c355299e593d16089fa5e56097b2 -Author: Thomas Bächler -Date: Sun Oct 21 18:51:51 2007 +0200 - - Fix broken terminal detection, disable colors when the terminal is unknown. - -commit e3f7fc94d40e13f65e00adb3d7c48fb6f790c7d7 -Author: Roman Kyrylych -Date: Sun Oct 21 16:39:24 2007 +0300 - - make non-ASCII chars work before login too - - Signed-off-by: Roman Kyrylych - -commit bbc2f945cb5df2ff103759ccb6de5183a87487b7 -Author: Thomas Bächler -Date: Sun Oct 21 15:11:20 2007 +0200 - - yes, I fixed a trailing whitespace - -commit 59f89b4a25fbc100551a814f5bcf81aa05b6c2e7 -Author: Roman Kyrylych -Date: Sun Oct 21 15:24:57 2007 +0300 - - Fix locale handling - - Signed-off-by: Roman Kyrylych - -commit 956e12f7f57a38ed382032d361ac22196d015170 -Author: Thomas Bächler -Date: Sun Oct 21 11:45:43 2007 +0200 - - change install.sh to exit on failure with return code 1 - -commit 7d018e6ba90b1b006068502f443b69e258795061 -Author: Thomas Bächler -Date: Sun Oct 21 11:40:50 2007 +0200 - - Added install script - -commit affd2bf9f3f84d507ab4c4a9998b4d1c2697300c -Author: Thomas Bächler -Date: Sun Oct 21 11:31:45 2007 +0200 - - Make daemon shutdown fix more consistent with the other init scripts and simplify it a bit - -commit 1b8636ed76e4bf5ef23c3b357e991c66e18714c5 -Author: Thomas Bächler -Date: Sun Oct 21 11:06:07 2007 +0200 - - fixing second part of #6959 - -commit bc1b5289228e74641a61cff3bb8b3751713dcf54 -Author: Thomas Bächler -Date: Sun Oct 21 10:53:28 2007 +0200 - - replace all remaining backticks with $(...) - -commit 1828938d4406d5a95b7c89828f61600f9e6975a6 -Author: Thomas Bächler -Date: Sun Oct 21 10:41:21 2007 +0200 - - fix the utf8 activating code: there are 63 virtual terminals, not 12 - -commit c8030f33082229530ef2f0ed699eddea4465dad9 -Author: Thomas Bächler -Date: Sun Oct 21 10:18:36 2007 +0200 - - Release name: "Don't Panic" -> "Core Dump" - -commit e064575e7842d55371db39991593f3ea0bf03b9b -Author: Thomas Bächler -Date: Sun Oct 21 10:15:47 2007 +0200 - - Remove hwdetect as it is maintained as a separate package and this version isn't up to date anyway. - -commit cfab94bc71dc2e072c691122df82f4b6f2bdef29 -Author: Thomas Bächler -Date: Sun Oct 21 10:05:28 2007 +0200 - - disable colors on stupid terminals - (fixes #7369) - -commit bb0984ad899ab3ae85ef8bf2c0e178a2b485885c -Author: Thomas Bächler -Date: Fri Oct 19 22:22:52 2007 +0000 - - added (barely tested) improvement of ASK keyword in crypttab - -commit 39a8c53bd8c2b82e824d9299a4a18d81c9e530bd -Author: Tobias Powalowski -Date: Fri Oct 19 07:02:14 2007 +0000 - - 'upgpkg: removed double entry of ifconfig lo' - -commit 31dbcc786457dd92d9f56618e7c946b94ec04646 -Author: Tobias Powalowski -Date: Fri Oct 19 06:08:19 2007 +0000 - - 'upgpkg: added /sys/class/net/lo check' - -commit 24e468641b51e5e0a05e631d62ad706b5c0a2dd7 -Author: Tobias Powalowski -Date: Thu Oct 18 16:50:26 2007 +0000 - - 'upgpkg: added loopbackhardcoded to rc.sysinit and remove it from rc.conf' - -commit 6f35411f5ee1db8db1e27faf91c7b03e900c5bee -Author: Dan McGee -Date: Thu Oct 18 16:15:58 2007 +0000 - - removing unnecessary isatty.c, replaced by shell test -t option - -commit a7c1404def678e27e0ac808397f46f81a1d2c8d4 -Author: Tobias Powalowski -Date: Thu Oct 18 14:27:56 2007 +0000 - - 'upgpkg: fixed utf typo' - -commit fa4866f0adce9c3e0bfc09fb878eebb99797c338 -Author: Tobias Powalowski -Date: Thu Oct 18 08:43:28 2007 +0000 - - 'upgpkg: trying to fix #6237,7554,7165,7641,5740' - -commit 8649f79e8e0027bd46da8b13f6d8ac5465471c35 -Author: Dan McGee -Date: Wed Aug 15 04:01:59 2007 +0000 - - upgpkg: initscripts 2007.08-2 - -commit e3c06e981af869d6a00ec8cde34bde1e15cb53ad -Author: Tobias Powalowski -Date: Mon Jul 30 20:24:42 2007 +0000 - - 'upgpgk: fixed nocpfs netfs bug and bump to don't panic release' - -commit 6852a33372052c1374248f6727e6f7755aeadd30 -Author: Thomas Bächler -Date: Sun May 13 13:40:40 2007 +0000 - - upgpkg: initscripts 0.8-11 - -commit aca95b25037ee1085c70a2e73b609a5d8cdff44b -Author: Thomas Bächler -Date: Sun May 13 12:01:11 2007 +0000 - - upgpkg: initscripts 0.8-10 - -commit cc2c8b1fa2a709b405e3efc65222b984a63e13c6 -Author: Tobias Powalowski -Date: Sat May 12 12:55:37 2007 +0000 - - 'upgpkg: bump to Duke and cleanup rc.sysinit and netds' - -commit 352dda7e7ba2c62686579e2c58b519ebb961b8be -Author: James Rayner -Date: Thu May 10 00:18:05 2007 +0000 - - upgpkg: initscripts 0.8-8 - fixing flyspray #7004 #6859, change in dhcpcd state directory. - -commit 3fc84b485213763335a5b820f8a4b4d6483be20d -Author: Tobias Powalowski -Date: Sun Apr 22 13:37:53 2007 +0000 - - 'upgpkg: added autoloading of standard acpi modules during boot, with the possibility to blacklist by default methods' - -commit b04f18c15cef8f6d48aa0aa63fa8104b551fe1db -Author: Thomas Bächler -Date: Sat Feb 10 09:14:34 2007 +0000 - - fixed typo, fixed verbose booting - -commit fff26e7f1fecaec1bf4c07cc07d1a426b160168b -Author: Thomas Bächler -Date: Tue Jan 30 18:56:37 2007 +0000 - - forgot to add rc.local.shutdown - -commit 36e129004f1dfb2e890edc55f99c8eb0df89c668 -Author: Tobias Powalowski -Date: Mon Jan 29 21:51:35 2007 +0000 - - 'upgpkg: added network listing help to rc.conf' - -commit 78b5f6beee0453dd938f1a3c6a6ab5776e6d78f3 -Author: Thomas Bächler -Date: Mon Jan 29 20:45:25 2007 +0000 - - fix 6038 - -commit 1bad30cc17f6cec15668f2bae9d6b72dd44788ee -Author: Tobias Powalowski -Date: Mon Jan 22 21:52:41 2007 +0000 - - 'upgpkg: fixed verbose boot option' - -commit bced30e91fea71c05e3e521aa7cf04583f0dadbb -Author: Tobias Powalowski -Date: Thu Jan 18 19:21:26 2007 +0000 - - 'upgpkg: fixed usb removal' - -commit 221f3c66ca47ccf283f8ebbe7f8799cc24176def -Author: Tobias Powalowski -Date: Sun Dec 31 16:11:52 2006 +0000 - - 'added a bunch of new options' - -commit c323a4ae268d20d293351dc5e195e34d19ed28e7 -Author: Thomas Bächler -Date: Mon Dec 18 21:54:53 2006 +0000 - - upgpkg: initscripts 0.8-2 - finally fixed 5445 - -commit f9b90969a7669044f098b90babe203b145bf55a9 -Author: Tobias Powalowski -Date: Mon Dec 18 19:24:54 2006 +0000 - - 'upgpkg: added --keymap option' - -commit 4b00503d2d25e40b0e962df08005d749cf3a4c87 -Author: Thomas Bächler -Date: Sun Dec 17 12:53:22 2006 +0000 - - added stat_append to functions, fixed fsck bugs when clock is not set - -commit 779bd2abb1b67431b6e353eaba569779fb718833 -Author: Thomas Bächler -Date: Sat Dec 16 23:49:35 2006 +0000 - - let lvm start quietly - -commit 9b58da29d7ce93bf3dc258a28d2fae00eb181f7e -Author: Thomas Bächler -Date: Sat Dec 16 22:03:29 2006 +0000 - - rc.sysinit, rc.shutdown: - - Code cleanup - - Added "verbose" commandline option for debugging - - Fixed #5968 - - Fixed #4648 - -commit 567edd5aa95d5728b50f9fff6d71c368a7f3966a -Author: Tobias Powalowski -Date: Sat Dec 16 13:31:00 2006 +0000 - - 'upgpkg: readded rc.sysinit and hwdetect for 0.8 package' - -commit 9a73b01bb6ea96b81b9ed887f8808b47b4fc5f19 -Author: Andreas Radke -Date: Sun Dec 10 21:21:20 2006 +0000 - - cuurent x86_64 updated - -commit 3fcefcf13b87883216dd5331b2aed84db473de04 -Author: Tobias Powalowski -Date: Sun Dec 10 14:34:46 2006 +0000 - - 'upgpkg: added voodoo tag and new hwdetect' - -commit 6b671f7901477d36fca5f8901731e4c0d5e7948f -Author: Aaron Griffin -Date: Thu Nov 16 01:01:16 2006 +0000 - - upgpkg: initscripts 0.7.3-1 - Bugfix #5529: Set timezone before hwclock calls - -commit c632bec83a37945e5bb4e7cedf4f4d96f0a955ec -Author: Judd Vinet -Date: Mon Nov 13 00:00:27 2006 +0000 - - FS#5385: Fixed RAID setup code - -commit ef6a41ebd7e2ab216e4b950df2a6d0826aef39b7 -Author: Judd Vinet -Date: Wed Nov 8 20:01:06 2006 +0000 - - patch from Paul to disable NIS domainname before shutting down (syslog-ng was hanging). Also added a 2>/dev/null to fsck during startup - -commit 01f15f89c1cf4cdb77c7d0a8ddb37ddabd7df012 -Author: Tobias Powalowski -Date: Mon Oct 2 14:50:41 2006 +0000 - - 'upgpkg: added psmouse workaround for new broken lappies' - -commit 9c34c7c5c8c525ce17a5bf447e40d78741ee15ba -Author: Judd Vinet -Date: Thu Sep 28 19:25:16 2006 +0000 - - added CONSOLE check to UTF-8/Locale stuff to avoid doing it when running scripts from cron - -commit 00081d09b7ab18b8672a299d61a1281819904890 -Author: Judd Vinet -Date: Tue Sep 26 06:34:35 2006 +0000 - - Added --directisa switch to hwclock in rc.shutdown - -commit 2f49e1bb285fc9ad7259caf5edb957d7c891c974 -Author: Tobias Powalowski -Date: Wed Sep 20 10:36:16 2006 +0000 - - 'upgpkg: added udev persistent rules check' - -commit 8d399cf84d6d6192a13286e33258aaa369eee1bb -Author: Tobias Powalowski -Date: Fri Aug 4 07:54:32 2006 +0000 - - 'upgpkg: added kexec support to rc.shutdown' - -commit 977797d7a67033d03c4be04dba5b789ecdf2a36f -Author: Judd Vinet -Date: Tue Jul 25 22:36:42 2006 +0000 - - set a default for LOCALE so it's no longer needed in /etc/profile - -commit 87132356080924e00822a4b24d593e94bb18e24a -Author: Judd Vinet -Date: Fri Jul 21 19:40:00 2006 +0000 - - added --directisa to hwclock calls, support for additional options in crypttab for non-LUKS partitions, fixed the WPA_OPTS varname typo in netcfg - -commit 8d214daab85c043f87ed21912b68172cc0e33635 -Author: Tobias Powalowski -Date: Fri Jul 7 15:17:34 2006 +0000 - - 'upgpkg: fixed usbfs mounting again' - -commit 93ba858cb8f3684506bcc5854ce32b637e108d00 -Author: Judd Vinet -Date: Fri Jun 30 19:40:10 2006 +0000 - - various fixes -- netcfg fixes, md device node creation fixes w/ mkinitcpio, 2.4 kernel support removed - -commit 4d91b544b6f666a12b84f82576b4309622806e83 -Author: Judd Vinet -Date: Fri Jun 30 15:54:33 2006 +0000 - - Fixed --menu when using gpm (#4916) - -commit 09bb556bf07b89130d27dc137190ff354beadecc -Author: Judd Vinet -Date: Wed Jun 28 17:27:47 2006 +0000 - - handle ESSID fields that contain spaces - -commit 6cc15eeb857f9a01e7199c4c665866c7728244aa -Author: Judd Vinet -Date: Thu Jun 15 21:54:12 2006 +0000 - - added patch from James Rayner to auto-configure WPA through netcfg - -commit 96971f91453600f1d94d3e333dfb8773d1e4f596 -Author: Judd Vinet -Date: Mon Jun 12 17:36:12 2006 +0000 - - fixed the path to the console maps in the comment area of rc.conf - -commit 5d708a122229e99d1f09f9cfd8297370e1778732 -Author: Tobias Powalowski -Date: Wed Jun 7 17:12:17 2006 +0000 - - 'upgpkg: removed the rest of 2.4 kernel' - -commit b4306a3ede324f6bdbfa5c7b80d0cff15f22c1be -Author: Tobias Powalowski -Date: Wed Jun 7 16:49:32 2006 +0000 - - 'upgpkg: removed kernel24 stuff eg. devfsd support and lvm1' - -commit ddac836cdbb67ba5b89d21aa3b25a67919efeb88 -Author: Judd Vinet -Date: Tue May 9 18:23:41 2006 +0000 - - upgpkg: initscripts 0.7.2 - -commit dfb74ab60c8bb84f3e02d89cfe8127e55aeb7984 -Author: Judd Vinet -Date: Mon Mar 27 18:13:56 2006 +0000 - - fix for #4296 - -commit 7cc268dcf5d2e64a3f10b808e8b1b90a8f6fec4a -Author: Judd Vinet -Date: Sun Feb 26 19:15:58 2006 +0000 - - Additional fix for locale stuff, re-enabled the depmod -A call at bootup - -commit befe253687d69267cac5e5953e0ca55d18bef000 -Author: Tobias Powalowski -Date: Fri Feb 24 06:57:54 2006 +0000 - - 'upgpkg: added depmod -A again' - -commit 7ad516d1a7bf6fb5eed4e43669a7fb2a0832a552 -Author: Tobias Powalowski -Date: Tue Feb 21 07:35:10 2006 +0000 - - 'upgpkg: fixed module loading and udev startup' - -commit e0074ab78392be117c4cc63b4e0832fef95f2009 -Author: Judd Vinet -Date: Mon Feb 20 05:33:27 2006 +0000 - - default LOCALE is now en_US.utf8 - -commit d4bd7c245c018d9de3f25eca580515cfc3048217 -Author: Judd Vinet -Date: Mon Feb 20 05:26:07 2006 +0000 - - fix for terminal/locale bug (3996) - -commit a33f5477d845f3919cd746ab2be1180cb025b415 -Author: Judd Vinet -Date: Thu Feb 16 17:56:33 2006 +0000 - - hwdetect->udev, removed default usbserial blacklist - -commit 655d3db463145facd994e5e3cfd0c0a911b30297 -Author: Judd Vinet -Date: Thu Feb 16 17:12:06 2006 +0000 - - added note about disallowed hyphens in bash variable names - -commit 207256890573ce867d4391c362b34f31a1a60865 -Author: Tobias Powalowski -Date: Thu Feb 16 10:23:38 2006 +0000 - - 'upgpkg: put loading modules in front of udev and disabled depmod -A during boot' - -commit 9058c034c77ab62b91f2cd7d3637a2cb04f7c7d7 -Author: Judd Vinet -Date: Mon Feb 13 04:47:51 2006 +0000 - - removed unnecessary line from netfs - -commit 6411dc721549d99335367f5643c0887095fc7818 -Author: Judd Vinet -Date: Thu Feb 9 18:48:17 2006 +0000 - - added note about dialog package required for netcfg menus - -commit 0d286b02f2c425d28c1908a82d99f266d3549919 -Author: Judd Vinet -Date: Mon Feb 6 19:38:45 2006 +0000 - - moved swap activation after local filesystem mounting, so people can use swap files - -commit 8172dd9403fa216479c458e222c9d01c5b293437 -Author: Tobias Powalowski -Date: Mon Feb 6 18:13:03 2006 +0000 - - 'upgpkg: fixed weird scsi raid controllers' - -commit f137bbe79f4249a296c0e9064a29f5c76f38273d -Author: Judd Vinet -Date: Wed Feb 1 21:24:08 2006 +0000 - - utf8 little fix - -commit affcb39fd921774f48b79fb9d48d68f3a917fd4f -Author: Judd Vinet -Date: Tue Jan 31 01:30:55 2006 +0000 - - added --mknodes switch to the vgscan call (LVM) - -commit bd6701616508c5bb21de9166e9b1daa6fe1de769 -Author: Judd Vinet -Date: Sat Jan 21 20:58:24 2006 +0000 - - fixed random-seed restoration - -commit e4af7e36ba40ab49993fcc4232dcebdedc1763b9 -Author: Tobias Powalowski -Date: Thu Jan 19 16:25:38 2006 +0000 - - 'upgpkg: update to new udev module loading' - -commit 8f67fcb5f1fb15d67f024f16bf3249da85375418 -Author: Judd Vinet -Date: Sat Jan 14 08:34:09 2006 +0000 - - added hook for rc.local.shutdown - -commit cef7bab5145b923577aeea7431d7b19f2dd3946b -Author: Judd Vinet -Date: Tue Jan 3 09:06:09 2006 +0000 - - changed xdm path in inittab - -commit 33d5e65a50fa302f6863277c52c061af721a3c44 -Author: Judd Vinet -Date: Mon Dec 19 18:43:03 2005 +0000 - - final touches for utf8 stuff (Thanks Roman\!) - -commit e4439a61bca626d05d3c6073ac94740db5c446c4 -Author: Judd Vinet -Date: Sat Dec 17 18:33:46 2005 +0000 - - re-fixed my utf fix (yea, that's right, i fell down a lot when i was a kid) - -commit 00b620075a21e293db4b55a8d451ecd2930dbce1 -Author: Judd Vinet -Date: Sat Dec 17 02:16:47 2005 +0000 - - added sr link to makedevs - -commit 0d08cad43172cc04df237a4a4271525ad1d527b3 -Author: Judd Vinet -Date: Sat Dec 17 00:59:04 2005 +0000 - - final utf8 fixes, a couple small fixes for hwdetect and netcfg - -commit cee3cbb3a261ce0ba812618493e9bd253424ea3f -Author: Judd Vinet -Date: Thu Dec 15 18:56:19 2005 +0000 - - added scsi CD nodes - -commit f14a9cc609ce341ef2327c3ae93aa2695b58b392 -Author: Tobias Powalowski -Date: Tue Dec 13 21:43:08 2005 +0000 - - 'upgpkg: added kernel_verion=, cleaned up some parts added --modules for MODULES= generation for rc.conf use' - -commit c4c551a2f870f579438ae38b07ff9c14008cd6c9 -Author: Judd Vinet -Date: Tue Dec 13 04:12:28 2005 +0000 - - makedevs fix - -commit a8db77d46d74fa3a8a0e13870b94c916a60358b8 -Author: Judd Vinet -Date: Tue Dec 13 04:06:46 2005 +0000 - - latest utf fixes - -commit fcdcb21e2c33b1d3e359dc847638b936caf2aeee -Author: Judd Vinet -Date: Tue Dec 13 01:55:31 2005 +0000 - - makedevs: added ternary and quaternary ide/scsi devices - -commit 675e9d69d02233e0079672f6c10cbe07da3027ad -Author: Tobias Powalowski -Date: Mon Dec 12 10:40:15 2005 +0000 - - 'upgpkg: removed unneeded utf stuff, umlauts in user names do not work, you even cannot create them, - added quiet option to filsystem check, fixed garbeled fonts if no framebuffer is used' - -commit d768a9c95a254e09a34c39aa86840c01cb6d97dd -Author: Judd Vinet -Date: Wed Dec 7 00:21:45 2005 +0000 - - changed both network scripts to use good ol' /bin/kill instead of dhcpcd's -k switch (I forgot about #2942) - -commit f45c3abd5697fa89d1a6431d8dbf5e96e6804ca8 -Author: Judd Vinet -Date: Tue Dec 6 06:45:42 2005 +0000 - - Added interface param to dhcpcd -k calls in network and netcfg - -commit cfaa5552fcbe964a172138e5e6c87e54abb6ce4c -Author: Judd Vinet -Date: Mon Dec 5 18:59:11 2005 +0000 - - dhcpcd fix in rc.d/network - -commit cec2d46513c7cd557f219fa2ede3c7a816a526dc -Author: Tobias Powalowski -Date: Sat Dec 3 13:25:37 2005 +0000 - - 'upgpkg: fixed ide check' - -commit 7e18ec8806c28d52c771cacda045aa3bd81ba0b2 -Author: Judd Vinet -Date: Thu Dec 1 21:04:15 2005 +0000 - - fixed wpa_cli path in netcfg - -commit 78365fe57d61645c1b8282784d863a0cd8537eb5 -Author: Judd Vinet -Date: Tue Nov 29 01:26:11 2005 +0000 - - finished crypttab work, fixed a bug in hwdetect related to custom kernels - -commit 0d7cb77c48fc6232a8342fba9056a1896898b066 -Author: Tobias Powalowski -Date: Mon Nov 28 22:32:00 2005 +0000 - - 'upgpkg: fixed custom kernels' - -commit 2c90c8af7bee4f06cf05c481e658406df35fe401 -Author: Judd Vinet -Date: Mon Nov 28 19:36:56 2005 +0000 - - added USEWPA to template to enable/disable wpa_supplicant - -commit 15c49deac15f97e647afc081c7b5e210ad4bdcd3 -Author: Judd Vinet -Date: Mon Nov 28 19:14:53 2005 +0000 - - moved sysctl config stuff to precede daemon startup (#3530) - -commit fb8a47586d0c5c5833a6bee2adc162a22b646d5a -Author: Tobias Powalowski -Date: Sun Nov 27 18:55:30 2005 +0000 - - 'upgpkg: fixed lock on kernels <= 2.6.12' - -commit 66779d909c3a08f2c3fa0811de12f0e3b5c54bc0 -Author: Tobias Powalowski -Date: Sat Nov 26 15:55:36 2005 +0000 - - 'upgpkg: fixed non ide systems, fixed usb modules' - -commit b087f41b86014ba5dfc0b23ea79d6897573fb562 -Author: Tobias Powalowski -Date: Wed Nov 23 12:54:55 2005 +0000 - - 'upgpkg: fixed hwdetect syntax for rc.sysinit' - -commit a03faeb98fbe82a01977a9900b0d1b6974aac3c6 -Author: Tobias Powalowski -Date: Wed Nov 23 12:45:41 2005 +0000 - - 'upgpkg: fixed mtp modules, added modules-order option, changes options to -- syntax' - -commit d8df29152b8401e4c56a07b8920f34fdf9252bc1 -Author: Judd Vinet -Date: Wed Nov 23 01:58:50 2005 +0000 - - added check for /sys/devices - -commit fca87ebae05b19c0da51c1b996f4bddad82c3115 -Author: Tobias Powalowski -Date: Mon Nov 21 08:52:49 2005 +0000 - - 'upgpkg: hwdetect fixed module order, added load_modules=off to rc.sysinit' - -commit d7695ef38916be8e806b84f8e195a45a7b2ec217 -Author: Tobias Powalowski -Date: Sat Nov 19 15:44:02 2005 +0000 - - 'upgpkg: added more modules' - -commit 561ff8a3abbda0a86cc2a479d8e1a9e1b965b0d1 -Author: Judd Vinet -Date: Sat Nov 19 01:47:31 2005 +0000 - - added crypttab stuff - -commit 23f08df5cb31d38347582e4d62f9279385c612ba -Author: Tobias Powalowski -Date: Fri Nov 18 19:00:25 2005 +0000 - - 'upgpkg : added full ide,scsi detection to hwdetect' - -commit 6931feb5463b3ce9119753bda74279ec87ed447a -Author: Tobias Powalowski -Date: Thu Nov 17 07:52:21 2005 +0000 - - 'upgpkg: added new PNP software and some workarounds' - -commit 0cddbac760aa1b38e5fb68d54b315cb01c67b7b6 -Author: Judd Vinet -Date: Tue Nov 15 09:07:13 2005 +0000 - - cosmetics - -commit 2dc0038155b978eb70be482313cc8535dadc436d -Author: Judd Vinet -Date: Tue Nov 15 02:51:52 2005 +0000 - - added variables for autoloading modules, cleaned up rc.conf a bit - -commit abdeaf8051aaadb9f5270a14e45481a8d61e0b95 -Author: Judd Vinet -Date: Tue Nov 15 01:18:14 2005 +0000 - - added tpowa's changes, cleaned up output and removed redundant code - -commit 684a99329e37924e84344cb340e5022628d6777c -Author: Judd Vinet -Date: Mon Nov 14 17:46:46 2005 +0000 - - more thorough cleaning of /var/run at bootup - -commit e3315ad97c60b8cbad31aff8500d269d9176a9b5 -Author: Tobias Powalowski -Date: Sat Nov 12 15:00:08 2005 +0000 - - 'upgpkg: added more text to show modules, to make it more readable :) " - -commit 9e02c37ccd310844c919f27af64c901979c4105d -Author: Judd Vinet -Date: Fri Nov 11 18:49:54 2005 +0000 - - updated hwdetect - -commit 9683aeadd86569b69ad44d270e006284e565dfd5 -Author: Judd Vinet -Date: Fri Nov 11 18:46:12 2005 +0000 - - changed ifup() to skip interfaces that are already up - -commit 78ce45a497753e2be061e29a6464fcd969041895 -Author: Judd Vinet -Date: Thu Nov 10 21:56:55 2005 +0000 - - added nocifs to pre-network mounts, fixed mdadm.conf missing errors - -commit 0daa0d11302e16ba26d7518c1edf0e4887aade9c -Author: Judd Vinet -Date: Thu Nov 10 19:21:59 2005 +0000 - - little bugfix - -commit d87c9749651741249b4c7cbf5f18b7ab1b3300fb -Author: Judd Vinet -Date: Thu Nov 10 19:06:51 2005 +0000 - - tpowa's hardware detection script - -commit d7e23b7ef7c92f7c9529c65a255b524b26648cc3 -Author: Judd Vinet -Date: Thu Nov 10 02:34:20 2005 +0000 - - added more intelligence for RAID/LVM setups from the initrd - -commit 0e992c0464125a0cb0207171a053dbf64c593833 -Author: Judd Vinet -Date: Wed Nov 9 21:22:44 2005 +0000 - - added logic to free up initrd memory once it's not needed anymore - -commit 71468248567e6bf1e794094d9b5f87ac61de033a -Author: Judd Vinet -Date: Wed Nov 9 21:21:17 2005 +0000 - - added logic to free up initrd memory once it's not needed anymore - -commit f947ecffc4a9109d0790e5b2853e2a835b4cf81b -Author: Judd Vinet -Date: Fri Nov 4 18:29:25 2005 +0000 - - fixed a syntax bug in locale setting - -commit 826e8af03cdfc3edec0dfc382a4f4308748a08f7 -Author: Judd Vinet -Date: Fri Nov 4 09:50:36 2005 +0000 - - added support for encrypted root filesystems through the initrd - -commit e00744e1d385f80f44618baea869136dcf64c88c -Author: Judd Vinet -Date: Fri Nov 4 01:44:56 2005 +0000 - - dm changes - -commit 3f2fb1767eb2c8167a4f78999e431da73b9c8e8d -Author: Judd Vinet -Date: Fri Nov 4 00:54:22 2005 +0000 - - makedevs helper script -- not added to package yet - -commit c8a4f09b7943a7fe9a875d9fc7af7decd29db6a2 -Author: Judd Vinet -Date: Sat Oct 22 21:23:47 2005 +0000 - - added patch for wpa_supplicant support - -commit f22d7a53b09ad0e28911117412c1cd0ab5c7bb68 -Author: Judd Vinet -Date: Fri Oct 21 23:35:39 2005 +0000 - - upgpkg: initscripts 0.7.1 - -commit fa6d682d8bb1d95525e9f6540917446ad1247ea6 -Author: Judd Vinet -Date: Wed Oct 12 16:53:43 2005 +0000 - - another quick fix for netcfg stuff (no rebuild yet) - -commit 14886e1bf20897e2efbc677d6bd1846db0201cbb -Author: Judd Vinet -Date: Thu Oct 6 17:00:31 2005 +0000 - - added WIFI_WAIT parameter (no rebuild yet) - -commit 79142a38d91eaf27a6c677e0a6511f855e57e30d -Author: Judd Vinet -Date: Mon Oct 3 17:58:51 2005 +0000 - - added ability to use the netcfg menu from the NET env var - -commit 39f5db6e89fd04da3979c11c3b2761ea031cd94d -Author: Judd Vinet -Date: Thu Sep 29 07:22:25 2005 +0000 - - added tpowa's fix for locale stuff - -commit e772aeae76f2ad704a834dc17df02dbc137a6573 -Author: Judd Vinet -Date: Thu Sep 15 20:05:07 2005 +0000 - - modified netcfg/network scripts -- you can list multiple entries in NET_PROFILES that use the same INTERFACE. They will be started one at a time, and the first successful one will be kept. - -commit 0be8f5b2d33fc6160e2a62d33fc1f828218fa90a -Author: Judd Vinet -Date: Mon Jul 18 19:17:14 2005 +0000 - - fixed netcfg to remove stale dhcpcd .pid files (#2973) - -commit 00945333dc1dd08d893a6c42f395e7d3c81dad0d -Author: Judd Vinet -Date: Wed Jul 6 05:15:37 2005 +0000 - - fixed a netcfg bug where disabled profiles were being started - -commit 0fa1f0eeb3422ba0e84a346a20437172f26859da -Author: Judd Vinet -Date: Fri Jul 1 02:54:50 2005 +0000 - - fixed a --stopall bug in netcfg - -commit a440a006d7dc42ad072b13986f1f737e8f7e1719 -Author: Judd Vinet -Date: Fri Jul 1 00:13:38 2005 +0000 - - fixed some spacing in rc.multi -- cosmetic - -commit 863e8311cfc2ec7dc98fdb43abaa8499dd3414a4 -Author: Judd Vinet -Date: Thu Jun 30 23:57:54 2005 +0000 - - added new netcfg stuff for roaming network profiles - -commit 47ca58301f0bf0680baf59465202c4209b1ac112 -Author: Judd Vinet -Date: Sun Jun 5 20:30:12 2005 +0000 - - rc.sysinit now sets the NIS domain name, if configured. Also fixed a /var/locks typo - -commit 0ad54a5ba99d95c9b5dfe02f567e1f349de6a720 -Author: Judd Vinet -Date: Wed Jun 1 17:36:42 2005 +0000 - - added -q switch to sysctl - -commit b5d692b639b9e4a47cd6ba920b91a6d2ff50dc3d -Author: Judd Vinet -Date: Tue May 31 18:31:01 2005 +0000 - - moved usb setup above the Loading Modules stage, so sane and other usb things will work correctly (#2770) - -commit cc6648d06dba085b903db820ad581dd94eb669ef -Author: Judd Vinet -Date: Sun May 22 17:40:33 2005 +0000 - - added sysctl call from rc.sysinit - -commit 41e115b5973f6498ce4bfce6fe772b8d0b459700 -Author: Judd Vinet -Date: Mon Apr 18 06:59:02 2005 +0000 - - added a /proc/modules check before running modprobe, just in case the user is running a non-modular kernel - -commit c4a367e15b1bf0c9814a674c0a55084aa714245a -Author: Judd Vinet -Date: Thu Mar 24 18:53:37 2005 +0000 - - added CIFS to netfs script - -commit 8b862a2073ad6fe7303a4dbbe7d7316a60db1147 -Author: Judd Vinet -Date: Wed Mar 16 17:31:30 2005 +0000 - - updated copyright year in rc.sysinit - -commit 8aff6add70fd50b3febe363a0002098f21e2679b -Author: Judd Vinet -Date: Fri Mar 11 20:02:08 2005 +0000 - - added support for backgrounding daemons at startup with a '@' prefix, commented out the ldconfig call at startup, added support for unicode console maps, added a hotplug_ifup() function rc.d/network for hotplug's net.agent to use - -commit 22805e822d4e9fee9c1f4331dee31bccd1db45d2 -Author: Judd Vinet -Date: Sun Mar 6 20:08:29 2005 +0000 - - added logic to handle shutdown -F (forcefsck) - -commit 92d43c54f0bd5142a2a844b1910d15c808d86992 -Author: Judd Vinet -Date: Fri Feb 11 01:21:43 2005 +0000 - - added ethernet bonding support (still untested) - -commit e8a2e4663543d16fcafa4c62c75f42fdab32ff28 -Author: Judd Vinet -Date: Sun Jan 2 23:52:40 2005 +0000 - - fixed a typo in the rc.conf comments - -commit 45d3c546ee36b28c6808fb4330669b1c23437c26 -Author: Judd Vinet -Date: Tue Nov 30 07:33:19 2004 +0000 - - fixed the missing /dev/initctl problem with udev in runlevel 1 - -commit 4c1c59be80c29f73655913ff139717268ff1f50f -Author: Judd Vinet -Date: Tue Nov 23 22:58:25 2004 +0000 - - made rc.d/network pay attention to the new conf.d files (dhcpcd and wireless). also modified rc.sysinit to wait til after modules are loaded before attempting to mount /proc/bus/usb. If the user uses hotplug, then the usb host modules may not be loaded yet, but that's okay -- hotplug will mount /proc/bus/usb for them - -commit 2822ea48f2e7609232d4e4b47285d60097de2828 -Author: Judd Vinet -Date: Tue Sep 28 06:24:03 2004 +0000 - - used depmod -A in rc.sysinit to update module deps - -commit 85c899a1ca88c088aaeb679dc009687670e30ac7 -Author: Judd Vinet -Date: Fri Sep 24 17:22:34 2004 +0000 - - updated rc.single to pay attention to udev and syslog-ng - -commit 8784d3a487b1613759e871c8f8b4a4530509bdd3 -Author: Judd Vinet -Date: Sun Sep 12 19:40:51 2004 +0000 - - added fix for xorg temp directories (bug #1408) - -commit 20dceb289f61b69a98c6377921ee2a009aeefd98 -Author: Judd Vinet -Date: Fri Jul 23 01:03:08 2004 +0000 - - re-mounted / after removing /etc/mtab, so it's written to mtab properly - -commit 9f5d7b15d7b58b7a3d80a8923a2ff1952c90966a -Author: Judd Vinet -Date: Wed Jul 21 22:15:59 2004 +0000 - - re-mount /sys and /proc once / is rw so the entries can be written to /etc/mtab - -commit ef0a365fc88fd1b02883dd42e0afb0929fbfa3f4 -Author: Judd Vinet -Date: Sun Jul 18 21:28:41 2004 +0000 - - fixed the sysfs problem with 2.4 - -commit 5ef7c1839eed06599d615380dae4447fe43dfb34 -Author: Judd Vinet -Date: Fri Jul 16 03:03:26 2004 +0000 - - modified ifdown to bring a dhcp'd eth0 down even if the .pid file is not found (#756) - -commit 2881e158d80e1203d2fae41ff2ce0f122b132e45 -Author: Judd Vinet -Date: Fri Jul 16 01:03:51 2004 +0000 - - made syslog-ng Arch's new default logger - -commit 3280eeff177ecf79c32213303c9eb320b579d040 -Author: Judd Vinet -Date: Fri Jul 16 00:27:57 2004 +0000 - - updated version header to 0.7, added support for udev and static /dev trees - -commit 2c20f4d5637da88e983b65db9c97373aa79d8a37 -Author: Judd Vinet -Date: Sat Jul 3 19:40:02 2004 +0000 - - added iflist and rtlist functions and made ifup,ifdown,rtup,rtdown accessible from outside the script - -commit cd0e2c63acc50d080edba54b797f7f1c58da1312 -Author: Judd Vinet -Date: Thu May 27 00:30:15 2004 +0000 - - fixed the lvm2 segfault on shutdown - -commit f396331a675e17ef282b56ea228e66383d401400 -Author: Judd Vinet -Date: Wed May 19 16:56:48 2004 +0000 - - added sysfs mounting to fix LVM2 segfaults - -commit 446e095bdfb1d4d9c31f729d4169aa4a9f44797f -Author: Judd Vinet -Date: Tue May 18 23:40:53 2004 +0000 - - added better LVM handling - -commit e555d5efc43f7e8597dd90482e145f6d1936faf8 -Author: Judd Vinet -Date: Tue May 11 21:34:59 2004 +0000 - - added hotplug to the DAEMONS array (disabled by default) - -commit 262af2251dd4675e3664435068d4a96b21ab7d74 -Author: Judd Vinet -Date: Fri Mar 26 20:01:07 2004 +0000 - - added -h arg to poweroff to park the hard drives - -commit abbe7921517e87dcf3fa61036d26d72bc714257a -Author: Judd Vinet -Date: Sun Feb 29 23:09:37 2004 +0000 - - added --ignorelockingfailure during startup vgchange (LVM2) - -commit 0d76f45bffddced00c83b0c06f1be796a780366b -Author: Judd Vinet -Date: Sun Feb 29 07:03:00 2004 +0000 - - updated for LVM2 - -commit d9f8f3c07bcf1ab349fa6484980a04ef57c7212c -Author: Judd Vinet -Date: Mon Feb 23 03:32:36 2004 +0000 - - added setup commands for LVM2 - -commit d4a5c5ef402ca7315e5429eaccb0748e38b964af -Author: Judd Vinet -Date: Thu Feb 19 18:50:09 2004 +0000 - - added cleanups by Leif Askeland - -commit 45ede7cf9dd872c580e9c2a57a00b0350f035371 -Author: Judd Vinet -Date: Wed Feb 18 19:35:17 2004 +0000 - - updated copyright - -commit b6fab06a33cb0c829731c3123ef35444c6909d72 -Author: Judd Vinet -Date: Fri Jan 30 18:30:06 2004 +0000 - - added a rc.d/netfs script to mount network-based filesystems from DAEMONS - -commit 4abccbdf439817f1328547f1f22db969fe6d8591 -Author: Judd Vinet -Date: Sat Jan 10 00:46:13 2004 +0000 - - fixed a kernel 2.6 bug re: console fonts - -commit a7768b2ae842c55413b1dce8a3f19e7c730885fa -Author: Judd Vinet -Date: Tue Dec 30 22:42:18 2003 +0000 - - network-based mounts are not mounted til rc.multi runs - -commit 9009002d949745ec8824662680c06cf34040dba8 -Author: Judd Vinet -Date: Tue Dec 30 22:37:50 2003 +0000 - - removed a debug comment - -commit 4fa550ea84f951b4afe5c2e4af4aad32b7a901f6 -Author: Judd Vinet -Date: Tue Dec 30 22:23:36 2003 +0000 - - added a cosmetic fix to ifdown() in rc.d/network - -commit e9b62e0418df5ce6db98de36837bab2922154229 -Author: Judd Vinet -Date: Sun Dec 21 08:58:37 2003 +0000 - - removed a leftover debugging statement - -commit a71e42c461da1672582143a829654049399616e7 -Author: Judd Vinet -Date: Sun Dec 21 00:48:23 2003 +0000 - - upgpkg: initscripts 0.6 - -commit 53ae13821436183990e40cffefa8c9cff4b4f2ae -Author: Judd Vinet -Date: Fri Oct 10 22:24:34 2003 +0000 - - fixed the licensing line - -commit 93dd5710cf2273c228135959c22f9e4f33d78477 -Author: Judd Vinet -Date: Fri Oct 10 01:26:53 2003 +0000 - - added a missing space - -commit 065e944539ec9b527fa163317c0a633c872c809b -Author: Judd Vinet -Date: Fri Oct 10 01:16:08 2003 +0000 - - a little formatting improvement - -commit 7f4117b05f9e4730657779ec7d4b3b08ba12616c -Author: Judd Vinet -Date: Fri Oct 10 01:10:18 2003 +0000 - - added color to rc messages and fixed bug #168 - -commit be8b6f59470b8779c3d4e10b3045507920931896 -Author: Judd Vinet -Date: Sat Oct 4 07:41:42 2003 +0000 - - added -x check to /sbin/fsck, so reiserfs users can uninstall e2fsprogs without script errors - -commit 3a161b0240eb8eedcc8affb5e0c5b92d058619d9 -Author: Judd Vinet -Date: Fri Sep 19 05:16:21 2003 +0000 - - added consolefont setting to rc.conf - -commit 6ea51dec01002c6b392c374fa70a62020edffd84 -Author: Judd Vinet -Date: Fri Sep 19 04:57:20 2003 +0000 - - added timeout to dhcp startup - -commit 2a48c5bd8db694cfe3a26cc3ef92e36050859b31 -Author: Judd Vinet -Date: Fri Sep 19 04:29:34 2003 +0000 - - modified network script to not bail out on error - -commit 25223b3c0c1be7d320299af4e31062295694098a -Author: Judd Vinet -Date: Mon Aug 25 19:15:49 2003 +0000 - - improved lvm detection/activation - -commit da04ddf1b88b62ad77db29b8efa33649a0871b58 -Author: Judd Vinet -Date: Sat Jul 12 19:21:26 2003 +0000 - - added a check for lvmtab before activating LVM groups - -commit e39affb13f412f21a93205431c2abc625b4238a4 -Author: Judd Vinet -Date: Wed Jul 9 02:13:45 2003 +0000 - - removed the conf.d stuff -- conf.d files will be parsed individually by the rc.d scripts to avoid name collisions - -commit d69b11e73a70c9c0ed6cd888ff4ac4eb3e877ec2 -Author: Judd Vinet -Date: Wed Jun 4 00:22:45 2003 +0000 - - fixed a rc.sysinit bug and moved conf.d parsing to the top of rc.conf - -commit 18c7679d90ca5c1c9508548c35c0a4ea14ca4d6f -Author: Judd Vinet -Date: Tue May 27 18:29:39 2003 +0000 - - fixed a small typo - -commit 2e25861ad03003273707fa604522e3390c24f895 -Author: Judd Vinet -Date: Tue May 27 17:14:50 2003 +0000 - - moved nfsmount to nfs-utils - -commit ba769985bf38b1eb4e54f0e19d8b3502216646d6 -Author: Judd Vinet -Date: Mon May 26 22:22:04 2003 +0000 - - added lvm handling - -commit df91d849d2c19bd070473da49dd8befc7aae978c -Author: Judd Vinet -Date: Fri May 23 23:58:57 2003 +0000 - - upgpkg: initscripts 0.5 - -commit ead9f8db5fe817f019512681d5169dffad705357 -Author: Judd Vinet -Date: Thu May 8 18:12:46 2003 +0000 - - added -D, -H, and -h to the dhcp line - -commit a85df6abb081d7a7d51b00e7e301d1497fede30a -Author: Judd Vinet -Date: Fri Feb 7 17:05:02 2003 +0000 - - updated PKGBUILD release - -commit e4398c2e693441b8844645ee69fd3b7e483b3530 -Author: Judd Vinet -Date: Fri Feb 7 16:58:42 2003 +0000 - - added the MODULES=() line to rc.conf, with loading in rc.sysinit - -commit f6081f262419c2a4880d372636e391a52e148782 -Author: Judd Vinet -Date: Tue Jan 7 01:48:51 2003 +0000 - - updated rc.single to shutdown daemons correctly - -commit 6c4a6fc1938f12ee85b4f593de64a8776e5c1ba0 -Author: Judd Vinet -Date: Mon Jan 6 23:23:41 2003 +0000 - - kill dhcpcd pid files before running the client daemon - -commit 19c04471ce76a3f803fdf47b964880266b529070 -Author: Judd Vinet -Date: Sat Dec 14 00:13:55 2002 +0000 - - fixed the location of adjtime - -commit 96cb8c51e0ddb57f382c958ebb7808baaa258765 -Author: Judd Vinet -Date: Thu Dec 12 22:27:36 2002 +0000 - - modified to stat_fail to return a $retval - -commit 81da8c411f590b436e0cffcae9dd4c30598d35b2 -Author: Judd Vinet -Date: Fri Nov 29 09:06:45 2002 +0000 - - fixed a syntax bug in rc.sysinit - -commit c5f67416f3250e0d16eb2e588fc2b62435727d3c -Author: Judd Vinet -Date: Wed Nov 27 00:36:14 2002 +0000 - - fix - -commit 43cda626dbc05e92dffc0027ef19db9d3cc44d37 -Author: Judd Vinet -Date: Tue Nov 26 23:26:48 2002 +0000 - - added nfsmount (from jk) - -commit c8cd508809408a0be9f1fbeb65775ab7fb083f3b -Author: Judd Vinet -Date: Tue Nov 26 18:17:31 2002 +0000 - - Added utf hwclock support (from user patch) - -commit 914b0b3b572a3d5d311682a88424d165589798f1 -Author: Judd Vinet -Date: Sat Nov 23 20:37:55 2002 +0000 - - added jk's changes: system clock is set earlier on, and modules.dep is only - updated if new modules are present. - -commit dd4248ed74b9adce32910ee95274719249220757 -Author: Judd Vinet -Date: Wed Aug 28 21:43:10 2002 +0000 - - removed PROFILES array - -commit eb2f42cba2d8134e83321810dcad897cc88e4716 -Author: Judd Vinet -Date: Sat Aug 24 20:54:22 2002 +0000 - - rc.sysinit removes /var/run/daemons/* on bootup - -commit fd8fde036ab46b593590b362bc94b051e432a295 -Author: Judd Vinet -Date: Wed Jul 24 02:57:16 2002 +0000 - - Upgraded initscripts to 0.3 - -commit 2b503065569fa2ffedf5eafc76158c74062ac49b -Author: Judd Vinet -Date: Tue Jun 11 05:07:54 2002 +0000 - - nada - -commit efa9a6d681b87fa4b8e321173690144b17a08d35 -Author: Judd Vinet -Date: Sat Apr 27 21:04:15 2002 +0000 - - Added DHCP handling to initscripts - -commit 30277f5e1ce30a10ed08ae2529282718c86ac826 -Author: Judd Vinet -Date: Fri Apr 19 17:16:37 2002 +0000 - - *** empty log message *** - -commit f7a1c1ba6c35069ed6086e41146471fe97856325 -Author: Judd Vinet -Date: Fri Apr 19 17:15:35 2002 +0000 - - *** empty log message *** - -commit 3a3db1e368443447d7eaec461110bb122d026d83 -Author: Judd Vinet -Date: Fri Apr 19 17:13:21 2002 +0000 - - Cleaned up networking in initscripts - -commit cd5a839558fa3e5b10423fa33e621be2f27acf12 -Author: Judd Vinet -Date: Fri Apr 19 07:28:04 2002 +0000 - - Updated for /etc/profile.d - -commit f5e0fa814e1f31279509645a25057dcefa5eaadc -Author: Judd Vinet -Date: Tue Apr 16 03:59:06 2002 +0000 - - Updated network rc script with jproctor's disable-eth changes - -commit 8bc78f134bf719b16a3b3b2a7cea947fbf526e3b -Author: Judd Vinet -Date: Mon Apr 15 16:45:38 2002 +0000 - - Added arch-release to filesystem - Fixed initscripts (again) - -commit b840b6f59bfa39bceb663ad1b40f4c0ff5984366 -Author: Judd Vinet -Date: Mon Apr 15 07:00:55 2002 +0000 - - *** empty log message *** - -commit 9a59bb9539dacac884b9c3b0088e22ba762f2b9b -Author: Judd Vinet -Date: Mon Apr 15 06:53:10 2002 +0000 - - Updated initscripts - -commit 2f4936aec49df2c681ae0862103cee8376c5ab57 -Author: Judd Vinet -Date: Mon Apr 15 06:47:05 2002 +0000 - - Bugfix for initscripts - -commit 5b61b6c2bf49d75df992a4dc39757e66a536dbcd -Author: Judd Vinet -Date: Mon Apr 15 06:41:16 2002 +0000 - - Updated initscripts for multiple ethernet interfaces - -commit 91fd2beff99c9e623a201c8221964353c8669044 -Author: Judd Vinet -Date: Thu Apr 11 05:06:15 2002 +0000 - - Updated installer script - Added package dhcpcd - Took ash job control out of busybox for bootdisk - -commit 2cb34b31712bf72ae6c30e5029572463152a082f -Author: Judd Vinet -Date: Sun Mar 24 08:50:48 2002 +0000 - - Fixed a runlevel bug in initscripts - -commit 65405267704892a9bcb42186c95adcf4566cbf8c -Author: Judd Vinet -Date: Sun Mar 24 08:40:40 2002 +0000 - - Added rc.d network script to initscripts - -commit eea6fee11ad792708d6b8fbf0cb5b42b00ea1c91 -Author: Judd Vinet -Date: Thu Mar 14 08:34:49 2002 +0000 - - Removed all filelist files from repository - -commit 57d51e9a853fc21be0e733253ac56f2d9756d3a7 -Author: Judd Vinet -Date: Wed Mar 13 08:05:47 2002 +0000 - - Updated inittab for X11 - -commit d0ea35d522f7e68b198afe01bf369463af56259f -Author: Judd Vinet -Date: Tue Mar 12 05:37:01 2002 +0000 - - Rebuild package pcmcia-cs for 2.4.18 - Tweaked initscripts/filesystem - Added doc/install.txt and misc/cdboot/etc/issue and scripts/makerelease - -commit 14e3f9480a7364200b999477fa4ab9da16884831 -Author: Judd Vinet -Date: Mon Mar 11 00:58:34 2002 +0000 - - Removed rc.proto, updated rc.single - -commit 325b46a6b02aee695658eafe6b714d0e02810e1a -Author: Judd Vinet -Date: Sat Mar 9 10:07:16 2002 +0000 - - Added some rudimentary networking stuff - -commit 897380f9b8071b8df0dcdb85cc9e1424640762b9 -Author: Judd Vinet -Date: Tue Mar 5 04:59:03 2002 +0000 - - Changed name to Arch Linux - -commit 98c76a453222169f12b0e95f8a7ed0175e182598 -Author: Judd Vinet -Date: Mon Mar 4 07:28:25 2002 +0000 - - Initial revision diff --git a/abs/core-testing/initscripts/PKGBUILD b/abs/core-testing/initscripts/PKGBUILD deleted file mode 100644 index df2897e..0000000 --- a/abs/core-testing/initscripts/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 85250 2010-07-11 09:54:57Z thomas $ -# Maintainer: Thomas Bächler -# Maintainer: Aaron Griffin - -pkgname=initscripts -pkgver=2010.07 -pkgrel=1 -pkgdesc="System initialization/bootup scripts" -arch=('i686' 'x86_64') -url="http://www.archlinux.org" -license=('GPL') -groups=('base') -backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown) -depends=('glibc' 'bash' 'awk' 'grep' 'coreutils' 'sed' 'udev>=139-1' - 'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit') -optdepends=('bridge-utils: Network bridging support' - 'dhcpcd: DHCP network configuration' - 'wireless_tools: Wireless networking') -install=initscripts.install -source=(ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}-${pkgrel}.tar.xz rc.sysinit.patch rc.shutdown.patch) - -build() { - cd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}/ - patch -p0 < ${srcdir}/rc.sysinit.patch || exit 1 - patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1 - DESTDIR=${pkgdir} ./install.sh -} -sha256sums=('16b89a9108deacb7d2afd965e59e31aa4b313fc4d1a660fb3cc1fa5c28cfc053' - '3a8a82edd680263c4ffa7289fdb6dac69d4611905d093ee3457c00e008e95a1a' - 'caeb8d9e56783d01001875ffa12d207bc78e06d0fbe3883ce1b68efdfa6ce195') -sha256sums=('16b89a9108deacb7d2afd965e59e31aa4b313fc4d1a660fb3cc1fa5c28cfc053' - '3a8a82edd680263c4ffa7289fdb6dac69d4611905d093ee3457c00e008e95a1a' - 'fd5248ccfc927ca0d8722cec61c041083b4bf79126176d18d51d5e21378ec5fa') diff --git a/abs/core-testing/initscripts/__changelog b/abs/core-testing/initscripts/__changelog deleted file mode 100644 index 8d03d24..0000000 --- a/abs/core-testing/initscripts/__changelog +++ /dev/null @@ -1 +0,0 @@ -Patch init scripts diff --git a/abs/core-testing/initscripts/initscripts.install b/abs/core-testing/initscripts/initscripts.install deleted file mode 100644 index 360101c..0000000 --- a/abs/core-testing/initscripts/initscripts.install +++ /dev/null @@ -1,7 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 2009.07)" -lt 0 ]; then - echo "==> Adjusting /etc/inittab for transition to /dev/tty standard." - echo "==> Original file saved as /etc/inittab.pacsave" - sed -i'.pacsave' 's#vc/\([0-9]\)#tty\1#' /etc/inittab - fi -} diff --git a/abs/core-testing/initscripts/rc.shutdown.patch b/abs/core-testing/initscripts/rc.shutdown.patch deleted file mode 100644 index 329164d..0000000 --- a/abs/core-testing/initscripts/rc.shutdown.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- rc.shutdown.orig 2010-08-08 23:50:24.000000000 +0000 -+++ rc.shutdown 2010-08-08 23:51:37.000000000 +0000 -@@ -32,6 +32,12 @@ - fi - done - fi -+#unmount network filesystems for runit -+#if [ -e /var/services/netfs ] -+#then -+ /etc/rc.d/netfs stop -+#fi -+ - # Shutdown daemons in reverse order - let i=${#DAEMONS[@]}-1 - while [ $i -ge 0 ]; do diff --git a/abs/core-testing/initscripts/rc.sysinit.patch b/abs/core-testing/initscripts/rc.sysinit.patch deleted file mode 100644 index b0253d0..0000000 --- a/abs/core-testing/initscripts/rc.sysinit.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- rc.sysinit.orig 2010-08-08 23:42:36.000000000 +0000 -+++ rc.sysinit 2010-08-08 23:44:28.000000000 +0000 -@@ -7,10 +7,9 @@ - . /etc/rc.d/functions - - echo " " --printhl "Arch Linux\n" --printhl "${C_H2}http://www.archlinux.org" --printhl "Copyright 2002-2007 Judd Vinet" --printhl "Copyright 2007-2010 Aaron Griffin" -+printhl "LinHES\n" -+printhl "The Linux Home Entertainment System\n" -+printhl "${C_H2}http://www.linhes.org" - printhl "Distributed under the GNU General Public License (GPL)" - printsep - diff --git a/abs/core-testing/inputproto/PKGBUILD b/abs/core-testing/inputproto/PKGBUILD deleted file mode 100644 index 2741bb7..0000000 --- a/abs/core-testing/inputproto/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 54533 2009-10-11 09:28:09Z andyrtr $ -# Maintainer: Jan de Groot - -pkgname=inputproto -pkgver=2.0 -pkgrel=1 -pkgdesc="X11 Input extension wire protocol" -arch=(any) -license=('custom') -url="http://xorg.freedesktop.org/" -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -md5sums=('0f7acbc14a082f9ae03744396527d23d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 -} diff --git a/abs/core-testing/intltool/ChangeLog b/abs/core-testing/intltool/ChangeLog deleted file mode 100644 index 4419f0f..0000000 --- a/abs/core-testing/intltool/ChangeLog +++ /dev/null @@ -1,38 +0,0 @@ -2009-03-15 Eric Belanger - - * intltool 0.40.6-1 - * Upstream update - -2009-02-07 Eric Belanger - - * Added I18N-HOWTO doc (close FS#12889) - -2008-11-28 Jan de Groot - - * intltool 0.40.5-1 - * Upstream update - -2008-09-25 Jan de Groot - - * intltool 0.40.4-1 - * Upstream update - -2008-07-28 Eric Belanger - - * intltool 0.40.3-1 - * Upstream update - -2008-07-23 Eric Belanger - - * intltool 0.40.1-1 - * Upstream update - -2008-06-08 Eric Belanger - - * intltool 0.40.0-1 - * Upstream update - -2008-03-01 Eric Belanger - - * intltool 0.37.1-1 - * Upstream update diff --git a/abs/core-testing/intltool/PKGBUILD b/abs/core-testing/intltool/PKGBUILD deleted file mode 100644 index d367e29..0000000 --- a/abs/core-testing/intltool/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 30076 2009-03-16 03:02:39Z eric $ -# Maintainer: Eric Belanger -# Contributor: Jan de Groot - -pkgname=intltool -pkgver=0.40.6 -pkgrel=1 -pkgdesc="The internationalization tool collection" -arch=('i686' 'x86_64') -url="http://freedesktop.org/wiki/Software/intltool" -license=('GPL') -depends=('perlxml') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('69bc0353323112f42ad4f9cf351bc3e5') -sha1sums=('4f6469e09e2c06a8072dffff36f84ff401d7ea75') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -D -m644 doc/I18N-HOWTO ${pkgdir}/usr/share/doc/${pkgname}/I18N-HOWTO || return 1 -} diff --git a/abs/core-testing/iproute2/PKGBUILD b/abs/core-testing/iproute2/PKGBUILD deleted file mode 100644 index 38b5a4c..0000000 --- a/abs/core-testing/iproute2/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 82589 2010-06-14 06:49:40Z ronald $ -# Maintainer: Ronald van Haren -# Contributor: Judd Vinet - -pkgname=iproute2 -pkgver=2.6.34 -pkgrel=2 -pkgdesc="IP Routing Utilities" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://www.linux-foundation.org/en/Net:Iproute2" -depends=('linux-atm' 'perl') -provides=('iproute') -conflicts=('iproute') -replaces=('iproute') -options=('!makeflags') -backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ - 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') -source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2 - 'iproute2-fhs.patch' 'tc.patch') -sha1sums=('b57f98e284c68a464b9c3e132d29760de6331688' - 'ae7c4529555e1dce389fcedcbb7e0df5c726741a' - 'de7ffa44922741c1239e1715e1d81d8f4e7b04e4') - -build() { - cd $srcdir/iproute2-${pkgver} - - # set correct fhs structure - patch -Np1 -i ${srcdir}/iproute2-fhs.patch || return 1 - patch -Np0 -i ${srcdir}/tc.patch || return 1 - ./configure || return 1 - make || return 1 -} - -package() { - cd $srcdir/iproute2-${pkgver} - - make DESTDIR=$pkgdir install || return 1 - - # libnetlink isn't installed, install it FS#19385 - install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h || return 1 - install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a || return 1 -} - diff --git a/abs/core-testing/iproute2/iproute2-2.4.7-now-ss020116.patch b/abs/core-testing/iproute2/iproute2-2.4.7-now-ss020116.patch deleted file mode 100644 index 0e37865..0000000 --- a/abs/core-testing/iproute2/iproute2-2.4.7-now-ss020116.patch +++ /dev/null @@ -1,9823 +0,0 @@ -diff -Naur iproute2-orig/Makefile iproute2/Makefile ---- iproute2-orig/Makefile 2002-01-15 15:30:32.000000000 -0800 -+++ iproute2/Makefile 2004-05-21 00:16:36.000000000 -0700 -@@ -4,8 +4,6 @@ - CONFDIR=/etc/iproute2 - DOCDIR=/usr/doc/iproute2 - --KERNEL_INCLUDE=/usr/src/linux/include --LIBC_INCLUDE=/usr/include - - DEFINES= -DRESOLVE_HOSTNAMES - -@@ -23,19 +21,11 @@ - #options for ipx - ADDLIB+=ipx_ntop.o ipx_pton.o - --ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h)) -- ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h)) -- GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h -- endif --endif --ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h)) -- GLIBCFIX=-I../include-glibc -I/usr/include/db3 -include ../include-glibc/glibc-bugs.h --endif - - - CC = gcc - CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g --CFLAGS = $(CCOPTS) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES) -+CFLAGS = $(CCOPTS) -I../include $(DEFINES) - - LDLIBS += -L../lib -lnetlink -lutil - -@@ -43,19 +33,11 @@ - - LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a - --all: check-kernel -+all: - @set -e; \ - for i in $(SUBDIRS); \ - do $(MAKE) -C $$i; done - --check-kernel: --ifeq ($(KERNEL_INCLUDE),) -- @echo "Please, set correct KERNEL_INCLUDE"; false --else -- @set -e; \ -- if [ ! -r $(KERNEL_INCLUDE)/linux/autoconf.h ]; then \ -- echo "Please, compile the kernel first"; false; fi --endif - - install: all - install -m 0755 -d $(DESTDIR)$(SBINDIR) -diff -Naur iproute2-orig/Makefile~ iproute2/Makefile~ ---- iproute2-orig/Makefile~ 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/Makefile~ 2002-01-15 15:30:32.000000000 -0800 -@@ -0,0 +1,77 @@ -+# Path to parent kernel include files directory -+DESTDIR= -+SBINDIR=/sbin -+CONFDIR=/etc/iproute2 -+DOCDIR=/usr/doc/iproute2 -+ -+KERNEL_INCLUDE=/usr/src/linux/include -+LIBC_INCLUDE=/usr/include -+ -+DEFINES= -DRESOLVE_HOSTNAMES -+ -+#options if you have a bind>=4.9.4 libresolv (or, maybe, glibc) -+LDLIBS=-lresolv -+ADDLIB= -+ -+#options if you compile with libc5, and without a bind>=4.9.4 libresolv -+#LDLIBS= -+#ADDLIB=inet_ntop.o inet_pton.o -+ -+#options for decnet -+ADDLIB+=dnet_ntop.o dnet_pton.o -+ -+#options for ipx -+ADDLIB+=ipx_ntop.o ipx_pton.o -+ -+ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h)) -+ ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h)) -+ GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h -+ endif -+endif -+ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h)) -+ GLIBCFIX=-I../include-glibc -I/usr/include/db3 -include ../include-glibc/glibc-bugs.h -+endif -+ -+ -+CC = gcc -+CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -+CFLAGS = $(CCOPTS) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES) -+ -+LDLIBS += -L../lib -lnetlink -lutil -+ -+SUBDIRS=lib ip tc misc -+ -+LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a -+ -+all: check-kernel -+ @set -e; \ -+ for i in $(SUBDIRS); \ -+ do $(MAKE) -C $$i; done -+ -+check-kernel: -+ifeq ($(KERNEL_INCLUDE),) -+ @echo "Please, set correct KERNEL_INCLUDE"; false -+else -+ @set -e; \ -+ if [ ! -r $(KERNEL_INCLUDE)/linux/autoconf.h ]; then \ -+ echo "Please, compile the kernel first"; false; fi -+endif -+ -+install: all -+ install -m 0755 -d $(DESTDIR)$(SBINDIR) -+ install -m 0755 -d $(DESTDIR)$(CONFDIR) -+ install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples -+ install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv -+ install -m 0644 README.iproute2+tc $(shell find examples -type f -maxdepth 1) $(DESTDIR)$(DOCDIR)/examples -+ install -m 0644 $(shell echo examples/diffserv/*) $(DESTDIR)$(DOCDIR)/examples/diffserv -+ @for i in $(SUBDIRS) doc; do $(MAKE) -C $$i install; done -+ @cd etc/iproute2; for i in *; do \ -+ if [ ! -e $(DESTDIR)$(CONFDIR)/$$i ]; then \ -+ echo install -m 0644 $$i $(DESTDIR)$(CONFDIR); \ -+ install -m 0644 $$i $(DESTDIR)$(CONFDIR); fi; done -+ -+clean: -+ for i in $(SUBDIRS) doc; \ -+ do $(MAKE) -C $$i clean; done -+ -+.EXPORT_ALL_VARIABLES: -diff -Naur iproute2-orig/debian/README.Debian iproute2/debian/README.Debian ---- iproute2-orig/debian/README.Debian 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/README.Debian 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,4 @@ -+This version of "iproute" includes the HTB Linux queuing discipline -+explained in http://luxik.cdi.cz/~devik/qos/htb/ -+ -+You need kernel version 2.4.21 or newer in order to use it. -diff -Naur iproute2-orig/debian/changelog iproute2/debian/changelog ---- iproute2-orig/debian/changelog 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/changelog 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,207 @@ -+iproute (20010824-13) unstable; urgency=low -+ -+ * debian/rules: Run dpkg-shlibdeps with all the executables, -+ to fix dependency problem (closes: Bug#224063) -+ * Really removed references to obsolete include files -+ (Bug#223165 was not fixed properly) -+ -+ -- Juan Cespedes Sun, 25 Jan 2004 23:04:20 +0100 -+ -+iproute (20010824-12) unstable; urgency=low -+ -+ * Updated README.Debian and copyright file -+ * Added two new manpages from http://lartc.org/manpages/: -+ ip(8) and tc-cbq-details(8). -+ * Removed references to obsolete include files which made -+ compilation fail (closes: Bug#223165) -+ -+ -- Juan Cespedes Sun, 14 Dec 2003 00:40:10 +0100 -+ -+iproute (20010824-11) unstable; urgency=low -+ -+ * Changed priority to "optional" -+ * Fixed "tc -s qdisc" on sparc (patch by "Nicolas S. Dade" -+ ) (closes: Bug#194128) -+ -+ -- Juan Cespedes Sun, 17 Aug 2003 00:22:47 +0200 -+ -+iproute (20010824-10) unstable; urgency=low -+ -+ * Updated manual pages from http://www.lartc.org/manpages/ -+ (closes: Bug#156353, Bug#175313, Bug#176989, Bug#189095) -+ * New Standards-Version -+ * Don't "rm -rf /etc/iproute2" on purge (closes: Bug#202862) -+ * Include "iproute2" in the description (closes: Bug#182999) -+ -+ -- Juan Cespedes Sat, 16 Aug 2003 18:29:27 +0200 -+ -+iproute (20010824-9) unstable; urgency=medium -+ -+ * Added patch for HTB v3.6 to be able to work with kernel 2.4.20 -+ (from http://luxik.cdi.cz/~devik/qos/htb/v3/htb3.6-020525.tgz) -+ (closes: Bug#147550, Bug#167149, Bug#167597, Bug#171277) -+ -+ -- Juan Cespedes Thu, 05 Dec 2002 13:44:10 +0100 -+ -+iproute (20010824-8) unstable; urgency=medium -+ -+ * Added support for HTB queuing discipline (closes: Bug#133381) -+ NOTE: you need a patched kernel in order to use it -+ -+ -- Juan Cespedes Tue, 2 Apr 2002 20:29:40 +0200 -+ -+iproute (20010824-7) unstable; urgency=medium -+ -+ * Move `ip' binary to /bin to fix FHS violation (closes: Bug#134812) -+ -+ -- Juan Cespedes Mon, 4 Mar 2002 00:20:30 +0100 -+ -+iproute (20010824-6) unstable; urgency=low -+ -+ * Added a couple of #ifdef's to be able to compile with older -+ kernel headers (needed for arm) (closes: Bug#131695) -+ -+ -- Juan Cespedes Sat, 16 Feb 2002 19:27:15 +0100 -+ -+iproute (20010824-5) unstable; urgency=low -+ -+ * Really fix Bug#121589 (dead gateway bug); apparently I -+ forgot to include the patch in 20010824-2 -+ -+ -- Juan Cespedes Tue, 29 Jan 2002 23:22:24 +0100 -+ -+iproute (20010824-4) unstable; urgency=low -+ -+ * Added support for DIFFSERV and ATM in tc -+ -+ -- Juan Cespedes Sun, 13 Jan 2002 03:01:47 +0100 -+ -+iproute (20010824-3) unstable; urgency=low -+ -+ * Updated tc* man pages (thanks to bert hubert ) -+ * Fixed spurious space in `tc -s qdisc' output (closes: Bug#128501) -+ -+ -- Juan Cespedes Thu, 10 Jan 2002 22:18:25 +0100 -+ -+iproute (20010824-2) unstable; urgency=low -+ -+ * Fixed the following important and serious bugs: -+ + iproute doesn't compile on Alpha (closes: Bug#118113, Bug#123224) -+ + iproute doesn't compile on MIPS (closes: Bug#118424) -+ + iproute doesn't compile on powerpc (closes: Bug#119601) -+ * Added man pages for tc (closes: Bug#124230), tc-cbq, tc-red, tc-tbf, -+ tc-prio and tc-sfq -+ * Removed references to old programs from iproute(7) (closes: Bug#99536) -+ * Fixed bug which presented first hop as dead in equal cost multipath -+ (closes: Bug#121589) -+ * Do not process .ps with through `psnup' (closes: Bug#119820) -+ -+ -- Juan Cespedes Tue, 8 Jan 2002 16:07:27 +0100 -+ -+iproute (20010824-1) unstable; urgency=low -+ -+ * New upstream version -+ * Make ingress qdisc work again with tc (closes: Bug#84444) -+ * Make it compile properly with new include files (closes: Bug#113112) -+ -+ -- Juan Cespedes Sun, 28 Oct 2001 16:38:00 +0100 -+ -+iproute (20001007-1) unstable; urgency=low -+ -+ * New upstream version (closes: Bug#63701) -+ * Remove /etc/iproute2 on purge (closes: Bug#72743) -+ * Fixed Lintian warnings (no-priority-field and no-section-field) -+ -+ -- Juan Cespedes Sat, 14 Oct 2000 19:27:12 +0200 -+ -+iproute (991023-2) unstable; urgency=low -+ -+ * New Standards-Version (3.1.1) (closes: Bug#47923) -+ * Modified description of package to show which kernel options are -+ necessary to use the package (closes: Bug#47922) -+ * Updated manual page to point at /usr/share/doc/iproute (closes: Bug#47924) -+ -+ -- Juan Cespedes Sun, 19 Dec 1999 04:00:21 +0100 -+ -+iproute (991023-1) unstable; urgency=low -+ -+ * New upstream version (closes: Bug#48733) -+ -+ -- Juan Cespedes Tue, 2 Nov 1999 16:29:37 +0100 -+ -+iproute (990824-1) unstable; urgency=low -+ -+ * New maintainer -+ * New upstream version -+ * New Standards-Version: 3.1.0 -+ * Minor fix in "ip rule list": mask in "from" address was not shown -+ correctly -+ * Removed obsoleted documentation from "debian/" directory -+ -+ -- Juan Cespedes Sun, 24 Oct 1999 19:02:56 +0200 -+ -+iproute (990630-1) unstable; urgency=low -+ -+ * New upstream version. -+ * FHS and standards 3.0.1.0. -+ -+ -- Roberto Lumbreras Tue, 3 Aug 1999 02:49:28 +0200 -+ -+iproute (990530-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Build with 2.2.10 kernel headers. -+ * Install new scripts ip/routef ip/routel, but not ip/ifcfg ip/rtpr by -+ now, I don't know who/what needs rtpr; ifcfg uses arping, and it isn't -+ available in debian for now. -+ -+ -- Roberto Lumbreras Tue, 22 Jun 1999 02:28:53 +0200 -+ -+iproute (990329-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Build with 2.2.5 kernel headers. -+ -+ -- Roberto Lumbreras Sun, 4 Apr 1999 18:50:39 +0200 -+ -+iproute (980630-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Build with 2.1.112 kernel headers. -+ * Rewrote the rules file. -+ -+ -- Roberto Lumbreras Wed, 29 Jul 1998 23:37:52 +0200 -+ -+iproute (980119-1) unstable; urgency=low -+ -+ * Outdated documentation. Upstream docs are scarce. -+ * Non-Maintainer release -+ * This package has no correct copyright file! -+ * Include all the README.* docs from the upstream site. -+ * Modified to build under glibc -+ * Build with 2.1.85 kernel headers. -+ * produce a correct diff. -+ * Reworked the rules file to utilize debmake fully -+ * Newest upstream release -+ * glibc compilation -+ -+ -- Christoph Lameter Wed, 4 Feb 1998 13:37:28 -0800 -+ -+iproute (961225-2) unstable frozen; urgency=low -+ -+ * Added a man page for iproute. (Fixes #8080). -+ * Removed out-of-date patches. -+ * Added routing.txt from /usr/src/linux/Documentation/networking/routing.txt -+ * Newer version of debmake. -+ -+ -- Tom Lees Mon, 17 Apr 1997 17:00:36 +0100 -+ -+iproute (961225-1) unstable; urgency=low -+ -+ * Initial Release. -+ -+ -- Tom Lees Mon, 30 Dec 1996 11:12:23 +0000 -+ -+Local variables: -+mode: debian-changelog -+End: -diff -Naur iproute2-orig/debian/conffiles iproute2/debian/conffiles ---- iproute2-orig/debian/conffiles 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/conffiles 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,5 @@ -+/etc/iproute2/rt_dsfield -+/etc/iproute2/rt_protos -+/etc/iproute2/rt_realms -+/etc/iproute2/rt_scopes -+/etc/iproute2/rt_tables -diff -Naur iproute2-orig/debian/control iproute2/debian/control ---- iproute2-orig/debian/control 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/control 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,19 @@ -+Source: iproute -+Section: net -+Priority: optional -+Maintainer: Juan Cespedes -+Standards-Version: 3.6.0 -+Build-Depends: tetex-bin, atm-dev -+ -+Package: iproute -+Architecture: any -+Depends: ${shlibs:Depends} -+Description: Professional tools to control the networking in Linux kernels -+ This is `iproute', the professional set of tools to control the -+ networking behavior in kernels 2.2.x and later. -+ . -+ At least, the options CONFIG_NETLINK and CONFIG_RTNETLINK must -+ be compiled in the running kernel -+ . -+ This package is also known as iproute2 upstream and in some -+ documentation. -diff -Naur iproute2-orig/debian/copyright iproute2/debian/copyright ---- iproute2-orig/debian/copyright 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/copyright 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,42 @@ -+This is the Debian GNU/Linux's prepackaged version of the -+Linux Traffic Control engine and related utils, "iproute" -+ -+This package was put together from sources obtained from: -+ ftp://ftp.inr.ac.ru/ip-routing/iproute2-2.4.7-now-ss010824.tar.gz -+ -+Changes for Debian: -+ * added Debian GNU/Linux package maintenance system files -+ * Added HTB v3.6 from -+ -+ -+ -+Copyrights -+---------- -+Copyright (C) 1996-2001 Alexey Kuznetsov -+ -+Modifications for Debian: -+ Copyright (C) 1996 Tom Lees -+ Copyright (C) 1998 Christoph Lameter -+ Copyright (C) 1998-1999 Roberto Lumbreras -+ Copyright (C) 1999-2003 Juan Cespedes -+ -+ -+License -+------- -+ -+This program is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2, or (at your option) -+any later version. -+ -+This program is distributed in the hope that it will be useful, but -+WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+General Public License for more details. -+ -+A copy of the GNU General Public License is available as -+`/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution -+or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'. -+You can also obtain it by writing to the Free Software Foundation, -+Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -+ -diff -Naur iproute2-orig/debian/manpages/ip.8 iproute2/debian/manpages/ip.8 ---- iproute2-orig/debian/manpages/ip.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/ip.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,1809 @@ -+.TH IP 8 "17 January 2002" "iproute2" "Linux" -+.SH NAME -+ip \- show / manipulate routing, devices, policy routing and tunnels -+.SH SYNOPSIS -+ -+.ad l -+.in +8 -+.ti -8 -+.B ip -+.RI "[ " OPTIONS " ] " OBJECT " { " COMMAND " | " -+.BR help " }" -+.sp -+ -+.ti -8 -+.IR OBJECT " := { " -+.BR link " | " addr " | " route " | " rule " | " neigh " | " tunnel " | "\ -+maddr " | " mroute " | " monitor " }" -+.sp -+ -+.ti -8 -+.IR OPTIONS " := { " -+\fB\-V\fR[\fIersion\fR] | -+\fB\-s\fR[\fItatistics\fR] | -+\fB\-r\fR[\fIesolve\fR] | -+\fB\-f\fR[\fIamily\fR] { -+.BR inet " | " inet6 " | " ipx " | " dnet " | " link " } | " -+\fB\-o\fR[\fIneline\fR] } -+ -+.ti -8 -+.BI "ip link set " DEVICE -+.RB "{ " up " | " down " | " arp " { " on " | " off " } |" -+.br -+.BR promisc " { " on " | " off " } |" -+.br -+.BR allmulti " { " on " | " off " } |" -+.br -+.BR dynamic " { " on " | " off " } |" -+.br -+.BR multicast " { " on " | " off " } |" -+.br -+.B txqueuelen -+.IR PACKETS " |" -+.br -+.B name -+.IR NEWNAME " |" -+.br -+.B address -+.IR LLADDR " |" -+.B broadcast -+.IR LLADDR " |" -+.br -+.B mtu -+.IR MTU " }" -+ -+.ti -8 -+.B ip link show -+.RI "[ " DEVICE " ]" -+ -+.ti -8 -+.BR "ip addr" " { " add " | " del " } " -+.IB IFADDR " dev " STRING -+ -+.ti -8 -+.BR "ip addr" " { " show " | " flush " } [ " dev -+.IR STRING " ] [ " -+.B scope -+.IR SCOPE-ID " ] [ " -+.B to -+.IR PREFIX " ] [ " FLAG-LIST " ] [ " -+.B label -+.IR PATTERN " ]" -+ -+.ti -8 -+.IR IFADDR " := " PREFIX " | " ADDR -+.B peer -+.IR PREFIX " [ " -+.B broadcast -+.IR ADDR " ] [ " -+.B anycast -+.IR ADDR " ] [ " -+.B label -+.IR STRING " ] [ " -+.B scope -+.IR SCOPE-ID " ]" -+ -+.ti -8 -+.IR SCOPE-ID " := " -+.RB "[ " host " | " link " | " global " | " -+.IR NUMBER " ]" -+ -+.ti -8 -+.IR FLAG-LIST " := [ " FLAG-LIST " ] " FLAG -+ -+.ti -8 -+.IR FLAG " := " -+.RB "[ " permanent " | " dynamic " | " secondary " | " primary " | "\ -+tentative " | " deprecated " ]" -+ -+.ti -8 -+.BR "ip route" " { " -+.BR list " | " flush " } " -+.I SELECTOR -+ -+.ti -8 -+.B ip route get -+.IR ADDRESS " [ " -+.BI from " ADDRESS " iif " STRING" -+.RB " ] [ " oif -+.IR STRING " ] [ " -+.B tos -+.IR TOS " ]" -+ -+.ti -8 -+.BR "ip route" " { " add " | " del " | " change " | " append " | "\ -+replace " | " monitor " } " -+.I ROUTE -+ -+.ti -8 -+.IR SELECTOR " := " -+.RB "[ " root -+.IR PREFIX " ] [ " -+.B match -+.IR PREFIX " ] [ " -+.B exact -+.IR PREFIX " ] [ " -+.B table -+.IR TABLE_ID " ] [ " -+.B proto -+.IR RTPROTO " ] [ " -+.B type -+.IR TYPE " ] [ " -+.B scope -+.IR SCOPE " ]" -+ -+.ti -8 -+.IR ROUTE " := " NODE_SPEC " [ " INFO_SPEC " ]" -+ -+.ti -8 -+.IR NODE_SPEC " := [ " TYPE " ] " PREFIX " [" -+.B tos -+.IR TOS " ] [ " -+.B table -+.IR TABLE_ID " ] [ " -+.B proto -+.IR RTPROTO " ] [ " -+.B scope -+.IR SCOPE " ] [ " -+.B metric -+.IR METRIC " ]" -+ -+.ti -8 -+.IR INFO_SPEC " := " "NH OPTIONS FLAGS" " [" -+.B nexthop -+.IR NH " ] ..." -+ -+.ti -8 -+.IR NH " := [ " -+.B via -+.IR ADDRESS " ] [ " -+.B dev -+.IR STRING " ] [ " -+.B weight -+.IR NUMBER " ] " NHFLAGS -+ -+.ti -8 -+.IR OPTIONS " := " FLAGS " [ " -+.B mtu -+.IR NUMBER " ] [ " -+.B advmss -+.IR NUMBER " ] [ " -+.B rtt -+.IR NUMBER " ] [ " -+.B rttvar -+.IR NUMBER " ] [ " -+.B window -+.IR NUMBER " ] [ " -+.B cwnd -+.IR NUMBER " ] [ " -+.B ssthresh -+.IR REALM " ] [ " -+.B realms -+.IR REALM " ]" -+ -+.ti -8 -+.IR TYPE " := [ " -+.BR unicast " | " local " | " broadcast " | " multicast " | "\ -+throw " | " unreachable " | " prohibit " | " blackhole " | " nat " ]" -+ -+.ti -8 -+.IR TABLE_ID " := [ " -+.BR local "| " main " | " default " | " all " |" -+.IR NUMBER " ]" -+ -+.ti -8 -+.IR SCOPE " := [ " -+.BR host " | " link " | " global " |" -+.IR NUMBER " ]" -+ -+.ti -8 -+.IR FLAGS " := [ " -+.BR equalize " ]" -+ -+.ti -8 -+.IR NHFLAGS " := [ " -+.BR onlink " | " pervasive " ]" -+ -+.ti -8 -+.IR RTPROTO " := [ " -+.BR kernel " | " boot " | " static " |" -+.IR NUMBER " ]" -+ -+.ti -8 -+.B ip rule -+.RB " [ " list " | " add " | " del " ]" -+.I SELECTOR ACTION -+ -+.ti -8 -+.IR SELECTOR " := [ " -+.B from -+.IR PREFIX " ] [ " -+.B to -+.IR PREFIX " ] [ " -+.B tos -+.IR TOS " ] [ " -+.B fwmark -+.IR FWMARK " ] [ " -+.B dev -+.IR STRING " ] [ " -+.B pref -+.IR NUMBER " ]" -+ -+.ti -8 -+.IR ACTION " := [ " -+.B table -+.IR TABLE_ID " ] [ " -+.B nat -+.IR ADDRESS " ] [ " -+.BR prohibit " | " reject " | " unreachable " ] [ " realms -+.RI "[" SRCREALM "/]" DSTREALM " ]" -+ -+.ti -8 -+.IR TABLE_ID " := [ " -+.BR local " | " main " | " default " |" -+.IR NUMBER " ]" -+ -+.ti -8 -+.BR "ip neigh" " { " add " | " del " | " change " | " replace " } { " -+.IR ADDR " [ " -+.B lladdr -+.IR LLADDR " ] [ " -+.BR nud " { " permanent " | " noarp " | " stale " | " reachable " } ] | " proxy -+.IR ADDR " } [ " -+.B dev -+.IR DEV " ]" -+ -+.ti -8 -+.BR "ip neigh" " { " show " | " flush " } [ " to -+.IR PREFIX " ] [ " -+.B dev -+.IR DEV " ] [ " -+.B nud -+.IR STATE " ]" -+ -+.ti -8 -+.BR "ip tunnel" " { " add " | " change " | " del " | " show " }" -+.RI "[ " NAME " ]" -+.br -+.RB "[ " mode " { " ipip " | " gre " | " sit " } ]" -+.br -+.RB "[ " remote -+.IR ADDR " ] [ " -+.B local -+.IR ADDR " ]" -+.br -+.RB "[ [" i "|" o "]" seq " ] [ [" i "|" o "]" key -+.IR KEY " ] [ " -+.RB "[" i "|" o "]" csum " ] ]" -+.br -+.RB "[ " ttl -+.IR TTL " ] [ " -+.B tos -+.IR TOS " ] [ " -+.RB "[" no "]" pmtudisc " ]" -+.br -+.RB "[ " dev -+.IR PHYS_DEV " ]" -+ -+.ti -8 -+.IR ADDR " := { " IP_ADDRESS " |" -+.BR any " }" -+ -+.ti -8 -+.IR TOS " := { " NUMBER " |" -+.BR inherit " }" -+ -+.ti -8 -+.IR TTL " := { " 1 ".." 255 " | " -+.BR inherit " }" -+ -+.ti -8 -+.IR KEY " := { " DOTTED_QUAD " | " NUMBER " }" -+ -+.ti -8 -+.BR "ip maddr" " [ " add " | " del " ]" -+.IB MULTIADDR " dev " STRING -+ -+.ti -8 -+.BR "ip maddr show" " [ " dev -+.IR STRING " ]" -+ -+.ti -8 -+.BR "ip mroute show" " [" -+.IR PREFIX " ] [ " -+.B from -+.IR PREFIX " ] [ " -+.B iif -+.IR DEVICE " ]" -+ -+.ti -8 -+.BR "ip monitor" " [ " all " |" -+.IR LISTofOBJECTS " ]" -+.in -8 -+.ad b -+ -+.SH OPTIONS -+ -+.TP -+.BR "\-V" , " -Version" -+print the version of the -+.B ip -+utility and exit. -+ -+.TP -+.BR "\-s" , " \-stats", " \-statistics" -+output more information. If the option -+appears twice or more, the amount of information increases. -+As a rule, the information is statistics or some time values. -+ -+.TP -+.BR "\-f" , " \-family" -+followed by protocol family identifier: -+.BR "inet" , " inet6" -+or -+.B link -+,enforce the protocol family to use. If the option is not present, -+the protocol family is guessed from other arguments. If the rest -+of the command line does not give enough information to guess the -+family, -+.B ip -+falls back to the default one, usually -+.B inet -+or -+.BR "any" . -+.B link -+is a special family identifier meaning that no networking protocol -+is involved. -+ -+.TP -+.B \-4 -+shortcut for -+.BR "-family inet" . -+ -+.TP -+.B \-6 -+shortcut for -+.BR "\-family inet6" . -+ -+.TP -+.B \-0 -+shortcut for -+.BR "\-family link" . -+ -+.TP -+.BR "\-o" , " \-oneline" -+output each record on a single line, replacing line feeds -+with the -+.B '\' -+character. This is convenient when you want to count records -+with -+.BR wc (1) -+ or to -+.BR grep (1) -+the output. -+ -+.TP -+.BR "\-r" , " \-resolve" -+use the system's name resolver to print DNS names instead of -+host addresses. -+ -+.SH IP - COMMAND SYNTAX -+ -+.SS -+.I OBJECT -+ -+.TP -+.B link -+- network device. -+ -+.TP -+.B address -+- protocol (IP or IPv6) address on a device. -+.TP -+.B neighbour -+- ARP or NDISC cache entry. -+ -+.TP -+.B route -+- routing table entry. -+ -+.TP -+.B rule -+- rule in routing policy database. -+ -+.TP -+.B maddress -+- multicast address. -+ -+.TP -+.B mroute -+- multicast routing cache entry. -+ -+.TP -+.B tunnel -+- tunnel over IP. -+ -+.PP -+The names of all objects may be written in full or -+abbreviated form, f.e. -+.B address -+is abbreviated as -+.B addr -+or just -+.B a. -+ -+.SS -+.I COMMAND -+ -+Specifies the action to perform on the object. -+The set of possible actions depends on the object type. -+As a rule, it is possible to -+.BR "add" , " delete" -+and -+.B show -+(or -+.B list -+) objects, but some objects do not allow all of these operations -+or have some additional commands. The -+.B help -+command is available for all objects. It prints -+out a list of available commands and argument syntax conventions. -+.sp -+If no command is given, some default command is assumed. -+Usually it is -+.B list -+or, if the objects of this class cannot be listed, -+.BR "help" . -+ -+.SH ip link - network device configuration -+ -+.B link -+is a network device and the corresponding commands -+display and change the state of devices. -+ -+.SS ip link set - change device attributes -+ -+.TP -+.BI dev " NAME " (default) -+.I NAME -+specifies network device to operate on. -+ -+.TP -+.BR up " and " down -+change the state of the device to -+.B UP -+or -+.BR "DOWN" . -+ -+.TP -+.BR "arp on " or " arp off" -+change the -+.B NOARP -+flag on the device. -+ -+.TP -+.BR "multicast on " or " multicast off" -+change the -+.B MULTICAST -+flag on the device. -+ -+.TP -+.BR "dynamic on " or " dynamic off" -+change the -+.B DYNAMIC -+flag on the device. -+ -+.TP -+.BI name " NAME" -+change the name of the device. This operation is not -+recommended if the device is running or has some addresses -+already configured. -+ -+.TP -+.BI txqueuelen " NUMBER" -+.TP -+.BI txqlen " NUMBER" -+change the transmit queue length of the device. -+ -+.TP -+.BI mtu " NUMBER" -+change the -+.I MTU -+of the device. -+ -+.TP -+.BI address " LLADDRESS" -+change the station address of the interface. -+ -+.TP -+.BI broadcast " LLADDRESS" -+.TP -+.BI brd " LLADDRESS" -+.TP -+.BI peer " LLADDRESS" -+change the link layer broadcast address or the peer address when -+the interface is -+.IR "POINTOPOINT" . -+ -+.PP -+.B Warning: -+If multiple parameter changes are requested, -+.B ip -+aborts immediately after any of the changes have failed. -+This is the only case when -+.B ip -+can move the system to an unpredictable state. The solution -+is to avoid changing several parameters with one -+.B ip link set -+call. -+ -+.SS ip link show - display device attributes -+ -+.TP -+.BI dev " NAME " (default) -+.I NAME -+specifies the network device to show. -+If this argument is omitted all devices are listed. -+ -+.TP -+.B up -+only display running interfaces. -+ -+.SH ip address - protocol address management. -+ -+The -+.B address -+is a protocol (IP or IPv6) address attached -+to a network device. Each device must have at least one address -+to use the corresponding protocol. It is possible to have several -+different addresses attached to one device. These addresses are not -+discriminated, so that the term -+.B alias -+is not quite appropriate for them and we do not use it in this document. -+.sp -+The -+.B ip addr -+command displays addresses and their properties, adds new addresses -+and deletes old ones. -+ -+.SS ip address add - add new protocol address. -+ -+.TP -+.BI dev " NAME" -+the name of the device to add the address to. -+ -+.TP -+.BI local " ADDRESS " (default) -+the address of the interface. The format of the address depends -+on the protocol. It is a dotted quad for IP and a sequence of -+hexadecimal halfwords separated by colons for IPv6. The -+.I ADDRESS -+may be followed by a slash and a decimal number which encodes -+the network prefix length. -+ -+.TP -+.BI peer " ADDRESS" -+the address of the remote endpoint for pointopoint interfaces. -+Again, the -+.I ADDRESS -+may be followed by a slash and a decimal number, encoding the network -+prefix length. If a peer address is specified, the local address -+cannot have a prefix length. The network prefix is associated -+with the peer rather than with the local address. -+ -+.TP -+.BI broadcast " ADDRESS" -+the broadcast address on the interface. -+.sp -+It is possible to use the special symbols -+.B '+' -+and -+.B '-' -+instead of the broadcast address. In this case, the broadcast address -+is derived by setting/resetting the host bits of the interface prefix. -+ -+.TP -+.BI label " NAME" -+Each address may be tagged with a label string. -+In order to preserve compatibility with Linux-2.0 net aliases, -+this string must coincide with the name of the device or must be prefixed -+with the device name followed by colon. -+ -+.TP -+.BI scope " SCOPE_VALUE" -+the scope of the area where this address is valid. -+The available scopes are listed in file -+.BR "/etc/iproute2/rt_scopes" . -+Predefined scope values are: -+ -+.in +8 -+.B global -+- the address is globally valid. -+.sp -+.B site -+- (IPv6 only) the address is site local, i.e. it is -+valid inside this site. -+.sp -+.B link -+- the address is link local, i.e. it is valid only on this device. -+.sp -+.B host -+- the address is valid only inside this host. -+.in -8 -+ -+.SS ip address delete - delete protocol address -+.B Arguments: -+coincide with the arguments of -+.B ip addr add. -+The device name is a required argument. The rest are optional. -+If no arguments are given, the first address is deleted. -+ -+.SS ip address show - look at protocol addresses -+ -+.TP -+.BI dev " NAME " (default) -+name of device. -+ -+.TP -+.BI scope " SCOPE_VAL" -+only list addresses with this scope. -+ -+.TP -+.BI to " PREFIX" -+only list addresses matching this prefix. -+ -+.TP -+.BI label " PATTERN" -+only list addresses with labels matching the -+.IR "PATTERN" . -+.I PATTERN -+is a usual shell style pattern. -+ -+.TP -+.BR dynamic " and " permanent -+(IPv6 only) only list addresses installed due to stateless -+address configuration or only list permanent (not dynamic) -+addresses. -+ -+.TP -+.B tentative -+(IPv6 only) only list addresses which did not pass duplicate -+address detection. -+ -+.TP -+.B deprecated -+(IPv6 only) only list deprecated addresses. -+ -+.TP -+.BR primary " and " secondary -+only list primary (or secondary) addresses. -+ -+.SS ip address flush - flush protocol addresses -+This command flushes the protocol addresses selected by some criteria. -+ -+.PP -+This command has the same arguments as -+.B show. -+The difference is that it does not run when no arguments are given. -+ -+.PP -+.B Warning: -+This command (and other -+.B flush -+commands described below) is pretty dangerous. If you make a mistake, -+it will not forgive it, but will cruelly purge all the addresses. -+ -+.PP -+With the -+.B -statistics -+option, the command becomes verbose. It prints out the number of deleted -+addresses and the number of rounds made to flush the address list. If -+this option is given twice, -+.B ip addr flush -+also dumps all the deleted addresses in the format described in the -+previous subsection. -+ -+.SH ip neighbour - neighbour/arp tables management. -+ -+.B neighbour -+objects establish bindings between protocol addresses and -+link layer addresses for hosts sharing the same link. -+Neighbour entries are organized into tables. The IPv4 neighbour table -+is known by another name - the ARP table. -+ -+.P -+The corresponding commands display neighbour bindings -+and their properties, add new neighbour entries and delete old ones. -+ -+.SS ip neighbour add - add a new neighbour entry -+.SS ip neighbour change - change an existing entry -+.SS ip neighbour replace - add a new entry or change an existing one -+ -+These commands create new neighbour records or update existing ones. -+ -+.TP -+.BI to " ADDRESS " (default) -+the protocol address of the neighbour. It is either an IPv4 or IPv6 address. -+ -+.TP -+.BI dev " NAME" -+the interface to which this neighbour is attached. -+ -+.TP -+.BI lladdr " LLADDRESS" -+the link layer address of the neighbour. -+.I LLADDRESS -+can also be -+.BR "null" . -+ -+.TP -+.BI nud " NUD_STATE" -+the state of the neighbour entry. -+.B nud -+is an abbreviation for 'Neigh bour Unreachability Detection'. -+The state can take one of the following values: -+ -+.in +8 -+.B permanent -+- the neighbour entry is valid forever and can be only -+be removed administratively. -+.sp -+ -+.B noarp -+- the neighbour entry is valid. No attempts to validate -+this entry will be made but it can be removed when its lifetime expires. -+.sp -+ -+.B reachable -+- the neighbour entry is valid until the reachability -+timeout expires. -+.sp -+ -+.B stale -+- the neighbour entry is valid but suspicious. -+This option to -+.B ip neigh -+does not change the neighbour state if it was valid and the address -+is not changed by this command. -+.in -8 -+ -+.SS ip neighbour delete - delete a neighbour entry -+This command invalidates a neighbour entry. -+ -+.PP -+The arguments are the same as with -+.BR "ip neigh add" , -+except that -+.B lladdr -+and -+.B nud -+are ignored. -+ -+.PP -+.B Warning: -+Attempts to delete or manually change a -+.B noarp -+entry created by the kernel may result in unpredictable behaviour. -+Particularly, the kernel may try to resolve this address even -+on a -+.B NOARP -+interface or if the address is multicast or broadcast. -+ -+.SS ip neighbour show - list neighbour entries -+ -+This commands displays neighbour tables. -+ -+.TP -+.BI to " ADDRESS " (default) -+the prefix selecting the neighbours to list. -+ -+.TP -+.BI dev " NAME" -+only list the neighbours attached to this device. -+ -+.TP -+.B unused -+only list neighbours which are not currently in use. -+ -+.TP -+.BI nud " NUD_STATE" -+only list neighbour entries in this state. -+.I NUD_STATE -+takes values listed below or the special value -+.B all -+which means all states. This option may occur more than once. -+If this option is absent, -+.B ip -+lists all entries except for -+.B none -+and -+.BR "noarp" . -+ -+.SS ip neighbour flush - flush neighbour entries -+This command flushes neighbour tables, selecting -+entries to flush by some criteria. -+ -+.PP -+This command has the same arguments as -+.B show. -+The differences are that it does not run when no arguments are given, -+and that the default neighbour states to be flushed do not include -+.B permanent -+and -+.BR "noarp" . -+ -+.PP -+With the -+.B -statistics -+option, the command becomes verbose. It prints out the number of -+deleted neighbours and the number of rounds made to flush the -+neighbour table. If the option is given -+twice, -+.B ip neigh flush -+also dumps all the deleted neighbours. -+ -+.SH ip route - routing table management -+Manipulate route entries in the kernel routing tables keep -+information about paths to other networked nodes. -+.sp -+.B Route types: -+ -+.in +8 -+.B unicast -+- the route entry describes real paths to the destinations covered -+by the route prefix. -+ -+.sp -+.B unreachable -+- these destinations are unreachable. Packets are discarded and the -+ICMP message -+.I host unreachable -+is generated. -+The local senders get an -+.I EHOSTUNREACH -+error. -+ -+.sp -+.B blackhole -+- these destinations are unreachable. Packets are discarded silently. -+The local senders get an -+.I EINVAL -+error. -+ -+.sp -+.B prohibit -+- these destinations are unreachable. Packets are discarded and the -+ICMP message -+.I communication administratively prohibited -+is generated. The local senders get an -+.I EACCES -+error. -+ -+.sp -+.B local -+- the destinations are assigned to this host. The packets are looped -+back and delivered locally. -+ -+.sp -+.B broadcast -+- the destinations are broadcast addresses. The packets are sent as -+link broadcasts. -+ -+.sp -+.B throw -+- a special control route used together with policy rules. If such a -+route is selected, lookup in this table is terminated pretending that -+no route was found. Without policy routing it is equivalent to the -+absence of the route in the routing table. The packets are dropped -+and the ICMP message -+.I net unreachable -+is generated. The local senders get an -+.I ENETUNREACH -+error. -+ -+.sp -+.B nat -+- a special NAT route. Destinations covered by the prefix -+are considered to be dummy (or external) addresses which require translation -+to real (or internal) ones before forwarding. The addresses to translate to -+are selected with the attribute -+.BR "via" . -+ -+.sp -+.B anycast -+.RI "- " "not implemented" -+the destinations are -+.I anycast -+addresses assigned to this host. They are mainly equivalent -+to -+.B local -+with one difference: such addresses are invalid when used -+as the source address of any packet. -+ -+.sp -+.B multicast -+- a special type used for multicast routing. It is not present in -+normal routing tables. -+.in -8 -+ -+.P -+.B Route tables: -+Linux-2.x can pack routes into several routing -+tables identified by a number in the range from 1 to 255 or by -+name from the file -+.B /etc/iproute2/rt_tables -+. By default all normal routes are inserted into the -+.B main -+table (ID 254) and the kernel only uses this table when calculating routes. -+ -+.sp -+Actually, one other table always exists, which is invisible but -+even more important. It is the -+.B local -+table (ID 255). This table -+consists of routes for local and broadcast addresses. The kernel maintains -+this table automatically and the administrator usually need not modify it -+or even look at it. -+ -+The multiple routing tables enter the game when -+.I policy routing -+is used. -+ -+.SS ip route add - add new route -+.SS ip route change - change route -+.SS ip route replace - change or add new one -+ -+.TP -+.BI to " TYPE PREFIX " (default) -+the destination prefix of the route. If -+.I TYPE -+is omitted, -+.B ip -+assumes type -+.BR "unicast" . -+Other values of -+.I TYPE -+are listed above. -+.I PREFIX -+is an IP or IPv6 address optionally followed by a slash and the -+prefix length. If the length of the prefix is missing, -+.B ip -+assumes a full-length host route. There is also a special -+.I PREFIX -+.B default -+- which is equivalent to IP -+.B 0/0 -+or to IPv6 -+.BR "::/0" . -+ -+.TP -+.BI tos " TOS" -+.TP -+.BI dsfield " TOS" -+the Type Of Service (TOS) key. This key has no associated mask and -+the longest match is understood as: First, compare the TOS -+of the route and of the packet. If they are not equal, then the packet -+may still match a route with a zero TOS. -+.I TOS -+is either an 8 bit hexadecimal number or an identifier -+from -+.BR "/etc/iproute2/rt_dsfield" . -+ -+.TP -+.BI metric " NUMBER" -+.TP -+.BI preference " NUMBER" -+the preference value of the route. -+.I NUMBER -+is an arbitrary 32bit number. -+ -+.TP -+.BI table " TABLEID" -+the table to add this route to. -+.I TABLEID -+may be a number or a string from the file -+.BR "/etc/iproute2/rt_tables" . -+If this parameter is omitted, -+.B ip -+assumes the -+.B main -+table, with the exception of -+.BR local " , " broadcast " and " nat -+routes, which are put into the -+.B local -+table by default. -+ -+.TP -+.BI dev " NAME" -+the output device name. -+ -+.TP -+.BI via " ADDRESS" -+the address of the nexthop router. Actually, the sense of this field -+depends on the route type. For normal -+.B unicast -+routes it is either the true next hop router or, if it is a direct -+route installed in BSD compatibility mode, it can be a local address -+of the interface. For NAT routes it is the first address of the block -+of translated IP destinations. -+ -+.TP -+.BI src " ADDRESS" -+the source address to prefer when sending to the destinations -+covered by the route prefix. -+ -+.TP -+.BI realm " REALMID" -+the realm to which this route is assigned. -+.I REALMID -+may be a number or a string from the file -+.BR "/etc/iproute2/rt_realms" . -+ -+.TP -+.BI mtu " MTU" -+.TP -+.BI "mtu lock" " MTU" -+the MTU along the path to the destination. If the modifier -+.B lock -+is not used, the MTU may be updated by the kernel due to -+Path MTU Discovery. If the modifier -+.B lock -+is used, no path MTU discovery will be tried, all packets -+will be sent without the DF bit in IPv4 case or fragmented -+to MTU for IPv6. -+ -+.TP -+.BI window " NUMBER" -+the maximal window for TCP to advertise to these destinations, -+measured in bytes. It limits maximal data bursts that our TCP -+peers are allowed to send to us. -+ -+.TP -+.BI rtt " NUMBER" -+the initial RTT ('Round Trip Time') estimate. -+ -+.TP -+.BI rttvar " NUMBER " "(2.3.15+ only)" -+the initial RTT variance estimate. -+ -+.TP -+.BI ssthresh " NUMBER " "(2.3.15+ only)" -+an estimate for the initial slow start threshold. -+ -+.TP -+.BI cwnd " NUMBER " "(2.3.15+ only)" -+the clamp for congestion window. It is ignored if the -+.B lock -+flag is not used. -+ -+.TP -+.BI advmss " NUMBER " "(2.3.15+ only)" -+the MSS ('Maximal Segment Size') to advertise to these -+destinations when establishing TCP connections. If it is not given, -+Linux uses a default value calculated from the first hop device MTU. -+(If the path to these destination is asymmetric, this guess may be wrong.) -+ -+.TP -+.BI reordering " NUMBER " "(2.3.15+ only)" -+Maximal reordering on the path to this destination. -+If it is not given, Linux uses the value selected with -+.B sysctl -+variable -+.BR "net/ipv4/tcp_reordering" . -+ -+.TP -+.BI nexthop " NEXTHOP" -+the nexthop of a multipath route. -+.I NEXTHOP -+is a complex value with its own syntax similar to the top level -+argument lists: -+ -+.in +8 -+.BI via " ADDRESS" -+- is the nexthop router. -+.sp -+ -+.BI dev " NAME" -+- is the output device. -+.sp -+ -+.BI weight " NUMBER" -+- is a weight for this element of a multipath -+route reflecting its relative bandwidth or quality. -+.in -8 -+ -+.TP -+.BI scope " SCOPE_VAL" -+the scope of the destinations covered by the route prefix. -+.I SCOPE_VAL -+may be a number or a string from the file -+.BR "/etc/iproute2/rt_scopes" . -+If this parameter is omitted, -+.B ip -+assumes scope -+.B global -+for all gatewayed -+.B unicast -+routes, scope -+.B link -+for direct -+.BR unicast " and " broadcast -+routes and scope -+.BR host " for " local -+routes. -+ -+.TP -+.BI protocol " RTPROTO" -+the routing protocol identifier of this route. -+.I RTPROTO -+may be a number or a string from the file -+.BR "/etc/iproute2/rt_protos" . -+If the routing protocol ID is not given, -+.B ip assumes protocol -+.B boot -+(i.e. it assumes the route was added by someone who doesn't -+understand what they are doing). Several protocol values have -+a fixed interpretation. -+Namely: -+ -+.in +8 -+.B redirect -+- the route was installed due to an ICMP redirect. -+.sp -+ -+.B kernel -+- the route was installed by the kernel during autoconfiguration. -+.sp -+ -+.B boot -+- the route was installed during the bootup sequence. -+If a routing daemon starts, it will purge all of them. -+.sp -+ -+.B static -+- the route was installed by the administrator -+to override dynamic routing. Routing daemon will respect them -+and, probably, even advertise them to its peers. -+.sp -+ -+.B ra -+- the route was installed by Router Discovery protocol. -+.in -8 -+ -+.sp -+The rest of the values are not reserved and the administrator is free -+to assign (or not to assign) protocol tags. -+ -+.TP -+.B onlink -+pretend that the nexthop is directly attached to this link, -+even if it does not match any interface prefix. -+ -+.TP -+.B equalize -+allow packet by packet randomization on multipath routes. -+Without this modifier, the route will be frozen to one selected -+nexthop, so that load splitting will only occur on per-flow base. -+.B equalize -+only works if the kernel is patched. -+ -+.SS ip route delete - delete route -+ -+.B ip route del -+has the same arguments as -+.BR "ip route add" , -+but their semantics are a bit different. -+ -+Key values -+.RB "(" to ", " tos ", " preference " and " table ")" -+select the route to delete. If optional attributes are present, -+.B ip -+verifies that they coincide with the attributes of the route to delete. -+If no route with the given key and attributes was found, -+.B ip route del -+fails. -+ -+.SS ip route show - list routes -+the command displays the contents of the routing tables or the route(s) -+selected by some criteria. -+ -+.TP -+.BI to " SELECTOR " (default) -+only select routes from the given range of destinations. -+.I SELECTOR -+consists of an optional modifier -+.RB "(" root ", " match " or " exact ")" -+and a prefix. -+.BI root " PREFIX" -+selects routes with prefixes not shorter than -+.IR PREFIX "." -+F.e. -+.BI root " 0/0" -+selects the entire routing table. -+.BI match " PREFIX" -+selects routes with prefixes not longer than -+.IR PREFIX "." -+F.e. -+.BI match " 10.0/16" -+selects -+.IR 10.0/16 "," -+.IR 10/8 " and " 0/0 , -+but it does not select -+.IR 10.1/16 " and " 10.0.0/24 . -+And -+.BI exact " PREFIX" -+(or just -+.IR PREFIX ")" -+selects routes with this exact prefix. If neither of these options -+are present, -+.B ip -+assumes -+.BI root " 0/0" -+i.e. it lists the entire table. -+ -+.TP -+.BI tos " TOS" -+.BI dsfield " TOS" -+only select routes with the given TOS. -+ -+.TP -+.BI table " TABLEID" -+show the routes from this table(s). The default setting is to show -+.BR table main "." -+.I TABLEID -+may either be the ID of a real table or one of the special values: -+.sp -+.in +8 -+.B all -+- list all of the tables. -+.sp -+.B cache -+- dump the routing cache. -+.in -8 -+ -+.TP -+.B cloned -+.TP -+.B cached -+list cloned routes i.e. routes which were dynamically forked from -+other routes because some route attribute (f.e. MTU) was updated. -+Actually, it is equivalent to -+.BR "table cache" "." -+ -+.TP -+.BI from " SELECTOR" -+the same syntax as for -+.BR to "," -+but it binds the source address range rather than destinations. -+Note that the -+.B from -+option only works with cloned routes. -+ -+.TP -+.BI protocol " RTPROTO" -+only list routes of this protocol. -+ -+.TP -+.BI scope " SCOPE_VAL" -+only list routes with this scope. -+ -+.TP -+.BI type " TYPE" -+only list routes of this type. -+ -+.TP -+.BI dev " NAME" -+only list routes going via this device. -+ -+.TP -+.BI via " PREFIX" -+only list routes going via the nexthop routers selected by -+.IR PREFIX "." -+ -+.TP -+.BI src " PREFIX" -+only list routes with preferred source addresses selected -+by -+.IR PREFIX "." -+ -+.TP -+.BI realm " REALMID" -+.TP -+.BI realms " FROMREALM/TOREALM" -+only list routes with these realms. -+ -+.SS ip route flush - flush routing tables -+this command flushes routes selected by some criteria. -+ -+.sp -+The arguments have the same syntax and semantics as the arguments of -+.BR "ip route show" , -+but routing tables are not listed but purged. The only difference is -+the default action: -+.B show -+dumps all the IP main routing table but -+.B flush -+prints the helper page. -+ -+.sp -+With the -+.B -statistics -+option, the command becomes verbose. It prints out the number of -+deleted routes and the number of rounds made to flush the routing -+table. If the option is given -+twice, -+.B ip route flush -+also dumps all the deleted routes in the format described in the -+previous subsection. -+ -+.SS ip route get - get a single route -+this command gets a single route to a destination and prints its -+contents exactly as the kernel sees it. -+ -+.TP -+.BI to " ADDRESS " (default) -+the destination address. -+ -+.TP -+.BI from " ADDRESS" -+the source address. -+ -+.TP -+.BI tos " TOS" -+.TP -+.BI dsfield " TOS" -+the Type Of Service. -+ -+.TP -+.BI iif " NAME" -+the device from which this packet is expected to arrive. -+ -+.TP -+.BI oif " NAME" -+force the output device on which this packet will be routed. -+ -+.TP -+.B connected -+if no source address -+.RB "(option " from ")" -+was given, relookup the route with the source set to the preferred -+address received from the first lookup. -+If policy routing is used, it may be a different route. -+ -+.P -+Note that this operation is not equivalent to -+.BR "ip route show" . -+.B show -+shows existing routes. -+.B get -+resolves them and creates new clones if necessary. Essentially, -+.B get -+is equivalent to sending a packet along this path. -+If the -+.B iif -+argument is not given, the kernel creates a route -+to output packets towards the requested destination. -+This is equivalent to pinging the destination -+with a subsequent -+.BR "ip route ls cache" , -+however, no packets are actually sent. With the -+.B iif -+argument, the kernel pretends that a packet arrived from this interface -+and searches for a path to forward the packet. -+ -+.SH ip rule - routing policy database management -+ -+.BR "Rule" s -+in the routing policy database control the route selection algorithm. -+ -+.P -+Classic routing algorithms used in the Internet make routing decisions -+based only on the destination address of packets (and in theory, -+but not in practice, on the TOS field). -+ -+.P -+In some circumstances we want to route packets differently depending not only -+on destination addresses, but also on other packet fields: source address, -+IP protocol, transport protocol ports or even packet payload. -+This task is called 'policy routing'. -+ -+.P -+To solve this task, the conventional destination based routing table, ordered -+according to the longest match rule, is replaced with a 'routing policy -+database' (or RPDB), which selects routes by executing some set of rules. -+ -+.P -+Each policy routing rule consists of a -+.B selector -+and an -+.B action predicate. -+The RPDB is scanned in the order of increasing priority. The selector -+of each rule is applied to {source address, destination address, incoming -+interface, tos, fwmark} and, if the selector matches the packet, -+the action is performed. The action predicate may return with success. -+In this case, it will either give a route or failure indication -+and the RPDB lookup is terminated. Otherwise, the RPDB program -+continues on the next rule. -+ -+.P -+Semantically, natural action is to select the nexthop and the output device. -+ -+.P -+At startup time the kernel configures the default RPDB consisting of three -+rules: -+ -+.TP -+1. -+Priority: 0, Selector: match anything, Action: lookup routing -+table -+.B local -+(ID 255). -+The -+.B local -+table is a special routing table containing -+high priority control routes for local and broadcast addresses. -+.sp -+Rule 0 is special. It cannot be deleted or overridden. -+ -+.TP -+2. -+Priority: 32766, Selector: match anything, Action: lookup routing -+table -+.B main -+(ID 254). -+The -+.B main -+table is the normal routing table containing all non-policy -+routes. This rule may be deleted and/or overridden with other -+ones by the administrator. -+ -+.TP -+3. -+Priority: 32767, Selector: match anything, Action: lookup routing -+table -+.B default -+(ID 253). -+The -+.B default -+table is empty. It is reserved for some post-processing if no previous -+default rules selected the packet. -+This rule may also be deleted. -+ -+.P -+Each RPDB entry has additional -+attributes. F.e. each rule has a pointer to some routing -+table. NAT and masquerading rules have an attribute to select new IP -+address to translate/masquerade. Besides that, rules have some -+optional attributes, which routes have, namely -+.BR "realms" . -+These values do not override those contained in the routing tables. They -+are only used if the route did not select any attributes. -+ -+.sp -+The RPDB may contain rules of the following types: -+ -+.in +8 -+.B unicast -+- the rule prescribes to return the route found -+in the routing table referenced by the rule. -+ -+.B blackhole -+- the rule prescribes to silently drop the packet. -+ -+.B unreachable -+- the rule prescribes to generate a 'Network is unreachable' error. -+ -+.B prohibit -+- the rule prescribes to generate 'Communication is administratively -+prohibited' error. -+ -+.B nat -+- the rule prescribes to translate the source address -+of the IP packet into some other value. -+.in -8 -+ -+.SS ip rule add - insert a new rule -+.SS ip rule delete - delete a rule -+ -+.TP -+.BI type " TYPE " (default) -+the type of this rule. The list of valid types was given in the previous -+subsection. -+ -+.TP -+.BI from " PREFIX" -+select the source prefix to match. -+ -+.TP -+.BI to " PREFIX" -+select the destination prefix to match. -+ -+.TP -+.BI iif " NAME" -+select the incoming device to match. If the interface is loopback, -+the rule only matches packets originating from this host. This means -+that you may create separate routing tables for forwarded and local -+packets and, hence, completely segregate them. -+ -+.TP -+.BI tos " TOS" -+.TP -+.BI dsfield " TOS" -+select the TOS value to match. -+ -+.TP -+.BI fwmark " MARK" -+select the -+.B fwmark -+value to match. -+ -+.TP -+.BI priority " PREFERENCE" -+the priority of this rule. Each rule should have an explicitly -+set -+.I unique -+priority value. -+ -+.TP -+.BI table " TABLEID" -+the routing table identifier to lookup if the rule selector matches. -+ -+.TP -+.BI realms " FROM/TO" -+Realms to select if the rule matched and the routing table lookup -+succeeded. Realm -+.I TO -+is only used if the route did not select any realm. -+ -+.TP -+.BI nat " ADDRESS" -+The base of the IP address block to translate (for source addresses). -+The -+.I ADDRESS -+may be either the start of the block of NAT addresses (selected by NAT -+routes) or a local host address (or even zero). -+In the last case the router does not translate the packets, but -+masquerades them to this address. -+ -+.B Warning: -+Changes to the RPDB made with these commands do not become active -+immediately. It is assumed that after a script finishes a batch of -+updates, it flushes the routing cache with -+.BR "ip route flush cache" . -+ -+.SS ip rule show - list rules -+This command has no arguments. -+ -+.SH ip maddress - multicast addresses management -+ -+.B maddress -+objects are multicast addresses. -+ -+.SS ip maddress show - list multicast addresses -+ -+.TP -+.BI dev " NAME " (default) -+the device name. -+ -+.SS ip maddress add - add a multicast address -+.SS ip maddress delete - delete a multicast address -+these commands attach/detach a static link layer multicast address -+to listen on the interface. -+Note that it is impossible to join protocol multicast groups -+statically. This command only manages link layer addresses. -+ -+.TP -+.BI address " LLADDRESS " (default) -+the link layer multicast address. -+ -+.TP -+.BI dev " NAME" -+the device to join/leave this multicast address. -+ -+.SH ip mroute - multicast routing cache management -+.B mroute -+objects are multicast routing cache entries created by a user level -+mrouting daemon (f.e. -+.B pimd -+or -+.B mrouted -+). -+ -+Due to the limitations of the current interface to the multicast routing -+engine, it is impossible to change -+.B mroute -+objects administratively, so we may only display them. This limitation -+will be removed in the future. -+ -+.SS ip mroute show - list mroute cache entries -+ -+.TP -+.BI to " PREFIX " (default) -+the prefix selecting the destination multicast addresses to list. -+ -+.TP -+.BI iif " NAME" -+the interface on which multicast packets are received. -+ -+.TP -+.BI from " PREFIX" -+the prefix selecting the IP source addresses of the multicast route. -+ -+.SH ip tunnel - tunnel configuration -+.B tunnel -+objects are tunnels, encapsulating packets in IPv4 packets and then -+sending them over the IP infrastructure. -+ -+.SS ip tunnel add - add a new tunnel -+.SS ip tunnel change - change an existing tunnel -+.SS ip tunnel delete - destroy a tunnel -+ -+.TP -+.BI name " NAME " (default) -+select the tunnel device name. -+ -+.TP -+.BI mode " MODE" -+set the tunnel mode. Three modes are currently available: -+.BR ipip ", " sit " and " gre "." -+ -+.TP -+.BI remote " ADDRESS" -+set the remote endpoint of the tunnel. -+ -+.TP -+.BI local " ADDRESS" -+set the fixed local address for tunneled packets. -+It must be an address on another interface of this host. -+ -+.TP -+.BI ttl " N" -+set a fixed TTL -+.I N -+on tunneled packets. -+.I N -+is a number in the range 1--255. 0 is a special value -+meaning that packets inherit the TTL value. -+The default value is: -+.BR "inherit" . -+ -+.TP -+.BI tos " T" -+.TP -+.BI dsfield " T" -+set a fixed TOS -+.I T -+on tunneled packets. -+The default value is: -+.BR "inherit" . -+ -+.TP -+.BI dev " NAME" -+bind the tunnel to the device -+.I NAME -+so that tunneled packets will only be routed via this device and will -+not be able to escape to another device when the route to endpoint -+changes. -+ -+.TP -+.B nopmtudisc -+disable Path MTU Discovery on this tunnel. -+It is enabled by default. Note that a fixed ttl is incompatible -+with this option: tunnelling with a fixed ttl always makes pmtu -+discovery. -+ -+.TP -+.BI key " K" -+.TP -+.BI ikey " K" -+.TP -+.BI okey " K" -+.RB ( " only GRE tunnels " ) -+use keyed GRE with key -+.IR K ". " K -+is either a number or an IP address-like dotted quad. -+The -+.B key -+parameter sets the key to use in both directions. -+The -+.BR ikey " and " okey -+parameters set different keys for input and output. -+ -+.TP -+.BR csum ", " icsum ", " ocsum -+.RB ( " only GRE tunnels " ) -+generate/require checksums for tunneled packets. -+The -+.B ocsum -+flag calculates checksums for outgoing packets. -+The -+.B icsum -+flag requires that all input packets have the correct -+checksum. The -+.B csum -+flag is equivalent to the combination -+.BR "icsum ocsum" . -+ -+.TP -+.BR seq ", " iseq ", " oseq -+.RB ( " only GRE tunnels " ) -+serialize packets. -+The -+.B oseq -+flag enables sequencing of outgoing packets. -+The -+.B iseq -+flag requires that all input packets are serialized. -+The -+.B seq -+flag is equivalent to the combination -+.BR "iseq oseq" . -+.B It isn't work. Don't use it. -+ -+.SS ip tunnel show - list tunnels -+This command has no arguments. -+ -+.SH ip monitor and rtmon - state monitoring -+ -+The -+.B ip -+utility can monitor the state of devices, addresses -+and routes continuously. This option has a slightly different format. -+Namely, the -+.B monitor -+command is the first in the command line and then the object list follows: -+ -+.BR "ip monitor" " [ " all " |" -+.IR LISTofOBJECTS " ]" -+ -+.I OBJECT-LIST -+is the list of object types that we want to monitor. -+It may contain -+.BR link ", " address " and " route "." -+If no -+.B file -+argument is given, -+.B ip -+opens RTNETLINK, listens on it and dumps state changes in the format -+described in previous sections. -+ -+.P -+If a file name is given, it does not listen on RTNETLINK, -+but opens the file containing RTNETLINK messages saved in binary format -+and dumps them. Such a history file can be generated with the -+.B rtmon -+utility. This utility has a command line syntax similar to -+.BR "ip monitor" . -+Ideally, -+.B rtmon -+should be started before the first network configuration command -+is issued. F.e. if you insert: -+.sp -+.in +8 -+rtmon file /var/log/rtmon.log -+.in -8 -+.sp -+in a startup script, you will be able to view the full history -+later. -+ -+.P -+Certainly, it is possible to start -+.B rtmon -+at any time. -+It prepends the history with the state snapshot dumped at the moment -+of starting. -+ -+.SH HISTORY -+ -+.B ip -+was written by Alexey N. Kuznetsov and added in Linux 2.2. -+.SH SEE ALSO -+.BR tc (8) -+.br -+.RB "IP Command reference " ip-cref.ps -+.br -+.RB "IP tunnels " ip-cref.ps -+ -+.SH AUTHOR -+ -+Manpage maintained by Michail Litvak -diff -Naur iproute2-orig/debian/manpages/old/ip.8 iproute2/debian/manpages/old/ip.8 ---- iproute2-orig/debian/manpages/old/ip.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/old/ip.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,1809 @@ -+.TH IP 8 "17 January 2002" "iproute2" "Linux" -+.SH NAME -+ip \- show / manipulate routing, devices, policy routing and tunnels -+.SH SYNOPSIS -+ -+.ad l -+.in +8 -+.ti -8 -+.B ip -+.RI "[ " OPTIONS " ] " OBJECT " { " COMMAND " | " -+.BR help " }" -+.sp -+ -+.ti -8 -+.IR OBJECT " := { " -+.BR link " | " addr " | " route " | " rule " | " neigh " | " tunnel " | "\ -+maddr " | " mroute " | " monitor " }" -+.sp -+ -+.ti -8 -+.IR OPTIONS " := { " -+\fB\-V\fR[\fIersion\fR] | -+\fB\-s\fR[\fItatistics\fR] | -+\fB\-r\fR[\fIesolve\fR] | -+\fB\-f\fR[\fIamily\fR] { -+.BR inet " | " inet6 " | " ipx " | " dnet " | " link " } | " -+\fB\-o\fR[\fIneline\fR] } -+ -+.ti -8 -+.BI "ip link set " DEVICE -+.RB "{ " up " | " down " | " arp " { " on " | " off " } |" -+.br -+.BR promisc " { " on " | " off " } |" -+.br -+.BR allmulti " { " on " | " off " } |" -+.br -+.BR dynamic " { " on " | " off " } |" -+.br -+.BR multicast " { " on " | " off " } |" -+.br -+.B txqueuelen -+.IR PACKETS " |" -+.br -+.B name -+.IR NEWNAME " |" -+.br -+.B address -+.IR LLADDR " |" -+.B broadcast -+.IR LLADDR " |" -+.br -+.B mtu -+.IR MTU " }" -+ -+.ti -8 -+.B ip link show -+.RI "[ " DEVICE " ]" -+ -+.ti -8 -+.BR "ip addr" " { " add " | " del " } " -+.IB IFADDR " dev " STRING -+ -+.ti -8 -+.BR "ip addr" " { " show " | " flush " } [ " dev -+.IR STRING " ] [ " -+.B scope -+.IR SCOPE-ID " ] [ " -+.B to -+.IR PREFIX " ] [ " FLAG-LIST " ] [ " -+.B label -+.IR PATTERN " ]" -+ -+.ti -8 -+.IR IFADDR " := " PREFIX " | " ADDR -+.B peer -+.IR PREFIX " [ " -+.B broadcast -+.IR ADDR " ] [ " -+.B anycast -+.IR ADDR " ] [ " -+.B label -+.IR STRING " ] [ " -+.B scope -+.IR SCOPE-ID " ]" -+ -+.ti -8 -+.IR SCOPE-ID " := " -+.RB "[ " host " | " link " | " global " | " -+.IR NUMBER " ]" -+ -+.ti -8 -+.IR FLAG-LIST " := [ " FLAG-LIST " ] " FLAG -+ -+.ti -8 -+.IR FLAG " := " -+.RB "[ " permanent " | " dynamic " | " secondary " | " primary " | "\ -+tentative " | " deprecated " ]" -+ -+.ti -8 -+.BR "ip route" " { " -+.BR list " | " flush " } " -+.I SELECTOR -+ -+.ti -8 -+.B ip route get -+.IR ADDRESS " [ " -+.BI from " ADDRESS " iif " STRING" -+.RB " ] [ " oif -+.IR STRING " ] [ " -+.B tos -+.IR TOS " ]" -+ -+.ti -8 -+.BR "ip route" " { " add " | " del " | " change " | " append " | "\ -+replace " | " monitor " } " -+.I ROUTE -+ -+.ti -8 -+.IR SELECTOR " := " -+.RB "[ " root -+.IR PREFIX " ] [ " -+.B match -+.IR PREFIX " ] [ " -+.B exact -+.IR PREFIX " ] [ " -+.B table -+.IR TABLE_ID " ] [ " -+.B proto -+.IR RTPROTO " ] [ " -+.B type -+.IR TYPE " ] [ " -+.B scope -+.IR SCOPE " ]" -+ -+.ti -8 -+.IR ROUTE " := " NODE_SPEC " [ " INFO_SPEC " ]" -+ -+.ti -8 -+.IR NODE_SPEC " := [ " TYPE " ] " PREFIX " [" -+.B tos -+.IR TOS " ] [ " -+.B table -+.IR TABLE_ID " ] [ " -+.B proto -+.IR RTPROTO " ] [ " -+.B scope -+.IR SCOPE " ] [ " -+.B metric -+.IR METRIC " ]" -+ -+.ti -8 -+.IR INFO_SPEC " := " "NH OPTIONS FLAGS" " [" -+.B nexthop -+.IR NH " ] ..." -+ -+.ti -8 -+.IR NH " := [ " -+.B via -+.IR ADDRESS " ] [ " -+.B dev -+.IR STRING " ] [ " -+.B weight -+.IR NUMBER " ] " NHFLAGS -+ -+.ti -8 -+.IR OPTIONS " := " FLAGS " [ " -+.B mtu -+.IR NUMBER " ] [ " -+.B advmss -+.IR NUMBER " ] [ " -+.B rtt -+.IR NUMBER " ] [ " -+.B rttvar -+.IR NUMBER " ] [ " -+.B window -+.IR NUMBER " ] [ " -+.B cwnd -+.IR NUMBER " ] [ " -+.B ssthresh -+.IR REALM " ] [ " -+.B realms -+.IR REALM " ]" -+ -+.ti -8 -+.IR TYPE " := [ " -+.BR unicast " | " local " | " broadcast " | " multicast " | "\ -+throw " | " unreachable " | " prohibit " | " blackhole " | " nat " ]" -+ -+.ti -8 -+.IR TABLE_ID " := [ " -+.BR local "| " main " | " default " | " all " |" -+.IR NUMBER " ]" -+ -+.ti -8 -+.IR SCOPE " := [ " -+.BR host " | " link " | " global " |" -+.IR NUMBER " ]" -+ -+.ti -8 -+.IR FLAGS " := [ " -+.BR equalize " ]" -+ -+.ti -8 -+.IR NHFLAGS " := [ " -+.BR onlink " | " pervasive " ]" -+ -+.ti -8 -+.IR RTPROTO " := [ " -+.BR kernel " | " boot " | " static " |" -+.IR NUMBER " ]" -+ -+.ti -8 -+.B ip rule -+.RB " [ " list " | " add " | " del " ]" -+.I SELECTOR ACTION -+ -+.ti -8 -+.IR SELECTOR " := [ " -+.B from -+.IR PREFIX " ] [ " -+.B to -+.IR PREFIX " ] [ " -+.B tos -+.IR TOS " ] [ " -+.B fwmark -+.IR FWMARK " ] [ " -+.B dev -+.IR STRING " ] [ " -+.B pref -+.IR NUMBER " ]" -+ -+.ti -8 -+.IR ACTION " := [ " -+.B table -+.IR TABLE_ID " ] [ " -+.B nat -+.IR ADDRESS " ] [ " -+.BR prohibit " | " reject " | " unreachable " ] [ " realms -+.RI "[" SRCREALM "/]" DSTREALM " ]" -+ -+.ti -8 -+.IR TABLE_ID " := [ " -+.BR local " | " main " | " default " |" -+.IR NUMBER " ]" -+ -+.ti -8 -+.BR "ip neigh" " { " add " | " del " | " change " | " replace " } { " -+.IR ADDR " [ " -+.B lladdr -+.IR LLADDR " ] [ " -+.BR nud " { " permanent " | " noarp " | " stale " | " reachable " } ] | " proxy -+.IR ADDR " } [ " -+.B dev -+.IR DEV " ]" -+ -+.ti -8 -+.BR "ip neigh" " { " show " | " flush " } [ " to -+.IR PREFIX " ] [ " -+.B dev -+.IR DEV " ] [ " -+.B nud -+.IR STATE " ]" -+ -+.ti -8 -+.BR "ip tunnel" " { " add " | " change " | " del " | " show " }" -+.RI "[ " NAME " ]" -+.br -+.RB "[ " mode " { " ipip " | " gre " | " sit " } ]" -+.br -+.RB "[ " remote -+.IR ADDR " ] [ " -+.B local -+.IR ADDR " ]" -+.br -+.RB "[ [" i "|" o "]" seq " ] [ [" i "|" o "]" key -+.IR KEY " ] [ " -+.RB "[" i "|" o "]" csum " ] ]" -+.br -+.RB "[ " ttl -+.IR TTL " ] [ " -+.B tos -+.IR TOS " ] [ " -+.RB "[" no "]" pmtudisc " ]" -+.br -+.RB "[ " dev -+.IR PHYS_DEV " ]" -+ -+.ti -8 -+.IR ADDR " := { " IP_ADDRESS " |" -+.BR any " }" -+ -+.ti -8 -+.IR TOS " := { " NUMBER " |" -+.BR inherit " }" -+ -+.ti -8 -+.IR TTL " := { " 1 ".." 255 " | " -+.BR inherit " }" -+ -+.ti -8 -+.IR KEY " := { " DOTTED_QUAD " | " NUMBER " }" -+ -+.ti -8 -+.BR "ip maddr" " [ " add " | " del " ]" -+.IB MULTIADDR " dev " STRING -+ -+.ti -8 -+.BR "ip maddr show" " [ " dev -+.IR STRING " ]" -+ -+.ti -8 -+.BR "ip mroute show" " [" -+.IR PREFIX " ] [ " -+.B from -+.IR PREFIX " ] [ " -+.B iif -+.IR DEVICE " ]" -+ -+.ti -8 -+.BR "ip monitor" " [ " all " |" -+.IR LISTofOBJECTS " ]" -+.in -8 -+.ad b -+ -+.SH OPTIONS -+ -+.TP -+.BR "\-V" , " -Version" -+print the version of the -+.B ip -+utility and exit. -+ -+.TP -+.BR "\-s" , " \-stats", " \-statistics" -+output more information. If the option -+appears twice or more, the amount of information increases. -+As a rule, the information is statistics or some time values. -+ -+.TP -+.BR "\-f" , " \-family" -+followed by protocol family identifier: -+.BR "inet" , " inet6" -+or -+.B link -+,enforce the protocol family to use. If the option is not present, -+the protocol family is guessed from other arguments. If the rest -+of the command line does not give enough information to guess the -+family, -+.B ip -+falls back to the default one, usually -+.B inet -+or -+.BR "any" . -+.B link -+is a special family identifier meaning that no networking protocol -+is involved. -+ -+.TP -+.B \-4 -+shortcut for -+.BR "-family inet" . -+ -+.TP -+.B \-6 -+shortcut for -+.BR "\-family inet6" . -+ -+.TP -+.B \-0 -+shortcut for -+.BR "\-family link" . -+ -+.TP -+.BR "\-o" , " \-oneline" -+output each record on a single line, replacing line feeds -+with the -+.B '\' -+character. This is convenient when you want to count records -+with -+.BR wc (1) -+ or to -+.BR grep (1) -+the output. -+ -+.TP -+.BR "\-r" , " \-resolve" -+use the system's name resolver to print DNS names instead of -+host addresses. -+ -+.SH IP - COMMAND SYNTAX -+ -+.SS -+.I OBJECT -+ -+.TP -+.B link -+- network device. -+ -+.TP -+.B address -+- protocol (IP or IPv6) address on a device. -+.TP -+.B neighbour -+- ARP or NDISC cache entry. -+ -+.TP -+.B route -+- routing table entry. -+ -+.TP -+.B rule -+- rule in routing policy database. -+ -+.TP -+.B maddress -+- multicast address. -+ -+.TP -+.B mroute -+- multicast routing cache entry. -+ -+.TP -+.B tunnel -+- tunnel over IP. -+ -+.PP -+The names of all objects may be written in full or -+abbreviated form, f.e. -+.B address -+is abbreviated as -+.B addr -+or just -+.B a. -+ -+.SS -+.I COMMAND -+ -+Specifies the action to perform on the object. -+The set of possible actions depends on the object type. -+As a rule, it is possible to -+.BR "add" , " delete" -+and -+.B show -+(or -+.B list -+) objects, but some objects do not allow all of these operations -+or have some additional commands. The -+.B help -+command is available for all objects. It prints -+out a list of available commands and argument syntax conventions. -+.sp -+If no command is given, some default command is assumed. -+Usually it is -+.B list -+or, if the objects of this class cannot be listed, -+.BR "help" . -+ -+.SH ip link - network device configuration -+ -+.B link -+is a network device and the corresponding commands -+display and change the state of devices. -+ -+.SS ip link set - change device attributes -+ -+.TP -+.BI dev " NAME " (default) -+.I NAME -+specifies network device to operate on. -+ -+.TP -+.BR up " and " down -+change the state of the device to -+.B UP -+or -+.BR "DOWN" . -+ -+.TP -+.BR "arp on " or " arp off" -+change the -+.B NOARP -+flag on the device. -+ -+.TP -+.BR "multicast on " or " multicast off" -+change the -+.B MULTICAST -+flag on the device. -+ -+.TP -+.BR "dynamic on " or " dynamic off" -+change the -+.B DYNAMIC -+flag on the device. -+ -+.TP -+.BI name " NAME" -+change the name of the device. This operation is not -+recommended if the device is running or has some addresses -+already configured. -+ -+.TP -+.BI txqueuelen " NUMBER" -+.TP -+.BI txqlen " NUMBER" -+change the transmit queue length of the device. -+ -+.TP -+.BI mtu " NUMBER" -+change the -+.I MTU -+of the device. -+ -+.TP -+.BI address " LLADDRESS" -+change the station address of the interface. -+ -+.TP -+.BI broadcast " LLADDRESS" -+.TP -+.BI brd " LLADDRESS" -+.TP -+.BI peer " LLADDRESS" -+change the link layer broadcast address or the peer address when -+the interface is -+.IR "POINTOPOINT" . -+ -+.PP -+.B Warning: -+If multiple parameter changes are requested, -+.B ip -+aborts immediately after any of the changes have failed. -+This is the only case when -+.B ip -+can move the system to an unpredictable state. The solution -+is to avoid changing several parameters with one -+.B ip link set -+call. -+ -+.SS ip link show - display device attributes -+ -+.TP -+.BI dev " NAME " (default) -+.I NAME -+specifies the network device to show. -+If this argument is omitted all devices are listed. -+ -+.TP -+.B up -+only display running interfaces. -+ -+.SH ip address - protocol address management. -+ -+The -+.B address -+is a protocol (IP or IPv6) address attached -+to a network device. Each device must have at least one address -+to use the corresponding protocol. It is possible to have several -+different addresses attached to one device. These addresses are not -+discriminated, so that the term -+.B alias -+is not quite appropriate for them and we do not use it in this document. -+.sp -+The -+.B ip addr -+command displays addresses and their properties, adds new addresses -+and deletes old ones. -+ -+.SS ip address add - add new protocol address. -+ -+.TP -+.BI dev " NAME" -+the name of the device to add the address to. -+ -+.TP -+.BI local " ADDRESS " (default) -+the address of the interface. The format of the address depends -+on the protocol. It is a dotted quad for IP and a sequence of -+hexadecimal halfwords separated by colons for IPv6. The -+.I ADDRESS -+may be followed by a slash and a decimal number which encodes -+the network prefix length. -+ -+.TP -+.BI peer " ADDRESS" -+the address of the remote endpoint for pointopoint interfaces. -+Again, the -+.I ADDRESS -+may be followed by a slash and a decimal number, encoding the network -+prefix length. If a peer address is specified, the local address -+cannot have a prefix length. The network prefix is associated -+with the peer rather than with the local address. -+ -+.TP -+.BI broadcast " ADDRESS" -+the broadcast address on the interface. -+.sp -+It is possible to use the special symbols -+.B '+' -+and -+.B '-' -+instead of the broadcast address. In this case, the broadcast address -+is derived by setting/resetting the host bits of the interface prefix. -+ -+.TP -+.BI label " NAME" -+Each address may be tagged with a label string. -+In order to preserve compatibility with Linux-2.0 net aliases, -+this string must coincide with the name of the device or must be prefixed -+with the device name followed by colon. -+ -+.TP -+.BI scope " SCOPE_VALUE" -+the scope of the area where this address is valid. -+The available scopes are listed in file -+.BR "/etc/iproute2/rt_scopes" . -+Predefined scope values are: -+ -+.in +8 -+.B global -+- the address is globally valid. -+.sp -+.B site -+- (IPv6 only) the address is site local, i.e. it is -+valid inside this site. -+.sp -+.B link -+- the address is link local, i.e. it is valid only on this device. -+.sp -+.B host -+- the address is valid only inside this host. -+.in -8 -+ -+.SS ip address delete - delete protocol address -+.B Arguments: -+coincide with the arguments of -+.B ip addr add. -+The device name is a required argument. The rest are optional. -+If no arguments are given, the first address is deleted. -+ -+.SS ip address show - look at protocol addresses -+ -+.TP -+.BI dev " NAME " (default) -+name of device. -+ -+.TP -+.BI scope " SCOPE_VAL" -+only list addresses with this scope. -+ -+.TP -+.BI to " PREFIX" -+only list addresses matching this prefix. -+ -+.TP -+.BI label " PATTERN" -+only list addresses with labels matching the -+.IR "PATTERN" . -+.I PATTERN -+is a usual shell style pattern. -+ -+.TP -+.BR dynamic " and " permanent -+(IPv6 only) only list addresses installed due to stateless -+address configuration or only list permanent (not dynamic) -+addresses. -+ -+.TP -+.B tentative -+(IPv6 only) only list addresses which did not pass duplicate -+address detection. -+ -+.TP -+.B deprecated -+(IPv6 only) only list deprecated addresses. -+ -+.TP -+.BR primary " and " secondary -+only list primary (or secondary) addresses. -+ -+.SS ip address flush - flush protocol addresses -+This command flushes the protocol addresses selected by some criteria. -+ -+.PP -+This command has the same arguments as -+.B show. -+The difference is that it does not run when no arguments are given. -+ -+.PP -+.B Warning: -+This command (and other -+.B flush -+commands described below) is pretty dangerous. If you make a mistake, -+it will not forgive it, but will cruelly purge all the addresses. -+ -+.PP -+With the -+.B -statistics -+option, the command becomes verbose. It prints out the number of deleted -+addresses and the number of rounds made to flush the address list. If -+this option is given twice, -+.B ip addr flush -+also dumps all the deleted addresses in the format described in the -+previous subsection. -+ -+.SH ip neighbour - neighbour/arp tables management. -+ -+.B neighbour -+objects establish bindings between protocol addresses and -+link layer addresses for hosts sharing the same link. -+Neighbour entries are organized into tables. The IPv4 neighbour table -+is known by another name - the ARP table. -+ -+.P -+The corresponding commands display neighbour bindings -+and their properties, add new neighbour entries and delete old ones. -+ -+.SS ip neighbour add - add a new neighbour entry -+.SS ip neighbour change - change an existing entry -+.SS ip neighbour replace - add a new entry or change an existing one -+ -+These commands create new neighbour records or update existing ones. -+ -+.TP -+.BI to " ADDRESS " (default) -+the protocol address of the neighbour. It is either an IPv4 or IPv6 address. -+ -+.TP -+.BI dev " NAME" -+the interface to which this neighbour is attached. -+ -+.TP -+.BI lladdr " LLADDRESS" -+the link layer address of the neighbour. -+.I LLADDRESS -+can also be -+.BR "null" . -+ -+.TP -+.BI nud " NUD_STATE" -+the state of the neighbour entry. -+.B nud -+is an abbreviation for 'Neigh bour Unreachability Detection'. -+The state can take one of the following values: -+ -+.in +8 -+.B permanent -+- the neighbour entry is valid forever and can be only -+be removed administratively. -+.sp -+ -+.B noarp -+- the neighbour entry is valid. No attempts to validate -+this entry will be made but it can be removed when its lifetime expires. -+.sp -+ -+.B reachable -+- the neighbour entry is valid until the reachability -+timeout expires. -+.sp -+ -+.B stale -+- the neighbour entry is valid but suspicious. -+This option to -+.B ip neigh -+does not change the neighbour state if it was valid and the address -+is not changed by this command. -+.in -8 -+ -+.SS ip neighbour delete - delete a neighbour entry -+This command invalidates a neighbour entry. -+ -+.PP -+The arguments are the same as with -+.BR "ip neigh add" , -+except that -+.B lladdr -+and -+.B nud -+are ignored. -+ -+.PP -+.B Warning: -+Attempts to delete or manually change a -+.B noarp -+entry created by the kernel may result in unpredictable behaviour. -+Particularly, the kernel may try to resolve this address even -+on a -+.B NOARP -+interface or if the address is multicast or broadcast. -+ -+.SS ip neighbour show - list neighbour entries -+ -+This commands displays neighbour tables. -+ -+.TP -+.BI to " ADDRESS " (default) -+the prefix selecting the neighbours to list. -+ -+.TP -+.BI dev " NAME" -+only list the neighbours attached to this device. -+ -+.TP -+.B unused -+only list neighbours which are not currently in use. -+ -+.TP -+.BI nud " NUD_STATE" -+only list neighbour entries in this state. -+.I NUD_STATE -+takes values listed below or the special value -+.B all -+which means all states. This option may occur more than once. -+If this option is absent, -+.B ip -+lists all entries except for -+.B none -+and -+.BR "noarp" . -+ -+.SS ip neighbour flush - flush neighbour entries -+This command flushes neighbour tables, selecting -+entries to flush by some criteria. -+ -+.PP -+This command has the same arguments as -+.B show. -+The differences are that it does not run when no arguments are given, -+and that the default neighbour states to be flushed do not include -+.B permanent -+and -+.BR "noarp" . -+ -+.PP -+With the -+.B -statistics -+option, the command becomes verbose. It prints out the number of -+deleted neighbours and the number of rounds made to flush the -+neighbour table. If the option is given -+twice, -+.B ip neigh flush -+also dumps all the deleted neighbours. -+ -+.SH ip route - routing table management -+Manipulate route entries in the kernel routing tables keep -+information about paths to other networked nodes. -+.sp -+.B Route types: -+ -+.in +8 -+.B unicast -+- the route entry describes real paths to the destinations covered -+by the route prefix. -+ -+.sp -+.B unreachable -+- these destinations are unreachable. Packets are discarded and the -+ICMP message -+.I host unreachable -+is generated. -+The local senders get an -+.I EHOSTUNREACH -+error. -+ -+.sp -+.B blackhole -+- these destinations are unreachable. Packets are discarded silently. -+The local senders get an -+.I EINVAL -+error. -+ -+.sp -+.B prohibit -+- these destinations are unreachable. Packets are discarded and the -+ICMP message -+.I communication administratively prohibited -+is generated. The local senders get an -+.I EACCES -+error. -+ -+.sp -+.B local -+- the destinations are assigned to this host. The packets are looped -+back and delivered locally. -+ -+.sp -+.B broadcast -+- the destinations are broadcast addresses. The packets are sent as -+link broadcasts. -+ -+.sp -+.B throw -+- a special control route used together with policy rules. If such a -+route is selected, lookup in this table is terminated pretending that -+no route was found. Without policy routing it is equivalent to the -+absence of the route in the routing table. The packets are dropped -+and the ICMP message -+.I net unreachable -+is generated. The local senders get an -+.I ENETUNREACH -+error. -+ -+.sp -+.B nat -+- a special NAT route. Destinations covered by the prefix -+are considered to be dummy (or external) addresses which require translation -+to real (or internal) ones before forwarding. The addresses to translate to -+are selected with the attribute -+.BR "via" . -+ -+.sp -+.B anycast -+.RI "- " "not implemented" -+the destinations are -+.I anycast -+addresses assigned to this host. They are mainly equivalent -+to -+.B local -+with one difference: such addresses are invalid when used -+as the source address of any packet. -+ -+.sp -+.B multicast -+- a special type used for multicast routing. It is not present in -+normal routing tables. -+.in -8 -+ -+.P -+.B Route tables: -+Linux-2.x can pack routes into several routing -+tables identified by a number in the range from 1 to 255 or by -+name from the file -+.B /etc/iproute2/rt_tables -+. By default all normal routes are inserted into the -+.B main -+table (ID 254) and the kernel only uses this table when calculating routes. -+ -+.sp -+Actually, one other table always exists, which is invisible but -+even more important. It is the -+.B local -+table (ID 255). This table -+consists of routes for local and broadcast addresses. The kernel maintains -+this table automatically and the administrator usually need not modify it -+or even look at it. -+ -+The multiple routing tables enter the game when -+.I policy routing -+is used. -+ -+.SS ip route add - add new route -+.SS ip route change - change route -+.SS ip route replace - change or add new one -+ -+.TP -+.BI to " TYPE PREFIX " (default) -+the destination prefix of the route. If -+.I TYPE -+is omitted, -+.B ip -+assumes type -+.BR "unicast" . -+Other values of -+.I TYPE -+are listed above. -+.I PREFIX -+is an IP or IPv6 address optionally followed by a slash and the -+prefix length. If the length of the prefix is missing, -+.B ip -+assumes a full-length host route. There is also a special -+.I PREFIX -+.B default -+- which is equivalent to IP -+.B 0/0 -+or to IPv6 -+.BR "::/0" . -+ -+.TP -+.BI tos " TOS" -+.TP -+.BI dsfield " TOS" -+the Type Of Service (TOS) key. This key has no associated mask and -+the longest match is understood as: First, compare the TOS -+of the route and of the packet. If they are not equal, then the packet -+may still match a route with a zero TOS. -+.I TOS -+is either an 8 bit hexadecimal number or an identifier -+from -+.BR "/etc/iproute2/rt_dsfield" . -+ -+.TP -+.BI metric " NUMBER" -+.TP -+.BI preference " NUMBER" -+the preference value of the route. -+.I NUMBER -+is an arbitrary 32bit number. -+ -+.TP -+.BI table " TABLEID" -+the table to add this route to. -+.I TABLEID -+may be a number or a string from the file -+.BR "/etc/iproute2/rt_tables" . -+If this parameter is omitted, -+.B ip -+assumes the -+.B main -+table, with the exception of -+.BR local " , " broadcast " and " nat -+routes, which are put into the -+.B local -+table by default. -+ -+.TP -+.BI dev " NAME" -+the output device name. -+ -+.TP -+.BI via " ADDRESS" -+the address of the nexthop router. Actually, the sense of this field -+depends on the route type. For normal -+.B unicast -+routes it is either the true next hop router or, if it is a direct -+route installed in BSD compatibility mode, it can be a local address -+of the interface. For NAT routes it is the first address of the block -+of translated IP destinations. -+ -+.TP -+.BI src " ADDRESS" -+the source address to prefer when sending to the destinations -+covered by the route prefix. -+ -+.TP -+.BI realm " REALMID" -+the realm to which this route is assigned. -+.I REALMID -+may be a number or a string from the file -+.BR "/etc/iproute2/rt_realms" . -+ -+.TP -+.BI mtu " MTU" -+.TP -+.BI "mtu lock" " MTU" -+the MTU along the path to the destination. If the modifier -+.B lock -+is not used, the MTU may be updated by the kernel due to -+Path MTU Discovery. If the modifier -+.B lock -+is used, no path MTU discovery will be tried, all packets -+will be sent without the DF bit in IPv4 case or fragmented -+to MTU for IPv6. -+ -+.TP -+.BI window " NUMBER" -+the maximal window for TCP to advertise to these destinations, -+measured in bytes. It limits maximal data bursts that our TCP -+peers are allowed to send to us. -+ -+.TP -+.BI rtt " NUMBER" -+the initial RTT ('Round Trip Time') estimate. -+ -+.TP -+.BI rttvar " NUMBER " "(2.3.15+ only)" -+the initial RTT variance estimate. -+ -+.TP -+.BI ssthresh " NUMBER " "(2.3.15+ only)" -+an estimate for the initial slow start threshold. -+ -+.TP -+.BI cwnd " NUMBER " "(2.3.15+ only)" -+the clamp for congestion window. It is ignored if the -+.B lock -+flag is not used. -+ -+.TP -+.BI advmss " NUMBER " "(2.3.15+ only)" -+the MSS ('Maximal Segment Size') to advertise to these -+destinations when establishing TCP connections. If it is not given, -+Linux uses a default value calculated from the first hop device MTU. -+(If the path to these destination is asymmetric, this guess may be wrong.) -+ -+.TP -+.BI reordering " NUMBER " "(2.3.15+ only)" -+Maximal reordering on the path to this destination. -+If it is not given, Linux uses the value selected with -+.B sysctl -+variable -+.BR "net/ipv4/tcp_reordering" . -+ -+.TP -+.BI nexthop " NEXTHOP" -+the nexthop of a multipath route. -+.I NEXTHOP -+is a complex value with its own syntax similar to the top level -+argument lists: -+ -+.in +8 -+.BI via " ADDRESS" -+- is the nexthop router. -+.sp -+ -+.BI dev " NAME" -+- is the output device. -+.sp -+ -+.BI weight " NUMBER" -+- is a weight for this element of a multipath -+route reflecting its relative bandwidth or quality. -+.in -8 -+ -+.TP -+.BI scope " SCOPE_VAL" -+the scope of the destinations covered by the route prefix. -+.I SCOPE_VAL -+may be a number or a string from the file -+.BR "/etc/iproute2/rt_scopes" . -+If this parameter is omitted, -+.B ip -+assumes scope -+.B global -+for all gatewayed -+.B unicast -+routes, scope -+.B link -+for direct -+.BR unicast " and " broadcast -+routes and scope -+.BR host " for " local -+routes. -+ -+.TP -+.BI protocol " RTPROTO" -+the routing protocol identifier of this route. -+.I RTPROTO -+may be a number or a string from the file -+.BR "/etc/iproute2/rt_protos" . -+If the routing protocol ID is not given, -+.B ip assumes protocol -+.B boot -+(i.e. it assumes the route was added by someone who doesn't -+understand what they are doing). Several protocol values have -+a fixed interpretation. -+Namely: -+ -+.in +8 -+.B redirect -+- the route was installed due to an ICMP redirect. -+.sp -+ -+.B kernel -+- the route was installed by the kernel during autoconfiguration. -+.sp -+ -+.B boot -+- the route was installed during the bootup sequence. -+If a routing daemon starts, it will purge all of them. -+.sp -+ -+.B static -+- the route was installed by the administrator -+to override dynamic routing. Routing daemon will respect them -+and, probably, even advertise them to its peers. -+.sp -+ -+.B ra -+- the route was installed by Router Discovery protocol. -+.in -8 -+ -+.sp -+The rest of the values are not reserved and the administrator is free -+to assign (or not to assign) protocol tags. -+ -+.TP -+.B onlink -+pretend that the nexthop is directly attached to this link, -+even if it does not match any interface prefix. -+ -+.TP -+.B equalize -+allow packet by packet randomization on multipath routes. -+Without this modifier, the route will be frozen to one selected -+nexthop, so that load splitting will only occur on per-flow base. -+.B equalize -+only works if the kernel is patched. -+ -+.SS ip route delete - delete route -+ -+.B ip route del -+has the same arguments as -+.BR "ip route add" , -+but their semantics are a bit different. -+ -+Key values -+.RB "(" to ", " tos ", " preference " and " table ")" -+select the route to delete. If optional attributes are present, -+.B ip -+verifies that they coincide with the attributes of the route to delete. -+If no route with the given key and attributes was found, -+.B ip route del -+fails. -+ -+.SS ip route show - list routes -+the command displays the contents of the routing tables or the route(s) -+selected by some criteria. -+ -+.TP -+.BI to " SELECTOR " (default) -+only select routes from the given range of destinations. -+.I SELECTOR -+consists of an optional modifier -+.RB "(" root ", " match " or " exact ")" -+and a prefix. -+.BI root " PREFIX" -+selects routes with prefixes not shorter than -+.IR PREFIX "." -+F.e. -+.BI root " 0/0" -+selects the entire routing table. -+.BI match " PREFIX" -+selects routes with prefixes not longer than -+.IR PREFIX "." -+F.e. -+.BI match " 10.0/16" -+selects -+.IR 10.0/16 "," -+.IR 10/8 " and " 0/0 , -+but it does not select -+.IR 10.1/16 " and " 10.0.0/24 . -+And -+.BI exact " PREFIX" -+(or just -+.IR PREFIX ")" -+selects routes with this exact prefix. If neither of these options -+are present, -+.B ip -+assumes -+.BI root " 0/0" -+i.e. it lists the entire table. -+ -+.TP -+.BI tos " TOS" -+.BI dsfield " TOS" -+only select routes with the given TOS. -+ -+.TP -+.BI table " TABLEID" -+show the routes from this table(s). The default setting is to show -+.BR table main "." -+.I TABLEID -+may either be the ID of a real table or one of the special values: -+.sp -+.in +8 -+.B all -+- list all of the tables. -+.sp -+.B cache -+- dump the routing cache. -+.in -8 -+ -+.TP -+.B cloned -+.TP -+.B cached -+list cloned routes i.e. routes which were dynamically forked from -+other routes because some route attribute (f.e. MTU) was updated. -+Actually, it is equivalent to -+.BR "table cache" "." -+ -+.TP -+.BI from " SELECTOR" -+the same syntax as for -+.BR to "," -+but it binds the source address range rather than destinations. -+Note that the -+.B from -+option only works with cloned routes. -+ -+.TP -+.BI protocol " RTPROTO" -+only list routes of this protocol. -+ -+.TP -+.BI scope " SCOPE_VAL" -+only list routes with this scope. -+ -+.TP -+.BI type " TYPE" -+only list routes of this type. -+ -+.TP -+.BI dev " NAME" -+only list routes going via this device. -+ -+.TP -+.BI via " PREFIX" -+only list routes going via the nexthop routers selected by -+.IR PREFIX "." -+ -+.TP -+.BI src " PREFIX" -+only list routes with preferred source addresses selected -+by -+.IR PREFIX "." -+ -+.TP -+.BI realm " REALMID" -+.TP -+.BI realms " FROMREALM/TOREALM" -+only list routes with these realms. -+ -+.SS ip route flush - flush routing tables -+this command flushes routes selected by some criteria. -+ -+.sp -+The arguments have the same syntax and semantics as the arguments of -+.BR "ip route show" , -+but routing tables are not listed but purged. The only difference is -+the default action: -+.B show -+dumps all the IP main routing table but -+.B flush -+prints the helper page. -+ -+.sp -+With the -+.B -statistics -+option, the command becomes verbose. It prints out the number of -+deleted routes and the number of rounds made to flush the routing -+table. If the option is given -+twice, -+.B ip route flush -+also dumps all the deleted routes in the format described in the -+previous subsection. -+ -+.SS ip route get - get a single route -+this command gets a single route to a destination and prints its -+contents exactly as the kernel sees it. -+ -+.TP -+.BI to " ADDRESS " (default) -+the destination address. -+ -+.TP -+.BI from " ADDRESS" -+the source address. -+ -+.TP -+.BI tos " TOS" -+.TP -+.BI dsfield " TOS" -+the Type Of Service. -+ -+.TP -+.BI iif " NAME" -+the device from which this packet is expected to arrive. -+ -+.TP -+.BI oif " NAME" -+force the output device on which this packet will be routed. -+ -+.TP -+.B connected -+if no source address -+.RB "(option " from ")" -+was given, relookup the route with the source set to the preferred -+address received from the first lookup. -+If policy routing is used, it may be a different route. -+ -+.P -+Note that this operation is not equivalent to -+.BR "ip route show" . -+.B show -+shows existing routes. -+.B get -+resolves them and creates new clones if necessary. Essentially, -+.B get -+is equivalent to sending a packet along this path. -+If the -+.B iif -+argument is not given, the kernel creates a route -+to output packets towards the requested destination. -+This is equivalent to pinging the destination -+with a subsequent -+.BR "ip route ls cache" , -+however, no packets are actually sent. With the -+.B iif -+argument, the kernel pretends that a packet arrived from this interface -+and searches for a path to forward the packet. -+ -+.SH ip rule - routing policy database management -+ -+.BR "Rule" s -+in the routing policy database control the route selection algorithm. -+ -+.P -+Classic routing algorithms used in the Internet make routing decisions -+based only on the destination address of packets (and in theory, -+but not in practice, on the TOS field). -+ -+.P -+In some circumstances we want to route packets differently depending not only -+on destination addresses, but also on other packet fields: source address, -+IP protocol, transport protocol ports or even packet payload. -+This task is called 'policy routing'. -+ -+.P -+To solve this task, the conventional destination based routing table, ordered -+according to the longest match rule, is replaced with a 'routing policy -+database' (or RPDB), which selects routes by executing some set of rules. -+ -+.P -+Each policy routing rule consists of a -+.B selector -+and an -+.B action predicate. -+The RPDB is scanned in the order of increasing priority. The selector -+of each rule is applied to {source address, destination address, incoming -+interface, tos, fwmark} and, if the selector matches the packet, -+the action is performed. The action predicate may return with success. -+In this case, it will either give a route or failure indication -+and the RPDB lookup is terminated. Otherwise, the RPDB program -+continues on the next rule. -+ -+.P -+Semantically, natural action is to select the nexthop and the output device. -+ -+.P -+At startup time the kernel configures the default RPDB consisting of three -+rules: -+ -+.TP -+1. -+Priority: 0, Selector: match anything, Action: lookup routing -+table -+.B local -+(ID 255). -+The -+.B local -+table is a special routing table containing -+high priority control routes for local and broadcast addresses. -+.sp -+Rule 0 is special. It cannot be deleted or overridden. -+ -+.TP -+2. -+Priority: 32766, Selector: match anything, Action: lookup routing -+table -+.B main -+(ID 254). -+The -+.B main -+table is the normal routing table containing all non-policy -+routes. This rule may be deleted and/or overridden with other -+ones by the administrator. -+ -+.TP -+3. -+Priority: 32767, Selector: match anything, Action: lookup routing -+table -+.B default -+(ID 253). -+The -+.B default -+table is empty. It is reserved for some post-processing if no previous -+default rules selected the packet. -+This rule may also be deleted. -+ -+.P -+Each RPDB entry has additional -+attributes. F.e. each rule has a pointer to some routing -+table. NAT and masquerading rules have an attribute to select new IP -+address to translate/masquerade. Besides that, rules have some -+optional attributes, which routes have, namely -+.BR "realms" . -+These values do not override those contained in the routing tables. They -+are only used if the route did not select any attributes. -+ -+.sp -+The RPDB may contain rules of the following types: -+ -+.in +8 -+.B unicast -+- the rule prescribes to return the route found -+in the routing table referenced by the rule. -+ -+.B blackhole -+- the rule prescribes to silently drop the packet. -+ -+.B unreachable -+- the rule prescribes to generate a 'Network is unreachable' error. -+ -+.B prohibit -+- the rule prescribes to generate 'Communication is administratively -+prohibited' error. -+ -+.B nat -+- the rule prescribes to translate the source address -+of the IP packet into some other value. -+.in -8 -+ -+.SS ip rule add - insert a new rule -+.SS ip rule delete - delete a rule -+ -+.TP -+.BI type " TYPE " (default) -+the type of this rule. The list of valid types was given in the previous -+subsection. -+ -+.TP -+.BI from " PREFIX" -+select the source prefix to match. -+ -+.TP -+.BI to " PREFIX" -+select the destination prefix to match. -+ -+.TP -+.BI iif " NAME" -+select the incoming device to match. If the interface is loopback, -+the rule only matches packets originating from this host. This means -+that you may create separate routing tables for forwarded and local -+packets and, hence, completely segregate them. -+ -+.TP -+.BI tos " TOS" -+.TP -+.BI dsfield " TOS" -+select the TOS value to match. -+ -+.TP -+.BI fwmark " MARK" -+select the -+.B fwmark -+value to match. -+ -+.TP -+.BI priority " PREFERENCE" -+the priority of this rule. Each rule should have an explicitly -+set -+.I unique -+priority value. -+ -+.TP -+.BI table " TABLEID" -+the routing table identifier to lookup if the rule selector matches. -+ -+.TP -+.BI realms " FROM/TO" -+Realms to select if the rule matched and the routing table lookup -+succeeded. Realm -+.I TO -+is only used if the route did not select any realm. -+ -+.TP -+.BI nat " ADDRESS" -+The base of the IP address block to translate (for source addresses). -+The -+.I ADDRESS -+may be either the start of the block of NAT addresses (selected by NAT -+routes) or a local host address (or even zero). -+In the last case the router does not translate the packets, but -+masquerades them to this address. -+ -+.B Warning: -+Changes to the RPDB made with these commands do not become active -+immediately. It is assumed that after a script finishes a batch of -+updates, it flushes the routing cache with -+.BR "ip route flush cache" . -+ -+.SS ip rule show - list rules -+This command has no arguments. -+ -+.SH ip maddress - multicast addresses management -+ -+.B maddress -+objects are multicast addresses. -+ -+.SS ip maddress show - list multicast addresses -+ -+.TP -+.BI dev " NAME " (default) -+the device name. -+ -+.SS ip maddress add - add a multicast address -+.SS ip maddress delete - delete a multicast address -+these commands attach/detach a static link layer multicast address -+to listen on the interface. -+Note that it is impossible to join protocol multicast groups -+statically. This command only manages link layer addresses. -+ -+.TP -+.BI address " LLADDRESS " (default) -+the link layer multicast address. -+ -+.TP -+.BI dev " NAME" -+the device to join/leave this multicast address. -+ -+.SH ip mroute - multicast routing cache management -+.B mroute -+objects are multicast routing cache entries created by a user level -+mrouting daemon (f.e. -+.B pimd -+or -+.B mrouted -+). -+ -+Due to the limitations of the current interface to the multicast routing -+engine, it is impossible to change -+.B mroute -+objects administratively, so we may only display them. This limitation -+will be removed in the future. -+ -+.SS ip mroute show - list mroute cache entries -+ -+.TP -+.BI to " PREFIX " (default) -+the prefix selecting the destination multicast addresses to list. -+ -+.TP -+.BI iif " NAME" -+the interface on which multicast packets are received. -+ -+.TP -+.BI from " PREFIX" -+the prefix selecting the IP source addresses of the multicast route. -+ -+.SH ip tunnel - tunnel configuration -+.B tunnel -+objects are tunnels, encapsulating packets in IPv4 packets and then -+sending them over the IP infrastructure. -+ -+.SS ip tunnel add - add a new tunnel -+.SS ip tunnel change - change an existing tunnel -+.SS ip tunnel delete - destroy a tunnel -+ -+.TP -+.BI name " NAME " (default) -+select the tunnel device name. -+ -+.TP -+.BI mode " MODE" -+set the tunnel mode. Three modes are currently available: -+.BR ipip ", " sit " and " gre "." -+ -+.TP -+.BI remote " ADDRESS" -+set the remote endpoint of the tunnel. -+ -+.TP -+.BI local " ADDRESS" -+set the fixed local address for tunneled packets. -+It must be an address on another interface of this host. -+ -+.TP -+.BI ttl " N" -+set a fixed TTL -+.I N -+on tunneled packets. -+.I N -+is a number in the range 1--255. 0 is a special value -+meaning that packets inherit the TTL value. -+The default value is: -+.BR "inherit" . -+ -+.TP -+.BI tos " T" -+.TP -+.BI dsfield " T" -+set a fixed TOS -+.I T -+on tunneled packets. -+The default value is: -+.BR "inherit" . -+ -+.TP -+.BI dev " NAME" -+bind the tunnel to the device -+.I NAME -+so that tunneled packets will only be routed via this device and will -+not be able to escape to another device when the route to endpoint -+changes. -+ -+.TP -+.B nopmtudisc -+disable Path MTU Discovery on this tunnel. -+It is enabled by default. Note that a fixed ttl is incompatible -+with this option: tunnelling with a fixed ttl always makes pmtu -+discovery. -+ -+.TP -+.BI key " K" -+.TP -+.BI ikey " K" -+.TP -+.BI okey " K" -+.RB ( " only GRE tunnels " ) -+use keyed GRE with key -+.IR K ". " K -+is either a number or an IP address-like dotted quad. -+The -+.B key -+parameter sets the key to use in both directions. -+The -+.BR ikey " and " okey -+parameters set different keys for input and output. -+ -+.TP -+.BR csum ", " icsum ", " ocsum -+.RB ( " only GRE tunnels " ) -+generate/require checksums for tunneled packets. -+The -+.B ocsum -+flag calculates checksums for outgoing packets. -+The -+.B icsum -+flag requires that all input packets have the correct -+checksum. The -+.B csum -+flag is equivalent to the combination -+.BR "icsum ocsum" . -+ -+.TP -+.BR seq ", " iseq ", " oseq -+.RB ( " only GRE tunnels " ) -+serialize packets. -+The -+.B oseq -+flag enables sequencing of outgoing packets. -+The -+.B iseq -+flag requires that all input packets are serialized. -+The -+.B seq -+flag is equivalent to the combination -+.BR "iseq oseq" . -+.B It isn't work. Don't use it. -+ -+.SS ip tunnel show - list tunnels -+This command has no arguments. -+ -+.SH ip monitor and rtmon - state monitoring -+ -+The -+.B ip -+utility can monitor the state of devices, addresses -+and routes continuously. This option has a slightly different format. -+Namely, the -+.B monitor -+command is the first in the command line and then the object list follows: -+ -+.BR "ip monitor" " [ " all " |" -+.IR LISTofOBJECTS " ]" -+ -+.I OBJECT-LIST -+is the list of object types that we want to monitor. -+It may contain -+.BR link ", " address " and " route "." -+If no -+.B file -+argument is given, -+.B ip -+opens RTNETLINK, listens on it and dumps state changes in the format -+described in previous sections. -+ -+.P -+If a file name is given, it does not listen on RTNETLINK, -+but opens the file containing RTNETLINK messages saved in binary format -+and dumps them. Such a history file can be generated with the -+.B rtmon -+utility. This utility has a command line syntax similar to -+.BR "ip monitor" . -+Ideally, -+.B rtmon -+should be started before the first network configuration command -+is issued. F.e. if you insert: -+.sp -+.in +8 -+rtmon file /var/log/rtmon.log -+.in -8 -+.sp -+in a startup script, you will be able to view the full history -+later. -+ -+.P -+Certainly, it is possible to start -+.B rtmon -+at any time. -+It prepends the history with the state snapshot dumped at the moment -+of starting. -+ -+.SH HISTORY -+ -+.B ip -+was written by Alexey N. Kuznetsov and added in Linux 2.2. -+.SH SEE ALSO -+.BR tc (8) -+.br -+.RB "IP Command reference " ip-cref.ps -+.br -+.RB "IP tunnels " ip-cref.ps -+ -+.SH AUTHOR -+ -+Manpage maintained by Michail Litvak -diff -Naur iproute2-orig/debian/manpages/old/tc-cbq-details.8 iproute2/debian/manpages/old/tc-cbq-details.8 ---- iproute2-orig/debian/manpages/old/tc-cbq-details.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/old/tc-cbq-details.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,425 @@ -+.TH CBQ 8 "8 December 2001" "iproute2" "Linux" -+.SH NAME -+CBQ \- Class Based Queueing -+.SH SYNOPSIS -+.B tc qdisc ... dev -+dev -+.B ( parent -+classid -+.B | root) [ handle -+major: -+.B ] cbq avpkt -+bytes -+.B bandwidth -+rate -+.B [ cell -+bytes -+.B ] [ ewma -+log -+.B ] [ mpu -+bytes -+.B ] -+ -+.B tc class ... dev -+dev -+.B parent -+major:[minor] -+.B [ classid -+major:minor -+.B ] cbq allot -+bytes -+.B [ bandwidth -+rate -+.B ] [ rate -+rate -+.B ] prio -+priority -+.B [ weight -+weight -+.B ] [ minburst -+packets -+.B ] [ maxburst -+packets -+.B ] [ ewma -+log -+.B ] [ cell -+bytes -+.B ] avpkt -+bytes -+.B [ mpu -+bytes -+.B ] [ bounded isolated ] [ split -+handle -+.B & defmap -+defmap -+.B ] [ estimator -+interval timeconstant -+.B ] -+ -+.SH DESCRIPTION -+Class Based Queueing is a classful qdisc that implements a rich -+linksharing hierarchy of classes. It contains shaping elements as -+well as prioritizing capabilities. Shaping is performed using link -+idle time calculations based on the timing of dequeue events and -+underlying link bandwidth. -+ -+.SH SHAPING ALGORITHM -+Shaping is done using link idle time calculations, and actions taken if -+these calculations deviate from set limits. -+ -+When shaping a 10mbit/s connection to 1mbit/s, the link will -+be idle 90% of the time. If it isn't, it needs to be throttled so that it -+IS idle 90% of the time. -+ -+From the kernel's perspective, this is hard to measure, so CBQ instead -+derives the idle time from the number of microseconds (in fact, jiffies) -+that elapse between requests from the device driver for more data. Combined -+with the knowledge of packet sizes, this is used to approximate how full or -+empty the link is. -+ -+This is rather circumspect and doesn't always arrive at proper -+results. For example, what is the actual link speed of an interface -+that is not really able to transmit the full 100mbit/s of data, -+perhaps because of a badly implemented driver? A PCMCIA network card -+will also never achieve 100mbit/s because of the way the bus is -+designed - again, how do we calculate the idle time? -+ -+The physical link bandwidth may be ill defined in case of not-quite-real -+network devices like PPP over Ethernet or PPTP over TCP/IP. The effective -+bandwidth in that case is probably determined by the efficiency of pipes -+to userspace - which not defined. -+ -+During operations, the effective idletime is measured using an -+exponential weighted moving average (EWMA), which considers recent -+packets to be exponentially more important than past ones. The Unix -+loadaverage is calculated in the same way. -+ -+The calculated idle time is subtracted from the EWMA measured one, -+the resulting number is called 'avgidle'. A perfectly loaded link has -+an avgidle of zero: packets arrive exactly at the calculated -+interval. -+ -+An overloaded link has a negative avgidle and if it gets too negative, -+CBQ throttles and is then 'overlimit'. -+ -+Conversely, an idle link might amass a huge avgidle, which would then -+allow infinite bandwidths after a few hours of silence. To prevent -+this, avgidle is capped at -+.B maxidle. -+ -+If overlimit, in theory, the CBQ could throttle itself for exactly the -+amount of time that was calculated to pass between packets, and then -+pass one packet, and throttle again. Due to timer resolution constraints, -+this may not be feasible, see the -+.B minburst -+parameter below. -+ -+.SH CLASSIFICATION -+Within the one CBQ instance many classes may exist. Each of these classes -+contains another qdisc, by default -+.BR tc-pfifo (8). -+ -+When enqueueing a packet, CBQ starts at the root and uses various methods to -+determine which class should receive the data. If a verdict is reached, this -+process is repeated for the recipient class which might have further -+means of classifying traffic to its children, if any. -+ -+CBQ has the following methods available to classify a packet to any child -+classes. -+.TP -+(i) -+.B skb->priority class encoding. -+Can be set from userspace by an application with the -+.B SO_PRIORITY -+setsockopt. -+The -+.B skb->priority class encoding -+only applies if the skb->priority holds a major:minor handle of an existing -+class within this qdisc. -+.TP -+(ii) -+tc filters attached to the class. -+.TP -+(iii) -+The defmap of a class, as set with the -+.B split & defmap -+parameters. The defmap may contain instructions for each possible Linux packet -+priority. -+ -+.P -+Each class also has a -+.B level. -+Leaf nodes, attached to the bottom of the class hierarchy, have a level of 0. -+.SH CLASSIFICATION ALGORITHM -+ -+Classification is a loop, which terminates when a leaf class is found. At any -+point the loop may jump to the fallback algorithm. -+ -+The loop consists of the following steps: -+.TP -+(i) -+If the packet is generated locally and has a valid classid encoded within its -+.B skb->priority, -+choose it and terminate. -+ -+.TP -+(ii) -+Consult the tc filters, if any, attached to this child. If these return -+a class which is not a leaf class, restart loop from the class returned. -+If it is a leaf, choose it and terminate. -+.TP -+(iii) -+If the tc filters did not return a class, but did return a classid, -+try to find a class with that id within this qdisc. -+Check if the found class is of a lower -+.B level -+than the current class. If so, and the returned class is not a leaf node, -+restart the loop at the found class. If it is a leaf node, terminate. -+If we found an upward reference to a higher level, enter the fallback -+algorithm. -+.TP -+(iv) -+If the tc filters did not return a class, nor a valid reference to one, -+consider the minor number of the reference to be the priority. Retrieve -+a class from the defmap of this class for the priority. If this did not -+contain a class, consult the defmap of this class for the -+.B BEST_EFFORT -+class. If this is an upward reference, or no -+.B BEST_EFFORT -+class was defined, -+enter the fallback algorithm. If a valid class was found, and it is not a -+leaf node, restart the loop at this class. If it is a leaf, choose it and -+terminate. If -+neither the priority distilled from the classid, nor the -+.B BEST_EFFORT -+priority yielded a class, enter the fallback algorithm. -+.P -+The fallback algorithm resides outside of the loop and is as follows. -+.TP -+(i) -+Consult the defmap of the class at which the jump to fallback occured. If -+the defmap contains a class for the -+.B -+priority -+of the class (which is related to the TOS field), choose this class and -+terminate. -+.TP -+(ii) -+Consult the map for a class for the -+.B BEST_EFFORT -+priority. If found, choose it, and terminate. -+.TP -+(iii) -+Choose the class at which break out to the fallback algorithm occured. Terminate. -+.P -+The packet is enqueued to the class which was chosen when either algorithm -+terminated. It is therefore possible for a packet to be enqueued *not* at a -+leaf node, but in the middle of the hierarchy. -+ -+.SH LINK SHARING ALGORITHM -+When dequeuing for sending to the network device, CBQ decides which of its -+classes will be allowed to send. It does so with a Weighted Round Robin process -+in which each class with packets gets a chance to send in turn. The WRR process -+starts by asking the highest priority classes (lowest numerically - -+highest semantically) for packets, and will continue to do so until they -+have no more data to offer, in which case the process repeats for lower -+priorities. -+ -+.B CERTAINTY ENDS HERE, ANK PLEASE HELP -+ -+Each class is not allowed to send at length though - they can only dequeue a -+configurable amount of data during each round. -+ -+If a class is about to go overlimit, and it is not -+.B bounded -+it will try to borrow avgidle from siblings that are not -+.B isolated. -+This process is repeated from the bottom upwards. If a class is unable -+to borrow enough avgidle to send a packet, it is throttled and not asked -+for a packet for enough time for the avgidle to increase above zero. -+ -+.B I REALLY NEED HELP FIGURING THIS OUT. REST OF DOCUMENT IS PRETTY CERTAIN -+.B AGAIN. -+ -+.SH QDISC -+The root qdisc of a CBQ class tree has the following parameters: -+ -+.TP -+parent major:minor | root -+This mandatory parameter determines the place of the CBQ instance, either at the -+.B root -+of an interface or within an existing class. -+.TP -+handle major: -+Like all other qdiscs, the CBQ can be assigned a handle. Should consist only -+of a major number, followed by a colon. Optional. -+.TP -+avpkt bytes -+For calculations, the average packet size must be known. It is silently capped -+at a minimum of 2/3 of the interface MTU. Mandatory. -+.TP -+bandwidth rate -+To determine the idle time, CBQ must know the bandwidth of your underlying -+physical interface, or parent qdisc. This is a vital parameter, more about it -+later. Mandatory. -+.TP -+cell -+The cell size determines he granularity of packet transmission time calculations. Has a sensible default. -+.TP -+mpu -+A zero sized packet may still take time to transmit. This value is the lower -+cap for packet transmission time calculations - packets smaller than this value -+are still deemed to have this size. Defaults to zero. -+.TP -+ewma log -+When CBQ needs to measure the average idle time, it does so using an -+Exponentially Weighted Moving Average which smoothes out measurements into -+a moving average. The EWMA LOG determines how much smoothing occurs. Defaults -+to 5. Lower values imply greater sensitivity. Must be between 0 and 31. -+.P -+A CBQ qdisc does not shape out of its own accord. It only needs to know certain -+parameters about the underlying link. Actual shaping is done in classes. -+ -+.SH CLASSES -+Classes have a host of parameters to configure their operation. -+ -+.TP -+parent major:minor -+Place of this class within the hierarchy. If attached directly to a qdisc -+and not to another class, minor can be omitted. Mandatory. -+.TP -+classid major:minor -+Like qdiscs, classes can be named. The major number must be equal to the -+major number of the qdisc to which it belongs. Optional, but needed if this -+class is going to have children. -+.TP -+weight weight -+When dequeuing to the interface, classes are tried for traffic in a -+round-robin fashion. Classes with a higher configured qdisc will generally -+have more traffic to offer during each round, so it makes sense to allow -+it to dequeue more traffic. All weights under a class are normalized, so -+only the ratios matter. Defaults to the configured rate, unless the priority -+of this class is maximal, in which case it is set to 1. -+.TP -+allot bytes -+Allot specifies how many bytes a qdisc can dequeue -+during each round of the process. This parameter is weighted using the -+renormalized class weight described above. -+ -+.TP -+priority priority -+In the round-robin process, classes with the lowest priority field are tried -+for packets first. Mandatory. -+ -+.TP -+rate rate -+Maximum rate this class and all its children combined can send at. Mandatory. -+ -+.TP -+bandwidth rate -+This is different from the bandwidth specified when creating a CBQ disc. Only -+used to determine maxidle and offtime, which are only calculated when -+specifying maxburst or minburst. Mandatory if specifying maxburst or minburst. -+ -+.TP -+maxburst -+This number of packets is used to calculate maxidle so that when -+avgidle is at maxidle, this number of average packets can be burst -+before avgidle drops to 0. Set it higher to be more tolerant of -+bursts. You can't set maxidle directly, only via this parameter. -+ -+.TP -+minburst -+As mentioned before, CBQ needs to throttle in case of -+overlimit. The ideal solution is to do so for exactly the calculated -+idle time, and pass 1 packet. However, Unix kernels generally have a -+hard time scheduling events shorter than 10ms, so it is better to -+throttle for a longer period, and then pass minburst packets in one -+go, and then sleep minburst times longer. -+ -+The time to wait is called the offtime. Higher values of minburst lead -+to more accurate shaping in the long term, but to bigger bursts at -+millisecond timescales. -+ -+.TP -+minidle -+If avgidle is below 0, we are overlimits and need to wait until -+avgidle will be big enough to send one packet. To prevent a sudden -+burst from shutting down the link for a prolonged period of time, -+avgidle is reset to minidle if it gets too low. -+ -+Minidle is specified in negative microseconds, so 10 means that -+avgidle is capped at -10us. -+ -+.TP -+bounded -+Signifies that this class will not borrow bandwidth from its siblings. -+.TP -+isolated -+Means that this class will not borrow bandwidth to its siblings -+ -+.TP -+split major:minor & defmap bitmap[/bitmap] -+If consulting filters attached to a class did not give a verdict, -+CBQ can also classify based on the packet's priority. There are 16 -+priorities available, numbered from 0 to 15. -+ -+The defmap specifies which priorities this class wants to receive, -+specified as a bitmap. The Least Significant Bit corresponds to priority -+zero. The -+.B split -+parameter tells CBQ at which class the decision must be made, which should -+be a (grand)parent of the class you are adding. -+ -+As an example, 'tc class add ... classid 10:1 cbq .. split 10:0 defmap c0' -+configures class 10:0 to send packets with priorities 6 and 7 to 10:1. -+ -+The complimentary configuration would then -+be: 'tc class add ... classid 10:2 cbq ... split 10:0 defmap 3f' -+Which would send all packets 0, 1, 2, 3, 4 and 5 to 10:1. -+.TP -+estimator interval timeconstant -+CBQ can measure how much bandwidth each class is using, which tc filters -+can use to classify packets with. In order to determine the bandwidth -+it uses a very simple estimator that measures once every -+.B interval -+microseconds how much traffic has passed. This again is a EWMA, for which -+the time constant can be specified, also in microseconds. The -+.B time constant -+corresponds to the sluggishness of the measurement or, conversely, to the -+sensitivity of the average to short bursts. Higher values mean less -+sensitivity. -+ -+ -+ -+.SH SOURCES -+.TP -+o -+Sally Floyd and Van Jacobson, "Link-sharing and Resource -+Management Models for Packet Networks", -+IEEE/ACM Transactions on Networking, Vol.3, No.4, 1995 -+ -+.TP -+o -+Sally Floyd, "Notes on CBQ and Guarantee Service", 1995 -+ -+.TP -+o -+Sally Floyd, "Notes on Class-Based Queueing: Setting -+Parameters", 1996 -+ -+.TP -+o -+Sally Floyd and Michael Speer, "Experimental Results -+for Class-Based Queueing", 1998, not published. -+ -+ -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHOR -+Alexey N. Kuznetsov, . This manpage maintained by -+bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/old/tc-cbq.8 iproute2/debian/manpages/old/tc-cbq.8 ---- iproute2-orig/debian/manpages/old/tc-cbq.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/old/tc-cbq.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,353 @@ -+.TH CBQ 8 "16 December 2001" "iproute2" "Linux" -+.SH NAME -+CBQ \- Class Based Queueing -+.SH SYNOPSIS -+.B tc qdisc ... dev -+dev -+.B ( parent -+classid -+.B | root) [ handle -+major: -+.B ] cbq [ allot -+bytes -+.B ] avpkt -+bytes -+.B bandwidth -+rate -+.B [ cell -+bytes -+.B ] [ ewma -+log -+.B ] [ mpu -+bytes -+.B ] -+ -+.B tc class ... dev -+dev -+.B parent -+major:[minor] -+.B [ classid -+major:minor -+.B ] cbq allot -+bytes -+.B [ bandwidth -+rate -+.B ] [ rate -+rate -+.B ] prio -+priority -+.B [ weight -+weight -+.B ] [ minburst -+packets -+.B ] [ maxburst -+packets -+.B ] [ ewma -+log -+.B ] [ cell -+bytes -+.B ] avpkt -+bytes -+.B [ mpu -+bytes -+.B ] [ bounded isolated ] [ split -+handle -+.B & defmap -+defmap -+.B ] [ estimator -+interval timeconstant -+.B ] -+ -+.SH DESCRIPTION -+Class Based Queueing is a classful qdisc that implements a rich -+linksharing hierarchy of classes. It contains shaping elements as -+well as prioritizing capabilities. Shaping is performed using link -+idle time calculations based on the timing of dequeue events and -+underlying link bandwidth. -+ -+.SH SHAPING ALGORITHM -+When shaping a 10mbit/s connection to 1mbit/s, the link will -+be idle 90% of the time. If it isn't, it needs to be throttled so that it -+IS idle 90% of the time. -+ -+During operations, the effective idletime is measured using an -+exponential weighted moving average (EWMA), which considers recent -+packets to be exponentially more important than past ones. The Unix -+loadaverage is calculated in the same way. -+ -+The calculated idle time is subtracted from the EWMA measured one, -+the resulting number is called 'avgidle'. A perfectly loaded link has -+an avgidle of zero: packets arrive exactly at the calculated -+interval. -+ -+An overloaded link has a negative avgidle and if it gets too negative, -+CBQ throttles and is then 'overlimit'. -+ -+Conversely, an idle link might amass a huge avgidle, which would then -+allow infinite bandwidths after a few hours of silence. To prevent -+this, avgidle is capped at -+.B maxidle. -+ -+If overlimit, in theory, the CBQ could throttle itself for exactly the -+amount of time that was calculated to pass between packets, and then -+pass one packet, and throttle again. Due to timer resolution constraints, -+this may not be feasible, see the -+.B minburst -+parameter below. -+ -+.SH CLASSIFICATION -+Within the one CBQ instance many classes may exist. Each of these classes -+contains another qdisc, by default -+.BR tc-pfifo (8). -+ -+When enqueueing a packet, CBQ starts at the root and uses various methods to -+determine which class should receive the data. -+ -+In the absence of uncommon configuration options, the process is rather easy. -+At each node we look for an instruction, and then go to the class the -+instruction refers us to. If the class found is a barren leaf-node (without -+children), we enqueue the packet there. If it is not yet a leaf node, we do -+the whole thing over again starting from that node. -+ -+The following actions are performed, in order at each node we visit, until one -+sends us to another node, or terminates the process. -+.TP -+(i) -+Consult filters attached to the class. If sent to a leafnode, we are done. -+Otherwise, restart. -+.TP -+(ii) -+Consult the defmap for the priority assigned to this packet, which depends -+on the TOS bits. Check if the referral is leafless, otherwise restart. -+.TP -+(iii) -+Ask the defmap for instructions for the 'best effort' priority. Check the -+answer for leafness, otherwise restart. -+.TP -+(iv) -+If none of the above returned with an instruction, enqueue at this node. -+.P -+This algorithm makes sure that a packet always ends up somewhere, even while -+you are busy building your configuration. -+ -+For more details, see -+.BR tc-cbq-details(8). -+ -+.SH LINK SHARING ALGORITHM -+When dequeuing for sending to the network device, CBQ decides which of its -+classes will be allowed to send. It does so with a Weighted Round Robin process -+in which each class with packets gets a chance to send in turn. The WRR process -+starts by asking the highest priority classes (lowest numerically - -+highest semantically) for packets, and will continue to do so until they -+have no more data to offer, in which case the process repeats for lower -+priorities. -+ -+Classes by default borrow bandwidth from their siblings. A class can be -+prevented from doing so by declaring it 'bounded'. A class can also indicate -+its unwillingness to lend out bandwidth by being 'isolated'. -+ -+.SH QDISC -+The root of a CBQ qdisc class tree has the following parameters: -+ -+.TP -+parent major:minor | root -+This mandatory parameter determines the place of the CBQ instance, either at the -+.B root -+of an interface or within an existing class. -+.TP -+handle major: -+Like all other qdiscs, the CBQ can be assigned a handle. Should consist only -+of a major number, followed by a colon. Optional, but very useful if classes -+will be generated within this qdisc. -+.TP -+allot bytes -+This allotment is the 'chunkiness' of link sharing and is used for determining packet -+transmission time tables. The qdisc allot differs slightly from the class allot discussed -+below. Optional. Defaults to a reasonable value, related to avpkt. -+.TP -+avpkt bytes -+The average size of a packet is needed for calculating maxidle, and is also used -+for making sure 'allot' has a safe value. Mandatory. -+.TP -+bandwidth rate -+To determine the idle time, CBQ must know the bandwidth of your underlying -+physical interface, or parent qdisc. This is a vital parameter, more about it -+later. Mandatory. -+.TP -+cell -+The cell size determines he granularity of packet transmission time calculations. Has a sensible default. -+.TP -+mpu -+A zero sized packet may still take time to transmit. This value is the lower -+cap for packet transmission time calculations - packets smaller than this value -+are still deemed to have this size. Defaults to zero. -+.TP -+ewma log -+When CBQ needs to measure the average idle time, it does so using an -+Exponentially Weighted Moving Average which smoothes out measurements into -+a moving average. The EWMA LOG determines how much smoothing occurs. Lower -+values imply greater sensitivity. Must be between 0 and 31. Defaults -+to 5. -+.P -+A CBQ qdisc does not shape out of its own accord. It only needs to know certain -+parameters about the underlying link. Actual shaping is done in classes. -+ -+.SH CLASSES -+Classes have a host of parameters to configure their operation. -+ -+.TP -+parent major:minor -+Place of this class within the hierarchy. If attached directly to a qdisc -+and not to another class, minor can be omitted. Mandatory. -+.TP -+classid major:minor -+Like qdiscs, classes can be named. The major number must be equal to the -+major number of the qdisc to which it belongs. Optional, but needed if this -+class is going to have children. -+.TP -+weight weight -+When dequeuing to the interface, classes are tried for traffic in a -+round-robin fashion. Classes with a higher configured qdisc will generally -+have more traffic to offer during each round, so it makes sense to allow -+it to dequeue more traffic. All weights under a class are normalized, so -+only the ratios matter. Defaults to the configured rate, unless the priority -+of this class is maximal, in which case it is set to 1. -+.TP -+allot bytes -+Allot specifies how many bytes a qdisc can dequeue -+during each round of the process. This parameter is weighted using the -+renormalized class weight described above. Silently capped at a minimum of -+3/2 avpkt. Mandatory. -+ -+.TP -+prio priority -+In the round-robin process, classes with the lowest priority field are tried -+for packets first. Mandatory. -+ -+.TP -+avpkt -+See the QDISC section. -+ -+.TP -+rate rate -+Maximum rate this class and all its children combined can send at. Mandatory. -+ -+.TP -+bandwidth rate -+This is different from the bandwidth specified when creating a CBQ disc! Only -+used to determine maxidle and offtime, which are only calculated when -+specifying maxburst or minburst. Mandatory if specifying maxburst or minburst. -+ -+.TP -+maxburst -+This number of packets is used to calculate maxidle so that when -+avgidle is at maxidle, this number of average packets can be burst -+before avgidle drops to 0. Set it higher to be more tolerant of -+bursts. You can't set maxidle directly, only via this parameter. -+ -+.TP -+minburst -+As mentioned before, CBQ needs to throttle in case of -+overlimit. The ideal solution is to do so for exactly the calculated -+idle time, and pass 1 packet. However, Unix kernels generally have a -+hard time scheduling events shorter than 10ms, so it is better to -+throttle for a longer period, and then pass minburst packets in one -+go, and then sleep minburst times longer. -+ -+The time to wait is called the offtime. Higher values of minburst lead -+to more accurate shaping in the long term, but to bigger bursts at -+millisecond timescales. Optional. -+ -+.TP -+minidle -+If avgidle is below 0, we are overlimits and need to wait until -+avgidle will be big enough to send one packet. To prevent a sudden -+burst from shutting down the link for a prolonged period of time, -+avgidle is reset to minidle if it gets too low. -+ -+Minidle is specified in negative microseconds, so 10 means that -+avgidle is capped at -10us. Optional. -+ -+.TP -+bounded -+Signifies that this class will not borrow bandwidth from its siblings. -+.TP -+isolated -+Means that this class will not borrow bandwidth to its siblings -+ -+.TP -+split major:minor & defmap bitmap[/bitmap] -+If consulting filters attached to a class did not give a verdict, -+CBQ can also classify based on the packet's priority. There are 16 -+priorities available, numbered from 0 to 15. -+ -+The defmap specifies which priorities this class wants to receive, -+specified as a bitmap. The Least Significant Bit corresponds to priority -+zero. The -+.B split -+parameter tells CBQ at which class the decision must be made, which should -+be a (grand)parent of the class you are adding. -+ -+As an example, 'tc class add ... classid 10:1 cbq .. split 10:0 defmap c0' -+configures class 10:0 to send packets with priorities 6 and 7 to 10:1. -+ -+The complimentary configuration would then -+be: 'tc class add ... classid 10:2 cbq ... split 10:0 defmap 3f' -+Which would send all packets 0, 1, 2, 3, 4 and 5 to 10:1. -+.TP -+estimator interval timeconstant -+CBQ can measure how much bandwidth each class is using, which tc filters -+can use to classify packets with. In order to determine the bandwidth -+it uses a very simple estimator that measures once every -+.B interval -+microseconds how much traffic has passed. This again is a EWMA, for which -+the time constant can be specified, also in microseconds. The -+.B time constant -+corresponds to the sluggishness of the measurement or, conversely, to the -+sensitivity of the average to short bursts. Higher values mean less -+sensitivity. -+ -+.SH BUGS -+The actual bandwidth of the underlying link may not be known, for example -+in the case of PPoE or PPTP connections which in fact may send over a -+pipe, instead of over a physical device. CBQ is quite resilient to major -+errors in the configured bandwidth, probably a the cost of coarser shaping. -+ -+Default kernels rely on coarse timing information for making decisions. These -+may make shaping precise in the long term, but inaccurate on second long scales. -+ -+See -+.BR tc-cbq-details(8) -+for hints on how to improve this. -+ -+.SH SOURCES -+.TP -+o -+Sally Floyd and Van Jacobson, "Link-sharing and Resource -+Management Models for Packet Networks", -+IEEE/ACM Transactions on Networking, Vol.3, No.4, 1995 -+ -+.TP -+o -+Sally Floyd, "Notes on CBQ and Guaranteed Service", 1995 -+ -+.TP -+o -+Sally Floyd, "Notes on Class-Based Queueing: Setting -+Parameters", 1996 -+ -+.TP -+o -+Sally Floyd and Michael Speer, "Experimental Results -+for Class-Based Queueing", 1998, not published. -+ -+ -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHOR -+Alexey N. Kuznetsov, . This manpage maintained by -+bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/old/tc-htb.8 iproute2/debian/manpages/old/tc-htb.8 ---- iproute2-orig/debian/manpages/old/tc-htb.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/old/tc-htb.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,150 @@ -+.TH HTB 8 "10 January 2002" "iproute2" "Linux" -+.SH NAME -+HTB \- Hierarchy Token Bucket -+.SH SYNOPSIS -+.B tc qdisc ... dev -+dev -+.B ( parent -+classid -+.B | root) [ handle -+major: -+.B ] htb [ default -+minor-id -+.B ] -+ -+.B tc class ... dev -+dev -+.B parent -+major:[minor] -+.B [ classid -+major:minor -+.B ] htb rate -+rate -+.B [ ceil -+rate -+.B ] burst -+bytes -+.B [ cburst -+bytes -+.B ] [ prio -+priority -+.B ] -+ -+.SH DESCRIPTION -+HTB is meant as a more understandable and intuitive replacement for -+the CBQ qdisc in Linux. Both CBQ and HTB help you to control the use -+of the outbound bandwidth on a given link. Both allow you to use one -+physical link to simulate several slower links and to send different -+kinds of traffic on different simulated links. In both cases, you have -+to specify how to divide the physical link into simulated links and -+how to decide which simulated link to use for a given packet to be sent. -+ -+Unlike CBQ, HTB shapes traffic based on the Token Bucket Filter algorithm -+which does not depend on interface characteristics and so does not need to -+know the underlying bandwidth of the outgoing interface. -+ -+.SH SHAPING ALGORITHM -+Shaping works as documented in -+.B tc-tbf (8). -+ -+.SH CLASSIFICATION -+Within the one HRB instance many classes may exist. Each of these classes -+contains another qdisc, by default -+.BR tc-pfifo (8). -+ -+When enqueueing a packet, HTB starts at the root and uses various methods to -+determine which class should receive the data. -+ -+In the absence of uncommon configuration options, the process is rather easy. -+At each node we look for an instruction, and then go to the class the -+instruction refers us to. If the class found is a barren leaf-node (without -+children), we enqueue the packet there. If it is not yet a leaf node, we do -+the whole thing over again starting from that node. -+ -+The following actions are performed, in order at each node we visit, until one -+sends us to another node, or terminates the process. -+.TP -+(i) -+Consult filters attached to the class. If sent to a leafnode, we are done. -+Otherwise, restart. -+.TP -+(ii) -+If none of the above returned with an instruction, enqueue at this node. -+.P -+This algorithm makes sure that a packet always ends up somewhere, even while -+you are busy building your configuration. -+ -+.SH LINK SHARING ALGORITHM -+FIXME -+ -+.SH QDISC -+The root of a HTB qdisc class tree has the following parameters: -+ -+.TP -+parent major:minor | root -+This mandatory parameter determines the place of the HTB instance, either at the -+.B root -+of an interface or within an existing class. -+.TP -+handle major: -+Like all other qdiscs, the HTB can be assigned a handle. Should consist only -+of a major number, followed by a colon. Optional, but very useful if classes -+will be generated within this qdisc. -+.TP -+default minor-id -+Unclassified traffic gets sent to the class with this minor-id. -+ -+.SH CLASSES -+Classes have a host of parameters to configure their operation. -+ -+.TP -+parent major:minor -+Place of this class within the hierarchy. If attached directly to a qdisc -+and not to another class, minor can be omitted. Mandatory. -+.TP -+classid major:minor -+Like qdiscs, classes can be named. The major number must be equal to the -+major number of the qdisc to which it belongs. Optional, but needed if this -+class is going to have children. -+.TP -+prio priority -+In the round-robin process, classes with the lowest priority field are tried -+for packets first. Mandatory. -+ -+.TP -+rate rate -+Maximum rate this class and all its children are guaranteed. Mandatory. -+ -+.TP -+ceil rate -+Maximum rate at which a class can send, if its parent has bandwidth to spare. -+Defaults to the configured rate, which implies no borrowing -+ -+.TP -+burst bytes -+Amount of bytes that can be burst at -+.B ceil -+speed, in excess of the configured -+.B rate. -+Should be at least as high as the highest burst of all children. -+ -+.TP -+cburst bytes -+Amount of bytes that can be burst at 'infinite' speed, in other words, as fast -+as the interface can transmit them. For perfect evening out, should be equal to at most one average -+packet. Should be at least as high as the highest cburst of all children. -+ -+.SH NOTES -+Due to Unix timing constraints, the maximum ceil rate is not infinite and may in fact be quite low. On Intel, -+there are 100 timer events per second, the maximum rate is that rate at which 'burst' bytes are sent each timer tick. -+From this, the mininum burst size for a specified rate can be calculated. For i386, a 10mbit rate requires a 12 kilobyte -+burst as 100*12kb*8 equals 10mbit. -+ -+.SH SEE ALSO -+.BR tc (8) -+.P -+HTB website: http://luxik.cdi.cz/~devik/qos/htb/ -+.SH AUTHOR -+Martin Devera . This manpage maintained by bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/old/tc-pbfifo.8 iproute2/debian/manpages/old/tc-pbfifo.8 ---- iproute2-orig/debian/manpages/old/tc-pbfifo.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/old/tc-pbfifo.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,72 @@ -+.TH PBFIFO 8 "10 January 2002" "iproute2" "Linux" -+.SH NAME -+pfifo \- Packet limited First In, First Out queue -+.P -+bfifo \- Byte limited First In, First Out queue -+ -+.SH SYNOPSIS -+.B tc qdisc ... add pfifo -+.B [ limit -+packets -+.B ] -+.P -+.B tc qdisc ... add bfifo -+.B [ limit -+bytes -+.B ] -+ -+.SH DESCRIPTION -+The pfifo and bfifo qdiscs are unadorned First In, First Out queues. They are the -+simplest queues possible and therefore have no overhead. -+.B pfifo -+constrains the queue size as measured in packets. -+.B bfifo -+does so as measured in bytes. -+ -+Like all non-default qdiscs, they maintain statistics. This might be a reason to prefer -+pfifo or bfifo over the default. -+ -+.SH ALGORITHM -+A list of packets is maintained, when a packet is enqueued it gets inserted at the tail of -+a list. When a packet needs to be sent out to the network, it is taken from the head of the list. -+ -+If the list is too long, no further packets are allowed on. This is called 'tail drop'. -+ -+.SH PARAMETERS -+.TP -+limit -+Maximum queue size. Specified in bytes for bfifo, in packets for pfifo. For pfifo, defaults -+to the interface txqueuelen, as specified with -+.BR ifconfig (8) -+or -+.BR ip (8). -+ -+For bfifo, it defaults to the txqueuelen multiplied by the interface MTU. -+ -+.SH OUTPUT -+The output of -+.B tc -s qdisc ls -+contains the limit, either in packets or in bytes, and the number of bytes -+and packets actually sent. An unsent and dropped packet only appears between braces -+and is not counted as 'Sent'. -+ -+In this example, the queue length is 100 packets, 45894 bytes were sent over 681 packets. -+No packets were dropped, and as the pfifo queue does not slow down packets, there were also no -+overlimits: -+.P -+.nf -+# tc -s qdisc ls dev eth0 -+qdisc pfifo 8001: dev eth0 limit 100p -+ Sent 45894 bytes 681 pkts (dropped 0, overlimits 0) -+.fi -+ -+If a backlog occurs, this is displayed as well. -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHORS -+Alexey N. Kuznetsov, -+ -+This manpage maintained by bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/old/tc-pfifo_fast.8 iproute2/debian/manpages/old/tc-pfifo_fast.8 ---- iproute2-orig/debian/manpages/old/tc-pfifo_fast.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/old/tc-pfifo_fast.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,59 @@ -+.TH PFIFO_FAST 8 "10 January 2002" "iproute2" "Linux" -+.SH NAME -+pfifo_fast \- three-band first in, first out queue -+ -+.SH DESCRIPTION -+pfifo_fast is the default qdisc of each interface. -+ -+Whenever an interface is created, the pfifo_fast qdisc is automatically used -+as a queue. If another qdisc is attached, it preempts the default -+pfifo_fast, which automatically returns to function when an existing qdisc -+is detached. -+ -+In this sense this qdisc is magic, and unlike other qdiscs. -+ -+.SH ALGORITHM -+The algorithm is very similar to that of the classful -+.BR tc-prio (8) -+qdisc. -+.B pfifo_fast -+is like three -+.BR tc-pfifo (8) -+queues side by side, where packets can be enqueued in any of the three bands -+based on their Type of Service bits or assigned priority. -+ -+Not all three bands are dequeued simultaneously - as long as lower bands -+have traffic, higher bands are never dequeued. This can be used to -+prioritize interactive traffic or penalize 'lowest cost' traffic. -+ -+Each band can be txqueuelen packets long, as configured with -+.BR ifconfig (8) -+or -+.BR ip (8). -+Additional packets coming in are not enqueued but are instead dropped. -+ -+See -+.BR tc-prio (8) -+for complete details on how TOS bits are translated into bands. -+.SH PARAMETERS -+.TP -+txqueuelen -+The length of the three bands depends on the interface txqueuelen, as -+specified with -+.BR ifconfig (8) -+or -+.BR ip (8). -+ -+.SH BUGS -+Does not maintain statistics and does not show up in tc qdisc ls. This is because -+it is the automatic default in the absence of a configured qdisc. -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHORS -+Alexey N. Kuznetsov, -+ -+This manpage maintained by bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/old/tc-prio.8 iproute2/debian/manpages/old/tc-prio.8 ---- iproute2-orig/debian/manpages/old/tc-prio.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/old/tc-prio.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,187 @@ -+.TH PRIO 8 "16 December 2001" "iproute2" "Linux" -+.SH NAME -+PRIO \- Priority qdisc -+.SH SYNOPSIS -+.B tc qdisc ... dev -+dev -+.B ( parent -+classid -+.B | root) [ handle -+major: -+.B ] prio [ bands -+bands -+.B ] [ priomap -+band,band,band... -+.B ] [ estimator -+interval timeconstant -+.B ] -+ -+.SH DESCRIPTION -+The PRIO qdisc is a simple classful queueing discipline that contains -+an arbitrary number of classes of differing priority. The classes are -+dequeued in numerical descending order of priority. PRIO is a scheduler -+and never delays packets - it is a work-conserving qdisc, though the qdiscs -+contained in the classes may not be. -+ -+Very useful for lowering latency when there is no need for slowing down -+traffic. -+ -+.SH ALGORITHM -+On creation with 'tc qdisc add', a fixed number of bands is created. Each -+band is a class, although is not possible to add classes with 'tc qdisc -+add', the number of bands to be created must instead be specified on the -+commandline attaching PRIO to its root. -+ -+When dequeueing, band 0 is tried first and only if it did not deliver a -+packet does PRIO try band 1, and so onwards. Maximum reliability packets -+should therefore go to band 0, minimum delay to band 1 and the rest to band -+2. -+ -+As the PRIO qdisc itself will have minor number 0, band 0 is actually -+major:1, band 1 is major:2, etc. For major, substitute the major number -+assigned to the qdisc on 'tc qdisc add' with the -+.B handle -+parameter. -+ -+.SH CLASSIFICATION -+Three methods are available to PRIO to determine in which band a packet will -+be enqueued. -+.TP -+From userspace -+A process with sufficient privileges can encode the destination class -+directly with SO_PRIORITY, see -+.BR tc(7). -+.TP -+with a tc filter -+A tc filter attached to the root qdisc can point traffic directly to a class -+.TP -+with the priomap -+Based on the packet priority, which in turn is derived from the Type of -+Service assigned to the packet. -+.P -+Only the priomap is specific to this qdisc. -+.SH QDISC PARAMETERS -+.TP -+bands -+Number of bands. If changed from the default of 3, -+.B priomap -+must be updated as well. -+.TP -+priomap -+The priomap maps the priority of -+a packet to a class. The priority can either be set directly from userspace, -+or be derived from the Type of Service of the packet. -+ -+Determines how packet priorities, as assigned by the kernel, map to -+bands. Mapping occurs based on the TOS octet of the packet, which looks like -+this: -+ -+.nf -+0 1 2 3 4 5 6 7 -++---+---+---+---+---+---+---+---+ -+| | | | -+|PRECEDENCE | TOS |MBZ| -+| | | | -++---+---+---+---+---+---+---+---+ -+.fi -+ -+The four TOS bits (the 'TOS field') are defined as: -+ -+.nf -+Binary Decimcal Meaning -+----------------------------------------- -+1000 8 Minimize delay (md) -+0100 4 Maximize throughput (mt) -+0010 2 Maximize reliability (mr) -+0001 1 Minimize monetary cost (mmc) -+0000 0 Normal Service -+.fi -+ -+As there is 1 bit to the right of these four bits, the actual value of the -+TOS field is double the value of the TOS bits. Tcpdump -v -v shows you the -+value of the entire TOS field, not just the four bits. It is the value you -+see in the first column of this table: -+ -+.nf -+TOS Bits Means Linux Priority Band -+------------------------------------------------------------ -+0x0 0 Normal Service 0 Best Effort 1 -+0x2 1 Minimize Monetary Cost 1 Filler 2 -+0x4 2 Maximize Reliability 0 Best Effort 1 -+0x6 3 mmc+mr 0 Best Effort 1 -+0x8 4 Maximize Throughput 2 Bulk 2 -+0xa 5 mmc+mt 2 Bulk 2 -+0xc 6 mr+mt 2 Bulk 2 -+0xe 7 mmc+mr+mt 2 Bulk 2 -+0x10 8 Minimize Delay 6 Interactive 0 -+0x12 9 mmc+md 6 Interactive 0 -+0x14 10 mr+md 6 Interactive 0 -+0x16 11 mmc+mr+md 6 Interactive 0 -+0x18 12 mt+md 4 Int. Bulk 1 -+0x1a 13 mmc+mt+md 4 Int. Bulk 1 -+0x1c 14 mr+mt+md 4 Int. Bulk 1 -+0x1e 15 mmc+mr+mt+md 4 Int. Bulk 1 -+.fi -+ -+The second column contains the value of the relevant -+four TOS bits, followed by their translated meaning. For example, 15 stands -+for a packet wanting Minimal Montetary Cost, Maximum Reliability, Maximum -+Throughput AND Minimum Delay. -+ -+The fourth column lists the way the Linux kernel interprets the TOS bits, by -+showing to which Priority they are mapped. -+ -+The last column shows the result of the default priomap. On the commandline, -+the default priomap looks like this: -+ -+ 1, 2, 2, 2, 1, 2, 0, 0 , 1, 1, 1, 1, 1, 1, 1, 1 -+ -+This means that priority 4, for example, gets mapped to band number 1. -+The priomap also allows you to list higher priorities (> 7) which do not -+correspond to TOS mappings, but which are set by other means. -+ -+This table from RFC 1349 (read it for more details) explains how -+applications might very well set their TOS bits: -+ -+.nf -+TELNET 1000 (minimize delay) -+FTP -+ Control 1000 (minimize delay) -+ Data 0100 (maximize throughput) -+ -+TFTP 1000 (minimize delay) -+ -+SMTP -+ Command phase 1000 (minimize delay) -+ DATA phase 0100 (maximize throughput) -+ -+Domain Name Service -+ UDP Query 1000 (minimize delay) -+ TCP Query 0000 -+ Zone Transfer 0100 (maximize throughput) -+ -+NNTP 0001 (minimize monetary cost) -+ -+ICMP -+ Errors 0000 -+ Requests 0000 (mostly) -+ Responses (mostly) -+.fi -+ -+ -+.SH CLASSES -+PRIO classes cannot be configured further - they are automatically created -+when the PRIO qdisc is attached. Each class however can contain yet a -+further qdisc. -+ -+.SH BUGS -+Large amounts of traffic in the lower bands can cause starvation of higher -+bands. Can be prevented by attaching a shaper (for example, -+.BR tc-tbf(8) -+to these bands to make sure they cannot dominate the link. -+ -+.SH AUTHORS -+Alexey N. Kuznetsov, , J Hadi Salim -+. This manpage maintained by bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/old/tc-red.8 iproute2/debian/manpages/old/tc-red.8 ---- iproute2-orig/debian/manpages/old/tc-red.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/old/tc-red.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,131 @@ -+.TH RED 8 "13 December 2001" "iproute2" "Linux" -+.SH NAME -+red \- Random Early Detection -+.SH SYNOPSIS -+.B tc qdisc ... red -+.B limit -+bytes -+.B min -+bytes -+.B max -+bytes -+.B avpkt -+bytes -+.B burst -+packets -+.B [ ecn ] [ bandwidth -+rate -+.B ] probability -+chance -+ -+.SH DESCRIPTION -+Random Early Detection is a classless qdisc which manages its queue size -+smartly. Regular queues simply drop packets from the tail when they are -+full, which may not be the optimal behaviour. RED also performs tail drop, -+but does so in a more gradual way. -+ -+Once the queue hits a certain average length, packets enqueued have a -+configurable chance of being marked (which may mean dropped). This chance -+increases linearly up to a point called the -+.B max -+average queue length, although the queue might get bigger. -+ -+This has a host of benefits over simple taildrop, while not being processor -+intensive. It prevents synchronous retransmits after a burst in traffic, -+which cause further retransmits, etc. -+ -+The goal is the have a small queue size, which is good for interactivity -+while not disturbing TCP/IP traffic with too many sudden drops after a burst -+of traffic. -+ -+Depending on if ECN is configured, marking either means dropping or -+purely marking a packet as overlimit. -+.SH ALGORITHM -+The average queue size is used for determining the marking -+probability. This is calculated using an Exponential Weighted Moving -+Average, which can be more or less sensitive to bursts. -+ -+When the average queue size is below -+.B min -+bytes, no packet will ever be marked. When it exceeds -+.B min, -+the probability of doing so climbs linearly up -+to -+.B probability, -+until the average queue size hits -+.B max -+bytes. Because -+.B probability -+is normally not set to 100%, the queue size might -+conceivably rise above -+.B max -+bytes, so the -+.B limit -+parameter is provided to set a hard maximum for the size of the queue. -+ -+.SH PARAMETERS -+.TP -+min -+Average queue size at which marking becomes a possibility. -+.TP -+max -+At this average queue size, the marking probability is maximal. Should be at -+least twice -+.B min -+to prevent synchronous retransmits, higher for low -+.B min. -+.TP -+probability -+Maximum probability for marking, specified as a floating point -+number from 0.0 to 1.0. Suggested values are 0.01 or 0.02 (1 or 2%, -+respectively). -+.TP -+limit -+Hard limit on the real (not average) queue size in bytes. Further packets -+are dropped. Should be set higher than max+burst. It is advised to set this -+a few times higher than -+.B max. -+.TP -+burst -+Used for determining how fast the average queue size is influenced by the -+real queue size. Larger values make the calculation more sluggish, allowing -+longer bursts of traffic before marking starts. Real life experiments -+support the following guideline: (min+min+max)/(3*avpkt). -+.TP -+avpkt -+Specified in bytes. Used with burst to determine the time constant for -+average queue size calculations. 1000 is a good value. -+.TP -+bandwidth -+This rate is used for calculating the average queue size after some -+idle time. Should be set to the bandwidth of your interface. Does not mean -+that RED will shape for you! Optional. -+.TP -+ecn -+As mentioned before, RED can either 'mark' or 'drop'. Explicit Congestion -+Notification allows RED to notify remote hosts that their rate exceeds the -+amount of bandwidth available. Non-ECN capable hosts can only be notified by -+dropping a packet. If this parameter is specified, packets which indicate -+that their hosts honor ECN will only be marked and not dropped, unless the -+queue size hits -+.B limit -+bytes. Needs a tc binary with RED support compiled in. Recommended. -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH SOURCES -+.TP -+o -+Floyd, S., and Jacobson, V., Random Early Detection gateways for -+Congestion Avoidance. http://www.aciri.org/floyd/papers/red/red.html -+.TP -+o -+Some changes to the algorithm by Alexey N. Kuznetsov. -+ -+.SH AUTHORS -+Alexey N. Kuznetsov, , Alexey Makarenko -+, J Hadi Salim . -+This manpage maintained by bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/old/tc-sfq.8 iproute2/debian/manpages/old/tc-sfq.8 ---- iproute2-orig/debian/manpages/old/tc-sfq.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/old/tc-sfq.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,107 @@ -+.TH TC 8 "8 December 2001" "iproute2" "Linux" -+.SH NAME -+sfq \- Stochastic Fairness Queueing -+.SH SYNOPSIS -+.B tc qdisc ... perturb -+seconds -+.B quantum -+bytes -+ -+.SH DESCRIPTION -+ -+Stochastic Fairness Queueing is a classless queueing discipline available for -+traffic control with the -+.BR tc (8) -+command. -+ -+SFQ does not shape traffic but only schedules the transmission of packets, based on 'flows'. -+The goal is to ensure fairness so that each flow is able to send data in turn, thus preventing -+any single flow from drowning out the rest. -+ -+This may in fact have some effect in mitigating a Denial of Service attempt. -+ -+SFQ is work-conserving and therefore always delivers a packet if it has one available. -+.SH ALGORITHM -+On enqueueing, each packet is assigned to a hash bucket, based on -+.TP -+(i) -+Source address -+.TP -+(ii) -+Destination address -+.TP -+(iii) -+Source port -+.P -+If these are available. SFQ knows about ipv4 and ipv6 and also UDP, TCP and ESP. -+Packets with other protocols are hashed based on the 32bits representation of their -+destination and the socket they belong to. A flow corresponds mostly to a TCP/IP -+connection. -+ -+Each of these buckets should represent a unique flow. Because multiple flows may -+get hashed to the same bucket, the hashing algorithm is perturbed at configurable -+intervals so that the unfairness lasts only for a short while. Perturbation may -+however cause some inadvertent packet reordering to occur. -+ -+When dequeuing, each hashbucket with data is queried in a round robin fashion. -+ -+The compile time maximum length of the SFQ is 128 packets, which can be spread over -+at most 128 buckets of 1024 available. In case of overflow, tail-drop is performed -+on the fullest bucket, thus maintaining fairness. -+ -+.SH PARAMETERS -+.TP -+perturb -+Interval in seconds for queue algorithm perturbation. Defaults to 0, which means that -+no perturbation occurs. Do not set too low for each perturbation may cause some packet -+reordering. Advised value: 10 -+.TP -+quantum -+Amount of bytes a flow is allowed to dequeue during a round of the round robin process. -+Defaults to the MTU of the interface which is also the advised value and the minimum value. -+ -+.SH EXAMPLE & USAGE -+ -+To attach to device ppp0: -+.P -+# tc qdisc add dev ppp0 root sfq perturb 10 -+.P -+Please note that SFQ, like all non-shaping (work-conserving) qdiscs, is only useful -+if it owns the queue. -+This is the case when the link speed equals the actually available bandwidth. This holds -+for regular phone modems, ISDN connections and direct non-switched ethernet links. -+.P -+Most often, cable modems and DSL devices do not fall into this category. The same holds -+for when connected to a switch and trying to send data to a congested segment also -+connected to the switch. -+.P -+In this case, the effective queue does not reside within Linux and is therefore not -+available for scheduling. -+.P -+Embed SFQ in a classful qdisc to make sure it owns the queue. -+ -+.SH SOURCE -+.TP -+o -+Paul E. McKenney "Stochastic Fairness Queuing", -+IEEE INFOCOMM'90 Proceedings, San Francisco, 1990. -+ -+.TP -+o -+Paul E. McKenney "Stochastic Fairness Queuing", -+"Interworking: Research and Experience", v.2, 1991, p.113-131. -+ -+.TP -+o -+See also: -+M. Shreedhar and George Varghese "Efficient Fair -+Queuing using Deficit Round Robin", Proc. SIGCOMM 95. -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHOR -+Alexey N. Kuznetsov, . This manpage maintained by -+bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/old/tc-tbf.8 iproute2/debian/manpages/old/tc-tbf.8 ---- iproute2-orig/debian/manpages/old/tc-tbf.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/old/tc-tbf.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,138 @@ -+.TH TC 8 "13 December 2001" "iproute2" "Linux" -+.SH NAME -+tbf \- Token Bucket Filter -+.SH SYNOPSIS -+.B tc qdisc ... tbf rate -+rate -+.B burst -+bytes/cell -+.B ( latency -+ms -+.B | limit -+bytes -+.B ) [ mpu -+bytes -+.B [ peakrate -+rate -+.B mtu -+bytes/cell -+.B ] ] -+.P -+burst is also known as buffer and maxburst. mtu is also known as minburst. -+.SH DESCRIPTION -+ -+The Token Bucket Filter is a classless queueing discipline available for -+traffic control with the -+.BR tc (8) -+command. -+ -+TBF is a pure shaper and never schedules traffic. It is non-work-conserving and may throttle -+itself, although packets are available, to ensure that the configured rate is not exceeded. -+On all platforms except for Alpha, -+it is able to shape up to 1mbit/s of normal traffic with ideal minimal burstiness, -+sending out data exactly at the configured rates. -+ -+Much higher rates are possible but at the cost of losing the minimal burstiness. In that -+case, data is on average dequeued at the configured rate but may be sent much faster at millisecond -+timescales. Because of further queues living in network adaptors, this is often not a problem. -+ -+Kernels with a higher 'HZ' can achieve higher rates with perfect burstiness. On Alpha, HZ is ten -+times higher, leading to a 10mbit/s limit to perfection. These calculations hold for packets of on -+average 1000 bytes. -+ -+.SH ALGORITHM -+As the name implies, traffic is filtered based on the expenditure of -+.B tokens. -+Tokens roughly correspond to bytes, with the additional constraint that each packet consumes -+some tokens, no matter how small it is. This reflects the fact that even a zero-sized packet occupies -+the link for some time. -+ -+On creation, the TBF is stocked with tokens which correspond to the amount of traffic that can be burst -+in one go. Tokens arrive at a steady rate, until the bucket is full. -+ -+If no tokens are available, packets are queued, up to a configured limit. The TBF now -+calculates the token deficit, and throttles until the first packet in the queue can be sent. -+ -+If it is not acceptable to burst out packets at maximum speed, a peakrate can be configured -+to limit the speed at which the bucket empties. This peakrate is implemented as a second TBF -+with a very small bucket, so that it doesn't burst. -+ -+To achieve perfection, the second bucket may contain only a single packet, which leads to -+the earlier mentioned 1mbit/s limit. -+ -+This limit is caused by the fact that the kernel can only throttle for at minimum 1 'jiffy', which depends -+on HZ as 1/HZ. For perfect shaping, only a single packet can get sent per jiffy - for HZ=100, this means 100 -+packets of on average 1000 bytes each, which roughly corresponds to 1mbit/s. -+ -+.SH PARAMETERS -+See -+.BR tc (8) -+for how to specify the units of these values. -+.TP -+limit or latency -+Limit is the number of bytes that can be queued waiting for tokens to become -+available. You can also specify this the other way around by setting the -+latency parameter, which specifies the maximum amount of time a packet can -+sit in the TBF. The latter calculation takes into account the size of the -+bucket, the rate and possibly the peakrate (if set). These two parameters -+are mutually exclusive. -+.TP -+burst -+Also known as buffer or maxburst. -+Size of the bucket, in bytes. This is the maximum amount of bytes that tokens can be available for instantaneously. -+In general, larger shaping rates require a larger buffer. For 10mbit/s on Intel, you need at least 10kbyte buffer -+if you want to reach your configured rate! -+ -+If your buffer is too small, packets may be dropped because more tokens arrive per timer tick than fit in your bucket. -+The minimum buffer size can be calculated by dividing the rate by HZ. -+ -+Token usage calculations are performed using a table which by default has a resolution of 8 packets. -+This resolution can be changed by specifying the -+.B cell -+size with the burst. For example, to specify a 6000 byte buffer with a 16 -+byte cell size, set a burst of 6000/16. You will probably never have to set -+this. Must be an integral power of 2. -+.TP -+mpu -+A zero-sized packet does not use zero bandwidth. For ethernet, no packet uses less than 64 bytes. The Minimum Packet Unit -+determines the minimal token usage (specified in bytes) for a packet. Defaults to zero. -+.TP -+rate -+The speed knob. See remarks above about limits! See -+.BR tc (8) -+for units. -+.PP -+Furthermore, if a peakrate is desired, the following parameters are available: -+ -+.TP -+peakrate -+Maximum depletion rate of the bucket. Limited to 1mbit/s on Intel, 10mbit/s on Alpha. The peakrate does -+not need to be set, it is only necessary if perfect millisecond timescale shaping is required. -+ -+.TP -+mtu/minburst -+Specifies the size of the peakrate bucket. For perfect accuracy, should be set to the MTU of the interface. -+If a peakrate is needed, but some burstiness is acceptable, this size can be raised. A 3000 byte minburst -+allows around 3mbit/s of peakrate, given 1000 byte packets. -+ -+Like the regular burstsize you can also specify a -+.B cell -+size. -+.SH EXAMPLE & USAGE -+ -+To attach a TBF with a sustained maximum rate of 0.5mbit/s, a peakrate of 1.0mbit/s, -+a 5kilobyte buffer, with a pre-bucket queue size limit calculated so the TBF causes -+at most 70ms of latency, with perfect peakrate behaviour, issue: -+.P -+# tc qdisc add dev eth0 root tbf rate 0.5mbit \\ -+ burst 5kb latency 70ms peakrate 1mbit \\ -+ minburst 1540 -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHOR -+Alexey N. Kuznetsov, . This manpage maintained by -+bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/old/tc.8 iproute2/debian/manpages/old/tc.8 ---- iproute2-orig/debian/manpages/old/tc.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/old/tc.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,348 @@ -+.TH TC 8 "16 December 2001" "iproute2" "Linux" -+.SH NAME -+tc \- show / manipulate traffic control settings -+.SH SYNOPSIS -+.B tc qdisc [ add | change | replace | link ] dev -+DEV -+.B -+[ parent -+qdisc-id -+.B | root ] -+.B [ handle -+qdisc-id ] qdisc -+[ qdisc specific parameters ] -+.P -+ -+.B tc class [ add | change | replace ] dev -+DEV -+.B parent -+qdisc-id -+.B [ classid -+class-id ] qdisc -+[ qdisc specific parameters ] -+.P -+ -+.B tc filter [ add | change | replace ] dev -+DEV -+.B [ parent -+qdisc-id -+.B | root ] protocol -+protocol -+.B prio -+priority filtertype -+[ filtertype specific parameters ] -+.B flowid -+flow-id -+ -+.B tc [-s | -d ] qdisc show [ dev -+DEV -+.B ] -+.P -+.B tc [-s | -d ] class show dev -+DEV -+.P -+.B tc filter show dev -+DEV -+ -+.SH DESCRIPTION -+.B Tc -+is used to configure Traffic Control in the Linux kernel. Traffic Control consists -+of the following: -+ -+.TP -+SHAPING -+When traffic is shaped, its rate of transmission is under control. Shaping may -+be more than lowering the available bandwidth - it is also used to smooth out -+bursts in traffic for better network behaviour. Shaping occurs on egress. -+ -+.TP -+SCHEDULING -+By scheduling the transmission of packets it is possible to improve interactivity -+for traffic that needs it while still guaranteeing bandwidth to bulk transfers. Reordering -+is also called prioritizing, and happens only on egress. -+ -+.TP -+POLICING -+Where shaping deals with transmission of traffic, policing pertains to traffic -+arriving. Policing thus occurs on ingress. -+ -+.TP -+DROPPING -+Traffic exceeding a set bandwidth may also be dropped forthwith, both on -+ingress and on egress. -+ -+.P -+Processing of traffic is controlled by three kinds of objects: qdiscs, -+classes and filters. -+ -+.SH QDISCS -+.B qdisc -+is short for 'queueing discipline' and it is elementary to -+understanding traffic control. Whenever the kernel needs to send a -+packet to an interface, it is -+.B enqueued -+to the qdisc configured for that interface. Immediately afterwards, the kernel -+tries to get as many packets as possible from the qdisc, for giving them -+to the network adaptor driver. -+ -+A simple QDISC is the 'pfifo' one, which does no processing at all and is a pure -+First In, First Out queue. It does however store traffic when the network interface -+can't handle it momentarily. -+ -+.SH CLASSES -+Some qdiscs can contain classes, which contain further qdiscs - traffic may -+then be enqueued in any of the inner qdiscs, which are within the -+.B classes. -+When the kernel tries to dequeue a packet from such a -+.B classful qdisc -+it can come from any of the classes. A qdisc may for example prioritize -+certain kinds of traffic by trying to dequeue from certain classes -+before others. -+ -+.SH FILTERS -+A -+.B filter -+is used by a classful qdisc to determine in which class a packet will -+be enqueued. Whenever traffic arrives at a class with subclasses, it needs -+to be classified. Various methods may be employed to do so, one of these -+are the filters. All filters attached to the class are called, until one of -+them returns with a verdict. If no verdict was made, other criteria may be -+available. This differs per qdisc. -+ -+It is important to notice that filters reside -+.B within -+qdiscs - they are not masters of what happens. -+ -+.SH CLASSLESS QDISCS -+The classless qdiscs are: -+.TP -+[p|b]fifo -+Simplest usable qdisc, pure First In, First Out behaviour. Limited in -+packets or in bytes. -+.TP -+pfifo_fast -+Standard qdisc for 'Advanced Router' enabled kernels. Consists of a three-band -+queue which honors Type of Service flags, as well as the priority that may be -+assigned to a packet. -+.TP -+red -+Random Early Detection simulates physical congestion by randomly dropping -+packets when nearing configured bandwidth allocation. Well suited to very -+large bandwidth applications. -+.TP -+sfq -+Stochastic Fairness Queueing reorders queued traffic so each 'session' -+gets to send a packet in turn. -+.TP -+tbf -+The Token Bucket Filter is suited for slowing traffic down to a precisely -+configured rate. Scales well to large bandwidths. -+.SH CONFIGURING CLASSLESS QDISCS -+In the absence of classful qdiscs, classless qdiscs can only be attached at -+the root of a device. Full syntax: -+.P -+.B tc qdisc add dev -+DEV -+.B root -+QDISC QDISC-PARAMETERS -+ -+To remove, issue -+.P -+.B tc qdisc del dev -+DEV -+.B root -+ -+The -+.B pfifo_fast -+qdisc is the automatic default in the absence of a configured qdisc. -+ -+.SH CLASSFUL QDISCS -+The classful qdiscs are: -+.TP -+CBQ -+Class Based Queueing implements a rich linksharing hierarchy of classes. -+It contains shaping elements as well as prioritizing capabilities. Shaping is -+performed using link idle time calculations based on average packet size and -+underlying link bandwidth. The latter may be ill-defined for some interfaces. -+.TP -+HTB -+The Hierarchy Token Bucket implements a rich linksharing hierarchy of -+classes with an emphasis on conforming to existing practices. HTB facilitates -+guaranteeing bandwidth to classes, while also allowing specification of upper -+limits to inter-class sharing. It contains shaping elements, based on TBF and -+can prioritize classes. -+.TP -+PRIO -+The PRIO qdisc is a non-shaping container for a configurable number of -+classes which are dequeued in order. This allows for easy prioritization -+of traffic, where lower classes are only able to send if higher ones have -+no packets available. To facilitate configuration, Type Of Service bits are -+honored by default. -+.SH THEORY OF OPERATION -+Classes form a tree, where each class has a single parent. -+A class may have multiple children. Some qdiscs allow for runtime addition -+of classes (CBQ, HTB) while others (PRIO) are created with a static number of -+children. -+ -+Qdiscs which allow dynamic addition of classes can have zero or more -+subclasses to which traffic may be enqueued. -+ -+Furthermore, each class contains a -+.B leaf qdisc -+which by default has -+.B pfifo -+behaviour though another qdisc can be attached in place. This qdisc may again -+contain classes, but each class can have only one leaf qdisc. -+ -+When a packet enters a classful qdisc it can be -+.B classified -+to one of the classes within. Three criteria are available, although not all -+qdiscs will use all three: -+.TP -+tc filters -+If tc filters are attached to a class, they are consulted first -+for relevant instructions. Filters can match on all fields of a packet header, -+as well as on the firewall mark applied by ipchains or iptables. See -+.BR tc-filters (8). -+.TP -+Type of Service -+Some qdiscs have built in rules for classifying packets based on the TOS field. -+.TP -+skb->priority -+Userspace programs can encode a class-id in the 'skb->priority' field using -+the SO_PRIORITY option. -+.P -+Each node within the tree can have its own filters but higher level filters -+may also point directly to lower classes. -+ -+If classification did not succeed, packets are enqueued to the leaf qdisc -+attached to that class. Check qdisc specific manpages for details, however. -+ -+.SH NAMING -+All qdiscs, classes and filters have IDs, which can either be specified -+or be automatically assigned. -+ -+IDs consist of a major number and a minor number, separated by a colon. -+ -+.TP -+QDISCS -+A qdisc, which potentially can have children, -+gets assigned a major number, called a 'handle', leaving the minor -+number namespace available for classes. The handle is expressed as '10:'. -+It is customary to explicitly assign a handle to qdiscs expected to have -+children. -+ -+.TP -+CLASSES -+Classes residing under a qdisc share their qdisc major number, but each have -+a separate minor number called a 'classid' that has no relation to their -+parent classes, only to their parent qdisc. The same naming custom as for -+qdiscs applies. -+ -+.TP -+FILTERS -+Filters have a three part ID, which is only needed when using a hashed -+filter hierarchy, for which see -+.BR tc-filters (8). -+.SH UNITS -+All parameters accept a floating point number, possibly followed by a unit. -+.P -+Bandwidths or rates can be specified in: -+.TP -+kbps -+Kilobytes per second -+.TP -+mbps -+Megabytes per second -+.TP -+kbit -+Kilobits per second -+.TP -+mbit -+Megabits per second -+.TP -+bps or a bare number -+Bytes per second -+.P -+Amounts of data can be specified in: -+.TP -+kb or k -+Kilobytes -+.TP -+mb or m -+Megabytes -+.TP -+mbit -+Megabits -+.TP -+kbit -+Kilobits -+.TP -+b or a bare number -+Bytes. -+.P -+Lengths of time can be specified in: -+.TP -+s, sec or secs -+Whole seconds -+.TP -+ms, msec or msecs -+Milliseconds -+.TP -+us, usec, usecs or a bare number -+Microseconds. -+ -+.SH TC COMMANDS -+The following commands are available for qdiscs, classes and filter: -+.TP -+add -+Add a qdisc, class or filter to a node. For all entities, a -+.B parent -+must be passed, either by passing its ID or by attaching directly to the root of a device. -+When creating a qdisc or a filter, it can be named with the -+.B handle -+parameter. A class is named with the -+.B classid -+parameter. -+ -+.TP -+remove -+A qdisc can be removed by specifying its handle, which may also be 'root'. All subclasses and their leaf qdiscs -+are automatically deleted, as well as any filters attached to them. -+ -+.TP -+change -+Some entities can be modified 'in place'. Shares the syntax of 'add', with the exception -+that the handle cannot be changed and neither can the parent. In other words, -+.B -+change -+cannot move a node. -+ -+.TP -+replace -+Performs a nearly atomic remove/add on an existing node id. If the node does not exist yet -+it is created. -+ -+.TP -+link -+Only available for qdiscs and performs a replace where the node -+must exist already. -+ -+ -+.SH HISTORY -+.B tc -+was written by Alexey N. Kuznetsov and added in Linux 2.2. -+.SH SEE ALSO -+.BR tc-cbq (8), -+.BR tc-htb (8), -+.BR tc-sfq (8), -+.BR tc-red (8), -+.BR tc-tbf (8), -+.BR tc-pfifo (8), -+.BR tc-bfifo (8), -+.BR tc-pfifo_fast (8), -+.BR tc-filters (8) -+ -+.SH AUTHOR -+Manpage maintained by bert hubert (ahu@ds9a.nl) -+ -diff -Naur iproute2-orig/debian/manpages/tc-cbq-details.8 iproute2/debian/manpages/tc-cbq-details.8 ---- iproute2-orig/debian/manpages/tc-cbq-details.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/tc-cbq-details.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,425 @@ -+.TH CBQ 8 "8 December 2001" "iproute2" "Linux" -+.SH NAME -+CBQ \- Class Based Queueing -+.SH SYNOPSIS -+.B tc qdisc ... dev -+dev -+.B ( parent -+classid -+.B | root) [ handle -+major: -+.B ] cbq avpkt -+bytes -+.B bandwidth -+rate -+.B [ cell -+bytes -+.B ] [ ewma -+log -+.B ] [ mpu -+bytes -+.B ] -+ -+.B tc class ... dev -+dev -+.B parent -+major:[minor] -+.B [ classid -+major:minor -+.B ] cbq allot -+bytes -+.B [ bandwidth -+rate -+.B ] [ rate -+rate -+.B ] prio -+priority -+.B [ weight -+weight -+.B ] [ minburst -+packets -+.B ] [ maxburst -+packets -+.B ] [ ewma -+log -+.B ] [ cell -+bytes -+.B ] avpkt -+bytes -+.B [ mpu -+bytes -+.B ] [ bounded isolated ] [ split -+handle -+.B & defmap -+defmap -+.B ] [ estimator -+interval timeconstant -+.B ] -+ -+.SH DESCRIPTION -+Class Based Queueing is a classful qdisc that implements a rich -+linksharing hierarchy of classes. It contains shaping elements as -+well as prioritizing capabilities. Shaping is performed using link -+idle time calculations based on the timing of dequeue events and -+underlying link bandwidth. -+ -+.SH SHAPING ALGORITHM -+Shaping is done using link idle time calculations, and actions taken if -+these calculations deviate from set limits. -+ -+When shaping a 10mbit/s connection to 1mbit/s, the link will -+be idle 90% of the time. If it isn't, it needs to be throttled so that it -+IS idle 90% of the time. -+ -+From the kernel's perspective, this is hard to measure, so CBQ instead -+derives the idle time from the number of microseconds (in fact, jiffies) -+that elapse between requests from the device driver for more data. Combined -+with the knowledge of packet sizes, this is used to approximate how full or -+empty the link is. -+ -+This is rather circumspect and doesn't always arrive at proper -+results. For example, what is the actual link speed of an interface -+that is not really able to transmit the full 100mbit/s of data, -+perhaps because of a badly implemented driver? A PCMCIA network card -+will also never achieve 100mbit/s because of the way the bus is -+designed - again, how do we calculate the idle time? -+ -+The physical link bandwidth may be ill defined in case of not-quite-real -+network devices like PPP over Ethernet or PPTP over TCP/IP. The effective -+bandwidth in that case is probably determined by the efficiency of pipes -+to userspace - which not defined. -+ -+During operations, the effective idletime is measured using an -+exponential weighted moving average (EWMA), which considers recent -+packets to be exponentially more important than past ones. The Unix -+loadaverage is calculated in the same way. -+ -+The calculated idle time is subtracted from the EWMA measured one, -+the resulting number is called 'avgidle'. A perfectly loaded link has -+an avgidle of zero: packets arrive exactly at the calculated -+interval. -+ -+An overloaded link has a negative avgidle and if it gets too negative, -+CBQ throttles and is then 'overlimit'. -+ -+Conversely, an idle link might amass a huge avgidle, which would then -+allow infinite bandwidths after a few hours of silence. To prevent -+this, avgidle is capped at -+.B maxidle. -+ -+If overlimit, in theory, the CBQ could throttle itself for exactly the -+amount of time that was calculated to pass between packets, and then -+pass one packet, and throttle again. Due to timer resolution constraints, -+this may not be feasible, see the -+.B minburst -+parameter below. -+ -+.SH CLASSIFICATION -+Within the one CBQ instance many classes may exist. Each of these classes -+contains another qdisc, by default -+.BR tc-pfifo (8). -+ -+When enqueueing a packet, CBQ starts at the root and uses various methods to -+determine which class should receive the data. If a verdict is reached, this -+process is repeated for the recipient class which might have further -+means of classifying traffic to its children, if any. -+ -+CBQ has the following methods available to classify a packet to any child -+classes. -+.TP -+(i) -+.B skb->priority class encoding. -+Can be set from userspace by an application with the -+.B SO_PRIORITY -+setsockopt. -+The -+.B skb->priority class encoding -+only applies if the skb->priority holds a major:minor handle of an existing -+class within this qdisc. -+.TP -+(ii) -+tc filters attached to the class. -+.TP -+(iii) -+The defmap of a class, as set with the -+.B split & defmap -+parameters. The defmap may contain instructions for each possible Linux packet -+priority. -+ -+.P -+Each class also has a -+.B level. -+Leaf nodes, attached to the bottom of the class hierarchy, have a level of 0. -+.SH CLASSIFICATION ALGORITHM -+ -+Classification is a loop, which terminates when a leaf class is found. At any -+point the loop may jump to the fallback algorithm. -+ -+The loop consists of the following steps: -+.TP -+(i) -+If the packet is generated locally and has a valid classid encoded within its -+.B skb->priority, -+choose it and terminate. -+ -+.TP -+(ii) -+Consult the tc filters, if any, attached to this child. If these return -+a class which is not a leaf class, restart loop from the class returned. -+If it is a leaf, choose it and terminate. -+.TP -+(iii) -+If the tc filters did not return a class, but did return a classid, -+try to find a class with that id within this qdisc. -+Check if the found class is of a lower -+.B level -+than the current class. If so, and the returned class is not a leaf node, -+restart the loop at the found class. If it is a leaf node, terminate. -+If we found an upward reference to a higher level, enter the fallback -+algorithm. -+.TP -+(iv) -+If the tc filters did not return a class, nor a valid reference to one, -+consider the minor number of the reference to be the priority. Retrieve -+a class from the defmap of this class for the priority. If this did not -+contain a class, consult the defmap of this class for the -+.B BEST_EFFORT -+class. If this is an upward reference, or no -+.B BEST_EFFORT -+class was defined, -+enter the fallback algorithm. If a valid class was found, and it is not a -+leaf node, restart the loop at this class. If it is a leaf, choose it and -+terminate. If -+neither the priority distilled from the classid, nor the -+.B BEST_EFFORT -+priority yielded a class, enter the fallback algorithm. -+.P -+The fallback algorithm resides outside of the loop and is as follows. -+.TP -+(i) -+Consult the defmap of the class at which the jump to fallback occured. If -+the defmap contains a class for the -+.B -+priority -+of the class (which is related to the TOS field), choose this class and -+terminate. -+.TP -+(ii) -+Consult the map for a class for the -+.B BEST_EFFORT -+priority. If found, choose it, and terminate. -+.TP -+(iii) -+Choose the class at which break out to the fallback algorithm occured. Terminate. -+.P -+The packet is enqueued to the class which was chosen when either algorithm -+terminated. It is therefore possible for a packet to be enqueued *not* at a -+leaf node, but in the middle of the hierarchy. -+ -+.SH LINK SHARING ALGORITHM -+When dequeuing for sending to the network device, CBQ decides which of its -+classes will be allowed to send. It does so with a Weighted Round Robin process -+in which each class with packets gets a chance to send in turn. The WRR process -+starts by asking the highest priority classes (lowest numerically - -+highest semantically) for packets, and will continue to do so until they -+have no more data to offer, in which case the process repeats for lower -+priorities. -+ -+.B CERTAINTY ENDS HERE, ANK PLEASE HELP -+ -+Each class is not allowed to send at length though - they can only dequeue a -+configurable amount of data during each round. -+ -+If a class is about to go overlimit, and it is not -+.B bounded -+it will try to borrow avgidle from siblings that are not -+.B isolated. -+This process is repeated from the bottom upwards. If a class is unable -+to borrow enough avgidle to send a packet, it is throttled and not asked -+for a packet for enough time for the avgidle to increase above zero. -+ -+.B I REALLY NEED HELP FIGURING THIS OUT. REST OF DOCUMENT IS PRETTY CERTAIN -+.B AGAIN. -+ -+.SH QDISC -+The root qdisc of a CBQ class tree has the following parameters: -+ -+.TP -+parent major:minor | root -+This mandatory parameter determines the place of the CBQ instance, either at the -+.B root -+of an interface or within an existing class. -+.TP -+handle major: -+Like all other qdiscs, the CBQ can be assigned a handle. Should consist only -+of a major number, followed by a colon. Optional. -+.TP -+avpkt bytes -+For calculations, the average packet size must be known. It is silently capped -+at a minimum of 2/3 of the interface MTU. Mandatory. -+.TP -+bandwidth rate -+To determine the idle time, CBQ must know the bandwidth of your underlying -+physical interface, or parent qdisc. This is a vital parameter, more about it -+later. Mandatory. -+.TP -+cell -+The cell size determines he granularity of packet transmission time calculations. Has a sensible default. -+.TP -+mpu -+A zero sized packet may still take time to transmit. This value is the lower -+cap for packet transmission time calculations - packets smaller than this value -+are still deemed to have this size. Defaults to zero. -+.TP -+ewma log -+When CBQ needs to measure the average idle time, it does so using an -+Exponentially Weighted Moving Average which smoothes out measurements into -+a moving average. The EWMA LOG determines how much smoothing occurs. Defaults -+to 5. Lower values imply greater sensitivity. Must be between 0 and 31. -+.P -+A CBQ qdisc does not shape out of its own accord. It only needs to know certain -+parameters about the underlying link. Actual shaping is done in classes. -+ -+.SH CLASSES -+Classes have a host of parameters to configure their operation. -+ -+.TP -+parent major:minor -+Place of this class within the hierarchy. If attached directly to a qdisc -+and not to another class, minor can be omitted. Mandatory. -+.TP -+classid major:minor -+Like qdiscs, classes can be named. The major number must be equal to the -+major number of the qdisc to which it belongs. Optional, but needed if this -+class is going to have children. -+.TP -+weight weight -+When dequeuing to the interface, classes are tried for traffic in a -+round-robin fashion. Classes with a higher configured qdisc will generally -+have more traffic to offer during each round, so it makes sense to allow -+it to dequeue more traffic. All weights under a class are normalized, so -+only the ratios matter. Defaults to the configured rate, unless the priority -+of this class is maximal, in which case it is set to 1. -+.TP -+allot bytes -+Allot specifies how many bytes a qdisc can dequeue -+during each round of the process. This parameter is weighted using the -+renormalized class weight described above. -+ -+.TP -+priority priority -+In the round-robin process, classes with the lowest priority field are tried -+for packets first. Mandatory. -+ -+.TP -+rate rate -+Maximum rate this class and all its children combined can send at. Mandatory. -+ -+.TP -+bandwidth rate -+This is different from the bandwidth specified when creating a CBQ disc. Only -+used to determine maxidle and offtime, which are only calculated when -+specifying maxburst or minburst. Mandatory if specifying maxburst or minburst. -+ -+.TP -+maxburst -+This number of packets is used to calculate maxidle so that when -+avgidle is at maxidle, this number of average packets can be burst -+before avgidle drops to 0. Set it higher to be more tolerant of -+bursts. You can't set maxidle directly, only via this parameter. -+ -+.TP -+minburst -+As mentioned before, CBQ needs to throttle in case of -+overlimit. The ideal solution is to do so for exactly the calculated -+idle time, and pass 1 packet. However, Unix kernels generally have a -+hard time scheduling events shorter than 10ms, so it is better to -+throttle for a longer period, and then pass minburst packets in one -+go, and then sleep minburst times longer. -+ -+The time to wait is called the offtime. Higher values of minburst lead -+to more accurate shaping in the long term, but to bigger bursts at -+millisecond timescales. -+ -+.TP -+minidle -+If avgidle is below 0, we are overlimits and need to wait until -+avgidle will be big enough to send one packet. To prevent a sudden -+burst from shutting down the link for a prolonged period of time, -+avgidle is reset to minidle if it gets too low. -+ -+Minidle is specified in negative microseconds, so 10 means that -+avgidle is capped at -10us. -+ -+.TP -+bounded -+Signifies that this class will not borrow bandwidth from its siblings. -+.TP -+isolated -+Means that this class will not borrow bandwidth to its siblings -+ -+.TP -+split major:minor & defmap bitmap[/bitmap] -+If consulting filters attached to a class did not give a verdict, -+CBQ can also classify based on the packet's priority. There are 16 -+priorities available, numbered from 0 to 15. -+ -+The defmap specifies which priorities this class wants to receive, -+specified as a bitmap. The Least Significant Bit corresponds to priority -+zero. The -+.B split -+parameter tells CBQ at which class the decision must be made, which should -+be a (grand)parent of the class you are adding. -+ -+As an example, 'tc class add ... classid 10:1 cbq .. split 10:0 defmap c0' -+configures class 10:0 to send packets with priorities 6 and 7 to 10:1. -+ -+The complimentary configuration would then -+be: 'tc class add ... classid 10:2 cbq ... split 10:0 defmap 3f' -+Which would send all packets 0, 1, 2, 3, 4 and 5 to 10:1. -+.TP -+estimator interval timeconstant -+CBQ can measure how much bandwidth each class is using, which tc filters -+can use to classify packets with. In order to determine the bandwidth -+it uses a very simple estimator that measures once every -+.B interval -+microseconds how much traffic has passed. This again is a EWMA, for which -+the time constant can be specified, also in microseconds. The -+.B time constant -+corresponds to the sluggishness of the measurement or, conversely, to the -+sensitivity of the average to short bursts. Higher values mean less -+sensitivity. -+ -+ -+ -+.SH SOURCES -+.TP -+o -+Sally Floyd and Van Jacobson, "Link-sharing and Resource -+Management Models for Packet Networks", -+IEEE/ACM Transactions on Networking, Vol.3, No.4, 1995 -+ -+.TP -+o -+Sally Floyd, "Notes on CBQ and Guarantee Service", 1995 -+ -+.TP -+o -+Sally Floyd, "Notes on Class-Based Queueing: Setting -+Parameters", 1996 -+ -+.TP -+o -+Sally Floyd and Michael Speer, "Experimental Results -+for Class-Based Queueing", 1998, not published. -+ -+ -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHOR -+Alexey N. Kuznetsov, . This manpage maintained by -+bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/tc-cbq.8 iproute2/debian/manpages/tc-cbq.8 ---- iproute2-orig/debian/manpages/tc-cbq.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/tc-cbq.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,353 @@ -+.TH CBQ 8 "16 December 2001" "iproute2" "Linux" -+.SH NAME -+CBQ \- Class Based Queueing -+.SH SYNOPSIS -+.B tc qdisc ... dev -+dev -+.B ( parent -+classid -+.B | root) [ handle -+major: -+.B ] cbq [ allot -+bytes -+.B ] avpkt -+bytes -+.B bandwidth -+rate -+.B [ cell -+bytes -+.B ] [ ewma -+log -+.B ] [ mpu -+bytes -+.B ] -+ -+.B tc class ... dev -+dev -+.B parent -+major:[minor] -+.B [ classid -+major:minor -+.B ] cbq allot -+bytes -+.B [ bandwidth -+rate -+.B ] [ rate -+rate -+.B ] prio -+priority -+.B [ weight -+weight -+.B ] [ minburst -+packets -+.B ] [ maxburst -+packets -+.B ] [ ewma -+log -+.B ] [ cell -+bytes -+.B ] avpkt -+bytes -+.B [ mpu -+bytes -+.B ] [ bounded isolated ] [ split -+handle -+.B & defmap -+defmap -+.B ] [ estimator -+interval timeconstant -+.B ] -+ -+.SH DESCRIPTION -+Class Based Queueing is a classful qdisc that implements a rich -+linksharing hierarchy of classes. It contains shaping elements as -+well as prioritizing capabilities. Shaping is performed using link -+idle time calculations based on the timing of dequeue events and -+underlying link bandwidth. -+ -+.SH SHAPING ALGORITHM -+When shaping a 10mbit/s connection to 1mbit/s, the link will -+be idle 90% of the time. If it isn't, it needs to be throttled so that it -+IS idle 90% of the time. -+ -+During operations, the effective idletime is measured using an -+exponential weighted moving average (EWMA), which considers recent -+packets to be exponentially more important than past ones. The Unix -+loadaverage is calculated in the same way. -+ -+The calculated idle time is subtracted from the EWMA measured one, -+the resulting number is called 'avgidle'. A perfectly loaded link has -+an avgidle of zero: packets arrive exactly at the calculated -+interval. -+ -+An overloaded link has a negative avgidle and if it gets too negative, -+CBQ throttles and is then 'overlimit'. -+ -+Conversely, an idle link might amass a huge avgidle, which would then -+allow infinite bandwidths after a few hours of silence. To prevent -+this, avgidle is capped at -+.B maxidle. -+ -+If overlimit, in theory, the CBQ could throttle itself for exactly the -+amount of time that was calculated to pass between packets, and then -+pass one packet, and throttle again. Due to timer resolution constraints, -+this may not be feasible, see the -+.B minburst -+parameter below. -+ -+.SH CLASSIFICATION -+Within the one CBQ instance many classes may exist. Each of these classes -+contains another qdisc, by default -+.BR tc-pfifo (8). -+ -+When enqueueing a packet, CBQ starts at the root and uses various methods to -+determine which class should receive the data. -+ -+In the absence of uncommon configuration options, the process is rather easy. -+At each node we look for an instruction, and then go to the class the -+instruction refers us to. If the class found is a barren leaf-node (without -+children), we enqueue the packet there. If it is not yet a leaf node, we do -+the whole thing over again starting from that node. -+ -+The following actions are performed, in order at each node we visit, until one -+sends us to another node, or terminates the process. -+.TP -+(i) -+Consult filters attached to the class. If sent to a leafnode, we are done. -+Otherwise, restart. -+.TP -+(ii) -+Consult the defmap for the priority assigned to this packet, which depends -+on the TOS bits. Check if the referral is leafless, otherwise restart. -+.TP -+(iii) -+Ask the defmap for instructions for the 'best effort' priority. Check the -+answer for leafness, otherwise restart. -+.TP -+(iv) -+If none of the above returned with an instruction, enqueue at this node. -+.P -+This algorithm makes sure that a packet always ends up somewhere, even while -+you are busy building your configuration. -+ -+For more details, see -+.BR tc-cbq-details(8). -+ -+.SH LINK SHARING ALGORITHM -+When dequeuing for sending to the network device, CBQ decides which of its -+classes will be allowed to send. It does so with a Weighted Round Robin process -+in which each class with packets gets a chance to send in turn. The WRR process -+starts by asking the highest priority classes (lowest numerically - -+highest semantically) for packets, and will continue to do so until they -+have no more data to offer, in which case the process repeats for lower -+priorities. -+ -+Classes by default borrow bandwidth from their siblings. A class can be -+prevented from doing so by declaring it 'bounded'. A class can also indicate -+its unwillingness to lend out bandwidth by being 'isolated'. -+ -+.SH QDISC -+The root of a CBQ qdisc class tree has the following parameters: -+ -+.TP -+parent major:minor | root -+This mandatory parameter determines the place of the CBQ instance, either at the -+.B root -+of an interface or within an existing class. -+.TP -+handle major: -+Like all other qdiscs, the CBQ can be assigned a handle. Should consist only -+of a major number, followed by a colon. Optional, but very useful if classes -+will be generated within this qdisc. -+.TP -+allot bytes -+This allotment is the 'chunkiness' of link sharing and is used for determining packet -+transmission time tables. The qdisc allot differs slightly from the class allot discussed -+below. Optional. Defaults to a reasonable value, related to avpkt. -+.TP -+avpkt bytes -+The average size of a packet is needed for calculating maxidle, and is also used -+for making sure 'allot' has a safe value. Mandatory. -+.TP -+bandwidth rate -+To determine the idle time, CBQ must know the bandwidth of your underlying -+physical interface, or parent qdisc. This is a vital parameter, more about it -+later. Mandatory. -+.TP -+cell -+The cell size determines he granularity of packet transmission time calculations. Has a sensible default. -+.TP -+mpu -+A zero sized packet may still take time to transmit. This value is the lower -+cap for packet transmission time calculations - packets smaller than this value -+are still deemed to have this size. Defaults to zero. -+.TP -+ewma log -+When CBQ needs to measure the average idle time, it does so using an -+Exponentially Weighted Moving Average which smoothes out measurements into -+a moving average. The EWMA LOG determines how much smoothing occurs. Lower -+values imply greater sensitivity. Must be between 0 and 31. Defaults -+to 5. -+.P -+A CBQ qdisc does not shape out of its own accord. It only needs to know certain -+parameters about the underlying link. Actual shaping is done in classes. -+ -+.SH CLASSES -+Classes have a host of parameters to configure their operation. -+ -+.TP -+parent major:minor -+Place of this class within the hierarchy. If attached directly to a qdisc -+and not to another class, minor can be omitted. Mandatory. -+.TP -+classid major:minor -+Like qdiscs, classes can be named. The major number must be equal to the -+major number of the qdisc to which it belongs. Optional, but needed if this -+class is going to have children. -+.TP -+weight weight -+When dequeuing to the interface, classes are tried for traffic in a -+round-robin fashion. Classes with a higher configured qdisc will generally -+have more traffic to offer during each round, so it makes sense to allow -+it to dequeue more traffic. All weights under a class are normalized, so -+only the ratios matter. Defaults to the configured rate, unless the priority -+of this class is maximal, in which case it is set to 1. -+.TP -+allot bytes -+Allot specifies how many bytes a qdisc can dequeue -+during each round of the process. This parameter is weighted using the -+renormalized class weight described above. Silently capped at a minimum of -+3/2 avpkt. Mandatory. -+ -+.TP -+prio priority -+In the round-robin process, classes with the lowest priority field are tried -+for packets first. Mandatory. -+ -+.TP -+avpkt -+See the QDISC section. -+ -+.TP -+rate rate -+Maximum rate this class and all its children combined can send at. Mandatory. -+ -+.TP -+bandwidth rate -+This is different from the bandwidth specified when creating a CBQ disc! Only -+used to determine maxidle and offtime, which are only calculated when -+specifying maxburst or minburst. Mandatory if specifying maxburst or minburst. -+ -+.TP -+maxburst -+This number of packets is used to calculate maxidle so that when -+avgidle is at maxidle, this number of average packets can be burst -+before avgidle drops to 0. Set it higher to be more tolerant of -+bursts. You can't set maxidle directly, only via this parameter. -+ -+.TP -+minburst -+As mentioned before, CBQ needs to throttle in case of -+overlimit. The ideal solution is to do so for exactly the calculated -+idle time, and pass 1 packet. However, Unix kernels generally have a -+hard time scheduling events shorter than 10ms, so it is better to -+throttle for a longer period, and then pass minburst packets in one -+go, and then sleep minburst times longer. -+ -+The time to wait is called the offtime. Higher values of minburst lead -+to more accurate shaping in the long term, but to bigger bursts at -+millisecond timescales. Optional. -+ -+.TP -+minidle -+If avgidle is below 0, we are overlimits and need to wait until -+avgidle will be big enough to send one packet. To prevent a sudden -+burst from shutting down the link for a prolonged period of time, -+avgidle is reset to minidle if it gets too low. -+ -+Minidle is specified in negative microseconds, so 10 means that -+avgidle is capped at -10us. Optional. -+ -+.TP -+bounded -+Signifies that this class will not borrow bandwidth from its siblings. -+.TP -+isolated -+Means that this class will not borrow bandwidth to its siblings -+ -+.TP -+split major:minor & defmap bitmap[/bitmap] -+If consulting filters attached to a class did not give a verdict, -+CBQ can also classify based on the packet's priority. There are 16 -+priorities available, numbered from 0 to 15. -+ -+The defmap specifies which priorities this class wants to receive, -+specified as a bitmap. The Least Significant Bit corresponds to priority -+zero. The -+.B split -+parameter tells CBQ at which class the decision must be made, which should -+be a (grand)parent of the class you are adding. -+ -+As an example, 'tc class add ... classid 10:1 cbq .. split 10:0 defmap c0' -+configures class 10:0 to send packets with priorities 6 and 7 to 10:1. -+ -+The complimentary configuration would then -+be: 'tc class add ... classid 10:2 cbq ... split 10:0 defmap 3f' -+Which would send all packets 0, 1, 2, 3, 4 and 5 to 10:1. -+.TP -+estimator interval timeconstant -+CBQ can measure how much bandwidth each class is using, which tc filters -+can use to classify packets with. In order to determine the bandwidth -+it uses a very simple estimator that measures once every -+.B interval -+microseconds how much traffic has passed. This again is a EWMA, for which -+the time constant can be specified, also in microseconds. The -+.B time constant -+corresponds to the sluggishness of the measurement or, conversely, to the -+sensitivity of the average to short bursts. Higher values mean less -+sensitivity. -+ -+.SH BUGS -+The actual bandwidth of the underlying link may not be known, for example -+in the case of PPoE or PPTP connections which in fact may send over a -+pipe, instead of over a physical device. CBQ is quite resilient to major -+errors in the configured bandwidth, probably a the cost of coarser shaping. -+ -+Default kernels rely on coarse timing information for making decisions. These -+may make shaping precise in the long term, but inaccurate on second long scales. -+ -+See -+.BR tc-cbq-details(8) -+for hints on how to improve this. -+ -+.SH SOURCES -+.TP -+o -+Sally Floyd and Van Jacobson, "Link-sharing and Resource -+Management Models for Packet Networks", -+IEEE/ACM Transactions on Networking, Vol.3, No.4, 1995 -+ -+.TP -+o -+Sally Floyd, "Notes on CBQ and Guaranteed Service", 1995 -+ -+.TP -+o -+Sally Floyd, "Notes on Class-Based Queueing: Setting -+Parameters", 1996 -+ -+.TP -+o -+Sally Floyd and Michael Speer, "Experimental Results -+for Class-Based Queueing", 1998, not published. -+ -+ -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHOR -+Alexey N. Kuznetsov, . This manpage maintained by -+bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/tc-htb.8 iproute2/debian/manpages/tc-htb.8 ---- iproute2-orig/debian/manpages/tc-htb.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/tc-htb.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,150 @@ -+.TH HTB 8 "10 January 2002" "iproute2" "Linux" -+.SH NAME -+HTB \- Hierarchy Token Bucket -+.SH SYNOPSIS -+.B tc qdisc ... dev -+dev -+.B ( parent -+classid -+.B | root) [ handle -+major: -+.B ] htb [ default -+minor-id -+.B ] -+ -+.B tc class ... dev -+dev -+.B parent -+major:[minor] -+.B [ classid -+major:minor -+.B ] htb rate -+rate -+.B [ ceil -+rate -+.B ] burst -+bytes -+.B [ cburst -+bytes -+.B ] [ prio -+priority -+.B ] -+ -+.SH DESCRIPTION -+HTB is meant as a more understandable and intuitive replacement for -+the CBQ qdisc in Linux. Both CBQ and HTB help you to control the use -+of the outbound bandwidth on a given link. Both allow you to use one -+physical link to simulate several slower links and to send different -+kinds of traffic on different simulated links. In both cases, you have -+to specify how to divide the physical link into simulated links and -+how to decide which simulated link to use for a given packet to be sent. -+ -+Unlike CBQ, HTB shapes traffic based on the Token Bucket Filter algorithm -+which does not depend on interface characteristics and so does not need to -+know the underlying bandwidth of the outgoing interface. -+ -+.SH SHAPING ALGORITHM -+Shaping works as documented in -+.B tc-tbf (8). -+ -+.SH CLASSIFICATION -+Within the one HRB instance many classes may exist. Each of these classes -+contains another qdisc, by default -+.BR tc-pfifo (8). -+ -+When enqueueing a packet, HTB starts at the root and uses various methods to -+determine which class should receive the data. -+ -+In the absence of uncommon configuration options, the process is rather easy. -+At each node we look for an instruction, and then go to the class the -+instruction refers us to. If the class found is a barren leaf-node (without -+children), we enqueue the packet there. If it is not yet a leaf node, we do -+the whole thing over again starting from that node. -+ -+The following actions are performed, in order at each node we visit, until one -+sends us to another node, or terminates the process. -+.TP -+(i) -+Consult filters attached to the class. If sent to a leafnode, we are done. -+Otherwise, restart. -+.TP -+(ii) -+If none of the above returned with an instruction, enqueue at this node. -+.P -+This algorithm makes sure that a packet always ends up somewhere, even while -+you are busy building your configuration. -+ -+.SH LINK SHARING ALGORITHM -+FIXME -+ -+.SH QDISC -+The root of a HTB qdisc class tree has the following parameters: -+ -+.TP -+parent major:minor | root -+This mandatory parameter determines the place of the HTB instance, either at the -+.B root -+of an interface or within an existing class. -+.TP -+handle major: -+Like all other qdiscs, the HTB can be assigned a handle. Should consist only -+of a major number, followed by a colon. Optional, but very useful if classes -+will be generated within this qdisc. -+.TP -+default minor-id -+Unclassified traffic gets sent to the class with this minor-id. -+ -+.SH CLASSES -+Classes have a host of parameters to configure their operation. -+ -+.TP -+parent major:minor -+Place of this class within the hierarchy. If attached directly to a qdisc -+and not to another class, minor can be omitted. Mandatory. -+.TP -+classid major:minor -+Like qdiscs, classes can be named. The major number must be equal to the -+major number of the qdisc to which it belongs. Optional, but needed if this -+class is going to have children. -+.TP -+prio priority -+In the round-robin process, classes with the lowest priority field are tried -+for packets first. Mandatory. -+ -+.TP -+rate rate -+Maximum rate this class and all its children are guaranteed. Mandatory. -+ -+.TP -+ceil rate -+Maximum rate at which a class can send, if its parent has bandwidth to spare. -+Defaults to the configured rate, which implies no borrowing -+ -+.TP -+burst bytes -+Amount of bytes that can be burst at -+.B ceil -+speed, in excess of the configured -+.B rate. -+Should be at least as high as the highest burst of all children. -+ -+.TP -+cburst bytes -+Amount of bytes that can be burst at 'infinite' speed, in other words, as fast -+as the interface can transmit them. For perfect evening out, should be equal to at most one average -+packet. Should be at least as high as the highest cburst of all children. -+ -+.SH NOTES -+Due to Unix timing constraints, the maximum ceil rate is not infinite and may in fact be quite low. On Intel, -+there are 100 timer events per second, the maximum rate is that rate at which 'burst' bytes are sent each timer tick. -+From this, the mininum burst size for a specified rate can be calculated. For i386, a 10mbit rate requires a 12 kilobyte -+burst as 100*12kb*8 equals 10mbit. -+ -+.SH SEE ALSO -+.BR tc (8) -+.P -+HTB website: http://luxik.cdi.cz/~devik/qos/htb/ -+.SH AUTHOR -+Martin Devera . This manpage maintained by bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/tc-pbfifo.8 iproute2/debian/manpages/tc-pbfifo.8 ---- iproute2-orig/debian/manpages/tc-pbfifo.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/tc-pbfifo.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,72 @@ -+.TH PBFIFO 8 "10 January 2002" "iproute2" "Linux" -+.SH NAME -+pfifo \- Packet limited First In, First Out queue -+.P -+bfifo \- Byte limited First In, First Out queue -+ -+.SH SYNOPSIS -+.B tc qdisc ... add pfifo -+.B [ limit -+packets -+.B ] -+.P -+.B tc qdisc ... add bfifo -+.B [ limit -+bytes -+.B ] -+ -+.SH DESCRIPTION -+The pfifo and bfifo qdiscs are unadorned First In, First Out queues. They are the -+simplest queues possible and therefore have no overhead. -+.B pfifo -+constrains the queue size as measured in packets. -+.B bfifo -+does so as measured in bytes. -+ -+Like all non-default qdiscs, they maintain statistics. This might be a reason to prefer -+pfifo or bfifo over the default. -+ -+.SH ALGORITHM -+A list of packets is maintained, when a packet is enqueued it gets inserted at the tail of -+a list. When a packet needs to be sent out to the network, it is taken from the head of the list. -+ -+If the list is too long, no further packets are allowed on. This is called 'tail drop'. -+ -+.SH PARAMETERS -+.TP -+limit -+Maximum queue size. Specified in bytes for bfifo, in packets for pfifo. For pfifo, defaults -+to the interface txqueuelen, as specified with -+.BR ifconfig (8) -+or -+.BR ip (8). -+ -+For bfifo, it defaults to the txqueuelen multiplied by the interface MTU. -+ -+.SH OUTPUT -+The output of -+.B tc -s qdisc ls -+contains the limit, either in packets or in bytes, and the number of bytes -+and packets actually sent. An unsent and dropped packet only appears between braces -+and is not counted as 'Sent'. -+ -+In this example, the queue length is 100 packets, 45894 bytes were sent over 681 packets. -+No packets were dropped, and as the pfifo queue does not slow down packets, there were also no -+overlimits: -+.P -+.nf -+# tc -s qdisc ls dev eth0 -+qdisc pfifo 8001: dev eth0 limit 100p -+ Sent 45894 bytes 681 pkts (dropped 0, overlimits 0) -+.fi -+ -+If a backlog occurs, this is displayed as well. -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHORS -+Alexey N. Kuznetsov, -+ -+This manpage maintained by bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/tc-pfifo_fast.8 iproute2/debian/manpages/tc-pfifo_fast.8 ---- iproute2-orig/debian/manpages/tc-pfifo_fast.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/tc-pfifo_fast.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,59 @@ -+.TH PFIFO_FAST 8 "10 January 2002" "iproute2" "Linux" -+.SH NAME -+pfifo_fast \- three-band first in, first out queue -+ -+.SH DESCRIPTION -+pfifo_fast is the default qdisc of each interface. -+ -+Whenever an interface is created, the pfifo_fast qdisc is automatically used -+as a queue. If another qdisc is attached, it preempts the default -+pfifo_fast, which automatically returns to function when an existing qdisc -+is detached. -+ -+In this sense this qdisc is magic, and unlike other qdiscs. -+ -+.SH ALGORITHM -+The algorithm is very similar to that of the classful -+.BR tc-prio (8) -+qdisc. -+.B pfifo_fast -+is like three -+.BR tc-pfifo (8) -+queues side by side, where packets can be enqueued in any of the three bands -+based on their Type of Service bits or assigned priority. -+ -+Not all three bands are dequeued simultaneously - as long as lower bands -+have traffic, higher bands are never dequeued. This can be used to -+prioritize interactive traffic or penalize 'lowest cost' traffic. -+ -+Each band can be txqueuelen packets long, as configured with -+.BR ifconfig (8) -+or -+.BR ip (8). -+Additional packets coming in are not enqueued but are instead dropped. -+ -+See -+.BR tc-prio (8) -+for complete details on how TOS bits are translated into bands. -+.SH PARAMETERS -+.TP -+txqueuelen -+The length of the three bands depends on the interface txqueuelen, as -+specified with -+.BR ifconfig (8) -+or -+.BR ip (8). -+ -+.SH BUGS -+Does not maintain statistics and does not show up in tc qdisc ls. This is because -+it is the automatic default in the absence of a configured qdisc. -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHORS -+Alexey N. Kuznetsov, -+ -+This manpage maintained by bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/tc-prio.8 iproute2/debian/manpages/tc-prio.8 ---- iproute2-orig/debian/manpages/tc-prio.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/tc-prio.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,187 @@ -+.TH PRIO 8 "16 December 2001" "iproute2" "Linux" -+.SH NAME -+PRIO \- Priority qdisc -+.SH SYNOPSIS -+.B tc qdisc ... dev -+dev -+.B ( parent -+classid -+.B | root) [ handle -+major: -+.B ] prio [ bands -+bands -+.B ] [ priomap -+band,band,band... -+.B ] [ estimator -+interval timeconstant -+.B ] -+ -+.SH DESCRIPTION -+The PRIO qdisc is a simple classful queueing discipline that contains -+an arbitrary number of classes of differing priority. The classes are -+dequeued in numerical descending order of priority. PRIO is a scheduler -+and never delays packets - it is a work-conserving qdisc, though the qdiscs -+contained in the classes may not be. -+ -+Very useful for lowering latency when there is no need for slowing down -+traffic. -+ -+.SH ALGORITHM -+On creation with 'tc qdisc add', a fixed number of bands is created. Each -+band is a class, although is not possible to add classes with 'tc qdisc -+add', the number of bands to be created must instead be specified on the -+commandline attaching PRIO to its root. -+ -+When dequeueing, band 0 is tried first and only if it did not deliver a -+packet does PRIO try band 1, and so onwards. Maximum reliability packets -+should therefore go to band 0, minimum delay to band 1 and the rest to band -+2. -+ -+As the PRIO qdisc itself will have minor number 0, band 0 is actually -+major:1, band 1 is major:2, etc. For major, substitute the major number -+assigned to the qdisc on 'tc qdisc add' with the -+.B handle -+parameter. -+ -+.SH CLASSIFICATION -+Three methods are available to PRIO to determine in which band a packet will -+be enqueued. -+.TP -+From userspace -+A process with sufficient privileges can encode the destination class -+directly with SO_PRIORITY, see -+.BR tc(7). -+.TP -+with a tc filter -+A tc filter attached to the root qdisc can point traffic directly to a class -+.TP -+with the priomap -+Based on the packet priority, which in turn is derived from the Type of -+Service assigned to the packet. -+.P -+Only the priomap is specific to this qdisc. -+.SH QDISC PARAMETERS -+.TP -+bands -+Number of bands. If changed from the default of 3, -+.B priomap -+must be updated as well. -+.TP -+priomap -+The priomap maps the priority of -+a packet to a class. The priority can either be set directly from userspace, -+or be derived from the Type of Service of the packet. -+ -+Determines how packet priorities, as assigned by the kernel, map to -+bands. Mapping occurs based on the TOS octet of the packet, which looks like -+this: -+ -+.nf -+0 1 2 3 4 5 6 7 -++---+---+---+---+---+---+---+---+ -+| | | | -+|PRECEDENCE | TOS |MBZ| -+| | | | -++---+---+---+---+---+---+---+---+ -+.fi -+ -+The four TOS bits (the 'TOS field') are defined as: -+ -+.nf -+Binary Decimcal Meaning -+----------------------------------------- -+1000 8 Minimize delay (md) -+0100 4 Maximize throughput (mt) -+0010 2 Maximize reliability (mr) -+0001 1 Minimize monetary cost (mmc) -+0000 0 Normal Service -+.fi -+ -+As there is 1 bit to the right of these four bits, the actual value of the -+TOS field is double the value of the TOS bits. Tcpdump -v -v shows you the -+value of the entire TOS field, not just the four bits. It is the value you -+see in the first column of this table: -+ -+.nf -+TOS Bits Means Linux Priority Band -+------------------------------------------------------------ -+0x0 0 Normal Service 0 Best Effort 1 -+0x2 1 Minimize Monetary Cost 1 Filler 2 -+0x4 2 Maximize Reliability 0 Best Effort 1 -+0x6 3 mmc+mr 0 Best Effort 1 -+0x8 4 Maximize Throughput 2 Bulk 2 -+0xa 5 mmc+mt 2 Bulk 2 -+0xc 6 mr+mt 2 Bulk 2 -+0xe 7 mmc+mr+mt 2 Bulk 2 -+0x10 8 Minimize Delay 6 Interactive 0 -+0x12 9 mmc+md 6 Interactive 0 -+0x14 10 mr+md 6 Interactive 0 -+0x16 11 mmc+mr+md 6 Interactive 0 -+0x18 12 mt+md 4 Int. Bulk 1 -+0x1a 13 mmc+mt+md 4 Int. Bulk 1 -+0x1c 14 mr+mt+md 4 Int. Bulk 1 -+0x1e 15 mmc+mr+mt+md 4 Int. Bulk 1 -+.fi -+ -+The second column contains the value of the relevant -+four TOS bits, followed by their translated meaning. For example, 15 stands -+for a packet wanting Minimal Montetary Cost, Maximum Reliability, Maximum -+Throughput AND Minimum Delay. -+ -+The fourth column lists the way the Linux kernel interprets the TOS bits, by -+showing to which Priority they are mapped. -+ -+The last column shows the result of the default priomap. On the commandline, -+the default priomap looks like this: -+ -+ 1, 2, 2, 2, 1, 2, 0, 0 , 1, 1, 1, 1, 1, 1, 1, 1 -+ -+This means that priority 4, for example, gets mapped to band number 1. -+The priomap also allows you to list higher priorities (> 7) which do not -+correspond to TOS mappings, but which are set by other means. -+ -+This table from RFC 1349 (read it for more details) explains how -+applications might very well set their TOS bits: -+ -+.nf -+TELNET 1000 (minimize delay) -+FTP -+ Control 1000 (minimize delay) -+ Data 0100 (maximize throughput) -+ -+TFTP 1000 (minimize delay) -+ -+SMTP -+ Command phase 1000 (minimize delay) -+ DATA phase 0100 (maximize throughput) -+ -+Domain Name Service -+ UDP Query 1000 (minimize delay) -+ TCP Query 0000 -+ Zone Transfer 0100 (maximize throughput) -+ -+NNTP 0001 (minimize monetary cost) -+ -+ICMP -+ Errors 0000 -+ Requests 0000 (mostly) -+ Responses (mostly) -+.fi -+ -+ -+.SH CLASSES -+PRIO classes cannot be configured further - they are automatically created -+when the PRIO qdisc is attached. Each class however can contain yet a -+further qdisc. -+ -+.SH BUGS -+Large amounts of traffic in the lower bands can cause starvation of higher -+bands. Can be prevented by attaching a shaper (for example, -+.BR tc-tbf(8) -+to these bands to make sure they cannot dominate the link. -+ -+.SH AUTHORS -+Alexey N. Kuznetsov, , J Hadi Salim -+. This manpage maintained by bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/tc-red.8 iproute2/debian/manpages/tc-red.8 ---- iproute2-orig/debian/manpages/tc-red.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/tc-red.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,131 @@ -+.TH RED 8 "13 December 2001" "iproute2" "Linux" -+.SH NAME -+red \- Random Early Detection -+.SH SYNOPSIS -+.B tc qdisc ... red -+.B limit -+bytes -+.B min -+bytes -+.B max -+bytes -+.B avpkt -+bytes -+.B burst -+packets -+.B [ ecn ] [ bandwidth -+rate -+.B ] probability -+chance -+ -+.SH DESCRIPTION -+Random Early Detection is a classless qdisc which manages its queue size -+smartly. Regular queues simply drop packets from the tail when they are -+full, which may not be the optimal behaviour. RED also performs tail drop, -+but does so in a more gradual way. -+ -+Once the queue hits a certain average length, packets enqueued have a -+configurable chance of being marked (which may mean dropped). This chance -+increases linearly up to a point called the -+.B max -+average queue length, although the queue might get bigger. -+ -+This has a host of benefits over simple taildrop, while not being processor -+intensive. It prevents synchronous retransmits after a burst in traffic, -+which cause further retransmits, etc. -+ -+The goal is the have a small queue size, which is good for interactivity -+while not disturbing TCP/IP traffic with too many sudden drops after a burst -+of traffic. -+ -+Depending on if ECN is configured, marking either means dropping or -+purely marking a packet as overlimit. -+.SH ALGORITHM -+The average queue size is used for determining the marking -+probability. This is calculated using an Exponential Weighted Moving -+Average, which can be more or less sensitive to bursts. -+ -+When the average queue size is below -+.B min -+bytes, no packet will ever be marked. When it exceeds -+.B min, -+the probability of doing so climbs linearly up -+to -+.B probability, -+until the average queue size hits -+.B max -+bytes. Because -+.B probability -+is normally not set to 100%, the queue size might -+conceivably rise above -+.B max -+bytes, so the -+.B limit -+parameter is provided to set a hard maximum for the size of the queue. -+ -+.SH PARAMETERS -+.TP -+min -+Average queue size at which marking becomes a possibility. -+.TP -+max -+At this average queue size, the marking probability is maximal. Should be at -+least twice -+.B min -+to prevent synchronous retransmits, higher for low -+.B min. -+.TP -+probability -+Maximum probability for marking, specified as a floating point -+number from 0.0 to 1.0. Suggested values are 0.01 or 0.02 (1 or 2%, -+respectively). -+.TP -+limit -+Hard limit on the real (not average) queue size in bytes. Further packets -+are dropped. Should be set higher than max+burst. It is advised to set this -+a few times higher than -+.B max. -+.TP -+burst -+Used for determining how fast the average queue size is influenced by the -+real queue size. Larger values make the calculation more sluggish, allowing -+longer bursts of traffic before marking starts. Real life experiments -+support the following guideline: (min+min+max)/(3*avpkt). -+.TP -+avpkt -+Specified in bytes. Used with burst to determine the time constant for -+average queue size calculations. 1000 is a good value. -+.TP -+bandwidth -+This rate is used for calculating the average queue size after some -+idle time. Should be set to the bandwidth of your interface. Does not mean -+that RED will shape for you! Optional. -+.TP -+ecn -+As mentioned before, RED can either 'mark' or 'drop'. Explicit Congestion -+Notification allows RED to notify remote hosts that their rate exceeds the -+amount of bandwidth available. Non-ECN capable hosts can only be notified by -+dropping a packet. If this parameter is specified, packets which indicate -+that their hosts honor ECN will only be marked and not dropped, unless the -+queue size hits -+.B limit -+bytes. Needs a tc binary with RED support compiled in. Recommended. -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH SOURCES -+.TP -+o -+Floyd, S., and Jacobson, V., Random Early Detection gateways for -+Congestion Avoidance. http://www.aciri.org/floyd/papers/red/red.html -+.TP -+o -+Some changes to the algorithm by Alexey N. Kuznetsov. -+ -+.SH AUTHORS -+Alexey N. Kuznetsov, , Alexey Makarenko -+, J Hadi Salim . -+This manpage maintained by bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/tc-sfq.8 iproute2/debian/manpages/tc-sfq.8 ---- iproute2-orig/debian/manpages/tc-sfq.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/tc-sfq.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,107 @@ -+.TH TC 8 "8 December 2001" "iproute2" "Linux" -+.SH NAME -+sfq \- Stochastic Fairness Queueing -+.SH SYNOPSIS -+.B tc qdisc ... perturb -+seconds -+.B quantum -+bytes -+ -+.SH DESCRIPTION -+ -+Stochastic Fairness Queueing is a classless queueing discipline available for -+traffic control with the -+.BR tc (8) -+command. -+ -+SFQ does not shape traffic but only schedules the transmission of packets, based on 'flows'. -+The goal is to ensure fairness so that each flow is able to send data in turn, thus preventing -+any single flow from drowning out the rest. -+ -+This may in fact have some effect in mitigating a Denial of Service attempt. -+ -+SFQ is work-conserving and therefore always delivers a packet if it has one available. -+.SH ALGORITHM -+On enqueueing, each packet is assigned to a hash bucket, based on -+.TP -+(i) -+Source address -+.TP -+(ii) -+Destination address -+.TP -+(iii) -+Source port -+.P -+If these are available. SFQ knows about ipv4 and ipv6 and also UDP, TCP and ESP. -+Packets with other protocols are hashed based on the 32bits representation of their -+destination and the socket they belong to. A flow corresponds mostly to a TCP/IP -+connection. -+ -+Each of these buckets should represent a unique flow. Because multiple flows may -+get hashed to the same bucket, the hashing algorithm is perturbed at configurable -+intervals so that the unfairness lasts only for a short while. Perturbation may -+however cause some inadvertent packet reordering to occur. -+ -+When dequeuing, each hashbucket with data is queried in a round robin fashion. -+ -+The compile time maximum length of the SFQ is 128 packets, which can be spread over -+at most 128 buckets of 1024 available. In case of overflow, tail-drop is performed -+on the fullest bucket, thus maintaining fairness. -+ -+.SH PARAMETERS -+.TP -+perturb -+Interval in seconds for queue algorithm perturbation. Defaults to 0, which means that -+no perturbation occurs. Do not set too low for each perturbation may cause some packet -+reordering. Advised value: 10 -+.TP -+quantum -+Amount of bytes a flow is allowed to dequeue during a round of the round robin process. -+Defaults to the MTU of the interface which is also the advised value and the minimum value. -+ -+.SH EXAMPLE & USAGE -+ -+To attach to device ppp0: -+.P -+# tc qdisc add dev ppp0 root sfq perturb 10 -+.P -+Please note that SFQ, like all non-shaping (work-conserving) qdiscs, is only useful -+if it owns the queue. -+This is the case when the link speed equals the actually available bandwidth. This holds -+for regular phone modems, ISDN connections and direct non-switched ethernet links. -+.P -+Most often, cable modems and DSL devices do not fall into this category. The same holds -+for when connected to a switch and trying to send data to a congested segment also -+connected to the switch. -+.P -+In this case, the effective queue does not reside within Linux and is therefore not -+available for scheduling. -+.P -+Embed SFQ in a classful qdisc to make sure it owns the queue. -+ -+.SH SOURCE -+.TP -+o -+Paul E. McKenney "Stochastic Fairness Queuing", -+IEEE INFOCOMM'90 Proceedings, San Francisco, 1990. -+ -+.TP -+o -+Paul E. McKenney "Stochastic Fairness Queuing", -+"Interworking: Research and Experience", v.2, 1991, p.113-131. -+ -+.TP -+o -+See also: -+M. Shreedhar and George Varghese "Efficient Fair -+Queuing using Deficit Round Robin", Proc. SIGCOMM 95. -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHOR -+Alexey N. Kuznetsov, . This manpage maintained by -+bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/tc-tbf.8 iproute2/debian/manpages/tc-tbf.8 ---- iproute2-orig/debian/manpages/tc-tbf.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/tc-tbf.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,138 @@ -+.TH TC 8 "13 December 2001" "iproute2" "Linux" -+.SH NAME -+tbf \- Token Bucket Filter -+.SH SYNOPSIS -+.B tc qdisc ... tbf rate -+rate -+.B burst -+bytes/cell -+.B ( latency -+ms -+.B | limit -+bytes -+.B ) [ mpu -+bytes -+.B [ peakrate -+rate -+.B mtu -+bytes/cell -+.B ] ] -+.P -+burst is also known as buffer and maxburst. mtu is also known as minburst. -+.SH DESCRIPTION -+ -+The Token Bucket Filter is a classless queueing discipline available for -+traffic control with the -+.BR tc (8) -+command. -+ -+TBF is a pure shaper and never schedules traffic. It is non-work-conserving and may throttle -+itself, although packets are available, to ensure that the configured rate is not exceeded. -+On all platforms except for Alpha, -+it is able to shape up to 1mbit/s of normal traffic with ideal minimal burstiness, -+sending out data exactly at the configured rates. -+ -+Much higher rates are possible but at the cost of losing the minimal burstiness. In that -+case, data is on average dequeued at the configured rate but may be sent much faster at millisecond -+timescales. Because of further queues living in network adaptors, this is often not a problem. -+ -+Kernels with a higher 'HZ' can achieve higher rates with perfect burstiness. On Alpha, HZ is ten -+times higher, leading to a 10mbit/s limit to perfection. These calculations hold for packets of on -+average 1000 bytes. -+ -+.SH ALGORITHM -+As the name implies, traffic is filtered based on the expenditure of -+.B tokens. -+Tokens roughly correspond to bytes, with the additional constraint that each packet consumes -+some tokens, no matter how small it is. This reflects the fact that even a zero-sized packet occupies -+the link for some time. -+ -+On creation, the TBF is stocked with tokens which correspond to the amount of traffic that can be burst -+in one go. Tokens arrive at a steady rate, until the bucket is full. -+ -+If no tokens are available, packets are queued, up to a configured limit. The TBF now -+calculates the token deficit, and throttles until the first packet in the queue can be sent. -+ -+If it is not acceptable to burst out packets at maximum speed, a peakrate can be configured -+to limit the speed at which the bucket empties. This peakrate is implemented as a second TBF -+with a very small bucket, so that it doesn't burst. -+ -+To achieve perfection, the second bucket may contain only a single packet, which leads to -+the earlier mentioned 1mbit/s limit. -+ -+This limit is caused by the fact that the kernel can only throttle for at minimum 1 'jiffy', which depends -+on HZ as 1/HZ. For perfect shaping, only a single packet can get sent per jiffy - for HZ=100, this means 100 -+packets of on average 1000 bytes each, which roughly corresponds to 1mbit/s. -+ -+.SH PARAMETERS -+See -+.BR tc (8) -+for how to specify the units of these values. -+.TP -+limit or latency -+Limit is the number of bytes that can be queued waiting for tokens to become -+available. You can also specify this the other way around by setting the -+latency parameter, which specifies the maximum amount of time a packet can -+sit in the TBF. The latter calculation takes into account the size of the -+bucket, the rate and possibly the peakrate (if set). These two parameters -+are mutually exclusive. -+.TP -+burst -+Also known as buffer or maxburst. -+Size of the bucket, in bytes. This is the maximum amount of bytes that tokens can be available for instantaneously. -+In general, larger shaping rates require a larger buffer. For 10mbit/s on Intel, you need at least 10kbyte buffer -+if you want to reach your configured rate! -+ -+If your buffer is too small, packets may be dropped because more tokens arrive per timer tick than fit in your bucket. -+The minimum buffer size can be calculated by dividing the rate by HZ. -+ -+Token usage calculations are performed using a table which by default has a resolution of 8 packets. -+This resolution can be changed by specifying the -+.B cell -+size with the burst. For example, to specify a 6000 byte buffer with a 16 -+byte cell size, set a burst of 6000/16. You will probably never have to set -+this. Must be an integral power of 2. -+.TP -+mpu -+A zero-sized packet does not use zero bandwidth. For ethernet, no packet uses less than 64 bytes. The Minimum Packet Unit -+determines the minimal token usage (specified in bytes) for a packet. Defaults to zero. -+.TP -+rate -+The speed knob. See remarks above about limits! See -+.BR tc (8) -+for units. -+.PP -+Furthermore, if a peakrate is desired, the following parameters are available: -+ -+.TP -+peakrate -+Maximum depletion rate of the bucket. Limited to 1mbit/s on Intel, 10mbit/s on Alpha. The peakrate does -+not need to be set, it is only necessary if perfect millisecond timescale shaping is required. -+ -+.TP -+mtu/minburst -+Specifies the size of the peakrate bucket. For perfect accuracy, should be set to the MTU of the interface. -+If a peakrate is needed, but some burstiness is acceptable, this size can be raised. A 3000 byte minburst -+allows around 3mbit/s of peakrate, given 1000 byte packets. -+ -+Like the regular burstsize you can also specify a -+.B cell -+size. -+.SH EXAMPLE & USAGE -+ -+To attach a TBF with a sustained maximum rate of 0.5mbit/s, a peakrate of 1.0mbit/s, -+a 5kilobyte buffer, with a pre-bucket queue size limit calculated so the TBF causes -+at most 70ms of latency, with perfect peakrate behaviour, issue: -+.P -+# tc qdisc add dev eth0 root tbf rate 0.5mbit \\ -+ burst 5kb latency 70ms peakrate 1mbit \\ -+ minburst 1540 -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHOR -+Alexey N. Kuznetsov, . This manpage maintained by -+bert hubert -+ -+ -diff -Naur iproute2-orig/debian/manpages/tc.8 iproute2/debian/manpages/tc.8 ---- iproute2-orig/debian/manpages/tc.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/manpages/tc.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,348 @@ -+.TH TC 8 "16 December 2001" "iproute2" "Linux" -+.SH NAME -+tc \- show / manipulate traffic control settings -+.SH SYNOPSIS -+.B tc qdisc [ add | change | replace | link ] dev -+DEV -+.B -+[ parent -+qdisc-id -+.B | root ] -+.B [ handle -+qdisc-id ] qdisc -+[ qdisc specific parameters ] -+.P -+ -+.B tc class [ add | change | replace ] dev -+DEV -+.B parent -+qdisc-id -+.B [ classid -+class-id ] qdisc -+[ qdisc specific parameters ] -+.P -+ -+.B tc filter [ add | change | replace ] dev -+DEV -+.B [ parent -+qdisc-id -+.B | root ] protocol -+protocol -+.B prio -+priority filtertype -+[ filtertype specific parameters ] -+.B flowid -+flow-id -+ -+.B tc [-s | -d ] qdisc show [ dev -+DEV -+.B ] -+.P -+.B tc [-s | -d ] class show dev -+DEV -+.P -+.B tc filter show dev -+DEV -+ -+.SH DESCRIPTION -+.B Tc -+is used to configure Traffic Control in the Linux kernel. Traffic Control consists -+of the following: -+ -+.TP -+SHAPING -+When traffic is shaped, its rate of transmission is under control. Shaping may -+be more than lowering the available bandwidth - it is also used to smooth out -+bursts in traffic for better network behaviour. Shaping occurs on egress. -+ -+.TP -+SCHEDULING -+By scheduling the transmission of packets it is possible to improve interactivity -+for traffic that needs it while still guaranteeing bandwidth to bulk transfers. Reordering -+is also called prioritizing, and happens only on egress. -+ -+.TP -+POLICING -+Where shaping deals with transmission of traffic, policing pertains to traffic -+arriving. Policing thus occurs on ingress. -+ -+.TP -+DROPPING -+Traffic exceeding a set bandwidth may also be dropped forthwith, both on -+ingress and on egress. -+ -+.P -+Processing of traffic is controlled by three kinds of objects: qdiscs, -+classes and filters. -+ -+.SH QDISCS -+.B qdisc -+is short for 'queueing discipline' and it is elementary to -+understanding traffic control. Whenever the kernel needs to send a -+packet to an interface, it is -+.B enqueued -+to the qdisc configured for that interface. Immediately afterwards, the kernel -+tries to get as many packets as possible from the qdisc, for giving them -+to the network adaptor driver. -+ -+A simple QDISC is the 'pfifo' one, which does no processing at all and is a pure -+First In, First Out queue. It does however store traffic when the network interface -+can't handle it momentarily. -+ -+.SH CLASSES -+Some qdiscs can contain classes, which contain further qdiscs - traffic may -+then be enqueued in any of the inner qdiscs, which are within the -+.B classes. -+When the kernel tries to dequeue a packet from such a -+.B classful qdisc -+it can come from any of the classes. A qdisc may for example prioritize -+certain kinds of traffic by trying to dequeue from certain classes -+before others. -+ -+.SH FILTERS -+A -+.B filter -+is used by a classful qdisc to determine in which class a packet will -+be enqueued. Whenever traffic arrives at a class with subclasses, it needs -+to be classified. Various methods may be employed to do so, one of these -+are the filters. All filters attached to the class are called, until one of -+them returns with a verdict. If no verdict was made, other criteria may be -+available. This differs per qdisc. -+ -+It is important to notice that filters reside -+.B within -+qdiscs - they are not masters of what happens. -+ -+.SH CLASSLESS QDISCS -+The classless qdiscs are: -+.TP -+[p|b]fifo -+Simplest usable qdisc, pure First In, First Out behaviour. Limited in -+packets or in bytes. -+.TP -+pfifo_fast -+Standard qdisc for 'Advanced Router' enabled kernels. Consists of a three-band -+queue which honors Type of Service flags, as well as the priority that may be -+assigned to a packet. -+.TP -+red -+Random Early Detection simulates physical congestion by randomly dropping -+packets when nearing configured bandwidth allocation. Well suited to very -+large bandwidth applications. -+.TP -+sfq -+Stochastic Fairness Queueing reorders queued traffic so each 'session' -+gets to send a packet in turn. -+.TP -+tbf -+The Token Bucket Filter is suited for slowing traffic down to a precisely -+configured rate. Scales well to large bandwidths. -+.SH CONFIGURING CLASSLESS QDISCS -+In the absence of classful qdiscs, classless qdiscs can only be attached at -+the root of a device. Full syntax: -+.P -+.B tc qdisc add dev -+DEV -+.B root -+QDISC QDISC-PARAMETERS -+ -+To remove, issue -+.P -+.B tc qdisc del dev -+DEV -+.B root -+ -+The -+.B pfifo_fast -+qdisc is the automatic default in the absence of a configured qdisc. -+ -+.SH CLASSFUL QDISCS -+The classful qdiscs are: -+.TP -+CBQ -+Class Based Queueing implements a rich linksharing hierarchy of classes. -+It contains shaping elements as well as prioritizing capabilities. Shaping is -+performed using link idle time calculations based on average packet size and -+underlying link bandwidth. The latter may be ill-defined for some interfaces. -+.TP -+HTB -+The Hierarchy Token Bucket implements a rich linksharing hierarchy of -+classes with an emphasis on conforming to existing practices. HTB facilitates -+guaranteeing bandwidth to classes, while also allowing specification of upper -+limits to inter-class sharing. It contains shaping elements, based on TBF and -+can prioritize classes. -+.TP -+PRIO -+The PRIO qdisc is a non-shaping container for a configurable number of -+classes which are dequeued in order. This allows for easy prioritization -+of traffic, where lower classes are only able to send if higher ones have -+no packets available. To facilitate configuration, Type Of Service bits are -+honored by default. -+.SH THEORY OF OPERATION -+Classes form a tree, where each class has a single parent. -+A class may have multiple children. Some qdiscs allow for runtime addition -+of classes (CBQ, HTB) while others (PRIO) are created with a static number of -+children. -+ -+Qdiscs which allow dynamic addition of classes can have zero or more -+subclasses to which traffic may be enqueued. -+ -+Furthermore, each class contains a -+.B leaf qdisc -+which by default has -+.B pfifo -+behaviour though another qdisc can be attached in place. This qdisc may again -+contain classes, but each class can have only one leaf qdisc. -+ -+When a packet enters a classful qdisc it can be -+.B classified -+to one of the classes within. Three criteria are available, although not all -+qdiscs will use all three: -+.TP -+tc filters -+If tc filters are attached to a class, they are consulted first -+for relevant instructions. Filters can match on all fields of a packet header, -+as well as on the firewall mark applied by ipchains or iptables. See -+.BR tc-filters (8). -+.TP -+Type of Service -+Some qdiscs have built in rules for classifying packets based on the TOS field. -+.TP -+skb->priority -+Userspace programs can encode a class-id in the 'skb->priority' field using -+the SO_PRIORITY option. -+.P -+Each node within the tree can have its own filters but higher level filters -+may also point directly to lower classes. -+ -+If classification did not succeed, packets are enqueued to the leaf qdisc -+attached to that class. Check qdisc specific manpages for details, however. -+ -+.SH NAMING -+All qdiscs, classes and filters have IDs, which can either be specified -+or be automatically assigned. -+ -+IDs consist of a major number and a minor number, separated by a colon. -+ -+.TP -+QDISCS -+A qdisc, which potentially can have children, -+gets assigned a major number, called a 'handle', leaving the minor -+number namespace available for classes. The handle is expressed as '10:'. -+It is customary to explicitly assign a handle to qdiscs expected to have -+children. -+ -+.TP -+CLASSES -+Classes residing under a qdisc share their qdisc major number, but each have -+a separate minor number called a 'classid' that has no relation to their -+parent classes, only to their parent qdisc. The same naming custom as for -+qdiscs applies. -+ -+.TP -+FILTERS -+Filters have a three part ID, which is only needed when using a hashed -+filter hierarchy, for which see -+.BR tc-filters (8). -+.SH UNITS -+All parameters accept a floating point number, possibly followed by a unit. -+.P -+Bandwidths or rates can be specified in: -+.TP -+kbps -+Kilobytes per second -+.TP -+mbps -+Megabytes per second -+.TP -+kbit -+Kilobits per second -+.TP -+mbit -+Megabits per second -+.TP -+bps or a bare number -+Bytes per second -+.P -+Amounts of data can be specified in: -+.TP -+kb or k -+Kilobytes -+.TP -+mb or m -+Megabytes -+.TP -+mbit -+Megabits -+.TP -+kbit -+Kilobits -+.TP -+b or a bare number -+Bytes. -+.P -+Lengths of time can be specified in: -+.TP -+s, sec or secs -+Whole seconds -+.TP -+ms, msec or msecs -+Milliseconds -+.TP -+us, usec, usecs or a bare number -+Microseconds. -+ -+.SH TC COMMANDS -+The following commands are available for qdiscs, classes and filter: -+.TP -+add -+Add a qdisc, class or filter to a node. For all entities, a -+.B parent -+must be passed, either by passing its ID or by attaching directly to the root of a device. -+When creating a qdisc or a filter, it can be named with the -+.B handle -+parameter. A class is named with the -+.B classid -+parameter. -+ -+.TP -+remove -+A qdisc can be removed by specifying its handle, which may also be 'root'. All subclasses and their leaf qdiscs -+are automatically deleted, as well as any filters attached to them. -+ -+.TP -+change -+Some entities can be modified 'in place'. Shares the syntax of 'add', with the exception -+that the handle cannot be changed and neither can the parent. In other words, -+.B -+change -+cannot move a node. -+ -+.TP -+replace -+Performs a nearly atomic remove/add on an existing node id. If the node does not exist yet -+it is created. -+ -+.TP -+link -+Only available for qdiscs and performs a replace where the node -+must exist already. -+ -+ -+.SH HISTORY -+.B tc -+was written by Alexey N. Kuznetsov and added in Linux 2.2. -+.SH SEE ALSO -+.BR tc-cbq (8), -+.BR tc-htb (8), -+.BR tc-sfq (8), -+.BR tc-red (8), -+.BR tc-tbf (8), -+.BR tc-pfifo (8), -+.BR tc-bfifo (8), -+.BR tc-pfifo_fast (8), -+.BR tc-filters (8) -+ -+.SH AUTHOR -+Manpage maintained by bert hubert (ahu@ds9a.nl) -+ -diff -Naur iproute2-orig/debian/postinst iproute2/debian/postinst ---- iproute2-orig/debian/postinst 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/postinst 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,6 @@ -+#!/bin/sh -e -+ -+# FHS: -+if [ "$1" = "configure" -a -d /usr/doc -a ! -e /usr/doc/iproute ]; then -+ ln -sf ../share/doc/iproute /usr/doc/iproute -+fi -diff -Naur iproute2-orig/debian/postrm iproute2/debian/postrm ---- iproute2-orig/debian/postrm 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/postrm 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,6 @@ -+#!/bin/sh -+ -+if [ "$1" = "purge" ] -+then -+ rm -rf /etc/iproute2 -+fi -diff -Naur iproute2-orig/debian/prerm iproute2/debian/prerm ---- iproute2-orig/debian/prerm 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/prerm 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,5 @@ -+#!/bin/sh -e -+ -+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/iproute ]; then -+ rm -f /usr/doc/iproute -+fi -diff -Naur iproute2-orig/debian/rules iproute2/debian/rules ---- iproute2-orig/debian/rules 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/rules 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,85 @@ -+#!/usr/bin/make -f -+# -+# Copyright (C) 1999 Roberto Lumbreras -+# Copyright (C) 1999-2002 Juan Cespedes -+# Copying: GPL -+ -+SHELL = bash -+ -+PACKAGE = $(shell perl -e 'print <> =~ /^(.*) \(.*\)/' debian/changelog) -+PKG_VER = $(shell perl -e 'print <> =~ /\((.*)\)/' debian/changelog) -+PKG_UPVER= $(shell perl -e 'print <> =~ /\((.*)-[^-]*\)/' debian/changelog) -+ -+BINS = ip/ip -+SBINS = ip/rtmon ip/rtacct tc/tc -+SHBINS = ip/routef ip/routel # ip/ifcfg ip/rtpr -+DOCS = README* doc/Plan debian/README.Debian -+MAN8 = debian/manpages/*.8 -+MANLINKS= rtmon rtacct routef routel -+TEXDOCS = ip-cref ip-tunnels api-ip6-flowlabels -+ -+build: stamp-build -+ -+stamp-build: -+ test -f include-glibc/netinet/in.h.orig || \ -+ mv include-glibc/netinet/in.h \ -+ include-glibc/netinet/in.h.orig -+ $(MAKE) KERNEL_INCLUDE=/usr/include -+ $(MAKE) -C doc -+ touch stamp-build -+ -+binary: binary-indep binary-arch -+ -+binary-indep: -+ -+binary-arch: checkroot stamp-build -+ $(RM) -r debian/tmp -+ install -d -m0755 debian/tmp/{DEBIAN,bin,sbin,usr/{bin,share/doc/$(PACKAGE),share/man/man{7,8}}} -+ install -s -m0755 $(BINS) debian/tmp/bin/ -+ install -s -m0755 $(SBINS) debian/tmp/sbin/ -+ ln -s /bin/ip debian/tmp/sbin/ip -+ install -m0755 $(SHBINS) debian/tmp/usr/bin/ -+ cp -p $(DOCS) debian/tmp/usr/share/doc/$(PACKAGE)/ -+ cp -rp examples debian/tmp/usr/share/doc/$(PACKAGE)/ -+ find debian/tmp/usr/share/doc/$(PACKAGE)/examples -type f -exec chmod -x {} \; -+ install -m0644 debian/changelog debian/tmp/usr/share/doc/$(PACKAGE)/changelog.Debian -+ cp -p RELNOTES debian/tmp/usr/share/doc/$(PACKAGE)/changelog -+ for i in $(TEXDOCS); do \ -+ install -m0644 doc/$$i.tex debian/tmp/usr/share/doc/$(PACKAGE)/; \ -+ install -m0644 doc/$$i.dvi debian/tmp/usr/share/doc/$(PACKAGE)/; \ -+ install -m0644 doc/$$i.ps debian/tmp/usr/share/doc/$(PACKAGE)/; \ -+ done -+ install -m0644 $(MAN8) debian/tmp/usr/share/man/man8/ -+ gzip -9fr debian/tmp/usr/share || true -+ ln -s tc-pbfifo.8.gz debian/tmp/usr/share/man/man8/tc-pfifo.8.gz -+ ln -s tc-pbfifo.8.gz debian/tmp/usr/share/man/man8/tc-bfifo.8.gz -+ for i in $(MANLINKS); do \ -+ ln -s ../man7/undocumented.7.gz debian/tmp/usr/share/man/man8/$$i.8.gz; \ -+ done -+ cp -p debian/copyright debian/tmp/usr/share/doc/$(PACKAGE)/ -+ cp -rp etc debian/tmp/ -+ install -m0644 debian/conffiles debian/tmp/DEBIAN/ -+ -+ dpkg-shlibdeps $(BINS) $(SBINS) -+ dpkg-gencontrol -isp -+ chown -R root.root debian/tmp -+ chmod -R u=rwX,go=rX debian/tmp -+ dpkg --build debian/tmp .. -+ -+checkdir: -+ @test -f debian/rules -+ -+checkroot: checkdir -+ @test 0 = `id -u` || { echo "Error: not super-user"; exit 1; } -+ -+clean: checkdir debian/control -+ $(RM) stamp-build debian/files debian/substvars -+ $(MAKE) clean -+ $(MAKE) -C doc clean -+ $(RM) `find . -name "*~" -o -name core` -+ $(RM) -r debian/tmp -+ test -f include-glibc/netinet/in.h.orig && \ -+ mv include-glibc/netinet/in.h.orig \ -+ include-glibc/netinet/in.h || true -+ -+.PHONY: build binary binary-arch binary-indep checkdir checkroot clean -diff -Naur iproute2-orig/debian/tc-cbq.8 iproute2/debian/tc-cbq.8 ---- iproute2-orig/debian/tc-cbq.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/tc-cbq.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,353 @@ -+.TH CBQ 8 "16 December 2001" "iproute2" "Linux" -+.SH NAME -+CBQ \- Class Based Queueing -+.SH SYNOPSIS -+.B tc qdisc ... dev -+dev -+.B ( parent -+classid -+.B | root) [ handle -+major: -+.B ] cbq [ allot -+bytes -+.B ] avpkt -+bytes -+.B bandwidth -+rate -+.B [ cell -+bytes -+.B ] [ ewma -+log -+.B ] [ mpu -+bytes -+.B ] -+ -+.B tc class ... dev -+dev -+.B parent -+major:[minor] -+.B [ classid -+major:minor -+.B ] cbq allot -+bytes -+.B [ bandwidth -+rate -+.B ] [ rate -+rate -+.B ] prio -+priority -+.B [ weight -+weight -+.B ] [ minburst -+packets -+.B ] [ maxburst -+packets -+.B ] [ ewma -+log -+.B ] [ cell -+bytes -+.B ] avpkt -+bytes -+.B [ mpu -+bytes -+.B ] [ bounded isolated ] [ split -+handle -+.B & defmap -+defmap -+.B ] [ estimator -+interval timeconstant -+.B ] -+ -+.SH DESCRIPTION -+Class Based Queueing is a classful qdisc that implements a rich -+linksharing hierarchy of classes. It contains shaping elements as -+well as prioritizing capabilities. Shaping is performed using link -+idle time calculations based on the timing of dequeue events and -+underlying link bandwidth. -+ -+.SH SHAPING ALGORITHM -+When shaping a 10mbit/s connection to 1mbit/s, the link will -+be idle 90% of the time. If it isn't, it needs to be throttled so that it -+IS idle 90% of the time. -+ -+During operations, the effective idletime is measured using an -+exponential weighted moving average (EWMA), which considers recent -+packets to be exponentially more important than past ones. The Unix -+loadaverage is calculated in the same way. -+ -+The calculated idle time is subtracted from the EWMA measured one, -+the resulting number is called 'avgidle'. A perfectly loaded link has -+an avgidle of zero: packets arrive exactly at the calculated -+interval. -+ -+An overloaded link has a negative avgidle and if it gets too negative, -+CBQ throttles and is then 'overlimit'. -+ -+Conversely, an idle link might amass a huge avgidle, which would then -+allow infinite bandwidths after a few hours of silence. To prevent -+this, avgidle is capped at -+.B maxidle. -+ -+If overlimit, in theory, the CBQ could throttle itself for exactly the -+amount of time that was calculated to pass between packets, and then -+pass one packet, and throttle again. Due to timer resolution constraints, -+this may not be feasible, see the -+.B minburst -+parameter below. -+ -+.SH CLASSIFICATION -+Within the one CBQ instance many classes may exist. Each of these classes -+contains another qdisc, by default -+.BR tc-pfifo (8). -+ -+When enqueueing a packet, CBQ starts at the root and uses various methods to -+determine which class should receive the data. -+ -+In the absence of uncommon configuration options, the process is rather easy. -+At each node we look for an instruction, and then go to the class the -+instruction refers us to. If the class found is a barren leaf-node (without -+children), we enqueue the packet there. If it is not yet a leaf node, we do -+the whole thing over again starting from that node. -+ -+The following actions are performed, in order at each node we visit, until one -+sends us to another node, or terminates the process. -+.TP -+(i) -+Consult filters attached to the class. If sent to a leafnode, we are done. -+Otherwise, restart. -+.TP -+(ii) -+Consult the defmap for the priority assigned to this packet, which depends -+on the TOS bits. Check if the referral is leafless, otherwise restart. -+.TP -+(iii) -+Ask the defmap for instructions for the 'best effort' priority. Check the -+answer for leafness, otherwise restart. -+.TP -+(iv) -+If none of the above returned with an instruction, enqueue at this node. -+.P -+This algorithm makes sure that a packet always ends up somewhere, even while -+you are busy building your configuration. -+ -+For more details, see -+.BR tc-cbq-details(8). -+ -+.SH LINK SHARING ALGORITHM -+When dequeuing for sending to the network device, CBQ decides which of its -+classes will be allowed to send. It does so with a Weighted Round Robin process -+in which each class with packets gets a chance to send in turn. The WRR process -+starts by asking the highest priority classes (lowest numerically - -+highest semantically) for packets, and will continue to do so until they -+have no more data to offer, in which case the process repeats for lower -+priorities. -+ -+Classes by default borrow bandwidth from their siblings. A class can be -+prevented from doing so by declaring it 'bounded'. A class can also indicate -+its unwillingness to lend out bandwidth by being 'isolated'. -+ -+.SH QDISC -+The root of a CBQ qdisc class tree has the following parameters: -+ -+.TP -+parent major:minor | root -+This mandatory parameter determines the place of the CBQ instance, either at the -+.B root -+of an interface or within an existing class. -+.TP -+handle major: -+Like all other qdiscs, the CBQ can be assigned a handle. Should consist only -+of a major number, followed by a colon. Optional, but very useful if classes -+will be generated within this qdisc. -+.TP -+allot bytes -+This allotment is the 'chunkiness' of link sharing and is used for determining packet -+transmission time tables. The qdisc allot differs slightly from the class allot discussed -+below. Optional. Defaults to a reasonable value, related to avpkt. -+.TP -+avpkt bytes -+The average size of a packet is needed for calculating maxidle, and is also used -+for making sure 'allot' has a safe value. Mandatory. -+.TP -+bandwidth rate -+To determine the idle time, CBQ must know the bandwidth of your underlying -+physical interface, or parent qdisc. This is a vital parameter, more about it -+later. Mandatory. -+.TP -+cell -+The cell size determines he granularity of packet transmission time calculations. Has a sensible default. -+.TP -+mpu -+A zero sized packet may still take time to transmit. This value is the lower -+cap for packet transmission time calculations - packets smaller than this value -+are still deemed to have this size. Defaults to zero. -+.TP -+ewma log -+When CBQ needs to measure the average idle time, it does so using an -+Exponentially Weighted Moving Average which smoothes out measurements into -+a moving average. The EWMA LOG determines how much smoothing occurs. Lower -+values imply greater sensitivity. Must be between 0 and 31. Defaults -+to 5. -+.P -+A CBQ qdisc does not shape out of its own accord. It only needs to know certain -+parameters about the underlying link. Actual shaping is done in classes. -+ -+.SH CLASSES -+Classes have a host of parameters to configure their operation. -+ -+.TP -+parent major:minor -+Place of this class within the hierarchy. If attached directly to a qdisc -+and not to another class, minor can be omitted. Mandatory. -+.TP -+classid major:minor -+Like qdiscs, classes can be named. The major number must be equal to the -+major number of the qdisc to which it belongs. Optional, but needed if this -+class is going to have children. -+.TP -+weight weight -+When dequeuing to the interface, classes are tried for traffic in a -+round-robin fashion. Classes with a higher configured qdisc will generally -+have more traffic to offer during each round, so it makes sense to allow -+it to dequeue more traffic. All weights under a class are normalized, so -+only the ratios matter. Defaults to the configured rate, unless the priority -+of this class is maximal, in which case it is set to 1. -+.TP -+allot bytes -+Allot specifies how many bytes a qdisc can dequeue -+during each round of the process. This parameter is weighted using the -+renormalized class weight described above. Silently capped at a minimum of -+3/2 avpkt. Mandatory. -+ -+.TP -+prio priority -+In the round-robin process, classes with the lowest priority field are tried -+for packets first. Mandatory. -+ -+.TP -+avpkt -+See the QDISC section. -+ -+.TP -+rate rate -+Maximum rate this class and all its children combined can send at. Mandatory. -+ -+.TP -+bandwidth rate -+This is different from the bandwidth specified when creating a CBQ disc! Only -+used to determine maxidle and offtime, which are only calculated when -+specifying maxburst or minburst. Mandatory if specifying maxburst or minburst. -+ -+.TP -+maxburst -+This number of packets is used to calculate maxidle so that when -+avgidle is at maxidle, this number of average packets can be burst -+before avgidle drops to 0. Set it higher to be more tolerant of -+bursts. You can't set maxidle directly, only via this parameter. -+ -+.TP -+minburst -+As mentioned before, CBQ needs to throttle in case of -+overlimit. The ideal solution is to do so for exactly the calculated -+idle time, and pass 1 packet. However, Unix kernels generally have a -+hard time scheduling events shorter than 10ms, so it is better to -+throttle for a longer period, and then pass minburst packets in one -+go, and then sleep minburst times longer. -+ -+The time to wait is called the offtime. Higher values of minburst lead -+to more accurate shaping in the long term, but to bigger bursts at -+millisecond timescales. Optional. -+ -+.TP -+minidle -+If avgidle is below 0, we are overlimits and need to wait until -+avgidle will be big enough to send one packet. To prevent a sudden -+burst from shutting down the link for a prolonged period of time, -+avgidle is reset to minidle if it gets too low. -+ -+Minidle is specified in negative microseconds, so 10 means that -+avgidle is capped at -10us. Optional. -+ -+.TP -+bounded -+Signifies that this class will not borrow bandwidth from its siblings. -+.TP -+isolated -+Means that this class will not borrow bandwidth to its siblings -+ -+.TP -+split major:minor & defmap bitmap[/bitmap] -+If consulting filters attached to a class did not give a verdict, -+CBQ can also classify based on the packet's priority. There are 16 -+priorities available, numbered from 0 to 15. -+ -+The defmap specifies which priorities this class wants to receive, -+specified as a bitmap. The Least Significant Bit corresponds to priority -+zero. The -+.B split -+parameter tells CBQ at which class the decision must be made, which should -+be a (grand)parent of the class you are adding. -+ -+As an example, 'tc class add ... classid 10:1 cbq .. split 10:0 defmap c0' -+configures class 10:0 to send packets with priorities 6 and 7 to 10:1. -+ -+The complimentary configuration would then -+be: 'tc class add ... classid 10:2 cbq ... split 10:0 defmap 3f' -+Which would send all packets 0, 1, 2, 3, 4 and 5 to 10:1. -+.TP -+estimator interval timeconstant -+CBQ can measure how much bandwidth each class is using, which tc filters -+can use to classify packets with. In order to determine the bandwidth -+it uses a very simple estimator that measures once every -+.B interval -+microseconds how much traffic has passed. This again is a EWMA, for which -+the time constant can be specified, also in microseconds. The -+.B time constant -+corresponds to the sluggishness of the measurement or, conversely, to the -+sensitivity of the average to short bursts. Higher values mean less -+sensitivity. -+ -+.SH BUGS -+The actual bandwidth of the underlying link may not be known, for example -+in the case of PPoE or PPTP connections which in fact may send over a -+pipe, instead of over a physical device. CBQ is quite resilient to major -+errors in the configured bandwidth, probably a the cost of coarser shaping. -+ -+Default kernels rely on coarse timing information for making decisions. These -+may make shaping precise in the long term, but inaccurate on second long scales. -+ -+See -+.BR tc-cbq-details(8) -+for hints on how to improve this. -+ -+.SH SOURCES -+.TP -+o -+Sally Floyd and Van Jacobson, "Link-sharing and Resource -+Management Models for Packet Networks", -+IEEE/ACM Transactions on Networking, Vol.3, No.4, 1995 -+ -+.TP -+o -+Sally Floyd, "Notes on CBQ and Guaranteed Service", 1995 -+ -+.TP -+o -+Sally Floyd, "Notes on Class-Based Queueing: Setting -+Parameters", 1996 -+ -+.TP -+o -+Sally Floyd and Michael Speer, "Experimental Results -+for Class-Based Queueing", 1998, not published. -+ -+ -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHOR -+Alexey N. Kuznetsov, . This manpage maintained by -+bert hubert -+ -+ -diff -Naur iproute2-orig/debian/tc-htb.8 iproute2/debian/tc-htb.8 ---- iproute2-orig/debian/tc-htb.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/tc-htb.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,153 @@ -+.TH HTB 8 "10 January 2002" "iproute2" "Linux" -+.SH NAME -+HTB \- Hierarchy Token Bucket -+.SH SYNOPSIS -+.B tc qdisc ... dev -+dev -+.B ( parent -+classid -+.B | root) [ handle -+major: -+.B ] htb [ default -+minor-id -+.B ] -+ -+.B tc class ... dev -+dev -+.B parent -+major:[minor] -+.B [ classid -+major:minor -+.B ] htb rate -+rate -+.B [ ceil -+rate -+.B ] burst -+bytes -+.B [ cburst -+bytes -+.B ] [ prio -+priority -+.B ] -+ -+.SH DESCRIPTION -+HTB is meant as a more understandable and intuitive replacement for -+the CBQ qdisc in Linux. Both CBQ and HTB help you to control the use -+of the outbound bandwidth on a given link. Both allow you to use one -+physical link to simulate several slower links and to send different -+kinds of traffic on different simulated links. In both cases, you have -+to specify how to divide the physical link into simulated links and -+how to decide which simulated link to use for a given packet to be sent. -+ -+Unlike CBQ, HTB shapes traffic based on the Token Bucket Filter algorithm -+which does not depend on interface characteristics and so does not need to -+know the underlying bandwidth of the outgoing interface. -+ -+.SH SHAPING ALGORITHM -+Shaping works as documented in -+.B tc-tbf (8). -+ -+.SH CLASSIFICATION -+Within the one HRB instance many classes may exist. Each of these classes -+contains another qdisc, by default -+.BR tc-pfifo (8). -+ -+When enqueueing a packet, HTB starts at the root and uses various methods to -+determine which class should receive the data. -+ -+In the absence of uncommon configuration options, the process is rather easy. -+At each node we look for an instruction, and then go to the class the -+instruction refers us to. If the class found is a barren leaf-node (without -+children), we enqueue the packet there. If it is not yet a leaf node, we do -+the whole thing over again starting from that node. -+ -+The following actions are performed, in order at each node we visit, until one -+sends us to another node, or terminates the process. -+.TP -+(i) -+Consult filters attached to the class. If sent to a leafnode, we are done. -+Otherwise, restart. -+.TP -+(ii) -+If none of the above returned with an instruction, enqueue at this node. -+.P -+This algorithm makes sure that a packet always ends up somewhere, even while -+you are busy building your configuration. -+ -+.SH LINK SHARING ALGORITHM -+FIXME -+ -+.SH QDISC -+The root of a CBQ qdisc class tree has the following parameters: -+ -+.TP -+parent major:minor | root -+This mandatory parameter determines the place of the CBQ instance, either at the -+.B root -+of an interface or within an existing class. -+.TP -+handle major: -+Like all other qdiscs, the CBQ can be assigned a handle. Should consist only -+of a major number, followed by a colon. Optional, but very useful if classes -+will be generated within this qdisc. -+.TP -+default minor-id -+Unclassified traffic gets sent to the class with this minor-id. -+ -+.SH CLASSES -+Classes have a host of parameters to configure their operation. -+ -+.TP -+parent major:minor -+Place of this class within the hierarchy. If attached directly to a qdisc -+and not to another class, minor can be omitted. Mandatory. -+.TP -+classid major:minor -+Like qdiscs, classes can be named. The major number must be equal to the -+major number of the qdisc to which it belongs. Optional, but needed if this -+class is going to have children. -+.TP -+prio priority -+In the round-robin process, classes with the lowest priority field are tried -+for packets first. Mandatory. -+ -+.TP -+rate rate -+Maximum rate this class and all its children are guaranteed. Mandatory. -+ -+.TP -+ceil rate -+Maximum rate at which a class can send, if its parent has bandwidth to spare. -+Defaults to the configured rate, which implies no borrowing -+ -+.TP -+burst bytes -+Amount of bytes that can be burst at -+.B ceil -+speed, in excess of the configured -+.B rate. -+Should be at least as high as the highest burst of all children. -+ -+.TP -+cburst bytes -+Amount of bytes that can be burst at 'infinite' speed, in other words, as fast -+as the interface can transmit them. For perfect evening out, should be equal to at most one average -+packet. Should be at least as high as the highest cburst of all children. -+ -+.SH NOTES -+Due to Unix timing constraints, the maximum ceil rate is not infinite and may in fact be quite low. On Intel, -+there are 100 timer events per second, the maximum rate is that rate at which 'burst' bytes are sent each timer tick. -+From this, the mininum burst size for a specified rate can be calculated. For i386, a 10mbit rate requires a 12 kilobyte -+burst as 100*12kb*8 equals 10mbit. -+ -+.SH BUGS -+Not in the stock kernel yet. -+ -+.SH SEE ALSO -+.BR tc (8) -+.P -+HTB website: http://luxik.cdi.cz/~devik/qos/htb/ -+.SH AUTHOR -+Martin Devera . This manpage maintained by bert hubert -+ -+ -diff -Naur iproute2-orig/debian/tc-pbfifo.8 iproute2/debian/tc-pbfifo.8 ---- iproute2-orig/debian/tc-pbfifo.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/tc-pbfifo.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,72 @@ -+.TH PBFIFO 8 "10 January 2002" "iproute2" "Linux" -+.SH NAME -+pfifo \- Packet limited First In, First Out queue -+.P -+bfifo \- Byte limited First In, First Out queue -+ -+.SH SYNOPSIS -+.B tc qdisc ... add pfifo -+.B [ limit -+packets -+.B ] -+.P -+.B tc qdisc ... add bfifo -+.B [ limit -+bytes -+.B ] -+ -+.SH DESCRIPTION -+The pfifo and bfifo qdiscs are unadorned First In, First Out queues. They are the -+simplest queues possible and therefore have no overhead. -+.B pfifo -+constrains the queue size as measured in packets. -+.B bfifo -+does so as measured in bytes. -+ -+Like all non-default qdiscs, they maintain statistics. This might be a reason to prefer -+pfifo or bfifo over the default. -+ -+.SH ALGORITHM -+A list of packets is maintained, when a packet is enqueued it gets inserted at the tail of -+a list. When a packet needs to be sent out to the network, it is taken from the head of the list. -+ -+If the list is too long, no further packets are allowed on. This is called 'tail drop'. -+ -+.SH PARAMETERS -+.TP -+limit -+Maximum queue size. Specified in bytes for bfifo, in packets for pfifo. For pfifo, defaults -+to the interface txqueuelen, as specified with -+.BR ifconfig (8) -+or -+.BR ip (8). -+ -+For bfifo, it defaults to the txqueuelen multiplied by the interface MTU. -+ -+.SH OUTPUT -+The output of -+.B tc -s qdisc ls -+contains the limit, either in packets or in bytes, and the number of bytes -+and packets actually sent. An unsent and dropped packet only appears between braces -+and is not counted as 'Sent'. -+ -+In this example, the queue length is 100 packets, 45894 bytes were sent over 681 packets. -+No packets were dropped, and as the pfifo queue does not slow down packets, there were also no -+overlimits: -+.P -+.nf -+# tc -s qdisc ls dev eth0 -+qdisc pfifo 8001: dev eth0 limit 100p -+ Sent 45894 bytes 681 pkts (dropped 0, overlimits 0) -+.fi -+ -+If a backlog occurs, this is displayed as well. -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHORS -+Alexey N. Kuznetsov, -+ -+This manpage maintained by bert hubert -+ -+ -diff -Naur iproute2-orig/debian/tc-pfifo_fast.8 iproute2/debian/tc-pfifo_fast.8 ---- iproute2-orig/debian/tc-pfifo_fast.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/tc-pfifo_fast.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,59 @@ -+.TH PFIFO_FAST 8 "10 January 2002" "iproute2" "Linux" -+.SH NAME -+pfifo_fast \- three-band first in, first out queue -+ -+.SH DESCRIPTION -+pfifo_fast is the default qdisc of each interface. -+ -+Whenever an interface is created, the pfifo_fast qdisc is automatically used -+as a queue. If another qdisc is attached, it preempts the default -+pfifo_fast, which automatically returns to function when an existing qdisc -+is detached. -+ -+In this sense this qdisc is magic, and unlike other qdiscs. -+ -+.SH ALGORITHM -+The algorithm is very similar to that of the classful -+.BR tc-prio (8) -+qdisc. -+.B pfifo_fast -+is like three -+.BR tc-pfifo (8) -+queues side by side, where packets can be enqueued in any of the three bands -+based on their Type of Service bits or assigned priority. -+ -+Not all three bands are dequeued simultaneously - as long as lower bands -+have traffic, higher bands are never dequeued. This can be used to -+prioritize interactive traffic or penalize 'lowest cost' traffic. -+ -+Each band can be txqueuelen packets long, as configured with -+.BR ifconfig (8) -+or -+.BR ip (8). -+Additional packets coming in are not enqueued but are instead dropped. -+ -+See -+.BR tc-prio (8) -+for complete details on how TOS bits are translated into bands. -+.SH PARAMETERS -+.TP -+txqueuelen -+The length of the three bands depends on the interface txqueuelen, as -+specified with -+.BR ifconfig (8) -+or -+.BR ip (8). -+ -+.SH BUGS -+Does not maintain statistics and does not show up in tc qdisc ls. This is because -+it is the automatic default in the absence of a configured qdisc. -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHORS -+Alexey N. Kuznetsov, -+ -+This manpage maintained by bert hubert -+ -+ -diff -Naur iproute2-orig/debian/tc-prio.8 iproute2/debian/tc-prio.8 ---- iproute2-orig/debian/tc-prio.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/tc-prio.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,187 @@ -+.TH PRIO 8 "16 December 2001" "iproute2" "Linux" -+.SH NAME -+PRIO \- Priority qdisc -+.SH SYNOPSIS -+.B tc qdisc ... dev -+dev -+.B ( parent -+classid -+.B | root) [ handle -+major: -+.B ] prio [ bands -+bands -+.B ] [ priomap -+band,band,band... -+.B ] [ estimator -+interval timeconstant -+.B ] -+ -+.SH DESCRIPTION -+The PRIO qdisc is a simple classful queueing discipline that contains -+an arbitrary number of classes of differing priority. The classes are -+dequeued in numerical descending order of priority. PRIO is a scheduler -+and never delays packets - it is a work-conserving qdisc, though the qdiscs -+contained in the classes may not be. -+ -+Very useful for lowering latency when there is no need for slowing down -+traffic. -+ -+.SH ALGORITHM -+On creation with 'tc qdisc add', a fixed number of bands is created. Each -+band is a class, although is not possible to add classes with 'tc qdisc -+add', the number of bands to be created must instead be specified on the -+commandline attaching PRIO to its root. -+ -+When dequeueing, band 0 is tried first and only if it did not deliver a -+packet does PRIO try band 1, and so onwards. Maximum reliability packets -+should therefore go to band 0, minimum delay to band 1 and the rest to band -+2. -+ -+As the PRIO qdisc itself will have minor number 0, band 0 is actually -+major:1, band 1 is major:2, etc. For major, substitute the major number -+assigned to the qdisc on 'tc qdisc add' with the -+.B handle -+parameter. -+ -+.SH CLASSIFICATION -+Three methods are available to PRIO to determine in which band a packet will -+be enqueued. -+.TP -+From userspace -+A process with sufficient privileges can encode the destination class -+directly with SO_PRIORITY, see -+.BR tc(7). -+.TP -+with a tc filter -+A tc filter attached to the root qdisc can point traffic directly to a class -+.TP -+with the priomap -+Based on the packet priority, which in turn is derived from the Type of -+Service assigned to the packet. -+.P -+Only the priomap is specific to this qdisc. -+.SH QDISC PARAMETERS -+.TP -+bands -+Number of bands. If changed from the default of 3, -+.B priomap -+must be updated as well. -+.TP -+priomap -+The priomap maps the priority of -+a packet to a class. The priority can either be set directly from userspace, -+or be derived from the Type of Service of the packet. -+ -+Determines how packet priorities, as assigned by the kernel, map to -+bands. Mapping occurs based on the TOS octet of the packet, which looks like -+this: -+ -+.nf -+0 1 2 3 4 5 6 7 -++---+---+---+---+---+---+---+---+ -+| | | | -+|PRECEDENCE | TOS |MBZ| -+| | | | -++---+---+---+---+---+---+---+---+ -+.fi -+ -+The four TOS bits (the 'TOS field') are defined as: -+ -+.nf -+Binary Decimcal Meaning -+----------------------------------------- -+1000 8 Minimize delay (md) -+0100 4 Maximize throughput (mt) -+0010 2 Maximize reliability (mr) -+0001 1 Minimize monetary cost (mmc) -+0000 0 Normal Service -+.fi -+ -+As there is 1 bit to the right of these four bits, the actual value of the -+TOS field is double the value of the TOS bits. Tcpdump -v -v shows you the -+value of the entire TOS field, not just the four bits. It is the value you -+see in the first column of this table: -+ -+.nf -+TOS Bits Means Linux Priority Band -+------------------------------------------------------------ -+0x0 0 Normal Service 0 Best Effort 1 -+0x2 1 Minimize Monetary Cost 1 Filler 2 -+0x4 2 Maximize Reliability 0 Best Effort 1 -+0x6 3 mmc+mr 0 Best Effort 1 -+0x8 4 Maximize Throughput 2 Bulk 2 -+0xa 5 mmc+mt 2 Bulk 2 -+0xc 6 mr+mt 2 Bulk 2 -+0xe 7 mmc+mr+mt 2 Bulk 2 -+0x10 8 Minimize Delay 6 Interactive 0 -+0x12 9 mmc+md 6 Interactive 0 -+0x14 10 mr+md 6 Interactive 0 -+0x16 11 mmc+mr+md 6 Interactive 0 -+0x18 12 mt+md 4 Int. Bulk 1 -+0x1a 13 mmc+mt+md 4 Int. Bulk 1 -+0x1c 14 mr+mt+md 4 Int. Bulk 1 -+0x1e 15 mmc+mr+mt+md 4 Int. Bulk 1 -+.fi -+ -+The second column contains the value of the relevant -+four TOS bits, followed by their translated meaning. For example, 15 stands -+for a packet wanting Minimal Montetary Cost, Maximum Reliability, Maximum -+Throughput AND Minimum Delay. -+ -+The fourth column lists the way the Linux kernel interprets the TOS bits, by -+showing to which Priority they are mapped. -+ -+The last column shows the result of the default priomap. On the commandline, -+the default priomap looks like this: -+ -+ 1, 2, 2, 2, 1, 2, 0, 0 , 1, 1, 1, 1, 1, 1, 1, 1 -+ -+This means that priority 4, for example, gets mapped to band number 1. -+The priomap also allows you to list higher priorities (> 7) which do not -+correspond to TOS mappings, but which are set by other means. -+ -+This table from RFC 1349 (read it for more details) explains how -+applications might very well set their TOS bits: -+ -+.nf -+TELNET 1000 (minimize delay) -+FTP -+ Control 1000 (minimize delay) -+ Data 0100 (maximize throughput) -+ -+TFTP 1000 (minimize delay) -+ -+SMTP -+ Command phase 1000 (minimize delay) -+ DATA phase 0100 (maximize throughput) -+ -+Domain Name Service -+ UDP Query 1000 (minimize delay) -+ TCP Query 0000 -+ Zone Transfer 0100 (maximize throughput) -+ -+NNTP 0001 (minimize monetary cost) -+ -+ICMP -+ Errors 0000 -+ Requests 0000 (mostly) -+ Responses (mostly) -+.fi -+ -+ -+.SH CLASSES -+PRIO classes cannot be configured further - they are automatically created -+when the PRIO qdisc is attached. Each class however can contain yet a -+further qdisc. -+ -+.SH BUGS -+Large amounts of traffic in the lower bands can cause starvation of higher -+bands. Can be prevented by attaching a shaper (for example, -+.BR tc-tbf(8) -+to these bands to make sure they cannot dominate the link. -+ -+.SH AUTHORS -+Alexey N. Kuznetsov, , J Hadi Salim -+. This manpage maintained by bert hubert -+ -+ -diff -Naur iproute2-orig/debian/tc-red.8 iproute2/debian/tc-red.8 ---- iproute2-orig/debian/tc-red.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/tc-red.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,131 @@ -+.TH RED 8 "13 December 2001" "iproute2" "Linux" -+.SH NAME -+red \- Random Early Detection -+.SH SYNOPSIS -+.B tc qdisc ... red -+.B limit -+bytes -+.B min -+bytes -+.B max -+bytes -+.B avpkt -+bytes -+.B burst -+packets -+.B [ ecn ] [ bandwidth -+rate -+.B ] probability -+chance -+ -+.SH DESCRIPTION -+Random Early Detection is a classless qdisc which manages its queue size -+smartly. Regular queues simply drop packets from the tail when they are -+full, which may not be the optimal behaviour. RED also performs tail drop, -+but does so in a more gradual way. -+ -+Once the queue hits a certain average length, packets enqueued have a -+configurable chance of being marked (which may mean dropped). This chance -+increases linearly up to a point called the -+.B max -+average queue length, although the queue might get bigger. -+ -+This has a host of benefits over simple taildrop, while not being processor -+intensive. It prevents synchronous retransmits after a burst in traffic, -+which cause further retransmits, etc. -+ -+The goal is the have a small queue size, which is good for interactivity -+while not disturbing TCP/IP traffic with too many sudden drops after a burst -+of traffic. -+ -+Depending on 08 ECN is configured, marking either means dropping or -+purely marking a packet as overlimit. -+.SH ALGORITHM -+The average queue size is used for determining the marking -+probability. This is calculated using an Exponential Weighted Moving -+Average, which can be more or less sensitive to bursts. -+ -+When the average queue size is below -+.B min -+bytes, no packet will ever be marked. When it exceeds -+.B min, -+the probability of doing so climbs linearly up -+to -+.B probability, -+until the average queue size hits -+.B max -+bytes. Because -+.B probability -+is normally not set to 100%, the queue size might -+conceivably rise above -+.B max -+bytes, so the -+.B limit -+parameter is provided to set a hard maximum for the size of the queue. -+ -+.SH PARAMETERS -+.TP -+min -+Average queue size at which marking becomes a possibility. -+.TP -+max -+At this average queue size, the marking probability is maximal. Should be at -+least twice -+.B min -+to prevent synchronous retransmits, higher for low -+.B min. -+.TP -+probability -+Maximum probability for marking, specified as a floating point -+number from 0.0 to 1.0. Suggested values are 0.01 or 0.02 (1 or 2%, -+respectively). -+.TP -+limit -+Hard limit on the real (not average) queue size in bytes. Further packets -+are dropped. Should be set higher than max+burst. It is advised to set this -+a few times higher than -+.B max. -+.TP -+burst -+Used for determining how fast the average queue size is influenced by the -+real queue size. Larger values make the calculation more sluggish, allowing -+longer bursts of traffic before marking starts. Real life experiments -+support the following guideline: (min+min+max)/(3*avpkt). -+.TP -+avpkt -+Specified in bytes. Used with burst to determine the time constant for -+average queue size calculations. 1000 is a good value. -+.TP -+bandwidth -+This rate is used for calculating the average queue size after some -+idle time. Should be set to the bandwidth of your interface. Does not mean -+that RED will shape for you! Optional. -+.TP -+ecn -+As mentioned before, RED can either 'mark' or 'drop'. Explicit Congestion -+Notification allows RED to notify remote hosts that their rate exceeds the -+amount of bandwidth available. Non-ECN capable hosts can only be notified by -+dropping a packet. If this parameter is specified, packets which indicate -+that their hosts honor ECN will only be marked and not dropped, unless the -+queue size hits -+.B limit -+bytes. Needs a tc binary with RED support compiled in. Recommended. -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH SOURCES -+.TP -+o -+Floyd, S., and Jacobson, V., Random Early Detection gateways for -+Congestion Avoidance. http://www.aciri.org/floyd/papers/red/red.html -+.TP -+o -+Some changes to the algorithm by Alexey N. Kuznetsov. -+ -+.SH AUTHORS -+Alexey N. Kuznetsov, , Alexey Makarenko -+, J Hadi Salim . -+This manpage maintained by bert hubert -+ -+ -diff -Naur iproute2-orig/debian/tc-sfq.8 iproute2/debian/tc-sfq.8 ---- iproute2-orig/debian/tc-sfq.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/tc-sfq.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,107 @@ -+.TH TC 8 "8 December 2001" "iproute2" "Linux" -+.SH NAME -+sfq \- Stochastic Fairness Queueing -+.SH SYNOPSIS -+.B tc qdisc ... perturb -+seconds -+.B quantum -+bytes -+ -+.SH DESCRIPTION -+ -+Stochastic Fairness Queueing is a classless queueing discipline available for -+traffic control with the -+.BR tc (8) -+command. -+ -+SFQ does not shape traffic but only schedules the transmission of packets, based on 'flows'. -+The goal is to ensure fairness so that each flow is able to send data in turn, thus preventing -+any single flow from drowning out the rest. -+ -+This may in fact have some effect in mitigating a Denial of Service attempt. -+ -+SFQ is work-conserving and therefore always delivers a packet if it has one available. -+.SH ALGORITHM -+On enqueueing, each packet is assigned to a hash bucket, based on -+.TP -+(i) -+Source address -+.TP -+(ii) -+Destination address -+.TP -+(iii) -+Source port -+.P -+If these are available. SFQ knows about ipv4 and ipv6 and also UDP, TCP and ESP. -+Packets with other protocols are hashed based on the 32bits representation of their -+destination and the socket they belong to. A flow corresponds mostly to a TCP/IP -+connection. -+ -+Each of these buckets should represent a unique flow. Because multiple flows may -+get hashed to the same bucket, the hashing algorithm is perturbed at configurable -+intervals so that the unfairness lasts only for a short while. Perturbation may -+however cause some inadvertent packet reordering to occur. -+ -+When dequeuing, each hashbucket with data is queried in a round robin fashion. -+ -+The compile time maximum length of the SFQ is 128 packets, which can be spread over -+at most 128 buckets of 1024 available. In case of overflow, tail-drop is performed -+on the fullest bucket, thus maintaining fairness. -+ -+.SH PARAMETERS -+.TP -+perturb -+Interval in seconds for queue algorithm perturbation. Defaults to 0, which means that -+no perturbation occurs. Do not set too low for each perturbation may cause some packet -+reordering. Advised value: 10 -+.TP -+quantum -+Amount of bytes a flow is allowed to dequeue during a round of the round robin process. -+Defaults to the MTU of the interface which is also the advised value and the minimum value. -+ -+.SH EXAMPLE & USAGE -+ -+To attach to device ppp0: -+.P -+# tc qdisc add dev ppp0 root sfq perturb 10 -+.P -+Please note that SFQ, like all non-shaping (work-conserving) qdiscs, is only useful -+if it owns the queue. -+This is the case when the link speed equals the actually available bandwidth. This holds -+for regular phone modems, ISDN connections and direct non-switched ethernet links. -+.P -+Most often, cable modems and DSL devices do not fall into this category. The same holds -+for when connected to a switch and trying to send data to a congested segment also -+connected to the switch. -+.P -+In this case, the effective queue does not reside within Linux and is therefore not -+available for scheduling. -+.P -+Embed SFQ in a classful qdisc to make sure it owns the queue. -+ -+.SH SOURCE -+.TP -+o -+Paul E. McKenney "Stochastic Fairness Queuing", -+IEEE INFOCOMM'90 Proceedings, San Francisco, 1990. -+ -+.TP -+o -+Paul E. McKenney "Stochastic Fairness Queuing", -+"Interworking: Research and Experience", v.2, 1991, p.113-131. -+ -+.TP -+o -+See also: -+M. Shreedhar and George Varghese "Efficient Fair -+Queuing using Deficit Round Robin", Proc. SIGCOMM 95. -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHOR -+Alexey N. Kuznetsov, . This manpage maintained by -+bert hubert -+ -+ -diff -Naur iproute2-orig/debian/tc-tbf.8 iproute2/debian/tc-tbf.8 ---- iproute2-orig/debian/tc-tbf.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/tc-tbf.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,138 @@ -+.TH TC 8 "13 December 2001" "iproute2" "Linux" -+.SH NAME -+tbf \- Token Bucket Filter -+.SH SYNOPSIS -+.B tc qdisc ... tbf rate -+rate -+.B burst -+bytes/cell -+.B ( latency -+ms -+.B | limit -+bytes -+.B ) [ mpu -+bytes -+.B [ peakrate -+rate -+.B mtu -+bytes/cell -+.B ] ] -+.P -+burst is also known as buffer and maxburst. mtu is also known as minburst. -+.SH DESCRIPTION -+ -+The Token Bucket Filter is a classless queueing discipline available for -+traffic control with the -+.BR tc (8) -+command. -+ -+TBF is a pure shaper and never schedules traffic. It is non-work-conserving and may throttle -+itself, although packets are available, to ensure that the configured rate is not exceeded. -+On all platforms except for Alpha, -+it is able to shape up to 1mbit/s of normal traffic with ideal minimal burstiness, -+sending out data exactly at the configured rates. -+ -+Much higher rates are possible but at the cost of losing the minimal burstiness. In that -+case, data is on average dequeued at the configured rate but may be sent much faster at millisecond -+timescales. Because of further queues living in network adaptors, this is often not a problem. -+ -+Kernels with a higher 'HZ' can achieve higher rates with perfect burstiness. On Alpha, HZ is ten -+times higher, leading to a 10mbit/s limit to perfection. These calculations hold for packets of on -+average 1000 bytes. -+ -+.SH ALGORITHM -+As the name implies, traffic is filtered based on the expenditure of -+.B tokens. -+Tokens roughly correspond to bytes, with the additional constraint that each packet consumes -+some tokens, no matter how small it is. This reflects the fact that even a zero-sized packet occupies -+the link for some time. -+ -+On creation, the TBF is stocked with tokens which correspond to the amount of traffic that can be burst -+in one go. Tokens arrive at a steady rate, until the bucket is full. -+ -+If no tokens are available, packets are queued, up to a configured limit. The TBF now -+calculates the token deficit, and throttles until the first packet in the queue can be sent. -+ -+If it is not acceptable to burst out packets at maximum speed, a peakrate can be configured -+to limit the speed at which the bucket empties. This peakrate is implemented as a second TBF -+with a very small bucket, so that it doesn't burst. -+ -+To achieve perfection, the second bucket may contain only a single packet, which leads to -+the earlier mentioned 1mbit/s limit. -+ -+This limit is caused by the fact that the kernel can only throttle for at minimum 1 'jiffy', which depends -+on HZ as 1/HZ. For perfect shaping, only a single packet can get sent per jiffy - for HZ=100, this means 100 -+packets of on average 1000 bytes each, which roughly corresponds to 1mbit/s. -+ -+.SH PARAMETERS -+See -+.BR tc (8) -+for how to specify the units of these values. -+.TP -+limit or latency -+Limit is the number of bytes that can be queued waiting for tokens to become -+available. You can also specify this the other way around by setting the -+latency parameter, which specifies the maximum amount of time a packet can -+sit in the TBF. The latter calculation takes into account the size of the -+bucket, the rate and possibly the peakrate (if set). These two parameters -+are mutually exclusive. -+.TP -+burst -+Also known as buffer or maxburst. -+Size of the bucket, in bytes. This is the maximum amount of bytes that tokens can be available for instantaneously. -+In general, larger shaping rates require a larger buffer. For 10mbit/s on Intel, you need at least 10kbyte buffer -+if you want to reach your configured rate! -+ -+If your buffer is too small, packets may be dropped because more tokens arrive per timer tick than fit in your bucket. -+The minimum buffer size can be calculated by dividing the rate by HZ. -+ -+Token usage calculations are performed using a table which by default has a resolution of 8 packets. -+This resolution can be changed by specifying the -+.B cell -+size with the burst. For example, to specify a 6000 byte buffer with a 16 -+byte cell size, set a burst of 6000/16. You will probably never have to set -+this. Must be an integral power of 2. -+.TP -+mpu -+A zero-sized packet does not use zero bandwidth. For ethernet, no packet uses less than 64 bytes. The Minimum Packet Unit -+determines the minimal token usage (specified in bytes) for a packet. Defaults to zero. -+.TP -+rate -+The speed knob. See remarks above about limits! See -+.BR tc (8) -+for units. -+.PP -+Furthermore, if a peakrate is desired, the following parameters are available: -+ -+.TP -+peakrate -+Maximum depletion rate of the bucket. Limited to 1mbit/s on Intel, 10mbit/s on Alpha. The peakrate does -+not need to be set, it is only necessary if perfect millisecond timescale shaping is required. -+ -+.TP -+mtu/minburst -+Specifies the size of the peakrate bucket. For perfect accuracy, should be set to the MTU of the interface. -+If a peakrate is needed, but some burstiness is acceptable, this size can be raised. A 3000 byte minburst -+allows around 3mbit/s of peakrate, given 1000 byte packets. -+ -+Like the regular burstsize you can also specify a -+.B cell -+size. -+.SH EXAMPLE & USAGE -+ -+To attach a TBF with a sustained maximum rate of 0.5mbit/s, a peakrate of 1.0mbit/s, -+a 5kilobyte buffer, with a pre-bucket queue size limit calculated so the TBF causes -+at most 70ms of latency, with perfect peakrate behaviour, issue: -+.P -+# tc qdisc add dev eth0 root tbf rate 0.5mbit \\ -+ burst 5kb latency 70ms peakrate 1mbit \\ -+ minburst 1540 -+ -+.SH SEE ALSO -+.BR tc (8) -+ -+.SH AUTHOR -+Alexey N. Kuznetsov, . This manpage maintained by -+bert hubert -+ -+ -diff -Naur iproute2-orig/debian/tc.8 iproute2/debian/tc.8 ---- iproute2-orig/debian/tc.8 1969-12-31 16:00:00.000000000 -0800 -+++ iproute2/debian/tc.8 2004-05-21 00:09:38.000000000 -0700 -@@ -0,0 +1,348 @@ -+.TH TC 8 "16 December 2001" "iproute2" "Linux" -+.SH NAME -+tc \- show / manipulate traffic control settings -+.SH SYNOPSIS -+.B tc qdisc [ add | change | replace | link ] dev -+DEV -+.B -+[ parent -+qdisc-id -+.B | root ] -+.B [ handle -+qdisc-id ] qdisc -+[ qdisc specific parameters ] -+.P -+ -+.B tc class [ add | change | replace ] dev -+DEV -+.B parent -+qdisc-id -+.B [ classid -+class-id ] qdisc -+[ qdisc specific parameters ] -+.P -+ -+.B tc filter [ add | change | replace ] dev -+DEV -+.B [ parent -+qdisc-id -+.B | root ] protocol -+protocol -+.B prio -+priority filtertype -+[ filtertype specific parameters ] -+.B flowid -+flow-id -+ -+.B tc [-s | -d ] qdisc show [ dev -+DEV -+.B ] -+.P -+.B tc [-s | -d ] class show dev -+DEV -+.P -+.B tc filter show dev -+DEV -+ -+.SH DESCRIPTION -+.B Tc -+is used to configure Traffic Control in the Linux kernel. Traffic Control consists -+of the following: -+ -+.TP -+SHAPING -+When traffic is shaped, its rate of transmission is under control. Shaping may -+be more than lowering the available bandwidth - it is also used to smooth out -+bursts in traffic for better network behaviour. Shaping occurs on egress. -+ -+.TP -+SCHEDULING -+By scheduling the transmission of packets it is possible to improve interactivity -+for traffic that needs it while still guaranteeing bandwidth to bulk transfers. Reordering -+is also called prioritizing, and happens only on egress. -+ -+.TP -+POLICING -+Where shaping deals with transmission of traffic, policing pertains to traffic -+arriving. Policing thus occurs on ingress. -+ -+.TP -+DROPPING -+Traffic exceeding a set bandwidth may also be dropped forthwith, both on -+ingress and on egress. -+ -+.P -+Processing of traffic is controlled by three kinds of objects: qdiscs, -+classes and filters. -+ -+.SH QDISCS -+.B qdisc -+is short for 'queueing discipline' and it is elementary to -+understanding traffic control. Whenever the kernel needs to send a -+packet to an interface, it is -+.B enqueued -+to the qdisc configured for that interface. Immediately afterwards, the kernel -+tries to get as many packets as possible from the qdisc, for giving them -+to the network adaptor driver. -+ -+A simple QDISC is the 'pfifo' one, which does no processing at all and is a pure -+First In, First Out queue. It does however store traffic when the network interface -+can't handle it momentarily. -+ -+.SH CLASSES -+Some qdiscs can contain classes, which contain further qdiscs - traffic may -+then be enqueued in any of the inner qdiscs, which are within the -+.B classes. -+When the kernel tries to dequeue a packet from such a -+.B classful qdisc -+it can come from any of the classes. A qdisc may for example prioritize -+certain kinds of traffic by trying to dequeue from certain classes -+before others. -+ -+.SH FILTERS -+A -+.B filter -+is used by a classful qdisc to determine in which class a packet will -+be enqueued. Whenever traffic arrives at a class with subclasses, it needs -+to be classified. Various methods may be employed to do so, one of these -+are the filters. All filters attached to the class are called, until one of -+them returns with a verdict. If no verdict was made, other criteria may be -+available. This differs per qdisc. -+ -+It is important to notice that filters reside -+.B within -+qdiscs - they are not masters of what happens. -+ -+.SH CLASSLESS QDISCS -+The classless qdiscs are: -+.TP -+[p|b]fifo -+Simplest usable qdisc, pure First In, First Out behaviour. Limited in -+packets or in bytes. -+.TP -+pfifo_fast -+Standard qdisc for 'Advanced Router' enabled kernels. Consists of a three-band -+queue which honors Type of Service flags, as well as the priority that may be -+assigned to a packet. -+.TP -+red -+Random Early Detection simulates physical congestion by randomly dropping -+packets when nearing configured bandwidth allocation. Well suited to very -+large bandwidth applications. -+.TP -+sfq -+Stochastic Fairness Queueing reorders queued traffic so each 'session' -+gets to send a packet in turn. -+.TP -+tbf -+The Token Bucket Filter is suited for slowing traffic down to a precisely -+configured rate. Scales well to large bandwidths. -+.SH CONFIGURING CLASSLESS QDISCS -+In the absence of classful qdiscs, classless qdiscs can only be attached at -+the root of a device. Full syntax: -+.P -+.B tc qdisc add dev -+DEV -+.B root -+QDISC QDISC-PARAMETERS -+ -+To remove, issue -+.P -+.B tc qdisc del dev -+DEV -+.B root -+ -+The -+.B pfifo_fast -+qdisc is the automatic default in the absence of a configured qdisc. -+ -+.SH CLASSFUL QDISCS -+The classful qdiscs are: -+.TP -+CBQ -+Class Based Queueing implements a rich linksharing hierarchy of classes. -+It contains shaping elements as well as prioritizing capabilities. Shaping is -+performed using link idle time calculations based on average packet size and -+underlying link bandwidth. The latter may be ill-defined for some interfaces. -+.TP -+HTB -+The Hierarchy Token Bucket implements a rich linksharing hierarchy of -+classes with an emphasis on conforming to existing practices. HTB facilitates -+guaranteeing bandwidth to classes, while also allowing specification of upper -+limits to inter-class sharing. It contains shaping elements, based on TBF and -+can prioritize classes. -+.TP -+PRIO -+The PRIO qdisc is a non-shaping container for a configurable number of -+classes which are dequeued in order. This allows for easy prioritization -+of traffic, where lower classes are only able to send if higher ones have -+no packets available. To facilitate configuration, Type Of Service bits are -+honored by default. -+.SH THEORY OF OPERATION -+Classes form a tree, where each class has a single parent. -+A class may have multiple children. Some qdiscs allow for runtime addition -+of classes (CBQ, HTB) while others (PRIO) are created with a static number of -+children. -+ -+Qdiscs which allow dynamic addition of classes can have zero or more -+subclasses to which traffic may be enqueued. -+ -+Furthermore, each class contains a -+.B leaf qdisc -+which by default has -+.B pfifo -+behaviour though another qdisc can be attached in place. This qdisc may again -+contain classes, but each class can have only one leaf qdisc. -+ -+When a packet enters a classful qdisc it can be -+.B classified -+to one of the classes within. Three criteria are available, although not all -+qdiscs will use all three: -+.TP -+tc filters -+If tc filters are attached to a class, they are consulted first -+for relevant instructions. Filters can match on all fields of a packet header, -+as well as on the firewall mark applied by ipchains or iptables. See -+.BR tc-filters (8). -+.TP -+Type of Service -+Some qdiscs have built in rules for classifying packets based on the TOS field. -+.TP -+skb->priority -+Userspace programs can encode a class-id in the 'skb->priority' field using -+the SO_PRIORITY option. -+.P -+Each node within the tree can have its own filters but higher level filters -+may also point directly to lower classes. -+ -+If classification did not succeed, packets are enqueued to the leaf qdisc -+attached to that class. Check qdisc specific manpages for details, however. -+ -+.SH NAMING -+All qdiscs, classes and filters have IDs, which can either be specified -+or be automatically assigned. -+ -+IDs consist of a major number and a minor number, separated by a colon. -+ -+.TP -+QDISCS -+A qdisc, which potentially can have children, -+gets assigned a major number, called a 'handle', leaving the minor -+number namespace available for classes. The handle is expressed as '10:'. -+It is customary to explicitly assign a handle to qdiscs expected to have -+children. -+ -+.TP -+CLASSES -+Classes residing under a qdisc share their qdisc major number, but each have -+a separate minor number called a 'classid' that has no relation to their -+parent classes, only to their parent qdisc. The same naming custom as for -+qdiscs applies. -+ -+.TP -+FILTERS -+Filters have a three part ID, which is only needed when using a hashed -+filter hierarchy, for which see -+.BR tc-filters (8). -+.SH UNITS -+All parameters accept a floating point number, possibly followed by a unit. -+.P -+Bandwidths or rates can be specified in: -+.TP -+kbps -+Kilobytes per second -+.TP -+mbps -+Megabytes per second -+.TP -+kbit -+Kilobits per second -+.TP -+mbit -+Megabits per second -+.TP -+bps or a bare number -+Bits per second -+.P -+Amounts of data can be specified in: -+.TP -+kb or k -+Kilobytes -+.TP -+mb or m -+Megabytes -+.TP -+mbit -+Megabits -+.TP -+kbit -+Kilobits -+.TP -+b or a bare number -+Bytes. -+.P -+Lengths of time can be specified in: -+.TP -+s, sec or secs -+Whole seconds -+.TP -+ms, msec or msecs -+Milliseconds -+.TP -+us, usec, usecs or a bare number -+Microseconds. -+ -+.SH TC COMMANDS -+The following commands are available for qdiscs, classes and filter: -+.TP -+add -+Add a qdisc, class or filter to a node. For all entities, a -+.B parent -+must be passed, either by passing its ID or by attaching directly to the root of a device. -+When creating a qdisc or a filter, it can be named with the -+.B handle -+parameter. A class is named with the -+.B classid -+parameter. -+ -+.TP -+remove -+A qdisc can be removed by specifying its handle, which may also be 'root'. All subclasses and their leaf qdiscs -+are automatically deleted, as well as any filters attached to them. -+ -+.TP -+change -+Some entities can be modified 'in place'. Shares the syntax of 'add', with the exception -+that the handle cannot be changed and neither can the parent. In other words, -+.B -+change -+cannot move a node. -+ -+.TP -+replace -+Performs a nearly atomic remove/add on an existing node id. If the node does not exist yet -+it is created. -+ -+.TP -+link -+Only available for qdiscs and performs a replace where the node -+must exist already. -+ -+ -+.SH HISTORY -+.B tc -+was written by Alexey N. Kuznetsov and added in Linux 2.2. -+.SH SEE ALSO -+.BR tc-cbq (8), -+.BR tc-htb (8), -+.BR tc-sfq (8), -+.BR tc-red (8), -+.BR tc-tbf (8), -+.BR tc-pfifo (8), -+.BR tc-bfifo (8), -+.BR tc-pfifo_fast (8), -+.BR tc-filters (8) -+ -+.SH AUTHOR -+Manpage maintained by bert hubert (ahu@ds9a.nl) -+ -diff -Naur iproute2-orig/include/rt_names.h iproute2/include/rt_names.h ---- iproute2-orig/include/rt_names.h 2000-04-16 10:42:50.000000000 -0700 -+++ iproute2/include/rt_names.h 2004-05-21 00:16:36.000000000 -0700 -@@ -1,6 +1,8 @@ - #ifndef RT_NAMES_H_ - #define RT_NAMES_H_ 1 - -+#include -+ - const char* rtnl_rtprot_n2a(int id, char *buf, int len); - const char* rtnl_rtscope_n2a(int id, char *buf, int len); - const char* rtnl_rttable_n2a(int id, char *buf, int len); -diff -Naur iproute2-orig/lib/rt_names.c iproute2/lib/rt_names.c ---- iproute2-orig/lib/rt_names.c 2000-04-16 10:42:52.000000000 -0700 -+++ iproute2/lib/rt_names.c 2004-05-21 00:16:36.000000000 -0700 -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - static void rtnl_tab_initialize(char *file, char **tab, int size) - { -diff -Naur iproute2-orig/misc/arpd.c iproute2/misc/arpd.c ---- iproute2-orig/misc/arpd.c 2002-01-09 20:02:26.000000000 -0800 -+++ iproute2/misc/arpd.c 2004-05-21 00:16:36.000000000 -0700 -@@ -16,7 +16,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/abs/core-testing/iproute2/iproute2-fhs.patch b/abs/core-testing/iproute2/iproute2-fhs.patch deleted file mode 100644 index 563a915..0000000 --- a/abs/core-testing/iproute2/iproute2-fhs.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile ---- iproute2.old/Makefile 2009-11-11 22:05:21.251407668 +0100 -+++ iproute2-2.6.29/Makefile 2009-11-11 22:07:09.891833516 +0100 -@@ -1,11 +1,12 @@ - DESTDIR=/usr/ - ROOTDIR=$(DESTDIR) - LIBDIR=/usr/lib/ --SBINDIR=/sbin -+SBINDIR=/usr/sbin - CONFDIR=/etc/iproute2 --DOCDIR=/share/doc/iproute2 --MANDIR=/share/man -+DOCDIR=/usr/share/doc/iproute2 -+MANDIR=/usr/share/man - ARPDDIR=/var/lib/arpd -+SHAREDIR=/usr/share - - # Path to db_185.h include - DBM_INCLUDE:=$(ROOTDIR)/usr/include -diff -Naur iproute2.old/netem/Makefile iproute2-2.6.29/netem/Makefile ---- iproute2.old/netem/Makefile 2009-11-11 22:05:21.284750207 +0100 -+++ iproute2-2.6.29/netem/Makefile 2009-11-11 22:07:54.674736924 +0100 -@@ -20,9 +20,9 @@ - $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm - - install: all -- mkdir -p $(DESTDIR)/lib/tc -+ mkdir -p $(DESTDIR)/${SHAREDIR}/tc - for i in $(DISTDATA); \ -- do install -m 755 $$i $(DESTDIR)/lib/tc; \ -+ do install -m 755 $$i $(DESTDIR)/${SHAREDIR}/tc; \ - done - - clean: -diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c ---- iproute2.old/tc/tc_util.c 2009-11-11 22:05:21.298076943 +0100 -+++ iproute2-2.6.29/tc/tc_util.c 2009-11-11 22:09:32.865152646 +0100 -@@ -24,8 +24,8 @@ - #include "utils.h" - #include "tc_util.h" - --#ifndef LIBDIR --#define LIBDIR "/usr/lib/" -+#ifndef SHAREDIR -+#define SHAREDIR "/usr/share" - #endif - - const char *get_tc_lib(void) -@@ -34,7 +34,7 @@ - - lib_dir = getenv("TC_LIB_DIR"); - if (!lib_dir) -- lib_dir = LIBDIR "/tc/"; -+ lib_dir = SHAREDIR "/tc/"; - - return lib_dir; - } diff --git a/abs/core-testing/iproute2/libdir.patch b/abs/core-testing/iproute2/libdir.patch deleted file mode 100644 index 4e5671a..0000000 --- a/abs/core-testing/iproute2/libdir.patch +++ /dev/null @@ -1,129 +0,0 @@ -Submitted By: Joe Ciccone -Date: 2008-09-31 -Upstream Status: Unknown -Origin: Joe Ciccone -Description: This patch gives the ability to change the libdir. - ---- iproute2-2.6.26.orig/Config 1969-12-31 19:00:00.000000000 -0500 -+++ iproute2-2.6.26/Config 2008-09-13 15:07:31.000000000 -0400 -@@ -0,0 +1 @@ -+# Generated config based on /usr/src/clfs-tarballs/conglomeration/iproute2-2.6.26/include -diff -Naur iproute2-2.6.26.orig/include/iptables.h iproute2-2.6.26/include/iptables.h ---- iproute2-2.6.26.orig/include/iptables.h 2008-07-25 16:46:07.000000000 -0400 -+++ iproute2-2.6.26/include/iptables.h 2008-09-13 15:43:33.000000000 -0400 -@@ -4,8 +4,12 @@ - #include "iptables_common.h" - #include "libiptc/libiptc.h" - -+#ifndef LIBDIR -+#define LIBDIR "/usr/lib" -+#endif -+ - #ifndef IPT_LIB_DIR --#define IPT_LIB_DIR "/usr/local/lib/iptables" -+#define IPT_LIB_DIR LIBDIR "/iptables" - #endif - - #ifndef IPPROTO_SCTP -diff -Naur iproute2-2.6.26.orig/ip/iplink.c iproute2-2.6.26/ip/iplink.c ---- iproute2-2.6.26.orig/ip/iplink.c 2008-07-25 16:46:07.000000000 -0400 -+++ iproute2-2.6.26/ip/iplink.c 2008-09-13 15:14:41.000000000 -0400 -@@ -34,7 +34,11 @@ - - #define IPLINK_IOCTL_COMPAT 1 - #ifndef DESTDIR --#define DESTDIR "/usr/" -+#define DESTDIR "/usr" -+#endif -+ -+#ifndef LIBDIR -+#define LIBDIR "/usr/lib" - #endif - - static void usage(void) __attribute__((noreturn)); -@@ -81,7 +85,7 @@ - if (strcmp(l->id, id) == 0) - return l; - -- snprintf(buf, sizeof(buf), DESTDIR "/lib/ip/link_%s.so", id); -+ snprintf(buf, sizeof(buf), DESTDIR LIBDIR "/ip/link_%s.so", id); - dlh = dlopen(buf, RTLD_LAZY); - if (dlh == NULL) { - /* look in current binary, only open once */ -diff -Naur iproute2-2.6.26.orig/Makefile iproute2-2.6.26/Makefile ---- iproute2-2.6.26.orig/Makefile 2008-07-25 16:46:07.000000000 -0400 -+++ iproute2-2.6.26/Makefile 2008-09-13 15:15:24.000000000 -0400 -@@ -1,13 +1,15 @@ --DESTDIR=/usr/ -+DESTDIR=/usr - SBINDIR=/sbin - CONFDIR=/etc/iproute2 - DOCDIR=/share/doc/iproute2 - MANDIR=/share/man - -+LIBDIR=/usr/lib -+ - # Path to db_185.h include - DBM_INCLUDE:=/usr/include - --DEFINES= -DRESOLVE_HOSTNAMES -DDESTDIR=\"$(DESTDIR)\" -+DEFINES= -DRESOLVE_HOSTNAMES -DDESTDIR=\"$(DESTDIR)\" -DLIBDIR=\"$(LIBDIR)\" - - #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc) - LDLIBS=-lresolv -diff -Naur iproute2-2.6.26.orig/netem/Makefile iproute2-2.6.26/netem/Makefile ---- iproute2-2.6.26.orig/netem/Makefile 2008-07-25 16:46:07.000000000 -0400 -+++ iproute2-2.6.26/netem/Makefile 2008-09-13 14:27:07.000000000 -0400 -@@ -20,9 +20,9 @@ - $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm - - install: all -- mkdir -p $(DESTDIR)/lib/tc -+ mkdir -p $(DESTDIR)$(LIBDIR)/tc - for i in $(DISTDATA); \ -- do install -m 755 $$i $(DESTDIR)/lib/tc; \ -+ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ - done - - clean: -diff -Naur iproute2-2.6.26.orig/tc/Makefile iproute2-2.6.26/tc/Makefile ---- iproute2-2.6.26.orig/tc/Makefile 2008-07-25 16:46:07.000000000 -0400 -+++ iproute2-2.6.26/tc/Makefile 2008-09-13 14:30:37.000000000 -0400 -@@ -72,10 +72,10 @@ - $(AR) rcs $@ $(TCLIB) - - install: all -- mkdir -p $(DESTDIR)/lib/tc -+ mkdir -p $(DESTDIR)$(LIBDIR)/tc - install -m 0755 tc $(DESTDIR)$(SBINDIR) - for i in $(TCSO); \ -- do install -m 755 $$i $(DESTDIR)/lib/tc; \ -+ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ - done - - clean: -diff -Naur iproute2-2.6.26.orig/tc/tc_util.c iproute2-2.6.26/tc/tc_util.c ---- iproute2-2.6.26.orig/tc/tc_util.c 2008-07-25 16:46:07.000000000 -0400 -+++ iproute2-2.6.26/tc/tc_util.c 2008-09-13 15:15:16.000000000 -0400 -@@ -25,7 +25,11 @@ - #include "tc_util.h" - - #ifndef DESTDIR --#define DESTDIR "/usr/" -+#define DESTDIR "/usr" -+#endif -+ -+#ifndef LIBDIR -+#define LIBDIR "/usr/lib" - #endif - - const char *get_tc_lib(void) -@@ -34,7 +38,7 @@ - - lib_dir = getenv("TC_LIB_DIR"); - if (!lib_dir) -- lib_dir = DESTDIR "/lib/tc"; -+ lib_dir = DESTDIR LIBDIR "/tc"; - - return lib_dir; - diff --git a/abs/core-testing/iproute2/tc.patch b/abs/core-testing/iproute2/tc.patch deleted file mode 100644 index e6d6276..0000000 --- a/abs/core-testing/iproute2/tc.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- tc/Makefile.old 2010-06-14 08:29:49.257421437 +0200 -+++ tc/Makefile 2010-06-14 08:30:07.157419977 +0200 -@@ -99,18 +99,11 @@ - $(AR) rcs $@ $(TCLIB) - - install: all -- echo mkdir -p $(MODDESTDIR) -- echo install -m 0755 tc $(DESTDIR)$(SBINDIR) -- for i in $(TCSO); \ -- do echo install -m 755 $$i $(MODDESTDIR); \ -- done -- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \ -- if [ -f $(MODDESTDIR)/m_xt.so ]; \ -- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \ -- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \ -- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \ -- fi; \ -- fi -+ mkdir -p $(DESTDIR)$(LIBDIR)/tc -+ install -m 0755 tc $(DESTDIR)$(SBINDIR) -+ for i in $(TCSO); \ -+ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ -+ done - - clean: - rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \ diff --git a/abs/core-testing/iptables/PKGBUILD b/abs/core-testing/iptables/PKGBUILD deleted file mode 100644 index c796285..0000000 --- a/abs/core-testing/iptables/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Thomas Baechler -pkgname=iptables -pkgver=1.4.1 -pkgrel=1 -pkgdesc="A Linux kernel packet control tool" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.netfilter.org/" -depends=('glibc') -source=(http://www.iptables.org/projects/iptables/files/iptables-$pkgver.tar.bz2 \ - iptables ip6tables empty.rules simple_firewall.rules iptables.conf.d) -md5sums=('e628f033b95741266a315d54fe73db9c' - '89401d6f0cf1de46a455b7be6720a58b' - '6e0e88c2ed0c3715d1409ee3258a0046' - '14186bbafe21bb0638c0cb8e0903c829' - 'e53a83bb4d8ac8b7eadd7bd58294751d' - 'c7cf6e4455c228e50d20ce3edd75ee59') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${startdir}/pkg install - install -D -m755 ../iptables $startdir/pkg/etc/rc.d/iptables - install -D -m755 ../ip6tables $startdir/pkg/etc/rc.d/ip6tables - install -D -m644 ../empty.rules $startdir/pkg/etc/iptables/empty.rules - install -D -m644 ../simple_firewall.rules $startdir/pkg/etc/iptables/simple_firewall.rules - install -D -m644 ../iptables.conf.d $startdir/pkg/etc/conf.d/iptables -} diff --git a/abs/core-testing/iptables/PKGBUILD.orig b/abs/core-testing/iptables/PKGBUILD.orig deleted file mode 100644 index b0182d8..0000000 --- a/abs/core-testing/iptables/PKGBUILD.orig +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Thomas Baechler -pkgname=iptables -pkgver=1.4.1 -pkgrel=1 -pkgdesc="A Linux kernel packet control tool" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.netfilter.org/" -depends=('glibc') -source=(http://www.iptables.org/projects/iptables/files/iptables-$pkgver.tar.bz2 \ - iptables ip6tables empty.rules simple_firewall.rules iptables.conf.d) -md5sums=('e628f033b95741266a315d54fe73db9c' - '89401d6f0cf1de46a455b7be6720a58b' - '6e0e88c2ed0c3715d1409ee3258a0046' - '14186bbafe21bb0638c0cb8e0903c829' - 'e53a83bb4d8ac8b7eadd7bd58294751d' - 'c7cf6e4455c228e50d20ce3edd75ee59') - -build() { - cd $startdir/src/$pkgname-$pkgver - sed -i 's|/usr/local|/usr|' Makefile - sed -i 's|MANDIR:=$(PREFIX)/man|MANDIR:=$(PREFIX)/share/man|' Makefile - # this seems to cause more problems than help - # sed -i "s:/usr/src/linux:/usr/src/linux\*:" Makefile - make KERNEL_DIR=/usr/src/linux-$(uname -r) || return 1 - make KERNEL_DIR=/usr/src/linux-$(uname -r) experimental || return 1 - make PREFIX=$startdir/pkg/usr KERNEL_DIR=/usr/src/linux-$(uname -r) install || return 1 - make PREFIX=$startdir/pkg/usr KERNEL_DIR=/usr/src/linux-$(uname -r) install-devel || return 1 - make PREFIX=$startdir/pkg/usr KERNEL_DIR=/usr/src/linux-$(uname -r) install-experimental || return 1 - install -D -m755 ../iptables $startdir/pkg/etc/rc.d/iptables - install -D -m755 ../ip6tables $startdir/pkg/etc/rc.d/ip6tables - install -D -m644 ../empty.rules $startdir/pkg/etc/iptables/empty.rules - install -D -m644 ../simple_firewall.rules $startdir/pkg/etc/iptables/simple_firewall.rules - install -D -m644 ../iptables.conf.d $startdir/pkg/etc/conf.d/iptables -} diff --git a/abs/core-testing/iptables/empty.rules b/abs/core-testing/iptables/empty.rules deleted file mode 100644 index e24e1aa..0000000 --- a/abs/core-testing/iptables/empty.rules +++ /dev/null @@ -1,6 +0,0 @@ -# Empty iptables rule file -*filter -:INPUT ACCEPT [0:0] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] -COMMIT diff --git a/abs/core-testing/iptables/ip6tables b/abs/core-testing/iptables/ip6tables deleted file mode 100755 index 1733db2..0000000 --- a/abs/core-testing/iptables/ip6tables +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables - -# Set defaults if settings are missing -[ -z "$IP6TABLES" ] && IP6TABLES=/usr/sbin/ip6tables -[ -z "$IP6TABLES_CONF" ] && IP6TABLES_CONF=/etc/iptables/ip6tables.rules - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - if [ ! -f $IP6TABLES_CONF ]; then - echo "Cannot load iptables rules: $IP6TABLES_CONF is missing!" >&2 - exit 1 - fi - stat_busy "Starting IP6 Tables" - if [ "$IPTABLES_FORWARD" = "1" ]; then - echo 1 >/proc/sys/net/ipv6/conf/default/forwarding - echo 1 >/proc/sys/net/ipv6/conf/all/forwarding - fi - if ck_daemon ip6tables; then - /usr/sbin/ip6tables-restore < $IP6TABLES_CONF - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ip6tables - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping IP6 Tables" - echo 0 >/proc/sys/net/ipv6/conf/all/forwarding - echo 0 >/proc/sys/net/ipv6/conf/default/forwarding - if ! ck_daemon ip6tables; then - fail=0 - for table in $(cat /proc/net/ip6_tables_names); do - $IP6TABLES -t $table -F &>/dev/null && \ - $IP6TABLES -t $table -X &>/dev/null && \ - $IP6TABLES -t $table -Z &>/dev/null - [ $? -gt 0 ] && fail=1 - done - if [ $fail -gt 0 ]; then - stat_fail - else - rm_daemon ip6tables - # reset policies - for table in filter mangle raw; do - if grep -qw $table /proc/net/ip6_tables_names; then - $IP6TABLES -t $table -P OUTPUT ACCEPT - fi - done - for table in filter mangle; do - if grep -qw $table /proc/net/ip6_tables_names; then - $IP6TABLES -t $table -P INPUT ACCEPT - $IP6TABLES -t $table -P FORWARD ACCEPT - fi - done - for table in mangle raw; do - if grep -qw $table /proc/net/ip6_tables_names; then - $IP6TABLES -t $table -P PREROUTING ACCEPT - fi - done - for table in mangle; do - if grep -qw $table /proc/net/ip6_tables_names; then - $IP6TABLES -t $table -P POSTROUTING ACCEPT - fi - done - stat_done - fi - else - stat_fail - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - save) - stat_busy "Saving IP6 Tables" - /usr/sbin/ip6tables-save >$IP6TABLES_CONF - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|save}" -esac -exit 0 diff --git a/abs/core-testing/iptables/iptables b/abs/core-testing/iptables/iptables deleted file mode 100755 index 50c13d5..0000000 --- a/abs/core-testing/iptables/iptables +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables - -# Set defaults if settings are missing -[ -z "$IPTABLES" ] && IPTABLES=/usr/sbin/iptables -[ -z "$IPTABLES_CONF" ] && IPTABLES_CONF=/etc/iptables/iptables.rules - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - if [ ! -f $IPTABLES_CONF ]; then - echo "Cannot load iptables rules: $IPTABLES_CONF is missing!" >&2 - exit 1 - fi - stat_busy "Starting IP Tables" - if [ "$IPTABLES_FORWARD" = "1" ]; then - echo 1 >/proc/sys/net/ipv4/ip_forward - fi - if ck_daemon iptables; then - /usr/sbin/iptables-restore < $IPTABLES_CONF - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon iptables - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping IP Tables" - echo 0 >/proc/sys/net/ipv4/ip_forward - if ! ck_daemon iptables; then - fail=0 - for table in $(cat /proc/net/ip_tables_names); do - $IPTABLES -t $table -F &>/dev/null && \ - $IPTABLES -t $table -X &>/dev/null && \ - $IPTABLES -t $table -Z &>/dev/null - [ $? -gt 0 ] && fail=1 - done - if [ $fail -gt 0 ]; then - stat_fail - else - rm_daemon iptables - # reset policies - for table in filter nat mangle raw; do - if grep -qw $table /proc/net/ip_tables_names; then - $IPTABLES -t $table -P OUTPUT ACCEPT - fi - done - for table in filter mangle; do - if grep -qw $table /proc/net/ip_tables_names; then - $IPTABLES -t $table -P INPUT ACCEPT - $IPTABLES -t $table -P FORWARD ACCEPT - fi - done - for table in nat mangle raw; do - if grep -qw $table /proc/net/ip_tables_names; then - $IPTABLES -t $table -P PREROUTING ACCEPT - fi - done - for table in nat mangle; do - if grep -qw $table /proc/net/ip_tables_names; then - $IPTABLES -t $table -P POSTROUTING ACCEPT - fi - done - stat_done - fi - else - stat_fail - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - save) - stat_busy "Saving IP Tables" - /usr/sbin/iptables-save >$IPTABLES_CONF - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|save}" -esac -exit 0 diff --git a/abs/core-testing/iptables/iptables.conf.d b/abs/core-testing/iptables/iptables.conf.d deleted file mode 100644 index e9afea2..0000000 --- a/abs/core-testing/iptables/iptables.conf.d +++ /dev/null @@ -1,8 +0,0 @@ -# Configuration for iptables rules - -IPTABLES=/usr/sbin/iptables -IP6TABLES=/usr/sbin/ip6tables - -IPTABLES_CONF=/etc/iptables/iptables.rules -IP6TABLES_CONF=/etc/iptables/ip6tables.rules -IPTABLES_FORWARD=1 # enable IP forwarding? diff --git a/abs/core-testing/iptables/simple_firewall.rules b/abs/core-testing/iptables/simple_firewall.rules deleted file mode 100644 index e1604cc..0000000 --- a/abs/core-testing/iptables/simple_firewall.rules +++ /dev/null @@ -1,11 +0,0 @@ -*filter -:INPUT DROP [0:0] -:FORWARD DROP [0:0] -:OUTPUT ACCEPT [0:0] --A INPUT -p icmp -j ACCEPT --A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT --A INPUT -i lo -j ACCEPT --A INPUT -p tcp -j REJECT --reject-with tcp-reset --A INPUT -p udp -j REJECT --reject-with icmp-port-unreachable --A INPUT -j REJECT --reject-with icmp-proto-unreachable -COMMIT diff --git a/abs/core-testing/iputils/PKGBUILD b/abs/core-testing/iputils/PKGBUILD deleted file mode 100644 index 341158b..0000000 --- a/abs/core-testing/iputils/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Aaron Griffin - -pkgname=iputils -pkgver=20070202 -_traceroutever=1.4a12 -pkgrel=13 -pkgdesc="IP Configuration Utilities (and Ping)" -arch=(i686 x86_64) -license=('GPL') -url="ftp://ftp.inr.ac.ru/ip-routing/" -groups=('base') -depends=('glibc') -makedepends=('jade') -conflicts=('netkit-base' 'arping' 'netkit-tftpd' 'traceroute') -replaces=('netkit-base' 'traceroute') -source=(http://www.skbuff.net/iputils/$pkgname-s$pkgver.tar.bz2 - ftp://ftp.ee.lbl.gov/traceroute-$_traceroutever.tar.gz - iputils-20070202-no-open-max.patch) -options=(!makeflags) -md5sums=('1d38fb3cfc2b71496e43cf646bfc1d6e' - '964d599ef696efccdeebe7721cd4828d' - 'a2cbc0174dd883f68297aa7f3e7c4f5c') - -build() -{ - #build iptuils - cd $startdir/src/$pkgname-s$pkgver - patch -Np1 -i ../iputils-20070202-no-open-max.patch || return 1 - make KERNEL_INCLUDE=/usr/include || return 1 # for i686 - for i in arping clockdiff rarpd rdisc tftpd tracepath tracepath6; do - install -D -m755 $i $startdir/pkg/usr/sbin/$i - done - for i in ping ping6 traceroute6; do - install -D -m4755 $i $startdir/pkg/bin/$i - done - - msg ":: building docs" - # good god, these docs are a pain - # special thanks to Michael(tm) Smith - http://people.w3.org/mike/ - # from #docbook on freenode.org for figuring this out - cd doc - for file in *.sgml; do - xf=${file/.sgml/.xml} - sx -xlower -xno-nl-in-tag $file > $xf - sed -i "s|\(.*\), \(.*\)|\1, \2|g" $xf - xsltproc /usr/share/xml/docbook/xsl-stylesheets-1.73.1/manpages/docbook.xsl $xf - done - - mkdir -p $startdir/pkg/usr/man/man8 - install -m644 arping.8 clockdiff.8 ping.8 ping6.8 rarpd.8 rdisc.8 \ - tftpd.8 tracepath.8 tracepath6.8 traceroute6 \ - $startdir/pkg/usr/man/man8/ - #make man - #for i in arping clockdiff ping rarpd rdisc tftpd tracepath traceroute6; do - # install -D -m644 $i.8 $startdir/pkg/usr/man/man8/$i.8 - #done - - # build traceroute - # this is combined in this package because it's awkward as a separate package - cd ${startdir}/src/traceroute-$_traceroutever - ./configure --prefix=/usr --sbindir=/bin - #if [ "${CARCH}" = "x86_64" ]; then - make CFLAGS="${CFLAGS} -Ilinux-include/" || return 1 - #else - # make || return 1 - #fi - make DESTDIR=${startdir}/pkg install install-man - - chmod 4775 ${startdir}/pkg/bin/traceroute -} - diff --git a/abs/core-testing/iputils/iputils-20070202-no-open-max.patch b/abs/core-testing/iputils/iputils-20070202-no-open-max.patch deleted file mode 100644 index 5013ba4..0000000 --- a/abs/core-testing/iputils/iputils-20070202-no-open-max.patch +++ /dev/null @@ -1,16 +0,0 @@ -the OPEN_MAX define has been removed in newer kernel headers so use the -proper method of getting the value dynamically - -http://bugs.gentoo.org/195861 - ---- a/rdisc.c -+++ b/rdisc.c -@@ -247,7 +247,7 @@ void do_fork(void) - if ((pid=fork()) != 0) - exit(0); - -- for (t = 0; t < OPEN_MAX; t++) -+ for (t = 0; t < sysconf(_SC_OPEN_MAX); t++) - if (t != s) - close(t); - diff --git a/abs/core-testing/iputils/iputils-big-patches.patch b/abs/core-testing/iputils/iputils-big-patches.patch deleted file mode 100644 index 29bc310..0000000 --- a/abs/core-testing/iputils/iputils-big-patches.patch +++ /dev/null @@ -1,595 +0,0 @@ -diff -Naur iputils.orig/Makefile iputils/Makefile ---- iputils.orig/Makefile 2002-11-09 03:01:11.000000000 +0000 -+++ iputils/Makefile 2005-06-09 16:15:32.000000000 +0000 -@@ -17,11 +17,6 @@ - GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h - endif - --ifeq ($(KERNEL_INCLUDE)/linux/pfkeyv2.h,$(wildcard $(KERNEL_INCLUDE)/linux/pfkeyv2.h)) -- SUBDIRS=libipsec setkey -- LDLIBS+=-Llibipsec -lipsec -- IPSECDEF=-DDO_IPSEC -Ilibipsec --endif - - - #options if you compile with libc5, and without a bind>=4.9.4 libresolv -@@ -31,7 +26,7 @@ - # What a pity, all new gccs are buggy and -Werror does not work. Sigh. - #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror - CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g --CFLAGS=$(CCOPT) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(IPSECDEF) $(DEFINES) -+CFLAGS=$(CCOPT) -I../include $(IPSECDEF) $(DEFINES) - - IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd - IPV6_TARGETS=tracepath6 traceroute6 ping6 -@@ -42,7 +37,11 @@ - - tftpd: tftpd.o tftpsubs.o - ping: ping.o ping_common.o -+ $(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro - ping6: ping6.o ping_common.o -+ $(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro -+traceroute6: traceroute6.o -+ $(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro - ping.o ping6.o ping_common.o: ping_common.h - tftpd.o tftpsubs.o: tftp.h - -diff -Naur iputils.orig/arping.c iputils/arping.c ---- iputils.orig/arping.c 2001-10-05 22:42:47.000000000 +0000 -+++ iputils/arping.c 2005-06-09 16:15:24.000000000 +0000 -@@ -9,6 +9,7 @@ - * Authors: Alexey Kuznetsov, - */ - -+#include - #include - #include - #include -@@ -19,6 +20,8 @@ - #include - #include - #include -+#include -+#include - #include - - #include -diff -Naur iputils.orig/clockdiff.c iputils/clockdiff.c ---- iputils.orig/clockdiff.c 2002-02-23 00:10:59.000000000 +0000 -+++ iputils/clockdiff.c 2005-06-09 16:15:24.000000000 +0000 -@@ -1,7 +1,9 @@ -+#include - #include - #include - #include - #include -+#include - #include - #include - #include -diff -Naur iputils.orig/include-glibc/netinet/in.h iputils/include-glibc/netinet/in.h ---- iputils.orig/include-glibc/netinet/in.h 2002-11-09 00:22:25.000000000 +0000 -+++ iputils/include-glibc/netinet/in.h 2005-06-09 16:15:00.000000000 +0000 -@@ -65,4 +65,45 @@ - && (((__const uint32_t *) (a))[3] == ((__const uint32_t *) (b))[3])) - - --#endif /* netinet/in.h */ -+/* Functions to convert between host and network byte order. -+ -+ Please note that these functions normally take `unsigned long int' or -+ `unsigned short int' values as arguments and also return them. But -+ this was a short-sighted decision since on different systems the types -+ may have different representations but the values are always the same. */ -+ -+extern u_int32_t ntohl (u_int32_t __netlong) __THROW __attribute__ ((__const__)); -+extern u_int16_t ntohs (u_int16_t __netshort) -+ __THROW __attribute__ ((__const__)); -+extern u_int32_t htonl (u_int32_t __hostlong) -+ __THROW __attribute__ ((__const__)); -+extern u_int16_t htons (u_int16_t __hostshort) -+ __THROW __attribute__ ((__const__)); -+ -+#include -+ -+/* Get machine dependent optimized versions of byte swapping functions. */ -+#include -+ -+#ifdef __OPTIMIZE__ -+/* We can optimize calls to the conversion functions. Either nothing has -+ to be done or we are using directly the byte-swapping functions which -+ often can be inlined. */ -+# if __BYTE_ORDER == __BIG_ENDIAN -+/* The host byte order is the same as network byte order, -+ so these functions are all just identity. */ -+# define ntohl(x) (x) -+# define ntohs(x) (x) -+# define htonl(x) (x) -+# define htons(x) (x) -+# else -+# if __BYTE_ORDER == __LITTLE_ENDIAN -+# define ntohl(x) __bswap_32 (x) -+# define ntohs(x) __bswap_16 (x) -+# define htonl(x) __bswap_32 (x) -+# define htons(x) __bswap_16 (x) -+# endif -+# endif -+#endif -+ -+#endif /* netinet/in.h */ -diff -Naur iputils.orig/ipg iputils/ipg ---- iputils.orig/ipg 2001-08-02 22:37:32.000000000 +0000 -+++ iputils/ipg 2005-06-09 16:14:49.000000000 +0000 -@@ -1,21 +1,31 @@ --#! /bin/bash -+#!/bin/bash - --modprobe pg3 -+modprobe pg3 >& /dev/null -+modprobe pktgen >& /dev/null -+ -+PGDEV=/proc/net/pg -+if [[ ! -e ${PGDEV} ]] ; then -+ PGDEV=/proc/net/pktgen/pg0 -+ if [[ ! -e ${PGDEV} ]] ; then -+ echo "Couldn't not locate pg in /proc/net :(" -+ exit 1 -+ fi -+fi - - function pgset() { - local result - -- echo $1 > /proc/net/pg -+ echo $1 > ${PGDEV} - -- result=`cat /proc/net/pg | fgrep "Result: OK:"` -+ result=`cat ${PGDEV} | fgrep "Result: OK:"` - if [ "$result" = "" ]; then -- cat /proc/net/pg | fgrep Result: -+ cat ${PGDEV} | fgrep Result: - fi - } - - function pg() { -- echo inject > /proc/net/pg -- cat /proc/net/pg -+ echo inject > ${PGDEV} -+ cat ${PGDEV} - } - - pgset "odev eth0" -diff -Naur iputils.orig/ping.c iputils/ping.c ---- iputils.orig/ping.c 2002-11-07 22:53:21.000000000 +0000 -+++ iputils/ping.c 2005-06-09 16:15:00.000000000 +0000 -@@ -60,8 +60,8 @@ - - #include "ping_common.h" - -+#include - #include --#include - #ifdef DO_IPSEC - #include - #endif -@@ -1213,7 +1213,7 @@ - once = 1; - - /* Patch bpflet for current identifier. */ -- insns[2] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __constant_htons(ident), 0, 1); -+ insns[2] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, htons(ident), 0, 1); - - if (setsockopt(icmp_sock, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter))) - perror("WARNING: failed to install socket filter\n"); -diff -Naur iputils.orig/ping6.c iputils/ping6.c ---- iputils.orig/ping6.c 2002-09-20 15:08:11.000000000 +0000 -+++ iputils/ping6.c 2005-06-09 16:15:00.000000000 +0000 -@@ -68,8 +68,44 @@ - */ - #include "ping_common.h" - --#include --#include -+struct ipv6_rt_hdr { -+ __u8 nexthdr; -+ __u8 hdrlen; -+ __u8 type; -+ __u8 segments_left; -+ -+ /* -+ * type specific data -+ * variable length field -+ */ -+}; -+ -+struct rt0_hdr { -+ struct ipv6_rt_hdr rt_hdr; -+ __u32 bitmap; /* strict/loose bit map */ -+ struct in6_addr addr[0]; -+ -+#define rt0_type rt_hdr.type; -+}; -+#define IPV6_SRCRT_TYPE_0 0 /* IPv6 type 0 Routing Header */ -+struct ipv6hdr { -+#if defined(__LITTLE_ENDIAN) -+ __u8 priority:4, -+ version:4; -+#elif defined(__BIG_ENDIAN) -+ __u8 version:4, -+ priority:4; -+#endif -+ __u8 flow_lbl[3]; -+ -+ __u16 payload_len; -+ __u8 nexthdr; -+ __u8 hop_limit; -+ -+ struct in6_addr saddr; -+ struct in6_addr daddr; -+}; -+ - #include - - #define BIT_CLEAR(nr, addr) do { ((__u32 *)(addr))[(nr) >> 5] &= ~(1U << ((nr) & 31)); } while(0) -@@ -879,7 +915,7 @@ - once = 1; - - /* Patch bpflet for current identifier. */ -- insns[1] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __constant_htons(ident), 0, 1); -+ insns[1] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, htons(ident), 0, 1); - - if (setsockopt(icmp_sock, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter))) - perror("WARNING: failed to install socket filter\n"); -diff -Naur iputils.orig/ping_common.h iputils/ping_common.h ---- iputils.orig/ping_common.h 2002-09-20 15:08:11.000000000 +0000 -+++ iputils/ping_common.h 2005-06-09 16:15:24.000000000 +0000 -@@ -1,3 +1,4 @@ -+#include - #include - #include - #include -@@ -19,6 +20,7 @@ - - #include - #include -+#include - #include - - #include "SNAPSHOT.h" -diff -Naur iputils.orig/rarpd.c iputils/rarpd.c ---- iputils.orig/rarpd.c 2001-12-02 18:45:06.000000000 +0000 -+++ iputils/rarpd.c 2005-06-09 16:15:24.000000000 +0000 -@@ -9,6 +9,7 @@ - * Authors: Alexey Kuznetsov, - */ - -+#include - #include - #include - #include -@@ -26,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -42,7 +44,9 @@ - char *ifname; - char *tftp_dir = "/etc/tftpboot"; - -+#ifndef __UCLIBC__ - extern int ether_ntohost(char *name, unsigned char *ea); -+#endif - void usage(void) __attribute__((noreturn)); - - struct iflink -@@ -52,12 +56,12 @@ - int hatype; - unsigned char lladdr[16]; - unsigned char name[IFNAMSIZ]; -- struct ifaddr *ifa_list; -+ struct l_ifaddr *ifa_list; - } *ifl_list; - --struct ifaddr -+struct l_ifaddr - { -- struct ifaddr *next; -+ struct l_ifaddr *next; - __u32 prefix; - __u32 mask; - __u32 local; -@@ -89,7 +93,7 @@ - int fd; - struct ifreq *ifrp, *ifend; - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - struct ifconf ifc; - struct ifreq ibuf[256]; - -@@ -180,7 +184,7 @@ - if (ifa == NULL) { - if (mask == 0 || prefix == 0) - continue; -- ifa = (struct ifaddr*)malloc(sizeof(*ifa)); -+ ifa = (struct l_ifaddr*)malloc(sizeof(*ifa)); - memset(ifa, 0, sizeof(*ifa)); - ifa->local = addr; - ifa->prefix = prefix; -@@ -236,10 +240,10 @@ - return dent != NULL; - } - --struct ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist) -+struct l_ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist) - { - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - int retry = 0; - int i; - -@@ -295,7 +299,7 @@ - - if (r == NULL) { - if (hatype == ARPHRD_ETHER && halen == 6) { -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - struct hostent *hp; - char ename[256]; - static struct rarp_map emap = { -@@ -305,7 +309,11 @@ - 6, - }; - -+#ifndef __UCLIBC__ - if (ether_ntohost(ename, lladdr) != 0 || -+#else -+ if ( -+#endif - (hp = gethostbyname(ename)) == NULL) { - if (verbose) - syslog(LOG_INFO, "not found in /etc/ethers"); -@@ -364,7 +372,7 @@ - { - __u32 laddr = 0; - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - - for (ifl=ifl_list; ifl; ifl = ifl->next) - if (ifl->index == ifindex) -diff -Naur iputils.orig/rdisc.c iputils/rdisc.c ---- iputils.orig/rdisc.c 2001-08-24 17:39:00.000000000 +0000 -+++ iputils/rdisc.c 2005-06-09 16:15:24.000000000 +0000 -@@ -25,6 +25,7 @@ - * 2550 Garcia Avenue - * Mountain View, California 94043 - */ -+#include - #include - #include - #include -@@ -1504,5 +1505,5 @@ - if (logging) - syslog(LOG_ERR, "%s: %m", str); - else -- (void) fprintf(stderr, "%s: %s\n", str, sys_errlist[errno]); -+ (void) fprintf(stderr, "%s: %s\n", str, strerror(errno)); - } -diff -Naur iputils.orig/tftpd.c iputils/tftpd.c ---- iputils.orig/tftpd.c 2002-01-24 00:31:41.000000000 +0000 -+++ iputils/tftpd.c 2005-06-09 16:15:24.000000000 +0000 -@@ -48,6 +48,7 @@ - * This version includes many modifications by Jim Guyton - */ - -+#include - #include - #include - #include -@@ -57,7 +58,6 @@ - - #include - #include --#include - #include - - #include -diff -Naur iputils.orig/tracepath.c iputils/tracepath.c ---- iputils.orig/tracepath.c 2002-11-09 04:54:46.000000000 +0000 -+++ iputils/tracepath.c 2005-06-09 16:15:24.000000000 +0000 -@@ -9,10 +9,12 @@ - * Authors: Alexey Kuznetsov, - */ - -+#include - #include - #include - #include - #include -+#include - #include - #include - #include -@@ -76,7 +78,7 @@ - int progress = -1; - int broken_router; - --restart: -+ while (1) { - memset(&rcvbuf, -1, sizeof(rcvbuf)); - iov.iov_base = &rcvbuf; - iov.iov_len = sizeof(rcvbuf); -@@ -93,7 +95,7 @@ - if (res < 0) { - if (errno == EAGAIN) - return progress; -- goto restart; -+ continue; - } - - progress = mtu; -@@ -216,7 +218,7 @@ - perror("NET ERROR"); - return 0; - } -- goto restart; -+ } - } - - int probe_ttl(int fd, int ttl) -@@ -227,7 +229,6 @@ - - memset(sndbuf,0,mtu); - --restart: - for (i=0; i<10; i++) { - int res; - -@@ -243,7 +244,8 @@ - if (res==0) - return 0; - if (res > 0) -- goto restart; -+ i = 0; -+ continue; - } - hisptr = (hisptr + 1)&63; - -diff -Naur iputils.orig/tracepath6.c iputils/tracepath6.c ---- iputils.orig/tracepath6.c 2001-09-02 02:03:46.000000000 +0000 -+++ iputils/tracepath6.c 2005-06-09 16:15:24.000000000 +0000 -@@ -9,13 +9,13 @@ - * Authors: Alexey Kuznetsov, - */ - -+#include - #include - #include - #include - #include - #include -- --#include -+#include - #include - #include - #include -@@ -66,7 +66,7 @@ - int progress = -1; - int broken_router; - --restart: -+ while (1) { - memset(&rcvbuf, -1, sizeof(rcvbuf)); - iov.iov_base = &rcvbuf; - iov.iov_len = sizeof(rcvbuf); -@@ -83,7 +83,7 @@ - if (res < 0) { - if (errno == EAGAIN) - return progress; -- goto restart; -+ continue; - } - - progress = 2; -@@ -222,34 +222,29 @@ - perror("NET ERROR"); - return 0; - } -- goto restart; -+ } - } - - int probe_ttl(int fd, int ttl) - { -- int i; -+ int i=0, res; - char sndbuf[mtu]; - struct probehdr *hdr = (struct probehdr*)sndbuf; - --restart: -- -- for (i=0; i<10; i++) { -- int res; -- -- hdr->ttl = ttl; -- gettimeofday(&hdr->tv, NULL); -- if (send(fd, sndbuf, mtu-overhead, 0) > 0) -- break; -- res = recverr(fd, ttl); -- if (res==0) -- return 0; -- if (res > 0) -- goto restart; -- } -- -- if (i<10) { -- int res; -- -+ while (i<10) { -+ for (i=0; i<10; i++) { -+ hdr->ttl = ttl; -+ gettimeofday(&hdr->tv, NULL); -+ if (send(fd, sndbuf, mtu-overhead, 0) > 0) -+ break; -+ res = recverr(fd, ttl); -+ if (res==0) -+ return 0; -+ if (res > 0) { -+ i = 0; -+ continue; -+ } -+ } - data_wait(fd); - if (recv(fd, sndbuf, sizeof(sndbuf), MSG_DONTWAIT) > 0) { - printf("%2d?: reply received 8)\n", ttl); -@@ -257,7 +252,7 @@ - } - res = recverr(fd, ttl); - if (res == 1) -- goto restart; -+ continue; - return res; - } - -diff -Naur iputils.orig/traceroute6.c iputils/traceroute6.c ---- iputils.orig/traceroute6.c 2002-10-03 03:29:23.000000000 +0000 -+++ iputils/traceroute6.c 2005-06-09 16:14:49.000000000 +0000 -@@ -244,11 +244,30 @@ - #include - #include - #include -+#if __linux__ -+#include -+#else - #include -+#endif -+ -+#include -+struct ipv6hdr { -+#if defined(__LITTLE_ENDIAN) -+ __u8 priority:4, -+ version:4; -+#elif defined(__BIG_ENDIAN) -+ __u8 version:4, -+ priority:4; -+#endif -+ __u8 flow_lbl[3]; - --#include --#include -+ __u16 payload_len; -+ __u8 nexthdr; -+ __u8 hop_limit; - -+ struct in6_addr saddr; -+ struct in6_addr daddr; -+}; - #include - - #include diff --git a/abs/core-testing/iputils/iputils-ss021109-try.patch b/abs/core-testing/iputils/iputils-ss021109-try.patch deleted file mode 100644 index 4d9a705..0000000 --- a/abs/core-testing/iputils/iputils-ss021109-try.patch +++ /dev/null @@ -1,239 +0,0 @@ -diff -urN iputils.orig/Makefile iputils/Makefile ---- iputils.orig/Makefile 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/Makefile 2004-05-02 20:30:48.000000000 +0000 -@@ -1,5 +1,4 @@ - # Path to parent kernel include files directory --KERNEL_INCLUDE=/usr/src/linux/include - LIBC_INCLUDE=/usr/include - - DEFINES= -@@ -8,21 +7,6 @@ - LDLIBS=-lresolv - ADDLIB= - --ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h)) -- ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h)) -- GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h -- endif --endif --ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h)) -- GLIBCFIX=-Iinclude-glibc -include include-glibc/glibc-bugs.h --endif -- --ifeq ($(KERNEL_INCLUDE)/linux/pfkeyv2.h,$(wildcard $(KERNEL_INCLUDE)/linux/pfkeyv2.h)) -- SUBDIRS=libipsec setkey -- LDLIBS+=-Llibipsec -lipsec -- IPSECDEF=-DDO_IPSEC -Ilibipsec --endif -- - - #options if you compile with libc5, and without a bind>=4.9.4 libresolv - # NOT AVAILABLE. Please, use libresolv. -@@ -31,13 +15,13 @@ - # What a pity, all new gccs are buggy and -Werror does not work. Sigh. - #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror - CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g --CFLAGS=$(CCOPT) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(IPSECDEF) $(DEFINES) -+CFLAGS=$(CCOPT) -I../include $(IPSECDEF) $(DEFINES) - - IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd - IPV6_TARGETS=tracepath6 traceroute6 ping6 - TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) - --all: check-kernel subdirs $(TARGETS) -+all: subdirs $(TARGETS) - - - tftpd: tftpd.o tftpsubs.o -@@ -51,15 +35,6 @@ - rdisc_srv.o: rdisc.c - $(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c - --check-kernel: --ifeq ($(KERNEL_INCLUDE),) -- @echo "Please, set correct KERNEL_INCLUDE"; false --else -- @set -e; \ -- if [ ! -r $(KERNEL_INCLUDE)/linux/autoconf.h ]; then \ -- echo "Please, set correct KERNEL_INCLUDE"; false; fi --endif -- - subdirs: - ifneq ($(SUBDIRS),) - @set -e; \ -diff -urN iputils.orig/arping.c iputils/arping.c ---- iputils.orig/arping.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/arping.c 2004-05-02 20:32:38.000000000 +0000 -@@ -9,6 +9,7 @@ - * Authors: Alexey Kuznetsov, - */ - -+#include - #include - #include - #include -@@ -19,6 +20,8 @@ - #include - #include - #include -+#include -+#include - #include - - #include -diff -urN iputils.orig/clockdiff.c iputils/clockdiff.c ---- iputils.orig/clockdiff.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/clockdiff.c 2004-05-02 20:30:48.000000000 +0000 -@@ -1,3 +1,4 @@ -+#include - #include - #include - #include -diff -urN iputils.orig/ping.c iputils/ping.c ---- iputils.orig/ping.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/ping.c 2004-05-02 20:31:03.000000000 +0000 -@@ -61,7 +61,7 @@ - #include "ping_common.h" - - #include --#include -+#include - #ifdef DO_IPSEC - #include - #endif -diff -urN iputils.orig/ping_common.h iputils/ping_common.h ---- iputils.orig/ping_common.h 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/ping_common.h 2004-05-02 20:30:48.000000000 +0000 -@@ -1,3 +1,4 @@ -+#include - #include - #include - #include -diff -urN iputils.orig/rarpd.c iputils/rarpd.c ---- iputils.orig/rarpd.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/rarpd.c 2004-05-02 20:33:07.000000000 +0000 -@@ -9,6 +9,7 @@ - * Authors: Alexey Kuznetsov, - */ - -+#include - #include - #include - #include -@@ -26,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -52,12 +54,12 @@ - int hatype; - unsigned char lladdr[16]; - unsigned char name[IFNAMSIZ]; -- struct ifaddr *ifa_list; -+ struct l_ifaddr *ifa_list; - } *ifl_list; - --struct ifaddr -+struct l_ifaddr - { -- struct ifaddr *next; -+ struct l_ifaddr *next; - __u32 prefix; - __u32 mask; - __u32 local; -@@ -89,7 +91,7 @@ - int fd; - struct ifreq *ifrp, *ifend; - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - struct ifconf ifc; - struct ifreq ibuf[256]; - -@@ -180,7 +182,7 @@ - if (ifa == NULL) { - if (mask == 0 || prefix == 0) - continue; -- ifa = (struct ifaddr*)malloc(sizeof(*ifa)); -+ ifa = (struct l_ifaddr*)malloc(sizeof(*ifa)); - memset(ifa, 0, sizeof(*ifa)); - ifa->local = addr; - ifa->prefix = prefix; -@@ -236,10 +238,10 @@ - return dent != NULL; - } - --struct ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist) -+struct l_ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist) - { - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - int retry = 0; - int i; - -@@ -295,7 +297,7 @@ - - if (r == NULL) { - if (hatype == ARPHRD_ETHER && halen == 6) { -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - struct hostent *hp; - char ename[256]; - static struct rarp_map emap = { -@@ -364,7 +366,7 @@ - { - __u32 laddr = 0; - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct l_ifaddr *ifa; - - for (ifl=ifl_list; ifl; ifl = ifl->next) - if (ifl->index == ifindex) -diff -urN iputils.orig/rdisc.c iputils/rdisc.c ---- iputils.orig/rdisc.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/rdisc.c 2004-05-02 20:30:48.000000000 +0000 -@@ -25,6 +25,7 @@ - * 2550 Garcia Avenue - * Mountain View, California 94043 - */ -+#include - #include - #include - #include -diff -urN iputils.orig/tftpd.c iputils/tftpd.c ---- iputils.orig/tftpd.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/tftpd.c 2004-05-02 20:30:48.000000000 +0000 -@@ -48,6 +48,7 @@ - * This version includes many modifications by Jim Guyton - */ - -+#include - #include - #include - #include -diff -urN iputils.orig/tracepath.c iputils/tracepath.c ---- iputils.orig/tracepath.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/tracepath.c 2004-05-02 20:30:48.000000000 +0000 -@@ -9,6 +9,7 @@ - * Authors: Alexey Kuznetsov, - */ - -+#include - #include - #include - #include -diff -urN iputils.orig/traceroute6.c iputils/traceroute6.c ---- iputils.orig/traceroute6.c 2004-05-02 20:30:43.000000000 +0000 -+++ iputils/traceroute6.c 2004-05-02 20:30:48.000000000 +0000 -@@ -230,6 +230,7 @@ - * Tue Dec 20 03:50:13 PST 1988 - */ - -+#include - #include - #include - #include diff --git a/abs/core-testing/iputils/iputils.patch b/abs/core-testing/iputils/iputils.patch deleted file mode 100644 index 4e99b75..0000000 --- a/abs/core-testing/iputils/iputils.patch +++ /dev/null @@ -1,1170 +0,0 @@ ---- iputils/ping_common.c.old Thu Mar 14 16:58:47 2002 -+++ iputils/ping_common.c Thu Mar 14 17:10:54 2002 -@@ -775,10 +775,10 @@ - tmdev = llsqrt(tsum2 - tsum * tsum); - - printf("rtt min/avg/max/mdev = %ld.%03ld/%lu.%03ld/%ld.%03ld/%ld.%03ld ms", -- tmin/1000, tmin%1000, -+ (long)tmin/1000, (long)tmin%1000, - (unsigned long)(tsum/1000), (long)(tsum%1000), -- tmax/1000, tmax%1000, -- tmdev/1000, tmdev%1000 -+ (long)tmax/1000, (long)tmax%1000, -+ (long)tmdev/1000, (long)tmdev%1000 - ); - } - if (pipesize > 1) -@@ -809,10 +809,10 @@ - tavg = tsum / (nreceived + nrepeats); - - fprintf(stderr, ", min/avg/ewma/max = %ld.%03ld/%lu.%03ld/%d.%03d/%ld.%03ld ms", -- tmin/1000, tmin%1000, -+ (long)tmin/1000, (long)tmin%1000, - tavg/1000, tavg%1000, - rtt/8000, (rtt/8)%1000, -- tmax/1000, tmax%1000 -+ (long)tmax/1000, (long)tmax%1000 - ); - } - fprintf(stderr, "\n"); ---- iputils/rdisc.c-org Wed May 1 00:27:34 2002 -+++ iputils/rdisc.c Wed May 1 00:32:40 2002 -@@ -63,6 +63,8 @@ - - #include "SNAPSHOT.h" - -+#define RDISC_SERVER -+ - struct interface - { - struct in_addr address; /* Used to identify the interface */ -@@ -163,11 +165,8 @@ - int debugfile; - - char usage[] = --"Usage: rdisc [-b] [-d] [-s] [-v] [-f] [-a] [-V] [send_address] [receive_address]\n" --#ifdef RDISC_SERVER --" rdisc -r [-b] [-d] [-s] [-v] [-f] [-a] [-V] [-p ] [-T ] \n" --" [send_address] [receive_address]\n" --#endif -+"Usage: rdisc -r [-b] [-d] [-s] [-v] [-f] [-a] [-V] [-p ] [-T ] \n" -+" [send_address] [receive_address]\n" - ; - - -@@ -875,7 +874,9 @@ - ((max_adv_int - min_adv_int) - * (random() % 1000)/1000); - } else { -- if (!is_directly_connected(ip->saddr)) { -+ struct in_addr tmp; -+ tmp.s_addr = ip->saddr; -+ if (!is_directly_connected(tmp)) { - if (verbose) - logtrace("ICMP %s from %s: source not directly connected\n", - pr_type((int)icp->type), -@@ -945,7 +946,6 @@ - { - #ifdef RDISC_SERVER - if (responder) { -- int i; - - /* Send out a packet with a preference so that all - * hosts will know that we are dead. ---- iputils/ping_common.c.countermeasures Tue May 21 10:06:05 2002 -+++ iputils/ping_common.c Tue May 21 10:12:42 2002 -@@ -628,7 +628,8 @@ - tvsub(tv, &tmp_tv); - triptime = tv->tv_sec * 1000000 + tv->tv_usec; - if (triptime < 0) { -- fprintf(stderr, "Warning: time of day goes back (%ldus), taking countermeasures.\n", triptime); -+ if (options & F_VERBOSE) -+ fprintf(stderr, "Warning: time of day goes back (%ldus), taking countermeasures.\n", triptime); - triptime = 0; - if (!(options & F_LATENCY)) { - gettimeofday(tv, NULL); ---- iputils/ping.c.addrcache 2002-09-20 17:08:11.000000000 +0200 -+++ iputils/ping.c 2003-05-15 16:41:19.000000000 +0200 -@@ -1124,6 +1124,12 @@ - { - struct hostent *hp; - static char buf[4096]; -+ static __u32 addr_cache = 0; -+ -+ if ( addr == addr_cache ) -+ return buf; -+ -+ addr_cache = addr; - - if ((options & F_NUMERIC) || - !(hp = gethostbyaddr((char *)&addr, 4, AF_INET))) ---- iputils/ping6.c.addrcache 2002-09-20 17:08:11.000000000 +0200 -+++ iputils/ping6.c 2003-05-15 16:41:19.000000000 +0200 -@@ -893,7 +893,14 @@ - */ - char * pr_addr(struct in6_addr *addr) - { -- struct hostent *hp = NULL; -+ static struct hostent *hp = NULL; -+ static struct in6_addr addr_cache = {{{0,0,0,0}}}; -+ -+ if ( addr->s6_addr32[0] == addr_cache.s6_addr32[0] && -+ addr->s6_addr32[1] == addr_cache.s6_addr32[1] && -+ addr->s6_addr32[2] == addr_cache.s6_addr32[2] && -+ addr->s6_addr32[3] == addr_cache.s6_addr32[3] ) -+ return hp ? hp->h_name : pr_addr_n(addr); - - if (!(options&F_NUMERIC)) - hp = gethostbyaddr((__u8*)addr, sizeof(struct in6_addr), AF_INET6); ---- iputils-ss021109-vanilla/ping.c Thu Nov 7 23:53:21 2002 -+++ iputils/ping.c Sun Jan 12 03:39:24 2003 -@@ -285,6 +285,9 @@ - perror("ping: IP_MULTICAST_IF"); - exit(2); - } -+ } else if (icmp_sock >= 0) { -+ /* We possible tried to SO_BINDTODEVICE() a subinterface like 'eth0:1' */ -+ perror("Warning: cannot bind to specified iface, falling back"); - } - } - } ---- iputils/ping.c.icmp_seq 2003-09-03 16:45:07.000000000 +0200 -+++ iputils/ping.c 2003-09-03 16:45:41.000000000 +0200 -@@ -610,7 +610,7 @@ - icp->type = ICMP_ECHO; - icp->code = 0; - icp->checksum = 0; -- icp->un.echo.sequence = htons(ntransmitted+1); -+ icp->un.echo.sequence = htons(ntransmitted); - icp->un.echo.id = ident; /* ID */ - - CLR((ntransmitted+1) % mx_dup_ck); ---- iputils/ping6.c.icmp_seq 2003-09-03 16:45:20.000000000 +0200 -+++ iputils/ping6.c 2003-09-03 16:45:34.000000000 +0200 -@@ -647,7 +647,7 @@ - icmph->icmp6_type = ICMPV6_ECHO_REQUEST; - icmph->icmp6_code = 0; - icmph->icmp6_cksum = 0; -- icmph->icmp6_sequence = htons(ntransmitted+1); -+ icmph->icmp6_sequence = htons(ntransmitted); - icmph->icmp6_identifier = ident; - - CLR((ntransmitted+1) % mx_dup_ck); -diff -ru iputils/include-glibc/netinet/in.h iputils-clean/include-glibc/netinet/in.h ---- iputils/include-glibc/netinet/in.h 2000-06-18 14:57:25.000000000 -0400 -+++ iputils-clean/include-glibc/netinet/in.h 2003-09-03 11:21:55.000000000 -0400 -@@ -8,4 +8,45 @@ - - #define SOL_IP 0 - --#endif /* netinet/in.h */ -+/* Functions to convert between host and network byte order. -+ -+ Please note that these functions normally take `unsigned long int' or -+ `unsigned short int' values as arguments and also return them. But -+ this was a short-sighted decision since on different systems the types -+ may have different representations but the values are always the same. */ -+ -+extern u_int32_t ntohl (u_int32_t __netlong) __THROW __attribute__ ((__const__)); -+extern u_int16_t ntohs (u_int16_t __netshort) -+ __THROW __attribute__ ((__const__)); -+extern u_int32_t htonl (u_int32_t __hostlong) -+ __THROW __attribute__ ((__const__)); -+extern u_int16_t htons (u_int16_t __hostshort) -+ __THROW __attribute__ ((__const__)); -+ -+#include -+ -+/* Get machine dependent optimized versions of byte swapping functions. */ -+#include -+ -+#ifdef __OPTIMIZE__ -+/* We can optimize calls to the conversion functions. Either nothing has -+ to be done or we are using directly the byte-swapping functions which -+ often can be inlined. */ -+# if __BYTE_ORDER == __BIG_ENDIAN -+/* The host byte order is the same as network byte order, -+ so these functions are all just identity. */ -+# define ntohl(x) (x) -+# define ntohs(x) (x) -+# define htonl(x) (x) -+# define htons(x) (x) -+# else -+# if __BYTE_ORDER == __LITTLE_ENDIAN -+# define ntohl(x) __bswap_32 (x) -+# define ntohs(x) __bswap_16 (x) -+# define htonl(x) __bswap_32 (x) -+# define htons(x) __bswap_16 (x) -+# endif -+# endif -+#endif -+ -+#endif /* netinet/in.h */ -diff -ru iputils/ping6.c iputils-clean/ping6.c ---- iputils/ping6.c 2003-09-03 11:22:46.000000000 -0400 -+++ iputils-clean/ping6.c 2003-09-03 11:15:42.000000000 -0400 -@@ -879,7 +879,7 @@ - once = 1; - - /* Patch bpflet for current identifier. */ -- insns[1] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __constant_htons(ident), 0, 1); -+ insns[1] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, htons(ident), 0, 1); - - if (setsockopt(icmp_sock, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter))) - perror("WARNING: failed to install socket filter\n"); -diff -ru iputils/ping.c iputils-clean/ping.c ---- iputils/ping.c 2003-09-03 11:22:46.000000000 -0400 -+++ iputils-clean/ping.c 2003-09-03 11:15:26.000000000 -0400 -@@ -1196,7 +1196,7 @@ - once = 1; - - /* Patch bpflet for current identifier. */ -- insns[2] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __constant_htons(ident), 0, 1); -+ insns[2] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, htons(ident), 0, 1); - - if (setsockopt(icmp_sock, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter))) - perror("WARNING: failed to install socket filter\n"); -diff -urN iputils/clockdiff.c iputils.new/clockdiff.c ---- iputils/clockdiff.c 2002-02-22 19:10:59.000000000 -0500 -+++ iputils.new/clockdiff.c 2003-09-10 09:20:28.000000000 -0400 -@@ -2,6 +2,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -urN iputils/ping6.c iputils.new/ping6.c ---- iputils/ping6.c 2003-09-10 17:27:48.000000000 -0400 -+++ iputils.new/ping6.c 2003-09-10 17:22:43.000000000 -0400 -@@ -68,8 +68,44 @@ - */ - #include "ping_common.h" - --#include --#include -+struct ipv6_rt_hdr { -+ __u8 nexthdr; -+ __u8 hdrlen; -+ __u8 type; -+ __u8 segments_left; -+ -+ /* -+ * type specific data -+ * variable length field -+ */ -+}; -+ -+struct rt0_hdr { -+ struct ipv6_rt_hdr rt_hdr; -+ __u32 bitmap; /* strict/loose bit map */ -+ struct in6_addr addr[0]; -+ -+#define rt0_type rt_hdr.type; -+}; -+#define IPV6_SRCRT_TYPE_0 0 /* IPv6 type 0 Routing Header */ -+struct ipv6hdr { -+#if defined(__LITTLE_ENDIAN) -+ __u8 priority:4, -+ version:4; -+#elif defined(__BIG_ENDIAN) -+ __u8 version:4, -+ priority:4; -+#endif -+ __u8 flow_lbl[3]; -+ -+ __u16 payload_len; -+ __u8 nexthdr; -+ __u8 hop_limit; -+ -+ struct in6_addr saddr; -+ struct in6_addr daddr; -+}; -+ - #include - - #define BIT_CLEAR(nr, addr) do { ((__u32 *)(addr))[(nr) >> 5] &= ~(1U << ((nr) & 31)); } while(0) -diff -urN iputils/ping_common.h iputils.new/ping_common.h ---- iputils/ping_common.h 2002-09-20 11:08:11.000000000 -0400 -+++ iputils.new/ping_common.h 2003-09-10 17:16:16.000000000 -0400 -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - - #include "SNAPSHOT.h" -diff -urN iputils/tftpd.c iputils.new/tftpd.c ---- iputils/tftpd.c 2002-01-23 19:31:41.000000000 -0500 -+++ iputils.new/tftpd.c 2003-09-10 09:39:45.000000000 -0400 -@@ -57,7 +57,6 @@ - - #include - #include --#include - #include - - #include -diff -urN iputils/tracepath6.c iputils.new/tracepath6.c ---- iputils/tracepath6.c 2001-09-01 22:03:46.000000000 -0400 -+++ iputils.new/tracepath6.c 2003-09-10 09:40:18.000000000 -0400 -@@ -14,8 +14,7 @@ - #include - #include - #include -- --#include -+#include - #include - #include - #include -diff -urN iputils/tracepath.c iputils.new/tracepath.c ---- iputils/tracepath.c 2002-02-22 19:10:59.000000000 -0500 -+++ iputils.new/tracepath.c 2003-09-10 06:14:35.000000000 -0400 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -urN iputils/traceroute6.c iputils.new/traceroute6.c ---- iputils/traceroute6.c 2002-09-20 11:44:22.000000000 -0400 -+++ iputils.new/traceroute6.c 2003-09-10 10:12:47.000000000 -0400 -@@ -246,9 +246,24 @@ - #include - #include - --#include --#include -+#include -+struct ipv6hdr { -+#if defined(__LITTLE_ENDIAN) -+ __u8 priority:4, -+ version:4; -+#elif defined(__BIG_ENDIAN) -+ __u8 version:4, -+ priority:4; -+#endif -+ __u8 flow_lbl[3]; -+ -+ __u16 payload_len; -+ __u8 nexthdr; -+ __u8 hop_limit; - -+ struct in6_addr saddr; -+ struct in6_addr daddr; -+}; - #include - - #include ---- iputils/arping.c.unaligned 2001-10-06 00:42:47.000000000 +0200 -+++ iputils/arping.c 2003-10-02 15:14:42.000000000 +0200 -@@ -332,7 +332,7 @@ - timeout = atoi(optarg); - break; - case 'I': -- device = optarg; -+ device = strdup(optarg); - break; - case 'f': - quit_on_reply=1; ---- iputils/traceroute6.c.inet_pton 2004-04-22 15:06:28.268797480 +0200 -+++ iputils/traceroute6.c 2004-04-22 15:06:35.727877941 +0200 -@@ -538,7 +538,7 @@ - } else { - (void) bzero((char *)&saddr, sizeof(saddr)); - saddr.sin6_family = AF_INET6; -- if (inet_pton(AF_INET6, source, &saddr.sin6_addr) < 0) -+ if (inet_pton(AF_INET6, source, &saddr.sin6_addr) <= 0) - { - Printf("traceroute: unknown addr %s\n", source); - exit(1); ---- iputils/traceroute6.c.old 2004-12-07 11:08:57.000000000 +0100 -+++ iputils/traceroute6.c 2004-12-07 11:14:09.397575536 +0100 -@@ -352,8 +352,11 @@ - icmp_sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6); - socket_errno = errno; - -- setuid(getuid()); -- -+ if(setuid(getuid()) != 0) -+ { -+ perror("traceroute: setuid()"); -+ exit(-1); -+ } - on = 1; - seq = tos = 0; - to = (struct sockaddr_in6 *)&whereto; ---- iputils/ping6.c.old 2004-12-07 11:08:57.000000000 +0100 -+++ iputils/ping6.c 2004-12-07 11:13:40.707937024 +0100 -@@ -223,7 +223,11 @@ - socket_errno = errno; - - uid = getuid(); -- setuid(uid); -+ if(setuid(uid) != 0) -+ { -+ perror("ping: setuid()"); -+ exit(-1); -+ } - - source.sin6_family = AF_INET6; - memset(&firsthop, 0, sizeof(firsthop)); ---- iputils/ping.c.old 2004-12-07 11:08:57.000000000 +0100 -+++ iputils/ping.c 2004-12-07 11:13:27.523941296 +0100 -@@ -119,7 +119,11 @@ - socket_errno = errno; - - uid = getuid(); -- setuid(uid); -+ if(setuid(uid) != 0) -+ { -+ perror("ping: setuid()"); -+ exit(-1); -+ } - - source.sin_family = AF_INET; - ---- iputils/doc/ping.8.old 2002-09-27 19:12:47.000000000 +0200 -+++ iputils/doc/ping.8 2004-12-07 11:09:42.434160144 +0100 -@@ -112,7 +112,7 @@ - when finished. - .TP - \fB-R\fR --Record route. -+Record route. (IPv4 only) - Includes the RECORD_ROUTE option in the ECHO_REQUEST - packet and displays the route buffer on returned packets. - Note that the IP header is only large enough for nine such routes. ---- iputils/doc/ping.sgml.old 2002-09-20 14:55:50.000000000 +0200 -+++ iputils/doc/ping.sgml 2004-12-07 11:09:42.435159992 +0100 -@@ -190,7 +190,7 @@ - -