From 9664bee729d487bcc0a0bc35859f8e13d5421c75 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 26 Sep 2012 01:10:42 +0000 Subject: Slackware 14.0 Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-) --- source/README.TXT | 36 + source/a/aaa_base/aaa_base.SlackBuild | 10 +- source/a/aaa_base/os-release | 10 + source/a/aaa_base/slackware-version | 2 +- source/a/aaa_elflibs/aaa_elflibs.SlackBuild | 6 +- source/a/aaa_elflibs/symlinks-to-tracked-libs | 8 +- source/a/acl/acl.SlackBuild | 6 +- source/a/acpid/acpid.SlackBuild | 55 +- source/a/attr/attr.SlackBuild | 6 +- source/a/bash/bash-4.1-patches/bash41-001 | 48 - source/a/bash/bash-4.1-patches/bash41-002 | 65 - source/a/bash/bash-4.1-patches/bash41-003 | 48 - source/a/bash/bash-4.1-patches/bash41-004 | 47 - source/a/bash/bash-4.1-patches/bash41-005 | 56 - source/a/bash/bash-4.1-patches/bash41-006 | 76 - source/a/bash/bash-4.1-patches/bash41-007 | 47 - source/a/bash/bash-4.1-patches/bash41-008 | 49 - source/a/bash/bash-4.1-patches/bash41-009 | 48 - source/a/bash/bash-4.1-patches/bash41-010 | 68 - source/a/bash/bash-4.2-patches/bash42-001 | 78 + source/a/bash/bash-4.2-patches/bash42-002 | 60 + source/a/bash/bash-4.2-patches/bash42-003 | 318 + source/a/bash/bash-4.2-patches/bash42-004 | 53 + source/a/bash/bash-4.2-patches/bash42-005 | 131 + source/a/bash/bash-4.2-patches/bash42-006 | 46 + source/a/bash/bash-4.2-patches/bash42-007 | 46 + source/a/bash/bash-4.2-patches/bash42-008 | 74 + source/a/bash/bash-4.2-patches/bash42-009 | 82 + source/a/bash/bash-4.2-patches/bash42-010 | 61 + source/a/bash/bash-4.2-patches/bash42-011 | 46 + source/a/bash/bash-4.2-patches/bash42-012 | 151 + source/a/bash/bash-4.2-patches/bash42-013 | 52 + source/a/bash/bash-4.2-patches/bash42-014 | 47 + source/a/bash/bash-4.2-patches/bash42-015 | 81 + source/a/bash/bash-4.2-patches/bash42-016 | 46 + source/a/bash/bash-4.2-patches/bash42-017 | 47 + source/a/bash/bash-4.2-patches/bash42-018 | 74 + source/a/bash/bash-4.2-patches/bash42-019 | 47 + source/a/bash/bash-4.2-patches/bash42-020 | 60 + source/a/bash/bash-4.2-patches/bash42-021 | 61 + source/a/bash/bash-4.2-patches/bash42-022 | 61 + source/a/bash/bash-4.2-patches/bash42-023 | 62 + source/a/bash/bash-4.2-patches/bash42-024 | 45 + source/a/bash/bash-4.2-patches/bash42-025 | 143 + source/a/bash/bash-4.2-patches/bash42-026 | 58 + source/a/bash/bash-4.2-patches/bash42-027 | 47 + source/a/bash/bash-4.2-patches/bash42-028 | 52 + source/a/bash/bash-4.2-patches/bash42-029 | 524 + source/a/bash/bash-4.2-patches/bash42-030 | 178 + source/a/bash/bash-4.2-patches/bash42-031 | 80 + source/a/bash/bash-4.2-patches/bash42-032 | 75 + source/a/bash/bash-4.2-patches/bash42-033 | 57 + source/a/bash/bash-4.2-patches/bash42-034 | 46 + source/a/bash/bash-4.2-patches/bash42-035 | 66 + source/a/bash/bash-4.2-patches/bash42-036 | 92 + source/a/bash/bash-4.2-patches/bash42-037 | 112 + source/a/bash/bash.SlackBuild | 30 +- source/a/btrfs-progs/btrfs-progs.SlackBuild | 17 +- source/a/btrfs-progs/slack-desc | 6 +- source/a/coreutils/coreutils.SlackBuild | 23 +- source/a/cpio/cpio.32bit.crc.diff | 111 + source/a/cpio/cpio.SlackBuild | 6 +- source/a/cryptsetup/cryptsetup.SlackBuild | 17 +- source/a/cups/cups.SlackBuild | 30 +- source/a/cups/cups.fix_broken_locking.diff | 256 - source/a/cups/cups.url | 1 + .../cups/usb-backend-both-usblp-and-libusb.dpatch | 574 - ...reset-after-job-only-for-specific-devices.patch | 74 + source/a/cxxlibs/cxxlibs.SlackBuild | 4 +- source/a/cxxlibs/symlinks-to-tracked-libs | 5 +- source/a/dbus/dbus.SlackBuild | 31 +- source/a/dbus/dbus.set.home.diff | 22 + source/a/dbus/rc.messagebus | 10 +- source/a/dcron/crontab.c.O_EXCL.diff | 5 +- source/a/dcron/crontab.root | 4 +- source/a/dcron/dcron.SlackBuild | 9 +- source/a/dcron/dcron.manpage.paths.diff | 65 - source/a/dcron/defs.h.TMPDIR.diff | 5 +- source/a/dcron/run-parts | 5 +- source/a/e2fsprogs/e2fsprogs-1.42.6.tar.sign | Bin 0 -> 543 bytes source/a/e2fsprogs/e2fsprogs.SlackBuild | 24 +- source/a/eject/eject.SlackBuild | 7 +- source/a/eject/eject_for_mac.patch | 12 + source/a/etc/etc.SlackBuild | 4 +- source/a/file/file.short.diff | 20 +- source/a/file/slack-desc | 2 +- source/a/gdisk/gdisk.SlackBuild | 117 - source/a/gdisk/slack-desc | 19 - source/a/gettext/gettext-tools.SlackBuild | 2 +- source/a/gettext/gettext.SlackBuild | 2 +- source/a/gptfdisk/gptfdisk.SlackBuild | 122 + source/a/gptfdisk/gptfdisk.remove.icu4c.dep.diff | 36 + source/a/gptfdisk/slack-desc | 19 + source/a/grep/grep.SlackBuild | 22 +- source/a/gzip/gzip.SlackBuild | 4 +- source/a/isapnptools/isapnptools-1.26.lsm | 25 + source/a/isapnptools/isapnptools.SlackBuild | 88 + source/a/isapnptools/isapnptools.url | 1 + source/a/isapnptools/isapnptools_1.26-5.diff | 597 + source/a/isapnptools/slack-desc | 19 + source/a/kbd/kbd.SlackBuild | 47 +- source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign | 8 - .../sources/kbd-1.15.3-fix-es-translation.patch | 12 + .../a/kernel-firmware/kernel-firmware.SlackBuild | 54 + source/a/kernel-firmware/slack-desc | 19 + source/a/kmod/kmod.SlackBuild | 147 + source/a/kmod/slack-desc | 19 + source/a/lilo/lilo.SlackBuild | 24 +- source/a/lilo/liloconfig | 14 +- source/a/lilo/slack14.0.2012.bmp | Bin 0 -> 118256 bytes source/a/logrotate/logrotate.SlackBuild | 17 +- source/a/logrotate/logrotate.cron | 4 +- source/a/logrotate/logrotate.slackware.diff | 65 +- source/a/lvm2/build_with_udev_165_and_later.diff | 21 - source/a/lvm2/fix-build-with-udev-183.patch | 44 + source/a/lvm2/lvm2.SlackBuild | 52 +- source/a/mdadm/mdadm-3.1.5.tar.bz2.sign | 8 - source/a/mdadm/mdadm.SlackBuild | 76 +- source/a/mdadm/mdadm.static.diff | 11 - source/a/minicom/minicom.SlackBuild | 13 +- source/a/mkinitrd/README.initrd | 28 +- source/a/mkinitrd/busybox-dot-config | 991 +- source/a/mkinitrd/busybox-dot-config.1.18.x | 990 + source/a/mkinitrd/busybox-dot-config.1.19.x | 1013 + source/a/mkinitrd/busybox-dot-config.1.20.x | 1024 + .../mkinitrd/fixes-1.20.1/busybox-1.20.1-ash.patch | 12 + .../fixes-1.20.1/busybox-1.20.1-ifupdown.patch | 75 + .../mkinitrd/fixes-1.20.1/busybox-1.20.1-man.patch | 34 + .../mkinitrd/fixes-1.20.1/busybox-1.20.1-tar.patch | 11 + source/a/mkinitrd/init | 49 +- source/a/mkinitrd/mkinitrd | 74 +- source/a/mkinitrd/mkinitrd.8 | 8 + source/a/mkinitrd/mkinitrd.SlackBuild | 45 +- source/a/module-init-tools/doinst.sh | 7 - .../modprobe.ignore_some_suffixes.diff | 41 - .../module-init-tools/module-init-tools.SlackBuild | 109 - source/a/module-init-tools/slack-desc | 19 - source/a/ntfs-3g/99-ntfs-3g.rules | 2 + source/a/ntfs-3g/ntfs-3g.SlackBuild | 44 +- ...h.281537bcd92515ae3b9f154acd579ce97260f99b.diff | 78 + ...h.99f2638763845d8173a0c9f9209ac2b4be947165.diff | 88 + source/a/patch/patch.SlackBuild | 12 +- source/a/pciutils/pciutils.SlackBuild | 60 +- source/a/pciutils/pciutils.dontcompress.diff | 11 + source/a/pciutils/pciutils.ids.dest.diff | 14 - source/a/pciutils/pciutils.update.pci.ids.url.diff | 11 + source/a/pciutils/pciutils.url | 5 +- source/a/pkgtools/pkgtools.SlackBuild | 6 +- source/a/pkgtools/scripts/pkgtool | 2 +- source/a/pkgtools/scripts/setup.services | 2 +- source/a/shadow/adduser | 9 +- source/a/shadow/login.defs | 8 +- source/a/shadow/patches/README_PATCHES | 1 + source/a/shadow/patches/r3090.diff | 11 + source/a/shadow/patches/r3299.diff | 12 - source/a/shadow/patches/unused/r3299.diff | 12 + source/a/shadow/shadow.SlackBuild | 10 +- source/a/shadow/shadow.man.nodups.diff | 11 + source/a/slocate/slocate.CVE-2007-0277.diff | 42 + source/a/slocate/slocate.SlackBuild | 14 +- source/a/slocate/slocate.bigfile.diff | 33 + source/a/syslinux/syslinux-3.84.tar.bz2.sign | 8 - source/a/syslinux/syslinux-4.05.tar.sign | 17 + source/a/syslinux/syslinux.SlackBuild | 8 +- source/a/syslinux/syslinux.altmbr.diff | 11 + source/a/sysvinit-scripts/scripts/inittab | 2 +- source/a/sysvinit-scripts/scripts/rc.6 | 22 +- source/a/sysvinit-scripts/scripts/rc.M | 13 +- source/a/sysvinit-scripts/scripts/rc.S | 50 +- .../a/sysvinit-scripts/scripts/rescan-scsi-bus.sh | 96 +- .../scripts/rescan-scsi-bus.sh.diff | 18 + .../a/sysvinit-scripts/sysvinit-scripts.SlackBuild | 6 +- source/a/sysvinit/sysvinit-2.86-timeval.patch | 42 - source/a/sysvinit/sysvinit.SlackBuild | 26 +- source/a/sysvinit/sysvinit.diff | 125 - source/a/sysvinit/sysvinit.paths.diff | 13 + .../sysvinit/sysvinit.pidof.rhforkseverything.diff | 81 - source/a/tcsh/tcsh.SlackBuild | 4 +- source/a/tree/tree.SlackBuild | 10 +- source/a/udev/config/modprobe.d/8139cp.conf | 7 + source/a/udev/config/modprobe.d/README | 11 + source/a/udev/config/modprobe.d/bcm43xx.conf | 7 + source/a/udev/config/modprobe.d/blacklist.conf.new | 270 - source/a/udev/config/modprobe.d/eepro100.conf | 8 + source/a/udev/config/modprobe.d/eth1394.conf | 8 + source/a/udev/config/modprobe.d/evbug.conf | 7 + source/a/udev/config/modprobe.d/framebuffers.conf | 48 + source/a/udev/config/modprobe.d/hostap.conf | 12 + source/a/udev/config/modprobe.d/hw_random.conf | 7 + source/a/udev/config/modprobe.d/isapnp.conf | 24 + source/a/udev/config/modprobe.d/isapnp.conf.new | 15 - source/a/udev/config/modprobe.d/isdn.conf | 11 + source/a/udev/config/modprobe.d/oss.conf | 61 + source/a/udev/config/modprobe.d/pcspkr.conf | 9 + source/a/udev/config/modprobe.d/psmouse.conf | 10 + source/a/udev/config/modprobe.d/psmouse.conf.new | 6 - .../config/modprobe.d/scsi-sata-controllers.conf | 81 + source/a/udev/config/modprobe.d/sound-modems.conf | 10 + source/a/udev/config/modprobe.d/tulip.conf | 11 + .../a/udev/config/modprobe.d/usb-controller.conf | 9 + .../udev/config/modprobe.d/usb-controller.conf.new | 4 - source/a/udev/config/modprobe.d/via-ircc.conf | 7 + source/a/udev/config/modprobe.d/watchdog.conf | 43 + source/a/udev/config/rc.d/rc.udev.new | 92 +- source/a/udev/config/rules.d/40-slackware.rules | 3 + source/a/udev/config/rules.d/90-network.rules | 5 - source/a/udev/config/scripts/nethelper.sh | 62 - source/a/udev/doinst.sh | 11 +- source/a/udev/fix-42-usb-hid-pm.rules.diff | 18 + source/a/udev/rule_generator.diff | 90 +- ...ixup-all-8-not-only-6-bytes-of-the-fw_rev.patch | 27 + source/a/udev/udev.SlackBuild | 62 +- ...-560de575148b7efda3b34a7f7073abd483c5f08e.patch | 305 - source/a/udisks/slack-desc | 19 + source/a/udisks/udisks.SlackBuild | 119 + source/a/udisks/udisks.url | 1 + source/a/udisks2/doinst.sh | 12 + source/a/udisks2/slack-desc | 19 + source/a/udisks2/udisks2.SlackBuild | 139 + source/a/upower/doinst.sh | 15 + source/a/upower/slack-desc | 19 + source/a/upower/upower.SlackBuild | 121 + source/a/upower/upower.url | 1 + source/a/usb_modeswitch/device_reference.txt | 2809 +- source/a/usb_modeswitch/usb_modeswitch.SlackBuild | 45 +- source/a/usbutils/usbutils-002.tar.bz2.sign | 8 - source/a/usbutils/usbutils.SlackBuild | 18 +- source/a/usbutils/usbutils.ids.dest | 11 - source/a/usbutils/usbutils.url | 1 + .../0001-mount-old-fix-encryption-usage.patch | 88 + ...-ignore-1MiB-granularity-on-512-byte-sect.patch | 31 + source/a/util-linux/adjtimex_1.23-1.diff | 5456 --- source/a/util-linux/adjtimex_1.29-2.2.diff | 6564 ++++ source/a/util-linux/column-fix_long_opts.diff | 15 + source/a/util-linux/net-tools.config.h | 78 + source/a/util-linux/net-tools.diff | 77 - source/a/util-linux/net-tools_1.60-19.diff | 29401 ---------------- source/a/util-linux/util-linux.SlackBuild | 38 +- source/a/xfsprogs/xfsprogs.SlackBuild | 2 +- source/a/xz/slack-desc | 2 +- source/a/xz/xz.SlackBuild | 9 +- source/ap/alsa-utils/alsa-utils.SlackBuild | 3 +- source/ap/cdrdao/cdrdao-1.2.3-stat.patch | 13 + source/ap/cdrdao/cdrdao.SlackBuild | 7 +- source/ap/diffutils/diffutils.SlackBuild | 2 +- source/ap/dmapi/slack-desc | 2 +- source/ap/ghostscript/ghostscript.SlackBuild | 29 +- source/ap/ghostscript/ghostscript.rev11948.diff | 13 - source/ap/htop/htop.SlackBuild | 122 + source/ap/htop/slack-desc | 19 + source/ap/linuxdoc-tools/ChangeLog.txt | 25 + source/ap/linuxdoc-tools/arm/build | 4 +- source/ap/linuxdoc-tools/linuxdoc-tools.build | 47 +- ...doc.asciidoc7compatible.revertbrokenchange.diff | 80 - source/ap/linuxdoc-tools/sources/gtk-doc.patch | 25 - .../linuxdoc-tools/sources/openjade-1.3-getopts.pl | 65 + .../sources/openjade-1.3.2-gcc46.patch | 82 + source/ap/linuxdoc-tools/sources/source.download | 36 +- source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools | 4 +- source/ap/lm_sensors/lm_sensors.SlackBuild | 4 +- source/ap/lsscsi/lsscsi.SlackBuild | 10 +- source/ap/lxc/lxc.SlackBuild | 4 +- source/ap/man-pages/man-pages.SlackBuild | 4 +- source/ap/mc/mc.SlackBuild | 24 +- source/ap/mc/mc.ext.in.geeqie.diff | 11 - source/ap/mc/mc.image.sh.geeqie.diff | 11 + source/ap/mc/mc.save.file.diff | 37 + source/ap/moc/moc.SlackBuild | 2 +- source/ap/mysql/README.mysql-embedded | 7 + source/ap/mysql/doinst.sh | 1 + source/ap/mysql/mirror-url | 1 + source/ap/mysql/mysql-embedded.SlackBuild | 221 + source/ap/mysql/mysql-embedded.build | 63 - source/ap/mysql/mysql.SlackBuild | 122 +- source/ap/nano/doinst.sh | 13 + source/ap/nano/nano.SlackBuild | 28 +- source/ap/ntfsprogs/ntfsprogs.SlackBuild | 134 - source/ap/ntfsprogs/slack-desc | 19 - source/ap/powertop/powertop.SlackBuild | 44 +- source/ap/rpm/rpm.SlackBuild | 11 +- source/ap/screen/screen.SlackBuild | 11 +- ...reen.d_termname.envterm.buffersizeincrease.diff | 22 + source/ap/soma/slack-desc | 19 + source/ap/soma/soma.SlackBuild | 67 + source/ap/soma/soma.info | 10 + source/ap/soma/soma.png | Bin 0 -> 229691 bytes source/ap/soma/stations.conf | 38 + source/ap/sqlite/sqlite.SlackBuild | 6 +- source/ap/sudo/sudo.SlackBuild | 10 +- source/ap/vbetool/slack-desc | 2 +- source/ap/vim/patches/7.3.155 | 286 + source/ap/vim/patches/7.3.156 | 89 + source/ap/vim/patches/7.3.157 | 52 + source/ap/vim/patches/7.3.158 | 48 + source/ap/vim/patches/7.3.159 | 54 + source/ap/vim/patches/7.3.160 | 482 + source/ap/vim/patches/7.3.161 | 1645 + source/ap/vim/patches/7.3.162 | 83 + source/ap/vim/patches/7.3.163 | 59 + source/ap/vim/patches/7.3.164 | 181 + source/ap/vim/patches/7.3.165 | 47 + source/ap/vim/patches/7.3.166 | 70 + source/ap/vim/patches/7.3.167 | 96 + source/ap/vim/patches/7.3.168 | 82 + source/ap/vim/patches/7.3.169 | 130 + source/ap/vim/patches/7.3.170 | 70 + source/ap/vim/patches/7.3.171 | 142 + source/ap/vim/patches/7.3.172 | 268 + source/ap/vim/patches/7.3.173 | 79 + source/ap/vim/patches/7.3.174 | 109 + source/ap/vim/patches/7.3.175 | 50 + source/ap/vim/patches/7.3.176 | 165 + source/ap/vim/patches/7.3.177 | 97 + source/ap/vim/patches/7.3.178 | 163 + source/ap/vim/patches/7.3.179 | 95 + source/ap/vim/patches/7.3.180 | 295 + source/ap/vim/patches/7.3.181 | 171 + source/ap/vim/patches/7.3.182 | 53 + source/ap/vim/patches/7.3.183 | 87 + source/ap/vim/patches/7.3.184 | 86 + source/ap/vim/patches/7.3.185 | 77 + source/ap/vim/patches/7.3.186 | 59 + source/ap/vim/patches/7.3.187 | 6621 ++++ source/ap/vim/patches/7.3.188 | 184 + source/ap/vim/patches/7.3.189 | 49 + source/ap/vim/patches/7.3.190 | 48 + source/ap/vim/patches/7.3.191 | 526 + source/ap/vim/patches/7.3.192 | 61 + source/ap/vim/patches/7.3.193 | 70 + source/ap/vim/patches/7.3.194 | 48 + source/ap/vim/patches/7.3.195 | 199 + source/ap/vim/patches/7.3.196 | 224 + source/ap/vim/patches/7.3.197 | 78 + source/ap/vim/patches/7.3.198 | 403 + source/ap/vim/patches/7.3.199 | 57 + source/ap/vim/patches/7.3.200 | 75 + source/ap/vim/patches/7.3.201 | 124 + source/ap/vim/patches/7.3.202 | 868 + source/ap/vim/patches/7.3.203 | 102 + source/ap/vim/patches/7.3.204 | 51 + source/ap/vim/patches/7.3.205 | 93 + source/ap/vim/patches/7.3.206 | 54 + source/ap/vim/patches/7.3.207 | 54 + source/ap/vim/patches/7.3.208 | 51 + source/ap/vim/patches/7.3.209 | 95 + source/ap/vim/patches/7.3.210 | 182 + source/ap/vim/patches/7.3.211 | 51 + source/ap/vim/patches/7.3.212 | 243 + source/ap/vim/patches/7.3.213 | 142 + source/ap/vim/patches/7.3.214 | 55 + source/ap/vim/patches/7.3.215 | 63 + source/ap/vim/patches/7.3.216 | 263 + source/ap/vim/patches/7.3.217 | 63 + source/ap/vim/patches/7.3.218 | 91 + source/ap/vim/patches/7.3.219 | 92 + source/ap/vim/patches/7.3.220 | 1230 + source/ap/vim/patches/7.3.221 | 287 + source/ap/vim/patches/7.3.222 | 71 + source/ap/vim/patches/7.3.223 | 387 + source/ap/vim/patches/7.3.224 | 162 + source/ap/vim/patches/7.3.225 | Bin 0 -> 18841 bytes source/ap/vim/patches/7.3.226 | 58 + source/ap/vim/patches/7.3.227 | 109 + source/ap/vim/patches/7.3.228 | 45 + source/ap/vim/patches/7.3.229 | 55 + source/ap/vim/patches/7.3.230 | 70 + source/ap/vim/patches/7.3.231 | 128 + source/ap/vim/patches/7.3.232 | 84 + source/ap/vim/patches/7.3.233 | 81 + source/ap/vim/patches/7.3.234 | 178 + source/ap/vim/patches/7.3.235 | 360 + source/ap/vim/patches/7.3.236 | 87 + source/ap/vim/patches/7.3.237 | 222 + source/ap/vim/patches/7.3.238 | 53 + source/ap/vim/patches/7.3.239 | 321 + source/ap/vim/patches/7.3.240 | 795 + source/ap/vim/patches/7.3.241 | 71 + source/ap/vim/patches/7.3.242 | 71 + source/ap/vim/patches/7.3.243 | 52 + source/ap/vim/patches/7.3.244 | 48 + source/ap/vim/patches/7.3.245 | 81 + source/ap/vim/patches/7.3.246 | 55 + source/ap/vim/patches/7.3.247 | 95 + source/ap/vim/patches/7.3.248 | 129 + source/ap/vim/patches/7.3.249 | 134 + source/ap/vim/patches/7.3.250 | 104 + source/ap/vim/patches/7.3.251 | 184 + source/ap/vim/patches/7.3.252 | 43 + source/ap/vim/patches/7.3.253 | 539 + source/ap/vim/patches/7.3.254 | 47 + source/ap/vim/patches/7.3.255 | 81 + source/ap/vim/patches/7.3.256 | 322 + source/ap/vim/patches/7.3.257 | 97 + source/ap/vim/patches/7.3.258 | 70 + source/ap/vim/patches/7.3.259 | 503 + source/ap/vim/patches/7.3.260 | 69 + source/ap/vim/patches/7.3.261 | 53 + source/ap/vim/patches/7.3.262 | 1356 + source/ap/vim/patches/7.3.263 | 162 + source/ap/vim/patches/7.3.264 | 159 + source/ap/vim/patches/7.3.265 | 145 + source/ap/vim/patches/7.3.266 | 54 + source/ap/vim/patches/7.3.267 | 67 + source/ap/vim/patches/7.3.268 | 69 + source/ap/vim/patches/7.3.269 | 112 + source/ap/vim/patches/7.3.270 | 52 + source/ap/vim/patches/7.3.271 | 504 + source/ap/vim/patches/7.3.272 | 51 + source/ap/vim/patches/7.3.273 | 124 + source/ap/vim/patches/7.3.274 | 55 + source/ap/vim/patches/7.3.275 | 77 + source/ap/vim/patches/7.3.276 | 130 + source/ap/vim/patches/7.3.277 | 348 + source/ap/vim/patches/7.3.278 | 73 + source/ap/vim/patches/7.3.279 | 118 + source/ap/vim/patches/7.3.280 | 181 + source/ap/vim/patches/7.3.281 | 134 + source/ap/vim/patches/7.3.282 | 60 + source/ap/vim/patches/7.3.283 | 114 + source/ap/vim/patches/7.3.284 | 211 + source/ap/vim/patches/7.3.285 | 144 + source/ap/vim/patches/7.3.286 | 84 + source/ap/vim/patches/7.3.287 | 100 + source/ap/vim/patches/7.3.288 | 76 + source/ap/vim/patches/7.3.289 | 56 + source/ap/vim/patches/7.3.290 | 75 + source/ap/vim/patches/7.3.291 | 125 + source/ap/vim/patches/7.3.292 | 55 + source/ap/vim/patches/7.3.293 | 74 + source/ap/vim/patches/7.3.294 | 58 + source/ap/vim/patches/7.3.295 | 109 + source/ap/vim/patches/7.3.296 | 222 + source/ap/vim/patches/7.3.297 | 130 + source/ap/vim/patches/7.3.298 | 167 + source/ap/vim/patches/7.3.299 | 516 + source/ap/vim/patches/7.3.300 | 74 + source/ap/vim/patches/7.3.301 | 97 + source/ap/vim/patches/7.3.302 | 68 + source/ap/vim/patches/7.3.303 | 55 + source/ap/vim/patches/7.3.304 | 103 + source/ap/vim/patches/7.3.305 | 58 + source/ap/vim/patches/7.3.306 | 244 + source/ap/vim/patches/7.3.307 | 180 + source/ap/vim/patches/7.3.308 | 260 + source/ap/vim/patches/7.3.309 | 105 + source/ap/vim/patches/7.3.310 | 3524 ++ source/ap/vim/patches/7.3.311 | 351 + source/ap/vim/patches/7.3.312 | 58 + source/ap/vim/patches/7.3.313 | 53 + source/ap/vim/patches/7.3.314 | 54 + source/ap/vim/patches/7.3.315 | 475 + source/ap/vim/patches/7.3.316 | 48 + source/ap/vim/patches/7.3.317 | 116 + source/ap/vim/patches/7.3.318 | 90 + source/ap/vim/patches/7.3.319 | 154 + source/ap/vim/patches/7.3.320 | 130 + source/ap/vim/patches/7.3.321 | 304 + source/ap/vim/patches/7.3.322 | 52 + source/ap/vim/patches/7.3.323 | 52 + source/ap/vim/patches/7.3.324 | 53 + source/ap/vim/patches/7.3.325 | 64 + source/ap/vim/patches/7.3.326 | 285 + source/ap/vim/patches/7.3.327 | 64 + source/ap/vim/patches/7.3.328 | 45 + source/ap/vim/patches/7.3.329 | 72 + source/ap/vim/patches/7.3.330 | 45 + source/ap/vim/patches/7.3.331 | 53 + source/ap/vim/patches/7.3.332 | 206 + source/ap/vim/patches/7.3.333 | 245 + source/ap/vim/patches/7.3.334 | 58 + source/ap/vim/patches/7.3.335 | 48 + source/ap/vim/patches/7.3.336 | 1100 + source/ap/vim/patches/7.3.337 | 58 + source/ap/vim/patches/7.3.338 | 100 + source/ap/vim/patches/7.3.339 | 57 + source/ap/vim/patches/7.3.340 | 62 + source/ap/vim/patches/7.3.341 | 360 + source/ap/vim/patches/7.3.342 | 93 + source/ap/vim/patches/7.3.343 | 252 + source/ap/vim/patches/7.3.344 | 121 + source/ap/vim/patches/7.3.345 | 48 + source/ap/vim/patches/7.3.346 | 143 + source/ap/vim/patches/7.3.347 | 54 + source/ap/vim/patches/7.3.348 | 57 + source/ap/vim/patches/7.3.349 | 88 + source/ap/vim/patches/7.3.350 | 46 + source/ap/vim/patches/7.3.351 | 46 + source/ap/vim/patches/7.3.352 | 108 + source/ap/vim/patches/7.3.353 | 155 + source/ap/vim/patches/7.3.354 | 71 + source/ap/vim/patches/7.3.355 | 56 + source/ap/vim/patches/7.3.356 | 79 + source/ap/vim/patches/7.3.357 | 52 + source/ap/vim/patches/7.3.358 | 74 + source/ap/vim/patches/7.3.359 | 64 + source/ap/vim/patches/7.3.360 | 61 + source/ap/vim/patches/7.3.361 | 55 + source/ap/vim/patches/7.3.362 | 59 + source/ap/vim/patches/7.3.363 | 110 + source/ap/vim/patches/7.3.364 | 57 + source/ap/vim/patches/7.3.365 | 131 + source/ap/vim/patches/7.3.366 | 76 + source/ap/vim/patches/7.3.367 | 53 + source/ap/vim/patches/7.3.368 | 103 + source/ap/vim/patches/7.3.369 | 48 + source/ap/vim/patches/7.3.370 | 63 + source/ap/vim/patches/7.3.371 | 75 + source/ap/vim/patches/7.3.372 | 52 + source/ap/vim/patches/7.3.373 | 78 + source/ap/vim/patches/7.3.374 | 59 + source/ap/vim/patches/7.3.375 | 64 + source/ap/vim/patches/7.3.376 | 57 + source/ap/vim/patches/7.3.377 | 406 + source/ap/vim/patches/7.3.378 | 71 + source/ap/vim/patches/7.3.379 | 112 + source/ap/vim/patches/7.3.380 | 318 + source/ap/vim/patches/7.3.381 | 260 + source/ap/vim/patches/7.3.382 | 173 + source/ap/vim/patches/7.3.383 | 51 + source/ap/vim/patches/7.3.384 | 53 + source/ap/vim/patches/7.3.385 | 69 + source/ap/vim/patches/7.3.386 | 55 + source/ap/vim/patches/7.3.387 | 61 + source/ap/vim/patches/7.3.388 | 45 + source/ap/vim/patches/7.3.389 | 61 + source/ap/vim/patches/7.3.390 | 155 + source/ap/vim/patches/7.3.391 | 51 + source/ap/vim/patches/7.3.392 | 115 + source/ap/vim/patches/7.3.393 | 130 + source/ap/vim/patches/7.3.394 | 62 + source/ap/vim/patches/7.3.395 | 115 + source/ap/vim/patches/7.3.396 | 49 + source/ap/vim/patches/7.3.397 | 224 + source/ap/vim/patches/7.3.398 | 65 + source/ap/vim/patches/7.3.399 | 137 + source/ap/vim/patches/7.3.400 | 1762 + source/ap/vim/patches/7.3.401 | 191 + source/ap/vim/patches/7.3.402 | 59 + source/ap/vim/patches/7.3.403 | 108 + source/ap/vim/patches/7.3.404 | 85 + source/ap/vim/patches/7.3.405 | 101 + source/ap/vim/patches/7.3.406 | 103 + source/ap/vim/patches/7.3.407 | 270 + source/ap/vim/patches/7.3.408 | 48 + source/ap/vim/patches/7.3.409 | 48 + source/ap/vim/patches/7.3.410 | 54 + source/ap/vim/patches/7.3.411 | 55 + source/ap/vim/patches/7.3.412 | 51 + source/ap/vim/patches/7.3.413 | 90 + source/ap/vim/patches/7.3.414 | 90 + source/ap/vim/patches/7.3.415 | 54 + source/ap/vim/patches/7.3.416 | 54 + source/ap/vim/patches/7.3.417 | 47 + source/ap/vim/patches/7.3.418 | 53 + source/ap/vim/patches/7.3.419 | 85 + source/ap/vim/patches/7.3.420 | 70 + source/ap/vim/patches/7.3.421 | 60 + source/ap/vim/patches/7.3.422 | 94 + source/ap/vim/patches/7.3.423 | 130 + source/ap/vim/patches/7.3.424 | 62 + source/ap/vim/patches/7.3.425 | 78 + source/ap/vim/patches/7.3.426 | 279 + source/ap/vim/patches/7.3.427 | 378 + source/ap/vim/patches/7.3.428 | 113 + source/ap/vim/patches/7.3.429 | 192 + source/ap/vim/patches/7.3.430 | 80 + source/ap/vim/patches/7.3.431 | 280 + source/ap/vim/patches/7.3.432 | 228 + source/ap/vim/patches/7.3.433 | 92 + source/ap/vim/patches/7.3.434 | 233 + source/ap/vim/patches/7.3.435 | 63 + source/ap/vim/patches/7.3.436 | 111 + source/ap/vim/patches/7.3.437 | 73 + source/ap/vim/patches/7.3.438 | 126 + source/ap/vim/patches/7.3.439 | 87 + source/ap/vim/patches/7.3.440 | 211 + source/ap/vim/patches/7.3.441 | 341 + source/ap/vim/patches/7.3.442 | 186 + source/ap/vim/patches/7.3.443 | 206 + source/ap/vim/patches/7.3.444 | 96 + source/ap/vim/patches/7.3.445 | 199 + source/ap/vim/patches/7.3.446 | 164 + source/ap/vim/patches/7.3.447 | 377 + source/ap/vim/patches/7.3.448 | 180 + source/ap/vim/patches/7.3.449 | 455 + source/ap/vim/patches/7.3.450 | 81 + source/ap/vim/patches/7.3.451 | 363 + source/ap/vim/patches/7.3.452 | 70 + source/ap/vim/patches/7.3.453 | 58 + source/ap/vim/patches/7.3.454 | 84 + source/ap/vim/patches/7.3.455 | 70 + source/ap/vim/patches/7.3.456 | 376 + source/ap/vim/patches/7.3.457 | 81 + source/ap/vim/patches/7.3.458 | 52 + source/ap/vim/patches/7.3.459 | 71 + source/ap/vim/patches/7.3.460 | 89 + source/ap/vim/patches/7.3.461 | 243 + source/ap/vim/patches/7.3.462 | 191 + source/ap/vim/patches/7.3.463 | 63 + source/ap/vim/patches/7.3.464 | 60 + source/ap/vim/patches/7.3.465 | 398 + source/ap/vim/patches/7.3.466 | 49 + source/ap/vim/patches/7.3.467 | 54 + source/ap/vim/patches/7.3.468 | 144 + source/ap/vim/patches/7.3.469 | 53 + source/ap/vim/patches/7.3.470 | 67 + source/ap/vim/patches/7.3.471 | 92 + source/ap/vim/patches/7.3.472 | 88 + source/ap/vim/patches/7.3.473 | 68 + source/ap/vim/patches/7.3.474 | 62 + source/ap/vim/patches/7.3.475 | 98 + source/ap/vim/patches/7.3.476 | 56 + source/ap/vim/patches/7.3.477 | 52 + source/ap/vim/patches/7.3.478 | 46 + source/ap/vim/patches/7.3.479 | 134 + source/ap/vim/patches/7.3.480 | 237 + source/ap/vim/patches/7.3.481 | 65 + source/ap/vim/patches/7.3.482 | 57 + source/ap/vim/patches/7.3.483 | 97 + source/ap/vim/patches/7.3.484 | 62 + source/ap/vim/patches/7.3.485 | 52 + source/ap/vim/patches/7.3.486 | 58 + source/ap/vim/patches/7.3.487 | 572 + source/ap/vim/patches/7.3.488 | 52 + source/ap/vim/patches/7.3.489 | 89 + source/ap/vim/patches/7.3.490 | 2517 ++ source/ap/vim/patches/7.3.491 | 235 + source/ap/vim/patches/7.3.492 | 718 + source/ap/vim/patches/7.3.493 | 54 + source/ap/vim/patches/7.3.494 | 186 + source/ap/vim/patches/7.3.495 | 124 + source/ap/vim/patches/7.3.496 | 69 + source/ap/vim/patches/7.3.497 | 50 + source/ap/vim/patches/7.3.498 | 63 + source/ap/vim/patches/7.3.499 | 84 + source/ap/vim/patches/7.3.500 | 46 + source/ap/vim/patches/7.3.501 | 63 + source/ap/vim/patches/7.3.502 | 67 + source/ap/vim/patches/7.3.503 | 51 + source/ap/vim/patches/7.3.504 | 87 + source/ap/vim/patches/7.3.505 | 116 + source/ap/vim/patches/7.3.506 | 100 + source/ap/vim/patches/7.3.507 | 149 + source/ap/vim/patches/7.3.508 | 85 + source/ap/vim/patches/7.3.509 | 304 + source/ap/vim/patches/7.3.510 | 53 + source/ap/vim/patches/7.3.511 | 49 + source/ap/vim/patches/7.3.512 | 70 + source/ap/vim/patches/7.3.513 | 129 + source/ap/vim/patches/7.3.514 | 232 + source/ap/vim/patches/7.3.515 | 68 + source/ap/vim/patches/7.3.516 | 94 + source/ap/vim/patches/7.3.517 | 60 + source/ap/vim/patches/7.3.518 | 57 + source/ap/vim/patches/7.3.519 | 64 + source/ap/vim/patches/7.3.520 | 140 + source/ap/vim/patches/7.3.521 | 129 + source/ap/vim/patches/7.3.522 | 56 + source/ap/vim/patches/7.3.523 | 103 + source/ap/vim/patches/7.3.524 | 46 + source/ap/vim/patches/7.3.525 | 55 + source/ap/vim/patches/7.3.526 | 59 + source/ap/vim/patches/7.3.527 | 59 + source/ap/vim/patches/7.3.528 | 171 + source/ap/vim/patches/7.3.529 | 81 + source/ap/vim/patches/7.3.530 | 50 + source/ap/vim/patches/7.3.531 | 52 + source/ap/vim/patches/7.3.532 | 53 + source/ap/vim/patches/7.3.533 | 46 + source/ap/vim/patches/7.3.534 | 101 + source/ap/vim/patches/7.3.535 | 356 + source/ap/vim/patches/7.3.536 | 73 + source/ap/vim/patches/7.3.537 | 47 + source/ap/vim/patches/7.3.538 | 321 + source/ap/vim/patches/7.3.539 | 51 + source/ap/vim/patches/7.3.540 | 55 + source/ap/vim/patches/7.3.541 | 1090 + source/ap/vim/patches/7.3.542 | 73 + source/ap/vim/patches/7.3.543 | 55 + source/ap/vim/patches/7.3.544 | 81 + source/ap/vim/patches/7.3.545 | 359 + source/ap/vim/patches/7.3.546 | 54 + source/ap/vim/patches/7.3.547 | 52 + source/ap/vim/patches/7.3.548 | 53 + source/ap/vim/patches/7.3.549 | 125 + source/ap/vim/patches/7.3.550 | 160 + source/ap/vim/patches/7.3.551 | 494 + source/ap/vim/patches/7.3.552 | 582 + source/ap/vim/patches/7.3.553 | 85 + source/ap/vim/patches/7.3.554 | 52 + source/ap/vim/patches/7.3.555 | 232 + source/ap/vim/patches/7.3.556 | 70 + source/ap/vim/patches/7.3.557 | 99 + source/ap/vim/patches/7.3.558 | 90 + source/ap/vim/patches/7.3.559 | 131 + source/ap/vim/patches/7.3.560 | 49 + source/ap/vim/patches/7.3.561 | 52 + source/ap/vim/patches/7.3.562 | 63 + source/ap/vim/patches/7.3.563 | 97 + source/ap/vim/patches/7.3.564 | 53 + source/ap/vim/patches/7.3.565 | 52 + source/ap/vim/patches/7.3.566 | 83 + source/ap/vim/patches/7.3.567 | 56 + source/ap/vim/patches/7.3.568 | 138 + source/ap/vim/patches/7.3.569 | 4762 +++ source/ap/vim/patches/7.3.570 | 145 + source/ap/vim/patches/7.3.571 | 117 + source/ap/vim/patches/7.3.572 | 59 + source/ap/vim/patches/7.3.573 | 52 + source/ap/vim/patches/7.3.574 | 88 + source/ap/vim/patches/7.3.575 | 60 + source/ap/vim/patches/7.3.576 | 255 + source/ap/vim/patches/7.3.577 | 273 + source/ap/vim/patches/7.3.578 | 80 + source/ap/vim/patches/7.3.579 | 232 + source/ap/vim/patches/7.3.580 | 52 + source/ap/vim/patches/7.3.581 | 117 + source/ap/vim/patches/7.3.582 | 61 + source/ap/vim/patches/7.3.583 | 79 + source/ap/vim/patches/7.3.584 | 134 + source/ap/vim/patches/7.3.585 | 56 + source/ap/vim/patches/7.3.586 | 103 + source/ap/vim/patches/7.3.587 | 84 + source/ap/vim/patches/7.3.588 | 85 + source/ap/vim/patches/7.3.589 | 69 + source/ap/vim/patches/7.3.590 | 61 + source/ap/vim/patches/7.3.591 | 208 + source/ap/vim/patches/7.3.592 | 126 + source/ap/vim/patches/7.3.593 | 81 + source/ap/vim/patches/7.3.594 | 171 + source/ap/vim/patches/7.3.595 | 154 + source/ap/vim/patches/7.3.596 | 171 + source/ap/vim/patches/7.3.597 | 720 + source/ap/vim/patches/7.3.598 | 73 + source/ap/vim/patches/7.3.599 | 107 + source/ap/vim/patches/7.3.600 | 68 + source/ap/vim/patches/7.3.601 | 51 + source/ap/vim/patches/7.3.602 | 55 + source/ap/vim/patches/7.3.603 | 370 + source/ap/vim/patches/7.3.604 | 60 + source/ap/vim/patches/7.3.605 | 86 + source/ap/vim/patches/7.3.606 | 76 + source/ap/vim/patches/7.3.607 | 56 + source/ap/vim/patches/7.3.608 | 119 + source/ap/vim/patches/7.3.609 | 251 + source/ap/vim/patches/7.3.610 | 400 + source/ap/vim/patches/7.3.611 | 58 + source/ap/vim/patches/7.3.612 | 83 + source/ap/vim/patches/7.3.613 | 149 + source/ap/vim/patches/7.3.614 | 176 + source/ap/vim/patches/7.3.615 | 107 + source/ap/vim/patches/7.3.616 | 46 + source/ap/vim/patches/7.3.617 | 65 + source/ap/vim/patches/7.3.618 | 367 + source/ap/vim/patches/7.3.619 | 50 + source/ap/vim/patches/7.3.620 | 163 + source/ap/vim/patches/7.3.621 | 72 + source/ap/vim/patches/7.3.622 | 56 + source/ap/vim/patches/7.3.623 | 92 + source/ap/vim/patches/7.3.624 | 52 + source/ap/vim/patches/7.3.625 | 140 + source/ap/vim/patches/7.3.626 | 49 + source/ap/vim/patches/7.3.627 | 102 + source/ap/vim/patches/7.3.628 | 54 + source/ap/vim/patches/7.3.629 | 437 + source/ap/vim/patches/7.3.630 | 48 + source/ap/vim/patches/7.3.631 | 322 + source/ap/vim/patches/7.3.632 | 537 + source/ap/vim/patches/7.3.633 | 81 + source/ap/vim/patches/7.3.634 | 57 + source/ap/vim/patches/7.3.635 | 50 + source/ap/vim/patches/7.3.636 | 148 + source/ap/vim/patches/7.3.637 | 94 + source/ap/vim/patches/7.3.638 | 55 + source/ap/vim/patches/7.3.639 | 846 + source/ap/vim/patches/7.3.640 | Bin 0 -> 455297 bytes source/ap/vim/patches/7.3.641 | 68 + source/ap/vim/patches/7.3.642 | 55 + source/ap/vim/patches/7.3.643 | 73 + source/ap/vim/patches/7.3.644 | 72 + source/ap/vim/patches/7.3.645 | 118 + source/ap/zsh/zsh.SlackBuild | 5 +- source/ap/zsh/zsh.regex.oh.bah.diff | 12 - source/d/automake/automake.SlackBuild | 11 +- source/d/automake/automake.perl516.prototype.diff | 119 + source/d/binutils/binutils-2.21.51.0.6.tar.sign | 8 - source/d/binutils/binutils-2.22.52.0.2.tar.sign | Bin 0 -> 543 bytes source/d/binutils/binutils.SlackBuild | 50 +- source/d/binutils/release.binutils-2.21.51.0.6 | 257 - source/d/binutils/release.binutils-2.22.52.0.2 | 508 + source/d/bison/bison.SlackBuild | 27 +- source/d/cmake/cmake.SlackBuild | 10 +- source/d/cmake/cmake.findpkgconfig.3ea850.patch | 63 + source/d/cmake/slack-desc | 2 +- source/d/doxygen/doxygen.SlackBuild | 8 + source/d/gcc/antlr-runtime-3.4.jar | Bin 0 -> 164368 bytes source/d/gcc/create_gcj_jvm.sh | 93 + source/d/gcc/ecj.sh | 5 + source/d/gcc/gcc-4.7.1.adalib.pic.diff | 40 + source/d/gcc/gcc.SlackBuild | 144 +- source/d/gcc/slack-desc.gcc-gfortran | 16 +- source/d/gcc/slack-desc.gcc-go | 19 + source/d/gdb/gdb.SlackBuild | 6 +- source/d/git/git-1.7.4.4.tar.sign | 8 - source/d/git/git.url | 1 + source/d/intltool/intltool.SlackBuild | 3 +- source/d/llvm/llvm.SlackBuild | 173 + source/d/llvm/llvm.url | 2 + source/d/llvm/slack-desc | 19 + source/d/make/make-3.82-android-build-fix.diff | 16 + source/d/make/make.SlackBuild | 7 +- source/d/oprofile/oprofile.SlackBuild | 6 +- source/d/oprofile/oprofile.binutils.diff | 44 + source/d/oprofile/oprofile.qt4.diff | 3194 -- source/d/perl/perl.SlackBuild | 47 +- source/d/python/python.SlackBuild | 48 +- source/d/python/python.no-static-library.diff | 49 + source/d/python/python.pure64.diff | 30 - .../python/python.readline.set_pre_input_hook.diff | 4 +- source/d/python/python.x86_64.diff | 213 +- source/d/ruby/ruby.SlackBuild | 18 +- source/d/slacktrack/slacktrack.SlackBuild | 6 +- source/d/subversion/get-svn-book.sh | 2 +- source/d/subversion/subversion.SlackBuild | 10 +- source/d/swig/swig.SlackBuild | 8 +- source/d/yasm/yasm.SlackBuild | 4 +- source/e/emacs/emacs.SlackBuild | 64 +- source/installer/busybox-1.19.4.tar.bz2.sign | 18 + source/installer/busybox-dot-config | 121 +- source/installer/busybox.SlackBuild | 9 +- source/installer/busybox.wget.P.diff | 31 + source/k/README.TXT | 2 +- source/k/README_SPEAKUP_PATCH.TXT | 86 - source/k/config-generic-2.6.37.6 | 5066 --- source/k/config-huge-2.6.37.6 | 5065 --- source/k/config-x86/config-generic-3.2.29 | 5689 ++++ source/k/config-x86/config-generic-smp-3.2.29-smp | 5719 ++++ source/k/config-x86/config-huge-3.2.29 | 5688 ++++ source/k/config-x86/config-huge-smp-3.2.29-smp | 5718 ++++ source/k/config-x86_64/config-generic-3.2.29.x64 | 5478 +++ source/k/config-x86_64/config-huge-3.2.29.x64 | 5477 +++ .../k/kernel-firmware/kernel-firmware.SlackBuild | 45 - source/k/kernel-firmware/slack-desc | 11 - source/k/kernel-generic/kernel-generic.SlackBuild | 100 - source/k/kernel-generic/slack-desc | 19 - source/k/kernel-huge/kernel-huge.SlackBuild | 100 - source/k/kernel-huge/slack-desc | 19 - source/k/kernel-modules/kernel-modules.SlackBuild | 84 - source/k/kernel-modules/rc.modules.new | 924 - source/k/kernel-modules/slack-desc | 19 - source/k/linux-2.6.37.6.tar.sign | 8 - source/k/linux-3.2.29.tar.sign | 17 + .../kernel-generic-smp.SlackBuild | 79 + .../k/packaging-x86/kernel-generic-smp/slack-desc | 19 + .../kernel-generic/kernel-generic.SlackBuild | 78 + source/k/packaging-x86/kernel-generic/slack-desc | 19 + .../kernel-huge-smp/kernel-huge-smp.SlackBuild | 79 + source/k/packaging-x86/kernel-huge-smp/slack-desc | 19 + .../kernel-huge/kernel-huge.SlackBuild | 79 + source/k/packaging-x86/kernel-huge/slack-desc | 19 + .../kernel-modules-smp.SlackBuild | 63 + .../kernel-modules-smp/rc.modules.new | 924 + .../k/packaging-x86/kernel-modules-smp/slack-desc | 19 + .../kernel-modules/kernel-modules.SlackBuild | 67 + .../k/packaging-x86/kernel-modules/rc.modules.new | 924 + source/k/packaging-x86/kernel-modules/slack-desc | 19 + .../kernel-generic/kernel-generic.SlackBuild | 100 + .../k/packaging-x86_64/kernel-generic/slack-desc | 19 + .../kernel-huge/kernel-huge.SlackBuild | 100 + source/k/packaging-x86_64/kernel-huge/slack-desc | 19 + .../kernel-modules/kernel-modules.SlackBuild | 84 + .../packaging-x86_64/kernel-modules/rc.modules.new | 924 + .../k/packaging-x86_64/kernel-modules/slack-desc | 19 + source/kde/KDE.SlackBuild | 458 +- source/kde/KDE.options | 19 +- source/kde/KDE_extra.SlackBuild | 54 - source/kde/amarok/amarok.SlackBuild | 109 - source/kde/amarok/doinst.sh | 5 - source/kde/amarok/local.options | 1 - source/kde/amarok/slack-desc | 19 - source/kde/build/calligra | 1 + source/kde/cmake/amarok | 22 + source/kde/cmake/analitza | 18 + source/kde/cmake/bluedevil | 13 + source/kde/cmake/calligra | 17 + source/kde/cmake/cmake | 16 + source/kde/cmake/k3b | 17 + source/kde/cmake/kdeaccessibility | 17 + source/kde/cmake/kdeadmin | 18 + source/kde/cmake/kdeartwork | 16 + source/kde/cmake/kdebase | 16 + source/kde/cmake/kdebindings | 25 + source/kde/cmake/kdelibs | 17 + source/kde/cmake/kdenetwork | 16 + source/kde/cmake/kdewebdev | 17 + source/kde/cmake/kwebkitpart | 11 + source/kde/cmake/networkmanagement | 17 + source/kde/cmake/perlkde | 20 + source/kde/cmake/perlqt | 20 + source/kde/cmake/polkit-kde-agent-1 | 15 + source/kde/cmake/polkit-kde-kcmodules-1 | 15 + source/kde/docs/k3b | 1 + source/kde/docs/kdepimlibs | 2 + source/kde/doinst.sh/amarok | 5 + source/kde/doinst.sh/blinken | 5 + source/kde/doinst.sh/bluedevil | 4 + source/kde/doinst.sh/cantor | 5 + source/kde/doinst.sh/gwenview | 5 + source/kde/doinst.sh/jovie | 5 + source/kde/doinst.sh/k3b | 5 + source/kde/doinst.sh/kalgebra | 5 + source/kde/doinst.sh/kalzium | 5 + source/kde/doinst.sh/kamera | 5 + source/kde/doinst.sh/kanagram | 5 + source/kde/doinst.sh/kate | 5 + source/kde/doinst.sh/kaudiocreator | 5 + source/kde/doinst.sh/kbruch | 5 + source/kde/doinst.sh/kcalc | 5 + source/kde/doinst.sh/kcolorchooser | 5 + source/kde/doinst.sh/kde-applications | 5 + source/kde/doinst.sh/kde-baseapps | 4 + source/kde/doinst.sh/kde-runtime | 5 + source/kde/doinst.sh/kde-workspace | 26 + source/kde/doinst.sh/kdeaccessibility | 5 + source/kde/doinst.sh/kdeadmin | 5 + source/kde/doinst.sh/kdeartwork | 5 + source/kde/doinst.sh/kdebase | 4 + source/kde/doinst.sh/kdeedu | 5 + source/kde/doinst.sh/kdegames | 5 + source/kde/doinst.sh/kdegraphics | 5 + source/kde/doinst.sh/kdelibs | 9 + source/kde/doinst.sh/kdemultimedia | 5 + source/kde/doinst.sh/kdenetwork | 5 + source/kde/doinst.sh/kdepim | 5 + source/kde/doinst.sh/kdepim-runtime | 5 + source/kde/doinst.sh/kdeplasma-addons | 5 + source/kde/doinst.sh/kdesdk | 5 + source/kde/doinst.sh/kdetoys | 5 + source/kde/doinst.sh/kdeutils | 5 + source/kde/doinst.sh/kdevelop | 5 + source/kde/doinst.sh/kdevplatform | 5 + source/kde/doinst.sh/kdewebdev | 5 + source/kde/doinst.sh/kdf | 5 + source/kde/doinst.sh/kgamma | 5 + source/kde/doinst.sh/kgeography | 5 + source/kde/doinst.sh/khangman | 5 + source/kde/doinst.sh/kig | 5 + source/kde/doinst.sh/kiten | 5 + source/kde/doinst.sh/klettres | 5 + source/kde/doinst.sh/kmag | 5 + source/kde/doinst.sh/kmousetool | 5 + source/kde/doinst.sh/kmouth | 5 + source/kde/doinst.sh/kmplot | 5 + source/kde/doinst.sh/koffice | 5 + source/kde/doinst.sh/kolourpaint | 5 + source/kde/doinst.sh/konsole | 5 + source/kde/doinst.sh/kopete-cryptography | 5 + source/kde/doinst.sh/kruler | 5 + source/kde/doinst.sh/ksaneplugin | 5 + source/kde/doinst.sh/ksnapshot | 5 + source/kde/doinst.sh/kstars | 5 + source/kde/doinst.sh/ktorrent | 5 + source/kde/doinst.sh/ktouch | 5 + source/kde/doinst.sh/kturtle | 5 + source/kde/doinst.sh/kwordquiz | 5 + source/kde/doinst.sh/marble | 5 + source/kde/doinst.sh/okular | 5 + source/kde/doinst.sh/parley | 5 + source/kde/doinst.sh/rocs | 5 + source/kde/doinst.sh/skanlite | 5 + source/kde/doinst.sh/step | 5 + source/kde/doinst.sh/wicd-kde | 5 + source/kde/k3b/doinst.sh | 5 - source/kde/k3b/k3b.SlackBuild | 94 - source/kde/k3b/local.options | 2 - source/kde/k3b/slack-desc | 19 - source/kde/kaudiocreator/doinst.sh | 5 - source/kde/kaudiocreator/kaudiocreator.SlackBuild | 86 - source/kde/kaudiocreator/local.options | 2 - source/kde/kaudiocreator/slack-desc | 19 - source/kde/kde-deps-build/PyQt | 1 + source/kde/kde-deps-build/QScintilla | 1 + source/kde/kde-deps-build/akonadi | 1 + source/kde/kde-deps-build/alldeps.SlackBuild | 73 + source/kde/kde-deps-build/attica | 1 + source/kde/kde-deps-build/clucene | 1 + source/kde/kde-deps-build/ebook-tools | 1 + source/kde/kde-deps-build/grantlee | 1 + source/kde/kde-deps-build/herqq | 1 + source/kde/kde-deps-build/hunspell | 1 + source/kde/kde-deps-build/lcms2 | 1 + source/kde/kde-deps-build/libatasmart | 1 + source/kde/kde-deps-build/libbluedevil | 1 + source/kde/kde-deps-build/libdbusmenu-qt | 1 + source/kde/kde-deps-build/libmsn | 1 + source/kde/kde-deps-build/libssh | 1 + source/kde/kde-deps-build/libvncserver | 1 + source/kde/kde-deps-build/phonon | 1 + source/kde/kde-deps-build/phonon-gstreamer | 1 + source/kde/kde-deps-build/phonon-mplayer | 1 + source/kde/kde-deps-build/phonon-xine | 1 + source/kde/kde-deps-build/polkit-qt-1 | 1 + source/kde/kde-deps-build/qt | 1 + source/kde/kde-deps-build/raptor2 | 1 + source/kde/kde-deps-build/rasqal | 1 + source/kde/kde-deps-build/redland | 1 + source/kde/kde-deps-build/sg3_utils | 1 + .../kde/kde-deps-build/shared-desktop-ontologies | 1 + source/kde/kde-deps-build/sip | 1 + source/kde/kde-deps-build/soprano | 1 + source/kde/kde-deps-build/strigi | 1 + source/kde/kde-deps-build/system-config-printer | 1 + source/kde/kde-deps-build/udisks | 1 + source/kde/kde-deps-build/upower | 1 + source/kde/kdeaccessibility/doinst.sh | 5 - .../kdeaccessibility/kdeaccessibility.SlackBuild | 90 - source/kde/kdeaccessibility/slack-desc | 20 - source/kde/kdeadmin/doinst.sh | 5 - source/kde/kdeadmin/kdeadmin.SlackBuild | 95 - source/kde/kdeadmin/knetworkconf.diff | 147 - source/kde/kdeadmin/local.options | 1 - source/kde/kdeadmin/slack-desc | 20 - source/kde/kdeartwork/doinst.sh | 5 - source/kde/kdeartwork/kdeartwork.SlackBuild | 91 - source/kde/kdeartwork/local.options | 1 - source/kde/kdeartwork/slack-desc | 19 - source/kde/kdebase-runtime/doinst.sh | 5 - .../kde/kdebase-runtime/kdebase-runtime.SlackBuild | 94 - source/kde/kdebase-runtime/local.options | 1 - source/kde/kdebase-runtime/slack-desc | 18 - source/kde/kdebase-workspace/config/Xsession | 88 - source/kde/kdebase-workspace/config/Xsession.orig | 65 - source/kde/kdebase-workspace/doinst.sh | 26 - .../kdebase-workspace/kdebase-workspace.SlackBuild | 126 - .../kdebase-workspace.kdm.server.timeout.diff | 14 - source/kde/kdebase-workspace/slack-desc | 12 - source/kde/kdebase-workspace/xinit/xinitrc.kde | 32 - source/kde/kdebase/config/kdeglobals | 4 - source/kde/kdebase/doinst.sh | 4 - source/kde/kdebase/kdebase.SlackBuild | 116 - .../kde/kdebase/konsole_right_click-185466.patch | 99 - .../kdebase/konsole_right_click-185466.patch.patch | 11 - source/kde/kdebase/local.options | 1 - source/kde/kdebase/profile.d/kde.csh | 12 - source/kde/kdebase/profile.d/kde.sh | 13 - source/kde/kdebase/slack-desc | 19 - .../kdebindings/kdebindings-len-ptr-rfloat.diff | 207 - source/kde/kdebindings/kdebindings-ruby-env.h.diff | 139 - .../kde/kdebindings/kdebindings-rubyconfig.h.diff | 20 - .../kdebindings.1170602.sip_4_11_x.diff | 66 - source/kde/kdebindings/kdebindings.SlackBuild | 111 - source/kde/kdebindings/local.options | 1 - source/kde/kdebindings/pykdeuic4.patch | 22 - source/kde/kdebindings/slack-desc | 19 - source/kde/kdeedu/doinst.sh | 5 - source/kde/kdeedu/kdeedu.SlackBuild | 90 - source/kde/kdeedu/slack-desc | 19 - source/kde/kdegames/doinst.sh | 5 - source/kde/kdegames/kdegames.SlackBuild | 90 - source/kde/kdegames/slack-desc | 19 - source/kde/kdegraphics/doinst.sh | 5 - source/kde/kdegraphics/kdegraphics.SlackBuild | 92 - source/kde/kdegraphics/local.options | 1 - source/kde/kdegraphics/slack-desc | 19 - source/kde/kdelibs/doinst.sh | 9 - source/kde/kdelibs/kdelibs.SlackBuild | 102 - source/kde/kdelibs/kdelibs.docbook.patch | 11 - .../kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff | 14 - .../kde/kdelibs/kdesu-allow_NOPASS_in_suauth.patch | 61 - source/kde/kdelibs/local.options | 1 - source/kde/kdelibs/slack-desc | 19 - source/kde/kdemultimedia/doinst.sh | 5 - source/kde/kdemultimedia/kdemultimedia.SlackBuild | 90 - source/kde/kdemultimedia/slack-desc | 19 - source/kde/kdenetwork/doinst.sh | 5 - source/kde/kdenetwork/kdenetwork.SlackBuild | 92 - source/kde/kdenetwork/slack-desc | 19 - source/kde/kdepim-runtime/doinst.sh | 5 - .../kde/kdepim-runtime/kdepim-runtime.SlackBuild | 91 - source/kde/kdepim-runtime/local.options | 1 - source/kde/kdepim-runtime/slack-desc | 19 - source/kde/kdepim/doinst.sh | 5 - .../kde/kdepim/kdepim-4.4.0-install-headers.patch | 127 - source/kde/kdepim/kdepim.SlackBuild | 94 - source/kde/kdepim/local.options | 1 - source/kde/kdepim/slack-desc | 19 - .../kdepimlibs-4.5.imap4.cpp.r1216162.diff | 13 - source/kde/kdepimlibs/kdepimlibs.SlackBuild | 93 - source/kde/kdepimlibs/local.options | 1 - source/kde/kdepimlibs/slack-desc | 19 - source/kde/kdeplasma-addons/doinst.sh | 5 - .../kdeplasma-addons/kdeplasma-addons.SlackBuild | 90 - source/kde/kdeplasma-addons/slack-desc | 19 - source/kde/kdesdk/doinst.sh | 5 - source/kde/kdesdk/kdesdk.SlackBuild | 90 - source/kde/kdesdk/slack-desc | 19 - source/kde/kdetoys/doinst.sh | 5 - source/kde/kdetoys/kdetoys.SlackBuild | 90 - source/kde/kdetoys/slack-desc | 19 - source/kde/kdeutils/doinst.sh | 5 - source/kde/kdeutils/kdeutils.SlackBuild | 91 - source/kde/kdeutils/slack-desc | 19 - source/kde/kdevelop/doinst.sh | 5 - source/kde/kdevelop/kdevelop.SlackBuild | 91 - source/kde/kdevelop/local.options | 1 - source/kde/kdevelop/slack-desc | 19 - source/kde/kdevplatform/doinst.sh | 5 - source/kde/kdevplatform/kdevplatform.SlackBuild | 91 - source/kde/kdevplatform/local.options | 1 - source/kde/kdevplatform/slack-desc | 19 - source/kde/kdewebdev/doinst.sh | 5 - source/kde/kdewebdev/include-tidy.patch | 13 - source/kde/kdewebdev/kde4-kdewebdev-findtidy.diff | 24 - source/kde/kdewebdev/kdewebdev.SlackBuild | 108 - source/kde/kdewebdev/slack-desc | 19 - source/kde/kdewebdev/tidy/get-tidy-cvs.sh | 37 - source/kde/kdewebdev/tidy/tidy.SlackBuild | 104 - source/kde/kdewebdev/tidy/tidy.build | 92 - source/kde/koffice/doinst.sh | 5 - source/kde/koffice/koffice.SlackBuild | 103 - source/kde/koffice/local.options | 2 - source/kde/koffice/slack-desc | 19 - .../kde/konq-plugins/konq-plugins-4.4.0-qt47.patch | 12 - source/kde/konq-plugins/konq-plugins.SlackBuild | 93 - source/kde/konq-plugins/local.options | 2 - source/kde/konq-plugins/slack-desc | 19 - source/kde/kopete-cryptography/doinst.sh | 5 - .../kopete-cryptography.SlackBuild | 91 - source/kde/kopete-cryptography/local.options | 1 - source/kde/kopete-cryptography/slack-desc | 19 - source/kde/ktorrent/doinst.sh | 5 - source/kde/ktorrent/ktorrent.SlackBuild | 91 - source/kde/ktorrent/local.options | 1 - source/kde/ktorrent/slack-desc | 19 - source/kde/libktorrent/libktorrent.SlackBuild | 90 - source/kde/libktorrent/local.options | 1 - source/kde/libktorrent/slack-desc | 19 - source/kde/modularize | 117 + source/kde/modules/extragear | 19 + source/kde/modules/kdeaccessibility | 7 + source/kde/modules/kdeadmin | 1 + source/kde/modules/kdeartwork | 1 + source/kde/modules/kdebase | 8 + source/kde/modules/kdebindings | 11 + source/kde/modules/kdeedu | 22 + source/kde/modules/kdegames | 1 + source/kde/modules/kdegraphics | 17 + source/kde/modules/kdelibs | 1 + source/kde/modules/kdemultimedia | 1 + source/kde/modules/kdenetwork | 1 + source/kde/modules/kdepim | 3 + source/kde/modules/kdepimlibs | 1 + source/kde/modules/kdeplasma-addons | 1 + source/kde/modules/kdesdk | 1 + source/kde/modules/kdetoys | 1 + source/kde/modules/kdeutils | 16 + source/kde/modules/kdewebdev | 1 + source/kde/modules/oxygen-icons | 2 + source/kde/modules/polkit-kde | 2 + source/kde/noarch | 5 + source/kde/oxygen-icons/oxygen-icons.SlackBuild | 86 - source/kde/oxygen-icons/slack-desc | 19 - source/kde/package-blacklist | 11 + source/kde/patch/README | 18 + source/kde/patch/amarok.patch | 3 + source/kde/patch/amarok/amarok-liblastfm1.patch | 704 + source/kde/patch/calligra.patch | 3 + .../calligra/calligra.words.fix_overflow.diff | 16 + source/kde/patch/kde-workspace.patch | 5 + .../kde-workspace/kde-workspace.batteryapplet.diff | 16 + .../kde-workspace.kdm.server.timeout.diff | 14 + source/kde/patch/kdelibs.patch | 8 + source/kde/patch/kdelibs/kdelibs.docbook.patch | 11 + .../patch/kdelibs/kdelibs.upnp_conditional.patch | 15 + source/kde/patch/kdepim.patch | 3 + .../kdepim/kdepim-4.5.85-install-headers.patch | 124 + source/kde/patch/kdewebdev.patch | 5 + source/kde/patch/kdewebdev/include-tidy.patch | 13 + source/kde/patch/korundum.patch | 4 + source/kde/patch/korundum/korundum_ruby19.patch | 31 + source/kde/polkit-kde-1/local.options | 2 - source/kde/polkit-kde-1/polkit-kde-1.SlackBuild | 95 - .../kde/polkit-kde-1/polkit-kde-1.nodrkonqi.diff | 17 - source/kde/polkit-kde-1/slack-desc | 18 - source/kde/polkit-kde-agent-1/local.options | 1 - .../polkit-kde-agent-1.SlackBuild | 93 - .../kde/polkit-kde-agent-1/pull-polkit-kde-agent-1 | 6 - source/kde/polkit-kde-agent-1/slack-desc | 18 - source/kde/polkit-kde-kcmodules-1/local.options | 1 - .../polkit-kde-kcmodules-1.SlackBuild | 93 - .../pull-polkit-kde-kcmodules-1 | 6 - source/kde/polkit-kde-kcmodules-1/slack-desc | 18 - source/kde/polkit-qt-1/local.options | 3 - source/kde/polkit-qt-1/polkit-qt-1.SlackBuild | 92 - .../kde/polkit-qt-1/polkit-qt-1.null-checking.diff | 14 - source/kde/polkit-qt-1/pull-polkit-qt-1 | 6 - source/kde/polkit-qt-1/slack-desc | 19 - source/kde/post-install/k3b.post-install | 2 + source/kde/post-install/kde-baseapps.post-install | 9 + .../post-install/kde-baseapps/profile.d/kde.csh | 12 + .../kde/post-install/kde-baseapps/profile.d/kde.sh | 13 + source/kde/post-install/kde-runtime.post-install | 9 + source/kde/post-install/kde-workspace.post-install | 46 + .../kde/post-install/kde-workspace/config/Xsession | 88 + .../kde-workspace/config/Xsession.orig | 65 + .../post-install/kde-workspace/xinit/xinitrc.kde | 32 + source/kde/post-install/kdelibs.post-install | 2 + source/kde/post-install/kdepim.post-install | 2 + source/kde/post-install/konsole.post-install | 12 + source/kde/post-install/wicd-kde.post-install | 2 + source/kde/pre-install/README | 18 + source/kde/pre-install/amarok.pre-install | 10 + source/kde/pre-install/kdewebdev.pre-install | 6 + .../kde/pre-install/kdewebdev/tidy/get-tidy-cvs.sh | 37 + .../kde/pre-install/kdewebdev/tidy/tidy.SlackBuild | 104 + source/kde/pre-install/kdewebdev/tidy/tidy.build | 92 + source/kde/skanlite/doinst.sh | 5 - source/kde/skanlite/local.options | 1 - source/kde/skanlite/skanlite.SlackBuild | 85 - source/kde/skanlite/slack-desc | 19 - source/kde/slack-desc/amarok | 19 + source/kde/slack-desc/analitza | 19 + source/kde/slack-desc/ark | 19 + source/kde/slack-desc/blinken | 19 + source/kde/slack-desc/bluedevil | 19 + source/kde/slack-desc/calligra | 19 + source/kde/slack-desc/cantor | 19 + source/kde/slack-desc/digikam | 19 + source/kde/slack-desc/filelight | 19 + source/kde/slack-desc/gwenview | 19 + source/kde/slack-desc/jovie | 19 + source/kde/slack-desc/k3b | 19 + source/kde/slack-desc/kaccessible | 19 + source/kde/slack-desc/kactivities | 19 + source/kde/slack-desc/kalgebra | 19 + source/kde/slack-desc/kalzium | 19 + source/kde/slack-desc/kamera | 19 + source/kde/slack-desc/kanagram | 19 + source/kde/slack-desc/kate | 19 + source/kde/slack-desc/kaudiocreator | 19 + source/kde/slack-desc/kbruch | 19 + source/kde/slack-desc/kcalc | 19 + source/kde/slack-desc/kcharselect | 19 + source/kde/slack-desc/kcolorchooser | 19 + source/kde/slack-desc/kde-base | 19 + source/kde/slack-desc/kde-base-artwork | 19 + source/kde/slack-desc/kde-baseapps | 19 + source/kde/slack-desc/kde-bindings | 19 + source/kde/slack-desc/kde-educational | 19 + source/kde/slack-desc/kde-runtime | 18 + source/kde/slack-desc/kde-wallpapers | 19 + source/kde/slack-desc/kde-workspace | 19 + source/kde/slack-desc/kdeaccessibility | 19 + source/kde/slack-desc/kdeadmin | 20 + source/kde/slack-desc/kdeartwork | 19 + source/kde/slack-desc/kdebase | 19 + source/kde/slack-desc/kdebase-runtime | 18 + source/kde/slack-desc/kdebase-workspace | 19 + source/kde/slack-desc/kdebindings | 19 + source/kde/slack-desc/kdeedu | 19 + source/kde/slack-desc/kdegames | 19 + source/kde/slack-desc/kdegraphics | 19 + source/kde/slack-desc/kdegraphics-mobipocket | 19 + source/kde/slack-desc/kdegraphics-strigi-analyzer | 19 + source/kde/slack-desc/kdegraphics-thumbnailers | 19 + source/kde/slack-desc/kdelibs | 19 + source/kde/slack-desc/kdemultimedia | 19 + source/kde/slack-desc/kdenetwork | 19 + source/kde/slack-desc/kdepim | 19 + source/kde/slack-desc/kdepim-runtime | 19 + source/kde/slack-desc/kdepimlibs | 19 + source/kde/slack-desc/kdeplasma-addons | 19 + source/kde/slack-desc/kdesdk | 19 + source/kde/slack-desc/kdetoys | 19 + source/kde/slack-desc/kdeutils | 19 + source/kde/slack-desc/kdevelop | 19 + source/kde/slack-desc/kdevelop-pg-qt | 19 + source/kde/slack-desc/kdevplatform | 19 + source/kde/slack-desc/kdewebdev | 19 + source/kde/slack-desc/kdf | 19 + source/kde/slack-desc/kfloppy | 19 + source/kde/slack-desc/kgamma | 19 + source/kde/slack-desc/kgeography | 19 + source/kde/slack-desc/kgpg | 19 + source/kde/slack-desc/khangman | 19 + source/kde/slack-desc/kig | 19 + source/kde/slack-desc/kimono | 19 + source/kde/slack-desc/kipi-plugins | 19 + source/kde/slack-desc/kiten | 19 + source/kde/slack-desc/klettres | 19 + source/kde/slack-desc/kmag | 19 + source/kde/slack-desc/kmousetool | 19 + source/kde/slack-desc/kmouth | 19 + source/kde/slack-desc/kmplot | 19 + source/kde/slack-desc/koffice | 19 + source/kde/slack-desc/kolourpaint | 19 + source/kde/slack-desc/konsole | 19 + source/kde/slack-desc/kopete-cryptography | 19 + source/kde/slack-desc/korundum | 19 + source/kde/slack-desc/kplayer | 19 + source/kde/slack-desc/kremotecontrol | 19 + source/kde/slack-desc/kross-interpreters | 19 + source/kde/slack-desc/kruler | 19 + source/kde/slack-desc/ksaneplugin | 19 + source/kde/slack-desc/ksecrets | 19 + source/kde/slack-desc/ksnapshot | 19 + source/kde/slack-desc/kstars | 19 + source/kde/slack-desc/ktimer | 19 + source/kde/slack-desc/ktorrent | 19 + source/kde/slack-desc/ktouch | 19 + source/kde/slack-desc/kturtle | 19 + source/kde/slack-desc/kwallet | 19 + source/kde/slack-desc/kwebkitpart | 19 + source/kde/slack-desc/kwordquiz | 19 + source/kde/slack-desc/libkdcraw | 19 + source/kde/slack-desc/libkdeedu | 19 + source/kde/slack-desc/libkexiv2 | 19 + source/kde/slack-desc/libkipi | 19 + source/kde/slack-desc/libksane | 19 + source/kde/slack-desc/libktorrent | 19 + source/kde/slack-desc/marble | 20 + source/kde/slack-desc/networkmanagement | 19 + source/kde/slack-desc/okular | 19 + source/kde/slack-desc/oxygen-gtk2 | 19 + source/kde/slack-desc/oxygen-icons | 19 + source/kde/slack-desc/parley | 19 + source/kde/slack-desc/perlkde | 19 + source/kde/slack-desc/perlqt | 19 + source/kde/slack-desc/polkit-kde-agent-1 | 19 + source/kde/slack-desc/polkit-kde-kcmodules-1 | 19 + source/kde/slack-desc/polkit-qt-1 | 19 + source/kde/slack-desc/printer-applet | 19 + source/kde/slack-desc/prison | 19 + source/kde/slack-desc/pykde4 | 19 + source/kde/slack-desc/qtruby | 19 + source/kde/slack-desc/quanta | 19 + source/kde/slack-desc/qyoto | 19 + source/kde/slack-desc/rocs | 19 + source/kde/slack-desc/skanlite | 19 + source/kde/slack-desc/smokegen | 19 + source/kde/slack-desc/smokekde | 19 + source/kde/slack-desc/smokeqt | 19 + source/kde/slack-desc/step | 19 + source/kde/slack-desc/strigi | 19 + source/kde/slack-desc/superkaramba | 19 + source/kde/slack-desc/svgpart | 19 + source/kde/slack-desc/sweeper | 19 + source/kde/slack-desc/wicd-kde | 19 + source/kdei/calligra-l10n/calligra-l10n.SlackBuild | 117 + source/kdei/calligra-l10n/languages | 26 + .../slack-desc/slack-desc.calligra-l10n-af | 19 + .../slack-desc/slack-desc.calligra-l10n-ar | 11 + .../slack-desc/slack-desc.calligra-l10n-az | 19 + .../slack-desc/slack-desc.calligra-l10n-bg | 11 + .../slack-desc/slack-desc.calligra-l10n-br | 19 + .../slack-desc/slack-desc.calligra-l10n-bs | 11 + .../slack-desc/slack-desc.calligra-l10n-ca | 11 + .../slack-desc.calligra-l10n-ca@valencia | 11 + .../slack-desc/slack-desc.calligra-l10n-cs | 19 + .../slack-desc/slack-desc.calligra-l10n-cy | 11 + .../slack-desc/slack-desc.calligra-l10n-da | 19 + .../slack-desc/slack-desc.calligra-l10n-de | 19 + .../slack-desc/slack-desc.calligra-l10n-el | 11 + .../slack-desc/slack-desc.calligra-l10n-en_GB | 19 + .../slack-desc/slack-desc.calligra-l10n-eo | 19 + .../slack-desc/slack-desc.calligra-l10n-es | 19 + .../slack-desc/slack-desc.calligra-l10n-et | 19 + .../slack-desc/slack-desc.calligra-l10n-eu | 19 + .../slack-desc/slack-desc.calligra-l10n-fa | 11 + .../slack-desc/slack-desc.calligra-l10n-fi | 11 + .../slack-desc/slack-desc.calligra-l10n-fr | 19 + .../slack-desc/slack-desc.calligra-l10n-fy | 11 + .../slack-desc/slack-desc.calligra-l10n-ga | 19 + .../slack-desc/slack-desc.calligra-l10n-gl | 19 + .../slack-desc/slack-desc.calligra-l10n-he | 11 + .../slack-desc/slack-desc.calligra-l10n-hi | 11 + .../slack-desc/slack-desc.calligra-l10n-hne | 11 + .../slack-desc/slack-desc.calligra-l10n-hsb | 11 + .../slack-desc/slack-desc.calligra-l10n-hu | 19 + .../slack-desc/slack-desc.calligra-l10n-is | 11 + .../slack-desc/slack-desc.calligra-l10n-it | 19 + .../slack-desc/slack-desc.calligra-l10n-ja | 19 + .../slack-desc/slack-desc.calligra-l10n-kk | 11 + .../slack-desc/slack-desc.calligra-l10n-km | 19 + .../slack-desc/slack-desc.calligra-l10n-lo | 11 + .../slack-desc/slack-desc.calligra-l10n-lt | 19 + .../slack-desc/slack-desc.calligra-l10n-lv | 11 + .../slack-desc/slack-desc.calligra-l10n-mk | 11 + .../slack-desc/slack-desc.calligra-l10n-ms | 19 + .../slack-desc/slack-desc.calligra-l10n-mt | 19 + .../slack-desc/slack-desc.calligra-l10n-nb | 11 + .../slack-desc/slack-desc.calligra-l10n-nds | 11 + .../slack-desc/slack-desc.calligra-l10n-ne | 11 + .../slack-desc/slack-desc.calligra-l10n-nl | 19 + .../slack-desc/slack-desc.calligra-l10n-nn | 11 + .../slack-desc/slack-desc.calligra-l10n-no | 19 + .../slack-desc/slack-desc.calligra-l10n-no_NY | 19 + .../slack-desc/slack-desc.calligra-l10n-pl | 19 + .../slack-desc/slack-desc.calligra-l10n-pt | 19 + .../slack-desc/slack-desc.calligra-l10n-pt_BR | 19 + .../slack-desc/slack-desc.calligra-l10n-ro | 19 + .../slack-desc/slack-desc.calligra-l10n-ru | 19 + .../slack-desc/slack-desc.calligra-l10n-se | 19 + .../slack-desc/slack-desc.calligra-l10n-sk | 19 + .../slack-desc/slack-desc.calligra-l10n-sl | 19 + .../slack-desc/slack-desc.calligra-l10n-sr | 19 + .../slack-desc/slack-desc.calligra-l10n-sr@Latn | 19 + .../slack-desc/slack-desc.calligra-l10n-sv | 19 + .../slack-desc/slack-desc.calligra-l10n-ta | 19 + .../slack-desc/slack-desc.calligra-l10n-tg | 11 + .../slack-desc/slack-desc.calligra-l10n-th | 11 + .../slack-desc/slack-desc.calligra-l10n-tr | 19 + .../slack-desc/slack-desc.calligra-l10n-uk | 19 + .../slack-desc/slack-desc.calligra-l10n-uz | 11 + .../slack-desc/slack-desc.calligra-l10n-ven | 11 + .../slack-desc/slack-desc.calligra-l10n-wa | 19 + .../slack-desc/slack-desc.calligra-l10n-xh | 11 + .../slack-desc/slack-desc.calligra-l10n-zh_CN | 11 + .../slack-desc/slack-desc.calligra-l10n-zh_TW | 11 + .../slack-desc/slack-desc.calligra-l10n-zu | 11 + source/kdei/kde-l10n/kde-l10n.SlackBuild | 16 +- .../kdepim-l10n/extract-kdepim-goodness.sh | 2 +- ...10n-fr-4.4.5.korganizer.docbook.reorganize.diff | 34 - source/kdei/kde-l10n/languages | 12 +- .../kde-l10n/slack-desc/slack-desc.kde-l10n-bs | 11 + .../slack-desc/slack-desc.kde-l10n-ca@valencia | 2 +- .../kde-l10n/slack-desc/slack-desc.kde-l10n-fa | 11 + .../kde-l10n/slack-desc/slack-desc.kde-l10n-ug | 11 + .../kde-l10n/slack-desc/slack-desc.kde-l10n-vi | 11 + source/kdei/koffice-l10n/koffice-l10n.SlackBuild | 114 - source/kdei/koffice-l10n/languages | 27 - .../slack-desc/slack-desc.koffice-l10n-af | 19 - .../slack-desc/slack-desc.koffice-l10n-ar | 11 - .../slack-desc/slack-desc.koffice-l10n-az | 19 - .../slack-desc/slack-desc.koffice-l10n-bg | 11 - .../slack-desc/slack-desc.koffice-l10n-br | 19 - .../slack-desc/slack-desc.koffice-l10n-bs | 11 - .../slack-desc/slack-desc.koffice-l10n-ca | 11 - .../slack-desc/slack-desc.koffice-l10n-ca@valencia | 11 - .../slack-desc/slack-desc.koffice-l10n-cs | 19 - .../slack-desc/slack-desc.koffice-l10n-cy | 11 - .../slack-desc/slack-desc.koffice-l10n-da | 19 - .../slack-desc/slack-desc.koffice-l10n-de | 19 - .../slack-desc/slack-desc.koffice-l10n-el | 11 - .../slack-desc/slack-desc.koffice-l10n-en_GB | 19 - .../slack-desc/slack-desc.koffice-l10n-eo | 19 - .../slack-desc/slack-desc.koffice-l10n-es | 19 - .../slack-desc/slack-desc.koffice-l10n-et | 19 - .../slack-desc/slack-desc.koffice-l10n-eu | 19 - .../slack-desc/slack-desc.koffice-l10n-fa | 11 - .../slack-desc/slack-desc.koffice-l10n-fi | 11 - .../slack-desc/slack-desc.koffice-l10n-fr | 19 - .../slack-desc/slack-desc.koffice-l10n-fy | 11 - .../slack-desc/slack-desc.koffice-l10n-ga | 19 - .../slack-desc/slack-desc.koffice-l10n-gl | 19 - .../slack-desc/slack-desc.koffice-l10n-he | 11 - .../slack-desc/slack-desc.koffice-l10n-hi | 11 - .../slack-desc/slack-desc.koffice-l10n-hne | 11 - .../slack-desc/slack-desc.koffice-l10n-hsb | 11 - .../slack-desc/slack-desc.koffice-l10n-hu | 19 - .../slack-desc/slack-desc.koffice-l10n-is | 11 - .../slack-desc/slack-desc.koffice-l10n-it | 19 - .../slack-desc/slack-desc.koffice-l10n-ja | 19 - .../slack-desc/slack-desc.koffice-l10n-kk | 11 - .../slack-desc/slack-desc.koffice-l10n-km | 19 - .../slack-desc/slack-desc.koffice-l10n-lo | 11 - .../slack-desc/slack-desc.koffice-l10n-lt | 19 - .../slack-desc/slack-desc.koffice-l10n-lv | 11 - .../slack-desc/slack-desc.koffice-l10n-mk | 11 - .../slack-desc/slack-desc.koffice-l10n-ms | 19 - .../slack-desc/slack-desc.koffice-l10n-mt | 19 - .../slack-desc/slack-desc.koffice-l10n-nb | 11 - .../slack-desc/slack-desc.koffice-l10n-nds | 11 - .../slack-desc/slack-desc.koffice-l10n-ne | 11 - .../slack-desc/slack-desc.koffice-l10n-nl | 19 - .../slack-desc/slack-desc.koffice-l10n-nn | 11 - .../slack-desc/slack-desc.koffice-l10n-no | 19 - .../slack-desc/slack-desc.koffice-l10n-no_NY | 19 - .../slack-desc/slack-desc.koffice-l10n-pl | 19 - .../slack-desc/slack-desc.koffice-l10n-pt | 19 - .../slack-desc/slack-desc.koffice-l10n-pt_BR | 19 - .../slack-desc/slack-desc.koffice-l10n-ro | 19 - .../slack-desc/slack-desc.koffice-l10n-ru | 19 - .../slack-desc/slack-desc.koffice-l10n-se | 19 - .../slack-desc/slack-desc.koffice-l10n-sk | 19 - .../slack-desc/slack-desc.koffice-l10n-sl | 19 - .../slack-desc/slack-desc.koffice-l10n-sr | 19 - .../slack-desc/slack-desc.koffice-l10n-sr@Latn | 19 - .../slack-desc/slack-desc.koffice-l10n-sv | 19 - .../slack-desc/slack-desc.koffice-l10n-ta | 19 - .../slack-desc/slack-desc.koffice-l10n-tg | 11 - .../slack-desc/slack-desc.koffice-l10n-th | 11 - .../slack-desc/slack-desc.koffice-l10n-tr | 19 - .../slack-desc/slack-desc.koffice-l10n-uk | 19 - .../slack-desc/slack-desc.koffice-l10n-uz | 11 - .../slack-desc/slack-desc.koffice-l10n-ven | 11 - .../slack-desc/slack-desc.koffice-l10n-wa | 19 - .../slack-desc/slack-desc.koffice-l10n-xh | 11 - .../slack-desc/slack-desc.koffice-l10n-zh_CN | 11 - .../slack-desc/slack-desc.koffice-l10n-zh_TW | 11 - .../slack-desc/slack-desc.koffice-l10n-zu | 11 - source/l/ConsoleKit/ConsoleKit.SlackBuild | 51 +- ...don-t-truncate-frequent-output-to-8-chars.patch | 28 + source/l/GConf/GConf.SlackBuild | 129 + source/l/GConf/doinst.sh | 20 + source/l/GConf/slack-desc | 19 + source/l/M2Crypto/M2Crypto.SlackBuild | 2 +- source/l/PyQt/PyQt.SlackBuild | 38 +- source/l/PyQt/PyQt.info | 2 - source/l/PyQt/slack-desc | 2 +- source/l/QScintilla/QScintilla.SlackBuild | 52 +- source/l/akonadi/akonadi.SlackBuild | 35 +- source/l/akonadi/slack-desc | 2 +- source/l/alsa-lib/alsa-lib.SlackBuild | 2 +- source/l/alsa-oss/alsa-oss.SlackBuild | 4 +- source/l/apr-util/apr-util.SlackBuild | 6 +- source/l/apr-util/apr-util.url | 2 + source/l/apr/apr.SlackBuild | 5 +- source/l/apr/apr.apr_ring.h.gcc45.diff | 13 - source/l/apr/apr.url | 2 + source/l/atk/atk.SlackBuild | 25 +- source/l/attica/attica.SlackBuild | 43 +- source/l/attica/slack-desc | 2 +- source/l/babl/babl.SlackBuild | 15 +- source/l/boost/boost.SlackBuild | 63 +- source/l/chmlib/slack-desc | 2 +- source/l/clucene/clucene.SlackBuild | 66 +- source/l/clucene/clucene.info | 5 - source/l/clucene/clucene.pkgconfig.patch | 24 + source/l/clucene/slack-desc | 7 + source/l/db44/db44.SlackBuild | 12 +- source/l/db48/db48.SlackBuild | 143 + source/l/db48/slack-desc | 19 + source/l/dbus-glib/dbus-glib.SlackBuild | 23 +- source/l/dbus-python/dbus-python.SlackBuild | 28 +- .../desktop-file-utils.SlackBuild | 2 +- source/l/djvulibre/djvulibre.SlackBuild | 5 +- source/l/ebook-tools/ebook-tools.SlackBuild | 29 +- source/l/ebook-tools/ebook-tools.paths.diff | 12 +- source/l/ebook-tools/slack-desc | 2 +- source/l/exiv2/exiv2.SlackBuild | 10 +- source/l/fftw/slack-desc | 2 +- source/l/freetype/freetype.SlackBuild | 6 +- source/l/fribidi/fribidi.SlackBuild | 30 +- source/l/fribidi/fribidi.glib.h.diff | 76 + .../fix-double-lock-in-inotify-helper-c.patch | 21 + source/l/gamin/gamin.SlackBuild | 10 +- source/l/gamin/no_g_const_return.patch | 44 + source/l/gcr/doinst.sh | 20 + source/l/gcr/gcr.SlackBuild | 112 + source/l/gcr/slack-desc | 19 + source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild | 31 +- source/l/gdk-pixbuf2/update-gdk-pixbuf-loaders | 4 + source/l/gegl/gegl.SlackBuild | 7 +- source/l/gegl/slack-desc | 2 +- source/l/glade3/glade3.SlackBuild | 108 + source/l/glade3/slack-desc | 19 + source/l/glib-networking/doinst.sh | 4 + .../l/glib-networking/glib-networking.SlackBuild | 121 + source/l/glib-networking/slack-desc | 19 + source/l/glib2/doinst.sh | 3 +- source/l/glib2/glib2.SlackBuild | 20 +- source/l/glibc/doinst.sh-glibc | 36 +- source/l/glibc/doinst.sh-glibc-solibs | 36 +- .../glibc/glibc-2.14-reexport-rpc-interface.patch | 26 + .../glibc-2.14-reinstall-nis-rpc-headers.patch | 27 + source/l/glibc/glibc-2.14.1-fixes-1.patch | 159 + source/l/glibc/glibc-2.15-revert-c5a0802a.diff | 226 + source/l/glibc/glibc-2.15.nscd-race-fix.diff | 47 + source/l/glibc/glibc.SlackBuild | 34 +- ...t-6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4.diff | 322 + source/l/glibc/glibc.strtod.CVE-2012-3480.diff | 407 + source/l/glibc/slack-desc.glibc-zoneinfo | 2 +- source/l/glibc/slack-desc.glibc-zoneinfo.olson | 19 + source/l/glibc/timezone-scripts/timeconfig | 90 + source/l/gmp/gmp.SlackBuild | 34 +- .../l/gnome-icon-theme/gnome-icon-theme.SlackBuild | 72 +- .../gnome-icon-theme.pkgconfig.path.diff | 11 - source/l/gnome-keyring/doinst.sh | 1 + source/l/gnome-keyring/gnome-keyring.SlackBuild | 117 + .../gpg-agent-Hook-up-the-TTL-cache-option.patch | 98 + ...a-Update-description-for-gpg-cache-method.patch | 30 + ...ore-Mark-a-secret-item-as-used-when-acces.patch | 26 + source/l/gnome-keyring/slack-desc | 19 + .../gobject-introspection.SlackBuild | 132 + source/l/gobject-introspection/slack-desc | 19 + source/l/grantlee/grantlee.SlackBuild | 106 + source/l/grantlee/slack-desc | 19 + source/l/gsettings-desktop-schemas/doinst.sh | 1 + .../gsettings-desktop-schemas.SlackBuild | 106 + source/l/gsettings-desktop-schemas/slack-desc | 19 + .../l/gst-plugins-base/gst-plugins-base.SlackBuild | 20 +- ...d.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff | 11 - .../l/gst-plugins-good/gst-plugins-good.SlackBuild | 6 +- source/l/gstreamer/gstreamer.SlackBuild | 20 +- source/l/gtk+2/gtk+2.SlackBuild | 13 +- source/l/gtk+3/doinst.sh | 28 + source/l/gtk+3/gtk+3.SlackBuild | 188 + source/l/gtk+3/slack-desc | 19 + source/l/gtk+3/update-gtk-immodules-3.0 | 86 + .../gtk+3/use_host_triplet_for_gtk_immodules.diff | 11 + source/l/gvfs/doinst.sh | 4 + source/l/gvfs/gvfs.SlackBuild | 132 + source/l/gvfs/slack-desc | 19 + source/l/hal-info/hal-info.SlackBuild | 69 - .../hal-info/patches/quirk-LG_X110-keyboard.patch | 46 - .../patches/quirk-acer_aspire_hotkey.patch | 25 - source/l/hal-info/slack-desc | 19 - source/l/hal/doinst.sh | 23 - source/l/hal/hal.SlackBuild | 177 - source/l/hal/hal.conf | 69 - .../l/hal/patches/10-keymap.fdi-restore_zap.diff | 67 - .../patches/fix-build-with-automake-1.11.1.patch | 27 - source/l/hal/patches/fix-hal-segfault.patch | 33 - source/l/hal/patches/fix_ioperm_arguments.patch | 40 - source/l/hal/patches/fix_libusb_detection.diff | 65 - .../hal/patches/fix_segfault-dbus_error_init.patch | 179 - .../fix_segfault_in_LIBHAL_FREE_DBUS_ERROR.diff | 51 - .../patches/handle_input.touchpad_explicitly.diff | 75 - .../l/hal/patches/ignore_internal_dm_devices.diff | 47 - .../hal/patches/increase_HAL_PATH_MAX_to_4096.diff | 30 - source/l/hal/rc.hald | 49 - source/l/hal/slack-desc | 19 - source/l/herqq/herqq.SlackBuild | 98 + source/l/herqq/slack-desc | 19 + source/l/hicolor-icon-theme/doinst.sh | 6 +- .../hicolor-icon-theme.SlackBuild | 2 +- .../setup.08.gtk-update-icon-cache | 6 +- source/l/hunspell/hunspell.SlackBuild | 26 +- source/l/hunspell/slack-desc | 6 +- source/l/icon-naming-utils/slack-desc | 8 +- source/l/icu4c/icu4c.SlackBuild | 104 + source/l/icu4c/slack-desc | 19 + source/l/ilmbase/slack-desc | 2 +- source/l/jasper/slack-desc | 3 +- source/l/jre | 1 - source/l/js185/js185-destdir.patch | 15 + source/l/js185/js185.SlackBuild | 120 + source/l/js185/slack-desc | 19 + source/l/keybinder/keybinder.SlackBuild | 109 + source/l/keybinder/slack-desc | 19 + source/l/keyutils/keyutils.SlackBuild | 134 + source/l/keyutils/slack-desc | 19 + source/l/lcms/lcms.SlackBuild | 2 +- source/l/lcms2/lcms2.SlackBuild | 119 + source/l/lcms2/slack-desc | 19 + source/l/libarchive/libarchive.info | 2 - source/l/libatasmart/README | 2 + source/l/libatasmart/libatasmart.SlackBuild | 112 + source/l/libatasmart/libatasmart.info | 1 + source/l/libatasmart/slack-desc | 19 + source/l/libbluedevil/libbluedevil.SlackBuild | 109 + source/l/libbluedevil/slack-desc | 19 + source/l/libcaca/libcaca.SlackBuild | 3 +- source/l/libcanberra/libcanberra.SlackBuild | 109 + source/l/libcanberra/libcanberra.url | 1 + source/l/libcanberra/slack-desc | 19 + source/l/libcap/libcap-2.20.tar.sign | 8 - source/l/libcap/libcap-2.22.tar.bz2.sign | 8 + source/l/libcap/libcap.SlackBuild | 4 +- source/l/libcddb/libcddb.SlackBuild | 2 +- source/l/libcdio/libcdio.SlackBuild | 34 +- source/l/libcdio/libcdio.url | 1 + source/l/libcroco/libcroco.SlackBuild | 104 + source/l/libcroco/libcroco.url | 1 + source/l/libcroco/slack-desc | 19 + source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild | 32 +- source/l/libdbusmenu-qt/slack-desc | 2 +- source/l/libdvdread/libdvdread.SlackBuild | 4 +- source/l/libexif/libexif.SlackBuild | 2 +- source/l/libffi/libffi.SlackBuild | 132 + source/l/libffi/slack-desc | 19 + .../l/libgnome-keyring/libgnome-keyring.SlackBuild | 107 + source/l/libgnome-keyring/slack-desc | 19 + .../fix-usb_id-callout-for-udev-175.diff | 12 + source/l/libgphoto2/libgphoto2.SlackBuild | 25 +- source/l/libgphoto2/slack-desc | 6 +- source/l/libgpod/libgpod.SlackBuild | 2 +- source/l/libgsf/libgsf.SlackBuild | 2 +- source/l/libical/libical.info | 8 - source/l/libical/slack-desc | 2 +- source/l/libidn/libidn.SlackBuild | 2 +- source/l/libieee1284/libieee1284.SlackBuild | 2 +- source/l/libjpeg/libjpeg.SlackBuild | 2 +- source/l/liblastfm/liblastfm.SlackBuild | 20 +- source/l/libmsn/libmsn.SlackBuild | 31 +- source/l/libmsn/libmsn.gcc47.diff | 10 + source/l/libmsn/slack-desc | 2 +- source/l/libmtp/libmtp.SlackBuild | 35 +- source/l/libnl3/doinst.sh | 16 + source/l/libnl3/libnl3.SlackBuild | 126 + source/l/libnl3/slack-desc | 19 + source/l/libnotify/libnotify.SlackBuild | 13 +- source/l/libpcap/libpcap.SlackBuild | 12 +- source/l/libpng/libpng.SlackBuild | 6 +- source/l/libpng/libpng.url | 1 + source/l/libproxy/gcc47-include-unistd.h.diff | 22 + source/l/libproxy/libproxy.SlackBuild | 109 + source/l/libproxy/libproxy.url | 1 + source/l/libproxy/only_link_mozjs185.diff | 46 + source/l/libproxy/slack-desc | 19 + source/l/librsvg/librsvg.SlackBuild | 18 +- source/l/libsoup/libsoup.SlackBuild | 98 + source/l/libsoup/slack-desc | 19 + source/l/libspectre/libspectre.SlackBuild | 22 +- source/l/libssh/libssh.SlackBuild | 113 + source/l/libssh/slack-desc | 19 + source/l/libtasn1/libtasn1.SlackBuild | 124 + source/l/libtasn1/slack-desc | 19 + source/l/libtiff/libtiff-CVE-2011-0192.patch | 27 - source/l/libtiff/libtiff-CVE-2011-1167.patch | 53 - source/l/libtiff/libtiff-CVE-2012-1173.patch | 71 + source/l/libtiff/libtiff.SlackBuild | 7 +- source/l/libusb-compat/libusb-compat.SlackBuild | 140 + source/l/libusb-compat/slack-desc | 19 + source/l/libusb/libusb.SlackBuild | 46 +- source/l/libusb/libusb.fix.debug.log.level.diff | 12 - source/l/libusb/slack-desc | 8 +- source/l/libvisual/libvisual.SlackBuild | 6 +- source/l/libvisual/libvisual.glib.h.diff | 11 + source/l/libvncserver/libvncserver.SlackBuild | 43 +- source/l/libvorbis/libvorbis.SlackBuild | 8 + source/l/libwnck/libwnck.SlackBuild | 2 +- source/l/libwpd/libwpd.SlackBuild | 10 +- .../l/libxml2/libxml2-2.7.8.broken.versioning.diff | 23 - source/l/libxml2/libxml2.SlackBuild | 12 +- source/l/libxslt/libxslt.SlackBuild | 4 +- source/l/libyaml/libyaml.SlackBuild | 114 + source/l/libyaml/libyaml.url | 1 + source/l/libyaml/slack-desc | 19 + .../loudmouth-1.4.3-glib-compile-fix.patch | 17 + source/l/loudmouth/loudmouth.SlackBuild | 11 +- source/l/lzo/.lzo.info | 8 - .../media-player-info/media-player-info.SlackBuild | 80 + source/l/media-player-info/slack-desc | 19 + source/l/mozilla-nss/MPL-1.1.txt | 470 + source/l/mozilla-nss/faq.html | 364 + source/l/mozilla-nss/gpl-2.0.txt | 339 + source/l/mozilla-nss/lgpl-2.1.txt | 504 + source/l/mozilla-nss/mozilla-nss.SlackBuild | 178 + source/l/mozilla-nss/nss-config.in | 145 + source/l/mozilla-nss/slack-desc | 19 + source/l/mpfr/mpfr.SlackBuild | 36 +- source/l/neon/neon.SlackBuild | 2 +- source/l/notify-python/libnotify07.patch | 38 + source/l/notify-python/notify-python.SlackBuild | 5 +- source/l/notify-python/slack-desc | 2 +- source/l/pango/pango.SlackBuild | 16 +- .../l/phonon-gstreamer/phonon-gstreamer.SlackBuild | 122 + source/l/phonon-gstreamer/slack-desc | 19 + source/l/phonon-mplayer/phonon-mplayer.SlackBuild | 28 +- .../phonon-backend-xine-4.4.4.find.phonon.patch | 186 + source/l/phonon-xine/phonon-xine.SlackBuild | 131 + source/l/phonon-xine/slack-desc | 19 + source/l/phonon/phonon.SlackBuild | 34 +- source/l/phonon/slack-desc | 10 +- source/l/pil/pil.SlackBuild | 2 +- source/l/pilot-link/pilot-link.SlackBuild | 2 +- source/l/polkit-gnome/polkit-gnome.SlackBuild | 10 +- source/l/polkit-qt-1/polkit-qt-1.SlackBuild | 113 + source/l/polkit-qt-1/pull-polkit-qt-1 | 6 + source/l/polkit-qt-1/slack-desc | 19 + .../polkit/10-org.freedesktop.NetworkManager.pkla | 6 + .../l/polkit/20-plugdev-group-mount-override.pkla | 6 + ...rocess-Clarify-that-the-real-uid-is-retur.patch | 139 - ...UnixProcess-also-record-the-uid-of-the-pr.patch | 623 - ...unix_process_get_uid-to-get-the-owner-of-.patch | 41 - ...void-TOCTTOU-problems-with-parent-process.patch | 127 - source/l/polkit/doinst.sh | 13 + source/l/polkit/polkit.SlackBuild | 30 +- source/l/poppler-data/poppler-data.SlackBuild | 10 +- source/l/poppler/poppler.SlackBuild | 9 +- source/l/poppler/poppler_xyscale.patch | 47 + source/l/pycairo/pycairo.SlackBuild | 2 +- source/l/pycurl/pycurl.SlackBuild | 84 + source/l/pycurl/slack-desc | 19 + source/l/pygobject/pygobject.SlackBuild | 9 +- .../pygobject.fix.no.introspection.crash.diff | 22 - source/l/pygobject/pygobject.flags.diff | 49 + source/l/pygtk/pygtk.SlackBuild | 2 +- source/l/pyrex/pyrex.SlackBuild | 2 +- source/l/qca-cyrus-sasl/slack-desc | 2 +- source/l/qca-ossl/qca-ossl-openssl-1.0.0.patch | 155 + source/l/qca-ossl/qca-ossl.SlackBuild | 6 +- source/l/qca-ossl/qca-ossl.nowhirlpool.diff | 30 - source/l/qt/QElfParser-fix-type-of-sh_size.patch | 41 + ..._orphaned_file_descriptors_after_printing.patch | 37 + ..._not_clickable_when_run_under_gnome-shell.patch | 97 + source/l/qt/Qt.pc | 16 + source/l/qt/doinst.sh | 5 + .../l/qt/qt.QSortFilterProxyModel.reformatted.diff | 92 - source/l/qt/qt.SlackBuild | 185 +- source/l/qt/qt.assistant.memcpy-crash.diff | 11 + source/l/qt/qt.blacklist.bad.certs.diff | 67 - source/l/qt/qt.blacklist.bad.certs.patch02.diff | 35 - source/l/qt/qt.ca89c49.cursor.position.diff | 31 + source/l/qt/qt.ld-gold.patch | 22 + source/l/qt/qt.webkit-no_Werror.patch | 13 + source/l/qt/qt.webkit.glib.diff | 11 + source/l/qt/qt.x86.cflags.diff | 11 - source/l/qt/slack-desc | 2 +- .../qtscriptgenerator/qtscriptgenerator.SlackBuild | 24 +- .../qtscriptgenerator/qtscriptgenerator.gcc44.diff | 10 - source/l/qtscriptgenerator/slack-desc | 12 +- source/l/raptor/raptor.SlackBuild | 118 - source/l/raptor/raptor.info | 2 - source/l/raptor/slack-desc | 12 - source/l/raptor2/raptor2.SlackBuild | 38 +- source/l/raptor2/slack-desc | 7 + source/l/rasqal/rasqal.SlackBuild | 34 +- source/l/rasqal/slack-desc | 9 +- source/l/redland/redland.SlackBuild | 37 +- source/l/redland/slack-desc | 7 + source/l/sg3_utils/sg3_utils.SlackBuild | 113 + source/l/sg3_utils/sg3_utils.info | 1 + source/l/sg3_utils/slack-desc | 19 + .../shared-desktop-ontologies.SlackBuild | 41 +- source/l/shared-desktop-ontologies/slack-desc | 2 +- source/l/shared-mime-info/doinst.sh | 2 +- .../l/shared-mime-info/shared-mime-info.SlackBuild | 26 +- source/l/sip/sip.SlackBuild | 42 +- source/l/sip/slack-desc | 2 +- source/l/soprano/slack-desc | 4 +- source/l/soprano/soprano.SlackBuild | 41 +- source/l/sound-theme-freedesktop/slack-desc | 19 + .../sound-theme-freedesktop.SlackBuild | 73 + .../sound-theme-freedesktop.url | 2 + .../startup-notification.SlackBuild | 2 +- source/l/strigi/README | 17 + source/l/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff | 16 + source/l/strigi/strigi.SlackBuild | 46 +- source/l/system-config-printer/doinst.sh | 4 +- .../system-config-printer.SlackBuild | 50 +- source/l/t1lib/t1lib.SlackBuild | 10 +- source/l/t1lib/t1lib_5.1.2-3.5.diff | 2109 ++ source/l/t1lib/t1lib_5.1.2-3.diff | 1830 - source/l/taglib/taglib.SlackBuild | 15 +- source/l/urwid/urwid.SlackBuild | 3 +- source/l/v4l-utils/slack-desc | 4 +- source/l/v4l-utils/v4l-utils.SlackBuild | 4 +- .../virtuoso-opensource-6.1.3.unicode.patch | 16 + source/l/virtuoso-ose/virtuoso-ose.SlackBuild | 11 +- source/l/vte/fix_meta_alt_keybinding.patch | 74 + source/l/vte/vte.SlackBuild | 10 +- source/l/vte/vte.escape.cpu.usage.diff | 89 + source/l/wv2/slack-desc | 19 - source/l/wv2/wv2.SlackBuild | 98 - source/l/zlib/zlib.SlackBuild | 23 +- source/l/zlib/zlib.largefile64_source.diff | 11 - source/local/README | 1 - source/local/jre/COPYRIGHT | 70 - source/local/jre/README | 1 - source/local/jre/THIRDPARTYLICENSEREADME.txt | 1 - source/local/jre/Welcome.html | 26 - source/local/jre/jre.SlackBuild | 130 - source/local/jre/profile.d/jre.csh | 4 - source/local/jre/profile.d/jre.sh | 4 - source/local/jre/slack-desc | 18 - source/n/ModemManager/ModemManager.SlackBuild | 105 + source/n/ModemManager/slack-desc | 19 + .../11-initialize-nm-remote-settings.patch | 27 + source/n/NetworkManager/55NetworkManager | 42 + source/n/NetworkManager/NetworkManager.SlackBuild | 154 + source/n/NetworkManager/NetworkManager.conf.new | 11 + source/n/NetworkManager/README | 15 + source/n/NetworkManager/doinst.sh | 32 + source/n/NetworkManager/slack-desc | 19 + source/n/alpine/alpine.SlackBuild | 28 +- source/n/alpine/alpine.config.h.diff | 15 - source/n/bind/bind.SlackBuild | 6 +- source/n/bind/caching-example/named.root | 5 +- source/n/bluez-hcidump/bluez-hcidump-2.4.tar.sign | 17 + source/n/bluez-hcidump/bluez-hcidump.SlackBuild | 3 +- source/n/bluez/bluez-4.91.tar.sign | 8 - source/n/bluez/bluez-4.99.tar.sign | 17 + source/n/bluez/bluez.SlackBuild | 47 +- source/n/bluez/bluez.enable.audio.socket.diff | 12 + source/n/bluez/config/bluetooth.sh | 7 - source/n/bluez/config/rc.bluetooth | 5 +- source/n/bluez/doinst.sh | 1 - source/n/bluez/passkey-agent.c | 418 - source/n/bluez/patches/bluez-dbus-config.patch | 22 - source/n/bluez/patches/bluez-run_udev_helper.patch | 12 - .../n/bluez/patches/bluez-unbreak_dell_mouse.patch | 14 - .../n/ca-certificates/ca-certificates.SlackBuild | 18 +- .../cacerts-20090814-fixup_DESTDIR.diff | 94 - ...erts-20090814-fixup_update-ca-certificates.diff | 14 - .../cacerts-20090814-remove_debconf.diff | 12 - source/n/ca-certificates/doinst.sh | 4 +- .../n/ca-certificates/patches/fixup_DESTDIR.diff | 64 + .../patches/fixup_update-ca-certificates.diff | 14 + .../n/ca-certificates/patches/remove_debconf.diff | 12 + source/n/ca-certificates/setup.11.cacerts | 3 + source/n/cifs-utils/cifs-utils.SlackBuild | 150 + ...set-rc-to-0-in-libcap-toggle_dac_capabili.patch | 38 + source/n/cifs-utils/slack-desc | 19 + source/n/curl/cacert-fetch.sh | 1 + source/n/curl/cacert.pem | 1257 +- .../n/curl/curl-7.27.0_curl-config_syntax_fix.diff | 15 + source/n/curl/curl.SlackBuild | 11 +- source/n/cyrus-sasl/cyrus-sasl.SlackBuild | 17 +- source/n/cyrus-sasl/cyrus-sasl.bad_elif.diff | 22 + source/n/dhcp/dhcp.SlackBuild | 19 +- source/n/dhcpcd/50-ntp.conf.diff | 29 - source/n/dhcpcd/COPYRIGHT | 2 +- .../dhcpcd/define-SERVICEstuff-for-Slackware.patch | 32 + source/n/dhcpcd/dhcpcd.SlackBuild | 31 +- source/n/epic5/epic5.SlackBuild | 2 +- source/n/fetchmail/fetchmail.SlackBuild | 2 +- source/n/fetchmail/fetchmail.url | 4 + source/n/gnupg/gnupg.SlackBuild | 4 +- source/n/gnupg2/gnupg2.SlackBuild | 22 +- source/n/gnutls/gnutls.SlackBuild | 24 +- source/n/gpa/doinst.sh | 3 - source/n/gpa/gpa.SlackBuild | 21 +- source/n/gpgme/gpgme.SlackBuild | 2 +- source/n/htdig/htdig.SlackBuild | 2 +- source/n/htdig/slack-desc | 2 +- source/n/httpd/README | 34 - source/n/httpd/config.layout.diff | 30 - source/n/httpd/doinst.sh | 53 +- source/n/httpd/httpd.SlackBuild | 54 +- .../httpd.brigade_move.__noinline__.gcc451.diff | 10 - source/n/httpd/httpd.nossldefault.diff | 11 - source/n/httpd/httpd.url | 4 +- source/n/httpd/rc.httpd | 11 +- source/n/iftop/iftop.SlackBuild | 126 + source/n/iftop/slack-desc | 19 + source/n/iproute2/doinst.sh | 1 + source/n/iproute2/fixup-for-x86_64.diff | 12 + source/n/iproute2/iproute2.SlackBuild | 45 +- .../iproute2.fixup_dbpath_and_iptablespath.diff | 34 - source/n/iptables/iptables.SlackBuild | 24 +- source/n/iputils/iputils.SlackBuild | 2 +- source/n/irssi/irssi.SlackBuild | 4 +- source/n/iw/iw.SlackBuild | 17 +- source/n/iw/iw.info | 2 +- .../iwlwifi-100-ucode/iwlwifi-100-ucode.SlackBuild | 57 - source/n/iwlwifi-100-ucode/slack-desc | 19 - .../iwlwifi-1000-ucode.SlackBuild | 57 - source/n/iwlwifi-1000-ucode/slack-desc | 19 - .../iwlwifi-3945-ucode.SlackBuild | 57 - source/n/iwlwifi-3945-ucode/slack-desc | 19 - .../iwlwifi-4965-ucode.SlackBuild | 57 - source/n/iwlwifi-4965-ucode/slack-desc | 19 - .../iwlwifi-5000-ucode.SlackBuild | 57 - source/n/iwlwifi-5000-ucode/slack-desc | 19 - .../iwlwifi-5150-ucode.SlackBuild | 57 - source/n/iwlwifi-5150-ucode/slack-desc | 19 - .../iwlwifi-6000-ucode.SlackBuild | 57 - source/n/iwlwifi-6000-ucode/slack-desc | 19 - .../iwlwifi-6xxx-ucode.SlackBuild | 58 - source/n/iwlwifi-6xxx-ucode/slack-desc | 19 - source/n/lftp/lftp.SlackBuild | 6 +- source/n/libgcrypt/libgcrypt.SlackBuild | 2 +- source/n/libgpg-error/libgpg-error.SlackBuild | 2 +- source/n/links/links.SlackBuild | 2 +- source/n/lynx/lynx.SlackBuild | 5 +- source/n/mailx/mailx.SlackBuild | 30 +- source/n/mobile-broadband-provider-info/README | 2 + .../mobile-broadband-provider-info.SlackBuild | 124 + .../mobile-broadband-provider-info.pc.diff | 10 + source/n/mobile-broadband-provider-info/slack-desc | 19 + source/n/mtr/mtr.SlackBuild | 4 +- source/n/mutt/mutt.SlackBuild | 2 +- source/n/net-snmp/net-snmp.SlackBuild | 4 +- source/n/net-snmp/slack-desc | 2 +- source/n/net-tools/net-tools.SlackBuild | 31 +- source/n/net-tools/net-tools.config.h | 78 + source/n/net-tools/net-tools.diff | 77 - source/n/net-tools/net-tools.mii-tool.string.diff | 29 - .../net-tools.struct.x25_address.gcc4.diff | 11 - .../n/net-tools/net-tools.switch.default.gcc4.diff | 42 - source/n/net-tools/net-tools.url | 1 + source/n/net-tools/net-tools_1.60-23.diff | 33404 ------------------- source/n/netatalk/doinst.sh | 11 +- source/n/netatalk/netatalk.SlackBuild | 17 +- source/n/netatalk/netatalk.afpdconf.diff | 10 - source/n/netatalk/netatalk.without_xfs.diff | 22 - source/n/netatalk/rc.atalk.new | 169 +- source/n/nettle/nettle.SlackBuild | 127 + source/n/nettle/slack-desc | 19 + .../n/network-scripts/network-scripts.SlackBuild | 4 +- source/n/network-scripts/scripts/netconfig | 51 +- source/n/network-scripts/scripts/rc.inet1 | 32 +- source/n/network-scripts/scripts/rc.inet1.conf | 10 + source/n/network-scripts/scripts/rc.inet2 | 2 +- source/n/nmap/nmap.SlackBuild | 9 +- source/n/ntp/ntp.SlackBuild | 6 +- .../n/obex-data-server/obex-data-server.SlackBuild | 39 +- source/n/obex-data-server/obex-data-server.url | 1 + source/n/obex-data-server/slack-desc | 1 - source/n/obexftp/obexftp.SlackBuild | 2 +- .../n/openldap-client/openldap-client.SlackBuild | 5 +- source/n/openssh/openssh.SlackBuild | 3 +- source/n/openssl/certwatch | 2 + source/n/openssl/doinst.sh-openssl | 5 + source/n/openssl/openssl.SlackBuild | 36 +- source/n/openssl/openssl.optsx86.diff | 10 +- source/n/openssl/openssl.soname.diff | 2 +- source/n/openssl/openssl0/certwatch | 128 + source/n/openssl/openssl0/doinst.sh-openssl | 21 + source/n/openssl/openssl0/doinst.sh-openssl-solibs | 12 + source/n/openssl/openssl0/openssl.SlackBuild | 195 + source/n/openssl/openssl0/openssl.optsx86.diff | 11 + source/n/openssl/openssl0/openssl.soname.diff | 11 + source/n/openssl/openssl0/openssl0.build | 198 + source/n/openssl/openssl0/slack-desc.openssl | 19 + .../n/openssl/openssl0/slack-desc.openssl-solibs | 19 + source/n/openssl/slack-desc.openssl-solibs | 4 +- source/n/openvpn/openvpn.SlackBuild | 4 +- source/n/openvpn/slack-desc | 2 +- source/n/p11-kit/p11-kit.SlackBuild | 106 + source/n/p11-kit/slack-desc | 19 + source/n/php/doinst.sh | 24 +- source/n/php/fetch-php.sh | 2 +- source/n/php/php-fpm.conf.diff | 28 + source/n/php/php.SlackBuild | 63 +- source/n/php/php.ini-development.diff | 19 +- source/n/php/php.session.save_path.diff | 22 - source/n/pidentd/pidentd.SlackBuild | 2 +- source/n/popa3d/popa3d.SlackBuild | 2 +- source/n/proftpd/proftpd.SlackBuild | 14 +- source/n/pssh/pssh.SlackBuild | 2 +- .../n/rt2860-firmware/rt2860-firmware.SlackBuild | 60 - source/n/rt2860-firmware/slack-desc | 19 - .../n/rt2870-firmware/rt2870-firmware.SlackBuild | 60 - source/n/rt2870-firmware/slack-desc | 19 - source/n/rt61-firmware/rt61-firmware.SlackBuild | 60 - source/n/rt61-firmware/slack-desc | 19 - source/n/rt71w-firmware/rt71w-firmware.SlackBuild | 58 - source/n/rt71w-firmware/slack-desc | 19 - source/n/samba/samba.SlackBuild | 32 +- source/n/samba/slack-desc | 8 +- source/n/sendmail/8.14.5.auth2.p0 | 23 + source/n/sendmail/SlackBuild-sendmail | 11 +- source/n/sendmail/SlackBuild-sendmail-cf | 6 +- source/n/slrn/slrn.SlackBuild | 2 +- source/n/snownews/snownews.SlackBuild | 2 +- source/n/tcpdump/tcpdump.SlackBuild | 4 + source/n/telnet/slack-desc | 2 +- source/n/vsftpd/vsftpd.SlackBuild | 6 +- source/n/wget/wget.SlackBuild | 7 +- source/n/whois/whois.SlackBuild | 2 +- source/n/wireless-tools/scripts/rc.wireless | 36 +- source/n/wireless-tools/wireless_tools.SlackBuild | 4 +- source/n/wpa_supplicant/config/dot.config | 42 + source/n/wpa_supplicant/config/wpa_gui.desktop | 7 + source/n/wpa_supplicant/config/wpa_gui.png | Bin 0 -> 5124 bytes source/n/wpa_supplicant/config/wpa_supplicant.conf | 2 + .../wpa_supplicant/config/wpa_supplicant.logrotate | 6 + source/n/wpa_supplicant/doinst.sh | 15 + .../fi.epitest.hostap.WPASupplicant.service | 4 - ...-b80b5639935d37b95d00f86b57f2844a9c775f57.patch | 61 - .../patches/dbus-service-file-args.diff | 20 + .../n/wpa_supplicant/patches/include-unistd_h.diff | 15 + .../n/wpa_supplicant/patches/libnl3-includes.diff | 12 + .../patches/quiet-scan-results-message.diff | 12 + .../patches/squelch-driver-disconnect-spam.diff | 95 + source/n/wpa_supplicant/wpa_gui.png | Bin 5124 -> 0 bytes source/n/wpa_supplicant/wpa_supplicant.SlackBuild | 213 +- source/n/wpa_supplicant/wpa_supplicant.defconfig | 27 - source/n/yptools/rc.yp | 153 +- source/n/yptools/yptools.SlackBuild | 15 +- source/tcl/tcl/tcl.SlackBuild | 8 +- source/tcl/tk/tk.SlackBuild | 4 +- source/x/fontconfig/fontconfig.SlackBuild | 1 + source/x/fontconfig/fontconfig.dejavu.diff | 103 +- source/x/freeglut/RATIONALE | 14 + source/x/freeglut/freeglut.SlackBuild | 97 + source/x/freeglut/slack-desc | 19 + source/x/libdrm/libdrm.SlackBuild | 4 +- source/x/libdrm/libdrm.uint32_t.diff | 11 - .../liberation-fonts-ttf.SlackBuild | 6 +- source/x/libhangul/libhangul.SlackBuild | 34 +- source/x/libhangul/slack-desc | 2 +- source/x/mesa/get-mesa.sh | 2 +- source/x/mesa/mesa.SlackBuild | 34 +- .../patches/i915_fragment_shader_disable.patch | 26 - .../mesa-7.9-libdrm-2.4.23-nouveau-api.patch | 89 - source/x/mtdev/mtdev.SlackBuild | 97 + source/x/mtdev/mtdev.url | 1 + source/x/mtdev/slack-desc | 19 + source/x/radeon_ucode/radeon_ucode.SlackBuild | 53 - source/x/radeon_ucode/slack-desc | 19 - .../x/radeon_ucode/ucode-20110302/LICENSE.radeon | 51 - source/x/scim-anthy/scim-anthy.SlackBuild | 32 +- source/x/scim-bridge/scim-bridge.SlackBuild | 31 +- source/x/scim-hangul/scim-hangul.SlackBuild | 35 +- source/x/scim-hangul/scim-hangul.gcc47.diff | 11 + source/x/scim-input-pad/scim-input-pad.SlackBuild | 34 +- source/x/scim-input-pad/slack-desc | 2 +- source/x/scim-m17n/scim-m17n.SlackBuild | 32 +- source/x/scim-pinyin/scim-pinyin.SlackBuild | 34 +- source/x/scim-tables/scim-tables.SlackBuild | 34 +- source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch | 11 - source/x/scim/scim.SlackBuild | 40 +- source/x/x11-skel/scripts/xwmconfig | 12 +- source/x/x11-skel/x11-skel.SlackBuild | 6 +- source/x/x11/build/libX11 | 1 - source/x/x11/build/libXaw3d | 1 + source/x/x11/build/xcb-proto | 1 + source/x/x11/build/xcompmgr | 1 - source/x/x11/build/xdm | 1 + source/x/x11/build/xf86-input-acecad | 1 - source/x/x11/build/xf86-input-penmount | 1 - source/x/x11/build/xf86-input-wacom | 1 + source/x/x11/build/xf86-video-apm | 1 + source/x/x11/build/xf86-video-chips | 1 + source/x/x11/build/xf86-video-cirrus | 1 - source/x/x11/build/xf86-video-i740 | 2 +- source/x/x11/build/xf86-video-mach64 | 1 - source/x/x11/build/xf86-video-openchrome | 1 - source/x/x11/build/xf86-video-r128 | 1 - source/x/x11/build/xf86-video-radeonhd | 1 - source/x/x11/build/xf86-video-s3 | 2 +- source/x/x11/build/xf86-video-s3virge | 1 - source/x/x11/build/xf86-video-sisusb | 1 + source/x/x11/build/xf86-video-tdfx | 1 - source/x/x11/build/xf86-video-tga | 2 +- source/x/x11/build/xf86-video-tseng | 1 + source/x/x11/build/xf86-video-v4l | 2 +- source/x/x11/build/xf86-video-vesa | 1 - source/x/x11/build/xf86-video-voodoo | 1 + source/x/x11/build/xf86-video-xgi | 1 + source/x/x11/build/xorg-server | 1 + source/x/x11/build/xpyb | 1 + source/x/x11/configure/compiz | 2 +- source/x/x11/configure/libXaw3d | 16 + source/x/x11/configure/xf86-video-ati | 21 - source/x/x11/configure/xorg-server | 5 +- source/x/x11/doinst.sh/xdm | 15 +- source/x/x11/modularize | 52 +- source/x/x11/noarch | 5 - source/x/x11/patch/xf86-video-chips.patch | 4 + ...-gut-the-overlay-8-16-support-from-driver.patch | 588 + ...-PciTag-is-unused-when-using-libpciaccess.patch | 29 + ...3-Use-malloc-calloc-realloc-free-directly.patch | 50 + .../0004-configure.ac-Remove-AM_PROG_CC_C_O.patch | 27 + .../0005-util-Consolidate-common-macros.patch | 283 + .../0006-Fix-implicit-declaration-of-iopl.patch | 35 + .../0007-Build-fix-for-ABI-Version-12.patch | 51 + ...ll-back-to-shadowfb-if-XAA-is-unavailable.patch | 31 + .../0009-Fix-for-new-vgaHW-ABI.patch | 25 + source/x/x11/patch/xorg-server.patch | 2 - .../xorg-server/x11.startwithblackscreen.diff | 21 +- .../xorg-server/xorg-server.fb.fbpict.c.mod.diff | 11 - .../patch/xorg-server/xorg-server.try_nouveau.diff | 11 - source/x/x11/post-install/lbxproxy.post-install | 5 - source/x/x11/post-install/libXaw3d.post-install | 29 + source/x/x11/post-install/proxymngr.post-install | 5 - source/x/x11/post-install/rstart.post-install | 5 - source/x/x11/post-install/util-macros.post-install | 2 - source/x/x11/post-install/xcb-util.post-install | 8 + source/x/x11/post-install/xdm.post-install | 35 +- .../x11/post-install/xf86-input-wacom.post-install | 5 + .../post-install/xf86-input-wacom/60-wacom.rules | 6 + source/x/x11/slack-desc/applewmproto | 19 - source/x/x11/slack-desc/appres | 10 +- source/x/x11/slack-desc/bdftopcf | 12 +- source/x/x11/slack-desc/beforelight | 12 +- source/x/x11/slack-desc/bigreqsproto | 2 +- source/x/x11/slack-desc/bitmap | 10 +- source/x/x11/slack-desc/compiz | 10 +- source/x/x11/slack-desc/compositeproto | 2 +- source/x/x11/slack-desc/constype | 19 - source/x/x11/slack-desc/damageproto | 2 +- source/x/x11/slack-desc/dmxproto | 2 +- source/x/x11/slack-desc/dri2proto | 2 +- source/x/x11/slack-desc/editres | 2 +- source/x/x11/slack-desc/encodings | 2 +- source/x/x11/slack-desc/evieext | 2 +- source/x/x11/slack-desc/fixesproto | 2 +- source/x/x11/slack-desc/font-adobe-100dpi | 2 +- source/x/x11/slack-desc/font-adobe-75dpi | 2 +- source/x/x11/slack-desc/font-adobe-utopia-100dpi | 2 +- source/x/x11/slack-desc/font-adobe-utopia-75dpi | 2 +- source/x/x11/slack-desc/font-adobe-utopia-type1 | 2 +- source/x/x11/slack-desc/font-alias | 2 +- source/x/x11/slack-desc/font-arabic-misc | 2 +- source/x/x11/slack-desc/font-bh-100dpi | 2 +- source/x/x11/slack-desc/font-bh-75dpi | 2 +- .../x11/slack-desc/font-bh-lucidatypewriter-100dpi | 2 +- .../x11/slack-desc/font-bh-lucidatypewriter-75dpi | 2 +- source/x/x11/slack-desc/font-bh-ttf | 2 +- source/x/x11/slack-desc/font-bh-type1 | 2 +- source/x/x11/slack-desc/font-bitstream-100dpi | 2 +- source/x/x11/slack-desc/font-bitstream-75dpi | 2 +- source/x/x11/slack-desc/font-bitstream-speedo | 2 +- source/x/x11/slack-desc/font-bitstream-type1 | 2 +- source/x/x11/slack-desc/font-cronyx-cyrillic | 2 +- source/x/x11/slack-desc/font-cursor-misc | 2 +- source/x/x11/slack-desc/font-daewoo-misc | 2 +- source/x/x11/slack-desc/font-dec-misc | 2 +- source/x/x11/slack-desc/font-ibm-type1 | 2 +- source/x/x11/slack-desc/font-isas-misc | 2 +- source/x/x11/slack-desc/font-jis-misc | 2 +- source/x/x11/slack-desc/font-micro-misc | 2 +- source/x/x11/slack-desc/font-misc-cyrillic | 2 +- source/x/x11/slack-desc/font-misc-ethiopic | 2 +- source/x/x11/slack-desc/font-misc-meltho | 2 +- source/x/x11/slack-desc/font-misc-misc | 2 +- source/x/x11/slack-desc/font-mutt-misc | 2 +- source/x/x11/slack-desc/font-schumacher-misc | 2 +- source/x/x11/slack-desc/font-screen-cyrillic | 2 +- source/x/x11/slack-desc/font-sony-misc | 2 +- source/x/x11/slack-desc/font-sun-misc | 2 +- source/x/x11/slack-desc/font-util | 2 +- source/x/x11/slack-desc/font-winitzki-cyrillic | 2 +- source/x/x11/slack-desc/font-xfree86-type1 | 2 +- source/x/x11/slack-desc/fontcacheproto | 2 +- source/x/x11/slack-desc/fontsproto | 2 +- source/x/x11/slack-desc/fonttosfnt | 2 +- source/x/x11/slack-desc/fslsfonts | 2 +- source/x/x11/slack-desc/fstobdf | 10 +- source/x/x11/slack-desc/gccmakedep | 2 +- source/x/x11/slack-desc/glproto | 2 +- source/x/x11/slack-desc/iceauth | 10 +- source/x/x11/slack-desc/ico | 10 +- source/x/x11/slack-desc/imake | 10 +- source/x/x11/slack-desc/inputproto | 2 +- source/x/x11/slack-desc/intel-gpu-tools | 20 +- source/x/x11/slack-desc/kbproto | 2 +- source/x/x11/slack-desc/lbxproxy | 19 - source/x/x11/slack-desc/libAppleWM | 19 - source/x/x11/slack-desc/libFS | 2 +- source/x/x11/slack-desc/libICE | 2 +- source/x/x11/slack-desc/libSM | 2 +- source/x/x11/slack-desc/libWindowsWM | 19 - source/x/x11/slack-desc/libX11 | 2 +- source/x/x11/slack-desc/libXScrnSaver | 2 +- source/x/x11/slack-desc/libXTrap | 19 - source/x/x11/slack-desc/libXau | 12 +- source/x/x11/slack-desc/libXaw | 10 +- source/x/x11/slack-desc/libXaw3d | 19 + source/x/x11/slack-desc/libXcm | 19 + source/x/x11/slack-desc/libXcomposite | 2 +- source/x/x11/slack-desc/libXcursor | 2 +- source/x/x11/slack-desc/libXdamage | 2 +- source/x/x11/slack-desc/libXdmcp | 2 +- source/x/x11/slack-desc/libXevie | 2 +- source/x/x11/slack-desc/libXext | 2 +- source/x/x11/slack-desc/libXfixes | 2 +- source/x/x11/slack-desc/libXfont | 14 +- source/x/x11/slack-desc/libXfontcache | 2 +- source/x/x11/slack-desc/libXft | 2 +- source/x/x11/slack-desc/libXi | 2 +- source/x/x11/slack-desc/libXinerama | 2 +- source/x/x11/slack-desc/libXmu | 10 +- source/x/x11/slack-desc/libXp | 2 +- source/x/x11/slack-desc/libXpm | 2 +- source/x/x11/slack-desc/libXprintAppUtil | 19 - source/x/x11/slack-desc/libXprintUtil | 19 - source/x/x11/slack-desc/libXrandr | 2 +- source/x/x11/slack-desc/libXrender | 2 +- source/x/x11/slack-desc/libXres | 2 +- source/x/x11/slack-desc/libXt | 2 +- source/x/x11/slack-desc/libXtst | 2 +- source/x/x11/slack-desc/libXv | 2 +- source/x/x11/slack-desc/libXvMC | 2 +- source/x/x11/slack-desc/libXxf86dga | 2 +- source/x/x11/slack-desc/libXxf86misc | 2 +- source/x/x11/slack-desc/libXxf86vm | 2 +- source/x/x11/slack-desc/libdmx | 2 +- source/x/x11/slack-desc/libfontenc | 2 +- source/x/x11/slack-desc/liblbxutil | 19 - source/x/x11/slack-desc/liboldX | 19 - source/x/x11/slack-desc/libpciaccess | 2 +- source/x/x11/slack-desc/libpthread-stubs | 12 +- source/x/x11/slack-desc/libxkbfile | 2 +- source/x/x11/slack-desc/libxkbui | 19 - source/x/x11/slack-desc/listres | 10 +- source/x/x11/slack-desc/lndir | 2 +- source/x/x11/slack-desc/luit | 10 +- source/x/x11/slack-desc/makedepend | 2 +- source/x/x11/slack-desc/mkcomposecache | 2 +- source/x/x11/slack-desc/mkfontdir | 10 +- source/x/x11/slack-desc/mkfontscale | 10 +- source/x/x11/slack-desc/oclock | 10 +- source/x/x11/slack-desc/pixman | 2 +- source/x/x11/slack-desc/printproto | 10 +- source/x/x11/slack-desc/proxymngr | 19 - source/x/x11/slack-desc/randrproto | 10 +- source/x/x11/slack-desc/recordproto | 2 +- source/x/x11/slack-desc/rendercheck | 10 +- source/x/x11/slack-desc/renderproto | 2 +- source/x/x11/slack-desc/resourceproto | 2 +- source/x/x11/slack-desc/rgb | 2 +- source/x/x11/slack-desc/rstart | 19 - source/x/x11/slack-desc/scripts | 19 - source/x/x11/slack-desc/scrnsaverproto | 2 +- source/x/x11/slack-desc/sessreg | 10 +- source/x/x11/slack-desc/setxkbmap | 2 +- source/x/x11/slack-desc/showfont | 10 +- source/x/x11/slack-desc/smproxy | 10 +- source/x/x11/slack-desc/transset | 19 + source/x/x11/slack-desc/trapproto | 19 - source/x/x11/slack-desc/twm | 2 +- source/x/x11/slack-desc/util-macros | 10 +- source/x/x11/slack-desc/videoproto | 2 +- source/x/x11/slack-desc/viewres | 2 +- source/x/x11/slack-desc/windowswmproto | 19 - source/x/x11/slack-desc/x11-app | 19 - source/x/x11/slack-desc/x11-data | 19 - source/x/x11/slack-desc/x11-doc | 19 - source/x/x11/slack-desc/x11-driver | 19 - source/x/x11/slack-desc/x11-font | 19 - source/x/x11/slack-desc/x11-lib | 19 - source/x/x11/slack-desc/x11-proto | 19 - source/x/x11/slack-desc/x11-util | 19 - source/x/x11/slack-desc/x11perf | 2 +- source/x/x11/slack-desc/xauth | 10 +- source/x/x11/slack-desc/xbacklight | 12 +- source/x/x11/slack-desc/xbiff | 10 +- source/x/x11/slack-desc/xbitmaps | 2 +- source/x/x11/slack-desc/xcalc | 10 +- source/x/x11/slack-desc/xcb-proto | 12 +- source/x/x11/slack-desc/xcb-util | 4 +- source/x/x11/slack-desc/xcb-util-image | 19 + source/x/x11/slack-desc/xcb-util-keysyms | 19 + source/x/x11/slack-desc/xcb-util-renderutil | 19 + source/x/x11/slack-desc/xcb-util-wm | 19 + source/x/x11/slack-desc/xclipboard | 10 +- source/x/x11/slack-desc/xclock | 10 +- source/x/x11/slack-desc/xcmiscproto | 2 +- source/x/x11/slack-desc/xcmsdb | 10 +- source/x/x11/slack-desc/xcompmgr | 10 +- source/x/x11/slack-desc/xconsole | 10 +- source/x/x11/slack-desc/xcursor-themes | 10 +- source/x/x11/slack-desc/xcursorgen | 2 +- source/x/x11/slack-desc/xdbedizzy | 10 +- source/x/x11/slack-desc/xditview | 2 +- source/x/x11/slack-desc/xdm | 2 +- source/x/x11/slack-desc/xdpyinfo | 2 +- source/x/x11/slack-desc/xdriinfo | 2 +- source/x/x11/slack-desc/xedit | 2 +- source/x/x11/slack-desc/xev | 16 +- source/x/x11/slack-desc/xextproto | 2 +- source/x/x11/slack-desc/xeyes | 2 +- source/x/x11/slack-desc/xf86-input-acecad | 2 +- source/x/x11/slack-desc/xf86-input-aiptek | 2 +- source/x/x11/slack-desc/xf86-input-calcomp | 19 - source/x/x11/slack-desc/xf86-input-citron | 19 - source/x/x11/slack-desc/xf86-input-digitaledge | 19 - source/x/x11/slack-desc/xf86-input-dmc | 19 - source/x/x11/slack-desc/xf86-input-dynapro | 19 - source/x/x11/slack-desc/xf86-input-elo2300 | 19 - source/x/x11/slack-desc/xf86-input-elographics | 19 - source/x/x11/slack-desc/xf86-input-evdev | 2 +- source/x/x11/slack-desc/xf86-input-fpit | 19 - source/x/x11/slack-desc/xf86-input-hyperpen | 19 - source/x/x11/slack-desc/xf86-input-jamstudio | 19 - source/x/x11/slack-desc/xf86-input-joystick | 2 +- source/x/x11/slack-desc/xf86-input-keyboard | 10 +- source/x/x11/slack-desc/xf86-input-magellan | 19 - source/x/x11/slack-desc/xf86-input-magictouch | 19 - source/x/x11/slack-desc/xf86-input-microtouch | 19 - source/x/x11/slack-desc/xf86-input-mouse | 10 +- source/x/x11/slack-desc/xf86-input-mutouch | 19 - source/x/x11/slack-desc/xf86-input-palmax | 19 - source/x/x11/slack-desc/xf86-input-penmount | 2 +- source/x/x11/slack-desc/xf86-input-spaceorb | 19 - source/x/x11/slack-desc/xf86-input-summa | 19 - source/x/x11/slack-desc/xf86-input-synaptics | 2 +- source/x/x11/slack-desc/xf86-input-tek4957 | 19 - source/x/x11/slack-desc/xf86-input-ur98 | 19 - source/x/x11/slack-desc/xf86-input-vmmouse | 2 +- source/x/x11/slack-desc/xf86-input-void | 2 +- source/x/x11/slack-desc/xf86-input-wacom | 12 +- source/x/x11/slack-desc/xf86-video-apm | 2 +- source/x/x11/slack-desc/xf86-video-ark | 2 +- source/x/x11/slack-desc/xf86-video-ast | 2 +- source/x/x11/slack-desc/xf86-video-ati | 2 +- source/x/x11/slack-desc/xf86-video-chips | 2 +- source/x/x11/slack-desc/xf86-video-cirrus | 2 +- source/x/x11/slack-desc/xf86-video-cyrix | 19 - source/x/x11/slack-desc/xf86-video-dummy | 2 +- source/x/x11/slack-desc/xf86-video-fbdev | 10 +- source/x/x11/slack-desc/xf86-video-geode | 2 +- source/x/x11/slack-desc/xf86-video-glint | 2 +- source/x/x11/slack-desc/xf86-video-i128 | 2 +- source/x/x11/slack-desc/xf86-video-i740 | 2 +- source/x/x11/slack-desc/xf86-video-i810 | 19 - source/x/x11/slack-desc/xf86-video-impact | 19 - source/x/x11/slack-desc/xf86-video-imstt | 19 - source/x/x11/slack-desc/xf86-video-intel | 2 +- source/x/x11/slack-desc/xf86-video-mach64 | 2 +- source/x/x11/slack-desc/xf86-video-mga | 2 +- source/x/x11/slack-desc/xf86-video-modesetting | 19 + source/x/x11/slack-desc/xf86-video-neomagic | 2 +- source/x/x11/slack-desc/xf86-video-newport | 19 - source/x/x11/slack-desc/xf86-video-nouveau | 2 +- source/x/x11/slack-desc/xf86-video-nsc | 19 - source/x/x11/slack-desc/xf86-video-nv | 2 +- source/x/x11/slack-desc/xf86-video-openchrome | 2 +- source/x/x11/slack-desc/xf86-video-qxl | 19 + source/x/x11/slack-desc/xf86-video-r128 | 2 +- source/x/x11/slack-desc/xf86-video-radeonhd | 19 - source/x/x11/slack-desc/xf86-video-rendition | 2 +- source/x/x11/slack-desc/xf86-video-s3 | 2 +- source/x/x11/slack-desc/xf86-video-s3virge | 2 +- source/x/x11/slack-desc/xf86-video-savage | 2 +- source/x/x11/slack-desc/xf86-video-siliconmotion | 2 +- source/x/x11/slack-desc/xf86-video-sis | 2 +- source/x/x11/slack-desc/xf86-video-sisusb | 2 +- source/x/x11/slack-desc/xf86-video-sunbw2 | 19 - source/x/x11/slack-desc/xf86-video-suncg14 | 19 - source/x/x11/slack-desc/xf86-video-suncg3 | 19 - source/x/x11/slack-desc/xf86-video-suncg6 | 19 - source/x/x11/slack-desc/xf86-video-sunffb | 19 - source/x/x11/slack-desc/xf86-video-sunleo | 19 - source/x/x11/slack-desc/xf86-video-suntcx | 19 - source/x/x11/slack-desc/xf86-video-tdfx | 2 +- source/x/x11/slack-desc/xf86-video-tga | 2 +- source/x/x11/slack-desc/xf86-video-trident | 2 +- source/x/x11/slack-desc/xf86-video-tseng | 2 +- source/x/x11/slack-desc/xf86-video-v4l | 2 +- source/x/x11/slack-desc/xf86-video-vermilion | 19 - source/x/x11/slack-desc/xf86-video-vesa | 2 +- source/x/x11/slack-desc/xf86-video-vga | 19 - source/x/x11/slack-desc/xf86-video-via | 19 - source/x/x11/slack-desc/xf86-video-vmware | 2 +- source/x/x11/slack-desc/xf86-video-voodoo | 2 +- source/x/x11/slack-desc/xf86-video-wsfb | 19 - source/x/x11/slack-desc/xf86-video-xgi | 2 +- source/x/x11/slack-desc/xf86-video-xgixp | 19 - source/x/x11/slack-desc/xf86bigfontproto | 2 +- source/x/x11/slack-desc/xf86dga | 2 +- source/x/x11/slack-desc/xf86dgaproto | 10 +- source/x/x11/slack-desc/xf86driproto | 2 +- source/x/x11/slack-desc/xf86miscproto | 10 +- source/x/x11/slack-desc/xf86rushproto | 19 - source/x/x11/slack-desc/xf86vidmodeproto | 2 +- source/x/x11/slack-desc/xfd | 10 +- source/x/x11/slack-desc/xfindproxy | 19 - source/x/x11/slack-desc/xfontsel | 10 +- source/x/x11/slack-desc/xfs | 2 +- source/x/x11/slack-desc/xfsinfo | 12 +- source/x/x11/slack-desc/xfwp | 19 - source/x/x11/slack-desc/xgamma | 10 +- source/x/x11/slack-desc/xgc | 10 +- source/x/x11/slack-desc/xhost | 10 +- source/x/x11/slack-desc/xineramaproto | 2 +- source/x/x11/slack-desc/xinit | 10 +- source/x/x11/slack-desc/xinput | 8 +- source/x/x11/slack-desc/xkbcomp | 2 +- source/x/x11/slack-desc/xkbdata | 19 - source/x/x11/slack-desc/xkbevd | 2 +- source/x/x11/slack-desc/xkbprint | 10 +- source/x/x11/slack-desc/xkbutils | 10 +- source/x/x11/slack-desc/xkeyboard-config | 14 +- source/x/x11/slack-desc/xkill | 10 +- source/x/x11/slack-desc/xload | 2 +- source/x/x11/slack-desc/xlogo | 2 +- source/x/x11/slack-desc/xlsatoms | 2 +- source/x/x11/slack-desc/xlsclients | 10 +- source/x/x11/slack-desc/xlsfonts | 10 +- source/x/x11/slack-desc/xmag | 10 +- source/x/x11/slack-desc/xman | 2 +- source/x/x11/slack-desc/xmessage | 10 +- source/x/x11/slack-desc/xmh | 10 +- source/x/x11/slack-desc/xmodmap | 10 +- source/x/x11/slack-desc/xmore | 2 +- source/x/x11/slack-desc/xorg-cf-files | 12 +- source/x/x11/slack-desc/xorg-docs | 10 +- source/x/x11/slack-desc/xorg-server-xdmx | 19 - source/x/x11/slack-desc/xorg-sgml-doctools | 14 +- source/x/x11/slack-desc/xphelloworld | 19 - source/x/x11/slack-desc/xplsprinters | 19 - source/x/x11/slack-desc/xpr | 10 +- source/x/x11/slack-desc/xprehashprinterlist | 19 - source/x/x11/slack-desc/xprop | 2 +- source/x/x11/slack-desc/xproto | 2 +- source/x/x11/slack-desc/xproxymanagementprotocol | 19 - source/x/x11/slack-desc/xpyb | 12 +- source/x/x11/slack-desc/xrandr | 10 +- source/x/x11/slack-desc/xrdb | 2 +- source/x/x11/slack-desc/xrefresh | 2 +- source/x/x11/slack-desc/xrx | 19 - source/x/x11/slack-desc/xscope | 2 +- source/x/x11/slack-desc/xset | 10 +- source/x/x11/slack-desc/xsetmode | 19 - source/x/x11/slack-desc/xsetpointer | 19 - source/x/x11/slack-desc/xsetroot | 2 +- source/x/x11/slack-desc/xsm | 2 +- source/x/x11/slack-desc/xstdcmap | 12 +- source/x/x11/slack-desc/xtrans | 10 +- source/x/x11/slack-desc/xtrap | 19 - source/x/x11/slack-desc/xvidtune | 10 +- source/x/x11/slack-desc/xvinfo | 10 +- source/x/x11/slack-desc/xwd | 2 +- source/x/x11/slack-desc/xwininfo | 10 +- source/x/x11/slack-desc/xwud | 10 +- source/x/x11/src/get-xf86-video-nouveau.sh | 10 +- source/x/xaw3d/pull-xaw3d.sh | 7 - source/x/xaw3d/slack-desc | 19 - source/x/xaw3d/xaw3d.SlackBuild | 92 - source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild | 10 +- source/x/xterm/doinst.sh | 10 + source/x/xterm/xterm.SlackBuild | 8 + source/xap/MPlayer/MPlayer.SlackBuild | 268 +- source/xap/MPlayer/slack-desc | 19 +- .../audacious-plugins/audacious-plugins.SlackBuild | 14 +- ...udacious-plugins.alsa.noise.is.not.helpful.diff | 25 - source/xap/audacious/audacious.SlackBuild | 26 +- source/xap/blackbox/blackbox.SlackBuild | 12 +- source/xap/blackbox/startblackbox | 23 + .../textpropertytostring-unconditional.diff | 28 + source/xap/blackbox/xinitrc.blackbox | 4 +- source/xap/blueman/blueman.SlackBuild | 2 +- source/xap/fluxbox/fluxbox.SlackBuild | 23 +- source/xap/fluxbox/fluxbox.startfluxbox.dbus.diff | 14 + source/xap/fluxbox/xinitrc.fluxbox | 1 + source/xap/fvwm/doinst.sh | 3 +- source/xap/fvwm/fvwm.SlackBuild | 74 +- source/xap/fvwm/fvwm.colormap.diff | 20 - source/xap/fvwm/slack-desc | 2 +- source/xap/fvwm/startfvwm2 | 23 + source/xap/fvwm/system.fvwm2rc | 822 - source/xap/fvwm/xinitrc.fvwm2 | 4 +- source/xap/geeqie/geeqie.SlackBuild | 6 +- source/xap/geeqie/slack-desc | 1 - source/xap/gftp/gftp.SlackBuild | 19 +- source/xap/gimp/gimp.SlackBuild | 22 +- source/xap/gkrellm/gkrellm.SlackBuild | 2 +- source/xap/gnuplot/gnuplot.SlackBuild | 5 + source/xap/gucharmap/doinst.sh | 6 + source/xap/gucharmap/gucharmap.SlackBuild | 2 - source/xap/gv/gv.SlackBuild | 6 +- source/xap/gv/gv.keysym.diff | 12 - source/xap/gv/gv.libXaw3d.diff | 11 + source/xap/imagemagick/imagemagick.SlackBuild | 26 +- .../xap/mozilla-firefox/mozilla-firefox.SlackBuild | 68 +- source/xap/mozilla-thunderbird/mimeTypes.rdf | 113 - .../mozilla-firefox.xpcom_arm.patch | 18 + .../mozilla-thunderbird.SlackBuild | 111 +- source/xap/network-manager-applet/doinst.sh | 20 + .../network-manager-applet.SlackBuild | 109 + source/xap/network-manager-applet/slack-desc | 19 + source/xap/pan/pan.SlackBuild | 5 +- source/xap/pan/pan.gcc47.diff | 10 + source/xap/pan/slack-desc | 2 +- source/xap/pidgin/fix-gmain_h-compile-error.diff | 17 + source/xap/pidgin/pidgin.SlackBuild | 24 +- source/xap/pidgin/purple-allow-sign-rsa-md5.patch | 12 - source/xap/rdesktop/rdesktop.CVE-2011-1595.diff | 22 - source/xap/rdesktop/rdesktop.SlackBuild | 11 +- source/xap/rxvt/rxvt.SlackBuild | 29 +- source/xap/sane/sane-backends-1.0.22-v4l.diff | 64 + source/xap/sane/sane.SlackBuild | 24 +- source/xap/seamonkey/pkgconfig/seamonkey-libxul.pc | 11 + source/xap/seamonkey/pkgconfig/seamonkey-nss.pc | 2 +- source/xap/seamonkey/pkgconfig/seamonkey-plugin.pc | 2 +- source/xap/seamonkey/seamonkey.SlackBuild | 84 +- source/xap/seyon/seyon.SlackBuild | 32 +- source/xap/thunar-volman/slack-desc | 19 - source/xap/thunar-volman/thunar-volman.SlackBuild | 84 - .../windowmaker/WindowMaker.noopensusemenu.diff | 14 + source/xap/windowmaker/windowmaker.SlackBuild | 51 +- source/xap/windowmaker/windowmaker.no-mmx.diff | 19 - source/xap/windowmaker/windowmaker.png.1.4.0.diff | 11 - source/xap/windowmaker/wmaker.inst.diff | 29 +- source/xap/windowmaker/xinitrc.wmaker | 4 +- source/xap/x11-ssh-askpass/slack-desc | 6 +- source/xap/x3270/x3270.SlackBuild | 70 +- source/xap/xchat/xchat.SlackBuild | 2 +- .../xfce/patches/Thunar.thunar-vfs-io-local.diff | 20 - .../fixup_comments_in_xfce-utils-Xft.xrdb.diff | 24 - source/xap/xfce/patches/mousepad-fix_find.diff | 43 - .../patches/mousepad-fix_find_and_replace.diff | 36 - .../no_sensitive_panel_during_plugin_moves.patch | 26 - .../xfce/patches/thunar-1.0.2-fixup_docdir.diff | 384 - source/xap/xfce/patches/xfcalendar.desktop.in.diff | 9 - .../xfce-utils-load_systemwide_Xmodmap.diff | 11 - .../patches/xfce-utils.xinitrc.consolekit.diff | 15 - .../xfce/patches/xfdesktop-fix_education_icon.diff | 11 - .../xfsm-compat-kde.c-start-kde4-services.diff | 49 - source/xap/xfce/profile.d/xfce.csh | 6 - source/xap/xfce/profile.d/xfce.sh | 7 - source/xap/xfce/slack-desc | 19 - source/xap/xfce/xfce.SlackBuild | 248 - source/xap/xfce4-notifyd/doinst.sh | 10 - source/xap/xfce4-notifyd/slack-desc | 19 - source/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild | 103 - source/xap/xfce4-power-manager/doinst.sh | 10 - source/xap/xfce4-power-manager/slack-desc | 19 - .../xfce4-power-manager.SlackBuild | 116 - source/xap/xfractint/xfractint.SlackBuild | 40 +- source/xap/xine-lib/xine-lib.SlackBuild | 14 +- source/xap/xine-ui/xine-ui.SlackBuild | 12 +- .../xine-ui.no.deprecated.curl.headers.diff | 11 + source/xap/xine-ui/xine-ui.png14.diff | 11 - source/xap/xlockmore/xlockmore.SlackBuild | 6 +- source/xap/xpdf/patches/03-float.patch | 25 + source/xap/xpdf/xpdf.SlackBuild | 7 +- source/xap/xsane/xsane.SlackBuild | 2 +- .../xscreensaver/xscreensaver-getimage-file-5.14 | 555 + source/xap/xscreensaver/xscreensaver.SlackBuild | 10 +- source/xfce/Terminal/Terminal.SlackBuild | 120 + source/xfce/Terminal/slack-desc | 19 + source/xfce/Thunar/Thunar.SlackBuild | 135 + source/xfce/Thunar/slack-desc | 19 + source/xfce/exo/exo.SlackBuild | 135 + source/xfce/exo/slack-desc | 19 + source/xfce/garcon/garcon.SlackBuild | 135 + source/xfce/garcon/slack-desc | 19 + .../gtk-xfce-engine/gtk-xfce-engine.SlackBuild | 135 + source/xfce/gtk-xfce-engine/slack-desc | 19 + source/xfce/libxfce4ui/libxfce4ui.SlackBuild | 140 + source/xfce/libxfce4ui/slack-desc | 19 + source/xfce/libxfce4util/libxfce4util.SlackBuild | 135 + source/xfce/libxfce4util/slack-desc | 19 + source/xfce/libxfcegui4/libxfcegui4.SlackBuild | 135 + source/xfce/libxfcegui4/slack-desc | 19 + source/xfce/orage/orage.SlackBuild | 121 + source/xfce/orage/slack-desc | 19 + source/xfce/thunar-volman/slack-desc | 19 + source/xfce/thunar-volman/thunar-volman.SlackBuild | 103 + source/xfce/tumbler/slack-desc | 19 + source/xfce/tumbler/tumbler.SlackBuild | 135 + source/xfce/xfce-build-all.sh | 72 + source/xfce/xfce4-appfinder/slack-desc | 19 + .../xfce4-appfinder/xfce4-appfinder.SlackBuild | 135 + source/xfce/xfce4-clipman-plugin/doinst.sh | 10 + source/xfce/xfce4-clipman-plugin/slack-desc | 19 + .../xfce4-clipman-plugin.SlackBuild | 108 + .../xfce4-clipman-plugin/xfce4-clipman-plugin.url | 1 + source/xfce/xfce4-dev-tools/slack-desc | 19 + .../xfce4-dev-tools/xfce4-dev-tools.SlackBuild | 135 + source/xfce/xfce4-mixer/doinst.sh | 14 + source/xfce/xfce4-mixer/slack-desc | 19 + source/xfce/xfce4-mixer/xfce4-mixer.SlackBuild | 106 + source/xfce/xfce4-notifyd/doinst.sh | 10 + source/xfce/xfce4-notifyd/slack-desc | 19 + source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild | 121 + source/xfce/xfce4-panel/slack-desc | 19 + source/xfce/xfce4-panel/xfce4-panel.SlackBuild | 135 + source/xfce/xfce4-power-manager/doinst.sh | 10 + source/xfce/xfce4-power-manager/slack-desc | 19 + .../xfce4-power-manager.SlackBuild | 129 + source/xfce/xfce4-screenshooter/doinst.sh | 10 + source/xfce/xfce4-screenshooter/slack-desc | 19 + .../xfce4-screenshooter.SlackBuild | 130 + .../xfce4-screenshooter/xfce4-screenshooter.url | 1 + source/xfce/xfce4-session/slack-desc | 19 + source/xfce/xfce4-session/xfce4-session.SlackBuild | 138 + source/xfce/xfce4-settings/slack-desc | 19 + .../xfce/xfce4-settings/xfce4-settings.SlackBuild | 140 + .../xfce/xfce4-settings/xfce4-settings.theme.diff | 12 + .../xfce4-settings.xft.defaults.diff | 23 + source/xfce/xfce4-systemload-plugin/slack-desc | 19 + .../xfce4-systemload-plugin.SlackBuild | 106 + .../xfce4-systemload-plugin.url | 1 + source/xfce/xfce4-taskmanager/doinst.sh | 4 + source/xfce/xfce4-taskmanager/slack-desc | 19 + .../xfce4-taskmanager/xfce4-taskmanager.SlackBuild | 105 + .../xfce/xfce4-taskmanager/xfce4-taskmanager.url | 1 + source/xfce/xfce4-volumed/slack-desc | 19 + source/xfce/xfce4-volumed/xfce4-volumed.SlackBuild | 106 + source/xfce/xfce4-weather-plugin/slack-desc | 19 + .../xfce4-weather-plugin.SlackBuild | 106 + .../xfce4-weather-plugin/xfce4-weather-plugin.url | 1 + source/xfce/xfconf/slack-desc | 19 + source/xfce/xfconf/xfconf.SlackBuild | 135 + source/xfce/xfdesktop/slack-desc | 19 + source/xfce/xfdesktop/xfdesktop.SlackBuild | 135 + source/xfce/xfwm4-themes/slack-desc | 19 + source/xfce/xfwm4-themes/xfwm4-themes.SlackBuild | 135 + source/xfce/xfwm4/slack-desc | 19 + source/xfce/xfwm4/xfwm4.SlackBuild | 139 + source/xfce/xfwm4/xinitrc.xfce | 40 + source/y/bsd-games/bsd-games.SlackBuild | 9 +- .../20120302.diff | 11 + 2673 files changed, 180129 insertions(+), 111301 deletions(-) create mode 100644 source/README.TXT create mode 100644 source/a/aaa_base/os-release delete mode 100644 source/a/bash/bash-4.1-patches/bash41-001 delete mode 100644 source/a/bash/bash-4.1-patches/bash41-002 delete mode 100644 source/a/bash/bash-4.1-patches/bash41-003 delete mode 100644 source/a/bash/bash-4.1-patches/bash41-004 delete mode 100644 source/a/bash/bash-4.1-patches/bash41-005 delete mode 100644 source/a/bash/bash-4.1-patches/bash41-006 delete mode 100644 source/a/bash/bash-4.1-patches/bash41-007 delete mode 100644 source/a/bash/bash-4.1-patches/bash41-008 delete mode 100644 source/a/bash/bash-4.1-patches/bash41-009 delete mode 100644 source/a/bash/bash-4.1-patches/bash41-010 create mode 100644 source/a/bash/bash-4.2-patches/bash42-001 create mode 100644 source/a/bash/bash-4.2-patches/bash42-002 create mode 100644 source/a/bash/bash-4.2-patches/bash42-003 create mode 100644 source/a/bash/bash-4.2-patches/bash42-004 create mode 100644 source/a/bash/bash-4.2-patches/bash42-005 create mode 100644 source/a/bash/bash-4.2-patches/bash42-006 create mode 100644 source/a/bash/bash-4.2-patches/bash42-007 create mode 100644 source/a/bash/bash-4.2-patches/bash42-008 create mode 100644 source/a/bash/bash-4.2-patches/bash42-009 create mode 100644 source/a/bash/bash-4.2-patches/bash42-010 create mode 100644 source/a/bash/bash-4.2-patches/bash42-011 create mode 100644 source/a/bash/bash-4.2-patches/bash42-012 create mode 100644 source/a/bash/bash-4.2-patches/bash42-013 create mode 100644 source/a/bash/bash-4.2-patches/bash42-014 create mode 100644 source/a/bash/bash-4.2-patches/bash42-015 create mode 100644 source/a/bash/bash-4.2-patches/bash42-016 create mode 100644 source/a/bash/bash-4.2-patches/bash42-017 create mode 100644 source/a/bash/bash-4.2-patches/bash42-018 create mode 100644 source/a/bash/bash-4.2-patches/bash42-019 create mode 100644 source/a/bash/bash-4.2-patches/bash42-020 create mode 100644 source/a/bash/bash-4.2-patches/bash42-021 create mode 100644 source/a/bash/bash-4.2-patches/bash42-022 create mode 100644 source/a/bash/bash-4.2-patches/bash42-023 create mode 100644 source/a/bash/bash-4.2-patches/bash42-024 create mode 100644 source/a/bash/bash-4.2-patches/bash42-025 create mode 100644 source/a/bash/bash-4.2-patches/bash42-026 create mode 100644 source/a/bash/bash-4.2-patches/bash42-027 create mode 100644 source/a/bash/bash-4.2-patches/bash42-028 create mode 100644 source/a/bash/bash-4.2-patches/bash42-029 create mode 100644 source/a/bash/bash-4.2-patches/bash42-030 create mode 100644 source/a/bash/bash-4.2-patches/bash42-031 create mode 100644 source/a/bash/bash-4.2-patches/bash42-032 create mode 100644 source/a/bash/bash-4.2-patches/bash42-033 create mode 100644 source/a/bash/bash-4.2-patches/bash42-034 create mode 100644 source/a/bash/bash-4.2-patches/bash42-035 create mode 100644 source/a/bash/bash-4.2-patches/bash42-036 create mode 100644 source/a/bash/bash-4.2-patches/bash42-037 create mode 100644 source/a/cpio/cpio.32bit.crc.diff delete mode 100644 source/a/cups/cups.fix_broken_locking.diff create mode 100644 source/a/cups/cups.url delete mode 100644 source/a/cups/usb-backend-both-usblp-and-libusb.dpatch create mode 100644 source/a/cups/usb-backend-reset-after-job-only-for-specific-devices.patch create mode 100644 source/a/dbus/dbus.set.home.diff delete mode 100644 source/a/dcron/dcron.manpage.paths.diff create mode 100644 source/a/e2fsprogs/e2fsprogs-1.42.6.tar.sign create mode 100644 source/a/eject/eject_for_mac.patch delete mode 100755 source/a/gdisk/gdisk.SlackBuild delete mode 100644 source/a/gdisk/slack-desc create mode 100755 source/a/gptfdisk/gptfdisk.SlackBuild create mode 100644 source/a/gptfdisk/gptfdisk.remove.icu4c.dep.diff create mode 100644 source/a/gptfdisk/slack-desc create mode 100644 source/a/isapnptools/isapnptools-1.26.lsm create mode 100755 source/a/isapnptools/isapnptools.SlackBuild create mode 100644 source/a/isapnptools/isapnptools.url create mode 100644 source/a/isapnptools/isapnptools_1.26-5.diff create mode 100644 source/a/isapnptools/slack-desc delete mode 100644 source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign create mode 100644 source/a/kbd/sources/kbd-1.15.3-fix-es-translation.patch create mode 100755 source/a/kernel-firmware/kernel-firmware.SlackBuild create mode 100644 source/a/kernel-firmware/slack-desc create mode 100755 source/a/kmod/kmod.SlackBuild create mode 100644 source/a/kmod/slack-desc create mode 100644 source/a/lilo/slack14.0.2012.bmp delete mode 100644 source/a/lvm2/build_with_udev_165_and_later.diff create mode 100644 source/a/lvm2/fix-build-with-udev-183.patch delete mode 100644 source/a/mdadm/mdadm-3.1.5.tar.bz2.sign delete mode 100644 source/a/mdadm/mdadm.static.diff mode change 100644 => 120000 source/a/mkinitrd/busybox-dot-config create mode 100644 source/a/mkinitrd/busybox-dot-config.1.18.x create mode 100644 source/a/mkinitrd/busybox-dot-config.1.19.x create mode 100644 source/a/mkinitrd/busybox-dot-config.1.20.x create mode 100644 source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-ash.patch create mode 100644 source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-ifupdown.patch create mode 100644 source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-man.patch create mode 100644 source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-tar.patch delete mode 100644 source/a/module-init-tools/doinst.sh delete mode 100644 source/a/module-init-tools/modprobe.ignore_some_suffixes.diff delete mode 100755 source/a/module-init-tools/module-init-tools.SlackBuild delete mode 100644 source/a/module-init-tools/slack-desc create mode 100644 source/a/ntfs-3g/99-ntfs-3g.rules create mode 100644 source/a/patch/patch.281537bcd92515ae3b9f154acd579ce97260f99b.diff create mode 100644 source/a/patch/patch.99f2638763845d8173a0c9f9209ac2b4be947165.diff create mode 100644 source/a/pciutils/pciutils.dontcompress.diff delete mode 100644 source/a/pciutils/pciutils.ids.dest.diff create mode 100644 source/a/pciutils/pciutils.update.pci.ids.url.diff create mode 100644 source/a/shadow/patches/r3090.diff delete mode 100644 source/a/shadow/patches/r3299.diff create mode 100644 source/a/shadow/patches/unused/r3299.diff create mode 100644 source/a/shadow/shadow.man.nodups.diff create mode 100644 source/a/slocate/slocate.CVE-2007-0277.diff create mode 100644 source/a/slocate/slocate.bigfile.diff delete mode 100644 source/a/syslinux/syslinux-3.84.tar.bz2.sign create mode 100644 source/a/syslinux/syslinux-4.05.tar.sign create mode 100644 source/a/syslinux/syslinux.altmbr.diff create mode 100644 source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh.diff delete mode 100644 source/a/sysvinit/sysvinit-2.86-timeval.patch delete mode 100644 source/a/sysvinit/sysvinit.diff create mode 100644 source/a/sysvinit/sysvinit.paths.diff delete mode 100644 source/a/sysvinit/sysvinit.pidof.rhforkseverything.diff create mode 100644 source/a/udev/config/modprobe.d/8139cp.conf create mode 100644 source/a/udev/config/modprobe.d/README create mode 100644 source/a/udev/config/modprobe.d/bcm43xx.conf delete mode 100644 source/a/udev/config/modprobe.d/blacklist.conf.new create mode 100644 source/a/udev/config/modprobe.d/eepro100.conf create mode 100644 source/a/udev/config/modprobe.d/eth1394.conf create mode 100644 source/a/udev/config/modprobe.d/evbug.conf create mode 100644 source/a/udev/config/modprobe.d/framebuffers.conf create mode 100644 source/a/udev/config/modprobe.d/hostap.conf create mode 100644 source/a/udev/config/modprobe.d/hw_random.conf create mode 100644 source/a/udev/config/modprobe.d/isapnp.conf delete mode 100644 source/a/udev/config/modprobe.d/isapnp.conf.new create mode 100644 source/a/udev/config/modprobe.d/isdn.conf create mode 100644 source/a/udev/config/modprobe.d/oss.conf create mode 100644 source/a/udev/config/modprobe.d/pcspkr.conf create mode 100644 source/a/udev/config/modprobe.d/psmouse.conf delete mode 100644 source/a/udev/config/modprobe.d/psmouse.conf.new create mode 100644 source/a/udev/config/modprobe.d/scsi-sata-controllers.conf create mode 100644 source/a/udev/config/modprobe.d/sound-modems.conf create mode 100644 source/a/udev/config/modprobe.d/tulip.conf create mode 100644 source/a/udev/config/modprobe.d/usb-controller.conf delete mode 100644 source/a/udev/config/modprobe.d/usb-controller.conf.new create mode 100644 source/a/udev/config/modprobe.d/via-ircc.conf create mode 100644 source/a/udev/config/modprobe.d/watchdog.conf delete mode 100644 source/a/udev/config/rules.d/90-network.rules delete mode 100755 source/a/udev/config/scripts/nethelper.sh create mode 100644 source/a/udev/fix-42-usb-hid-pm.rules.diff create mode 100644 source/a/udev/udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_rev.patch delete mode 100644 source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch create mode 100644 source/a/udisks/slack-desc create mode 100755 source/a/udisks/udisks.SlackBuild create mode 100644 source/a/udisks/udisks.url create mode 100644 source/a/udisks2/doinst.sh create mode 100644 source/a/udisks2/slack-desc create mode 100755 source/a/udisks2/udisks2.SlackBuild create mode 100644 source/a/upower/doinst.sh create mode 100644 source/a/upower/slack-desc create mode 100755 source/a/upower/upower.SlackBuild create mode 100644 source/a/upower/upower.url delete mode 100644 source/a/usbutils/usbutils-002.tar.bz2.sign delete mode 100644 source/a/usbutils/usbutils.ids.dest create mode 100644 source/a/usbutils/usbutils.url create mode 100644 source/a/util-linux/0001-mount-old-fix-encryption-usage.patch create mode 100644 source/a/util-linux/0002-fdisk-don-t-ignore-1MiB-granularity-on-512-byte-sect.patch delete mode 100644 source/a/util-linux/adjtimex_1.23-1.diff create mode 100644 source/a/util-linux/adjtimex_1.29-2.2.diff create mode 100644 source/a/util-linux/column-fix_long_opts.diff create mode 100644 source/a/util-linux/net-tools.config.h delete mode 100644 source/a/util-linux/net-tools.diff delete mode 100644 source/a/util-linux/net-tools_1.60-19.diff create mode 100644 source/ap/cdrdao/cdrdao-1.2.3-stat.patch delete mode 100644 source/ap/ghostscript/ghostscript.rev11948.diff create mode 100755 source/ap/htop/htop.SlackBuild create mode 100644 source/ap/htop/slack-desc delete mode 100644 source/ap/linuxdoc-tools/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff delete mode 100644 source/ap/linuxdoc-tools/sources/gtk-doc.patch create mode 100644 source/ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl create mode 100644 source/ap/linuxdoc-tools/sources/openjade-1.3.2-gcc46.patch delete mode 100644 source/ap/mc/mc.ext.in.geeqie.diff create mode 100644 source/ap/mc/mc.image.sh.geeqie.diff create mode 100644 source/ap/mc/mc.save.file.diff create mode 100644 source/ap/mysql/README.mysql-embedded create mode 100644 source/ap/mysql/mirror-url create mode 100755 source/ap/mysql/mysql-embedded.SlackBuild delete mode 100755 source/ap/mysql/mysql-embedded.build create mode 100644 source/ap/nano/doinst.sh delete mode 100755 source/ap/ntfsprogs/ntfsprogs.SlackBuild delete mode 100644 source/ap/ntfsprogs/slack-desc create mode 100644 source/ap/screen/screen.d_termname.envterm.buffersizeincrease.diff create mode 100644 source/ap/soma/slack-desc create mode 100755 source/ap/soma/soma.SlackBuild create mode 100644 source/ap/soma/soma.info create mode 100644 source/ap/soma/soma.png create mode 100644 source/ap/soma/stations.conf create mode 100644 source/ap/vim/patches/7.3.155 create mode 100644 source/ap/vim/patches/7.3.156 create mode 100644 source/ap/vim/patches/7.3.157 create mode 100644 source/ap/vim/patches/7.3.158 create mode 100644 source/ap/vim/patches/7.3.159 create mode 100644 source/ap/vim/patches/7.3.160 create mode 100644 source/ap/vim/patches/7.3.161 create mode 100644 source/ap/vim/patches/7.3.162 create mode 100644 source/ap/vim/patches/7.3.163 create mode 100644 source/ap/vim/patches/7.3.164 create mode 100644 source/ap/vim/patches/7.3.165 create mode 100644 source/ap/vim/patches/7.3.166 create mode 100644 source/ap/vim/patches/7.3.167 create mode 100644 source/ap/vim/patches/7.3.168 create mode 100644 source/ap/vim/patches/7.3.169 create mode 100644 source/ap/vim/patches/7.3.170 create mode 100644 source/ap/vim/patches/7.3.171 create mode 100644 source/ap/vim/patches/7.3.172 create mode 100644 source/ap/vim/patches/7.3.173 create mode 100644 source/ap/vim/patches/7.3.174 create mode 100644 source/ap/vim/patches/7.3.175 create mode 100644 source/ap/vim/patches/7.3.176 create mode 100644 source/ap/vim/patches/7.3.177 create mode 100644 source/ap/vim/patches/7.3.178 create mode 100644 source/ap/vim/patches/7.3.179 create mode 100644 source/ap/vim/patches/7.3.180 create mode 100644 source/ap/vim/patches/7.3.181 create mode 100644 source/ap/vim/patches/7.3.182 create mode 100644 source/ap/vim/patches/7.3.183 create mode 100644 source/ap/vim/patches/7.3.184 create mode 100644 source/ap/vim/patches/7.3.185 create mode 100644 source/ap/vim/patches/7.3.186 create mode 100644 source/ap/vim/patches/7.3.187 create mode 100644 source/ap/vim/patches/7.3.188 create mode 100644 source/ap/vim/patches/7.3.189 create mode 100644 source/ap/vim/patches/7.3.190 create mode 100644 source/ap/vim/patches/7.3.191 create mode 100644 source/ap/vim/patches/7.3.192 create mode 100644 source/ap/vim/patches/7.3.193 create mode 100644 source/ap/vim/patches/7.3.194 create mode 100644 source/ap/vim/patches/7.3.195 create mode 100644 source/ap/vim/patches/7.3.196 create mode 100644 source/ap/vim/patches/7.3.197 create mode 100644 source/ap/vim/patches/7.3.198 create mode 100644 source/ap/vim/patches/7.3.199 create mode 100644 source/ap/vim/patches/7.3.200 create mode 100644 source/ap/vim/patches/7.3.201 create mode 100644 source/ap/vim/patches/7.3.202 create mode 100644 source/ap/vim/patches/7.3.203 create mode 100644 source/ap/vim/patches/7.3.204 create mode 100644 source/ap/vim/patches/7.3.205 create mode 100644 source/ap/vim/patches/7.3.206 create mode 100644 source/ap/vim/patches/7.3.207 create mode 100644 source/ap/vim/patches/7.3.208 create mode 100644 source/ap/vim/patches/7.3.209 create mode 100644 source/ap/vim/patches/7.3.210 create mode 100644 source/ap/vim/patches/7.3.211 create mode 100644 source/ap/vim/patches/7.3.212 create mode 100644 source/ap/vim/patches/7.3.213 create mode 100644 source/ap/vim/patches/7.3.214 create mode 100644 source/ap/vim/patches/7.3.215 create mode 100644 source/ap/vim/patches/7.3.216 create mode 100644 source/ap/vim/patches/7.3.217 create mode 100644 source/ap/vim/patches/7.3.218 create mode 100644 source/ap/vim/patches/7.3.219 create mode 100644 source/ap/vim/patches/7.3.220 create mode 100644 source/ap/vim/patches/7.3.221 create mode 100644 source/ap/vim/patches/7.3.222 create mode 100644 source/ap/vim/patches/7.3.223 create mode 100644 source/ap/vim/patches/7.3.224 create mode 100644 source/ap/vim/patches/7.3.225 create mode 100644 source/ap/vim/patches/7.3.226 create mode 100644 source/ap/vim/patches/7.3.227 create mode 100644 source/ap/vim/patches/7.3.228 create mode 100644 source/ap/vim/patches/7.3.229 create mode 100644 source/ap/vim/patches/7.3.230 create mode 100644 source/ap/vim/patches/7.3.231 create mode 100644 source/ap/vim/patches/7.3.232 create mode 100644 source/ap/vim/patches/7.3.233 create mode 100644 source/ap/vim/patches/7.3.234 create mode 100644 source/ap/vim/patches/7.3.235 create mode 100644 source/ap/vim/patches/7.3.236 create mode 100644 source/ap/vim/patches/7.3.237 create mode 100644 source/ap/vim/patches/7.3.238 create mode 100644 source/ap/vim/patches/7.3.239 create mode 100644 source/ap/vim/patches/7.3.240 create mode 100644 source/ap/vim/patches/7.3.241 create mode 100644 source/ap/vim/patches/7.3.242 create mode 100644 source/ap/vim/patches/7.3.243 create mode 100644 source/ap/vim/patches/7.3.244 create mode 100644 source/ap/vim/patches/7.3.245 create mode 100644 source/ap/vim/patches/7.3.246 create mode 100644 source/ap/vim/patches/7.3.247 create mode 100644 source/ap/vim/patches/7.3.248 create mode 100644 source/ap/vim/patches/7.3.249 create mode 100644 source/ap/vim/patches/7.3.250 create mode 100644 source/ap/vim/patches/7.3.251 create mode 100644 source/ap/vim/patches/7.3.252 create mode 100644 source/ap/vim/patches/7.3.253 create mode 100644 source/ap/vim/patches/7.3.254 create mode 100644 source/ap/vim/patches/7.3.255 create mode 100644 source/ap/vim/patches/7.3.256 create mode 100644 source/ap/vim/patches/7.3.257 create mode 100644 source/ap/vim/patches/7.3.258 create mode 100644 source/ap/vim/patches/7.3.259 create mode 100644 source/ap/vim/patches/7.3.260 create mode 100644 source/ap/vim/patches/7.3.261 create mode 100644 source/ap/vim/patches/7.3.262 create mode 100644 source/ap/vim/patches/7.3.263 create mode 100644 source/ap/vim/patches/7.3.264 create mode 100644 source/ap/vim/patches/7.3.265 create mode 100644 source/ap/vim/patches/7.3.266 create mode 100644 source/ap/vim/patches/7.3.267 create mode 100644 source/ap/vim/patches/7.3.268 create mode 100644 source/ap/vim/patches/7.3.269 create mode 100644 source/ap/vim/patches/7.3.270 create mode 100644 source/ap/vim/patches/7.3.271 create mode 100644 source/ap/vim/patches/7.3.272 create mode 100644 source/ap/vim/patches/7.3.273 create mode 100644 source/ap/vim/patches/7.3.274 create mode 100644 source/ap/vim/patches/7.3.275 create mode 100644 source/ap/vim/patches/7.3.276 create mode 100644 source/ap/vim/patches/7.3.277 create mode 100644 source/ap/vim/patches/7.3.278 create mode 100644 source/ap/vim/patches/7.3.279 create mode 100644 source/ap/vim/patches/7.3.280 create mode 100644 source/ap/vim/patches/7.3.281 create mode 100644 source/ap/vim/patches/7.3.282 create mode 100644 source/ap/vim/patches/7.3.283 create mode 100644 source/ap/vim/patches/7.3.284 create mode 100644 source/ap/vim/patches/7.3.285 create mode 100644 source/ap/vim/patches/7.3.286 create mode 100644 source/ap/vim/patches/7.3.287 create mode 100644 source/ap/vim/patches/7.3.288 create mode 100644 source/ap/vim/patches/7.3.289 create mode 100644 source/ap/vim/patches/7.3.290 create mode 100644 source/ap/vim/patches/7.3.291 create mode 100644 source/ap/vim/patches/7.3.292 create mode 100644 source/ap/vim/patches/7.3.293 create mode 100644 source/ap/vim/patches/7.3.294 create mode 100644 source/ap/vim/patches/7.3.295 create mode 100644 source/ap/vim/patches/7.3.296 create mode 100644 source/ap/vim/patches/7.3.297 create mode 100644 source/ap/vim/patches/7.3.298 create mode 100644 source/ap/vim/patches/7.3.299 create mode 100644 source/ap/vim/patches/7.3.300 create mode 100644 source/ap/vim/patches/7.3.301 create mode 100644 source/ap/vim/patches/7.3.302 create mode 100644 source/ap/vim/patches/7.3.303 create mode 100644 source/ap/vim/patches/7.3.304 create mode 100644 source/ap/vim/patches/7.3.305 create mode 100644 source/ap/vim/patches/7.3.306 create mode 100644 source/ap/vim/patches/7.3.307 create mode 100644 source/ap/vim/patches/7.3.308 create mode 100644 source/ap/vim/patches/7.3.309 create mode 100644 source/ap/vim/patches/7.3.310 create mode 100644 source/ap/vim/patches/7.3.311 create mode 100644 source/ap/vim/patches/7.3.312 create mode 100644 source/ap/vim/patches/7.3.313 create mode 100644 source/ap/vim/patches/7.3.314 create mode 100644 source/ap/vim/patches/7.3.315 create mode 100644 source/ap/vim/patches/7.3.316 create mode 100644 source/ap/vim/patches/7.3.317 create mode 100644 source/ap/vim/patches/7.3.318 create mode 100644 source/ap/vim/patches/7.3.319 create mode 100644 source/ap/vim/patches/7.3.320 create mode 100644 source/ap/vim/patches/7.3.321 create mode 100644 source/ap/vim/patches/7.3.322 create mode 100644 source/ap/vim/patches/7.3.323 create mode 100644 source/ap/vim/patches/7.3.324 create mode 100644 source/ap/vim/patches/7.3.325 create mode 100644 source/ap/vim/patches/7.3.326 create mode 100644 source/ap/vim/patches/7.3.327 create mode 100644 source/ap/vim/patches/7.3.328 create mode 100644 source/ap/vim/patches/7.3.329 create mode 100644 source/ap/vim/patches/7.3.330 create mode 100644 source/ap/vim/patches/7.3.331 create mode 100644 source/ap/vim/patches/7.3.332 create mode 100644 source/ap/vim/patches/7.3.333 create mode 100644 source/ap/vim/patches/7.3.334 create mode 100644 source/ap/vim/patches/7.3.335 create mode 100644 source/ap/vim/patches/7.3.336 create mode 100644 source/ap/vim/patches/7.3.337 create mode 100644 source/ap/vim/patches/7.3.338 create mode 100644 source/ap/vim/patches/7.3.339 create mode 100644 source/ap/vim/patches/7.3.340 create mode 100644 source/ap/vim/patches/7.3.341 create mode 100644 source/ap/vim/patches/7.3.342 create mode 100644 source/ap/vim/patches/7.3.343 create mode 100644 source/ap/vim/patches/7.3.344 create mode 100644 source/ap/vim/patches/7.3.345 create mode 100644 source/ap/vim/patches/7.3.346 create mode 100644 source/ap/vim/patches/7.3.347 create mode 100644 source/ap/vim/patches/7.3.348 create mode 100644 source/ap/vim/patches/7.3.349 create mode 100644 source/ap/vim/patches/7.3.350 create mode 100644 source/ap/vim/patches/7.3.351 create mode 100644 source/ap/vim/patches/7.3.352 create mode 100644 source/ap/vim/patches/7.3.353 create mode 100644 source/ap/vim/patches/7.3.354 create mode 100644 source/ap/vim/patches/7.3.355 create mode 100644 source/ap/vim/patches/7.3.356 create mode 100644 source/ap/vim/patches/7.3.357 create mode 100644 source/ap/vim/patches/7.3.358 create mode 100644 source/ap/vim/patches/7.3.359 create mode 100644 source/ap/vim/patches/7.3.360 create mode 100644 source/ap/vim/patches/7.3.361 create mode 100644 source/ap/vim/patches/7.3.362 create mode 100644 source/ap/vim/patches/7.3.363 create mode 100644 source/ap/vim/patches/7.3.364 create mode 100644 source/ap/vim/patches/7.3.365 create mode 100644 source/ap/vim/patches/7.3.366 create mode 100644 source/ap/vim/patches/7.3.367 create mode 100644 source/ap/vim/patches/7.3.368 create mode 100644 source/ap/vim/patches/7.3.369 create mode 100644 source/ap/vim/patches/7.3.370 create mode 100644 source/ap/vim/patches/7.3.371 create mode 100644 source/ap/vim/patches/7.3.372 create mode 100644 source/ap/vim/patches/7.3.373 create mode 100644 source/ap/vim/patches/7.3.374 create mode 100644 source/ap/vim/patches/7.3.375 create mode 100644 source/ap/vim/patches/7.3.376 create mode 100644 source/ap/vim/patches/7.3.377 create mode 100644 source/ap/vim/patches/7.3.378 create mode 100644 source/ap/vim/patches/7.3.379 create mode 100644 source/ap/vim/patches/7.3.380 create mode 100644 source/ap/vim/patches/7.3.381 create mode 100644 source/ap/vim/patches/7.3.382 create mode 100644 source/ap/vim/patches/7.3.383 create mode 100644 source/ap/vim/patches/7.3.384 create mode 100644 source/ap/vim/patches/7.3.385 create mode 100644 source/ap/vim/patches/7.3.386 create mode 100644 source/ap/vim/patches/7.3.387 create mode 100644 source/ap/vim/patches/7.3.388 create mode 100644 source/ap/vim/patches/7.3.389 create mode 100644 source/ap/vim/patches/7.3.390 create mode 100644 source/ap/vim/patches/7.3.391 create mode 100644 source/ap/vim/patches/7.3.392 create mode 100644 source/ap/vim/patches/7.3.393 create mode 100644 source/ap/vim/patches/7.3.394 create mode 100644 source/ap/vim/patches/7.3.395 create mode 100644 source/ap/vim/patches/7.3.396 create mode 100644 source/ap/vim/patches/7.3.397 create mode 100644 source/ap/vim/patches/7.3.398 create mode 100644 source/ap/vim/patches/7.3.399 create mode 100644 source/ap/vim/patches/7.3.400 create mode 100644 source/ap/vim/patches/7.3.401 create mode 100644 source/ap/vim/patches/7.3.402 create mode 100644 source/ap/vim/patches/7.3.403 create mode 100644 source/ap/vim/patches/7.3.404 create mode 100644 source/ap/vim/patches/7.3.405 create mode 100644 source/ap/vim/patches/7.3.406 create mode 100644 source/ap/vim/patches/7.3.407 create mode 100644 source/ap/vim/patches/7.3.408 create mode 100644 source/ap/vim/patches/7.3.409 create mode 100644 source/ap/vim/patches/7.3.410 create mode 100644 source/ap/vim/patches/7.3.411 create mode 100644 source/ap/vim/patches/7.3.412 create mode 100644 source/ap/vim/patches/7.3.413 create mode 100644 source/ap/vim/patches/7.3.414 create mode 100644 source/ap/vim/patches/7.3.415 create mode 100644 source/ap/vim/patches/7.3.416 create mode 100644 source/ap/vim/patches/7.3.417 create mode 100644 source/ap/vim/patches/7.3.418 create mode 100644 source/ap/vim/patches/7.3.419 create mode 100644 source/ap/vim/patches/7.3.420 create mode 100644 source/ap/vim/patches/7.3.421 create mode 100644 source/ap/vim/patches/7.3.422 create mode 100644 source/ap/vim/patches/7.3.423 create mode 100644 source/ap/vim/patches/7.3.424 create mode 100644 source/ap/vim/patches/7.3.425 create mode 100644 source/ap/vim/patches/7.3.426 create mode 100644 source/ap/vim/patches/7.3.427 create mode 100644 source/ap/vim/patches/7.3.428 create mode 100644 source/ap/vim/patches/7.3.429 create mode 100644 source/ap/vim/patches/7.3.430 create mode 100644 source/ap/vim/patches/7.3.431 create mode 100644 source/ap/vim/patches/7.3.432 create mode 100644 source/ap/vim/patches/7.3.433 create mode 100644 source/ap/vim/patches/7.3.434 create mode 100644 source/ap/vim/patches/7.3.435 create mode 100644 source/ap/vim/patches/7.3.436 create mode 100644 source/ap/vim/patches/7.3.437 create mode 100644 source/ap/vim/patches/7.3.438 create mode 100644 source/ap/vim/patches/7.3.439 create mode 100644 source/ap/vim/patches/7.3.440 create mode 100644 source/ap/vim/patches/7.3.441 create mode 100644 source/ap/vim/patches/7.3.442 create mode 100644 source/ap/vim/patches/7.3.443 create mode 100644 source/ap/vim/patches/7.3.444 create mode 100644 source/ap/vim/patches/7.3.445 create mode 100644 source/ap/vim/patches/7.3.446 create mode 100644 source/ap/vim/patches/7.3.447 create mode 100644 source/ap/vim/patches/7.3.448 create mode 100644 source/ap/vim/patches/7.3.449 create mode 100644 source/ap/vim/patches/7.3.450 create mode 100644 source/ap/vim/patches/7.3.451 create mode 100644 source/ap/vim/patches/7.3.452 create mode 100644 source/ap/vim/patches/7.3.453 create mode 100644 source/ap/vim/patches/7.3.454 create mode 100644 source/ap/vim/patches/7.3.455 create mode 100644 source/ap/vim/patches/7.3.456 create mode 100644 source/ap/vim/patches/7.3.457 create mode 100644 source/ap/vim/patches/7.3.458 create mode 100644 source/ap/vim/patches/7.3.459 create mode 100644 source/ap/vim/patches/7.3.460 create mode 100644 source/ap/vim/patches/7.3.461 create mode 100644 source/ap/vim/patches/7.3.462 create mode 100644 source/ap/vim/patches/7.3.463 create mode 100644 source/ap/vim/patches/7.3.464 create mode 100644 source/ap/vim/patches/7.3.465 create mode 100644 source/ap/vim/patches/7.3.466 create mode 100644 source/ap/vim/patches/7.3.467 create mode 100644 source/ap/vim/patches/7.3.468 create mode 100644 source/ap/vim/patches/7.3.469 create mode 100644 source/ap/vim/patches/7.3.470 create mode 100644 source/ap/vim/patches/7.3.471 create mode 100644 source/ap/vim/patches/7.3.472 create mode 100644 source/ap/vim/patches/7.3.473 create mode 100644 source/ap/vim/patches/7.3.474 create mode 100644 source/ap/vim/patches/7.3.475 create mode 100644 source/ap/vim/patches/7.3.476 create mode 100644 source/ap/vim/patches/7.3.477 create mode 100644 source/ap/vim/patches/7.3.478 create mode 100644 source/ap/vim/patches/7.3.479 create mode 100644 source/ap/vim/patches/7.3.480 create mode 100644 source/ap/vim/patches/7.3.481 create mode 100644 source/ap/vim/patches/7.3.482 create mode 100644 source/ap/vim/patches/7.3.483 create mode 100644 source/ap/vim/patches/7.3.484 create mode 100644 source/ap/vim/patches/7.3.485 create mode 100644 source/ap/vim/patches/7.3.486 create mode 100644 source/ap/vim/patches/7.3.487 create mode 100644 source/ap/vim/patches/7.3.488 create mode 100644 source/ap/vim/patches/7.3.489 create mode 100644 source/ap/vim/patches/7.3.490 create mode 100644 source/ap/vim/patches/7.3.491 create mode 100644 source/ap/vim/patches/7.3.492 create mode 100644 source/ap/vim/patches/7.3.493 create mode 100644 source/ap/vim/patches/7.3.494 create mode 100644 source/ap/vim/patches/7.3.495 create mode 100644 source/ap/vim/patches/7.3.496 create mode 100644 source/ap/vim/patches/7.3.497 create mode 100644 source/ap/vim/patches/7.3.498 create mode 100644 source/ap/vim/patches/7.3.499 create mode 100644 source/ap/vim/patches/7.3.500 create mode 100644 source/ap/vim/patches/7.3.501 create mode 100644 source/ap/vim/patches/7.3.502 create mode 100644 source/ap/vim/patches/7.3.503 create mode 100644 source/ap/vim/patches/7.3.504 create mode 100644 source/ap/vim/patches/7.3.505 create mode 100644 source/ap/vim/patches/7.3.506 create mode 100644 source/ap/vim/patches/7.3.507 create mode 100644 source/ap/vim/patches/7.3.508 create mode 100644 source/ap/vim/patches/7.3.509 create mode 100644 source/ap/vim/patches/7.3.510 create mode 100644 source/ap/vim/patches/7.3.511 create mode 100644 source/ap/vim/patches/7.3.512 create mode 100644 source/ap/vim/patches/7.3.513 create mode 100644 source/ap/vim/patches/7.3.514 create mode 100644 source/ap/vim/patches/7.3.515 create mode 100644 source/ap/vim/patches/7.3.516 create mode 100644 source/ap/vim/patches/7.3.517 create mode 100644 source/ap/vim/patches/7.3.518 create mode 100644 source/ap/vim/patches/7.3.519 create mode 100644 source/ap/vim/patches/7.3.520 create mode 100644 source/ap/vim/patches/7.3.521 create mode 100644 source/ap/vim/patches/7.3.522 create mode 100644 source/ap/vim/patches/7.3.523 create mode 100644 source/ap/vim/patches/7.3.524 create mode 100644 source/ap/vim/patches/7.3.525 create mode 100644 source/ap/vim/patches/7.3.526 create mode 100644 source/ap/vim/patches/7.3.527 create mode 100644 source/ap/vim/patches/7.3.528 create mode 100644 source/ap/vim/patches/7.3.529 create mode 100644 source/ap/vim/patches/7.3.530 create mode 100644 source/ap/vim/patches/7.3.531 create mode 100644 source/ap/vim/patches/7.3.532 create mode 100644 source/ap/vim/patches/7.3.533 create mode 100644 source/ap/vim/patches/7.3.534 create mode 100644 source/ap/vim/patches/7.3.535 create mode 100644 source/ap/vim/patches/7.3.536 create mode 100644 source/ap/vim/patches/7.3.537 create mode 100644 source/ap/vim/patches/7.3.538 create mode 100644 source/ap/vim/patches/7.3.539 create mode 100644 source/ap/vim/patches/7.3.540 create mode 100644 source/ap/vim/patches/7.3.541 create mode 100644 source/ap/vim/patches/7.3.542 create mode 100644 source/ap/vim/patches/7.3.543 create mode 100644 source/ap/vim/patches/7.3.544 create mode 100644 source/ap/vim/patches/7.3.545 create mode 100644 source/ap/vim/patches/7.3.546 create mode 100644 source/ap/vim/patches/7.3.547 create mode 100644 source/ap/vim/patches/7.3.548 create mode 100644 source/ap/vim/patches/7.3.549 create mode 100644 source/ap/vim/patches/7.3.550 create mode 100644 source/ap/vim/patches/7.3.551 create mode 100644 source/ap/vim/patches/7.3.552 create mode 100644 source/ap/vim/patches/7.3.553 create mode 100644 source/ap/vim/patches/7.3.554 create mode 100644 source/ap/vim/patches/7.3.555 create mode 100644 source/ap/vim/patches/7.3.556 create mode 100644 source/ap/vim/patches/7.3.557 create mode 100644 source/ap/vim/patches/7.3.558 create mode 100644 source/ap/vim/patches/7.3.559 create mode 100644 source/ap/vim/patches/7.3.560 create mode 100644 source/ap/vim/patches/7.3.561 create mode 100644 source/ap/vim/patches/7.3.562 create mode 100644 source/ap/vim/patches/7.3.563 create mode 100644 source/ap/vim/patches/7.3.564 create mode 100644 source/ap/vim/patches/7.3.565 create mode 100644 source/ap/vim/patches/7.3.566 create mode 100644 source/ap/vim/patches/7.3.567 create mode 100644 source/ap/vim/patches/7.3.568 create mode 100644 source/ap/vim/patches/7.3.569 create mode 100644 source/ap/vim/patches/7.3.570 create mode 100644 source/ap/vim/patches/7.3.571 create mode 100644 source/ap/vim/patches/7.3.572 create mode 100644 source/ap/vim/patches/7.3.573 create mode 100644 source/ap/vim/patches/7.3.574 create mode 100644 source/ap/vim/patches/7.3.575 create mode 100644 source/ap/vim/patches/7.3.576 create mode 100644 source/ap/vim/patches/7.3.577 create mode 100644 source/ap/vim/patches/7.3.578 create mode 100644 source/ap/vim/patches/7.3.579 create mode 100644 source/ap/vim/patches/7.3.580 create mode 100644 source/ap/vim/patches/7.3.581 create mode 100644 source/ap/vim/patches/7.3.582 create mode 100644 source/ap/vim/patches/7.3.583 create mode 100644 source/ap/vim/patches/7.3.584 create mode 100644 source/ap/vim/patches/7.3.585 create mode 100644 source/ap/vim/patches/7.3.586 create mode 100644 source/ap/vim/patches/7.3.587 create mode 100644 source/ap/vim/patches/7.3.588 create mode 100644 source/ap/vim/patches/7.3.589 create mode 100644 source/ap/vim/patches/7.3.590 create mode 100644 source/ap/vim/patches/7.3.591 create mode 100644 source/ap/vim/patches/7.3.592 create mode 100644 source/ap/vim/patches/7.3.593 create mode 100644 source/ap/vim/patches/7.3.594 create mode 100644 source/ap/vim/patches/7.3.595 create mode 100644 source/ap/vim/patches/7.3.596 create mode 100644 source/ap/vim/patches/7.3.597 create mode 100644 source/ap/vim/patches/7.3.598 create mode 100644 source/ap/vim/patches/7.3.599 create mode 100644 source/ap/vim/patches/7.3.600 create mode 100644 source/ap/vim/patches/7.3.601 create mode 100644 source/ap/vim/patches/7.3.602 create mode 100644 source/ap/vim/patches/7.3.603 create mode 100644 source/ap/vim/patches/7.3.604 create mode 100644 source/ap/vim/patches/7.3.605 create mode 100644 source/ap/vim/patches/7.3.606 create mode 100644 source/ap/vim/patches/7.3.607 create mode 100644 source/ap/vim/patches/7.3.608 create mode 100644 source/ap/vim/patches/7.3.609 create mode 100644 source/ap/vim/patches/7.3.610 create mode 100644 source/ap/vim/patches/7.3.611 create mode 100644 source/ap/vim/patches/7.3.612 create mode 100644 source/ap/vim/patches/7.3.613 create mode 100644 source/ap/vim/patches/7.3.614 create mode 100644 source/ap/vim/patches/7.3.615 create mode 100644 source/ap/vim/patches/7.3.616 create mode 100644 source/ap/vim/patches/7.3.617 create mode 100644 source/ap/vim/patches/7.3.618 create mode 100644 source/ap/vim/patches/7.3.619 create mode 100644 source/ap/vim/patches/7.3.620 create mode 100644 source/ap/vim/patches/7.3.621 create mode 100644 source/ap/vim/patches/7.3.622 create mode 100644 source/ap/vim/patches/7.3.623 create mode 100644 source/ap/vim/patches/7.3.624 create mode 100644 source/ap/vim/patches/7.3.625 create mode 100644 source/ap/vim/patches/7.3.626 create mode 100644 source/ap/vim/patches/7.3.627 create mode 100644 source/ap/vim/patches/7.3.628 create mode 100644 source/ap/vim/patches/7.3.629 create mode 100644 source/ap/vim/patches/7.3.630 create mode 100644 source/ap/vim/patches/7.3.631 create mode 100644 source/ap/vim/patches/7.3.632 create mode 100644 source/ap/vim/patches/7.3.633 create mode 100644 source/ap/vim/patches/7.3.634 create mode 100644 source/ap/vim/patches/7.3.635 create mode 100644 source/ap/vim/patches/7.3.636 create mode 100644 source/ap/vim/patches/7.3.637 create mode 100644 source/ap/vim/patches/7.3.638 create mode 100644 source/ap/vim/patches/7.3.639 create mode 100644 source/ap/vim/patches/7.3.640 create mode 100644 source/ap/vim/patches/7.3.641 create mode 100644 source/ap/vim/patches/7.3.642 create mode 100644 source/ap/vim/patches/7.3.643 create mode 100644 source/ap/vim/patches/7.3.644 create mode 100644 source/ap/vim/patches/7.3.645 delete mode 100644 source/ap/zsh/zsh.regex.oh.bah.diff create mode 100644 source/d/automake/automake.perl516.prototype.diff delete mode 100644 source/d/binutils/binutils-2.21.51.0.6.tar.sign create mode 100644 source/d/binutils/binutils-2.22.52.0.2.tar.sign delete mode 100644 source/d/binutils/release.binutils-2.21.51.0.6 create mode 100644 source/d/binutils/release.binutils-2.22.52.0.2 create mode 100644 source/d/cmake/cmake.findpkgconfig.3ea850.patch create mode 100644 source/d/gcc/antlr-runtime-3.4.jar create mode 100644 source/d/gcc/create_gcj_jvm.sh create mode 100644 source/d/gcc/ecj.sh create mode 100644 source/d/gcc/gcc-4.7.1.adalib.pic.diff create mode 100644 source/d/gcc/slack-desc.gcc-go delete mode 100644 source/d/git/git-1.7.4.4.tar.sign create mode 100644 source/d/git/git.url create mode 100755 source/d/llvm/llvm.SlackBuild create mode 100644 source/d/llvm/llvm.url create mode 100644 source/d/llvm/slack-desc create mode 100644 source/d/make/make-3.82-android-build-fix.diff create mode 100644 source/d/oprofile/oprofile.binutils.diff delete mode 100644 source/d/oprofile/oprofile.qt4.diff create mode 100644 source/d/python/python.no-static-library.diff delete mode 100644 source/d/python/python.pure64.diff create mode 100644 source/installer/busybox-1.19.4.tar.bz2.sign create mode 100644 source/installer/busybox.wget.P.diff delete mode 100644 source/k/README_SPEAKUP_PATCH.TXT delete mode 100644 source/k/config-generic-2.6.37.6 delete mode 100644 source/k/config-huge-2.6.37.6 create mode 100644 source/k/config-x86/config-generic-3.2.29 create mode 100644 source/k/config-x86/config-generic-smp-3.2.29-smp create mode 100644 source/k/config-x86/config-huge-3.2.29 create mode 100644 source/k/config-x86/config-huge-smp-3.2.29-smp create mode 100644 source/k/config-x86_64/config-generic-3.2.29.x64 create mode 100644 source/k/config-x86_64/config-huge-3.2.29.x64 delete mode 100755 source/k/kernel-firmware/kernel-firmware.SlackBuild delete mode 100644 source/k/kernel-firmware/slack-desc delete mode 100755 source/k/kernel-generic/kernel-generic.SlackBuild delete mode 100644 source/k/kernel-generic/slack-desc delete mode 100755 source/k/kernel-huge/kernel-huge.SlackBuild delete mode 100644 source/k/kernel-huge/slack-desc delete mode 100755 source/k/kernel-modules/kernel-modules.SlackBuild delete mode 100755 source/k/kernel-modules/rc.modules.new delete mode 100644 source/k/kernel-modules/slack-desc delete mode 100644 source/k/linux-2.6.37.6.tar.sign create mode 100644 source/k/linux-3.2.29.tar.sign create mode 100755 source/k/packaging-x86/kernel-generic-smp/kernel-generic-smp.SlackBuild create mode 100644 source/k/packaging-x86/kernel-generic-smp/slack-desc create mode 100755 source/k/packaging-x86/kernel-generic/kernel-generic.SlackBuild create mode 100644 source/k/packaging-x86/kernel-generic/slack-desc create mode 100755 source/k/packaging-x86/kernel-huge-smp/kernel-huge-smp.SlackBuild create mode 100644 source/k/packaging-x86/kernel-huge-smp/slack-desc create mode 100755 source/k/packaging-x86/kernel-huge/kernel-huge.SlackBuild create mode 100644 source/k/packaging-x86/kernel-huge/slack-desc create mode 100755 source/k/packaging-x86/kernel-modules-smp/kernel-modules-smp.SlackBuild create mode 100755 source/k/packaging-x86/kernel-modules-smp/rc.modules.new create mode 100644 source/k/packaging-x86/kernel-modules-smp/slack-desc create mode 100755 source/k/packaging-x86/kernel-modules/kernel-modules.SlackBuild create mode 100755 source/k/packaging-x86/kernel-modules/rc.modules.new create mode 100644 source/k/packaging-x86/kernel-modules/slack-desc create mode 100755 source/k/packaging-x86_64/kernel-generic/kernel-generic.SlackBuild create mode 100644 source/k/packaging-x86_64/kernel-generic/slack-desc create mode 100755 source/k/packaging-x86_64/kernel-huge/kernel-huge.SlackBuild create mode 100644 source/k/packaging-x86_64/kernel-huge/slack-desc create mode 100755 source/k/packaging-x86_64/kernel-modules/kernel-modules.SlackBuild create mode 100755 source/k/packaging-x86_64/kernel-modules/rc.modules.new create mode 100644 source/k/packaging-x86_64/kernel-modules/slack-desc delete mode 100755 source/kde/KDE_extra.SlackBuild delete mode 100755 source/kde/amarok/amarok.SlackBuild delete mode 100644 source/kde/amarok/doinst.sh delete mode 100644 source/kde/amarok/local.options delete mode 100644 source/kde/amarok/slack-desc create mode 100644 source/kde/build/calligra create mode 100644 source/kde/cmake/amarok create mode 100644 source/kde/cmake/analitza create mode 100644 source/kde/cmake/bluedevil create mode 100644 source/kde/cmake/calligra create mode 100644 source/kde/cmake/cmake create mode 100644 source/kde/cmake/k3b create mode 100644 source/kde/cmake/kdeaccessibility create mode 100644 source/kde/cmake/kdeadmin create mode 100644 source/kde/cmake/kdeartwork create mode 100644 source/kde/cmake/kdebase create mode 100644 source/kde/cmake/kdebindings create mode 100644 source/kde/cmake/kdelibs create mode 100644 source/kde/cmake/kdenetwork create mode 100644 source/kde/cmake/kdewebdev create mode 100644 source/kde/cmake/kwebkitpart create mode 100644 source/kde/cmake/networkmanagement create mode 100644 source/kde/cmake/perlkde create mode 100644 source/kde/cmake/perlqt create mode 100644 source/kde/cmake/polkit-kde-agent-1 create mode 100644 source/kde/cmake/polkit-kde-kcmodules-1 create mode 100644 source/kde/docs/k3b create mode 100644 source/kde/docs/kdepimlibs create mode 100644 source/kde/doinst.sh/amarok create mode 100644 source/kde/doinst.sh/blinken create mode 100644 source/kde/doinst.sh/bluedevil create mode 100644 source/kde/doinst.sh/cantor create mode 100644 source/kde/doinst.sh/gwenview create mode 100644 source/kde/doinst.sh/jovie create mode 100644 source/kde/doinst.sh/k3b create mode 100644 source/kde/doinst.sh/kalgebra create mode 100644 source/kde/doinst.sh/kalzium create mode 100644 source/kde/doinst.sh/kamera create mode 100644 source/kde/doinst.sh/kanagram create mode 100644 source/kde/doinst.sh/kate create mode 100644 source/kde/doinst.sh/kaudiocreator create mode 100644 source/kde/doinst.sh/kbruch create mode 100644 source/kde/doinst.sh/kcalc create mode 100644 source/kde/doinst.sh/kcolorchooser create mode 100644 source/kde/doinst.sh/kde-applications create mode 100644 source/kde/doinst.sh/kde-baseapps create mode 100644 source/kde/doinst.sh/kde-runtime create mode 100644 source/kde/doinst.sh/kde-workspace create mode 100644 source/kde/doinst.sh/kdeaccessibility create mode 100644 source/kde/doinst.sh/kdeadmin create mode 100644 source/kde/doinst.sh/kdeartwork create mode 100644 source/kde/doinst.sh/kdebase create mode 100644 source/kde/doinst.sh/kdeedu create mode 100644 source/kde/doinst.sh/kdegames create mode 100644 source/kde/doinst.sh/kdegraphics create mode 100644 source/kde/doinst.sh/kdelibs create mode 100644 source/kde/doinst.sh/kdemultimedia create mode 100644 source/kde/doinst.sh/kdenetwork create mode 100644 source/kde/doinst.sh/kdepim create mode 100644 source/kde/doinst.sh/kdepim-runtime create mode 100644 source/kde/doinst.sh/kdeplasma-addons create mode 100644 source/kde/doinst.sh/kdesdk create mode 100644 source/kde/doinst.sh/kdetoys create mode 100644 source/kde/doinst.sh/kdeutils create mode 100644 source/kde/doinst.sh/kdevelop create mode 100644 source/kde/doinst.sh/kdevplatform create mode 100644 source/kde/doinst.sh/kdewebdev create mode 100644 source/kde/doinst.sh/kdf create mode 100644 source/kde/doinst.sh/kgamma create mode 100644 source/kde/doinst.sh/kgeography create mode 100644 source/kde/doinst.sh/khangman create mode 100644 source/kde/doinst.sh/kig create mode 100644 source/kde/doinst.sh/kiten create mode 100644 source/kde/doinst.sh/klettres create mode 100644 source/kde/doinst.sh/kmag create mode 100644 source/kde/doinst.sh/kmousetool create mode 100644 source/kde/doinst.sh/kmouth create mode 100644 source/kde/doinst.sh/kmplot create mode 100644 source/kde/doinst.sh/koffice create mode 100644 source/kde/doinst.sh/kolourpaint create mode 100644 source/kde/doinst.sh/konsole create mode 100644 source/kde/doinst.sh/kopete-cryptography create mode 100644 source/kde/doinst.sh/kruler create mode 100644 source/kde/doinst.sh/ksaneplugin create mode 100644 source/kde/doinst.sh/ksnapshot create mode 100644 source/kde/doinst.sh/kstars create mode 100644 source/kde/doinst.sh/ktorrent create mode 100644 source/kde/doinst.sh/ktouch create mode 100644 source/kde/doinst.sh/kturtle create mode 100644 source/kde/doinst.sh/kwordquiz create mode 100644 source/kde/doinst.sh/marble create mode 100644 source/kde/doinst.sh/okular create mode 100644 source/kde/doinst.sh/parley create mode 100644 source/kde/doinst.sh/rocs create mode 100644 source/kde/doinst.sh/skanlite create mode 100644 source/kde/doinst.sh/step create mode 100644 source/kde/doinst.sh/wicd-kde delete mode 100644 source/kde/k3b/doinst.sh delete mode 100755 source/kde/k3b/k3b.SlackBuild delete mode 100644 source/kde/k3b/local.options delete mode 100644 source/kde/k3b/slack-desc delete mode 100644 source/kde/kaudiocreator/doinst.sh delete mode 100755 source/kde/kaudiocreator/kaudiocreator.SlackBuild delete mode 100644 source/kde/kaudiocreator/local.options delete mode 100644 source/kde/kaudiocreator/slack-desc create mode 120000 source/kde/kde-deps-build/PyQt create mode 120000 source/kde/kde-deps-build/QScintilla create mode 120000 source/kde/kde-deps-build/akonadi create mode 100755 source/kde/kde-deps-build/alldeps.SlackBuild create mode 120000 source/kde/kde-deps-build/attica create mode 120000 source/kde/kde-deps-build/clucene create mode 120000 source/kde/kde-deps-build/ebook-tools create mode 120000 source/kde/kde-deps-build/grantlee create mode 120000 source/kde/kde-deps-build/herqq create mode 120000 source/kde/kde-deps-build/hunspell create mode 120000 source/kde/kde-deps-build/lcms2 create mode 120000 source/kde/kde-deps-build/libatasmart create mode 120000 source/kde/kde-deps-build/libbluedevil create mode 120000 source/kde/kde-deps-build/libdbusmenu-qt create mode 120000 source/kde/kde-deps-build/libmsn create mode 120000 source/kde/kde-deps-build/libssh create mode 120000 source/kde/kde-deps-build/libvncserver create mode 120000 source/kde/kde-deps-build/phonon create mode 120000 source/kde/kde-deps-build/phonon-gstreamer create mode 120000 source/kde/kde-deps-build/phonon-mplayer create mode 120000 source/kde/kde-deps-build/phonon-xine create mode 120000 source/kde/kde-deps-build/polkit-qt-1 create mode 120000 source/kde/kde-deps-build/qt create mode 120000 source/kde/kde-deps-build/raptor2 create mode 120000 source/kde/kde-deps-build/rasqal create mode 120000 source/kde/kde-deps-build/redland create mode 120000 source/kde/kde-deps-build/sg3_utils create mode 120000 source/kde/kde-deps-build/shared-desktop-ontologies create mode 120000 source/kde/kde-deps-build/sip create mode 120000 source/kde/kde-deps-build/soprano create mode 120000 source/kde/kde-deps-build/strigi create mode 120000 source/kde/kde-deps-build/system-config-printer create mode 120000 source/kde/kde-deps-build/udisks create mode 120000 source/kde/kde-deps-build/upower delete mode 100644 source/kde/kdeaccessibility/doinst.sh delete mode 100755 source/kde/kdeaccessibility/kdeaccessibility.SlackBuild delete mode 100644 source/kde/kdeaccessibility/slack-desc delete mode 100644 source/kde/kdeadmin/doinst.sh delete mode 100755 source/kde/kdeadmin/kdeadmin.SlackBuild delete mode 100644 source/kde/kdeadmin/knetworkconf.diff delete mode 100644 source/kde/kdeadmin/local.options delete mode 100644 source/kde/kdeadmin/slack-desc delete mode 100644 source/kde/kdeartwork/doinst.sh delete mode 100755 source/kde/kdeartwork/kdeartwork.SlackBuild delete mode 100644 source/kde/kdeartwork/local.options delete mode 100644 source/kde/kdeartwork/slack-desc delete mode 100644 source/kde/kdebase-runtime/doinst.sh delete mode 100755 source/kde/kdebase-runtime/kdebase-runtime.SlackBuild delete mode 100644 source/kde/kdebase-runtime/local.options delete mode 100644 source/kde/kdebase-runtime/slack-desc delete mode 100644 source/kde/kdebase-workspace/config/Xsession delete mode 100644 source/kde/kdebase-workspace/config/Xsession.orig delete mode 100644 source/kde/kdebase-workspace/doinst.sh delete mode 100755 source/kde/kdebase-workspace/kdebase-workspace.SlackBuild delete mode 100644 source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff delete mode 100644 source/kde/kdebase-workspace/slack-desc delete mode 100755 source/kde/kdebase-workspace/xinit/xinitrc.kde delete mode 100644 source/kde/kdebase/config/kdeglobals delete mode 100644 source/kde/kdebase/doinst.sh delete mode 100755 source/kde/kdebase/kdebase.SlackBuild delete mode 100644 source/kde/kdebase/konsole_right_click-185466.patch delete mode 100644 source/kde/kdebase/konsole_right_click-185466.patch.patch delete mode 100644 source/kde/kdebase/local.options delete mode 100755 source/kde/kdebase/profile.d/kde.csh delete mode 100755 source/kde/kdebase/profile.d/kde.sh delete mode 100644 source/kde/kdebase/slack-desc delete mode 100644 source/kde/kdebindings/kdebindings-len-ptr-rfloat.diff delete mode 100644 source/kde/kdebindings/kdebindings-ruby-env.h.diff delete mode 100644 source/kde/kdebindings/kdebindings-rubyconfig.h.diff delete mode 100644 source/kde/kdebindings/kdebindings.1170602.sip_4_11_x.diff delete mode 100755 source/kde/kdebindings/kdebindings.SlackBuild delete mode 100644 source/kde/kdebindings/local.options delete mode 100644 source/kde/kdebindings/pykdeuic4.patch delete mode 100644 source/kde/kdebindings/slack-desc delete mode 100644 source/kde/kdeedu/doinst.sh delete mode 100755 source/kde/kdeedu/kdeedu.SlackBuild delete mode 100644 source/kde/kdeedu/slack-desc delete mode 100644 source/kde/kdegames/doinst.sh delete mode 100755 source/kde/kdegames/kdegames.SlackBuild delete mode 100644 source/kde/kdegames/slack-desc delete mode 100644 source/kde/kdegraphics/doinst.sh delete mode 100755 source/kde/kdegraphics/kdegraphics.SlackBuild delete mode 100644 source/kde/kdegraphics/local.options delete mode 100644 source/kde/kdegraphics/slack-desc delete mode 100644 source/kde/kdelibs/doinst.sh delete mode 100755 source/kde/kdelibs/kdelibs.SlackBuild delete mode 100644 source/kde/kdelibs/kdelibs.docbook.patch delete mode 100644 source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff delete mode 100644 source/kde/kdelibs/kdesu-allow_NOPASS_in_suauth.patch delete mode 100644 source/kde/kdelibs/local.options delete mode 100644 source/kde/kdelibs/slack-desc delete mode 100644 source/kde/kdemultimedia/doinst.sh delete mode 100755 source/kde/kdemultimedia/kdemultimedia.SlackBuild delete mode 100644 source/kde/kdemultimedia/slack-desc delete mode 100644 source/kde/kdenetwork/doinst.sh delete mode 100755 source/kde/kdenetwork/kdenetwork.SlackBuild delete mode 100644 source/kde/kdenetwork/slack-desc delete mode 100644 source/kde/kdepim-runtime/doinst.sh delete mode 100755 source/kde/kdepim-runtime/kdepim-runtime.SlackBuild delete mode 100644 source/kde/kdepim-runtime/local.options delete mode 100644 source/kde/kdepim-runtime/slack-desc delete mode 100644 source/kde/kdepim/doinst.sh delete mode 100644 source/kde/kdepim/kdepim-4.4.0-install-headers.patch delete mode 100755 source/kde/kdepim/kdepim.SlackBuild delete mode 100644 source/kde/kdepim/local.options delete mode 100644 source/kde/kdepim/slack-desc delete mode 100644 source/kde/kdepimlibs/kdepimlibs-4.5.imap4.cpp.r1216162.diff delete mode 100755 source/kde/kdepimlibs/kdepimlibs.SlackBuild delete mode 100644 source/kde/kdepimlibs/local.options delete mode 100644 source/kde/kdepimlibs/slack-desc delete mode 100644 source/kde/kdeplasma-addons/doinst.sh delete mode 100755 source/kde/kdeplasma-addons/kdeplasma-addons.SlackBuild delete mode 100644 source/kde/kdeplasma-addons/slack-desc delete mode 100644 source/kde/kdesdk/doinst.sh delete mode 100755 source/kde/kdesdk/kdesdk.SlackBuild delete mode 100644 source/kde/kdesdk/slack-desc delete mode 100644 source/kde/kdetoys/doinst.sh delete mode 100755 source/kde/kdetoys/kdetoys.SlackBuild delete mode 100644 source/kde/kdetoys/slack-desc delete mode 100644 source/kde/kdeutils/doinst.sh delete mode 100755 source/kde/kdeutils/kdeutils.SlackBuild delete mode 100644 source/kde/kdeutils/slack-desc delete mode 100644 source/kde/kdevelop/doinst.sh delete mode 100755 source/kde/kdevelop/kdevelop.SlackBuild delete mode 100644 source/kde/kdevelop/local.options delete mode 100644 source/kde/kdevelop/slack-desc delete mode 100644 source/kde/kdevplatform/doinst.sh delete mode 100755 source/kde/kdevplatform/kdevplatform.SlackBuild delete mode 100644 source/kde/kdevplatform/local.options delete mode 100644 source/kde/kdevplatform/slack-desc delete mode 100644 source/kde/kdewebdev/doinst.sh delete mode 100644 source/kde/kdewebdev/include-tidy.patch delete mode 100644 source/kde/kdewebdev/kde4-kdewebdev-findtidy.diff delete mode 100755 source/kde/kdewebdev/kdewebdev.SlackBuild delete mode 100644 source/kde/kdewebdev/slack-desc delete mode 100755 source/kde/kdewebdev/tidy/get-tidy-cvs.sh delete mode 100755 source/kde/kdewebdev/tidy/tidy.SlackBuild delete mode 100755 source/kde/kdewebdev/tidy/tidy.build delete mode 100644 source/kde/koffice/doinst.sh delete mode 100755 source/kde/koffice/koffice.SlackBuild delete mode 100644 source/kde/koffice/local.options delete mode 100644 source/kde/koffice/slack-desc delete mode 100644 source/kde/konq-plugins/konq-plugins-4.4.0-qt47.patch delete mode 100755 source/kde/konq-plugins/konq-plugins.SlackBuild delete mode 100644 source/kde/konq-plugins/local.options delete mode 100644 source/kde/konq-plugins/slack-desc delete mode 100644 source/kde/kopete-cryptography/doinst.sh delete mode 100755 source/kde/kopete-cryptography/kopete-cryptography.SlackBuild delete mode 100644 source/kde/kopete-cryptography/local.options delete mode 100644 source/kde/kopete-cryptography/slack-desc delete mode 100644 source/kde/ktorrent/doinst.sh delete mode 100755 source/kde/ktorrent/ktorrent.SlackBuild delete mode 100644 source/kde/ktorrent/local.options delete mode 100644 source/kde/ktorrent/slack-desc delete mode 100755 source/kde/libktorrent/libktorrent.SlackBuild delete mode 100644 source/kde/libktorrent/local.options delete mode 100644 source/kde/libktorrent/slack-desc create mode 100644 source/kde/modularize create mode 100644 source/kde/modules/extragear create mode 100644 source/kde/modules/kdeaccessibility create mode 100644 source/kde/modules/kdeadmin create mode 100644 source/kde/modules/kdeartwork create mode 100644 source/kde/modules/kdebase create mode 100644 source/kde/modules/kdebindings create mode 100644 source/kde/modules/kdeedu create mode 100644 source/kde/modules/kdegames create mode 100644 source/kde/modules/kdegraphics create mode 100644 source/kde/modules/kdelibs create mode 100644 source/kde/modules/kdemultimedia create mode 100644 source/kde/modules/kdenetwork create mode 100644 source/kde/modules/kdepim create mode 100644 source/kde/modules/kdepimlibs create mode 100644 source/kde/modules/kdeplasma-addons create mode 100644 source/kde/modules/kdesdk create mode 100644 source/kde/modules/kdetoys create mode 100644 source/kde/modules/kdeutils create mode 100644 source/kde/modules/kdewebdev create mode 100644 source/kde/modules/oxygen-icons create mode 100644 source/kde/modules/polkit-kde create mode 100644 source/kde/noarch delete mode 100755 source/kde/oxygen-icons/oxygen-icons.SlackBuild delete mode 100644 source/kde/oxygen-icons/slack-desc create mode 100644 source/kde/package-blacklist create mode 100644 source/kde/patch/README create mode 100644 source/kde/patch/amarok.patch create mode 100644 source/kde/patch/amarok/amarok-liblastfm1.patch create mode 100644 source/kde/patch/calligra.patch create mode 100644 source/kde/patch/calligra/calligra.words.fix_overflow.diff create mode 100644 source/kde/patch/kde-workspace.patch create mode 100644 source/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff create mode 100644 source/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff create mode 100644 source/kde/patch/kdelibs.patch create mode 100644 source/kde/patch/kdelibs/kdelibs.docbook.patch create mode 100644 source/kde/patch/kdelibs/kdelibs.upnp_conditional.patch create mode 100644 source/kde/patch/kdepim.patch create mode 100644 source/kde/patch/kdepim/kdepim-4.5.85-install-headers.patch create mode 100644 source/kde/patch/kdewebdev.patch create mode 100644 source/kde/patch/kdewebdev/include-tidy.patch create mode 100644 source/kde/patch/korundum.patch create mode 100644 source/kde/patch/korundum/korundum_ruby19.patch delete mode 100644 source/kde/polkit-kde-1/local.options delete mode 100755 source/kde/polkit-kde-1/polkit-kde-1.SlackBuild delete mode 100644 source/kde/polkit-kde-1/polkit-kde-1.nodrkonqi.diff delete mode 100644 source/kde/polkit-kde-1/slack-desc delete mode 100644 source/kde/polkit-kde-agent-1/local.options delete mode 100755 source/kde/polkit-kde-agent-1/polkit-kde-agent-1.SlackBuild delete mode 100644 source/kde/polkit-kde-agent-1/pull-polkit-kde-agent-1 delete mode 100644 source/kde/polkit-kde-agent-1/slack-desc delete mode 100644 source/kde/polkit-kde-kcmodules-1/local.options delete mode 100755 source/kde/polkit-kde-kcmodules-1/polkit-kde-kcmodules-1.SlackBuild delete mode 100644 source/kde/polkit-kde-kcmodules-1/pull-polkit-kde-kcmodules-1 delete mode 100644 source/kde/polkit-kde-kcmodules-1/slack-desc delete mode 100644 source/kde/polkit-qt-1/local.options delete mode 100755 source/kde/polkit-qt-1/polkit-qt-1.SlackBuild delete mode 100644 source/kde/polkit-qt-1/polkit-qt-1.null-checking.diff delete mode 100644 source/kde/polkit-qt-1/pull-polkit-qt-1 delete mode 100644 source/kde/polkit-qt-1/slack-desc create mode 100644 source/kde/post-install/k3b.post-install create mode 100644 source/kde/post-install/kde-baseapps.post-install create mode 100644 source/kde/post-install/kde-baseapps/profile.d/kde.csh create mode 100644 source/kde/post-install/kde-baseapps/profile.d/kde.sh create mode 100644 source/kde/post-install/kde-runtime.post-install create mode 100644 source/kde/post-install/kde-workspace.post-install create mode 100644 source/kde/post-install/kde-workspace/config/Xsession create mode 100644 source/kde/post-install/kde-workspace/config/Xsession.orig create mode 100644 source/kde/post-install/kde-workspace/xinit/xinitrc.kde create mode 100644 source/kde/post-install/kdelibs.post-install create mode 100644 source/kde/post-install/kdepim.post-install create mode 100644 source/kde/post-install/konsole.post-install create mode 100644 source/kde/post-install/wicd-kde.post-install create mode 100644 source/kde/pre-install/README create mode 100644 source/kde/pre-install/amarok.pre-install create mode 100644 source/kde/pre-install/kdewebdev.pre-install create mode 100644 source/kde/pre-install/kdewebdev/tidy/get-tidy-cvs.sh create mode 100755 source/kde/pre-install/kdewebdev/tidy/tidy.SlackBuild create mode 100644 source/kde/pre-install/kdewebdev/tidy/tidy.build delete mode 100644 source/kde/skanlite/doinst.sh delete mode 100644 source/kde/skanlite/local.options delete mode 100755 source/kde/skanlite/skanlite.SlackBuild delete mode 100644 source/kde/skanlite/slack-desc create mode 100644 source/kde/slack-desc/amarok create mode 100644 source/kde/slack-desc/analitza create mode 100644 source/kde/slack-desc/ark create mode 100644 source/kde/slack-desc/blinken create mode 100644 source/kde/slack-desc/bluedevil create mode 100644 source/kde/slack-desc/calligra create mode 100644 source/kde/slack-desc/cantor create mode 100644 source/kde/slack-desc/digikam create mode 100644 source/kde/slack-desc/filelight create mode 100644 source/kde/slack-desc/gwenview create mode 100644 source/kde/slack-desc/jovie create mode 100644 source/kde/slack-desc/k3b create mode 100644 source/kde/slack-desc/kaccessible create mode 100644 source/kde/slack-desc/kactivities create mode 100644 source/kde/slack-desc/kalgebra create mode 100644 source/kde/slack-desc/kalzium create mode 100644 source/kde/slack-desc/kamera create mode 100644 source/kde/slack-desc/kanagram create mode 100644 source/kde/slack-desc/kate create mode 100644 source/kde/slack-desc/kaudiocreator create mode 100644 source/kde/slack-desc/kbruch create mode 100644 source/kde/slack-desc/kcalc create mode 100644 source/kde/slack-desc/kcharselect create mode 100644 source/kde/slack-desc/kcolorchooser create mode 100644 source/kde/slack-desc/kde-base create mode 100644 source/kde/slack-desc/kde-base-artwork create mode 100644 source/kde/slack-desc/kde-baseapps create mode 100644 source/kde/slack-desc/kde-bindings create mode 100644 source/kde/slack-desc/kde-educational create mode 100644 source/kde/slack-desc/kde-runtime create mode 100644 source/kde/slack-desc/kde-wallpapers create mode 100644 source/kde/slack-desc/kde-workspace create mode 100644 source/kde/slack-desc/kdeaccessibility create mode 100644 source/kde/slack-desc/kdeadmin create mode 100644 source/kde/slack-desc/kdeartwork create mode 100644 source/kde/slack-desc/kdebase create mode 100644 source/kde/slack-desc/kdebase-runtime create mode 100644 source/kde/slack-desc/kdebase-workspace create mode 100644 source/kde/slack-desc/kdebindings create mode 100644 source/kde/slack-desc/kdeedu create mode 100644 source/kde/slack-desc/kdegames create mode 100644 source/kde/slack-desc/kdegraphics create mode 100644 source/kde/slack-desc/kdegraphics-mobipocket create mode 100644 source/kde/slack-desc/kdegraphics-strigi-analyzer create mode 100644 source/kde/slack-desc/kdegraphics-thumbnailers create mode 100644 source/kde/slack-desc/kdelibs create mode 100644 source/kde/slack-desc/kdemultimedia create mode 100644 source/kde/slack-desc/kdenetwork create mode 100644 source/kde/slack-desc/kdepim create mode 100644 source/kde/slack-desc/kdepim-runtime create mode 100644 source/kde/slack-desc/kdepimlibs create mode 100644 source/kde/slack-desc/kdeplasma-addons create mode 100644 source/kde/slack-desc/kdesdk create mode 100644 source/kde/slack-desc/kdetoys create mode 100644 source/kde/slack-desc/kdeutils create mode 100644 source/kde/slack-desc/kdevelop create mode 100644 source/kde/slack-desc/kdevelop-pg-qt create mode 100644 source/kde/slack-desc/kdevplatform create mode 100644 source/kde/slack-desc/kdewebdev create mode 100644 source/kde/slack-desc/kdf create mode 100644 source/kde/slack-desc/kfloppy create mode 100644 source/kde/slack-desc/kgamma create mode 100644 source/kde/slack-desc/kgeography create mode 100644 source/kde/slack-desc/kgpg create mode 100644 source/kde/slack-desc/khangman create mode 100644 source/kde/slack-desc/kig create mode 100644 source/kde/slack-desc/kimono create mode 100644 source/kde/slack-desc/kipi-plugins create mode 100644 source/kde/slack-desc/kiten create mode 100644 source/kde/slack-desc/klettres create mode 100644 source/kde/slack-desc/kmag create mode 100644 source/kde/slack-desc/kmousetool create mode 100644 source/kde/slack-desc/kmouth create mode 100644 source/kde/slack-desc/kmplot create mode 100644 source/kde/slack-desc/koffice create mode 100644 source/kde/slack-desc/kolourpaint create mode 100644 source/kde/slack-desc/konsole create mode 100644 source/kde/slack-desc/kopete-cryptography create mode 100644 source/kde/slack-desc/korundum create mode 100644 source/kde/slack-desc/kplayer create mode 100644 source/kde/slack-desc/kremotecontrol create mode 100644 source/kde/slack-desc/kross-interpreters create mode 100644 source/kde/slack-desc/kruler create mode 100644 source/kde/slack-desc/ksaneplugin create mode 100644 source/kde/slack-desc/ksecrets create mode 100644 source/kde/slack-desc/ksnapshot create mode 100644 source/kde/slack-desc/kstars create mode 100644 source/kde/slack-desc/ktimer create mode 100644 source/kde/slack-desc/ktorrent create mode 100644 source/kde/slack-desc/ktouch create mode 100644 source/kde/slack-desc/kturtle create mode 100644 source/kde/slack-desc/kwallet create mode 100644 source/kde/slack-desc/kwebkitpart create mode 100644 source/kde/slack-desc/kwordquiz create mode 100644 source/kde/slack-desc/libkdcraw create mode 100644 source/kde/slack-desc/libkdeedu create mode 100644 source/kde/slack-desc/libkexiv2 create mode 100644 source/kde/slack-desc/libkipi create mode 100644 source/kde/slack-desc/libksane create mode 100644 source/kde/slack-desc/libktorrent create mode 100644 source/kde/slack-desc/marble create mode 100644 source/kde/slack-desc/networkmanagement create mode 100644 source/kde/slack-desc/okular create mode 100644 source/kde/slack-desc/oxygen-gtk2 create mode 100644 source/kde/slack-desc/oxygen-icons create mode 100644 source/kde/slack-desc/parley create mode 100644 source/kde/slack-desc/perlkde create mode 100644 source/kde/slack-desc/perlqt create mode 100644 source/kde/slack-desc/polkit-kde-agent-1 create mode 100644 source/kde/slack-desc/polkit-kde-kcmodules-1 create mode 100644 source/kde/slack-desc/polkit-qt-1 create mode 100644 source/kde/slack-desc/printer-applet create mode 100644 source/kde/slack-desc/prison create mode 100644 source/kde/slack-desc/pykde4 create mode 100644 source/kde/slack-desc/qtruby create mode 100644 source/kde/slack-desc/quanta create mode 100644 source/kde/slack-desc/qyoto create mode 100644 source/kde/slack-desc/rocs create mode 100644 source/kde/slack-desc/skanlite create mode 100644 source/kde/slack-desc/smokegen create mode 100644 source/kde/slack-desc/smokekde create mode 100644 source/kde/slack-desc/smokeqt create mode 100644 source/kde/slack-desc/step create mode 100644 source/kde/slack-desc/strigi create mode 100644 source/kde/slack-desc/superkaramba create mode 100644 source/kde/slack-desc/svgpart create mode 100644 source/kde/slack-desc/sweeper create mode 100644 source/kde/slack-desc/wicd-kde create mode 100755 source/kdei/calligra-l10n/calligra-l10n.SlackBuild create mode 100644 source/kdei/calligra-l10n/languages create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-af create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ar create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-az create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-bg create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-br create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-bs create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ca create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ca@valencia create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-cs create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-cy create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-da create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-de create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-el create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-en_GB create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-eo create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-es create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-et create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-eu create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fa create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fi create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fr create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fy create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ga create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-gl create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-he create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hi create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hne create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hsb create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hu create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-is create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-it create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ja create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-kk create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-km create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-lo create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-lt create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-lv create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-mk create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ms create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-mt create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nb create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nds create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ne create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nl create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nn create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-no create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-no_NY create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-pl create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-pt create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-pt_BR create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ro create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ru create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-se create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sk create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sl create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sr create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sr@Latn create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sv create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ta create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-tg create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-th create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-tr create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-uk create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-uz create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ven create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-wa create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-xh create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-zh_CN create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-zh_TW create mode 100644 source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-zu mode change 100755 => 100644 source/kdei/kde-l10n/kdepim-l10n/extract-kdepim-goodness.sh delete mode 100644 source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-fr-4.4.5.korganizer.docbook.reorganize.diff create mode 100644 source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bs create mode 100644 source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fa create mode 100644 source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ug create mode 100644 source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-vi delete mode 100755 source/kdei/koffice-l10n/koffice-l10n.SlackBuild delete mode 100644 source/kdei/koffice-l10n/languages delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-af delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ar delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-az delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-bg delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-br delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-bs delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ca delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ca@valencia delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-cs delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-cy delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-da delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-de delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-el delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-en_GB delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-eo delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-es delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-et delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-eu delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fa delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fi delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fr delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-fy delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ga delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-gl delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-he delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hi delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hne delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hsb delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-hu delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-is delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-it delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ja delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-kk delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-km delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-lo delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-lt delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-lv delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-mk delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ms delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-mt delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nb delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nds delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ne delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nl delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-nn delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-no delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-no_NY delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-pl delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-pt delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-pt_BR delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ro delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ru delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-se delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sk delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sl delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sr delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sr@Latn delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-sv delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ta delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-tg delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-th delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-tr delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-uk delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-uz delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-ven delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-wa delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-xh delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-zh_CN delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-zh_TW delete mode 100644 source/kdei/koffice-l10n/slack-desc/slack-desc.koffice-l10n-zu create mode 100644 source/l/ConsoleKit/ck-history-don-t-truncate-frequent-output-to-8-chars.patch create mode 100755 source/l/GConf/GConf.SlackBuild create mode 100644 source/l/GConf/doinst.sh create mode 100644 source/l/GConf/slack-desc delete mode 100644 source/l/PyQt/PyQt.info create mode 100644 source/l/apr-util/apr-util.url delete mode 100644 source/l/apr/apr.apr_ring.h.gcc45.diff create mode 100644 source/l/apr/apr.url delete mode 100644 source/l/clucene/clucene.info create mode 100644 source/l/clucene/clucene.pkgconfig.patch create mode 100755 source/l/db48/db48.SlackBuild create mode 100644 source/l/db48/slack-desc create mode 100644 source/l/fribidi/fribidi.glib.h.diff create mode 100644 source/l/gamin/fix-double-lock-in-inotify-helper-c.patch create mode 100644 source/l/gamin/no_g_const_return.patch create mode 100644 source/l/gcr/doinst.sh create mode 100755 source/l/gcr/gcr.SlackBuild create mode 100644 source/l/gcr/slack-desc create mode 100755 source/l/glade3/glade3.SlackBuild create mode 100644 source/l/glade3/slack-desc create mode 100644 source/l/glib-networking/doinst.sh create mode 100755 source/l/glib-networking/glib-networking.SlackBuild create mode 100644 source/l/glib-networking/slack-desc create mode 100644 source/l/glibc/glibc-2.14-reexport-rpc-interface.patch create mode 100644 source/l/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch create mode 100644 source/l/glibc/glibc-2.14.1-fixes-1.patch create mode 100644 source/l/glibc/glibc-2.15-revert-c5a0802a.diff create mode 100644 source/l/glibc/glibc-2.15.nscd-race-fix.diff create mode 100644 source/l/glibc/glibc.git-6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4.diff create mode 100644 source/l/glibc/glibc.strtod.CVE-2012-3480.diff create mode 100644 source/l/glibc/slack-desc.glibc-zoneinfo.olson delete mode 100644 source/l/gnome-icon-theme/gnome-icon-theme.pkgconfig.path.diff create mode 100644 source/l/gnome-keyring/doinst.sh create mode 100755 source/l/gnome-keyring/gnome-keyring.SlackBuild create mode 100644 source/l/gnome-keyring/gpg-agent-Hook-up-the-TTL-cache-option.patch create mode 100644 source/l/gnome-keyring/schema-Update-description-for-gpg-cache-method.patch create mode 100644 source/l/gnome-keyring/secret-store-Mark-a-secret-item-as-used-when-acces.patch create mode 100644 source/l/gnome-keyring/slack-desc create mode 100755 source/l/gobject-introspection/gobject-introspection.SlackBuild create mode 100644 source/l/gobject-introspection/slack-desc create mode 100755 source/l/grantlee/grantlee.SlackBuild create mode 100644 source/l/grantlee/slack-desc create mode 100644 source/l/gsettings-desktop-schemas/doinst.sh create mode 100755 source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild create mode 100644 source/l/gsettings-desktop-schemas/slack-desc delete mode 100644 source/l/gst-plugins-good/gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff create mode 100644 source/l/gtk+3/doinst.sh create mode 100755 source/l/gtk+3/gtk+3.SlackBuild create mode 100644 source/l/gtk+3/slack-desc create mode 100644 source/l/gtk+3/update-gtk-immodules-3.0 create mode 100644 source/l/gtk+3/use_host_triplet_for_gtk_immodules.diff create mode 100644 source/l/gvfs/doinst.sh create mode 100755 source/l/gvfs/gvfs.SlackBuild create mode 100644 source/l/gvfs/slack-desc delete mode 100755 source/l/hal-info/hal-info.SlackBuild delete mode 100644 source/l/hal-info/patches/quirk-LG_X110-keyboard.patch delete mode 100644 source/l/hal-info/patches/quirk-acer_aspire_hotkey.patch delete mode 100644 source/l/hal-info/slack-desc delete mode 100644 source/l/hal/doinst.sh delete mode 100755 source/l/hal/hal.SlackBuild delete mode 100644 source/l/hal/hal.conf delete mode 100644 source/l/hal/patches/10-keymap.fdi-restore_zap.diff delete mode 100644 source/l/hal/patches/fix-build-with-automake-1.11.1.patch delete mode 100644 source/l/hal/patches/fix-hal-segfault.patch delete mode 100644 source/l/hal/patches/fix_ioperm_arguments.patch delete mode 100644 source/l/hal/patches/fix_libusb_detection.diff delete mode 100644 source/l/hal/patches/fix_segfault-dbus_error_init.patch delete mode 100644 source/l/hal/patches/fix_segfault_in_LIBHAL_FREE_DBUS_ERROR.diff delete mode 100644 source/l/hal/patches/handle_input.touchpad_explicitly.diff delete mode 100644 source/l/hal/patches/ignore_internal_dm_devices.diff delete mode 100644 source/l/hal/patches/increase_HAL_PATH_MAX_to_4096.diff delete mode 100644 source/l/hal/rc.hald delete mode 100644 source/l/hal/slack-desc create mode 100755 source/l/herqq/herqq.SlackBuild create mode 100644 source/l/herqq/slack-desc create mode 100755 source/l/icu4c/icu4c.SlackBuild create mode 100644 source/l/icu4c/slack-desc delete mode 120000 source/l/jre create mode 100644 source/l/js185/js185-destdir.patch create mode 100755 source/l/js185/js185.SlackBuild create mode 100644 source/l/js185/slack-desc create mode 100755 source/l/keybinder/keybinder.SlackBuild create mode 100644 source/l/keybinder/slack-desc create mode 100755 source/l/keyutils/keyutils.SlackBuild create mode 100644 source/l/keyutils/slack-desc create mode 100755 source/l/lcms2/lcms2.SlackBuild create mode 100644 source/l/lcms2/slack-desc delete mode 100644 source/l/libarchive/libarchive.info create mode 100644 source/l/libatasmart/README create mode 100755 source/l/libatasmart/libatasmart.SlackBuild create mode 100644 source/l/libatasmart/libatasmart.info create mode 100644 source/l/libatasmart/slack-desc create mode 100755 source/l/libbluedevil/libbluedevil.SlackBuild create mode 100644 source/l/libbluedevil/slack-desc create mode 100755 source/l/libcanberra/libcanberra.SlackBuild create mode 100644 source/l/libcanberra/libcanberra.url create mode 100644 source/l/libcanberra/slack-desc delete mode 100644 source/l/libcap/libcap-2.20.tar.sign create mode 100644 source/l/libcap/libcap-2.22.tar.bz2.sign create mode 100644 source/l/libcdio/libcdio.url create mode 100755 source/l/libcroco/libcroco.SlackBuild create mode 100644 source/l/libcroco/libcroco.url create mode 100644 source/l/libcroco/slack-desc create mode 100755 source/l/libffi/libffi.SlackBuild create mode 100644 source/l/libffi/slack-desc create mode 100755 source/l/libgnome-keyring/libgnome-keyring.SlackBuild create mode 100644 source/l/libgnome-keyring/slack-desc create mode 100644 source/l/libgphoto2/fix-usb_id-callout-for-udev-175.diff delete mode 100644 source/l/libical/libical.info create mode 100644 source/l/libmsn/libmsn.gcc47.diff create mode 100644 source/l/libnl3/doinst.sh create mode 100755 source/l/libnl3/libnl3.SlackBuild create mode 100644 source/l/libnl3/slack-desc create mode 100644 source/l/libpng/libpng.url create mode 100644 source/l/libproxy/gcc47-include-unistd.h.diff create mode 100755 source/l/libproxy/libproxy.SlackBuild create mode 100644 source/l/libproxy/libproxy.url create mode 100644 source/l/libproxy/only_link_mozjs185.diff create mode 100644 source/l/libproxy/slack-desc create mode 100755 source/l/libsoup/libsoup.SlackBuild create mode 100644 source/l/libsoup/slack-desc create mode 100755 source/l/libssh/libssh.SlackBuild create mode 100644 source/l/libssh/slack-desc create mode 100755 source/l/libtasn1/libtasn1.SlackBuild create mode 100644 source/l/libtasn1/slack-desc delete mode 100644 source/l/libtiff/libtiff-CVE-2011-0192.patch delete mode 100644 source/l/libtiff/libtiff-CVE-2011-1167.patch create mode 100644 source/l/libtiff/libtiff-CVE-2012-1173.patch create mode 100755 source/l/libusb-compat/libusb-compat.SlackBuild create mode 100644 source/l/libusb-compat/slack-desc delete mode 100644 source/l/libusb/libusb.fix.debug.log.level.diff create mode 100644 source/l/libvisual/libvisual.glib.h.diff delete mode 100644 source/l/libxml2/libxml2-2.7.8.broken.versioning.diff create mode 100755 source/l/libyaml/libyaml.SlackBuild create mode 100644 source/l/libyaml/libyaml.url create mode 100644 source/l/libyaml/slack-desc create mode 100644 source/l/loudmouth/loudmouth-1.4.3-glib-compile-fix.patch delete mode 100644 source/l/lzo/.lzo.info create mode 100755 source/l/media-player-info/media-player-info.SlackBuild create mode 100644 source/l/media-player-info/slack-desc create mode 100644 source/l/mozilla-nss/MPL-1.1.txt create mode 100644 source/l/mozilla-nss/faq.html create mode 100644 source/l/mozilla-nss/gpl-2.0.txt create mode 100644 source/l/mozilla-nss/lgpl-2.1.txt create mode 100755 source/l/mozilla-nss/mozilla-nss.SlackBuild create mode 100644 source/l/mozilla-nss/nss-config.in create mode 100644 source/l/mozilla-nss/slack-desc create mode 100644 source/l/notify-python/libnotify07.patch create mode 100755 source/l/phonon-gstreamer/phonon-gstreamer.SlackBuild create mode 100644 source/l/phonon-gstreamer/slack-desc create mode 100644 source/l/phonon-xine/phonon-backend-xine-4.4.4.find.phonon.patch create mode 100755 source/l/phonon-xine/phonon-xine.SlackBuild create mode 100644 source/l/phonon-xine/slack-desc create mode 100755 source/l/polkit-qt-1/polkit-qt-1.SlackBuild create mode 100644 source/l/polkit-qt-1/pull-polkit-qt-1 create mode 100644 source/l/polkit-qt-1/slack-desc create mode 100644 source/l/polkit/10-org.freedesktop.NetworkManager.pkla create mode 100644 source/l/polkit/20-plugdev-group-mount-override.pkla delete mode 100644 source/l/polkit/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch delete mode 100644 source/l/polkit/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch delete mode 100644 source/l/polkit/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch delete mode 100644 source/l/polkit/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch create mode 100644 source/l/polkit/doinst.sh create mode 100644 source/l/poppler/poppler_xyscale.patch create mode 100755 source/l/pycurl/pycurl.SlackBuild create mode 100644 source/l/pycurl/slack-desc delete mode 100644 source/l/pygobject/pygobject.fix.no.introspection.crash.diff create mode 100644 source/l/pygobject/pygobject.flags.diff create mode 100644 source/l/qca-ossl/qca-ossl-openssl-1.0.0.patch delete mode 100644 source/l/qca-ossl/qca-ossl.nowhirlpool.diff create mode 100644 source/l/qt/QElfParser-fix-type-of-sh_size.patch create mode 100644 source/l/qt/QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch create mode 100644 source/l/qt/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch create mode 100644 source/l/qt/Qt.pc delete mode 100644 source/l/qt/qt.QSortFilterProxyModel.reformatted.diff create mode 100644 source/l/qt/qt.assistant.memcpy-crash.diff delete mode 100644 source/l/qt/qt.blacklist.bad.certs.diff delete mode 100644 source/l/qt/qt.blacklist.bad.certs.patch02.diff create mode 100644 source/l/qt/qt.ca89c49.cursor.position.diff create mode 100644 source/l/qt/qt.ld-gold.patch create mode 100644 source/l/qt/qt.webkit-no_Werror.patch create mode 100644 source/l/qt/qt.webkit.glib.diff delete mode 100644 source/l/qt/qt.x86.cflags.diff delete mode 100644 source/l/qtscriptgenerator/qtscriptgenerator.gcc44.diff delete mode 100755 source/l/raptor/raptor.SlackBuild delete mode 100644 source/l/raptor/raptor.info delete mode 100644 source/l/raptor/slack-desc create mode 100755 source/l/sg3_utils/sg3_utils.SlackBuild create mode 100644 source/l/sg3_utils/sg3_utils.info create mode 100644 source/l/sg3_utils/slack-desc create mode 100644 source/l/sound-theme-freedesktop/slack-desc create mode 100755 source/l/sound-theme-freedesktop/sound-theme-freedesktop.SlackBuild create mode 100644 source/l/sound-theme-freedesktop/sound-theme-freedesktop.url create mode 100644 source/l/strigi/README create mode 100644 source/l/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff create mode 100644 source/l/t1lib/t1lib_5.1.2-3.5.diff delete mode 100644 source/l/t1lib/t1lib_5.1.2-3.diff create mode 100644 source/l/virtuoso-ose/virtuoso-opensource-6.1.3.unicode.patch create mode 100644 source/l/vte/fix_meta_alt_keybinding.patch create mode 100644 source/l/vte/vte.escape.cpu.usage.diff delete mode 100644 source/l/wv2/slack-desc delete mode 100755 source/l/wv2/wv2.SlackBuild delete mode 100644 source/l/zlib/zlib.largefile64_source.diff delete mode 100644 source/local/README delete mode 100644 source/local/jre/COPYRIGHT delete mode 100644 source/local/jre/README delete mode 100644 source/local/jre/THIRDPARTYLICENSEREADME.txt delete mode 100644 source/local/jre/Welcome.html delete mode 100755 source/local/jre/jre.SlackBuild delete mode 100755 source/local/jre/profile.d/jre.csh delete mode 100755 source/local/jre/profile.d/jre.sh delete mode 100644 source/local/jre/slack-desc create mode 100755 source/n/ModemManager/ModemManager.SlackBuild create mode 100644 source/n/ModemManager/slack-desc create mode 100644 source/n/NetworkManager/11-initialize-nm-remote-settings.patch create mode 100644 source/n/NetworkManager/55NetworkManager create mode 100755 source/n/NetworkManager/NetworkManager.SlackBuild create mode 100644 source/n/NetworkManager/NetworkManager.conf.new create mode 100644 source/n/NetworkManager/README create mode 100644 source/n/NetworkManager/doinst.sh create mode 100644 source/n/NetworkManager/slack-desc delete mode 100644 source/n/alpine/alpine.config.h.diff create mode 100644 source/n/bluez-hcidump/bluez-hcidump-2.4.tar.sign delete mode 100644 source/n/bluez/bluez-4.91.tar.sign create mode 100644 source/n/bluez/bluez-4.99.tar.sign create mode 100644 source/n/bluez/bluez.enable.audio.socket.diff delete mode 100644 source/n/bluez/config/bluetooth.sh delete mode 100644 source/n/bluez/passkey-agent.c delete mode 100644 source/n/bluez/patches/bluez-dbus-config.patch delete mode 100644 source/n/bluez/patches/bluez-run_udev_helper.patch delete mode 100644 source/n/bluez/patches/bluez-unbreak_dell_mouse.patch delete mode 100644 source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff delete mode 100644 source/n/ca-certificates/cacerts-20090814-fixup_update-ca-certificates.diff delete mode 100644 source/n/ca-certificates/cacerts-20090814-remove_debconf.diff create mode 100644 source/n/ca-certificates/patches/fixup_DESTDIR.diff create mode 100644 source/n/ca-certificates/patches/fixup_update-ca-certificates.diff create mode 100644 source/n/ca-certificates/patches/remove_debconf.diff create mode 100644 source/n/ca-certificates/setup.11.cacerts create mode 100755 source/n/cifs-utils/cifs-utils.SlackBuild create mode 100644 source/n/cifs-utils/mount.cifs-set-rc-to-0-in-libcap-toggle_dac_capabili.patch create mode 100644 source/n/cifs-utils/slack-desc create mode 100755 source/n/curl/cacert-fetch.sh create mode 100644 source/n/curl/curl-7.27.0_curl-config_syntax_fix.diff create mode 100644 source/n/cyrus-sasl/cyrus-sasl.bad_elif.diff delete mode 100644 source/n/dhcpcd/50-ntp.conf.diff create mode 100644 source/n/dhcpcd/define-SERVICEstuff-for-Slackware.patch create mode 100644 source/n/fetchmail/fetchmail.url delete mode 100644 source/n/httpd/README delete mode 100644 source/n/httpd/config.layout.diff delete mode 100644 source/n/httpd/httpd.brigade_move.__noinline__.gcc451.diff delete mode 100644 source/n/httpd/httpd.nossldefault.diff create mode 100755 source/n/iftop/iftop.SlackBuild create mode 100644 source/n/iftop/slack-desc create mode 100644 source/n/iproute2/fixup-for-x86_64.diff delete mode 100644 source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff delete mode 100755 source/n/iwlwifi-100-ucode/iwlwifi-100-ucode.SlackBuild delete mode 100644 source/n/iwlwifi-100-ucode/slack-desc delete mode 100755 source/n/iwlwifi-1000-ucode/iwlwifi-1000-ucode.SlackBuild delete mode 100644 source/n/iwlwifi-1000-ucode/slack-desc delete mode 100755 source/n/iwlwifi-3945-ucode/iwlwifi-3945-ucode.SlackBuild delete mode 100644 source/n/iwlwifi-3945-ucode/slack-desc delete mode 100755 source/n/iwlwifi-4965-ucode/iwlwifi-4965-ucode.SlackBuild delete mode 100644 source/n/iwlwifi-4965-ucode/slack-desc delete mode 100755 source/n/iwlwifi-5000-ucode/iwlwifi-5000-ucode.SlackBuild delete mode 100644 source/n/iwlwifi-5000-ucode/slack-desc delete mode 100755 source/n/iwlwifi-5150-ucode/iwlwifi-5150-ucode.SlackBuild delete mode 100644 source/n/iwlwifi-5150-ucode/slack-desc delete mode 100755 source/n/iwlwifi-6000-ucode/iwlwifi-6000-ucode.SlackBuild delete mode 100644 source/n/iwlwifi-6000-ucode/slack-desc delete mode 100755 source/n/iwlwifi-6xxx-ucode/iwlwifi-6xxx-ucode.SlackBuild delete mode 100644 source/n/iwlwifi-6xxx-ucode/slack-desc create mode 100644 source/n/mobile-broadband-provider-info/README create mode 100755 source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild create mode 100644 source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.pc.diff create mode 100644 source/n/mobile-broadband-provider-info/slack-desc create mode 100644 source/n/net-tools/net-tools.config.h delete mode 100644 source/n/net-tools/net-tools.diff delete mode 100644 source/n/net-tools/net-tools.mii-tool.string.diff delete mode 100644 source/n/net-tools/net-tools.struct.x25_address.gcc4.diff delete mode 100644 source/n/net-tools/net-tools.switch.default.gcc4.diff create mode 100644 source/n/net-tools/net-tools.url delete mode 100644 source/n/net-tools/net-tools_1.60-23.diff delete mode 100644 source/n/netatalk/netatalk.afpdconf.diff delete mode 100644 source/n/netatalk/netatalk.without_xfs.diff create mode 100755 source/n/nettle/nettle.SlackBuild create mode 100644 source/n/nettle/slack-desc create mode 100644 source/n/obex-data-server/obex-data-server.url create mode 100644 source/n/openssl/openssl0/certwatch create mode 100644 source/n/openssl/openssl0/doinst.sh-openssl create mode 100644 source/n/openssl/openssl0/doinst.sh-openssl-solibs create mode 100755 source/n/openssl/openssl0/openssl.SlackBuild create mode 100644 source/n/openssl/openssl0/openssl.optsx86.diff create mode 100644 source/n/openssl/openssl0/openssl.soname.diff create mode 100755 source/n/openssl/openssl0/openssl0.build create mode 100644 source/n/openssl/openssl0/slack-desc.openssl create mode 100644 source/n/openssl/openssl0/slack-desc.openssl-solibs create mode 100755 source/n/p11-kit/p11-kit.SlackBuild create mode 100644 source/n/p11-kit/slack-desc create mode 100644 source/n/php/php-fpm.conf.diff delete mode 100644 source/n/php/php.session.save_path.diff delete mode 100755 source/n/rt2860-firmware/rt2860-firmware.SlackBuild delete mode 100644 source/n/rt2860-firmware/slack-desc delete mode 100755 source/n/rt2870-firmware/rt2870-firmware.SlackBuild delete mode 100644 source/n/rt2870-firmware/slack-desc delete mode 100755 source/n/rt61-firmware/rt61-firmware.SlackBuild delete mode 100644 source/n/rt61-firmware/slack-desc delete mode 100755 source/n/rt71w-firmware/rt71w-firmware.SlackBuild delete mode 100644 source/n/rt71w-firmware/slack-desc create mode 100644 source/n/sendmail/8.14.5.auth2.p0 create mode 100644 source/n/wpa_supplicant/config/dot.config create mode 100644 source/n/wpa_supplicant/config/wpa_gui.desktop create mode 100644 source/n/wpa_supplicant/config/wpa_gui.png create mode 100644 source/n/wpa_supplicant/config/wpa_supplicant.conf create mode 100644 source/n/wpa_supplicant/config/wpa_supplicant.logrotate create mode 100644 source/n/wpa_supplicant/doinst.sh delete mode 100644 source/n/wpa_supplicant/fi.epitest.hostap.WPASupplicant.service delete mode 100644 source/n/wpa_supplicant/hostap-07.git-b80b5639935d37b95d00f86b57f2844a9c775f57.patch create mode 100644 source/n/wpa_supplicant/patches/dbus-service-file-args.diff create mode 100644 source/n/wpa_supplicant/patches/include-unistd_h.diff create mode 100644 source/n/wpa_supplicant/patches/libnl3-includes.diff create mode 100644 source/n/wpa_supplicant/patches/quiet-scan-results-message.diff create mode 100644 source/n/wpa_supplicant/patches/squelch-driver-disconnect-spam.diff delete mode 100644 source/n/wpa_supplicant/wpa_gui.png delete mode 100644 source/n/wpa_supplicant/wpa_supplicant.defconfig create mode 100644 source/x/freeglut/RATIONALE create mode 100755 source/x/freeglut/freeglut.SlackBuild create mode 100644 source/x/freeglut/slack-desc delete mode 100644 source/x/libdrm/libdrm.uint32_t.diff delete mode 100644 source/x/mesa/patches/i915_fragment_shader_disable.patch delete mode 100644 source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch create mode 100755 source/x/mtdev/mtdev.SlackBuild create mode 100644 source/x/mtdev/mtdev.url create mode 100644 source/x/mtdev/slack-desc delete mode 100755 source/x/radeon_ucode/radeon_ucode.SlackBuild delete mode 100644 source/x/radeon_ucode/slack-desc delete mode 100644 source/x/radeon_ucode/ucode-20110302/LICENSE.radeon create mode 100644 source/x/scim-hangul/scim-hangul.gcc47.diff delete mode 100644 source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch delete mode 100644 source/x/x11/build/libX11 create mode 100644 source/x/x11/build/libXaw3d create mode 100644 source/x/x11/build/xcb-proto delete mode 100644 source/x/x11/build/xcompmgr create mode 100644 source/x/x11/build/xdm delete mode 100644 source/x/x11/build/xf86-input-acecad delete mode 100644 source/x/x11/build/xf86-input-penmount create mode 100644 source/x/x11/build/xf86-input-wacom create mode 100644 source/x/x11/build/xf86-video-apm create mode 100644 source/x/x11/build/xf86-video-chips delete mode 100644 source/x/x11/build/xf86-video-cirrus delete mode 100644 source/x/x11/build/xf86-video-mach64 delete mode 100644 source/x/x11/build/xf86-video-openchrome delete mode 100644 source/x/x11/build/xf86-video-r128 delete mode 100644 source/x/x11/build/xf86-video-radeonhd delete mode 100644 source/x/x11/build/xf86-video-s3virge create mode 100644 source/x/x11/build/xf86-video-sisusb delete mode 100644 source/x/x11/build/xf86-video-tdfx create mode 100644 source/x/x11/build/xf86-video-tseng delete mode 100644 source/x/x11/build/xf86-video-vesa create mode 100644 source/x/x11/build/xf86-video-voodoo create mode 100644 source/x/x11/build/xf86-video-xgi create mode 100644 source/x/x11/build/xorg-server create mode 100644 source/x/x11/build/xpyb create mode 100644 source/x/x11/configure/libXaw3d delete mode 100644 source/x/x11/configure/xf86-video-ati create mode 100644 source/x/x11/patch/xf86-video-chips.patch create mode 100644 source/x/x11/patch/xf86-video-chips/0001-chips-gut-the-overlay-8-16-support-from-driver.patch create mode 100644 source/x/x11/patch/xf86-video-chips/0002-PciTag-is-unused-when-using-libpciaccess.patch create mode 100644 source/x/x11/patch/xf86-video-chips/0003-Use-malloc-calloc-realloc-free-directly.patch create mode 100644 source/x/x11/patch/xf86-video-chips/0004-configure.ac-Remove-AM_PROG_CC_C_O.patch create mode 100644 source/x/x11/patch/xf86-video-chips/0005-util-Consolidate-common-macros.patch create mode 100644 source/x/x11/patch/xf86-video-chips/0006-Fix-implicit-declaration-of-iopl.patch create mode 100644 source/x/x11/patch/xf86-video-chips/0007-Build-fix-for-ABI-Version-12.patch create mode 100644 source/x/x11/patch/xf86-video-chips/0008-Fall-back-to-shadowfb-if-XAA-is-unavailable.patch create mode 100644 source/x/x11/patch/xf86-video-chips/0009-Fix-for-new-vgaHW-ABI.patch delete mode 100644 source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff delete mode 100644 source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff delete mode 100644 source/x/x11/post-install/lbxproxy.post-install create mode 100644 source/x/x11/post-install/libXaw3d.post-install delete mode 100644 source/x/x11/post-install/proxymngr.post-install delete mode 100644 source/x/x11/post-install/rstart.post-install delete mode 100644 source/x/x11/post-install/util-macros.post-install create mode 100644 source/x/x11/post-install/xcb-util.post-install create mode 100644 source/x/x11/post-install/xf86-input-wacom.post-install create mode 100644 source/x/x11/post-install/xf86-input-wacom/60-wacom.rules delete mode 100644 source/x/x11/slack-desc/applewmproto delete mode 100644 source/x/x11/slack-desc/constype delete mode 100644 source/x/x11/slack-desc/lbxproxy delete mode 100644 source/x/x11/slack-desc/libAppleWM delete mode 100644 source/x/x11/slack-desc/libWindowsWM delete mode 100644 source/x/x11/slack-desc/libXTrap create mode 100644 source/x/x11/slack-desc/libXaw3d create mode 100644 source/x/x11/slack-desc/libXcm delete mode 100644 source/x/x11/slack-desc/libXprintAppUtil delete mode 100644 source/x/x11/slack-desc/libXprintUtil delete mode 100644 source/x/x11/slack-desc/liblbxutil delete mode 100644 source/x/x11/slack-desc/liboldX delete mode 100644 source/x/x11/slack-desc/libxkbui delete mode 100644 source/x/x11/slack-desc/proxymngr delete mode 100644 source/x/x11/slack-desc/rstart delete mode 100644 source/x/x11/slack-desc/scripts create mode 100644 source/x/x11/slack-desc/transset delete mode 100644 source/x/x11/slack-desc/trapproto delete mode 100644 source/x/x11/slack-desc/windowswmproto delete mode 100644 source/x/x11/slack-desc/x11-app delete mode 100644 source/x/x11/slack-desc/x11-data delete mode 100644 source/x/x11/slack-desc/x11-doc delete mode 100644 source/x/x11/slack-desc/x11-driver delete mode 100644 source/x/x11/slack-desc/x11-font delete mode 100644 source/x/x11/slack-desc/x11-lib delete mode 100644 source/x/x11/slack-desc/x11-proto delete mode 100644 source/x/x11/slack-desc/x11-util create mode 100644 source/x/x11/slack-desc/xcb-util-image create mode 100644 source/x/x11/slack-desc/xcb-util-keysyms create mode 100644 source/x/x11/slack-desc/xcb-util-renderutil create mode 100644 source/x/x11/slack-desc/xcb-util-wm delete mode 100644 source/x/x11/slack-desc/xf86-input-calcomp delete mode 100644 source/x/x11/slack-desc/xf86-input-citron delete mode 100644 source/x/x11/slack-desc/xf86-input-digitaledge delete mode 100644 source/x/x11/slack-desc/xf86-input-dmc delete mode 100644 source/x/x11/slack-desc/xf86-input-dynapro delete mode 100644 source/x/x11/slack-desc/xf86-input-elo2300 delete mode 100644 source/x/x11/slack-desc/xf86-input-elographics delete mode 100644 source/x/x11/slack-desc/xf86-input-fpit delete mode 100644 source/x/x11/slack-desc/xf86-input-hyperpen delete mode 100644 source/x/x11/slack-desc/xf86-input-jamstudio delete mode 100644 source/x/x11/slack-desc/xf86-input-magellan delete mode 100644 source/x/x11/slack-desc/xf86-input-magictouch delete mode 100644 source/x/x11/slack-desc/xf86-input-microtouch delete mode 100644 source/x/x11/slack-desc/xf86-input-mutouch delete mode 100644 source/x/x11/slack-desc/xf86-input-palmax delete mode 100644 source/x/x11/slack-desc/xf86-input-spaceorb delete mode 100644 source/x/x11/slack-desc/xf86-input-summa delete mode 100644 source/x/x11/slack-desc/xf86-input-tek4957 delete mode 100644 source/x/x11/slack-desc/xf86-input-ur98 delete mode 100644 source/x/x11/slack-desc/xf86-video-cyrix delete mode 100644 source/x/x11/slack-desc/xf86-video-i810 delete mode 100644 source/x/x11/slack-desc/xf86-video-impact delete mode 100644 source/x/x11/slack-desc/xf86-video-imstt create mode 100644 source/x/x11/slack-desc/xf86-video-modesetting delete mode 100644 source/x/x11/slack-desc/xf86-video-newport delete mode 100644 source/x/x11/slack-desc/xf86-video-nsc create mode 100644 source/x/x11/slack-desc/xf86-video-qxl delete mode 100644 source/x/x11/slack-desc/xf86-video-radeonhd delete mode 100644 source/x/x11/slack-desc/xf86-video-sunbw2 delete mode 100644 source/x/x11/slack-desc/xf86-video-suncg14 delete mode 100644 source/x/x11/slack-desc/xf86-video-suncg3 delete mode 100644 source/x/x11/slack-desc/xf86-video-suncg6 delete mode 100644 source/x/x11/slack-desc/xf86-video-sunffb delete mode 100644 source/x/x11/slack-desc/xf86-video-sunleo delete mode 100644 source/x/x11/slack-desc/xf86-video-suntcx delete mode 100644 source/x/x11/slack-desc/xf86-video-vermilion delete mode 100644 source/x/x11/slack-desc/xf86-video-vga delete mode 100644 source/x/x11/slack-desc/xf86-video-via delete mode 100644 source/x/x11/slack-desc/xf86-video-wsfb delete mode 100644 source/x/x11/slack-desc/xf86-video-xgixp delete mode 100644 source/x/x11/slack-desc/xf86rushproto delete mode 100644 source/x/x11/slack-desc/xfindproxy delete mode 100644 source/x/x11/slack-desc/xfwp delete mode 100644 source/x/x11/slack-desc/xkbdata delete mode 100644 source/x/x11/slack-desc/xorg-server-xdmx delete mode 100644 source/x/x11/slack-desc/xphelloworld delete mode 100644 source/x/x11/slack-desc/xplsprinters delete mode 100644 source/x/x11/slack-desc/xprehashprinterlist delete mode 100644 source/x/x11/slack-desc/xproxymanagementprotocol delete mode 100644 source/x/x11/slack-desc/xrx delete mode 100644 source/x/x11/slack-desc/xsetmode delete mode 100644 source/x/x11/slack-desc/xsetpointer delete mode 100644 source/x/x11/slack-desc/xtrap delete mode 100755 source/x/xaw3d/pull-xaw3d.sh delete mode 100644 source/x/xaw3d/slack-desc delete mode 100755 source/x/xaw3d/xaw3d.SlackBuild create mode 100644 source/x/xterm/doinst.sh delete mode 100644 source/xap/audacious-plugins/audacious-plugins.alsa.noise.is.not.helpful.diff create mode 100644 source/xap/blackbox/startblackbox create mode 100644 source/xap/blackbox/textpropertytostring-unconditional.diff create mode 100644 source/xap/fluxbox/fluxbox.startfluxbox.dbus.diff delete mode 100644 source/xap/fvwm/fvwm.colormap.diff create mode 100644 source/xap/fvwm/startfvwm2 delete mode 100644 source/xap/fvwm/system.fvwm2rc delete mode 100644 source/xap/gv/gv.keysym.diff create mode 100644 source/xap/gv/gv.libXaw3d.diff delete mode 100644 source/xap/mozilla-thunderbird/mimeTypes.rdf create mode 100644 source/xap/mozilla-thunderbird/mozilla-firefox.xpcom_arm.patch create mode 100644 source/xap/network-manager-applet/doinst.sh create mode 100755 source/xap/network-manager-applet/network-manager-applet.SlackBuild create mode 100644 source/xap/network-manager-applet/slack-desc create mode 100644 source/xap/pan/pan.gcc47.diff create mode 100644 source/xap/pidgin/fix-gmain_h-compile-error.diff delete mode 100644 source/xap/pidgin/purple-allow-sign-rsa-md5.patch delete mode 100644 source/xap/rdesktop/rdesktop.CVE-2011-1595.diff create mode 100644 source/xap/sane/sane-backends-1.0.22-v4l.diff create mode 100644 source/xap/seamonkey/pkgconfig/seamonkey-libxul.pc delete mode 100644 source/xap/thunar-volman/slack-desc delete mode 100755 source/xap/thunar-volman/thunar-volman.SlackBuild create mode 100644 source/xap/windowmaker/WindowMaker.noopensusemenu.diff delete mode 100644 source/xap/windowmaker/windowmaker.no-mmx.diff delete mode 100644 source/xap/windowmaker/windowmaker.png.1.4.0.diff delete mode 100644 source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff delete mode 100644 source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff delete mode 100644 source/xap/xfce/patches/mousepad-fix_find.diff delete mode 100644 source/xap/xfce/patches/mousepad-fix_find_and_replace.diff delete mode 100644 source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch delete mode 100644 source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff delete mode 100644 source/xap/xfce/patches/xfcalendar.desktop.in.diff delete mode 100644 source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff delete mode 100644 source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff delete mode 100644 source/xap/xfce/patches/xfdesktop-fix_education_icon.diff delete mode 100644 source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff delete mode 100755 source/xap/xfce/profile.d/xfce.csh delete mode 100755 source/xap/xfce/profile.d/xfce.sh delete mode 100644 source/xap/xfce/slack-desc delete mode 100755 source/xap/xfce/xfce.SlackBuild delete mode 100644 source/xap/xfce4-notifyd/doinst.sh delete mode 100644 source/xap/xfce4-notifyd/slack-desc delete mode 100755 source/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild delete mode 100644 source/xap/xfce4-power-manager/doinst.sh delete mode 100644 source/xap/xfce4-power-manager/slack-desc delete mode 100755 source/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild create mode 100644 source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff delete mode 100644 source/xap/xine-ui/xine-ui.png14.diff create mode 100644 source/xap/xpdf/patches/03-float.patch create mode 100644 source/xap/xscreensaver/xscreensaver-getimage-file-5.14 create mode 100755 source/xfce/Terminal/Terminal.SlackBuild create mode 100644 source/xfce/Terminal/slack-desc create mode 100755 source/xfce/Thunar/Thunar.SlackBuild create mode 100644 source/xfce/Thunar/slack-desc create mode 100755 source/xfce/exo/exo.SlackBuild create mode 100644 source/xfce/exo/slack-desc create mode 100755 source/xfce/garcon/garcon.SlackBuild create mode 100644 source/xfce/garcon/slack-desc create mode 100755 source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild create mode 100644 source/xfce/gtk-xfce-engine/slack-desc create mode 100755 source/xfce/libxfce4ui/libxfce4ui.SlackBuild create mode 100644 source/xfce/libxfce4ui/slack-desc create mode 100755 source/xfce/libxfce4util/libxfce4util.SlackBuild create mode 100644 source/xfce/libxfce4util/slack-desc create mode 100755 source/xfce/libxfcegui4/libxfcegui4.SlackBuild create mode 100644 source/xfce/libxfcegui4/slack-desc create mode 100755 source/xfce/orage/orage.SlackBuild create mode 100644 source/xfce/orage/slack-desc create mode 100644 source/xfce/thunar-volman/slack-desc create mode 100755 source/xfce/thunar-volman/thunar-volman.SlackBuild create mode 100644 source/xfce/tumbler/slack-desc create mode 100755 source/xfce/tumbler/tumbler.SlackBuild create mode 100755 source/xfce/xfce-build-all.sh create mode 100644 source/xfce/xfce4-appfinder/slack-desc create mode 100755 source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild create mode 100644 source/xfce/xfce4-clipman-plugin/doinst.sh create mode 100644 source/xfce/xfce4-clipman-plugin/slack-desc create mode 100755 source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild create mode 100644 source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.url create mode 100644 source/xfce/xfce4-dev-tools/slack-desc create mode 100755 source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild create mode 100644 source/xfce/xfce4-mixer/doinst.sh create mode 100644 source/xfce/xfce4-mixer/slack-desc create mode 100755 source/xfce/xfce4-mixer/xfce4-mixer.SlackBuild create mode 100644 source/xfce/xfce4-notifyd/doinst.sh create mode 100644 source/xfce/xfce4-notifyd/slack-desc create mode 100755 source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild create mode 100644 source/xfce/xfce4-panel/slack-desc create mode 100755 source/xfce/xfce4-panel/xfce4-panel.SlackBuild create mode 100644 source/xfce/xfce4-power-manager/doinst.sh create mode 100644 source/xfce/xfce4-power-manager/slack-desc create mode 100755 source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild create mode 100644 source/xfce/xfce4-screenshooter/doinst.sh create mode 100644 source/xfce/xfce4-screenshooter/slack-desc create mode 100755 source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild create mode 100644 source/xfce/xfce4-screenshooter/xfce4-screenshooter.url create mode 100644 source/xfce/xfce4-session/slack-desc create mode 100755 source/xfce/xfce4-session/xfce4-session.SlackBuild create mode 100644 source/xfce/xfce4-settings/slack-desc create mode 100755 source/xfce/xfce4-settings/xfce4-settings.SlackBuild create mode 100644 source/xfce/xfce4-settings/xfce4-settings.theme.diff create mode 100644 source/xfce/xfce4-settings/xfce4-settings.xft.defaults.diff create mode 100644 source/xfce/xfce4-systemload-plugin/slack-desc create mode 100755 source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild create mode 100644 source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.url create mode 100644 source/xfce/xfce4-taskmanager/doinst.sh create mode 100644 source/xfce/xfce4-taskmanager/slack-desc create mode 100755 source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild create mode 100644 source/xfce/xfce4-taskmanager/xfce4-taskmanager.url create mode 100644 source/xfce/xfce4-volumed/slack-desc create mode 100755 source/xfce/xfce4-volumed/xfce4-volumed.SlackBuild create mode 100644 source/xfce/xfce4-weather-plugin/slack-desc create mode 100755 source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild create mode 100644 source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url create mode 100644 source/xfce/xfconf/slack-desc create mode 100755 source/xfce/xfconf/xfconf.SlackBuild create mode 100644 source/xfce/xfdesktop/slack-desc create mode 100755 source/xfce/xfdesktop/xfdesktop.SlackBuild create mode 100644 source/xfce/xfwm4-themes/slack-desc create mode 100755 source/xfce/xfwm4-themes/xfwm4-themes.SlackBuild create mode 100644 source/xfce/xfwm4/slack-desc create mode 100755 source/xfce/xfwm4/xfwm4.SlackBuild create mode 100644 source/xfce/xfwm4/xinitrc.xfce create mode 100644 source/y/bsd-games/fortune-fixes-sorry-no-additions-accepted-here/20120302.diff (limited to 'source') diff --git a/source/README.TXT b/source/README.TXT new file mode 100644 index 00000000..404c6de0 --- /dev/null +++ b/source/README.TXT @@ -0,0 +1,36 @@ + +This is the source used for Slackware. + +To look for a particular bit of source (let's say for 'cp'), first you would +look for the full path: + +fuzzy:~# which cp +/bin/cp + +Then, you grep for the package it came from. Note that the leading '/' +is removed: + +fuzzy:~# grep bin/cp /var/log/packages/* +/var/log/packages/cpio-2.4.2.91-i386-1:bin/cpio +/var/log/packages/fileutils-4.1-i386-2:bin/cp +/var/log/packages/gcc-2.95.3-i386-2:usr/bin/cpp +/var/log/packages/gnome-applets-1.4.0.5-i386-1:usr/bin/cpumemusage_applet + + +From this, you can see that 'cp' came from the fileutils-4.1-i386-2 package. +The source will be found in a corresponding subdirectory. In this case, that +would be ./a/bin. Don't be fooled into thinking that the _bin.tar.gz in this +directory is the package with the source code -- anything starting with '_' is +just a framework package full of empty files with the correct permissions and +ownerships for the completed package to use. + +Many of these packages now have scripts that untar, patch, and compile the +source automatically. These are the 'SlackBuild' scripts. Moving back to the +example above, you can figure out which package the bin/cp source came from by +examining the SlackBuild script. + +Have fun! + +--- +Patrick J. Volkerding +volkerdi@slackware.com diff --git a/source/a/aaa_base/aaa_base.SlackBuild b/source/a/aaa_base/aaa_base.SlackBuild index 29759144..b41e9545 100755 --- a/source/a/aaa_base/aaa_base.SlackBuild +++ b/source/a/aaa_base/aaa_base.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,8 +20,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=13.37 -BUILD=${BUILD:-3} +VERSION=14.0 +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -37,6 +37,7 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-aaa_base +rm -rf $PKG mkdir -p $TMP $PKG # Explode the package framework: @@ -51,6 +52,9 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cp -a $CWD/slackware-version $PKG/etc/slackware-version chown root:root $PKG/etc/slackware-version chmod 644 $PKG/etc/slackware-version +cp -a $CWD/os-release $PKG/etc/os-release +chown root:root $PKG/etc/os-release +chmod 644 $PKG/etc/os-release # Add lib64 directories on x86_64: if [ "$ARCH" = "x86_64" ]; then diff --git a/source/a/aaa_base/os-release b/source/a/aaa_base/os-release new file mode 100644 index 00000000..717dbbf8 --- /dev/null +++ b/source/a/aaa_base/os-release @@ -0,0 +1,10 @@ +NAME=Slackware +VERSION="14.0" +ID=slackware +VERSION_ID=14.0 +PRETTY_NAME="Slackware 14.0" +ANSI_COLOR="0;34" +CPE_NAME="cpe:/o:slackware:slackware_linux:14.0" +HOME_URL="http://slackware.com/" +SUPPORT_URL="http://www.linuxquestions.org/questions/slackware-14/" +BUG_REPORT_URL="http://www.linuxquestions.org/questions/slackware-14/" diff --git a/source/a/aaa_base/slackware-version b/source/a/aaa_base/slackware-version index 9f526a9a..bd93610e 100644 --- a/source/a/aaa_base/slackware-version +++ b/source/a/aaa_base/slackware-version @@ -1 +1 @@ -Slackware 13.37.0 +Slackware 14.0 diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild index 09c181ef..20a343d2 100755 --- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild +++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,8 @@ PKGNAM=aaa_elflibs -VERSION=${VERSION:-13.37} -BUILD=${BUILD:-7} +VERSION=${VERSION:-14.0} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs index ab5ec3d7..38a44e9e 100644 --- a/source/a/aaa_elflibs/symlinks-to-tracked-libs +++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs @@ -6,12 +6,13 @@ /lib/libdm.so.0 /lib/libfuse.so.2 /lib/libgpm.so.1 -/lib/liblzma.so.0 +/lib/liblzma.so.5 /lib/libncurses.so.5 /lib/libncursesw.so.5 /lib/libpopt.so.0 /lib/libsysfs.so.2 /lib/libtermcap.so.2 +/lib/libz.so.1 /usr/lib/libasound.so.2 /usr/lib/libcurl.so.2 /usr/lib/libcurl.so.3 @@ -32,14 +33,11 @@ /usr/lib/libgmpxx.so.4 /usr/lib/libgobject-2.0.so.0 /usr/lib/libgthread-2.0.so.0 -/usr/lib/libhistory.so.4 /usr/lib/libhistory.so.5 /usr/lib/libidn.so.11 /usr/lib/libjpeg.so.62 /usr/lib/libjpeg.so.8 -/usr/lib/liblber-2.3.so.0 /usr/lib/liblber-2.4.so.2 -/usr/lib/libldap-2.3.so.0 /usr/lib/libldap-2.4.so.2 /usr/lib/libltdl.so.3 /usr/lib/libltdl.so.7 @@ -56,7 +54,6 @@ /usr/lib/libpng.so.14 /usr/lib/libpng12.so.0 /usr/lib/libpng14.so.14 -/usr/lib/libreadline.so.4 /usr/lib/libreadline.so.5 /usr/lib/libslang.so.1 /usr/lib/libslang.so.2 @@ -65,4 +62,3 @@ /usr/lib/libusb-1.0.so.0 /usr/lib/libvga.so.1 /usr/lib/libvgagl.so.1 -/usr/lib/libz.so.1 diff --git a/source/a/acl/acl.SlackBuild b/source/a/acl/acl.SlackBuild index a97bf27d..a74fb355 100755 --- a/source/a/acl/acl.SlackBuild +++ b/source/a/acl/acl.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=acl -VERSION=2.2.50 +VERSION=2.2.51 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -50,7 +50,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf acl-$(echo $VERSION | cut -f 1 -d '-') -tar xzvf $CWD/acl-$VERSION.src.tar.gz || exit 1 +tar xvf $CWD/acl-$VERSION.src.tar.?z || exit 1 cd acl-$(echo $VERSION | cut -f 1 -d '-') || exit 1 chown -R root:root . diff --git a/source/a/acpid/acpid.SlackBuild b/source/a/acpid/acpid.SlackBuild index bd96d8b1..0b761d78 100755 --- a/source/a/acpid/acpid.SlackBuild +++ b/source/a/acpid/acpid.SlackBuild @@ -25,12 +25,14 @@ VERSION=${VERSION:-$(echo acpid-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -40,9 +42,22 @@ PKG=$TMP/package-acpid NUMJOBS=${NUMJOBS:--j8} +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + rm -rf $PKG mkdir -p $TMP $PKG - cd $TMP rm -rf acpid-$VERSION tar xvf $CWD/acpid-$VERSION.tar.?z* || exit 1 @@ -54,15 +69,29 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -make install \ - OPT="-O2" \ - PREFIX=/usr \ - MANDIR=/usr/man \ - DOCDIR=/usr/doc/acpid-$VERSION \ - DESTDIR=$PKG \ - || exit 1 +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/acpid-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -strip --strip-unneeded $PKG/usr/bin/acpi_listen $PKG/usr/sbin/acpid +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: diff --git a/source/a/attr/attr.SlackBuild b/source/a/attr/attr.SlackBuild index 1b6fe70b..892961cf 100755 --- a/source/a/attr/attr.SlackBuild +++ b/source/a/attr/attr.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=attr -VERSION=2.4.45 +VERSION=2.4.46 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -49,7 +49,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf attr-$(echo $VERSION | cut -f 1 -d '-') -tar xvf $CWD/attr-$VERSION.src.tar.gz || exit 1 +tar xvf $CWD/attr-$VERSION.src.tar.?z || exit 1 cd attr-$(echo $VERSION | cut -f 1 -d '-') || exit 1 chown -R root:root . find . \ diff --git a/source/a/bash/bash-4.1-patches/bash41-001 b/source/a/bash/bash-4.1-patches/bash41-001 deleted file mode 100644 index 758e1fa4..00000000 --- a/source/a/bash/bash-4.1-patches/bash41-001 +++ /dev/null @@ -1,48 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-001 - -Bug-Reported-by: Yann Rouillard -Bug-Reference-ID: <4B44A410.4070107@pleiades.fr.eu.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00018.html - -Bug-Description: - -A prototype for vsnprintf was incorrect, and caused compilation failures -on systems that did not have a suitable vsnprintf, but had a declaration in -one of the system header files. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/builtins/printf.def 2009-11-20 15:31:23.000000000 -0500 ---- builtins/printf.def 2010-01-07 08:50:06.000000000 -0500 -*************** -*** 173,177 **** - - #if !HAVE_VSNPRINTF -! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); - #endif - ---- 173,177 ---- - - #if !HAVE_VSNPRINTF -! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0))); - #endif - -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 0 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-002 b/source/a/bash/bash-4.1-patches/bash41-002 deleted file mode 100644 index a1151985..00000000 --- a/source/a/bash/bash-4.1-patches/bash41-002 +++ /dev/null @@ -1,65 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-002 - -Bug-Reported-by: guillaume.outters@free.fr -Bug-Reference-ID: <20100105230441.70D171AA7F52@asterix.local> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00017.html - -Bug-Description: - -Bash-4.1/Readline-6.1 introduced a hook function that allows applications -to rewrite or modify filenames read from the file system before comparing -them with a word to be completed. The converted filename, if it matches, -needs to be inserted into the line buffer, replacing the original contents. - -This fixes a completion bug on Mac OS X involving filenames containing -UTF-8 characters. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/lib/readline/complete.c 2009-11-29 18:39:30.000000000 -0500 ---- lib/readline/complete.c 2010-01-06 08:30:23.000000000 -0500 -*************** -*** 2139,2143 **** - if (filename_len == 0) - { -! if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name)) - continue; - ---- 2139,2143 ---- - if (filename_len == 0) - { -! if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn)) - continue; - -*************** -*** 2220,2224 **** - } - -! strcpy (temp + dirlen, entry->d_name); - } - else ---- 2220,2224 ---- - } - -! strcpy (temp + dirlen, convfn); - } - else -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-003 b/source/a/bash/bash-4.1-patches/bash41-003 deleted file mode 100644 index 479fdcd9..00000000 --- a/source/a/bash/bash-4.1-patches/bash41-003 +++ /dev/null @@ -1,48 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-003 - -Bug-Reported-by: coyote@wariat.org.pl -Bug-Reference-ID: <4b64a1f8.06e2660a.60af.4bfb@mx.google.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00135.html - -Bug-Description: - -If command completion is attempted on a word with a quoted globbing -character (e.g., `*' or `?'), bash can reference a NULL pointer and -dump core. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/bashline.c 2009-10-24 14:10:19.000000000 -0400 ---- bashline.c 2010-01-30 21:53:49.000000000 -0500 -*************** -*** 1681,1685 **** - characters in the common prefix are bad) will ever be returned on - regular completion. */ -! if (glob_pattern_p (hint)) - { - if (state == 0) ---- 1681,1685 ---- - characters in the common prefix are bad) will ever be returned on - regular completion. */ -! if (globpat) - { - if (state == 0) -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-004 b/source/a/bash/bash-4.1-patches/bash41-004 deleted file mode 100644 index 33f79bb7..00000000 --- a/source/a/bash/bash-4.1-patches/bash41-004 +++ /dev/null @@ -1,47 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-004 - -Bug-Reported-by: Crestez Dan Leonard -Bug-Reference-ID: <1265592839.30682.21.camel@deskbox> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00034.html - -Bug-Description: - -When running in Posix mode and executing a shell function without local -variables, bash will not propagate a variable in a special builtin's temporary -environment to have global scope. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/variables.c 2009-11-03 14:13:58.000000000 -0500 ---- variables.c 2010-02-08 17:36:18.000000000 -0500 -*************** -*** 3809,3812 **** ---- 3809,3817 ---- - if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate))) - { -+ /* Make sure we have a hash table to store the variable in while it is -+ being propagated down to the global variables table. Create one if -+ we have to */ -+ if ((vc_isfuncenv (shell_variables) || vc_istempenv (shell_variables)) && shell_variables->table == 0) -+ shell_variables->table = hash_create (0); - /* XXX - should we set v->context here? */ - v = bind_variable_internal (var->name, value_cell (var), shell_variables->table, 0, 0); -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-005 b/source/a/bash/bash-4.1-patches/bash41-005 deleted file mode 100644 index 8a2fec8a..00000000 --- a/source/a/bash/bash-4.1-patches/bash41-005 +++ /dev/null @@ -1,56 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-005 - -Bug-Reported-by: werner@suse.de -Bug-Reference-ID: <201002251238.o1PCcYcg016893@boole.suse.de> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00132.html - -Bug-Description: - -When the `read' builtin times out after the timeout specified with -t is -exceeded, it does not reset the flags that tell signal handlers to process -signals immediately instead of deferring their handling. This can result -in unsafe functions being called from signal handlers, which can cause bash -to hang or dump core. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/builtins/read.def 2009-10-08 11:35:46.000000000 -0400 ---- builtins/read.def 2010-03-17 17:35:39.000000000 -0400 -*************** -*** 616,621 **** - zsyncfd (fd); - -- interrupt_immediately--; -- terminate_immediately--; - discard_unwind_frame ("read_builtin"); - ---- 616,619 ---- -*************** -*** 624,627 **** ---- 622,628 ---- - assign_vars: - -+ interrupt_immediately--; -+ terminate_immediately--; -+ - #if defined (ARRAY_VARS) - /* If -a was given, take the string read, break it into a list of words, -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-006 b/source/a/bash/bash-4.1-patches/bash41-006 deleted file mode 100644 index d6553b8b..00000000 --- a/source/a/bash/bash-4.1-patches/bash41-006 +++ /dev/null @@ -1,76 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-006 - -Bug-Reported-by: Mike Frysinger -Bug-Reference-ID: <201003210155.56618.vapier@gentoo.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html - -Bug-Description: - -Bash did not correctly print/reproduce here documents attached to commands -inside compound commands such as for and while. This affected the -execution of such commands inside a shell function when the function -definition is saved and later restored using `.' or `eval'. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/print_cmd.c 2009-09-16 15:32:26.000000000 -0400 ---- print_cmd.c 2010-03-22 21:15:30.000000000 -0400 -*************** -*** 114,117 **** ---- 114,123 ---- - #define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr) - -+ #define PRINT_DEFERRED_HEREDOCS(x) \ -+ do { \ -+ if (deferred_heredocs) \ -+ print_deferred_heredocs (x); \ -+ } while (0) -+ - /* Non-zero means the stuff being printed is inside of a function def. */ - static int inside_function_def; -*************** -*** 561,571 **** - { - print_for_command_head (for_command); -- - cprintf (";"); - newline ("do\n"); - indentation += indentation_amount; - make_command_string_internal (for_command->action); - semicolon (); - indentation -= indentation_amount; - newline ("done"); - } ---- 566,578 ---- - { - print_for_command_head (for_command); - cprintf (";"); - newline ("do\n"); -+ - indentation += indentation_amount; - make_command_string_internal (for_command->action); -+ PRINT_DEFERRED_HEREDOCS (""); - semicolon (); - indentation -= indentation_amount; -+ - newline ("done"); - } -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 6 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-007 b/source/a/bash/bash-4.1-patches/bash41-007 deleted file mode 100644 index 07b4796c..00000000 --- a/source/a/bash/bash-4.1-patches/bash41-007 +++ /dev/null @@ -1,47 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-007 - -Bug-Reported-by: Rob Robason -Bug-Reference-ID: <1269513145.22336.9.camel@home.robason.homelinux.net> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00089.html - -Bug-Description: - -A typo caused bash to not honor a precision specification in a printf -format. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/builtins/printf.def 2010-01-18 10:50:22.000000000 -0500 ---- builtins/printf.def 2010-03-25 09:40:56.000000000 -0400 -*************** -*** 118,122 **** - nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \ - else if (have_precision) \ -! nw = vflag ? vbprintf (f, precision, func) : printf (f, fieldwidth, func); \ - else \ - nw = vflag ? vbprintf (f, func) : printf (f, func); \ ---- 118,122 ---- - nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \ - else if (have_precision) \ -! nw = vflag ? vbprintf (f, precision, func) : printf (f, precision, func); \ - else \ - nw = vflag ? vbprintf (f, func) : printf (f, func); \ -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 6 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 7 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-008 b/source/a/bash/bash-4.1-patches/bash41-008 deleted file mode 100644 index 2bec4de4..00000000 --- a/source/a/bash/bash-4.1-patches/bash41-008 +++ /dev/null @@ -1,49 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-008 - -Bug-Reported-by: Dennis van Dok -Bug-Reference-ID: <4BBF2501.5050703@gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-04/msg00038.html - -Bug-Description: - -When declaring an associative array and implicitly assigning a value -to element "0", bash does not correctly allocate memory, leading to -a segmentation violation when that element or the array itself is -unset. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/builtins/declare.def 2009-11-25 19:42:00.000000000 -0500 ---- builtins/declare.def 2010-05-30 18:25:21.000000000 -0400 -*************** -*** 513,517 **** - /* let bind_{array,assoc}_variable take care of this. */ - if (assoc_p (var)) -! bind_assoc_variable (var, name, "0", value, aflags); - else - bind_array_variable (name, 0, value, aflags); ---- 519,523 ---- - /* let bind_{array,assoc}_variable take care of this. */ - if (assoc_p (var)) -! bind_assoc_variable (var, name, savestring ("0"), value, aflags); - else - bind_array_variable (name, 0, value, aflags); -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 7 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 8 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-009 b/source/a/bash/bash-4.1-patches/bash41-009 deleted file mode 100644 index ae0f1e3e..00000000 --- a/source/a/bash/bash-4.1-patches/bash41-009 +++ /dev/null @@ -1,48 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-009 - -Bug-Reported-by: Tomas Trnka -Bug-Reference-ID: <201003242030.02166.tomastrnka@gmx.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00090.html - -Bug-Description: - -An arriving SIGCHLD will interrupt `slow' system calls such as write(2) to -or read(2) from a terminal. This results in an error message and truncated -input or output. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/sig.c Fri Aug 14 16:31:52 2009 ---- sig.c Fri Mar 26 22:34:11 2010 -*************** -*** 655,660 **** ---- 655,663 ---- - act.sa_flags |= SA_INTERRUPT; /* XXX */ - else - act.sa_flags |= SA_RESTART; /* XXX */ -+ #else -+ if (sig == SIGCHLD) -+ act.sa_flags |= SA_RESTART; - #endif - sigemptyset (&act.sa_mask); - sigemptyset (&oact.sa_mask); -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 8 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 9 - - #endif /* _PATCHLEVEL_H_ */ - diff --git a/source/a/bash/bash-4.1-patches/bash41-010 b/source/a/bash/bash-4.1-patches/bash41-010 deleted file mode 100644 index b5a4b615..00000000 --- a/source/a/bash/bash-4.1-patches/bash41-010 +++ /dev/null @@ -1,68 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-010 - -Bug-Reported-by: Stephane Jourdois -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-05/msg00165.html - -Bug-Description: - -The expansion of the \W prompt string escape sequence incorrectly used -strcpy to copy overlapping strings. Only memmove works in this case. - -Patch (apply with `patch -p0'): - -*** ../bash-4.1-patched/parse.y 2009-12-30 12:51:42.000000000 -0500 ---- parse.y 2011-02-24 16:40:48.000000000 -0500 -*************** -*** 5153,5157 **** - t = strrchr (t_string, '/'); - if (t) -! strcpy (t_string, t + 1); - } - } ---- 5153,5157 ---- - t = strrchr (t_string, '/'); - if (t) -! memmove (t_string, t + 1, strlen (t)); - } - } -*** ../bash-4.1-patched/y.tab.c 2009-12-30 12:52:02.000000000 -0500 ---- y.tab.c 2011-02-24 16:50:27.000000000 -0500 -*************** -*** 7482,7486 **** - t = strrchr (t_string, '/'); - if (t) -! strcpy (t_string, t + 1); - } - } ---- 7482,7486 ---- - t = strrchr (t_string, '/'); - if (t) -! memmove (t_string, t + 1, strlen (t)); - } - } -*************** -*** 8244,8246 **** - } - #endif /* HANDLE_MULTIBYTE */ -- ---- 8244,8245 ---- -*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 9 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 10 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-001 b/source/a/bash/bash-4.2-patches/bash42-001 new file mode 100644 index 00000000..547aaa06 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-001 @@ -0,0 +1,78 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-001 + +Bug-Reported-by: Juergen Daubert +Bug-Reference-ID: <20110214175132.GA19813@jue.netz> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00125.html + +Bug-Description: + +When running in Posix mode, bash does not correctly expand the right-hand +side of a double-quoted word expansion containing single quotes. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2011-01-02 16:12:51.000000000 -0500 +--- subst.c 2011-02-19 00:00:00.000000000 -0500 +*************** +*** 1380,1387 **** + + /* The handling of dolbrace_state needs to agree with the code in parse.y: +! parse_matched_pair() */ +! dolbrace_state = 0; +! if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) +! dolbrace_state = (flags & SX_POSIXEXP) ? DOLBRACE_QUOTE : DOLBRACE_PARAM; + + i = *sindex; +--- 1380,1389 ---- + + /* The handling of dolbrace_state needs to agree with the code in parse.y: +! parse_matched_pair(). The different initial value is to handle the +! case where this function is called to parse the word in +! ${param op word} (SX_WORD). */ +! dolbrace_state = (flags & SX_WORD) ? DOLBRACE_WORD : DOLBRACE_PARAM; +! if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && (flags & SX_POSIXEXP)) +! dolbrace_state = DOLBRACE_QUOTE; + + i = *sindex; +*************** +*** 7177,7181 **** + /* Extract the contents of the ${ ... } expansion + according to the Posix.2 rules. */ +! value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#') ? SX_POSIXEXP : 0); + if (string[sindex] == RBRACE) + sindex++; +--- 7181,7185 ---- + /* Extract the contents of the ${ ... } expansion + according to the Posix.2 rules. */ +! value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#' || c =='/' || c == '^' || c == ',' || c ==':') ? SX_POSIXEXP|SX_WORD : SX_WORD); + if (string[sindex] == RBRACE) + sindex++; +*** ../bash-4.2-patched/subst.h 2010-12-02 20:21:29.000000000 -0500 +--- subst.h 2011-02-16 21:12:09.000000000 -0500 +*************** +*** 57,60 **** +--- 57,61 ---- + #define SX_ARITHSUB 0x0080 /* extracting $(( ... )) (currently unused) */ + #define SX_POSIXEXP 0x0100 /* extracting new Posix pattern removal expansions in extract_dollar_brace_string */ ++ #define SX_WORD 0x0200 /* extracting word in ${param op word} */ + + /* Remove backslashes which are quoting backquotes from STRING. Modifies +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 0 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 1 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-002 b/source/a/bash/bash-4.2-patches/bash42-002 new file mode 100644 index 00000000..077c7e0f --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-002 @@ -0,0 +1,60 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-002 + +Bug-Reported-by: Clark J. Wang +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html + +Bug-Description: + +The readline vi-mode `cc', `dd', and `yy' commands failed to modify the +entire line. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/readline/vi_mode.c 2010-11-20 19:51:39.000000000 -0500 +--- lib/readline/vi_mode.c 2011-02-17 20:24:25.000000000 -0500 +*************** +*** 1115,1119 **** + _rl_vi_last_motion = c; + RL_UNSETSTATE (RL_STATE_VIMOTION); +! return (0); + } + #if defined (READLINE_CALLBACKS) +--- 1115,1119 ---- + _rl_vi_last_motion = c; + RL_UNSETSTATE (RL_STATE_VIMOTION); +! return (vidomove_dispatch (m)); + } + #if defined (READLINE_CALLBACKS) +*** ../bash-4.2-patched/lib/readline/callback.c 2010-06-06 12:18:58.000000000 -0400 +--- lib/readline/callback.c 2011-02-17 20:43:28.000000000 -0500 +*************** +*** 149,152 **** +--- 149,155 ---- + /* Should handle everything, including cleanup, numeric arguments, + and turning off RL_STATE_VIMOTION */ ++ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) ++ _rl_internal_char_cleanup (); ++ + return; + } +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 1 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 2 + + #endif /* _PATCHLEVEL_H_ */ + diff --git a/source/a/bash/bash-4.2-patches/bash42-003 b/source/a/bash/bash-4.2-patches/bash42-003 new file mode 100644 index 00000000..c488e96b --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-003 @@ -0,0 +1,318 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-003 + +Bug-Reported-by: Clark J. Wang +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00136.html + +Bug-Description: + +When using the pattern replacement and pattern removal word expansions, bash +miscalculates the possible match length in the presence of an unescaped left +bracket without a closing right bracket, resulting in a failure to match +the pattern. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/glob/gmisc.c 2011-02-05 16:11:17.000000000 -0500 +--- lib/glob/gmisc.c 2011-02-18 23:53:42.000000000 -0500 +*************** +*** 78,83 **** + size_t wmax; + { +! wchar_t wc, *wbrack; +! int matlen, t, in_cclass, in_collsym, in_equiv; + + if (*wpat == 0) +--- 78,83 ---- + size_t wmax; + { +! wchar_t wc; +! int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; + + if (*wpat == 0) +*************** +*** 119,123 **** + case L'[': + /* scan for ending `]', skipping over embedded [:...:] */ +! wbrack = wpat; + wc = *wpat++; + do +--- 119,123 ---- + case L'[': + /* scan for ending `]', skipping over embedded [:...:] */ +! bracklen = 1; + wc = *wpat++; + do +*************** +*** 125,140 **** + if (wc == 0) + { +! matlen += wpat - wbrack - 1; /* incremented below */ +! break; + } + else if (wc == L'\\') + { +! wc = *wpat++; +! if (*wpat == 0) +! break; + } + else if (wc == L'[' && *wpat == L':') /* character class */ + { + wpat++; + in_cclass = 1; + } +--- 125,148 ---- + if (wc == 0) + { +! wpat--; /* back up to NUL */ +! matlen += bracklen; +! goto bad_bracket; + } + else if (wc == L'\\') + { +! /* *wpat == backslash-escaped character */ +! bracklen++; +! /* If the backslash or backslash-escape ends the string, +! bail. The ++wpat skips over the backslash escape */ +! if (*wpat == 0 || *++wpat == 0) +! { +! matlen += bracklen; +! goto bad_bracket; +! } + } + else if (wc == L'[' && *wpat == L':') /* character class */ + { + wpat++; ++ bracklen++; + in_cclass = 1; + } +*************** +*** 142,145 **** +--- 150,154 ---- + { + wpat++; ++ bracklen++; + in_cclass = 0; + } +*************** +*** 147,152 **** + { + wpat++; + if (*wpat == L']') /* right bracket can appear as collating symbol */ +! wpat++; + in_collsym = 1; + } +--- 156,165 ---- + { + wpat++; ++ bracklen++; + if (*wpat == L']') /* right bracket can appear as collating symbol */ +! { +! wpat++; +! bracklen++; +! } + in_collsym = 1; + } +*************** +*** 154,157 **** +--- 167,171 ---- + { + wpat++; ++ bracklen++; + in_collsym = 0; + } +*************** +*** 159,164 **** + { + wpat++; + if (*wpat == L']') /* right bracket can appear as equivalence class */ +! wpat++; + in_equiv = 1; + } +--- 173,182 ---- + { + wpat++; ++ bracklen++; + if (*wpat == L']') /* right bracket can appear as equivalence class */ +! { +! wpat++; +! bracklen++; +! } + in_equiv = 1; + } +*************** +*** 166,174 **** +--- 184,196 ---- + { + wpat++; ++ bracklen++; + in_equiv = 0; + } ++ else ++ bracklen++; + } + while ((wc = *wpat++) != L']'); + matlen++; /* bracket expression can only match one char */ ++ bad_bracket: + break; + } +*************** +*** 214,219 **** + size_t max; + { +! char c, *brack; +! int matlen, t, in_cclass, in_collsym, in_equiv; + + if (*pat == 0) +--- 236,241 ---- + size_t max; + { +! char c; +! int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; + + if (*pat == 0) +*************** +*** 255,259 **** + case '[': + /* scan for ending `]', skipping over embedded [:...:] */ +! brack = pat; + c = *pat++; + do +--- 277,281 ---- + case '[': + /* scan for ending `]', skipping over embedded [:...:] */ +! bracklen = 1; + c = *pat++; + do +*************** +*** 261,276 **** + if (c == 0) + { +! matlen += pat - brack - 1; /* incremented below */ +! break; + } + else if (c == '\\') + { +! c = *pat++; +! if (*pat == 0) +! break; + } + else if (c == '[' && *pat == ':') /* character class */ + { + pat++; + in_cclass = 1; + } +--- 283,306 ---- + if (c == 0) + { +! pat--; /* back up to NUL */ +! matlen += bracklen; +! goto bad_bracket; + } + else if (c == '\\') + { +! /* *pat == backslash-escaped character */ +! bracklen++; +! /* If the backslash or backslash-escape ends the string, +! bail. The ++pat skips over the backslash escape */ +! if (*pat == 0 || *++pat == 0) +! { +! matlen += bracklen; +! goto bad_bracket; +! } + } + else if (c == '[' && *pat == ':') /* character class */ + { + pat++; ++ bracklen++; + in_cclass = 1; + } +*************** +*** 278,281 **** +--- 308,312 ---- + { + pat++; ++ bracklen++; + in_cclass = 0; + } +*************** +*** 283,288 **** + { + pat++; + if (*pat == ']') /* right bracket can appear as collating symbol */ +! pat++; + in_collsym = 1; + } +--- 314,323 ---- + { + pat++; ++ bracklen++; + if (*pat == ']') /* right bracket can appear as collating symbol */ +! { +! pat++; +! bracklen++; +! } + in_collsym = 1; + } +*************** +*** 290,293 **** +--- 325,329 ---- + { + pat++; ++ bracklen++; + in_collsym = 0; + } +*************** +*** 295,300 **** + { + pat++; + if (*pat == ']') /* right bracket can appear as equivalence class */ +! pat++; + in_equiv = 1; + } +--- 331,340 ---- + { + pat++; ++ bracklen++; + if (*pat == ']') /* right bracket can appear as equivalence class */ +! { +! pat++; +! bracklen++; +! } + in_equiv = 1; + } +*************** +*** 302,310 **** +--- 342,354 ---- + { + pat++; ++ bracklen++; + in_equiv = 0; + } ++ else ++ bracklen++; + } + while ((c = *pat++) != ']'); + matlen++; /* bracket expression can only match one char */ ++ bad_bracket: + break; + } +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 2 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 3 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-004 b/source/a/bash/bash-4.2-patches/bash42-004 new file mode 100644 index 00000000..fe29f82c --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-004 @@ -0,0 +1,53 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-004 + +Bug-Reported-by: Mike Frysinger +Bug-Reference-ID: <201102182106.17834.vapier@gentoo.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00222.html + +Bug-Description: + +When used in contexts where word splitting and quote removal were not +performed, such as pattern removal or pattern substitution, empty strings +(either literal or resulting from quoted variables that were unset or +null) were not matched correctly, resulting in failure. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2011-01-02 16:12:51.000000000 -0500 +--- subst.c 2011-02-18 22:30:13.000000000 -0500 +*************** +*** 3373,3379 **** + if (string == 0 || *string == '\0') + return (WORD_LIST *)NULL; + +! td.flags = 0; + td.word = string; + tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at); + return (tresult); +--- 3373,3379 ---- + if (string == 0 || *string == '\0') + return (WORD_LIST *)NULL; + +! td.flags = W_NOSPLIT2; /* no splitting, remove "" and '' */ + td.word = string; + tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at); + return (tresult); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 3 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 4 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-005 b/source/a/bash/bash-4.2-patches/bash42-005 new file mode 100644 index 00000000..3ca9fc1d --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-005 @@ -0,0 +1,131 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-005 + +Bug-Reported-by: Dennis Williamson +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00147.html + +Bug-Description: + +Systems that use tzset() to set the local timezone require the TZ variable +to be in the environment. Bash must make sure the environment has been +modified with any updated value for TZ before calling tzset(). This +affects prompt string expansions and the `%T' printf conversion specification +on systems that do not allow bash to supply a replacement for getenv(3). + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/variables.h 2010-12-02 20:22:01.000000000 -0500 +--- variables.h 2011-02-19 19:57:12.000000000 -0500 +*************** +*** 314,317 **** +--- 314,318 ---- + extern void sort_variables __P((SHELL_VAR **)); + ++ extern int chkexport __P((char *)); + extern void maybe_make_export_env __P((void)); + extern void update_export_env_inplace __P((char *, int, char *)); +*** ../bash-4.2-patched/variables.c 2011-01-24 20:07:48.000000000 -0500 +--- variables.c 2011-02-19 20:04:50.000000000 -0500 +*************** +*** 3654,3657 **** +--- 3654,3673 ---- + } + ++ int ++ chkexport (name) ++ char *name; ++ { ++ SHELL_VAR *v; ++ ++ v = find_variable (name); ++ if (exported_p (v)) ++ { ++ array_needs_making = 1; ++ maybe_make_export_env (); ++ return 1; ++ } ++ return 0; ++ } ++ + void + maybe_make_export_env () +*************** +*** 4215,4219 **** + { "TEXTDOMAINDIR", sv_locale }, + +! #if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) + { "TZ", sv_tz }, + #endif +--- 4231,4235 ---- + { "TEXTDOMAINDIR", sv_locale }, + +! #if defined (HAVE_TZSET) + { "TZ", sv_tz }, + #endif +*************** +*** 4559,4568 **** + #endif /* HISTORY */ + +! #if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) + void + sv_tz (name) + char *name; + { +! tzset (); + } + #endif +--- 4575,4585 ---- + #endif /* HISTORY */ + +! #if defined (HAVE_TZSET) + void + sv_tz (name) + char *name; + { +! if (chkexport (name)) +! tzset (); + } + #endif +*** ../bash-4.2-patched/parse.y 2011-01-02 15:48:11.000000000 -0500 +--- parse.y 2011-02-19 20:05:00.000000000 -0500 +*************** +*** 5136,5139 **** +--- 5136,5142 ---- + /* Make the current time/date into a string. */ + (void) time (&the_time); ++ #if defined (HAVE_TZSET) ++ sv_tz ("TZ"); /* XXX -- just make sure */ ++ #endif + tm = localtime (&the_time); + +*** ../bash-4.2-patched/builtins/printf.def 2010-11-23 10:02:55.000000000 -0500 +--- builtins/printf.def 2011-02-19 20:05:04.000000000 -0500 +*************** +*** 466,469 **** +--- 466,472 ---- + else + secs = arg; ++ #if defined (HAVE_TZSET) ++ sv_tz ("TZ"); /* XXX -- just make sure */ ++ #endif + tm = localtime (&secs); + n = strftime (timebuf, sizeof (timebuf), timefmt, tm); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 4 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 5 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-006 b/source/a/bash/bash-4.2-patches/bash42-006 new file mode 100644 index 00000000..be6e49c7 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-006 @@ -0,0 +1,46 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-006 + +Bug-Reported-by: Allan McRae +Bug-Reference-ID: <4D6D0D0B.50908@archlinux.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00001.html + +Bug-Description: + +A problem with bash42-005 caused it to dump core if TZ was unset. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/variables.c 2011-02-25 12:07:41.000000000 -0500 +--- variables.c 2011-03-01 10:13:04.000000000 -0500 +*************** +*** 3661,3665 **** + + v = find_variable (name); +! if (exported_p (v)) + { + array_needs_making = 1; +--- 3661,3665 ---- + + v = find_variable (name); +! if (v && exported_p (v)) + { + array_needs_making = 1; +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 5 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-007 b/source/a/bash/bash-4.2-patches/bash42-007 new file mode 100644 index 00000000..d16156e2 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-007 @@ -0,0 +1,46 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-007 + +Bug-Reported-by: Matthias Klose +Bug-Reference-ID: <4D6FD2AC.1010500@debian.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00015.html + +Bug-Description: + +When used in contexts where word splitting and quote removal were not +performed, such as case statement word expansion, empty strings +(either literal or resulting from quoted variables that were unset or +null) were not expanded correctly, resulting in failure. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2011-02-25 12:03:58.000000000 -0500 +--- subst.c 2011-03-03 14:08:23.000000000 -0500 +*************** +*** 4609,4614 **** +--- 4611,4617 ---- + if (ifs_firstc == 0) + #endif + word->flags |= W_NOSPLIT; ++ word->flags |= W_NOSPLIT2; + result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL); + expand_no_split_dollar_star = 0; + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 7 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-008 b/source/a/bash/bash-4.2-patches/bash42-008 new file mode 100644 index 00000000..631abbdf --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-008 @@ -0,0 +1,74 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-008 + +Bug-Reported-by: Doug McMahon +Bug-Reference-ID: <1299441211.2535.11.camel@doug-XPS-M1330> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00050.html + +Bug-Description: + +Bash-4.2 does not attempt to save the shell history on receipt of a +terminating signal that is handled synchronously. Unfortunately, the +`close' button on most X11 terminal emulators sends SIGHUP, which +kills the shell. + +This is a very small patch to save the history in the case that an +interactive shell receives a SIGHUP or SIGTERM while in readline and +reading a command. + +The next version of bash will do this differently. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/sig.c Tue Nov 23 08:21:22 2010 +--- sig.c Tue Mar 8 21:28:32 2011 +*************** +*** 47,50 **** +--- 47,51 ---- + #if defined (READLINE) + # include "bashline.h" ++ # include + #endif + +*************** +*** 63,66 **** +--- 64,68 ---- + extern int history_lines_this_session; + #endif ++ extern int no_line_editing; + + extern void initialize_siglist (); +*************** +*** 506,510 **** + #if defined (HISTORY) + /* XXX - will inhibit history file being written */ +! history_lines_this_session = 0; + #endif + terminate_immediately = 0; +--- 508,515 ---- + #if defined (HISTORY) + /* XXX - will inhibit history file being written */ +! # if defined (READLINE) +! if (interactive_shell == 0 || interactive == 0 || (sig != SIGHUP && sig != SIGTERM) || no_line_editing || (RL_ISSTATE (RL_STATE_READCMD) == 0)) +! # endif +! history_lines_this_session = 0; + #endif + terminate_immediately = 0; +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 7 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 8 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-009 b/source/a/bash/bash-4.2-patches/bash42-009 new file mode 100644 index 00000000..83a7e2c7 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-009 @@ -0,0 +1,82 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-009 + +Bug-Reported-by: +Bug-Reference-ID: <4DAAC0DB.7060606@piumalab.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00075.html + +Bug-Description: + +Under certain circumstances, running `fc -l' two times in succession with a +relative history offset at the end of the history will result in an incorrect +calculation of the last history entry and a seg fault. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/fc.def 2010-05-30 18:25:38.000000000 -0400 +--- builtins/fc.def 2011-04-19 15:46:17.000000000 -0400 +*************** +*** 305,309 **** + + /* XXX */ +! if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0) + while (last_hist >= 0 && hlist[last_hist] == 0) + last_hist--; +--- 305,309 ---- + + /* XXX */ +! if (i == last_hist && hlist[last_hist] == 0) + while (last_hist >= 0 && hlist[last_hist] == 0) + last_hist--; +*************** +*** 476,480 **** + { + int sign, n, clen, rh; +! register int i, j; + register char *s; + +--- 476,480 ---- + { + int sign, n, clen, rh; +! register int i, j, last_hist; + register char *s; + +*************** +*** 496,500 **** + calculation as if it were on. */ + rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); +! i -= rh + hist_last_line_added; + + /* No specification defaults to most recent command. */ +--- 496,508 ---- + calculation as if it were on. */ + rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); +! last_hist = i - rh - hist_last_line_added; +! +! if (i == last_hist && hlist[last_hist] == 0) +! while (last_hist >= 0 && hlist[last_hist] == 0) +! last_hist--; +! if (last_hist < 0) +! return (-1); +! +! i = last_hist; + + /* No specification defaults to most recent command. */ +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 8 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 9 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-010 b/source/a/bash/bash-4.2-patches/bash42-010 new file mode 100644 index 00000000..e408abd6 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-010 @@ -0,0 +1,61 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-010 + +Bug-Reported-by: Mike Frysinger +Bug-Reference-ID: <201104122356.20160.vapier@gentoo.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00058.html + +Bug-Description: + +Bash did not correctly print/reproduce here documents attached to commands +inside compound commands such as arithmetic for loops and user-specified +subshells. This affected the execution of such commands inside a shell +function when the function definition is saved and later restored using +`.' or `eval'. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/print_cmd.c 2010-05-30 18:34:08.000000000 -0400 +--- print_cmd.c 2011-04-14 10:43:18.000000000 -0400 +*************** +*** 316,319 **** +--- 317,321 ---- + skip_this_indent++; + make_command_string_internal (command->value.Subshell->command); ++ PRINT_DEFERRED_HEREDOCS (""); + cprintf (" )"); + break; +*************** +*** 593,596 **** +--- 606,610 ---- + indentation += indentation_amount; + make_command_string_internal (arith_for_command->action); ++ PRINT_DEFERRED_HEREDOCS (""); + semicolon (); + indentation -= indentation_amount; +*************** +*** 654,657 **** +--- 668,672 ---- + + make_command_string_internal (group_command->command); ++ PRINT_DEFERRED_HEREDOCS (""); + + if (inside_function_def) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 9 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 10 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-011 b/source/a/bash/bash-4.2-patches/bash42-011 new file mode 100644 index 00000000..26fdf65f --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-011 @@ -0,0 +1,46 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-011 + +Bug-Reported-by: "David Parks" +Bug-Reference-ID: <014101cc82c6$46ac1540$d4043fc0$@com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-10/msg00031.html + +Bug-Description: + +Overwriting a value in an associative array causes the memory allocated to +store the key on the second and subsequent assignments to leak. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/assoc.c 2009-08-05 20:19:40.000000000 -0400 +--- assoc.c 2011-10-04 20:23:07.000000000 -0400 +*************** +*** 78,81 **** +--- 78,86 ---- + if (b == 0) + return -1; ++ /* If we are overwriting an existing element's value, we're not going to ++ use the key. Nothing in the array assignment code path frees the key ++ string, so we can free it here to avoid a memory leak. */ ++ if (b->key != key) ++ free (key); + FREE (b->data); + b->data = value ? savestring (value) : (char *)0; +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 10 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 11 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-012 b/source/a/bash/bash-4.2-patches/bash42-012 new file mode 100644 index 00000000..70f0a56b --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-012 @@ -0,0 +1,151 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-012 + +Bug-Reported-by: Rui Santos +Bug-Reference-ID: <4E04C6D0.2020507@grupopie.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00079.html + +Bug-Description: + +When calling the parser to recursively parse a command substitution within +an arithmetic expansion, the shell overwrote the saved shell input line and +associated state, resulting in a garbled command. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/parse.y 2011-02-26 19:19:05.000000000 -0500 +--- parse.y 2011-06-24 20:08:22.000000000 -0400 +*************** +*** 3843,3846 **** +--- 3849,3853 ---- + { + sh_parser_state_t ps; ++ sh_input_line_state_t ls; + int orig_ind, nc, sflags; + char *ret, *s, *ep, *ostring; +*************** +*** 3850,3857 **** +--- 3857,3866 ---- + ostring = string; + ++ /*itrace("xparse_dolparen: size = %d shell_input_line = `%s'", shell_input_line_size, shell_input_line);*/ + sflags = SEVAL_NONINT|SEVAL_NOHIST|SEVAL_NOFREE; + if (flags & SX_NOLONGJMP) + sflags |= SEVAL_NOLONGJMP; + save_parser_state (&ps); ++ save_input_line_state (&ls); + + /*(*/ +*************** +*** 3862,3865 **** +--- 3871,3876 ---- + restore_parser_state (&ps); + reset_parser (); ++ /* reset_parser clears shell_input_line and associated variables */ ++ restore_input_line_state (&ls); + if (interactive) + token_to_read = 0; +*************** +*** 5909,5912 **** +--- 5920,5929 ---- + ps->echo_input_at_read = echo_input_at_read; + ++ ps->token = token; ++ ps->token_buffer_size = token_buffer_size; ++ /* Force reallocation on next call to read_token_word */ ++ token = 0; ++ token_buffer_size = 0; ++ + return (ps); + } +*************** +*** 5950,5953 **** +--- 5967,6006 ---- + expand_aliases = ps->expand_aliases; + echo_input_at_read = ps->echo_input_at_read; ++ ++ FREE (token); ++ token = ps->token; ++ token_buffer_size = ps->token_buffer_size; ++ } ++ ++ sh_input_line_state_t * ++ save_input_line_state (ls) ++ sh_input_line_state_t *ls; ++ { ++ if (ls == 0) ++ ls = (sh_input_line_state_t *)xmalloc (sizeof (sh_input_line_state_t)); ++ if (ls == 0) ++ return ((sh_input_line_state_t *)NULL); ++ ++ ls->input_line = shell_input_line; ++ ls->input_line_size = shell_input_line_size; ++ ls->input_line_len = shell_input_line_len; ++ ls->input_line_index = shell_input_line_index; ++ ++ /* force reallocation */ ++ shell_input_line = 0; ++ shell_input_line_size = shell_input_line_len = shell_input_line_index = 0; ++ } ++ ++ void ++ restore_input_line_state (ls) ++ sh_input_line_state_t *ls; ++ { ++ FREE (shell_input_line); ++ shell_input_line = ls->input_line; ++ shell_input_line_size = ls->input_line_size; ++ shell_input_line_len = ls->input_line_len; ++ shell_input_line_index = ls->input_line_index; ++ ++ set_line_mbstate (); + } + +*** ../bash-4.2-patched/shell.h 2011-01-06 22:16:55.000000000 -0500 +--- shell.h 2011-06-24 19:12:25.000000000 -0400 +*************** +*** 137,140 **** +--- 139,145 ---- + int *token_state; + ++ char *token; ++ int token_buffer_size; ++ + /* input line state -- line number saved elsewhere */ + int input_line_terminator; +*************** +*** 167,171 **** +--- 172,186 ---- + } sh_parser_state_t; + ++ typedef struct _sh_input_line_state_t { ++ char *input_line; ++ int input_line_index; ++ int input_line_size; ++ int input_line_len; ++ } sh_input_line_state_t; ++ + /* Let's try declaring these here. */ + extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *)); + extern void restore_parser_state __P((sh_parser_state_t *)); ++ ++ extern sh_input_line_state_t *save_input_line_state __P((sh_input_line_state_t *)); ++ extern void restore_input_line_state __P((sh_input_line_state_t *)); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 11 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 12 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-013 b/source/a/bash/bash-4.2-patches/bash42-013 new file mode 100644 index 00000000..5bb186b3 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-013 @@ -0,0 +1,52 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-013 + +Bug-Reported-by: Marten Wikstrom +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00049.html + +Bug-Description: + +An off-by-one error caused the shell to skip over CTLNUL characters, +which are used internally to mark quoted null strings. The effect +was to have stray 0x7f characters left after expanding words like +""""""""aa. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2011-03-06 14:11:11.000000000 -0500 +--- subst.c 2011-05-11 11:23:33.000000000 -0400 +*************** +*** 3707,3711 **** + } + else if (string[i] == CTLNUL) +! i++; + + prev_i = i; +--- 3710,3717 ---- + } + else if (string[i] == CTLNUL) +! { +! i++; +! continue; +! } + + prev_i = i; +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 12 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 13 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-014 b/source/a/bash/bash-4.2-patches/bash42-014 new file mode 100644 index 00000000..a43271c3 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-014 @@ -0,0 +1,47 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-014 + +Bug-Reported-by: Shawn Bohrer +Bug-Reference-ID: <20110504152320.6E8F28130527@dev1.rgmadvisors.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00018.html + +Bug-Description: + +The regular expression matching operator did not correctly match +expressions with an embedded ^A. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/pathexp.c 2010-08-13 23:21:57.000000000 -0400 +--- pathexp.c 2011-05-05 16:40:58.000000000 -0400 +*************** +*** 197,201 **** + if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/') + continue; +! if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) + continue; + temp[j++] = '\\'; +--- 197,201 ---- + if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/') + continue; +! if (pathname[i+1] != CTLESC && (qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) + continue; + temp[j++] = '\\'; +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 13 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 14 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-015 b/source/a/bash/bash-4.2-patches/bash42-015 new file mode 100644 index 00000000..86558738 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-015 @@ -0,0 +1,81 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-015 + +Bug-Reported-by: +Bug-Reference-ID: <728_1312188080_4E3666B0_728_118711_1_3B5D3E0F95CC5C478D6500CDCE8B691F7AAAA4AA3D@PUEXCB2B.nanterre.francetelecom.fr> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00000.html + +Bug-Description: + +When in a context where arithmetic evaluation is not taking place, the +evaluator should not check for division by 0. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/expr.c 2010-12-21 11:12:13.000000000 -0500 +--- expr.c 2011-08-02 20:58:28.000000000 -0400 +*************** +*** 477,480 **** +--- 481,492 ---- + if (special) + { ++ if ((op == DIV || op == MOD) && value == 0) ++ { ++ if (noeval == 0) ++ evalerror (_("division by 0")); ++ else ++ value = 1; ++ } ++ + switch (op) + { +*************** +*** 483,493 **** + break; + case DIV: +- if (value == 0) +- evalerror (_("division by 0")); + lvalue /= value; + break; + case MOD: +- if (value == 0) +- evalerror (_("division by 0")); + lvalue %= value; + break; +--- 495,501 ---- +*************** +*** 805,809 **** + + if (((op == DIV) || (op == MOD)) && (val2 == 0)) +! evalerror (_("division by 0")); + + if (op == MUL) +--- 813,822 ---- + + if (((op == DIV) || (op == MOD)) && (val2 == 0)) +! { +! if (noeval == 0) +! evalerror (_("division by 0")); +! else +! val2 = 1; +! } + + if (op == MUL) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 14 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 15 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-016 b/source/a/bash/bash-4.2-patches/bash42-016 new file mode 100644 index 00000000..46025888 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-016 @@ -0,0 +1,46 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-016 + +Bug-Reported-by: Martin von Gagern +Bug-Reference-ID: <4E43AD9E.8060501@gmx.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00141.html + +Bug-Description: + +Bash should not check for mail while executing the `eval' builtin. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/parse.y Fri Feb 25 12:07:41 2011 +--- parse.y Thu Aug 11 19:02:26 2011 +*************** +*** 2500,2504 **** + is the mail alarm reset; nothing takes place in check_mail () + except the checking of mail. Please don't change this. */ +! if (prompt_is_ps1 && time_to_check_mail ()) + { + check_mail (); +--- 2498,2502 ---- + is the mail alarm reset; nothing takes place in check_mail () + except the checking of mail. Please don't change this. */ +! if (prompt_is_ps1 && parse_and_execute_level == 0 && time_to_check_mail ()) + { + check_mail (); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 15 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 16 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-017 b/source/a/bash/bash-4.2-patches/bash42-017 new file mode 100644 index 00000000..010ed1e5 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-017 @@ -0,0 +1,47 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-017 + +Bug-Reported-by: Curtis Doty +Bug-Reference-ID: <20110621035324.A4F70849F59@mx1.iParadigms.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00053.html + +Bug-Description: + +Using `read -a foo' where foo was an already-declared associative array +caused the shell to die with a segmentation fault. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/read.def 2011-01-04 11:43:36.000000000 -0500 +--- builtins/read.def 2011-06-21 10:31:02.000000000 -0400 +*************** +*** 643,646 **** +--- 642,651 ---- + return EXECUTION_FAILURE; /* readonly or noassign */ + } ++ if (assoc_p (var)) ++ { ++ builtin_error (_("%s: cannot convert associative to indexed array"), arrayname); ++ xfree (input_string); ++ return EXECUTION_FAILURE; /* existing associative array */ ++ } + array_flush (array_cell (var)); + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 16 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 17 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-018 b/source/a/bash/bash-4.2-patches/bash42-018 new file mode 100644 index 00000000..5d11dce1 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-018 @@ -0,0 +1,74 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-018 + +Bug-Reported-by: Thomas Cort +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00110.html + +Bug-Description: + +Bash fails to compile unless JOB_CONTROL is defined. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/execute_cmd.c 2011-02-09 17:32:25.000000000 -0500 +--- execute_cmd.c 2011-11-06 15:12:48.000000000 -0500 +*************** +*** 2197,2200 **** +--- 2315,2319 ---- + cmd->flags |= CMD_IGNORE_RETURN; + ++ #if defined (JOB_CONTROL) + lastpipe_flag = 0; + begin_unwind_frame ("lastpipe-exec"); +*************** +*** 2216,2228 **** + add_unwind_protect (lastpipe_cleanup, lastpipe_jid); + } +! cmd->flags |= CMD_LASTPIPE; + } + if (prev >= 0) + add_unwind_protect (close, prev); + + exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close); + + if (lstdin > 0) + restore_stdin (lstdin); + + if (prev >= 0) +--- 2335,2351 ---- + add_unwind_protect (lastpipe_cleanup, lastpipe_jid); + } +! if (cmd) +! cmd->flags |= CMD_LASTPIPE; + } + if (prev >= 0) + add_unwind_protect (close, prev); ++ #endif + + exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close); + ++ #if defined (JOB_CONTROL) + if (lstdin > 0) + restore_stdin (lstdin); ++ #endif + + if (prev >= 0) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 17 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 18 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-019 b/source/a/bash/bash-4.2-patches/bash42-019 new file mode 100644 index 00000000..5fce40ae --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-019 @@ -0,0 +1,47 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-019 + +Bug-Reported-by: Diego Augusto Molina +Bug-Reference-ID: +Bug-Reference-URL: lists.gnu.org/archive/html/bug-bash/2011-09/msg00047.html + +Bug-Description: + +Using `declare' with attributes and an invalid array variable name or +assignment reference resulted in a segmentation fault instead of a +declaration error. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/declare.def 2010-05-30 18:25:21.000000000 -0400 +--- builtins/declare.def 2011-09-15 15:20:20.000000000 -0400 +*************** +*** 514,517 **** +--- 514,522 ---- + var = assign_array_element (name, value, 0); /* XXX - not aflags */ + *subscript_start = '\0'; ++ if (var == 0) /* some kind of assignment error */ ++ { ++ assign_error++; ++ NEXT_VARIABLE (); ++ } + } + else if (simple_array_assign) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 18 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 19 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-020 b/source/a/bash/bash-4.2-patches/bash42-020 new file mode 100644 index 00000000..a1dd0443 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-020 @@ -0,0 +1,60 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-020 + +Bug-Reported-by: Vincent Sheffer +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2011-08/msg00000.html + +Bug-Description: + +The shared object helper script needs to be updated for Mac OS X 10.7 +(Lion, darwin11). + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/support/shobj-conf 2009-10-28 09:20:21.000000000 -0400 +--- support/shobj-conf 2011-08-27 13:25:23.000000000 -0400 +*************** +*** 158,162 **** + + # Darwin/MacOS X +! darwin[89]*|darwin10*) + SHOBJ_STATUS=supported + SHLIB_STATUS=supported +--- 172,176 ---- + + # Darwin/MacOS X +! darwin[89]*|darwin1[012]*) + SHOBJ_STATUS=supported + SHLIB_STATUS=supported +*************** +*** 187,191 **** + + case "${host_os}" in +! darwin[789]*|darwin10*) SHOBJ_LDFLAGS='' + SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + ;; +--- 201,205 ---- + + case "${host_os}" in +! darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS='' + SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + ;; +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 19 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 20 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-021 b/source/a/bash/bash-4.2-patches/bash42-021 new file mode 100644 index 00000000..b6153c78 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-021 @@ -0,0 +1,61 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-021 + +Bug-Reported-by: Dan Douglas +Bug-Reference-ID: <4585554.nZWb4q7YoZ@smorgbox> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-12/msg00084.html + +Bug-Description: + +Using `read -N' to assign values to an array can result in NUL values being +assigned to some array elements. These values cause seg faults when referenced +later. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/read.def 2011-11-21 18:03:38.000000000 -0500 +--- builtins/read.def 2011-12-19 19:52:12.000000000 -0500 +*************** +*** 738,742 **** + } + else +! var = bind_read_variable (varname, t); + } + else +--- 775,779 ---- + } + else +! var = bind_read_variable (varname, t ? t : ""); + } + else +*************** +*** 799,803 **** + } + else +! var = bind_read_variable (list->word->word, input_string); + + if (var) +--- 836,840 ---- + } + else +! var = bind_read_variable (list->word->word, input_string ? input_string : ""); + + if (var) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 20 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 21 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-022 b/source/a/bash/bash-4.2-patches/bash42-022 new file mode 100644 index 00000000..0067b133 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-022 @@ -0,0 +1,61 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-022 + +Bug-Reported-by: Gregory Margo +Bug-Reference-ID: <20110727174529.GA3333@pacbell.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00102.html + +Bug-Description: + +The return value from lseek is `off_t'. This can cause corrupted return +values when the file offset is greater than 2**31 - 1. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/sh/zread.c Mon Mar 2 08:54:45 2009 +--- lib/sh/zread.c Thu Jul 28 18:16:53 2011 +*************** +*** 161,166 **** + int fd; + { +! off_t off; +! int r; + + off = lused - lind; +--- 161,165 ---- + int fd; + { +! off_t off, r; + + off = lused - lind; +*************** +*** 169,173 **** + r = lseek (fd, -off, SEEK_CUR); + +! if (r >= 0) + lused = lind = 0; + } +--- 168,172 ---- + r = lseek (fd, -off, SEEK_CUR); + +! if (r != -1) + lused = lind = 0; + } +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 21 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 22 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-023 b/source/a/bash/bash-4.2-patches/bash42-023 new file mode 100644 index 00000000..4f204efb --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-023 @@ -0,0 +1,62 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-023 + +Bug-Reported-by: Ewan Mellor +Bug-Reference-ID: <6005BE083BF501439A84DC3523BAC82DC4B964FD12@LONPMAILBOX01.citrite.net> +Bug-Reference-URL: + +Bug-Description: + +Under some circumstances, an exit trap triggered by a bad substitution +error when errexit is enabled will cause the shell to exit with an +incorrect exit status (0). + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2011-11-21 12:04:38.000000000 -0500 +--- subst.c 2012-02-08 13:36:28.000000000 -0500 +*************** +*** 7275,7278 **** +--- 7281,7285 ---- + case '\0': + bad_substitution: ++ last_command_exit_value = EXECUTION_FAILURE; + report_error (_("%s: bad substitution"), string ? string : "??"); + FREE (value); +*** ../bash-4.2-patched/error.c 2009-08-21 22:31:31.000000000 -0400 +--- error.c 2012-02-25 15:54:40.000000000 -0500 +*************** +*** 201,205 **** + va_end (args); + if (exit_immediately_on_error) +! exit_shell (1); + } + +--- 201,209 ---- + va_end (args); + if (exit_immediately_on_error) +! { +! if (last_command_exit_value == 0) +! last_command_exit_value = 1; +! exit_shell (last_command_exit_value); +! } + } + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 22 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 23 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-024 b/source/a/bash/bash-4.2-patches/bash42-024 new file mode 100644 index 00000000..b7b1158b --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-024 @@ -0,0 +1,45 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-024 + +Bug-Reported-by: Jim Avera +Bug-Reference-ID: <4F29E07A.80405@yahoo.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-02/msg00001.html + +Bug-Description: + +When `printf -v' is used to set an array element, the format string contains +`%b', and the corresponding argument is the empty string, the buffer used +to store the value to be assigned can be NULL, which results in NUL being +assigned to the array element. This causes a seg fault when it's used later. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/printf.def 2011-02-25 12:07:41.000000000 -0500 +--- builtins/printf.def 2012-02-02 08:37:12.000000000 -0500 +*************** +*** 256,259 **** +--- 257,262 ---- + { + vflag = 1; ++ if (vbsize == 0) ++ vbuf = xmalloc (vbsize = 16); + vblen = 0; + if (vbuf) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 23 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 24 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-025 b/source/a/bash/bash-4.2-patches/bash42-025 new file mode 100644 index 00000000..34ac3430 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-025 @@ -0,0 +1,143 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-025 + +Bug-Reported-by: Bill Gradwohl +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/help-bash/2012-03/msg00078.html + +Bug-Description: + +When used in a shell function, `declare -g -a array=(compound assignment)' +creates a local variable instead of a global one. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/command.h 2010-08-02 19:36:51.000000000 -0400 +--- command.h 2012-04-01 12:38:35.000000000 -0400 +*************** +*** 98,101 **** +--- 98,102 ---- + #define W_ASSIGNASSOC 0x400000 /* word looks like associative array assignment */ + #define W_ARRAYIND 0x800000 /* word is an array index being expanded */ ++ #define W_ASSNGLOBAL 0x1000000 /* word is a global assignment to declare (declare/typeset -g) */ + + /* Possible values for subshell_environment */ +*** ../bash-4.2-patched/execute_cmd.c 2011-11-21 18:03:41.000000000 -0500 +--- execute_cmd.c 2012-04-01 12:42:03.000000000 -0400 +*************** +*** 3581,3585 **** + WORD_LIST *w; + struct builtin *b; +! int assoc; + + if (words == 0) +--- 3581,3585 ---- + WORD_LIST *w; + struct builtin *b; +! int assoc, global; + + if (words == 0) +*************** +*** 3587,3591 **** + + b = 0; +! assoc = 0; + + for (w = words; w; w = w->next) +--- 3587,3591 ---- + + b = 0; +! assoc = global = 0; + + for (w = words; w; w = w->next) +*************** +*** 3604,3607 **** +--- 3604,3609 ---- + if (assoc) + w->word->flags |= W_ASSIGNASSOC; ++ if (global) ++ w->word->flags |= W_ASSNGLOBAL; + #endif + } +*************** +*** 3609,3613 **** + /* Note that we saw an associative array option to a builtin that takes + assignment statements. This is a bit of a kludge. */ +! else if (w->word->word[0] == '-' && strchr (w->word->word, 'A')) + { + if (b == 0) +--- 3611,3618 ---- + /* Note that we saw an associative array option to a builtin that takes + assignment statements. This is a bit of a kludge. */ +! else if (w->word->word[0] == '-' && (strchr (w->word->word+1, 'A') || strchr (w->word->word+1, 'g'))) +! #else +! else if (w->word->word[0] == '-' && strchr (w->word->word+1, 'g')) +! #endif + { + if (b == 0) +*************** +*** 3619,3626 **** + words->word->flags |= W_ASSNBLTIN; + } +! if (words->word->flags & W_ASSNBLTIN) + assoc = 1; + } +- #endif + } + +--- 3624,3632 ---- + words->word->flags |= W_ASSNBLTIN; + } +! if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'A')) + assoc = 1; ++ if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'g')) ++ global = 1; + } + } + +*** ../bash-4.2-patched/subst.c 2012-03-11 17:35:13.000000000 -0400 +--- subst.c 2012-04-01 12:38:35.000000000 -0400 +*************** +*** 367,370 **** +--- 367,375 ---- + fprintf (stderr, "W_ASSNBLTIN%s", f ? "|" : ""); + } ++ if (f & W_ASSNGLOBAL) ++ { ++ f &= ~W_ASSNGLOBAL; ++ fprintf (stderr, "W_ASSNGLOBAL%s", f ? "|" : ""); ++ } + if (f & W_COMPASSIGN) + { +*************** +*** 2804,2808 **** + else if (assign_list) + { +! if (word->flags & W_ASSIGNARG) + aflags |= ASS_MKLOCAL; + if (word->flags & W_ASSIGNASSOC) +--- 2809,2813 ---- + else if (assign_list) + { +! if ((word->flags & W_ASSIGNARG) && (word->flags & W_ASSNGLOBAL) == 0) + aflags |= ASS_MKLOCAL; + if (word->flags & W_ASSIGNASSOC) + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 24 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 25 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-026 b/source/a/bash/bash-4.2-patches/bash42-026 new file mode 100644 index 00000000..e15d7480 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-026 @@ -0,0 +1,58 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-026 + +Bug-Reported-by: Greg Wooledge +Bug-Reference-ID: <20120425180443.GO22241@eeg.ccf.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00172.html + +Bug-Description: + +The `lastpipe' option does not behave correctly on machines where the +open file limit is less than 256. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/execute_cmd.c 2011-11-21 12:04:47.000000000 -0500 +--- execute_cmd.c 2012-04-26 11:09:30.000000000 -0400 +*************** +*** 2206,2210 **** + if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) + { +! lstdin = move_to_high_fd (0, 0, 255); + if (lstdin > 0) + { +--- 2325,2329 ---- + if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) + { +! lstdin = move_to_high_fd (0, 1, -1); + if (lstdin > 0) + { +*************** +*** 2252,2256 **** +--- 2371,2377 ---- + } + ++ #if defined (JOB_CONTROL) + discard_unwind_frame ("lastpipe-exec"); ++ #endif + + return (exec_result); + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 25 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 26 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-027 b/source/a/bash/bash-4.2-patches/bash42-027 new file mode 100644 index 00000000..c0c5d3f8 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-027 @@ -0,0 +1,47 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-027 + +Bug-Reported-by: Mike Frysinger +Bug-Reference-ID: <201204211243.30163.vapier@gentoo.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00134.html + +Bug-Description: + +When the `extglob' shell option is enabled, pattern substitution does not +work correctly in the presence of multibyte characters. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2012-03-11 17:52:57.000000000 -0400 +--- subst.c 2012-04-22 16:19:10.000000000 -0400 +*************** +*** 4167,4171 **** + #if defined (EXTENDED_GLOB) + if (extended_glob) +! simple |= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/ + #endif + +--- 4167,4171 ---- + #if defined (EXTENDED_GLOB) + if (extended_glob) +! simple &= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/ + #endif + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 26 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 27 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-028 b/source/a/bash/bash-4.2-patches/bash42-028 new file mode 100644 index 00000000..fa3be3b4 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-028 @@ -0,0 +1,52 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-028 + +Bug-Reported-by: Mark Edgar +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-03/msg00109.html + +Bug-Description: + +When using a word expansion for which the right hand side is evaluated, +certain expansions of quoted null strings include spurious ^? characters. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2012-03-11 17:35:13.000000000 -0400 +--- subst.c 2012-03-20 19:30:13.000000000 -0400 +*************** +*** 5810,5813 **** +--- 5810,5823 ---- + if (qdollaratp && ((hasdol && quoted) || l->next)) + *qdollaratp = 1; ++ /* If we have a quoted null result (QUOTED_NULL(temp)) and the word is ++ a quoted null (l->next == 0 && QUOTED_NULL(l->word->word)), the ++ flags indicate it (l->word->flags & W_HASQUOTEDNULL), and the ++ expansion is quoted (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) ++ (which is more paranoia than anything else), we need to return the ++ quoted null string and set the flags to indicate it. */ ++ if (l->next == 0 && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && QUOTED_NULL(temp) && QUOTED_NULL(l->word->word) && (l->word->flags & W_HASQUOTEDNULL)) ++ { ++ w->flags |= W_HASQUOTEDNULL; ++ } + dispose_words (l); + } + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 27 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 28 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-029 b/source/a/bash/bash-4.2-patches/bash42-029 new file mode 100644 index 00000000..c51704ca --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-029 @@ -0,0 +1,524 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-029 + +Bug-Reported-by: "Michael Kalisz" +Bug-Reference-ID: <50241.78.69.11.112.1298585641.squirrel@kalisz.homelinux.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00274.html + +Bug-Description: + +Bash-4.2 tries to leave completed directory names as the user typed them, +without expanding them to a full pathname. One effect of this is that +shell variables used in pathnames being completed (e.g., $HOME) are left +unchanged, but the `$' is quoted by readline because it is a special +character to the shell. + +This patch introduces two things: + +1. A new shell option, `direxpand', which, if set, attempts to emulate the + bash-4.1 behavior of expanding words to full pathnames during + completion; +2. A set of heuristics that reduce the number of times special characters + such as `$' are quoted when the directory name is not expanded. + +Patch (apply with `patch -p0'): + +diff -NrC 2 ../bash-4.2-patched/bashline.c ./bashline.c +*** ../bash-4.2-patched/bashline.c 2011-01-16 15:32:47.000000000 -0500 +--- ./bashline.c 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 122,125 **** +--- 122,128 ---- + static int bash_push_line __P((void)); + ++ static rl_icppfunc_t *save_directory_hook __P((void)); ++ static void reset_directory_hook __P((rl_icppfunc_t *)); ++ + static void cleanup_expansion_error __P((void)); + static void maybe_make_readline_line __P((char *)); +*************** +*** 244,251 **** +--- 247,261 ---- + int dircomplete_spelling = 0; + ++ /* Expand directory names during word/filename completion. */ ++ int dircomplete_expand = 0; ++ int dircomplete_expand_relpath = 0; ++ + static char *bash_completer_word_break_characters = " \t\n\"'@><=;|&(:"; + static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:"; + /* )) */ + ++ static const char *default_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/ ++ static char *custom_filename_quote_characters = 0; ++ + static rl_hook_func_t *old_rl_startup_hook = (rl_hook_func_t *)NULL; + +*************** +*** 502,506 **** + /* Tell the completer that we might want to follow symbolic links or + do other expansion on directory names. */ +! rl_directory_rewrite_hook = bash_directory_completion_hook; + + rl_filename_rewrite_hook = bash_filename_rewrite_hook; +--- 512,516 ---- + /* Tell the completer that we might want to follow symbolic links or + do other expansion on directory names. */ +! set_directory_hook (); + + rl_filename_rewrite_hook = bash_filename_rewrite_hook; +*************** +*** 530,534 **** + + /* characters that need to be quoted when appearing in filenames. */ +! rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/ + + rl_filename_quoting_function = bash_quote_filename; +--- 540,544 ---- + + /* characters that need to be quoted when appearing in filenames. */ +! rl_filename_quote_characters = default_filename_quote_characters; + + rl_filename_quoting_function = bash_quote_filename; +*************** +*** 565,570 **** + rl_attempted_completion_function = attempt_shell_completion; + rl_completion_entry_function = NULL; +- rl_directory_rewrite_hook = bash_directory_completion_hook; + rl_ignore_some_completions_function = filename_completion_ignore; + } + +--- 575,582 ---- + rl_attempted_completion_function = attempt_shell_completion; + rl_completion_entry_function = NULL; + rl_ignore_some_completions_function = filename_completion_ignore; ++ rl_filename_quote_characters = default_filename_quote_characters; ++ ++ set_directory_hook (); + } + +*************** +*** 1280,1283 **** +--- 1292,1298 ---- + rl_ignore_some_completions_function = filename_completion_ignore; + ++ rl_filename_quote_characters = default_filename_quote_characters; ++ set_directory_hook (); ++ + /* Determine if this could be a command word. It is if it appears at + the start of the line (ignoring preceding whitespace), or if it +*************** +*** 1592,1595 **** +--- 1607,1616 ---- + else + { ++ if (dircomplete_expand && dot_or_dotdot (filename_hint)) ++ { ++ dircomplete_expand = 0; ++ set_directory_hook (); ++ dircomplete_expand = 1; ++ } + mapping_over = 4; + goto inner; +*************** +*** 1792,1795 **** +--- 1813,1819 ---- + inner: + val = rl_filename_completion_function (filename_hint, istate); ++ if (mapping_over == 4 && dircomplete_expand) ++ set_directory_hook (); ++ + istate = 1; + +*************** +*** 2694,2697 **** +--- 2718,2767 ---- + } + ++ /* Functions to save and restore the appropriate directory hook */ ++ /* This is not static so the shopt code can call it */ ++ void ++ set_directory_hook () ++ { ++ if (dircomplete_expand) ++ { ++ rl_directory_completion_hook = bash_directory_completion_hook; ++ rl_directory_rewrite_hook = (rl_icppfunc_t *)0; ++ } ++ else ++ { ++ rl_directory_rewrite_hook = bash_directory_completion_hook; ++ rl_directory_completion_hook = (rl_icppfunc_t *)0; ++ } ++ } ++ ++ static rl_icppfunc_t * ++ save_directory_hook () ++ { ++ rl_icppfunc_t *ret; ++ ++ if (dircomplete_expand) ++ { ++ ret = rl_directory_completion_hook; ++ rl_directory_completion_hook = (rl_icppfunc_t *)NULL; ++ } ++ else ++ { ++ ret = rl_directory_rewrite_hook; ++ rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL; ++ } ++ ++ return ret; ++ } ++ ++ static void ++ restore_directory_hook (hookf) ++ rl_icppfunc_t *hookf; ++ { ++ if (dircomplete_expand) ++ rl_directory_completion_hook = hookf; ++ else ++ rl_directory_rewrite_hook = hookf; ++ } ++ + /* Handle symbolic link references and other directory name + expansions while hacking completion. This should return 1 if it modifies +*************** +*** 2703,2720 **** + { + char *local_dirname, *new_dirname, *t; +! int return_value, should_expand_dirname; + WORD_LIST *wl; + struct stat sb; + +! return_value = should_expand_dirname = 0; + local_dirname = *dirname; + +! if (mbschr (local_dirname, '$')) +! should_expand_dirname = 1; + else + { + t = mbschr (local_dirname, '`'); + if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0) +! should_expand_dirname = 1; + } + +--- 2773,2801 ---- + { + char *local_dirname, *new_dirname, *t; +! int return_value, should_expand_dirname, nextch, closer; + WORD_LIST *wl; + struct stat sb; + +! return_value = should_expand_dirname = nextch = closer = 0; + local_dirname = *dirname; + +! if (t = mbschr (local_dirname, '$')) +! { +! should_expand_dirname = '$'; +! nextch = t[1]; +! /* Deliberately does not handle the deprecated $[...] arithmetic +! expansion syntax */ +! if (nextch == '(') +! closer = ')'; +! else if (nextch == '{') +! closer = '}'; +! else +! nextch = 0; +! } + else + { + t = mbschr (local_dirname, '`'); + if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0) +! should_expand_dirname = '`'; + } + +*************** +*** 2740,2743 **** +--- 2821,2841 ---- + dispose_words (wl); + local_dirname = *dirname; ++ /* XXX - change rl_filename_quote_characters here based on ++ should_expand_dirname/nextch/closer. This is the only place ++ custom_filename_quote_characters is modified. */ ++ if (rl_filename_quote_characters && *rl_filename_quote_characters) ++ { ++ int i, j, c; ++ i = strlen (default_filename_quote_characters); ++ custom_filename_quote_characters = xrealloc (custom_filename_quote_characters, i+1); ++ for (i = j = 0; c = default_filename_quote_characters[i]; i++) ++ { ++ if (c == should_expand_dirname || c == nextch || c == closer) ++ continue; ++ custom_filename_quote_characters[j++] = c; ++ } ++ custom_filename_quote_characters[j] = '\0'; ++ rl_filename_quote_characters = custom_filename_quote_characters; ++ } + } + else +*************** +*** 2759,2762 **** +--- 2857,2871 ---- + } + ++ /* no_symbolic_links == 0 -> use (default) logical view of the file system. ++ local_dirname[0] == '.' && local_dirname[1] == '/' means files in the ++ current directory (./). ++ local_dirname[0] == '.' && local_dirname[1] == 0 means relative pathnames ++ in the current directory (e.g., lib/sh). ++ XXX - should we do spelling correction on these? */ ++ ++ /* This is test as it was in bash-4.2: skip relative pathnames in current ++ directory. Change test to ++ (local_dirname[0] != '.' || (local_dirname[1] && local_dirname[1] != '/')) ++ if we want to skip paths beginning with ./ also. */ + if (no_symbolic_links == 0 && (local_dirname[0] != '.' || local_dirname[1])) + { +*************** +*** 2764,2767 **** +--- 2873,2885 ---- + int len1, len2; + ++ /* If we have a relative path ++ (local_dirname[0] != '/' && local_dirname[0] != '.') ++ that is canonical after appending it to the current directory, then ++ temp1 = temp2+'/' ++ That is, ++ strcmp (temp1, temp2) == 0 ++ after adding a slash to temp2 below. It should be safe to not ++ change those. ++ */ + t = get_working_directory ("symlink-hook"); + temp1 = make_absolute (local_dirname, t); +*************** +*** 2798,2802 **** + } + } +! return_value |= STREQ (local_dirname, temp2) == 0; + free (local_dirname); + *dirname = temp2; +--- 2916,2928 ---- + } + } +! +! /* dircomplete_expand_relpath == 0 means we want to leave relative +! pathnames that are unchanged by canonicalization alone. +! *local_dirname != '/' && *local_dirname != '.' == relative pathname +! (consistent with general.c:absolute_pathname()) +! temp1 == temp2 (after appending a slash to temp2) means the pathname +! is not changed by canonicalization as described above. */ +! if (dircomplete_expand_relpath || ((local_dirname[0] != '/' && local_dirname[0] != '.') && STREQ (temp1, temp2) == 0)) +! return_value |= STREQ (local_dirname, temp2) == 0; + free (local_dirname); + *dirname = temp2; +*************** +*** 3003,3012 **** + orig_func = rl_completion_entry_function; + orig_attempt_func = rl_attempted_completion_function; +- orig_dir_func = rl_directory_rewrite_hook; + orig_ignore_func = rl_ignore_some_completions_function; + orig_rl_completer_word_break_characters = rl_completer_word_break_characters; + rl_completion_entry_function = rl_filename_completion_function; + rl_attempted_completion_function = (rl_completion_func_t *)NULL; +- rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL; + rl_ignore_some_completions_function = filename_completion_ignore; + rl_completer_word_break_characters = " \t\n\"\'"; +--- 3129,3139 ---- + orig_func = rl_completion_entry_function; + orig_attempt_func = rl_attempted_completion_function; + orig_ignore_func = rl_ignore_some_completions_function; + orig_rl_completer_word_break_characters = rl_completer_word_break_characters; ++ ++ orig_dir_func = save_directory_hook (); ++ + rl_completion_entry_function = rl_filename_completion_function; + rl_attempted_completion_function = (rl_completion_func_t *)NULL; + rl_ignore_some_completions_function = filename_completion_ignore; + rl_completer_word_break_characters = " \t\n\"\'"; +*************** +*** 3016,3023 **** + rl_completion_entry_function = orig_func; + rl_attempted_completion_function = orig_attempt_func; +- rl_directory_rewrite_hook = orig_dir_func; + rl_ignore_some_completions_function = orig_ignore_func; + rl_completer_word_break_characters = orig_rl_completer_word_break_characters; + + return r; + } +--- 3143,3151 ---- + rl_completion_entry_function = orig_func; + rl_attempted_completion_function = orig_attempt_func; + rl_ignore_some_completions_function = orig_ignore_func; + rl_completer_word_break_characters = orig_rl_completer_word_break_characters; + ++ restore_directory_hook (orig_dir_func); ++ + return r; + } +diff -NrC 2 ../bash-4.2-patched/bashline.h ./bashline.h +*** ../bash-4.2-patched/bashline.h 2009-01-04 14:32:22.000000000 -0500 +--- ./bashline.h 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 34,41 **** +--- 34,46 ---- + extern int bash_re_edit __P((char *)); + ++ extern void bashline_set_event_hook __P((void)); ++ extern void bashline_reset_event_hook __P((void)); ++ + extern int bind_keyseq_to_unix_command __P((char *)); + + extern char **bash_default_completion __P((const char *, int, int, int, int)); + ++ void set_directory_hook __P((void)); ++ + /* Used by programmable completion code. */ + extern char *command_word_completion_function __P((const char *, int)); +diff -NrC 2 ../bash-4.2-patched/builtins/shopt.def ./builtins/shopt.def +*** ../bash-4.2-patched/builtins/shopt.def 2010-07-02 22:42:44.000000000 -0400 +--- ./builtins/shopt.def 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 62,65 **** +--- 62,69 ---- + #include "bashgetopt.h" + ++ #if defined (READLINE) ++ # include "../bashline.h" ++ #endif ++ + #if defined (HISTORY) + # include "../bashhist.h" +*************** +*** 95,99 **** + extern int no_empty_command_completion; + extern int force_fignore; +! extern int dircomplete_spelling; + + extern int enable_hostname_completion __P((int)); +--- 99,103 ---- + extern int no_empty_command_completion; + extern int force_fignore; +! extern int dircomplete_spelling, dircomplete_expand; + + extern int enable_hostname_completion __P((int)); +*************** +*** 122,125 **** +--- 126,133 ---- + #endif + ++ #if defined (READLINE) ++ static int shopt_set_complete_direxpand __P((char *, int)); ++ #endif ++ + static int shopt_login_shell; + static int shopt_compat31; +*************** +*** 151,154 **** +--- 159,163 ---- + { "compat41", &shopt_compat41, set_compatibility_level }, + #if defined (READLINE) ++ { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand }, + { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL }, + #endif +*************** +*** 536,539 **** +--- 545,559 ---- + } + ++ #if defined (READLINE) ++ static int ++ shopt_set_complete_direxpand (option_name, mode) ++ char *option_name; ++ int mode; ++ { ++ set_directory_hook (); ++ return 0; ++ } ++ #endif ++ + #if defined (RESTRICTED_SHELL) + /* Don't allow the value of restricted_shell to be modified. */ +Binary files ../bash-4.2-patched/doc/._bashref.pdf and ./doc/._bashref.pdf differ +diff -NrC 2 ../bash-4.2-patched/doc/bash.1 ./doc/bash.1 +*** ../bash-4.2-patched/doc/bash.1 2011-01-16 15:31:39.000000000 -0500 +--- ./doc/bash.1 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 8949,8952 **** +--- 8949,8962 ---- + The default bash behavior remains as in previous versions. + .TP 8 ++ .B direxpand ++ If set, ++ .B bash ++ replaces directory names with the results of word expansion when performing ++ filename completion. This changes the contents of the readline editing ++ buffer. ++ If not set, ++ .B bash ++ attempts to preserve what the user typed. ++ .TP 8 + .B dirspell + If set, +diff -NrC 2 ../bash-4.2-patched/doc/bashref.texi ./doc/bashref.texi +*** ../bash-4.2-patched/doc/bashref.texi 2011-01-16 15:31:57.000000000 -0500 +--- ./doc/bashref.texi 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 4536,4539 **** +--- 4536,4546 ---- + The default Bash behavior remains as in previous versions. + ++ @item direxpand ++ If set, Bash ++ replaces directory names with the results of word expansion when performing ++ filename completion. This changes the contents of the readline editing ++ buffer. ++ If not set, Bash attempts to preserve what the user typed. ++ + @item dirspell + If set, Bash +diff -NrC 2 ../bash-4.2-patched/tests/shopt.right ./tests/shopt.right +*** ../bash-4.2-patched/tests/shopt.right 2010-07-02 23:36:30.000000000 -0400 +--- ./tests/shopt.right 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 13,16 **** +--- 13,17 ---- + shopt -u compat40 + shopt -u compat41 ++ shopt -u direxpand + shopt -u dirspell + shopt -u dotglob +*************** +*** 69,72 **** +--- 70,74 ---- + shopt -u compat40 + shopt -u compat41 ++ shopt -u direxpand + shopt -u dirspell + shopt -u dotglob +*************** +*** 102,105 **** +--- 104,108 ---- + compat40 off + compat41 off ++ direxpand off + dirspell off + dotglob off +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 28 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 29 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-030 b/source/a/bash/bash-4.2-patches/bash42-030 new file mode 100644 index 00000000..261a619b --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-030 @@ -0,0 +1,178 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-030 + +Bug-Reported-by: Roman Rakus +Bug-Reference-ID: <4D7DD91E.7040808@redhat.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00126.html + +Bug-Description: + +When attempting to glob strings in a multibyte locale, and those strings +contain invalid multibyte characters that cause mbsnrtowcs to return 0, +the globbing code loops infinitely. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/glob/xmbsrtowcs.c 2010-05-30 18:36:27.000000000 -0400 +--- lib/glob/xmbsrtowcs.c 2011-03-22 16:06:47.000000000 -0400 +*************** +*** 36,39 **** +--- 36,41 ---- + #if HANDLE_MULTIBYTE + ++ #define WSBUF_INC 32 ++ + #ifndef FREE + # define FREE(x) do { if (x) free (x); } while (0) +*************** +*** 149,153 **** + size_t wcnum; /* Number of wide characters in WSBUF */ + mbstate_t state; /* Conversion State */ +! size_t wcslength; /* Number of wide characters produced by the conversion. */ + const char *end_or_backslash; + size_t nms; /* Number of multibyte characters to convert at one time. */ +--- 151,155 ---- + size_t wcnum; /* Number of wide characters in WSBUF */ + mbstate_t state; /* Conversion State */ +! size_t n, wcslength; /* Number of wide characters produced by the conversion. */ + const char *end_or_backslash; + size_t nms; /* Number of multibyte characters to convert at one time. */ +*************** +*** 172,176 **** + tmp_p = p; + tmp_state = state; +! wcslength = mbsnrtowcs(NULL, &tmp_p, nms, 0, &tmp_state); + + /* Conversion failed. */ +--- 174,189 ---- + tmp_p = p; + tmp_state = state; +! +! if (nms == 0 && *p == '\\') /* special initial case */ +! nms = wcslength = 1; +! else +! wcslength = mbsnrtowcs (NULL, &tmp_p, nms, 0, &tmp_state); +! +! if (wcslength == 0) +! { +! tmp_p = p; /* will need below */ +! tmp_state = state; +! wcslength = 1; /* take a single byte */ +! } + + /* Conversion failed. */ +*************** +*** 187,191 **** + wchar_t *wstmp; + +! wsbuf_size = wcnum+wcslength+1; /* 1 for the L'\0' or the potential L'\\' */ + + wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t)); +--- 200,205 ---- + wchar_t *wstmp; + +! while (wsbuf_size < wcnum+wcslength+1) /* 1 for the L'\0' or the potential L'\\' */ +! wsbuf_size += WSBUF_INC; + + wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t)); +*************** +*** 200,207 **** + + /* Perform the conversion. This is assumed to return 'wcslength'. +! * It may set 'p' to NULL. */ +! mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state); + +! wcnum += wcslength; + + if (mbsinit (&state) && (p != NULL) && (*p == '\\')) +--- 214,229 ---- + + /* Perform the conversion. This is assumed to return 'wcslength'. +! It may set 'p' to NULL. */ +! n = mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state); + +! /* Compensate for taking single byte on wcs conversion failure above. */ +! if (wcslength == 1 && (n == 0 || n == (size_t)-1)) +! { +! state = tmp_state; +! p = tmp_p; +! wsbuf[wcnum++] = *p++; +! } +! else +! wcnum += wcslength; + + if (mbsinit (&state) && (p != NULL) && (*p == '\\')) +*************** +*** 231,236 **** + of DESTP and INDICESP are NULL. */ + +- #define WSBUF_INC 32 +- + size_t + xdupmbstowcs (destp, indicesp, src) +--- 253,256 ---- +*** ../bash-4.2-patched/lib/glob/glob.c 2009-11-14 18:39:30.000000000 -0500 +--- lib/glob/glob.c 2012-07-07 12:09:56.000000000 -0400 +*************** +*** 201,206 **** + size_t pat_n, dn_n; + + pat_n = xdupmbstowcs (&pat_wc, NULL, pat); +! dn_n = xdupmbstowcs (&dn_wc, NULL, dname); + + ret = 0; +--- 201,209 ---- + size_t pat_n, dn_n; + ++ pat_wc = dn_wc = (wchar_t *)NULL; ++ + pat_n = xdupmbstowcs (&pat_wc, NULL, pat); +! if (pat_n != (size_t)-1) +! dn_n = xdupmbstowcs (&dn_wc, NULL, dname); + + ret = 0; +*************** +*** 222,225 **** +--- 225,230 ---- + ret = 1; + } ++ else ++ ret = skipname (pat, dname, flags); + + FREE (pat_wc); +*************** +*** 267,272 **** + n = xdupmbstowcs (&wpathname, NULL, pathname); + if (n == (size_t) -1) +! /* Something wrong. */ +! return; + orig_wpathname = wpathname; + +--- 272,280 ---- + n = xdupmbstowcs (&wpathname, NULL, pathname); + if (n == (size_t) -1) +! { +! /* Something wrong. Fall back to single-byte */ +! udequote_pathname (pathname); +! return; +! } + orig_wpathname = wpathname; + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 29 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 30 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-031 b/source/a/bash/bash-4.2-patches/bash42-031 new file mode 100644 index 00000000..419d4478 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-031 @@ -0,0 +1,80 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-031 + +Bug-Reported-by: Max Horn +Bug-Reference-ID: <20CC5C60-07C3-4E41-9817-741E48D407C5@quendi.de> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2012-06/msg00005.html + +Bug-Description: + +A change between bash-4.1 and bash-4.2 to prevent the readline input hook +from being called too frequently had the side effect of causing delays +when reading pasted input on systems such as Mac OS X. This patch fixes +those delays while retaining the bash-4.2 behavior. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/readline/input.c 2010-05-30 18:33:01.000000000 -0400 +--- lib/readline/input.c 2012-06-25 21:08:42.000000000 -0400 +*************** +*** 410,414 **** + rl_read_key () + { +! int c; + + rl_key_sequence_length++; +--- 412,416 ---- + rl_read_key () + { +! int c, r; + + rl_key_sequence_length++; +*************** +*** 430,441 **** + while (rl_event_hook) + { +! if (rl_gather_tyi () < 0) /* XXX - EIO */ + { + rl_done = 1; + return ('\n'); + } + RL_CHECK_SIGNALS (); +- if (rl_get_char (&c) != 0) +- break; + if (rl_done) /* XXX - experimental */ + return ('\n'); +--- 432,447 ---- + while (rl_event_hook) + { +! if (rl_get_char (&c) != 0) +! break; +! +! if ((r = rl_gather_tyi ()) < 0) /* XXX - EIO */ + { + rl_done = 1; + return ('\n'); + } ++ else if (r == 1) /* read something */ ++ continue; ++ + RL_CHECK_SIGNALS (); + if (rl_done) /* XXX - experimental */ + return ('\n'); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 30 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 31 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-032 b/source/a/bash/bash-4.2-patches/bash42-032 new file mode 100644 index 00000000..d4f25ca0 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-032 @@ -0,0 +1,75 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-032 + +Bug-Reported-by: Ruediger Kuhlmann +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00010.html + +Bug-Description: + +Bash-4.2 has problems with DEL characters in the expanded value of variables +used in the same quoted string as variables that expand to nothing. + +Patch (apply with `patch -p0'): + +*** ../bash-20120427/subst.c 2012-04-22 16:19:10.000000000 -0400 +--- subst.c 2012-05-07 16:06:35.000000000 -0400 +*************** +*** 8152,8155 **** +--- 8152,8163 ---- + dispose_word_desc (tword); + ++ /* Kill quoted nulls; we will add them back at the end of ++ expand_word_internal if nothing else in the string */ ++ if (had_quoted_null && temp && QUOTED_NULL (temp)) ++ { ++ FREE (temp); ++ temp = (char *)NULL; ++ } ++ + goto add_string; + break; +*************** +*** 8556,8560 **** + if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) + tword->flags |= W_QUOTED; +! if (had_quoted_null) + tword->flags |= W_HASQUOTEDNULL; + list = make_word_list (tword, (WORD_LIST *)NULL); +--- 8564,8568 ---- + if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) + tword->flags |= W_QUOTED; +! if (had_quoted_null && QUOTED_NULL (istring)) + tword->flags |= W_HASQUOTEDNULL; + list = make_word_list (tword, (WORD_LIST *)NULL); +*************** +*** 8587,8591 **** + if (word->flags & W_NOEXPAND) + tword->flags |= W_NOEXPAND; +! if (had_quoted_null) + tword->flags |= W_HASQUOTEDNULL; /* XXX */ + list = make_word_list (tword, (WORD_LIST *)NULL); +--- 8595,8599 ---- + if (word->flags & W_NOEXPAND) + tword->flags |= W_NOEXPAND; +! if (had_quoted_null && QUOTED_NULL (istring)) + tword->flags |= W_HASQUOTEDNULL; /* XXX */ + list = make_word_list (tword, (WORD_LIST *)NULL); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 31 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 32 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-033 b/source/a/bash/bash-4.2-patches/bash42-033 new file mode 100644 index 00000000..e58d7286 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-033 @@ -0,0 +1,57 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-033 + +Bug-Reported-by: David Leverton +Bug-Reference-ID: <4FCCE737.1060603@googlemail.com> +Bug-Reference-URL: + +Bug-Description: + +Bash uses a static buffer when expanding the /dev/fd prefix for the test +and conditional commands, among other uses, when it should use a dynamic +buffer to avoid buffer overflow. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/sh/eaccess.c 2011-01-08 20:50:10.000000000 -0500 +--- lib/sh/eaccess.c 2012-06-04 21:06:43.000000000 -0400 +*************** +*** 83,86 **** +--- 83,88 ---- + struct stat *finfo; + { ++ static char *pbuf = 0; ++ + if (*path == '\0') + { +*************** +*** 107,111 **** + On most systems, with the notable exception of linux, this is + effectively a no-op. */ +! char pbuf[32]; + strcpy (pbuf, DEV_FD_PREFIX); + strcat (pbuf, path + 8); +--- 109,113 ---- + On most systems, with the notable exception of linux, this is + effectively a no-op. */ +! pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8)); + strcpy (pbuf, DEV_FD_PREFIX); + strcat (pbuf, path + 8); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 32 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 33 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-034 b/source/a/bash/bash-4.2-patches/bash42-034 new file mode 100644 index 00000000..e4f05e10 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-034 @@ -0,0 +1,46 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-034 + +Bug-Reported-by: "Davide Brini" +Bug-Reference-ID: <20120604164154.69781EC04B@imaps.oficinas.atrapalo.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00030.html + +Bug-Description: + +In bash-4.2, the history code would inappropriately add a semicolon to +multi-line compound array assignments when adding them to the history. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/parse.y 2011-11-21 18:03:36.000000000 -0500 +--- parse.y 2012-06-07 12:48:47.000000000 -0400 +*************** +*** 4900,4905 **** +--- 4916,4924 ---- + return (current_command_line_count == 2 ? "\n" : ""); + } + ++ if (parser_state & PST_COMPASSIGN) ++ return (" "); ++ + /* First, handle some special cases. */ + /*(*/ + /* If we just read `()', assume it's a function definition, and don't +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 33 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 34 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-035 b/source/a/bash/bash-4.2-patches/bash42-035 new file mode 100644 index 00000000..6f0be6f9 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-035 @@ -0,0 +1,66 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-035 + +Bug-Reported-by: Dan Douglas +Bug-Reference-ID: <2766482.Ksm3GrSoYi@smorgbox> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00071.html + +Bug-Description: + +When given a number of lines to read, `mapfile -n lines' reads one too many. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/mapfile.def 2010-05-29 22:09:47.000000000 -0400 +--- builtins/mapfile.def 2012-06-20 09:48:33.000000000 -0400 +*************** +*** 196,206 **** + interrupt_immediately++; + for (array_index = origin, line_count = 1; +! zgetline (fd, &line, &line_length, unbuffered_read) != -1; +! array_index++, line_count++) + { +- /* Have we exceeded # of lines to store? */ +- if (line_count_goal != 0 && line_count > line_count_goal) +- break; +- + /* Remove trailing newlines? */ + if (flags & MAPF_CHOP) +--- 196,202 ---- + interrupt_immediately++; + for (array_index = origin, line_count = 1; +! zgetline (fd, &line, &line_length, unbuffered_read) != -1; +! array_index++) + { + /* Remove trailing newlines? */ + if (flags & MAPF_CHOP) +*************** +*** 218,221 **** +--- 214,222 ---- + + bind_array_element (entry, array_index, line, 0); ++ ++ /* Have we exceeded # of lines to store? */ ++ line_count++; ++ if (line_count_goal != 0 && line_count > line_count_goal) ++ break; + } + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 34 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 35 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-036 b/source/a/bash/bash-4.2-patches/bash42-036 new file mode 100644 index 00000000..73fac408 --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-036 @@ -0,0 +1,92 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-036 + +Bug-Reported-by: gregrwm +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00108.html + +Bug-Description: + +Bash-4.2 produces incorrect word splitting results when expanding +double-quoted $@ in the same string as and adjacent to other variable +expansions. The $@ should be split, the other expansions should not. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2012-05-02 12:02:33.000000000 -0400 +--- subst.c 2012-07-08 21:19:32.000000000 -0400 +*************** +*** 7923,7927 **** + /* State flags */ + int had_quoted_null; +! int has_dollar_at; + int tflag; + int pflags; /* flags passed to param_expand */ +--- 7923,7927 ---- + /* State flags */ + int had_quoted_null; +! int has_dollar_at, temp_has_dollar_at; + int tflag; + int pflags; /* flags passed to param_expand */ +*************** +*** 8128,8138 **** + *expanded_something = 1; + +! has_dollar_at = 0; + pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0; + if (word->flags & W_NOSPLIT2) + pflags |= PF_NOSPLIT2; + tword = param_expand (string, &sindex, quoted, expanded_something, +! &has_dollar_at, "ed_dollar_at, + &had_quoted_null, pflags); + + if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal) +--- 8128,8139 ---- + *expanded_something = 1; + +! temp_has_dollar_at = 0; + pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0; + if (word->flags & W_NOSPLIT2) + pflags |= PF_NOSPLIT2; + tword = param_expand (string, &sindex, quoted, expanded_something, +! &temp_has_dollar_at, "ed_dollar_at, + &had_quoted_null, pflags); ++ has_dollar_at += temp_has_dollar_at; + + if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal) +*************** +*** 8275,8281 **** + temp = (char *)NULL; + +! has_dollar_at = 0; + /* Need to get W_HASQUOTEDNULL flag through this function. */ +! list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &has_dollar_at, (int *)NULL); + + if (list == &expand_word_error || list == &expand_word_fatal) +--- 8276,8283 ---- + temp = (char *)NULL; + +! temp_has_dollar_at = 0; /* XXX */ + /* Need to get W_HASQUOTEDNULL flag through this function. */ +! list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &temp_has_dollar_at, (int *)NULL); +! has_dollar_at += temp_has_dollar_at; + + if (list == &expand_word_error || list == &expand_word_fatal) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 35 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 36 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.2-patches/bash42-037 b/source/a/bash/bash-4.2-patches/bash42-037 new file mode 100644 index 00000000..a12b8a7e --- /dev/null +++ b/source/a/bash/bash-4.2-patches/bash42-037 @@ -0,0 +1,112 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-037 + +Bug-Reported-by: Jakub Filak +Bug-Reference-ID: +Bug-Reference-URL: https://bugzilla.redhat.com/show_bug.cgi?id=813289 + +Bug-Description: + +Attempting to redo (using `.') the vi editing mode `cc', `dd', or `yy' +commands leads to an infinite loop. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/readline/vi_mode.c 2011-02-25 11:17:02.000000000 -0500 +--- lib/readline/vi_mode.c 2012-06-02 12:24:47.000000000 -0400 +*************** +*** 1235,1243 **** + r = rl_domove_motion_callback (_rl_vimvcxt); + } +! else if (vi_redoing) + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) +--- 1297,1313 ---- + r = rl_domove_motion_callback (_rl_vimvcxt); + } +! else if (vi_redoing && _rl_vi_last_motion != 'd') /* `dd' is special */ + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } ++ else if (vi_redoing) /* handle redoing `dd' here */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ rl_mark = rl_end; ++ rl_beg_of_line (1, key); ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++ r = vidomove_dispatch (_rl_vimvcxt); ++ } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) +*************** +*** 1317,1325 **** + r = rl_domove_motion_callback (_rl_vimvcxt); + } +! else if (vi_redoing) + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) +--- 1387,1403 ---- + r = rl_domove_motion_callback (_rl_vimvcxt); + } +! else if (vi_redoing && _rl_vi_last_motion != 'c') /* `cc' is special */ + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } ++ else if (vi_redoing) /* handle redoing `cc' here */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ rl_mark = rl_end; ++ rl_beg_of_line (1, key); ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++ r = vidomove_dispatch (_rl_vimvcxt); ++ } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) +*************** +*** 1378,1381 **** +--- 1456,1472 ---- + r = rl_domove_motion_callback (_rl_vimvcxt); + } ++ else if (vi_redoing && _rl_vi_last_motion != 'y') /* `yy' is special */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ r = rl_domove_motion_callback (_rl_vimvcxt); ++ } ++ else if (vi_redoing) /* handle redoing `yy' here */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ rl_mark = rl_end; ++ rl_beg_of_line (1, key); ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++ r = vidomove_dispatch (_rl_vimvcxt); ++ } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 36 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 37 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash.SlackBuild b/source/a/bash/bash.SlackBuild index 32ce9a40..ecd37b3c 100755 --- a/source/a/bash/bash.SlackBuild +++ b/source/a/bash/bash.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,6 +20,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2011, 2012 by Eric Hameleers for ARM port. + + # Set initial variables: CWD=`pwd` if [ "$TMP" = "" ]; then @@ -31,12 +34,14 @@ VERSION=${VERSION:-$(echo bash-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -48,10 +53,17 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" else SLKCFLAGS="-O2" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + if [ ! -d $TMP ]; then mkdir -p $TMP # location to build the source fi @@ -76,12 +88,18 @@ if [ -d $CWD/bash-${VERSION}-patches ]; then ( cd $CWD/bash-${VERSION}-patches ; cat bash4?-??? ) | patch -p0 --verbose || exit 1 fi +# End of preparations +if echo "$*" | grep -qw -- --prep ; then + exit 0 +fi + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --mandir=/usr/man \ --infodir=/usr/info \ - --build=$ARCH-slackware-linux + --build=$TARGET + make -j4 || make || exit 1 make install DESTDIR=$PKG mv $PKG/usr/share/doc $PKG/usr diff --git a/source/a/btrfs-progs/btrfs-progs.SlackBuild b/source/a/btrfs-progs/btrfs-progs.SlackBuild index ebbd9a53..99dd753d 100755 --- a/source/a/btrfs-progs/btrfs-progs.SlackBuild +++ b/source/a/btrfs-progs/btrfs-progs.SlackBuild @@ -27,13 +27,13 @@ BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} -# Download the btrfs-progs-unstable Git head if there's no tarball: +# Download the btrfs-progs Git head if there's no tarball: if ! /bin/ls $CWD/btrfs-progs*tar* 1> /dev/null 2> /dev/null ; then - git clone git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unstable.git - rm -r btrfs-progs-unstable/.git - tar cf btrfs-progs-$(date +%Y%m%d).tar btrfs-progs-unstable + git clone git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git + rm -r btrfs-progs/.git + tar cf btrfs-progs-$(date +%Y%m%d).tar btrfs-progs xz -9 btrfs-progs-$(date +%Y%m%d).tar - rm -r $CWD/btrfs-progs-unstable + rm -r $CWD/btrfs-progs fi VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -f 3 -d - | cut -f 1 -d .)} @@ -56,9 +56,9 @@ rm -rf $PKG mkdir -p $PKG cd $TMP -rm -rf btrfs-progs-unstable +rm -rf btrfs-progs tar xf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 -cd btrfs-progs-unstable +cd btrfs-progs # Make sure ownerships and permissions are sane: chown -R root:root . @@ -77,9 +77,6 @@ find . -perm 555 -exec chmod 755 {} \; # Build: make $NUMJOBS || make || exit 1 -# Build ext* conversion utility: -make $NUMJOBS convert || make convert || exit 1 - # Install: make install DESTDIR=$PKG || exit 1 diff --git a/source/a/btrfs-progs/slack-desc b/source/a/btrfs-progs/slack-desc index e9088d05..d53953c8 100644 --- a/source/a/btrfs-progs/slack-desc +++ b/source/a/btrfs-progs/slack-desc @@ -11,9 +11,9 @@ btrfs-progs: btrfs-progs: Btrfs is a new copy on write filesystem for Linux aimed at implementing btrfs-progs: advanced features while focusing on fault tolerance, repair and easy btrfs-progs: administration. Initially developed by Oracle, Btrfs is licensed under -btrfs-progs: the GPL and open for contribution from anyone. Btrfs is under heavy -btrfs-progs: development, and is not suitable for any uses other than benchmarking -btrfs-progs: and review. The Btrfs disk format is not yet finalized. +btrfs-progs: the GPL and open for contribution from anyone. +btrfs-progs: +btrfs-progs: btrfs-progs: btrfs-progs: Btrfs homepage: http://btrfs.wiki.kernel.org btrfs-progs: diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild index 86019984..3bd8e521 100755 --- a/source/a/coreutils/coreutils.SlackBuild +++ b/source/a/coreutils/coreutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -90,12 +90,13 @@ zcat $CWD/$PKGNAM.uname.diff.gz | patch -p1 --verbose --backup --suffix=.orig || # Compilation with glibc version later than 2.3.2 needs the environment # variable DEFAULT_POSIX2_VERSION set to 199209. -# Without the next line, the coreutils will start complaining about 'obsolete' +# Without that line, the coreutils will start complaining about 'obsolete' # command switches, like "tail -20" will be considered obsolete. # This behaviour breaks many other packages... the 'obsolete' parameters are # too commonly used to disregard them. Better to stick with the older more # widely accepted standards until things begin to demand the new way. +FORCE_UNSAFE_CONFIGURE=1 \ CFLAGS="$SLKCFLAGS" \ DEFAULT_POSIX2_VERSION=199209 \ ./configure \ @@ -164,10 +165,20 @@ done ( cd $PKG/usr/bin ; ln -sf ../../bin/ginstall ginstall ) ( cd $PKG/usr/man/man1 ; ln -sf install.1 ginstall.1 ) -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/* diff --git a/source/a/cpio/cpio.32bit.crc.diff b/source/a/cpio/cpio.32bit.crc.diff new file mode 100644 index 00000000..8ae94e98 --- /dev/null +++ b/source/a/cpio/cpio.32bit.crc.diff @@ -0,0 +1,111 @@ +From ccec71ec318fdf739f55858d5bffaf4fd6520036 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Mon, 20 Feb 2012 17:51:27 +0000 +Subject: Always use 32 bit CRC + +* src/cpiohdr.h (cpio_file_stat) : Change type to +uint32_t. +* src/extern.h (crc): Change type to uint32_t. +* src/global.c: Likewise. +* src/copyout.c (read_for_checksum): Return uint32_t. +* src/copyin.c: Fix printf formats. +--- +diff --git a/src/copyin.c b/src/copyin.c +index 3ab5dac..3282816 100644 +--- a/src/copyin.c ++++ b/src/copyin.c +@@ -178,7 +178,7 @@ list_file(struct cpio_file_stat* file_hdr, int in_file_des) + #endif + if (crc != file_hdr->c_chksum) + { +- error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"), ++ error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"), + file_hdr->c_name, crc, file_hdr->c_chksum); + } + } +@@ -525,7 +525,7 @@ copyin_regular_file (struct cpio_file_stat* file_hdr, int in_file_des) + if (archive_format == arf_crcascii) + { + if (crc != file_hdr->c_chksum) +- error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"), ++ error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"), + file_hdr->c_name, crc, file_hdr->c_chksum); + } + tape_skip_padding (in_file_des, file_hdr->c_filesize); +@@ -540,7 +540,7 @@ copyin_regular_file (struct cpio_file_stat* file_hdr, int in_file_des) + if (archive_format == arf_crcascii) + { + if (crc != file_hdr->c_chksum) +- error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"), ++ error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"), + file_hdr->c_name, crc, file_hdr->c_chksum); + } + +@@ -1436,7 +1436,7 @@ process_copy_in () + tape_skip_padding (in_file_des, file_hdr.c_filesize); + if (crc != file_hdr.c_chksum) + { +- error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"), ++ error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"), + file_hdr.c_name, crc, file_hdr.c_chksum); + } + /* Debian hack: -v and -V now work with --only-verify-crc. +diff --git a/src/copyout.c b/src/copyout.c +index ab6a243..a5a8931 100644 +--- a/src/copyout.c ++++ b/src/copyout.c +@@ -33,10 +33,10 @@ + /* Read FILE_SIZE bytes of FILE_NAME from IN_FILE_DES and + compute and return a checksum for them. */ + +-static unsigned long ++static uint32_t + read_for_checksum (int in_file_des, int file_size, char *file_name) + { +- unsigned long crc; ++ uint32_t crc; + char buf[BUFSIZ]; + int bytes_left; + int bytes_read; +diff --git a/src/cpiohdr.h b/src/cpiohdr.h +index 86ec988..9aa8ed9 100644 +--- a/src/cpiohdr.h ++++ b/src/cpiohdr.h +@@ -123,7 +123,7 @@ struct cpio_file_stat /* Internal representation of a CPIO header */ + long c_rdev_maj; + long c_rdev_min; + size_t c_namesize; +- unsigned long c_chksum; ++ uint32_t c_chksum; + char *c_name; + char *c_tar_linkname; + }; +diff --git a/src/extern.h b/src/extern.h +index be329ae..ef00242 100644 +--- a/src/extern.h ++++ b/src/extern.h +@@ -75,7 +75,7 @@ extern char *new_media_message_after_number; + extern int archive_des; + extern char *archive_name; + extern char *rsh_command_option; +-extern unsigned long crc; ++extern uint32_t crc; + #ifdef DEBUG_CPIO + extern int debug_flag; + #endif +diff --git a/src/global.c b/src/global.c +index 29e7afc..e08e188 100644 +--- a/src/global.c ++++ b/src/global.c +@@ -144,7 +144,7 @@ char *archive_name = NULL; + char *rsh_command_option = NULL; + + /* CRC checksum. */ +-unsigned long crc; ++uint32_t crc; + + /* Input and output buffers. */ + char *input_buffer, *output_buffer; +-- +cgit v0.9.0.2 + diff --git a/source/a/cpio/cpio.SlackBuild b/source/a/cpio/cpio.SlackBuild index b078d067..5e3eea05 100755 --- a/source/a/cpio/cpio.SlackBuild +++ b/source/a/cpio/cpio.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ PKGNAM=cpio VERSION=$(ls $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -62,7 +62,7 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION || exit 1 -#zcat $CWD/cpio-2.9.gcc43.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/cpio.32bit.crc.diff.gz | patch -p1 -F 3 --verbose || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . diff --git a/source/a/cryptsetup/cryptsetup.SlackBuild b/source/a/cryptsetup/cryptsetup.SlackBuild index 11370fc6..9b874e2a 100755 --- a/source/a/cryptsetup/cryptsetup.SlackBuild +++ b/source/a/cryptsetup/cryptsetup.SlackBuild @@ -33,7 +33,7 @@ # ----------------------------------------------------------------------------- PKGNAM=cryptsetup -VERSION=${VERSION:-1.2.0} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -121,7 +121,20 @@ if [ -r ChangeLog ]; then touch -r ChangeLog $DOCSDIR/ChangeLog fi -find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; || true +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/a/cups/cups.SlackBuild b/source/a/cups/cups.SlackBuild index 7af4bd81..afac9132 100755 --- a/source/a/cups/cups.SlackBuild +++ b/source/a/cups/cups.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,8 @@ # CUPS build script by volkerdi@slackware.com. -VERSION=1.4.6 -BUILD=${BUILD:-1} +VERSION=1.5.4 +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -53,13 +53,11 @@ mkdir -p $TMP $PKG cd $TMP rm -rf cups-$VERSION tar xvf $CWD/cups-$VERSION-source.tar.?z* || exit 1 -cd cups-$VERSION +cd cups-$VERSION || exit 1 -# Fix the USB backend to use either usblp or libusb: -zcat $CWD/usb-backend-both-usblp-and-libusb.dpatch.gz | patch -p1 --verbose || exit 1 - -# Fix locking to avoid crashes with OpenSSL: -zcat $CWD/cups.fix_broken_locking.diff.gz | patch -p1 --verbose || exit 1 +# Fix for CUPS 1.5.4. Don't reload the obsolete usblp module, as this +# can cause partial printing with certain printers. +zcat $CWD/usb-backend-reset-after-job-only-for-specific-devices.patch.gz | patch -p0 --verbose || exit 1 sed -i.orig -e 's#$exec_prefix/lib/cups#$libdir/cups#g' configure ./configure \ @@ -78,6 +76,9 @@ mkdir -p $PKG/etc/cups mkdir -p $PKG/var/spool make BUILDROOT=$PKG install || exit 1 +# Hey, what's with the gigantic test files? Bloat is bad. +rm -f $PKG/usr/share/cups/ipptool/*.{pdf,ps,jpg} + # I've added so many things like /etc/init.d/ to Slackware that CUPS # is now installing init scripts to the Red Hat locations. We'll move # them to the usual locations: @@ -88,17 +89,6 @@ chmod 644 $PKG/etc/rc.d/rc.cups.new # Clear out the additions: rm -rf $PKG/etc/init.d $PKG/etc/rc{0,2,3,5}.d -### OBSOLETE. The USB backend is patched to support usblp again. ### -## From 1.4.x, CUPS no longer uses usblp, and having the module loaded -## will interfere with USB printers. So, we will add a blacklist rule -## so that the module is not loaded: -#mkdir -p $PKG/etc/modprobe.d -#cat << EOF > $PKG/etc/modprobe.d/cups.blacklist.usblp.conf.new -## Do not load the kernel usblp module, since it interferes with -## versions of CUPS 1.4.0 and newer: -#blacklist usblp -#EOF - # I'm not sure if overwriting this blindly could have ill effects, # but it never hurts to play it safe. According to the dbus-daemon # manpage, only files ending in .conf will be used, so there won't diff --git a/source/a/cups/cups.fix_broken_locking.diff b/source/a/cups/cups.fix_broken_locking.diff deleted file mode 100644 index 44f97533..00000000 --- a/source/a/cups/cups.fix_broken_locking.diff +++ /dev/null @@ -1,256 +0,0 @@ -Submitted By: DJ Lucas -Date: 2010-09-13 -Initial Package Version: 1.4.4 -Upstream Status: Unknown -Origin: https://bugzilla.redhat.com/show_bug.cgi?id=553834 -Description: Bug fix for invalid locking with GCrypt. - -diff -Naurp cups-1.4.4-orig/cups/http.c cups-1.4.4/cups/http.c ---- cups-1.4.4-orig/cups/http.c 2010-06-16 00:27:41.000000000 -0500 -+++ cups-1.4.4/cups/http.c 2010-09-13 01:27:03.000000000 -0500 -@@ -83,12 +83,10 @@ - * http_debug_hex() - Do a hex dump of a buffer. - * http_field() - Return the field index for a field name. - * http_read_ssl() - Read from a SSL/TLS connection. -- * http_locking_cb() - Lock/unlock a thread's mutex. - * http_send() - Send a request with all fields and the trailing - * blank line. - * http_setup_ssl() - Set up SSL/TLS support on a connection. - * http_shutdown_ssl() - Shut down SSL/TLS on a connection. -- * http_threadid_cb() - Return the current thread ID. - * http_upgrade() - Force upgrade to TLS encryption. - * http_write() - Write a buffer to a HTTP connection. - * http_write_chunk() - Write a chunked buffer. -@@ -146,19 +144,6 @@ static int http_setup_ssl(http_t *http) - static void http_shutdown_ssl(http_t *http); - static int http_upgrade(http_t *http); - static int http_write_ssl(http_t *http, const char *buf, int len); -- --# ifdef HAVE_GNUTLS --# ifdef HAVE_PTHREAD_H --GCRY_THREAD_OPTION_PTHREAD_IMPL; --# endif /* HAVE_PTHREAD_H */ -- --# elif defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H) --static pthread_mutex_t *http_locks; /* OpenSSL lock mutexes */ -- --static void http_locking_cb(int mode, int type, const char *file, -- int line); --static unsigned long http_threadid_cb(void); --# endif /* HAVE_GNUTLS */ - #endif /* HAVE_SSL */ - - -@@ -1188,22 +1173,21 @@ httpHead(http_t *http, /* I - Conne - void - httpInitialize(void) - { -- static int initialized = 0; /* Have we been called before? */ --#ifdef WIN32 -- WSADATA winsockdata; /* WinSock data */ --#endif /* WIN32 */ - #ifdef HAVE_LIBSSL -- int i; /* Looping var */ -- unsigned char data[1024]; /* Seed data */ -+# ifndef WIN32 -+ struct timeval curtime; /* Current time in microseconds */ -+# endif /* !WIN32 */ -+ int i; /* Looping var */ -+ unsigned char data[1024]; /* Seed data */ - #endif /* HAVE_LIBSSL */ - -- -- if (initialized) -- return; -- - #ifdef WIN32 -- WSAStartup(MAKEWORD(2,2), &winsockdata); -+ WSADATA winsockdata; /* WinSock data */ -+ - -+ static int initialized = 0; /* Has WinSock been initialized? */ -+ if (!initialized) -+ WSAStartup(MAKEWORD(1,1), &winsockdata); - #elif !defined(SO_NOSIGPIPE) - /* - * Ignore SIGPIPE signals... -@@ -1226,21 +1210,15 @@ httpInitialize(void) - #endif /* WIN32 */ - - #ifdef HAVE_GNUTLS -- /* -- * Make sure we handle threading properly... -- */ -- --# ifdef HAVE_PTHREAD_H -- gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); --# endif /* HAVE_PTHREAD_H */ - - /* - * Initialize GNU TLS... - */ - - gnutls_global_init(); -+#endif /* HAVE_GNUTLS */ - --#elif defined(HAVE_LIBSSL) -+#ifdef HAVE_LIBSSL - /* - * Initialize OpenSSL... - */ -@@ -1249,33 +1227,21 @@ httpInitialize(void) - SSL_library_init(); - - /* -- * Set the threading callbacks... -- */ -- --# ifdef HAVE_PTHREAD_H -- http_locks = calloc(CRYPTO_num_locks(), sizeof(pthread_mutex_t)); -- -- for (i = 0; i < CRYPTO_num_locks(); i ++) -- pthread_mutex_init(http_locks + i, NULL); -- -- CRYPTO_set_id_callback(http_threadid_cb); -- CRYPTO_set_locking_callback(http_locking_cb); --# endif /* HAVE_PTHREAD_H */ -- -- /* - * Using the current time is a dubious random seed, but on some systems - * it is the best we can do (on others, this seed isn't even used...) - */ - -- CUPS_SRAND(time(NULL)); -+# ifdef WIN32 -+# else -+ gettimeofday(&curtime, NULL); -+ srand(curtime.tv_sec + curtime.tv_usec); -+# endif /* WIN32 */ - - for (i = 0; i < sizeof(data); i ++) -- data[i] = CUPS_RAND(); -+ data[i] = rand(); - - RAND_seed(data, sizeof(data)); --#endif /* HAVE_GNUTLS */ -- -- initialized = 1; -+#endif /* HAVE_LIBSSL */ - } - - -@@ -2834,25 +2800,6 @@ http_read_ssl(http_t *http, /* I - Conn - #endif /* HAVE_SSL */ - - --#if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H) --/* -- * 'http_locking_cb()' - Lock/unlock a thread's mutex. -- */ -- --static void --http_locking_cb(int mode, /* I - Lock mode */ -- int type, /* I - Lock type */ -- const char *file, /* I - Source file */ -- int line) /* I - Line number */ --{ -- if (mode & CRYPTO_LOCK) -- pthread_mutex_lock(http_locks + type); -- else -- pthread_mutex_unlock(http_locks + type); --} --#endif /* HAVE_LIBSSL && HAVE_PTHREAD_H */ -- -- - /* - * 'http_send()' - Send a request with all fields and the trailing blank line. - */ -@@ -3224,19 +3171,6 @@ http_shutdown_ssl(http_t *http) /* I - - #endif /* HAVE_SSL */ - - --#if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H) --/* -- * 'http_threadid_cb()' - Return the current thread ID. -- */ -- --static unsigned long /* O - Thread ID */ --http_threadid_cb(void) --{ -- return ((unsigned long)pthread_self()); --} --#endif /* HAVE_LIBSSL && HAVE_PTHREAD_H */ -- -- - #ifdef HAVE_SSL - /* - * 'http_upgrade()' - Force upgrade to TLS encryption. -diff -Naurp cups-1.4.4-orig/cups/http-private.h cups-1.4.4/cups/http-private.h ---- cups-1.4.4-orig/cups/http-private.h 2010-04-11 23:03:53.000000000 -0500 -+++ cups-1.4.4/cups/http-private.h 2010-09-13 01:27:24.000000000 -0500 -@@ -98,7 +98,6 @@ extern BIO_METHOD *_httpBIOMethods(void) - * The GNU TLS library is more of a "bare metal" SSL/TLS library... - */ - # include --# include - - typedef struct - { -diff -Naurp cups-1.4.4-orig/scheduler/main.c cups-1.4.4/scheduler/main.c ---- cups-1.4.4-orig/scheduler/main.c 2010-04-23 13:56:34.000000000 -0500 -+++ cups-1.4.4/scheduler/main.c 2010-09-13 01:27:36.000000000 -0500 -@@ -549,8 +549,6 @@ main(int argc, /* I - Number of comm - * Startup the server... - */ - -- httpInitialize(); -- - cupsdStartServer(); - - /* -diff -Naurp cups-1.4.4-orig/scheduler/server.c cups-1.4.4/scheduler/server.c ---- cups-1.4.4-orig/scheduler/server.c 2010-04-11 23:03:53.000000000 -0500 -+++ cups-1.4.4/scheduler/server.c 2010-09-13 01:27:49.000000000 -0500 -@@ -44,6 +44,42 @@ static int started = 0; - void - cupsdStartServer(void) - { -+#ifdef HAVE_LIBSSL -+ int i; /* Looping var */ -+ struct timeval curtime; /* Current time in microseconds */ -+ unsigned char data[1024]; /* Seed data */ -+#endif /* HAVE_LIBSSL */ -+ -+ -+#ifdef HAVE_LIBSSL -+ /* -+ * Initialize the encryption libraries... -+ */ -+ -+ SSL_library_init(); -+ SSL_load_error_strings(); -+ -+ /* -+ * Using the current time is a dubious random seed, but on some systems -+ * it is the best we can do (on others, this seed isn't even used...) -+ */ -+ -+ gettimeofday(&curtime, NULL); -+ srand(curtime.tv_sec + curtime.tv_usec); -+ -+ for (i = 0; i < sizeof(data); i ++) -+ data[i] = rand(); /* Yes, this is a poor source of random data... */ -+ -+ RAND_seed(&data, sizeof(data)); -+#elif defined(HAVE_GNUTLS) -+ /* -+ * Initialize the encryption libraries... -+ */ -+ -+ gnutls_global_init(); -+#endif /* HAVE_LIBSSL */ -+ -+ - /* - * Create the default security profile... - */ diff --git a/source/a/cups/cups.url b/source/a/cups/cups.url new file mode 100644 index 00000000..fc83aeb6 --- /dev/null +++ b/source/a/cups/cups.url @@ -0,0 +1 @@ +http://ftp.easysw.com/pub/cups/1.5.4/cups-1.5.4-source.tar.bz2 diff --git a/source/a/cups/usb-backend-both-usblp-and-libusb.dpatch b/source/a/cups/usb-backend-both-usblp-and-libusb.dpatch deleted file mode 100644 index 88ae9d07..00000000 --- a/source/a/cups/usb-backend-both-usblp-and-libusb.dpatch +++ /dev/null @@ -1,574 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## usb-backend-both-usblp-and-libusb.dpatch by -## -## DP: http://www.cups.org/str.php?L3357 - -@DPATCH@ -diff -urNad cups-1.4.3~/backend/Makefile cups-1.4.3/backend/Makefile ---- cups-1.4.3~/backend/Makefile 2010-04-09 15:56:03.735720821 +0200 -+++ cups-1.4.3/backend/Makefile 2010-04-09 15:56:04.335705387 +0200 -@@ -267,7 +267,7 @@ - echo Linking $@... - $(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \ - $(BACKLIBS) $(LIBS) --usb.o: usb.c usb-darwin.c usb-libusb.c usb-unix.c -+usb.o: usb.c usb-darwin.c usb-hybrid.c usb-libusb.c usb-unix.c - - - # -diff -urNad cups-1.4.3~/backend/ieee1284.c cups-1.4.3/backend/ieee1284.c ---- cups-1.4.3~/backend/ieee1284.c 2009-12-08 03:13:42.000000000 +0100 -+++ cups-1.4.3/backend/ieee1284.c 2010-04-09 15:56:04.335705387 +0200 -@@ -255,6 +255,7 @@ - cups_option_t *values; /* Keys and values in device ID */ - const char *mfg, /* Manufacturer */ - *mdl, /* Model */ -+ *des, /* Description */ - *sern; /* Serial number */ - char temp[256], /* Temporary manufacturer string */ - *tempptr; /* Pointer into temp string */ -@@ -285,10 +286,20 @@ - } - else - { -- strlcpy(temp, make_model, sizeof(temp)); -+ /* -+ * No manufacturer? Use the model string or description... -+ */ -+ -+ if (mdl) -+ _ppdNormalizeMakeAndModel(mdl, temp, sizeof(temp)); -+ else if ((des = cupsGetOption("DESCRIPTION", num_values, values)) != NULL || -+ (des = cupsGetOption("DES", num_values, values)) != NULL) -+ _ppdNormalizeMakeAndModel(des, temp, sizeof(temp)); -+ else -+ strlcpy(temp, "Unknown", sizeof(temp)); - - if ((tempptr = strchr(temp, ' ')) != NULL) -- *tempptr = '\0'; -+ *tempptr = '\0'; - - mfg = temp; - } -diff -urNad cups-1.4.3~/backend/usb-hybrid.c cups-1.4.3/backend/usb-hybrid.c ---- cups-1.4.3~/backend/usb-hybrid.c 1970-01-01 01:00:00.000000000 +0100 -+++ cups-1.4.3/backend/usb-hybrid.c 2010-04-09 15:56:04.345707078 +0200 -@@ -0,0 +1,87 @@ -+/* -+ * "$Id: usb-hybrid.c 8807 2009-08-31 18:45:43Z mike $" -+ * -+ * USB port backend for the Common UNIX Printing System (CUPS). -+ * -+ * This file is included from "usb.c" when compiled on Linux. -+ * -+ * Copyright 2007-2008 by Apple Inc. -+ * Copyright 1997-2007 by Easy Software Products, all rights reserved. -+ * -+ * These coded instructions, statements, and computer programs are the -+ * property of Apple Inc. and are protected by Federal copyright -+ * law. Distribution and use rights are outlined in the file "LICENSE.txt" -+ * "LICENSE" which should have been included with this file. If this -+ * file is missing or damaged, see the license at "http://www.cups.org/". -+ * -+ * This file is subject to the Apple OS-Developed Software exception. -+ * -+ * Contents: -+ * -+ * print_device() - Print a file to a USB device. -+ * list_devices() - List all USB devices. -+ */ -+ -+/* -+ * Include necessary headers. -+ */ -+ -+#include -+ -+/* -+ * Include the two USB implementations used under Linux ... -+ */ -+ -+#include "usb-libusb.c" -+#include "usb-unix.c" -+ -+/* -+ * 'print_device()' - Print a file to a USB device. -+ */ -+ -+int /* O - Exit status */ -+print_device(const char *uri, /* I - Device URI */ -+ const char *hostname, /* I - Hostname/manufacturer */ -+ const char *resource, /* I - Resource/modelname */ -+ char *options, /* I - Device options/serial number */ -+ int print_fd, /* I - File descriptor to print */ -+ int copies, /* I - Copies to print */ -+ int argc, /* I - Number of command-line arguments (6 or 7) */ -+ char *argv[]) /* I - Command-line arguments */ -+{ -+ int result; -+ for(;;) -+ { -+ result = print_device_unix(uri, hostname, resource, options, print_fd, -+ copies, argc, argv); -+ if (result == -1) -+ { -+ result = print_device_libusb(uri, hostname, resource, options, print_fd, -+ copies, argc, argv); -+ if (result == -1) -+ sleep(5); -+ else -+ return(result); -+ } -+ else -+ return(result); -+ } -+} -+ -+/* -+ * 'list_devices()' - List all USB devices. -+ */ -+ -+void -+list_devices(void) -+{ -+ /* Try both discovery methods, each device will appear only under one -+ of them */ -+ list_devices_libusb(); -+ list_devices_unix(); -+} -+ -+ -+/* -+ * End of "$Id: usb-hybrid.c 8807 2009-08-31 18:45:43Z mike $". -+ */ -diff -urNad cups-1.4.3~/backend/usb-libusb.c cups-1.4.3/backend/usb-libusb.c ---- cups-1.4.3~/backend/usb-libusb.c 2009-09-11 22:03:31.000000000 +0200 -+++ cups-1.4.3/backend/usb-libusb.c 2010-04-09 15:56:04.345707078 +0200 -@@ -13,16 +13,16 @@ - * - * Contents: - * -- * list_devices() - List the available printers. -- * print_device() - Print a file to a USB device. -+ * list_devices_libusb() - List the available printers. -+ * print_device_libusb() - Print a file to a USB device. - * close_device() - Close the connection to the USB printer. - * find_device() - Find or enumerate USB printers. - * get_device_id() - Get the IEEE-1284 device ID for the printer. - * list_cb() - List USB printers for discovery. - * make_device_uri() - Create a device URI for a USB printer. -- * open_device() - Open a connection to the USB printer. -+ * open_device_libusb() - Open a connection to the USB printer. - * print_cb() - Find a USB printer for printing. -- * side_cb() - Handle side-channel requests. -+ * side_cb_libusb() - Handle side-channel requests. - */ - - /* -@@ -65,30 +65,30 @@ - static char *make_device_uri(usb_printer_t *printer, - const char *device_id, - char *uri, size_t uri_size); --static int open_device(usb_printer_t *printer, int verbose); -+static int open_device_libusb(usb_printer_t *printer, int verbose); - static int print_cb(usb_printer_t *printer, const char *device_uri, - const char *device_id, const void *data); --static ssize_t side_cb(usb_printer_t *printer, int print_fd); -+static ssize_t side_cb_libusb(usb_printer_t *printer, int print_fd); - - - /* -- * 'list_devices()' - List the available printers. -+ * 'list_devices_libusb()' - List the available printers. - */ - - void --list_devices(void) -+list_devices_libusb(void) - { -- fputs("DEBUG: list_devices\n", stderr); -+ fputs("DEBUG: list_devices_libusb\n", stderr); - find_device(list_cb, NULL); - } - - - /* -- * 'print_device()' - Print a file to a USB device. -+ * 'print_device_libusb()' - Print a file to a USB device. - */ - - int /* O - Exit status */ --print_device(const char *uri, /* I - Device URI */ -+print_device_libusb(const char *uri, /* I - Device URI */ - const char *hostname, /* I - Hostname/manufacturer */ - const char *resource, /* I - Resource/modelname */ - char *options, /* I - Device options/serial number */ -@@ -105,19 +105,23 @@ - struct pollfd pfds[2]; /* Poll descriptors */ - - -- fputs("DEBUG: print_device\n", stderr); -+ fputs("DEBUG: print_device_libusb\n", stderr); - - /* - * Connect to the printer... - */ - -+#if defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) -+ if ((printer = find_device(print_cb, uri)) == NULL) -+ return(-1); -+#else - while ((printer = find_device(print_cb, uri)) == NULL) - { - _cupsLangPuts(stderr, - _("INFO: Waiting for printer to become available...\n")); - sleep(5); - } -- -+#endif - - /* - * If we are printing data from a print driver on stdin, ignore SIGTERM -@@ -189,7 +193,7 @@ - - if (pfds[1].revents & (POLLIN | POLLHUP)) - { -- if ((bytes = side_cb(printer, print_fd)) < 0) -+ if ((bytes = side_cb_libusb(printer, print_fd)) < 0) - pfds[1].events = 0; /* Filter has gone away... */ - else - tbytes += bytes; -@@ -359,7 +363,7 @@ - printer.iface = iface; - printer.handle = NULL; - -- if (!open_device(&printer, data != NULL)) -+ if (!open_device_libusb(&printer, data != NULL)) - { - if (!get_device_id(&printer, device_id, sizeof(device_id))) - { -@@ -583,6 +587,14 @@ - mfg = tempmfg; - } - -+ if (!strncasecmp(mdl, mfg, strlen(mfg))) -+ { -+ mdl += strlen(mfg); -+ -+ while (isspace(*mdl & 255)) -+ mdl ++; -+ } -+ - /* - * Generate the device URI from the manufacturer, model, serial number, - * and interface number... -@@ -611,11 +623,11 @@ - - - /* -- * 'open_device()' - Open a connection to the USB printer. -+ * 'open_device_libusb()' - Open a connection to the USB printer. - */ - - static int /* O - 0 on success, -1 on error */ --open_device(usb_printer_t *printer, /* I - Printer */ -+open_device_libusb(usb_printer_t *printer, /* I - Printer */ - int verbose) /* I - Update connecting-to-device state? */ - { - int number; /* Configuration/interface/altset numbers */ -@@ -733,16 +745,73 @@ - const char *device_id, /* I - IEEE-1284 device ID */ - const void *data) /* I - User data (make, model, S/N) */ - { -- return (!strcmp((char *)data, device_uri)); -+ char *uri = (char *)data, -+ *str1, -+ *str2, -+ buf[255], -+ requested_uri[1024]; -+ -+ /* Work on a copy of uri */ -+ strncpy(requested_uri, uri, sizeof(requested_uri)); -+ requested_uri[sizeof(requested_uri) - 1] = '\0'; -+ -+ /* -+ * libusb-discovered URIs can have an "interface" specification and this -+ * never happens for usblp-discovered URIs, so remove the "interface" -+ * specification from the URI which we are checking currently. This way a -+ * queue for a usblp-discovered printer can now be accessed via libusb -+ */ -+ if (((str1 = strstr(requested_uri, "interface=")) == NULL) && -+ ((str2 = strstr(device_uri, "interface=")) != NULL)) -+ { -+ *(str2 - 1) = '\0'; -+ } -+ -+ /* -+ * Old URI with "serial=?". Cut this part off and consider this as -+ * an URI without serial number -+ */ -+ if ((str1 = strstr(requested_uri, "serial=?")) != NULL) -+ *(str1 - 1) = '\0'; -+ -+ /* -+ * Old URI without serial number. Match it also with URIs with serial -+ * number -+ */ -+ if (((str1 = strstr(requested_uri, "serial=")) == NULL) && -+ ((str2 = strstr(device_uri, "serial=")) != NULL)) -+ *(str2 - 1) = '\0'; -+ -+ /* -+ * libusb-discovered URIs can have a "serial" specification when the -+ * usblp-discovered URI for the same printer does not have one, as -+ * with libusb we can discover serial numbers also with other methods -+ * than only via the device ID. Therefore we accept also a -+ * usblp-discovered printer without serial number as a match. This we -+ * do by removing the serial number from the queue's (libusb-discovered) -+ * URI before comparing. Also warn the user because of the incapability -+ * of the usblp-based access to distinguish printers by the serial -+ * number. -+ */ -+ if (((str1 = strstr(requested_uri, "serial=")) == NULL) && -+ ((str2 = strstr(device_uri, "serial=")) != NULL)) -+ { -+ *(str2 - 1) = '\0'; -+ if (backendGetMakeModel(device_id, buf, sizeof(buf)) == 0) -+ fprintf(stderr, "WARNING: If you have more than one %s printer connected to this machine, please make sure that the \"usblp\" kernel module is always unloaded (and blacklisted) and re-create the queues for these printers. Otherwise CUPS will not be able to distinguish them.\n", -+ buf); -+ } -+ -+ return (!strcmp(requested_uri, device_uri)); - } - - - /* -- * 'side_cb()' - Handle side-channel requests. -+ * 'side_cb_libusb()' - Handle side-channel requests. - */ - - static ssize_t /* O - Number of bytes written */ --side_cb(usb_printer_t *printer, /* I - Printer */ -+side_cb_libusb(usb_printer_t *printer, /* I - Printer */ - int print_fd) /* I - File to print */ - { - ssize_t bytes, /* Bytes read/written */ -diff -urNad cups-1.4.3~/backend/usb-unix.c cups-1.4.3/backend/usb-unix.c ---- cups-1.4.3~/backend/usb-unix.c 2009-12-08 03:13:42.000000000 +0100 -+++ cups-1.4.3/backend/usb-unix.c 2010-04-09 15:56:30.799666933 +0200 -@@ -18,10 +18,10 @@ - * - * Contents: - * -- * print_device() - Print a file to a USB device. -- * list_devices() - List all USB devices. -- * open_device() - Open a USB device... -- * side_cb() - Handle side-channel requests... -+ * print_device_unix() - Print a file to a USB device. -+ * list_devices_unix() - List all USB devices. -+ * open_device_unix() - Open a USB device... -+ * side_cb_unix() - Handle side-channel requests... - */ - - /* -@@ -35,17 +35,17 @@ - * Local functions... - */ - --static int open_device(const char *uri, int *use_bc); --static int side_cb(int print_fd, int device_fd, int snmp_fd, -+static int open_device_unix(const char *uri, int *use_bc); -+static int side_cb_unix(int print_fd, int device_fd, int snmp_fd, - http_addr_t *addr, int use_bc); - - - /* -- * 'print_device()' - Print a file to a USB device. -+ * 'print_device_unix()' - Print a file to a USB device. - */ - - int /* O - Exit status */ --print_device(const char *uri, /* I - Device URI */ -+print_device_unix(const char *uri, /* I - Device URI */ - const char *hostname, /* I - Hostname/manufacturer */ - const char *resource, /* I - Resource/modelname */ - char *options, /* I - Device options/serial number */ -@@ -102,7 +102,7 @@ - strncasecmp(hostname, "Minolta", 7); - #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */ - -- if ((device_fd = open_device(uri, &use_bc)) == -1) -+ if ((device_fd = open_device_unix(uri, &use_bc)) == -1) - { - if (getenv("CLASS") != NULL) - { -@@ -132,6 +132,10 @@ - _("INFO: Printer busy; will retry in 10 seconds...\n")); - sleep(10); - } -+#ifdef HAVE_USB_H -+ else -+ return (-1); -+#else - else if (errno == ENXIO || errno == EIO || errno == ENOENT || - errno == ENODEV) - { -@@ -147,6 +151,7 @@ - resource, strerror(errno)); - return (CUPS_BACKEND_FAILED); - } -+#endif - } - } - while (device_fd < 0); -@@ -190,7 +195,7 @@ - tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, NULL); - - #else -- tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb); -+ tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb_unix); - #endif /* __sun */ - - if (print_fd != 0 && tbytes >= 0) -@@ -214,11 +219,11 @@ - - - /* -- * 'list_devices()' - List all USB devices. -+ * 'list_devices_unix()' - List all USB devices. - */ - - void --list_devices(void) -+list_devices_unix(void) - { - #ifdef __linux - int i; /* Looping var */ -@@ -320,11 +325,11 @@ - - - /* -- * 'open_device()' - Open a USB device... -+ * 'open_device_unix()' - Open a USB device... - */ - - static int /* O - File descriptor or -1 on error */ --open_device(const char *uri, /* I - Device URI */ -+open_device_unix(const char *uri, /* I - Device URI */ - int *use_bc) /* O - Set to 0 for unidirectional */ - { - int fd; /* File descriptor */ -@@ -357,9 +362,12 @@ - char device[255], /* Device filename */ - device_id[1024], /* Device ID string */ - make_model[1024], /* Make and model */ -- device_uri[1024]; /* Device URI string */ -- -+ device_uri[1024], /* Device URI string */ -+ requested_uri[1024], /* Device URI string */ -+ *str1, -+ *str2; - -+ - /* - * Find the correct USB device... - */ -@@ -407,7 +415,55 @@ - device_uri[0] = '\0'; - } - -- if (!strcmp(uri, device_uri)) -+ /* Work on a copy of uri */ -+ strncpy(requested_uri, uri, sizeof(requested_uri)); -+ requested_uri[sizeof(requested_uri) - 1] = '\0'; -+ -+ /* -+ * libusb-discovered URIs can have an "interface" specification and this -+ * never happens for usblp-discovered URIs, so remove the "interface" -+ * specification from the URI of the print queue. This way a queue for -+ * a libusb-discovered printer can now be accessed via the usblip kernel -+ * module -+ */ -+ if ((str1 = strstr(requested_uri, "interface=")) != NULL) -+ *(str1 - 1) = '\0'; -+ -+ /* -+ * Old URI with "serial=?". Cut this part off and consider this as -+ * an URI without serial number -+ */ -+ if ((str1 = strstr(requested_uri, "serial=?")) != NULL) -+ *(str1 - 1) = '\0'; -+ -+ /* -+ * Old URI without serial number. Match it also with URIs with serial -+ * number -+ */ -+ if (((str1 = strstr(requested_uri, "serial=")) == NULL) && -+ ((str2 = strstr(device_uri, "serial=")) != NULL)) -+ *(str2 - 1) = '\0'; -+ -+ /* -+ * libusb-discovered URIs can have a "serial" specification when the -+ * usblp-discovered URI for the same printer does not have one, as -+ * with libusb we can discover serial numbers also with other methods -+ * than only via the device ID. Therefore we accept also a -+ * usblp-discovered printer without serial number as a match. This we -+ * do by removing the serial number from the queue's (libusb-discovered) -+ * URI before comparing. Also warn the user because of the incapability -+ * of the usblp-based access to distinguish printers by the serial -+ * number. -+ */ -+ if (((str1 = strstr(requested_uri, "serial=")) != NULL) && -+ ((str2 = strstr(device_uri, "serial=")) == NULL)) -+ { -+ *(str1 - 1) = '\0'; -+ fprintf(stderr, "WARNING: If you have more than one %s printer connected to this machine, please unload (and blacklist) the \"usblp\" kernel module as otherwise CUPS will not be able to distinguish your printers.\n", -+ make_model); -+ } -+ -+ if (!strcmp(requested_uri, device_uri)) - { - /* - * Yes, return this file descriptor... -@@ -433,10 +489,14 @@ - */ - - if (busy) -+ { - _cupsLangPuts(stderr, - _("INFO: Printer busy; will retry in 5 seconds...\n")); - -- sleep(5); -+ sleep(5); -+ } -+ else -+ return -1; - } - } - #elif defined(__sun) && defined(ECPPIOC_GETDEVID) -@@ -557,11 +617,11 @@ - - - /* -- * 'side_cb()' - Handle side-channel requests... -+ * 'side_cb_unix()' - Handle side-channel requests... - */ - - static int /* O - 0 on success, -1 on error */ --side_cb(int print_fd, /* I - Print file */ -+side_cb_unix(int print_fd, /* I - Print file */ - int device_fd, /* I - Device file */ - int snmp_fd, /* I - SNMP socket (unused) */ - http_addr_t *addr, /* I - Device address (unused) */ -diff -urNad cups-1.4.3~/backend/usb.c cups-1.4.3/backend/usb.c ---- cups-1.4.3~/backend/usb.c 2008-06-24 03:28:36.000000000 +0200 -+++ cups-1.4.3/backend/usb.c 2010-04-09 15:56:04.345707078 +0200 -@@ -56,7 +56,7 @@ - */ - - #ifdef HAVE_USB_H --# include "usb-libusb.c" -+# include "usb-hybrid.c" - #elif defined(__APPLE__) - # include "usb-darwin.c" - #elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) diff --git a/source/a/cups/usb-backend-reset-after-job-only-for-specific-devices.patch b/source/a/cups/usb-backend-reset-after-job-only-for-specific-devices.patch new file mode 100644 index 00000000..dcf91c83 --- /dev/null +++ b/source/a/cups/usb-backend-reset-after-job-only-for-specific-devices.patch @@ -0,0 +1,74 @@ +--- backend/usb-libusb.c.orig 2012-07-16 19:10:55.000000000 +0200 ++++ backend/usb-libusb.c 2012-08-06 11:01:58.034150159 +0200 +@@ -70,7 +70,7 @@ + read_endp, /* Read endpoint */ + protocol, /* Protocol: 1 = Uni-di, 2 = Bi-di. */ + usblp_attached, /* "usblp" kernel module attached? */ +- opened_for_job; /* Set to 1 by print_device() */ ++ reset_after_job; /* Set to 1 by print_device() */ + unsigned int quirks; /* Quirks flags */ + struct libusb_device_handle *handle; /* Open handle to device */ + } usb_printer_t; +@@ -122,6 +122,8 @@ + #define USBLP_QUIRK_USB_INIT 0x2 /* needs vendor USB init string */ + #define USBLP_QUIRK_BAD_CLASS 0x4 /* descriptor uses vendor-specific + Class or SubClass */ ++#define USBLP_QUIRK_RESET 0x4000 /* After printing do a reset ++ for clean-up */ + #define USBLP_QUIRK_NO_REATTACH 0x8000 /* After printing we cannot re-attach + the usblp kernel module */ + +@@ -147,9 +149,11 @@ + { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt + Printer M129C */ + { 0x067b, 0x2305, USBLP_QUIRK_BIDIR | +- USBLP_QUIRK_NO_REATTACH }, ++ USBLP_QUIRK_NO_REATTACH | ++ USBLP_QUIRK_RESET }, + /* Prolific Technology, Inc. PL2305 Parallel Port + (USB -> Parallel adapter) */ ++ { 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices */ + { 0, 0 } + }; + +@@ -256,7 +260,12 @@ + } + + g.print_fd = print_fd; +- g.printer->opened_for_job = 1; ++ ++ /* ++ * Some devices need a reset after finishing a job, these devices are ++ * marked with the USBLP_QUIRK_RESET quirk. ++ */ ++ g.printer->reset_after_job = (g.printer->quirks & USBLP_QUIRK_RESET ? 1 : 0); + + /* + * If we are printing data from a print driver on stdin, ignore SIGTERM +@@ -772,7 +781,7 @@ + * Reset the device to clean up after the job + */ + +- if (printer->opened_for_job == 1) ++ if (printer->reset_after_job == 1) + { + if ((errcode = libusb_reset_device(printer->handle)) < 0) + fprintf(stderr, +@@ -1288,7 +1297,7 @@ + } + + printer->usblp_attached = 0; +- printer->opened_for_job = 0; ++ printer->reset_after_job = 0; + + if (verbose) + fputs("STATE: +connecting-to-device\n", stderr); +@@ -1586,7 +1595,7 @@ + for (i = 0; quirk_printers[i].vendorId; i++) + { + if (vendor == quirk_printers[i].vendorId && +- product == quirk_printers[i].productId) ++ (product == 0x0000 || product == quirk_printers[i].productId)) + return quirk_printers[i].quirks; + } + return 0; diff --git a/source/a/cxxlibs/cxxlibs.SlackBuild b/source/a/cxxlibs/cxxlibs.SlackBuild index eff5d26c..b795d273 100755 --- a/source/a/cxxlibs/cxxlibs.SlackBuild +++ b/source/a/cxxlibs/cxxlibs.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ PKGNAM=cxxlibs -VERSION=${VERSION:-6.0.14} +VERSION=${VERSION:-6.0.17} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/a/cxxlibs/symlinks-to-tracked-libs b/source/a/cxxlibs/symlinks-to-tracked-libs index e4f67cf6..39ff58e3 100644 --- a/source/a/cxxlibs/symlinks-to-tracked-libs +++ b/source/a/cxxlibs/symlinks-to-tracked-libs @@ -1,5 +1,2 @@ -/usr/i486-slackware-linux/lib/libstdc++-libc6.1-2.so.3 -/usr/i486-slackware-linux/lib/libstdc++-libc6.2-2.so.3 -/usr/i486-slackware-linux/lib/libstdc++.so.4 -/usr/i486-slackware-linux/lib/libstdc++.so.5 +/usr/lib/libstdc++.so.5 /usr/lib/libstdc++.so.6 diff --git a/source/a/dbus/dbus.SlackBuild b/source/a/dbus/dbus.SlackBuild index b11340cd..bd6acd99 100755 --- a/source/a/dbus/dbus.SlackBuild +++ b/source/a/dbus/dbus.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007-2010 Robby Workman, Northport, Alabama, USA -# Copyright 2007-2010 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2007-2012 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=dbus VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -69,6 +69,7 @@ find . \ -exec chmod 644 {} \; zcat $CWD/dbus-1.4.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/dbus.set.home.diff.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -80,9 +81,11 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --infodir=/usr/info \ --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-doxygen-docs \ --enable-shared=yes \ --enable-static=no \ --enable-inotify \ + --enable-x11-autolaunch \ --with-system-pid-file=/var/run/dbus/dbus.pid \ --with-system-socket=/var/run/dbus/system_bus_socket \ --with-init-scripts=slackware \ @@ -94,8 +97,20 @@ make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi # Install a custom init script for dbus - the included one is not good for us rm $PKG/etc/rc.d/* @@ -112,6 +127,14 @@ cp -a \ $PKG/usr/doc/$PKGNAM-$VERSION find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \; +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/a/dbus/dbus.set.home.diff b/source/a/dbus/dbus.set.home.diff new file mode 100644 index 00000000..5c0f7976 --- /dev/null +++ b/source/a/dbus/dbus.set.home.diff @@ -0,0 +1,22 @@ +Set HOME environment variable when switching user. + +2011-08-05 Egor Y. Egorov + +References: +https://bugs.freedesktop.org/show_bug.cgi?id=39857 +https://bugs.kde.org/show_bug.cgi?id=249217#c27 + +diff --git a/bus/activation-helper.c b/bus/activation-helper.c +index baba8f0..b75ea7c 100644 +--- a/bus/activation-helper.c ++++ b/bus/activation-helper.c +@@ -344,6 +344,8 @@ switch_user (char *user, DBusError *error) + "cannot setuid user %i", pw->pw_uid); + return FALSE; + } ++ ++ _dbus_setenv ("HOME", pw->pw_dir); + #endif + return TRUE; + } + diff --git a/source/a/dbus/rc.messagebus b/source/a/dbus/rc.messagebus index 7b27eb59..fb035af5 100644 --- a/source/a/dbus/rc.messagebus +++ b/source/a/dbus/rc.messagebus @@ -16,7 +16,8 @@ PIDFILE=/var/run/dbus/dbus.pid start() { - if ! ps axc | grep -w dbus-daemon ; then + mkdir -p $(dirname $PIDFILE) + if ! ps -u messagebus -c | grep -wq dbus-daemon; then rm -f $(dirname $PIDFILE)/* if [ -x /usr/bin/dbus-uuidgen -a -x /usr/bin/dbus-daemon ] ; then echo "Starting system message bus: /usr/bin/dbus-uuidgen --ensure ; /usr/bin/dbus-daemon --system" @@ -48,10 +49,10 @@ reload() { } status() { - if ps axc | grep -wq dbus-daemon 2>/dev/null ; then - echo "dbus-daemon is running." + if ps -u messagebus -c | grep -wq dbus-daemon; then + echo "System dbus-daemon is running." else - echo "dbus is stopped." + echo "System dbus-daemon is stopped." fi } @@ -66,6 +67,7 @@ case "$1" in restart) stop start + echo "You may need to restart your Window Manager to reconnect to the system dbus." ;; reload) reload diff --git a/source/a/dcron/crontab.c.O_EXCL.diff b/source/a/dcron/crontab.c.O_EXCL.diff index 7acd5ce2..f705487e 100644 --- a/source/a/dcron/crontab.c.O_EXCL.diff +++ b/source/a/dcron/crontab.c.O_EXCL.diff @@ -1,5 +1,6 @@ ---- ./crontab.c.orig 2010-01-18 09:27:31.000000000 -0600 -+++ ./crontab.c 2010-02-11 16:38:03.000000000 -0600 +diff -Nur dcron-4.5.orig//crontab.c dcron-4.5/crontab.c +--- dcron-4.5.orig//crontab.c 2011-05-01 07:22:09.000000000 -0500 ++++ dcron-4.5/crontab.c 2011-08-22 16:26:46.778225447 -0500 @@ -199,7 +199,7 @@ * Read from repFd, write to fd for "$CDir/$USER.new" */ diff --git a/source/a/dcron/crontab.root b/source/a/dcron/crontab.root index b5b42562..5b0ce8cb 100644 --- a/source/a/dcron/crontab.root +++ b/source/a/dcron/crontab.root @@ -1,7 +1,7 @@ # If you don't want the output of a cron job mailed to you, you have to direct # any output to /dev/null. We'll do this here since these jobs should run -# properly on a newly installed system, but if they don't the average newbie -# might get quite perplexed about getting strange mail every 5 minutes. :^) +# properly on a newly installed system. If a script fails, run-parts will +# mail a notice to root. # # Run the hourly, daily, weekly, and monthly cron jobs. # Jobs that need different timing may be entered into the crontab as before, diff --git a/source/a/dcron/dcron.SlackBuild b/source/a/dcron/dcron.SlackBuild index f67f869f..243c0cc8 100755 --- a/source/a/dcron/dcron.SlackBuild +++ b/source/a/dcron/dcron.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=${VERSION:-$(echo dcron-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -70,10 +70,7 @@ zcat $CWD/defs.h.TMPDIR.diff.gz | patch -p1 || exit 1 # using 'crontab -', exits with control-c, and then crontab refuses to # overwrite the junk file. It would be better if dcron would wipe # the junk file in the event it were not closed correctly, but oh well. -zcat $CWD/patches/crontab.c.O_EXCL.diff.gz | patch -p1 || exit 1 - -# Get the directory names under /var/spool/ right in the manpages: -zcat $CWD/dcron.manpage.paths.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/crontab.c.O_EXCL.diff.gz | patch -p1 || exit 1 CFLAGS+="$SLKCFLAGS" make || exit 1 strip --strip-unneeded crond crontab diff --git a/source/a/dcron/dcron.manpage.paths.diff b/source/a/dcron/dcron.manpage.paths.diff deleted file mode 100644 index afd9c3d1..00000000 --- a/source/a/dcron/dcron.manpage.paths.diff +++ /dev/null @@ -1,65 +0,0 @@ ---- ./crond.8.orig 2010-01-18 09:29:25.000000000 -0600 -+++ ./crond.8 2010-02-11 17:22:36.000000000 -0600 -@@ -17,13 +17,13 @@ - .RE - .TP - .B -c dir --directory of per-user crontabs (defaults to /var/spool/cron) -+directory of per-user crontabs (defaults to /var/spool/cron/crontabs) - .RS - .RE - .TP - .B -t dir - directory of timestamps for \@freq and FREQ=\&... jobs (defaults to --/var/spool/cronstamps) -+/var/spool/cron/cronstamps) - .RS - .RE - .TP -@@ -172,7 +172,7 @@ - \f[B]crontab\f[] notifies \f[B]crond\f[] that a user's crontab file - has been modified (or created or deleted) through the - \[lq]cron.update\[rq] file, which resides in the per-user crontabs --directory (usually /var/spool/cron). -+directory (usually /var/spool/cron/crontabs). - \f[B]crontab\f[] appends the filename of the modified crontab file - to \[lq]cron.update\[rq]; and \f[B]crond\f[] inspects this file to - determine when to reparse or otherwise update its internal list of -@@ -180,7 +180,7 @@ - .PP - Whenever a \[lq]cron.update\[rq] file is seen, \f[B]crond\f[] also - re-reads timestamp files from its timestamp directory (usually --/var/spool/cronstamps). -+/var/spool/cron/cronstamps). - Normally these will just mirror \f[B]crond\f[]'s own internal - representations, but this mechanism could be used to manually - notify \f[B]crond\f[] that you've externally updated the -@@ -210,7 +210,7 @@ - crontab to /etc/cron.d/foo. - .PP - The superuser has a per-user crontab along with other users. --It usually resides at /var/spool/cron/root. -+It usually resides at /var/spool/cron/crontabs/root. - .PP - Users can only have a crontab if they have an entry in /etc/passwd; - however they do not need to have login shell privileges. ---- ./crontab.1.orig 2010-01-18 09:29:25.000000000 -0600 -+++ ./crontab.1 2010-02-11 17:23:13.000000000 -0600 -@@ -45,7 +45,7 @@ - different user and/or crontab directory. - .PP - The superuser also has his or her own per-user crontab, saved as --/var/spool/cron/root. -+/var/spool/cron/crontabs/root. - .PP - Unlike other cron daemons, this crond/crontab package doesn't try - to do everything under the sun. -@@ -117,7 +117,7 @@ - The formats \@hourly, \@daily, \@weekly, \@monthly, and \@yearly - need to update timestamp files when their jobs have been run. - The timestamp files are saved as --/var/spool/cronstamps/user.jobname. -+/var/spool/cron/cronstamps/user.jobname. - So for all of these formats, the cron command needs a jobname, - given by prefixing the command with \f[B]ID=jobname\f[]. - (This syntax was chosen to maximize the chance that our crontab diff --git a/source/a/dcron/defs.h.TMPDIR.diff b/source/a/dcron/defs.h.TMPDIR.diff index 6263843b..698f4ebc 100644 --- a/source/a/dcron/defs.h.TMPDIR.diff +++ b/source/a/dcron/defs.h.TMPDIR.diff @@ -1,5 +1,6 @@ ---- ./defs.h.orig 2010-01-15 20:17:04.000000000 -0600 -+++ ./defs.h 2010-02-11 16:39:33.000000000 -0600 +diff -Nur dcron-4.5.orig//defs.h dcron-4.5/defs.h +--- dcron-4.5.orig//defs.h 2011-05-01 07:22:09.000000000 -0500 ++++ dcron-4.5/defs.h 2011-08-22 16:28:35.343956248 -0500 @@ -73,7 +73,7 @@ #define CRONUPDATE "cron.update" #endif diff --git a/source/a/dcron/run-parts b/source/a/dcron/run-parts index 247d8c6e..65c778f3 100644 --- a/source/a/dcron/run-parts +++ b/source/a/dcron/run-parts @@ -39,10 +39,7 @@ for SCRIPT in $1/* ; do fi # If we've made it this far, then run the script if it's executable: if [ -x $SCRIPT ]; then - echo "$SCRIPT:" - echo - $SCRIPT 2>&1 - echo + $SCRIPT || echo "$SCRIPT failed." fi done diff --git a/source/a/e2fsprogs/e2fsprogs-1.42.6.tar.sign b/source/a/e2fsprogs/e2fsprogs-1.42.6.tar.sign new file mode 100644 index 00000000..6558e77e Binary files /dev/null and b/source/a/e2fsprogs/e2fsprogs-1.42.6.tar.sign differ diff --git a/source/a/e2fsprogs/e2fsprogs.SlackBuild b/source/a/e2fsprogs/e2fsprogs.SlackBuild index a14d8e11..3ba78e55 100755 --- a/source/a/e2fsprogs/e2fsprogs.SlackBuild +++ b/source/a/e2fsprogs/e2fsprogs.SlackBuild @@ -20,18 +20,23 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2012 by Eric Hameleers for ARM port. + + VERSION=${VERSION:-$(echo e2fsprogs*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -44,11 +49,19 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-e2fsprogs @@ -81,7 +94,7 @@ CFLAGS="$SLKCFLAGS" \ --disable-libblkid \ --disable-libuuid \ --disable-uuidd \ - --build=$ARCH-slackware-linux + --build=$TARGET make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -125,6 +138,7 @@ EOF chmod 0755 fsck.ext2 # Why won't symlinks work here? --RW # Because $0 will always be "fsck.ext2" in that case. --PJV + # rworkman is correct, so ignore the previous two comments :) --PJV cp -a fsck.ext2 fsck.ext3 cp -a fsck.ext2 fsck.ext4 cp -a fsck.ext2 fsck.ext4dev diff --git a/source/a/eject/eject.SlackBuild b/source/a/eject/eject.SlackBuild index c637ef55..94b0ccf7 100755 --- a/source/a/eject/eject.SlackBuild +++ b/source/a/eject/eject.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=eject VERSION=${VERSION:-2.1.5} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -59,6 +59,9 @@ cd ${PKGNAM} # Patch a problem with spaces in the pathname: zcat $CWD/eject.spaces.diff.gz | patch -p0 --verbose || exit 1 +# Fix "eject -T": +zcat $CWD/eject_for_mac.patch.gz | patch -p4 --verbose || exit 1 + # Make sure ownerships and permissions are sane: chown -R root:root . find . \ diff --git a/source/a/eject/eject_for_mac.patch b/source/a/eject/eject_for_mac.patch new file mode 100644 index 00000000..c86e3c17 --- /dev/null +++ b/source/a/eject/eject_for_mac.patch @@ -0,0 +1,12 @@ +diff -Nru /tmp/6rrvEn4EMT/eject-2.1.4/eject.c /tmp/Jon9ZzjSLN/eject-2.1.4/eject.c +--- /tmp/6rrvEn4EMT/eject-2.1.4/eject.c 2007-03-12 14:15:26.000000000 +0100 ++++ /tmp/Jon9ZzjSLN/eject-2.1.4/eject.c 2007-03-12 14:15:28.000000000 +0100 +@@ -552,7 +552,7 @@ + gettimeofday(&time_start, NULL); + + /* Send the CDROMEJECT command to the device. */ +- if (ioctl(fd, CDROMEJECT, 0) < 0) { ++ if (ioctl(fd, CDROMEJECT, 0) < 0 && errno != EIO) { + perror("ioctl"); + exit(1); + } diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild index d4508f2b..5db87ea7 100755 --- a/source/a/etc/etc.SlackBuild +++ b/source/a/etc/etc.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,7 +20,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=13.013 +VERSION=14.0 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/a/file/file.short.diff b/source/a/file/file.short.diff index be47218c..0f6a0e7b 100644 --- a/source/a/file/file.short.diff +++ b/source/a/file/file.short.diff @@ -1,12 +1,12 @@ -diff -Nur file-5.00.orig/src/readelf.h file-5.00/src/readelf.h ---- file-5.00.orig/src/readelf.h 2008-05-28 15:58:16.000000000 -0500 -+++ file-5.00/src/readelf.h 2009-02-08 22:17:26.681636542 -0600 -@@ -233,7 +233,7 @@ - #define NT_OPENBSD_VERSION 1 - #define NT_DRAGONFLY_VERSION 1 - /* GNU executables (name = "GNU") */ --#define NT_GNU_VERSION 1 -+#define NT_GNU_VERSION 0 +diff -Nur file-5.08.orig//src/readelf.h file-5.08/src/readelf.h +--- file-5.08.orig//src/readelf.h 2011-08-03 09:45:16.000000000 -0500 ++++ file-5.08/src/readelf.h 2011-08-23 21:10:04.228054614 -0500 +@@ -239,7 +239,7 @@ + * word[2]: minor version + * word[3]: tiny version + */ +-#define NT_GNU_VERSION 1 ++#define NT_GNU_VERSION 0 /* GNU OS tags */ - #define GNU_OS_LINUX 0 + #define GNU_OS_LINUX 0 diff --git a/source/a/file/slack-desc b/source/a/file/slack-desc index 96be2617..d405cb86 100644 --- a/source/a/file/slack-desc +++ b/source/a/file/slack-desc @@ -11,7 +11,7 @@ file: file: This is Ian F. Darwin's 'file' utility, used to identify files. file: Christos Zoulas has been file's maintainer since 1994. file: -file: +file: Home FTP site: ftp://ftp.astron.com/pub/file/ file: file: file: diff --git a/source/a/gdisk/gdisk.SlackBuild b/source/a/gdisk/gdisk.SlackBuild deleted file mode 100755 index 841332dd..00000000 --- a/source/a/gdisk/gdisk.SlackBuild +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh - -# Copyright (c) 2011 Eric Hameleers, Eindhoven, NL -# Copyright 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=gdisk -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -NUMJOBS=${NUMJOBS:-" -j7 "} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG - -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -export LDFLAGS="$SLKLDFLAGS" -export CXXFLAGS="$SLKCFLAGS" -export CFLAGS="$SLKCFLAGS" -make || exit 1 - -# Manually install the stuff: -for FILE in gdisk sgdisk ; do - install -D $FILE $PKG/sbin/$FILE - install -D $FILE.8 $PKG/usr/man/man8/$FILE.8 -done - -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - COPYING* NEWS README* \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# Strip binaries: -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) - -# Compress and if needed symlink the man pages: -if [ -d $PKG/usr/man ]; then - ( cd $PKG/usr/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/a/gdisk/slack-desc b/source/a/gdisk/slack-desc deleted file mode 100644 index 492b4460..00000000 --- a/source/a/gdisk/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -gdisk: gdisk (GPT fdisk) -gdisk: -gdisk: GPT fdisk (gdisk) is a partitioning tool for disks using a GPT (GUID -gdisk: Partition Table). It features a command-line interface, fairly direct -gdisk: manipulation of partition table structures, recovery tools to help -gdisk: you deal with corrupt partition tables, and the ability to convert -gdisk: MBR disks to GPT format. -gdisk: -gdisk: -gdisk: gdisk home: http://www.rodsbooks.com/gdisk/ -gdisk: diff --git a/source/a/gettext/gettext-tools.SlackBuild b/source/a/gettext/gettext-tools.SlackBuild index 0ed840dc..8b3154b0 100755 --- a/source/a/gettext/gettext-tools.SlackBuild +++ b/source/a/gettext/gettext-tools.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=0.18.1.1 -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j6 "} diff --git a/source/a/gettext/gettext.SlackBuild b/source/a/gettext/gettext.SlackBuild index acaf1df1..cd86bf7e 100755 --- a/source/a/gettext/gettext.SlackBuild +++ b/source/a/gettext/gettext.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=0.18.1.1 -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j6 "} diff --git a/source/a/gptfdisk/gptfdisk.SlackBuild b/source/a/gptfdisk/gptfdisk.SlackBuild new file mode 100755 index 00000000..6c6f5fc9 --- /dev/null +++ b/source/a/gptfdisk/gptfdisk.SlackBuild @@ -0,0 +1,122 @@ +#!/bin/sh + +# Copyright 2011 Eric Hameleers, Eindhoven, NL +# Copyright 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=gptfdisk +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +# Remove dependency on icu4c by switching from the uncommented Makefile +# lines to the commented ones: +zcat $CWD/gptfdisk.remove.icu4c.dep.diff.gz | patch -p1 || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +export LDFLAGS="$SLKLDFLAGS" +export CXXFLAGS="$SLKCFLAGS" +export CFLAGS="$SLKCFLAGS" +make || exit 1 + +# Manually install the stuff: +for FILE in cgdisk fixparts gdisk sgdisk ; do + install -D $FILE $PKG/sbin/$FILE + install -D $FILE.8 $PKG/usr/man/man8/$FILE.8 +done + +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + COPYING* NEWS README* \ + gdisk_test.sh \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/a/gptfdisk/gptfdisk.remove.icu4c.dep.diff b/source/a/gptfdisk/gptfdisk.remove.icu4c.dep.diff new file mode 100644 index 00000000..ce5d7a8a --- /dev/null +++ b/source/a/gptfdisk/gptfdisk.remove.icu4c.dep.diff @@ -0,0 +1,36 @@ +--- ./Makefile.orig 2012-05-30 10:38:43.000000000 -0500 ++++ ./Makefile 2012-08-06 16:37:17.256362865 -0500 +@@ -1,8 +1,8 @@ + CC=gcc + CXX=g++ + CFLAGS+=-D_FILE_OFFSET_BITS=64 +-CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 +-#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 ++#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 ++CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 + LDFLAGS+= + LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix + MBR_LIBS=support diskio diskio-unix basicmbr mbrpart +@@ -14,16 +14,16 @@ + all: cgdisk gdisk sgdisk fixparts + + gdisk: $(LIB_OBJS) gdisk.o gpttext.o +-# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk +- $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk ++ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk ++# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk + + cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o +-# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk +- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk ++ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk ++# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk + + sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o +-# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk +- $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk ++ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk ++# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk + + fixparts: $(MBR_LIB_OBJS) fixparts.o + $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts diff --git a/source/a/gptfdisk/slack-desc b/source/a/gptfdisk/slack-desc new file mode 100644 index 00000000..913fd875 --- /dev/null +++ b/source/a/gptfdisk/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +gptfdisk: gptfdisk (GPT fdisk utilities) +gptfdisk: +gptfdisk: GPT fdisk (consisting of the gdisk, cgdisk, sgdisk, and fixparts +gptfdisk: programs) is a set of text-mode partitioning tools for using a GPT +gptfdisk: (GUID Partition Table), rather than the traditional MBR (Master Boot +gptfdisk: Record) partition tables. It features several partitioning tools, +gptfdisk: recovery tools to help you deal with corrupt partition tables, and the +gptfdisk: ability to convert MBR disks to GPT format. +gptfdisk: +gptfdisk: gdisk home: http://www.rodsbooks.com/gdisk/ +gptfdisk: diff --git a/source/a/grep/grep.SlackBuild b/source/a/grep/grep.SlackBuild index b789bc72..6bdf0d81 100755 --- a/source/a/grep/grep.SlackBuild +++ b/source/a/grep/grep.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -60,6 +60,7 @@ cd $TMP rm -rf grep-$VERSION tar xvf $CWD/grep-$VERSION.tar.xz || exit 1 cd grep-$VERSION || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -90,11 +91,20 @@ mkdir -p $PKG/usr/bin ln -sf ../../bin/fgrep . ) -# Compress man pages -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi # Compress info pages rm -f $PKG/usr/info/dir diff --git a/source/a/gzip/gzip.SlackBuild b/source/a/gzip/gzip.SlackBuild index d5133fd5..19ef42fb 100755 --- a/source/a/gzip/gzip.SlackBuild +++ b/source/a/gzip/gzip.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=gzip -VERSION=${VERSION:-1.4} +VERSION=${VERSION:-1.5} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j6} @@ -166,5 +166,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $TMP/package-${PKGNAM} -/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.tgz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/isapnptools/isapnptools-1.26.lsm b/source/a/isapnptools/isapnptools-1.26.lsm new file mode 100644 index 00000000..f2c2af40 --- /dev/null +++ b/source/a/isapnptools/isapnptools-1.26.lsm @@ -0,0 +1,25 @@ +Begin3 +Title: isapnptools +Version: 1.26 +Entered-date: 2001-05-08 +Description: ISA plug and play configuration utility + Two programs - one allows the dumping of resource data and generation + of a skeleton configuration file, the other configures ISA PnP hardware + using a configuration file. + See http://www.roestock.demon.co.uk/isapnptools/ for latest information. +Keywords: ISA PnP Configuration Hardware +Author: fox@roestock.demon.co.uk (Peter Fox) +Maintained-by: fox@roestock.demon.co.uk (Peter Fox) +Primary-site: MetaLab.unc.edu /pub/Linux/system/hardware + 227k isapnptools-1.26.tgz + 384k isapnptools-1.26.bin.tgz +Alternate-site: tsx-11.mit.edu /pub/linux/sources/sbin + 227k isapnptools-1.26.src.tar.gz +Alternate-site: tsx-11.mit.edu /pub/linux/binaries/sbin + 384k isapnptools-1.26.bin.tar.gz +Alternate-site: ftp.lmh.ox.ac.uk /pub/linux/pnp + 227k isapnptools-1.26.tgz +Original-site: ftp.demon.co.uk /pub/unix/linux/utils + 227k isapnptools-1.26.tgz +Copying-policy: GNU +End diff --git a/source/a/isapnptools/isapnptools.SlackBuild b/source/a/isapnptools/isapnptools.SlackBuild new file mode 100755 index 00000000..38362878 --- /dev/null +++ b/source/a/isapnptools/isapnptools.SlackBuild @@ -0,0 +1,88 @@ +#!/bin/sh + +# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +CWD=`pwd` +TMP=/tmp +PKG=$TMP/package-isapnptools +rm -rf $PKG +mkdir -p $PKG +cd $TMP + +# sanity check +if [ "$( uname -m )" = "x86_64" ]; then + echo "isapnptools is not supported on x86_64" + exit 1 +fi + +VERSION=${VERSION:-1.26} +ARCH=${ARCH:-i486} +BUILD=${BUILD:-2} + +tar xzvf $CWD/isapnptools-$VERSION.tar.gz || exit 1 +cd isapnptools-$VERSION + +zcat $CWD/isapnptools_1.26-5.diff.xz | patch -p1 --verbose || exit 1 + +chown -R root:root . +find . -perm 666 -exec chmod 644 {} \; +find . -perm 664 -exec chmod 644 {} \; +find . -perm 600 -exec chmod 644 {} \; +find . -perm 444 -exec chmod 644 {} \; +find . -perm 400 -exec chmod 644 {} \; +find . -perm 440 -exec chmod 644 {} \; +find . -perm 777 -exec chmod 755 {} \; +find . -perm 775 -exec chmod 755 {} \; +find . -perm 511 -exec chmod 755 {} \; +find . -perm 711 -exec chmod 755 {} \; +find . -perm 555 -exec chmod 755 {} \; + +./configure --prefix=/usr +make -j4 || exit 1 +( cd src + strip isapnp pnpdump + mkdir -p $PKG/sbin + cat isapnp > $PKG/sbin/isapnp + cat pnpdump > $PKG/sbin/pnpdump + chmod 755 $PKG/sbin/* ) +mkdir -p $PKG/etc +( cd etc + mkdir -p $PKG/etc + cat isapnp.conf > $PKG/etc/isapnp.conf.sample + cat isapnp.gone > $PKG/etc/isapnp.gone.sample ) +( cd doc + mkdir -p $PKG/usr/man/man5 + cat isapnp.conf.5 | gzip -9c > $PKG/usr/man/man5/isapnp.conf.5.gz + mkdir -p $PKG/usr/man/man8 + cat isapnp.8 | gzip -9c > $PKG/usr/man/man8/isapnp.8.gz + cat pnpdump.8 | gzip -9c > $PKG/usr/man/man8/pnpdump.8.gz ) +mkdir -p $PKG/usr/doc/isapnptools-$VERSION +cp -a AUTHORS CHANGES COPYING INSTALL README isapnp.lsm doc/isapnpfaq.txt doc/README.ide doc/README.initrd $PKG/usr/doc/isapnptools-$VERSION +chown -R root:root $PKG/usr/doc/isapnptools-$VERSION +chmod 644 $PKG/usr/doc/isapnptools-$VERSION/* +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +makepkg -c n -l y $TMP/isapnptools-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/a/isapnptools/isapnptools.url b/source/a/isapnptools/isapnptools.url new file mode 100644 index 00000000..e4a66ad5 --- /dev/null +++ b/source/a/isapnptools/isapnptools.url @@ -0,0 +1 @@ +http://www.roestock.demon.co.uk/isapnptools/ diff --git a/source/a/isapnptools/isapnptools_1.26-5.diff b/source/a/isapnptools/isapnptools_1.26-5.diff new file mode 100644 index 00000000..73bfae9e --- /dev/null +++ b/source/a/isapnptools/isapnptools_1.26-5.diff @@ -0,0 +1,597 @@ +--- isapnptools-1.26.orig/doc/man2html ++++ isapnptools-1.26/doc/man2html +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # Brute force script to convert isapnptools man pages to html. + # +--- isapnptools-1.26.orig/debian/changelog ++++ isapnptools-1.26/debian/changelog +@@ -0,0 +1,263 @@ ++isapnptools (1.26-5) unstable; urgency=low ++ ++ * src/isapnp_main.l: Don't declare variable serial_identifier as static ++ (thanks Andreas Jochens). Closes: #286477. ++ ++ -- Steve M. Robbins Thu, 23 Dec 2004 00:04:41 -0500 ++ ++isapnptools (1.26-4) unstable; urgency=low ++ ++ * Add amd64 to list of supported arches. Closes: #257455. ++ ++ -- Steve M. Robbins Wed, 7 Jul 2004 21:21:29 -0400 ++ ++isapnptools (1.26-3) unstable; urgency=low ++ ++ * Applied portability fixes from David Weinehall. Closes: #254921. ++ - debian/isapnptools.init: Replace "test EXPR1 -o EXPR2" by ++ "test EXPR1 || test EXPR2". ++ - doc/man2html: Change hash-bang line from /bin/bash to /bin/sh. ++ ++ -- Steve M. Robbins Thu, 24 Jun 2004 20:25:08 -0400 ++ ++isapnptools (1.26-2) unstable; urgency=low ++ ++ * debian/control: ++ Standards-Version updated to 3.5.6.0; no changes required. ++ Build-depend on flex-old rather than flex. ++ Build-depend on linux-kernel-headers, for . ++ Set -dev package section to libdevel. ++ ++ * debian/rules: ++ Suppress accidental execution of auto-* tools. ++ Honour DEB_BUILD_OPTIONS policy. ++ ++ * src/callbacks.c: Include stdlib.h, for declaration of exit(). ++ ++ * src/resource.c: Define __KERNEL__ and include ++ to switch on definitions of __u32 et al. Closes: #223166. ++ ++ -- Steve M. Robbins Sat, 6 Dec 2003 22:32:25 -0500 ++ ++isapnptools (1.26-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Revert to explicit list of architectures; does not ++ build on "mipsel". Closes: #97942. ++ * Do not install /etc/isapnp.conf or /etc/isapnp.gone; ++ supply them as examples, instead. ++ * Init script will exit if the kernel has an isa-pnp.o module. ++ * Install doc/README.lib in -dev package; don't install README ++ files for DOS, OS2, or borland. ++ ++ -- Steve M. Robbins Fri, 18 May 2001 20:10:02 -0400 ++ ++isapnptools (1.25-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Change to architecture "any" (Closes: #94091). ++ ++ -- Steve M. Robbins Mon, 16 Apr 2001 19:19:03 -0400 ++ ++isapnptools (1.24-3) unstable; urgency=low ++ ++ * Fix getopt_long() call to avoid coredump (Closes: #93097). ++ ++ -- Steve M. Robbins Sat, 7 Apr 2001 12:40:52 -0400 ++ ++isapnptools (1.24-2) unstable; urgency=low ++ ++ * In version 1.24-1, all the include files were moved to libisapnp-dev, ++ so it must conflict with older isapnptools (closes: #90373). ++ * Set section/priority to base/extra, in agreement with the archive ++ override file. ++ ++ -- Steve M. Robbins Mon, 19 Mar 2001 23:12:31 -0500 ++ ++isapnptools (1.24-1) unstable; urgency=low ++ ++ * New Maintainer (closes: #89719). ++ * New upstream version. ++ - scanner is case insensitive (closes: #74455, #75362, #83251). ++ * Repackaged using debhelper. ++ - correctly generates /usr/doc symlink (closes: #52641) ++ * Past NMU fixes that remain fixed: ++ - ensure isapnp is in /sbin (closes: #74893, #74642, #74349, #74487) ++ - dev package installs lib and headers (closes: #64469) ++ - README.lib was missing (closes: #62343, #53259) ++ - no longer uses awk (closes: #29633, #29862) ++ - updated version long ago (closes: #27784) ++ - upstream changelog correctly named (closes: #9664) ++ * Patch previously incorporated without closing bug: ++ - exit init script if test -e /proc/isapnp (closes: #53057) ++ * Closing lots of obsolete bugs (closes: #46674). ++ ++ -- Steve M. Robbins Sun, 18 Mar 2001 20:11:10 -0500 ++ ++isapnptools (1.23-0.4) unstable; urgency=low ++ ++ * Non-Maintainer upload. ++ * Apply patch-1.23a from ++ http://www.roestock.demon.co.uk/isapnptools/patch-1.23a.gz ++ * Created acconfig.h (build fix). ++ ++ -- Ivo Timmermans Fri, 23 Feb 2001 19:45:39 +0100 ++ ++isapnptools (1.23-0.3) unstable; urgency=low ++ ++ * Non-Maintainer Upload. ++ * Fixed location of isapnp binary - should have tested this with 2.2 ++ kernel, not just 2.4.. (Closes: #74642, #74349, #74363, #74642) ++ ++ -- Joseph Carter Sun, 15 Oct 2000 13:20:19 -0500 ++ ++isapnptools (1.23-0.2) unstable; urgency=low ++ ++ * Non-Maintainer Upload ++ * Fixed drain bamage in isapnp/release.h regarding config.h ++ ++ -- Joseph Carter Wed, 4 Oct 2000 14:36:03 -0500 ++ ++isapnptools (1.23-0.1) unstable; urgency=low ++ ++ * Non-Maintainer Upload. ++ * New upstream version ++ * Modified debian/* for autosomething ++ ++ -- Joseph Carter Mon, 25 Sep 2000 01:04:14 -0500 ++ ++isapnptools (1.21-2.2) unstable; urgency=low ++ ++ * NMU again. ++ * Put libisapnp-dev in devel, not libs. ++ ++ -- Chris Lawrence Mon, 24 Jul 2000 16:38:05 -0500 ++ ++isapnptools (1.21-2.1) unstable; urgency=low ++ ++ * NMU. ++ * Create a separate libisapnp-dev package. (Closes: #64469) ++ * Update Standards-Version in control file. ++ * Properly include section and priority fields. ++ * README.lib md5sums problem fixed. (Closes: #53259, #62343) ++ ++ -- Chris Lawrence Sat, 1 Jul 2000 14:13:45 -0500 ++ ++isapnptools (1.21-2) unstable; urgency=low ++ ++ * applied patch from Cesar Eduardo Barros to correct the behaviour ++ for IRQ 2. Closes: #50202. ++ * changed the test to not start for 2.3 kernels. Closes: #52818. ++ ++ -- Frederic Lepied Thu, 16 Dec 1999 05:56:59 +0100 ++ ++isapnptools (1.21-1) unstable; urgency=low ++ ++ * new upstream version. ++ ++ -- Frederic Lepied Sat, 11 Dec 1999 15:52:40 +0100 ++ ++isapnptools (1.19-1) unstable; urgency=low ++ ++ * new upstream version. ++ ++ -- Frederic Lepied Thu, 21 Oct 1999 05:51:00 +0200 ++ ++isapnptools (1.18-1) unstable; urgency=low ++ ++ * new upstream version. ++ * Don't start isapnp on startup for 2.3 kernels. Closes: Bug#43634. ++ ++ -- Frederic Lepied Sat, 4 Sep 1999 07:06:42 +0200 ++ ++isapnptools (1.16-4) frozen unstable; urgency=low ++ ++ * downgrade pciutils dependency from Recommend to Suggest. Closes Bug#29004. ++ ++ -- Frederic Lepied Mon, 9 Nov 1998 06:01:16 +0100 ++ ++isapnptools (1.16-3) frozen unstable; urgency=low ++ ++ * oops upload to frozen too. ++ ++ -- Frederic Lepied Wed, 4 Nov 1998 04:06:53 +0100 ++ ++isapnptools (1.16-2) unstable; urgency=low ++ ++ * added missing dependency fields. Closes Bug#28136 ++ * (resource.c): use type instead of which to test for ++ the lspci command. Closes Bug#28728. ++ ++ -- Frederic Lepied Tue, 27 Oct 1998 09:32:57 +0100 ++ ++isapnptools (1.16-1) unstable; urgency=low ++ ++ * new upstream version. ++ ++ -- Frederic Lepied Fri, 16 Oct 1998 08:53:06 +0200 ++ ++isapnptools (1.13-3.1) unstable; urgency=high ++ ++ * Non-maintainer upload ++ * Fix #23770 (startup link in rcS.d) ++ * Add depend on dpkg >= 1.4.0.21 because of update-rc.d ++ ++ -- Gergely Madarasz Wed, 24 Jun 1998 00:11:59 +0200 ++ ++isapnptools (1.13-3) unstable; urgency=low ++ ++ * made architecture i386 and alpha. Fix Bug#19704. ++ ++ -- Frederic Lepied Sun, 15 Mar 1998 20:53:28 +0100 ++ ++isapnptools (1.13-2) unstable; urgency=low ++ ++ * Fix Bug#19334 (reports from lintian). ++ ++ -- Frederic Lepied Sun, 15 Mar 1998 14:44:16 +0100 ++ ++isapnptools (1.13-1) unstable; urgency=low, Closes=15423 ++ ++ * upstream release. ++ * remade architecture 'any' as it works with the alpha architecture now. ++ * install changelog.Debian compressed. Closes Bug#15423. ++ ++ -- Frederic Lepied Wed, 7 Jan 1998 06:22:42 +0100 ++ ++isapnptools (1.11-3) unstable; urgency=low ++ ++ * made architecture i386 (bug #12532). ++ ++ -- Frederic Lepied Wed, 8 Oct 1997 11:22:26 +0200 ++ ++isapnptools (1.11-2) unstable; urgency=low ++ ++ * test if isapnp.conf is readable before launching isapnp (bug #13688) ++ ++ -- Frederic Lepied Wed, 8 Oct 1997 09:40:09 +0200 ++ ++isapnptools (1.11-1) unstable; urgency=low ++ ++ * new upstream version. ++ ++ -- Frederic Lepied Sat, 26 Jul 1997 11:14:14 +0200 ++ ++isapnptools (1.10-2) unstable; urgency=low ++ ++ * compiled with libc6. ++ ++ -- Frederic Lepied Sat, 12 Jul 1997 19:48:15 +0200 ++ ++isapnptools (1.10-1) unstable; urgency=low ++ ++ * New upstream release. ++ ++ -- Frederic Lepied Thu, 12 Jun 1997 08:47:14 +0200 ++ ++isapnptools (1.9-1) unstable; urgency=low ++ ++ * Initial Release. ++ * Need to be integrated with sysvinit. ++ ++ -- Frederic Lepied Thu, 13 Feb 1997 10:28:34 +0100 ++ +--- isapnptools-1.26.orig/debian/control ++++ isapnptools-1.26/debian/control +@@ -0,0 +1,26 @@ ++Source: isapnptools ++Section: base ++Priority: extra ++Maintainer: Steve M. Robbins ++Standards-Version: 3.5.8.0 ++Build-Depends: debhelper (>> 3.0.0), flex-old, linux-kernel-headers ++ ++Package: isapnptools ++Architecture: alpha amd64 arm i386 ++Depends: ${shlibs:Depends}, dpkg (>= 1.4.0.21) ++Description: ISA Plug-And-Play configuration utilities. ++ This program is suitable for all systems, whether or not they ++ include a PnP BIOS. In fact, a PnP BIOS adds some complications ++ because it may already activate some cards so that the drivers ++ can find them, and these tools can unconfigure them, or change ++ their settings causing all sorts of nasty effects. ++ ++Package: libisapnp-dev ++Architecture: alpha amd64 arm i386 ++Conflicts: isapnptools (<< 1.24-1) ++Section: libdevel ++Priority: optional ++Description: ISA Plug-And-Play development libraries. ++ This package provides a header file and a static library for ++ development of software that detects and configures ISA Plug-And-Play ++ devices. +--- isapnptools-1.26.orig/debian/copyright ++++ isapnptools-1.26/debian/copyright +@@ -0,0 +1,17 @@ ++This package was debianized by Frederic Lepied on ++Thu, 13 Feb 1997 09:10:53 +0100. ++ ++It was downloaded from http://www.roestock.demon.co.uk/isapnptools/index.html ++ ++Copyright: ++ ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 ++ ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc., ++ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ Everyone is permitted to copy and distribute verbatim copies ++ of this license document, but changing it is not allowed. ++ ++On Debian Linux systems, the complete text of the GNU General ++Public License can be found in `/usr/share/common-licenses/GPL'. +--- isapnptools-1.26.orig/debian/isapnptools.README.Debian ++++ isapnptools-1.26/debian/isapnptools.README.Debian +@@ -0,0 +1,38 @@ ++Starting with version 1.26-1 (2001-05-18), the sample configuration ++files are no longer installed in /etc. Look for them in ++/usr/share/doc/isapnptools/examples. ++ ++The example files are not very useful, in fact. Start with ++"pnpdump >isapnp.conf" and then read "man isapnp.conf" to get started. ++ ++ ++The --reset option to pnpdump may be useful to reset some hardware at ++shutdown time. However, the pnpdump manpage suggests this may cause a ++lockup, so this is not done by default. Edit /etc/init.d/isapnp if ++you wish to do so. See bug report #54686. ++ ++ ++ Kernel ISA PnP Support ++ ---------------------- ++ ++The 2.4 linux kernels have built-in support for ISA PnP configuration, ++obviating the need for isapnptools. The init script will silently ++exit if the running kernel has isa-pnp support built-in or compiled as ++a module. ++ ++For many, the kernel PnP configuration will be sufficient (it seems to ++be better than isapnptools). If your card does not get properly ++configured, you will have to peruse the file Documentation/isapnp.txt ++from the kernel sources and come up with the required commands ++to configure it. Put them into a file, e.g. /etc/proc-isapnp.conf, ++and arrange for this to be read during boot. If isa-pnp is compiled ++as a module, you can use a module post-install rule such as ++the following: ++ ++ post-install isa-pnp cat /etc/proc-isapnp.conf > /proc/isapnp ++ ++Install this line into a file in /etc/modutils of your choosing ++(e.g. /etc/modutils/local) then run "update-modules". ++ ++ ++ -- Steve M. Robbins , Sat Dec 6 23:35:46 2003 +--- isapnptools-1.26.orig/debian/isapnptools.docs ++++ isapnptools-1.26/debian/isapnptools.docs +@@ -0,0 +1,8 @@ ++AUTHORS ++NEWS ++README ++doc/README.ide ++doc/README.initrd ++doc/README.modules ++doc/isapnpfaq.txt ++ +--- isapnptools-1.26.orig/debian/isapnptools.examples ++++ isapnptools-1.26/debian/isapnptools.examples +@@ -0,0 +1,2 @@ ++etc/isapnp.gone ++etc/isapnp.conf +--- isapnptools-1.26.orig/debian/isapnptools.files ++++ isapnptools-1.26/debian/isapnptools.files +@@ -0,0 +1,4 @@ ++sbin ++usr/sbin ++usr/share/man ++ +--- isapnptools-1.26.orig/debian/isapnptools.init ++++ isapnptools-1.26/debian/isapnptools.init +@@ -0,0 +1,29 @@ ++#! /bin/sh ++ ++# /etc/init.d/isapnp: configure Plug and Play boards ++ ++test -x /sbin/isapnp || exit 0 ++ ++# kernel 2.3.x and later can handle Pnp directly ++if test -e /proc/isapnp || \ ++ test -e /lib/modules/`/bin/uname -r`/kernel/drivers/pnp/isa-pnp.o ++then ++ exit 0 ++fi ++ ++case "$1" in ++ start) ++ if [ -r /etc/isapnp.conf ]; then ++ /sbin/isapnp /etc/isapnp.conf ++ fi ++ ;; ++ ++ stop|force-reload|restart) ++ ;; ++ ++ *) ++ echo "Usage: $0 {start|stop|restart|force-reload}" ++ exit 1 ++esac ++ ++exit 0 +--- isapnptools-1.26.orig/debian/libisapnp-dev.docs ++++ isapnptools-1.26/debian/libisapnp-dev.docs +@@ -0,0 +1,4 @@ ++AUTHORS ++NEWS ++README ++doc/README.lib +--- isapnptools-1.26.orig/debian/libisapnp-dev.examples ++++ isapnptools-1.26/debian/libisapnp-dev.examples +@@ -0,0 +1,2 @@ ++demos/demo.c ++demos/demo2.c +--- isapnptools-1.26.orig/debian/libisapnp-dev.files ++++ isapnptools-1.26/debian/libisapnp-dev.files +@@ -0,0 +1,2 @@ ++usr/include ++usr/lib +--- isapnptools-1.26.orig/debian/postrm ++++ isapnptools-1.26/debian/postrm +@@ -0,0 +1,7 @@ ++#!/bin/sh -e ++ ++#DEBHELPER# ++ ++if [ "$1" = "purge" ] ; then ++ rm -f /etc/isapnp.conf /etc/isapnp.gone ++fi +--- isapnptools-1.26.orig/debian/rules ++++ isapnptools-1.26/debian/rules +@@ -0,0 +1,115 @@ ++#!/usr/bin/make -f ++# ++# Adapted from /usr/share/doc/debhelper/examples/rules.multi2 ++ ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++ ++# This is the debhelper compatibility version to use. ++export DH_COMPAT=3 ++ ++# This has to be exported to make some magic below work. ++export DH_OPTIONS ++ ++# Suppress accidental execution of the auto-* tools; see ++# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html ++no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ ++ AUTOCONF="`pwd`/missing autoconf" \ ++ AUTOMAKE="`pwd`/missing automake" \ ++ AUTOHEADER="`pwd`/missing autoheader" ++ ++# Customization follows Debian policy 11.1. ++# ++# Variable DEB_BUILD_OPTIONS can have "noopt" or "nostrip" ++ ++CFLAGS = -Wall -g ++export CFLAGS ++ ++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ++CFLAGS += -O0 ++else ++CFLAGS += -O2 ++endif ++ ++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) ++INSTALL_PROGRAM += -s ++endif ++ ++build: build-stamp ++build-stamp: ++ dh_testdir ++ ++ rm -f config.cache ++ ./configure --prefix=/usr \ ++ --mandir=/usr/share/man --infodir=/usr/share/info ++ $(MAKE) $(no_auto_tools) ++ ++ touch build-stamp ++ ++clean: ++ dh_testdir ++ dh_testroot ++ rm -f build-stamp ++ ++ -cd demos && $(MAKE) distclean ++ -$(MAKE) distclean ++ ++ dh_clean ++ ++install: DH_OPTIONS= ++install: build ++ dh_testdir ++ dh_testroot ++ dh_clean -k ++ dh_installdirs ++ ++ $(MAKE) DESTDIR=`pwd`/debian/tmp install ++ # Move isapnp to /sbin ++ mkdir debian/tmp/sbin ++ mv debian/tmp/usr/sbin/isapnp debian/tmp/sbin ++ ++ dh_movefiles ++ ++# This single target is used to build all the packages, all at once, or ++# one at a time. So keep in mind: any options passed to commands here will ++# affect _all_ packages. Anything you want to only affect one package ++# should be put in another target, such as the install target. ++binary-common: ++ dh_testdir ++ dh_testroot ++# dh_installdebconf ++ dh_installdocs ++ dh_installexamples ++ # override init script name, for historical reasons ++ dh_installinit --no-restart-on-upgrade \ ++ --init-script=isapnp \ ++ -- start 15 S . ++# dh_installman ++ dh_installinfo ++ dh_installchangelogs ChangeLog ++# dh_link ++ dh_strip ++ dh_compress ++ dh_fixperms ++# dh_makeshlibs ++ dh_installdeb ++ dh_shlibdeps ++ dh_gencontrol ++ dh_md5sums ++ dh_builddeb ++ ++# Build architecture independant packages using the common target. ++binary-indep: build install ++# (Uncomment this next line if you have such packages.) ++# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common ++ ++# Build architecture dependant packages using the common target. ++binary-arch: build install ++ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common ++ ++# Any other binary targets build just one binary package at a time. ++binary-%: build install ++ make -f debian/rules binary-common DH_OPTIONS=-p$* ++ ++binary: binary-indep binary-arch ++.PHONY: build clean binary-indep binary-arch binary install +--- isapnptools-1.26.orig/src/callbacks.c ++++ isapnptools-1.26/src/callbacks.c +@@ -51,6 +51,7 @@ + #include + #include + #include ++#include + + /****************************************************************************/ + +--- isapnptools-1.26.orig/src/isapnp_main.l ++++ isapnptools-1.26/src/isapnp_main.l +@@ -363,7 +363,7 @@ + return 0; + } + +-static unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN]; ++unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN]; + static char *boardid[NUM_CARDS+1]; + static unsigned long serno[NUM_CARDS+1]; + +--- isapnptools-1.26.orig/src/resource.c ++++ isapnptools-1.26/src/resource.c +@@ -24,6 +24,9 @@ + #include + + #ifdef ENABLE_PCI ++#define __KERNEL__ ++#include ++#undef __KERNEL__ + #include + #endif + diff --git a/source/a/isapnptools/slack-desc b/source/a/isapnptools/slack-desc new file mode 100644 index 00000000..8646def6 --- /dev/null +++ b/source/a/isapnptools/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +isapnptools: isapnptools (ISA Plug-And-Play tools) +isapnptools: +isapnptools: These programs allow ISA Plug-And-Play devices to be configured +isapnptools: on a Linux machine. +isapnptools: +isapnptools: +isapnptools: +isapnptools: +isapnptools: +isapnptools: +isapnptools: diff --git a/source/a/kbd/kbd.SlackBuild b/source/a/kbd/kbd.SlackBuild index ddcd9670..1b2147d0 100755 --- a/source/a/kbd/kbd.SlackBuild +++ b/source/a/kbd/kbd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=kbd -VERSION=1.15.2 -BUILD=${BUILD:-1} +VERSION=1.15.3 +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -34,7 +34,7 @@ if [ -z "$ARCH" ]; then esac fi -NUMJOBS=${NUMJOBS:--j4} +NUMJOBS=${NUMJOBS:--j6} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -49,7 +49,7 @@ cd $TMP # Extract source: rm -rf $PKGNAM-$VERSION -tar xvf $CWD/sources/$PKGNAM-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/sources/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION # Make sure ownerships and permissions are sane: @@ -69,9 +69,12 @@ find . -perm 555 -exec chmod 755 {} \; # Apply patches: # These are taken from Fedora's SRPM: zcat $CWD/sources/kbd-1.15.2-po.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/sources/kbd-1.15-keycodes-man.patch | patch -p1 --verbose || exit 1 -zcat $CWD/sources/kbd-1.15-unicode_start.patch | patch -p1 --verbose || exit 1 -zcat $CWD/sources/kbd-1.15-resizecon-x86_64.patch | patch -p1 --verbose || exit 1 +zcat $CWD/sources/kbd-1.15-keycodes-man.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/sources/kbd-1.15-unicode_start.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/sources/kbd-1.15-resizecon-x86_64.patch.gz | patch -p1 --verbose || exit 1 + +# This is from Mandriva's SRPM: +zcat $CWD/sources/kbd-1.15.3-fix-es-translation.patch.gz | patch -p1 --verbose || exit 1 # This is from Fedora's spec file: # 7-bit maps are obsolete; so are non-euro maps @@ -114,6 +117,12 @@ make install DESTDIR=$PKG || exit 1 mv -fv usr/bin/loadkeys bin/ cd usr/bin ; ln -vsf ../../bin/loadkeys . ) +# Build/install resizecons: +( cd src + make resizecons + cp resizecons $PKG/usr/bin +) + # ro_win.map.gz is useless rm -fv $PKG/usr/share/kbd/keymaps/i386/qwerty/ro_win.map.gz @@ -197,10 +206,20 @@ config etc/rc.d/rc.font.new EOF -# Compress man pages: -( cd $PKG/usr/man - find . -name "*.?" -type f | xargs gzip -9 -) +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi # Install package description: install -vpm644 $CWD/slack-desc $PKG/install/ @@ -212,5 +231,5 @@ install -vpm644 $CWD/slack-desc $PKG/install/ ) cd $PKG -makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz -#EOF +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign b/source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign deleted file mode 100644 index 39f3c022..00000000 --- a/source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBLwPHZyGugalF9Dw4RAhiyAJ9DdLbizzsoJi87OjQ8VzyNsRnr2QCeJ9zg -MOKY0UbkCZyUALLyzxF2bKE= -=Ou46 ------END PGP SIGNATURE----- diff --git a/source/a/kbd/sources/kbd-1.15.3-fix-es-translation.patch b/source/a/kbd/sources/kbd-1.15.3-fix-es-translation.patch new file mode 100644 index 00000000..2d76cd9f --- /dev/null +++ b/source/a/kbd/sources/kbd-1.15.3-fix-es-translation.patch @@ -0,0 +1,12 @@ +diff -Naur kbd-1.15.3//po/es.po kbd-1.15.3.tpg//po/es.po +--- kbd-1.15.3//po/es.po 2011-05-14 21:12:49.000000000 +0000 ++++ kbd-1.15.3.tpg//po/es.po 2011-06-19 12:29:55.000000000 +0000 +@@ -1363,7 +1363,7 @@ + #: src/setfont.c:682 + #, c-format + msgid "Saved %d-char %dx%d font file on %s\n" +-msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n" ++msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n" + + #: src/setkeycodes.c:21 + #, c-format diff --git a/source/a/kernel-firmware/kernel-firmware.SlackBuild b/source/a/kernel-firmware/kernel-firmware.SlackBuild new file mode 100755 index 00000000..66445ea8 --- /dev/null +++ b/source/a/kernel-firmware/kernel-firmware.SlackBuild @@ -0,0 +1,54 @@ +#!/bin/sh + +# Copyright 2011 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=kernel-firmware +VERSION=${VERSION:-$(date +%Y%m%d)git} +ARCH=noarch +BUILD=${BUILD:-1} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $PKG +git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git +find . -name ".git*" -exec rm -rf "{}" \; +chown -R root:root . +mkdir -p lib +mv linux-firmware lib/firmware + +# Install documentation link: +mkdir -p $PKG/usr/doc +( cd $PKG/usr/doc + ln -sf /lib/firmware kernel-firmware-$VERSION +) + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/a/kernel-firmware/slack-desc b/source/a/kernel-firmware/slack-desc new file mode 100644 index 00000000..5231a426 --- /dev/null +++ b/source/a/kernel-firmware/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +kernel-firmware: kernel-firmware (Firmware for the kernel) +kernel-firmware: +kernel-firmware: These are firmware files for the Linux kernel. +kernel-firmware: +kernel-firmware: You'll need these to use certain hardware drivers with Linux. +kernel-firmware: +kernel-firmware: Upstream site: +kernel-firmware: +kernel-firmware: git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git +kernel-firmware: +kernel-firmware: diff --git a/source/a/kmod/kmod.SlackBuild b/source/a/kmod/kmod.SlackBuild new file mode 100755 index 00000000..0863d0e3 --- /dev/null +++ b/source/a/kmod/kmod.SlackBuild @@ -0,0 +1,147 @@ +#!/bin/sh + +# Slackware build script for kmod + +# Copyright 2011, 2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=kmod +VERSION=${VERSION:-9} +BUILD=${BUILD:-3} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Fix paths in manual pages +sed -i "s,/usr/lib,/lib,g" man/* + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/lib${LIBDIRSUFFIX} \ + --bindir=/sbin \ + --sbindir=/sbin \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --with-xz \ + --with-zlib \ + --build=$ARCH-slackware-linux || exit 1 + +make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# Create symlinks for the usual module-init-tools stuff: +( cd $PKG/sbin + for file in depmod insmod lsmod modinfo modprobe rmmod ; do + ln -sf kmod $file + done +) + +# Link lsmod into /bin +mkdir -p $PKG/bin +( cd $PKG/bin ; ln -sf /sbin/lsmod . ) + +mkdir -p $PKG/etc/modprobe.d +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} +mv $PKG/lib${LIBDIRSUFFIX}/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX} +rm -f $PKG/lib${LIBDIRSUFFIX}/{*.so,*.la} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + ln -sf ../../lib${LIBDIRSUFFIX}/libkmod.so.? libkmod.so +) + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + COPYING* NEWS README* TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/a/kmod/slack-desc b/source/a/kmod/slack-desc new file mode 100644 index 00000000..78507311 --- /dev/null +++ b/source/a/kmod/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +kmod: kmod (kernel module tools and library) +kmod: +kmod: kmod is a set of tools to handle common tasks with Linux kernel +kmod: modules like insert, remove, list, check properties, resolve +kmod: dependencies and aliases. The aim is to be compatible with the tools, +kmod: configurations and indexes from the module-init-tools project. +kmod: +kmod: These tools are designed on top of libkmod, a library that is +kmod: shipped with kmod. +kmod: +kmod: Project home: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/ diff --git a/source/a/lilo/lilo.SlackBuild b/source/a/lilo/lilo.SlackBuild index 2e7902cd..2df7618d 100755 --- a/source/a/lilo/lilo.SlackBuild +++ b/source/a/lilo/lilo.SlackBuild @@ -21,8 +21,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-22.8} -BUILD=${BUILD:-16} +VERSION=${VERSION:-23.2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -43,15 +43,18 @@ mkdir -p $TMP $PKG cd $TMP rm -rf lilo-$VERSION -tar xvf $CWD/lilo-$VERSION.src.tar.gz || exit 1 +tar xvf $CWD/lilo-$VERSION.tar.gz || exit 1 cd lilo-$VERSION chown -R root:root . -# This is needed for LVM+udev+devtmpfs -zcat $CWD/lilo.use_major_minor_instead_lvm_name.diff.gz | patch -p1 --verbose || exit 1 +# Obsolete patch? +## This is needed for LVM+udev+devtmpfs +#( cd src +# zcat $CWD/lilo.use_major_minor_instead_lvm_name.diff.gz | patch -p1 --verbose || exit 1 +#) make || exit 1 -make install ROOT=$PKG +make -i install DESTDIR=$PKG || exit 1 # Add a Slackware logo boot menu (sorry, couldn't resist): if [ "$ARCH" = "x86_64" -a -f $CWD/slack64.bmp ]; then @@ -61,13 +64,18 @@ else fi chmod 644 $PKG/boot/slack.bmp -# We don't need to add this empty directory: -rmdir $PKG/etc +# Remove non-Slackware litter: +( cd $PKG/boot + rm -f coffee.bmp *debian* +) +rm -r $PKG/etc/{initramfs,kernel} # Add Slackware's 'liloconfig' utility: mkdir -p $PKG/sbin cp -a $CWD/liloconfig $PKG/sbin/liloconfig chmod 755 $PKG/sbin/liloconfig +# Hey, you're stomping on our name! Plus, it doesn't work. +rm -f $PKG/usr/sbin/liloconfig mkdir -p $PKG/var/log/setup cp -a $CWD/setup.liloconfig $PKG/var/log/setup/setup.liloconfig cp -a $CWD/text.lilohelp $PKG/var/log/setup/text.lilohelp diff --git a/source/a/lilo/liloconfig b/source/a/lilo/liloconfig index 7dccd3d6..d8bc02dd 100644 --- a/source/a/lilo/liloconfig +++ b/source/a/lilo/liloconfig @@ -53,7 +53,7 @@ if [ ! -d "$T_PX" ]; then fi # Determine LILO documentation directory: -LILODOCDIR="$(ls -d /usr/doc/lilo-* | tail -n 1)" +LILODOCDIR="$(ls -d $T_PX/usr/doc/lilo-* 2> /dev/null | tail -n 1)" if [ ! -d "$LILODOCDIR" ]; then LILODOCDIR="/usr/doc/lilo/" fi @@ -236,14 +236,12 @@ hit ENTER to continue.\n\ } ask_utf() { - if [ "$(uname -r | cut -f 3 -d .)" -gt "23" ]; then dialog --defaultno --title "USE UTF-8 TEXT CONSOLE?" --yesno \ "Beginning with the 2.6.24 kernel, the text consoles default to UTF-8 mode. \ Unless you are using a UTF-8 locale (\$LANG setting), using the old default \ of a non-UTF text console is safer until some issues with various console \ programs are addressed. This option has no effect on the use of UTF-8 with X. \ \"No\" is the safe choice here." 10 70 - fi } # This function scans for bootable partitions (making some assumptions along @@ -584,12 +582,10 @@ checkbootsplash() cp -a $LILODOCDIR/sample/sl1337.bmp /boot/slack.bmp fi fi - # Thanks to amrit@slackware.com: - if grep -wq 13.37.0 /etc/slackware-version ; then - if ls -l /etc/lilo.conf | grep -q 13:37 ; then - if [ -r $LILODOCDIR/sample/sl1337.bmp ]; then - cp -a $LILODOCDIR/sample/sl1337.bmp /boot/slack.bmp - fi + # Mayan calendar easter egg + if [ "$(date "+%Y%m%d")" = "20121221" ]; then + if [ -r $LILODOCDIR/sample/slack14.0.2012.bmp ]; then + cp -a $LILODOCDIR/sample/slack14.0.2012.bmp /boot/slack.bmp fi fi } diff --git a/source/a/lilo/slack14.0.2012.bmp b/source/a/lilo/slack14.0.2012.bmp new file mode 100644 index 00000000..ea217657 Binary files /dev/null and b/source/a/lilo/slack14.0.2012.bmp differ diff --git a/source/a/logrotate/logrotate.SlackBuild b/source/a/logrotate/logrotate.SlackBuild index 76cc34ab..e38f2715 100755 --- a/source/a/logrotate/logrotate.SlackBuild +++ b/source/a/logrotate/logrotate.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,7 +20,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-3.7.8} +VERSION=${VERSION:-3.8.2} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -68,7 +68,7 @@ find . \ zcat $CWD/logrotate.slackware.diff.gz | patch -p1 || exit 1 make clean -make EXTRA_CFLAGS="$SLKCFLAGS" || exit 1 +make RPM_OPT_FLAGS="$SLKCFLAGS" || exit 1 strip logrotate mkdir -p $PKG/usr/sbin @@ -87,14 +87,19 @@ mkdir -p $PKG/etc/cron.daily zcat $CWD/logrotate.cron.gz > $PKG/etc/cron.daily/logrotate chmod 0755 $PKG/etc/cron.daily/logrotate -# Create the state directory -mkdir -p $PKG/var/lib/logrotate - mkdir -p $PKG/usr/doc/logrotate-$VERSION cp -a \ CHANGES COPYING READM* \ $PKG/usr/doc/logrotate-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/a/logrotate/logrotate.cron b/source/a/logrotate/logrotate.cron index f91b3add..acdf65c2 100644 --- a/source/a/logrotate/logrotate.cron +++ b/source/a/logrotate/logrotate.cron @@ -1,3 +1,3 @@ #!/bin/sh -/usr/sbin/logrotate /etc/logrotate.conf -[ $? != 0 ] && /usr/bin/logger -t logrotate "ALERT - exited abnormally." +/usr/sbin/logrotate /etc/logrotate.conf \ + || { /usr/bin/logger -t logrotate "ALERT - exited abnormally." && false ; } diff --git a/source/a/logrotate/logrotate.slackware.diff b/source/a/logrotate/logrotate.slackware.diff index e9126cee..6fa0436d 100644 --- a/source/a/logrotate/logrotate.slackware.diff +++ b/source/a/logrotate/logrotate.slackware.diff @@ -1,60 +1,25 @@ -diff -Nur logrotate-3.7.8.orig/Makefile logrotate-3.7.8/Makefile ---- logrotate-3.7.8.orig/Makefile 2008-05-19 05:25:54.000000000 -0500 -+++ logrotate-3.7.8/Makefile 2009-05-09 23:25:12.060201375 -0500 -@@ -1,7 +1,7 @@ - VERSION = $(shell awk '/Version:/ { print $$2 }' logrotate.spec) - OS_NAME = $(shell uname -s) - LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`) --CFLAGS = -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS) -+CFLAGS = -Wall $(EXTRA_CFLAGS) -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS) - PROG = logrotate - MAN = logrotate.8 - LOADLIBES = -lpopt -diff -Nur logrotate-3.7.8.orig/config.c logrotate-3.7.8/config.c ---- logrotate-3.7.8.orig/config.c 2008-06-02 05:26:14.000000000 -0500 -+++ logrotate-3.7.8/config.c 2009-05-09 23:53:36.748287318 -0500 -@@ -33,8 +33,9 @@ - #define isblank(c) ( (c) == ' ' || (c) == '\t' ) ? 1 : 0 - #endif - --static char *defTabooExts[] = { ".rpmsave", ".rpmorig", "~", ",v", +diff -Nur logrotate-3.8.0.orig//config.c logrotate-3.8.0/config.c +--- logrotate-3.8.0.orig//config.c 2011-06-21 03:12:02.000000000 -0500 ++++ logrotate-3.8.0/config.c 2011-08-22 15:53:25.199625138 -0500 +@@ -86,7 +86,8 @@ + static char *defTabooExts[] = { ".rpmsave", ".rpmorig", "~", ",v", + ".disabled", ".dpkg-old", ".dpkg-dist", ".dpkg-new", ".cfsaved", + ".ucf-old", ".ucf-dist", ".ucf-new", - ".rpmnew", ".swp", ".cfsaved", ".rhn-cfg-tmp-*" -+static char *defTabooExts[] = { ".new", ".orig", ".old", ".bak", -+ ".rpmsave", ".rpmorig", "~", ",v", ".rpmnew", ".swp", ".cfsaved", -+ ".rhn-cfg-tmp-*" ++ ".rpmnew", ".swp", ".cfsaved", ".rhn-cfg-tmp-*", ++ ".new", ".old", ".orig", ".bak" }; static int defTabooCount = sizeof(defTabooExts) / sizeof(char *); -diff -Nur logrotate-3.7.8.orig/config.h logrotate-3.7.8/config.h ---- logrotate-3.7.8.orig/config.h 2005-11-12 13:07:56.000000000 -0600 -+++ logrotate-3.7.8/config.h 2009-05-09 23:58:17.040241145 -0500 -@@ -13,7 +13,7 @@ - #define DEFAULT_MAIL_COMMAND "/usr/bin/mailx" - #define COMPRESS_COMMAND "/usr/local/bin/gzip" - #define UNCOMPRESS_COMMAND "/usr/local/bin/gunzip" --#define STATEFILE "/var/log/logrotate.status" -+#define STATEFILE "/var/lib/logrotate/status" - #endif - - /* -diff -Nur logrotate-3.7.8.orig/logrotate.8 logrotate-3.7.8/logrotate.8 ---- logrotate-3.7.8.orig/logrotate.8 2008-12-06 08:05:40.000000000 -0600 -+++ logrotate-3.7.8/logrotate.8 2009-05-09 23:56:45.137687740 -0500 -@@ -442,7 +442,7 @@ +diff -Nur logrotate-3.8.0.orig//logrotate.8 logrotate-3.8.0/logrotate.8 +--- logrotate-3.8.0.orig//logrotate.8 2011-06-21 03:12:02.000000000 -0500 ++++ logrotate-3.8.0/logrotate.8 2011-08-22 15:56:12.247672243 -0500 +@@ -472,7 +472,7 @@ for information on the taboo extensions). If a + precedes the list of extensions, the current taboo extension list is augmented, otherwise it is replaced. At startup, the taboo extension list --contains .rpmorig, .rpmsave, ,v, .swp, .rpmnew, ~, .cfsaved and .rhn-cfg-tmp-*. -+contains .new, .orig, .bak, .old, .rpmorig, .rpmsave, ,v, .swp, .rpmnew, ~, .cfsaved and .rhn-cfg-tmp-*. +-contains .rpmsave, .rpmorig, ~, .disabled, .dpkg-old, .dpkg-dist, .dpkg-new, .cfsaved, .ucf-old, .ucf-dist, .ucf-new, .rpmnew, .swp, .cfsaved, .rhn-cfg-tmp-* ++contains .rpmsave, .rpmorig, ~, .disabled, .dpkg-old, .dpkg-dist, .dpkg-new, .cfsaved, .ucf-old, .ucf-dist, .ucf-new, .rpmnew, .swp, .cfsaved, .rhn-cfg-tmp-*, .new, .old, .orig, .bak .TP \fBweekly\fR -@@ -459,7 +459,7 @@ - .SH FILES - .PD 0 - .TP 27 --\fI/var/lib/logrotate.status\fR -+\fI/var/lib/logrotate/status\fR - Default state file. - .TP 27 - \fI/etc/logrotate.conf\fR diff --git a/source/a/lvm2/build_with_udev_165_and_later.diff b/source/a/lvm2/build_with_udev_165_and_later.diff deleted file mode 100644 index 800e0f9f..00000000 --- a/source/a/lvm2/build_with_udev_165_and_later.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur LVM2.2.02.84.orig//configure LVM2.2.02.84/configure ---- LVM2.2.02.84.orig//configure 2011-02-04 16:17:54.000000000 -0600 -+++ LVM2.2.02.84/configure 2011-02-09 20:23:11.818797797 -0600 -@@ -8768,7 +8768,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ludev $LIBS" -+LIBS="-ludev -lrt $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -8799,7 +8799,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_udev_udev_queue_get_udev_is_active" >&5 - $as_echo "$ac_cv_lib_udev_udev_queue_get_udev_is_active" >&6; } - if test "x$ac_cv_lib_udev_udev_queue_get_udev_is_active" = x""yes; then : -- UDEV_PC="libudev"; UDEV_LIBS="-ludev" -+ UDEV_PC="libudev"; UDEV_LIBS="-ludev -lrt" - else - as_fn_error $? "bailing out... libudev library is required" "$LINENO" 5 - fi diff --git a/source/a/lvm2/fix-build-with-udev-183.patch b/source/a/lvm2/fix-build-with-udev-183.patch new file mode 100644 index 00000000..747926c4 --- /dev/null +++ b/source/a/lvm2/fix-build-with-udev-183.patch @@ -0,0 +1,44 @@ +From 57f4ebb843195bdd29c0d58e1659eeb0e9700081 Mon Sep 17 00:00:00 2001 +From: "Wulf C. Krueger" +Date: Sun, 27 May 2012 00:34:55 +0200 +Subject: [PATCH] lvm2: Fix build with systemd/udev-183. + +--- + lib/misc/lvm-wrappers.c | 2 +- + tools/dmsetup.c | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/lib/misc/lvm-wrappers.c b/lib/misc/lvm-wrappers.c +index 84f61a6..d4fcea6 100644 +--- a/lib/misc/lvm-wrappers.c ++++ b/lib/misc/lvm-wrappers.c +@@ -72,7 +72,7 @@ const char *udev_get_dev_dir(void) + return NULL; + } + +- return udev_get_dev_path(_udev); ++ return "/dev"; + } + + struct udev* udev_get_library_context(void) +diff --git a/tools/dmsetup.c b/tools/dmsetup.c +index 6934de8..e09b56c 100644 +--- a/tools/dmsetup.c ++++ b/tools/dmsetup.c +@@ -1009,7 +1009,7 @@ static int _udevcookies(CMD_ARGS) + static int _set_up_udev_support(const char *dev_dir) + { + struct udev *udev; +- const char *udev_dev_dir; ++ const char *udev_dev_dir = "/dev"; + size_t udev_dev_dir_len; + int dirs_diff; + const char *env; +@@ -1031,7 +1031,6 @@ static int _set_up_udev_support(const char *dev_dir) + _udev_cookie); + + if (!(udev = udev_new()) || +- !(udev_dev_dir = udev_get_dev_path(udev)) || + !*udev_dev_dir) { + log_error("Could not get udev dev path."); + return 0; diff --git a/source/a/lvm2/lvm2.SlackBuild b/source/a/lvm2/lvm2.SlackBuild index e72897d0..349d5486 100755 --- a/source/a/lvm2/lvm2.SlackBuild +++ b/source/a/lvm2/lvm2.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=$(echo LVM2.*.tar.xz | cut -f 2- -d . | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-1} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -68,8 +68,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix linking of librt until upstream does it correctly :) -zcat $CWD/build_with_udev_165_and_later.diff.gz | patch -p1 --verbose || exit 1 +# Not yet. +#zcat $CWD/fix-build-with-udev-183.patch.gz | patch -p1 --verbose || exit 1 # uid 0 = root # gid 6 = disk @@ -82,7 +82,6 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --with-usrlibdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ - --enable-static_link \ --enable-realtime \ --with-lvm1=internal \ --enable-pkgconfig \ @@ -92,6 +91,11 @@ CFLAGS="$SLKCFLAGS" \ --with-device-uid=0 \ --with-device-gid=6 \ --with-device-mode=0660 \ + --with-default-locking-dir=/run/lock/lvm \ + --with-default-run-dir=/run/lvm \ + --with-clvmd-pidfile=/run/lvm/clvmd.pid \ + --with-cmirrord-pidfile=/run/lvm/cmirrord.pid \ + --with-dmeventd-pidfile=/run/lvm/dmeventd.pid \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 @@ -99,9 +103,6 @@ make install DESTDIR=$PKG || exit 1 mv $PKG/etc/lvm/lvm.conf $PKG/etc/lvm/lvm.conf.new -# Create default rundir -mkdir -p $PKG/var/run/lvm - if [ -d $PKG/usr/share/man ]; then # --mandir was ignored mv $PKG/usr/share/man $PKG/usr rmdir $PKG/usr/share @@ -116,27 +117,36 @@ mkdir -p $PKG/lib${LIBDIRSUFFIX} done ) -# The Makefile is DIW. -( cd $PKG/usr/lib${LIBDIRSUFFIX} - find . -name "*.so" -type l | cut -b3- | while read file ; do - # These two excluded files are in ./device-mapper/ subdir - if [ "$file" != "libdevmapper-event-lvm2mirror.so" -a "$file" != "libdevmapper-event-lvm2snapshot.so" ]; then - rm -f $file - ln -sf $(basename ../../lib${LIBDIRSUFFIX}/${file}.?.*) $file - fi - done -) - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + mkdir -p $PKG/usr/doc/LVM2.$VERSION cp -a \ COPYING* INSTALL README* VERSION WHATS_NEW \ $PKG/usr/doc/LVM2.$VERSION -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/a/mdadm/mdadm-3.1.5.tar.bz2.sign b/source/a/mdadm/mdadm-3.1.5.tar.bz2.sign deleted file mode 100644 index e5c72768..00000000 --- a/source/a/mdadm/mdadm-3.1.5.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBNiYLLyGugalF9Dw4RAjiBAJkB62x+h+B7v24ghmwIUa2p44sWNwCeIZfe -sW9YOnjL/odR4C9Uuzu5pUQ= -=qI9A ------END PGP SIGNATURE----- diff --git a/source/a/mdadm/mdadm.SlackBuild b/source/a/mdadm/mdadm.SlackBuild index 71f7c1a3..7ede6ab7 100755 --- a/source/a/mdadm/mdadm.SlackBuild +++ b/source/a/mdadm/mdadm.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=3.1.5 +VERSION=${VERSION:-$(echo mdadm-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -34,22 +34,33 @@ if [ -z "$ARCH" ]; then esac fi +NUMJOBS=${NUMJOBS:-" -j7 "} + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-mdadm +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf mdadm-$VERSION -tar xjvf $CWD/mdadm-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/mdadm-$VERSION.tar.?z || exit 1 cd mdadm-$VERSION -# With glibc on the initrd and installer, there is no longer a -# good reason to compile this statically. Commented out. -## Build this static: -##zcat $CWD/mdadm.static.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -57,28 +68,51 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Treating all warnings as errors causes the build to fail. +sed -i "s,-Werror,," Makefile + make clean || exit 1 -make || exit 1 -#make mdadm.static -make install DESTDIR=$PKG || exit 1 -#cat mdadm.static > $PKG/sbin/mdadm -mv $PKG/usr/share/man $PKG/usr -rmdir $PKG/usr/share +make CXFLAGS="$SLKCFLAGS" MANDIR=/usr/man || exit 1 +make install MANDIR=/usr/man DESTDIR=$PKG || exit 1 + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + mkdir -p $PKG/etc cat mdadm.conf-example > $PKG/etc/mdadm.conf.new -gzip -9 $PKG/usr/man/man?/*.? + mkdir -p $PKG/usr/doc/mdadm-$VERSION cp -a \ - ANNOUNCE-$VERSION COPYING* ChangeLog INSTALL TODO \ + ANNOUNCE-$VERSION COPYING* INSTALL TODO \ $PKG/usr/doc/mdadm-$VERSION -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG -makepkg -l y -c n $TMP/mdadm-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/mdadm-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/mdadm/mdadm.static.diff b/source/a/mdadm/mdadm.static.diff deleted file mode 100644 index ae8a4642..00000000 --- a/source/a/mdadm/mdadm.static.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile.orig 2009-03-10 01:01:17.000000000 -0500 -+++ ./Makefile 2010-05-16 20:56:33.000000000 -0500 -@@ -55,7 +55,7 @@ - CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) - - # If you want a static binary, you might uncomment these --# LDFLAGS = -static -+LDFLAGS = -static - # STRIP = -s - - INSTALL = /usr/bin/install diff --git a/source/a/minicom/minicom.SlackBuild b/source/a/minicom/minicom.SlackBuild index be060ec2..19ec515f 100755 --- a/source/a/minicom/minicom.SlackBuild +++ b/source/a/minicom/minicom.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.5 +VERSION=2.6 BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j6} @@ -56,7 +56,7 @@ mkdir -p $TMP $PKG # minicom cd $TMP rm -rf minicom-$VERSION -tar xzvf $CWD/minicom-$VERSION.tar.gz || exit 1 +tar xvf $CWD/minicom-$VERSION.tar.xz || exit 1 cd minicom-$VERSION # The following command renames the internal implementation of getline @@ -79,7 +79,7 @@ make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/etc zcat $CWD/minicom.users.gz > $PKG/etc/minicom.users.new -printf "# Machine-generated file - use "minicom -s" to change parameters.\n" \ +printf "# Machine-generated file - use \"minicom -s\" to change parameters.\n" \ > $PKG/etc/minirc.dfl.new mkdir -p $PKG/usr/doc/minicom-$VERSION @@ -97,8 +97,6 @@ if [ -r ChangeLog ]; then fi # lzrz -# If autotools causes failure here (which it probably will), temporarily -# move /usr/bin/auto{conf,header,make} out of the way and it should work... cd $TMP rm -rf lrzsz-990823 @@ -119,6 +117,9 @@ for i in debian/patches/* ; do patch -p1 < $i || exit 1 ; done --mandir=/usr/man \ --build=$ARCH-slackware-linux +touch stamp-h.in # to stop autoheader from running +touch -d yesterday aclocal.m4 # to stop automake from running + make $NUMJOBS || make || exit 1 cp src/lrz src/lsz $PKG/usr/bin diff --git a/source/a/mkinitrd/README.initrd b/source/a/mkinitrd/README.initrd index ca95c332..c10bb630 100644 --- a/source/a/mkinitrd/README.initrd +++ b/source/a/mkinitrd/README.initrd @@ -1,10 +1,10 @@ Slackware initrd mini HOWTO by Patrick Volkerding, volkerdi@slackware.com -Thu Apr 7 06:02:26 CDT 2011 +@DATE@ This document describes how to create and install an initrd, which may be -required to use the 2.6 kernel. Also see "man mkinitrd". +required to use some features of the kernel. Also see "man mkinitrd". 1. What is an initrd? 2. Why to I need an initrd? @@ -33,26 +33,26 @@ flexible to ship a generic kernel and a set of kernel modules for it. The easiest way to make the initrd is to use the mkinitrd script included in Slackware's mkinitrd package. We'll walk through the process of -upgrading to the generic 2.6.37.6 Linux kernel using the packages +upgrading to the generic @KERNEL_VERSION@ Linux kernel using the packages found in Slackware's slackware/a/ directory. First, make sure the kernel, kernel modules, and mkinitrd package are installed (the current version numbers might be a little different, so this is just an example): - installpkg kernel-generic-2.6.37.6-i686-1.tgz - installpkg kernel-modules-2.6.37.6-i686-1.tgz - installpkg mkinitrd-1.1.0-i486-1.tgz + installpkg kernel-generic-@KERNEL_VERSION@-@ARCH@-@BUILD@.tgz + installpkg kernel-modules-@KERNEL_VERSION@-@ARCH@-@BUILD@.tgz + installpkg mkinitrd-@MKINITRD_VERSION@-@ARCH@-@BUILD@.tgz Change into the /boot directory: cd /boot -Now you'll want to run "mkinitrd". I'm using reiserfs for my root -filesystem, and since it's an IDE system the reiserfs module will be -the only one I need to load: +Now you'll want to run "mkinitrd". I'm using ext4 for my root +filesystem, and since mkinitrd should figure out any other modules +it requires, I shouldn't need to specify any others: - mkinitrd -c -k 2.6.37.6 -m reiserfs + mkinitrd -c -k @KERNEL_VERSION@ -m ext4 This should do two things. First, it will create a directory /boot/initrd-tree containing the initrd's filesystem. Then it will @@ -61,10 +61,10 @@ you could make some additional changes in /boot/initrd-tree/ and then run mkinitrd again without options to rebuild the image. That's optional, though, and only advanced users will need to think about that. -Here's another example: Build an initrd image using Linux 2.6.37.6 +Here's another example: Build an initrd image using Linux @KERNEL_VERSION@ kernel modules for a system with an ext3 root partition on /dev/sdb3: - mkinitrd -c -k 2.6.37.6 -m ext3 -f ext3 -r /dev/sdb3 + mkinitrd -c -k @KERNEL_VERSION@ -m ext3 -f ext3 -r /dev/sdb3 4. Now that I've built an initrd, how do I use it? @@ -76,10 +76,10 @@ initrd. Here's an example section of lilo.conf showing how this is done: # Linux bootable partition config begins -image = /boot/vmlinuz-generic-2.6.37.6 +image = /boot/vmlinuz-generic-@KERNEL_VERSION@ initrd = /boot/initrd.gz root = /dev/sda6 - label = Lnx26376 + label = @LILO_KERNEL_NAME@ read-only # Linux bootable partition config ends diff --git a/source/a/mkinitrd/busybox-dot-config b/source/a/mkinitrd/busybox-dot-config deleted file mode 100644 index 35b32a4f..00000000 --- a/source/a/mkinitrd/busybox-dot-config +++ /dev/null @@ -1,990 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.18.4 -# Fri Mar 25 23:08:06 2011 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -CONFIG_DESKTOP=y -# CONFIG_EXTRA_COMPAT is not set -CONFIG_INCLUDE_SUSv2=y -# CONFIG_USE_PORTABLE_CODE is not set -CONFIG_PLATFORM_LINUX=y -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -CONFIG_FEATURE_VERBOSE_USAGE=y -CONFIG_FEATURE_COMPRESS_USAGE=y -CONFIG_FEATURE_INSTALLER=y -CONFIG_INSTALL_NO_USR=y -CONFIG_LOCALE_SUPPORT=y -CONFIG_UNICODE_SUPPORT=y -# CONFIG_UNICODE_USING_LOCALE is not set -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_SUBST_WCHAR=63 -CONFIG_LAST_SUPPORTED_WCHAR=767 -# CONFIG_UNICODE_COMBINING_WCHARS is not set -# CONFIG_UNICODE_WIDE_WCHARS is not set -# CONFIG_UNICODE_BIDI_SUPPORT is not set -# CONFIG_UNICODE_NEUTRAL_TABLE is not set -# CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_LONG_OPTS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_WTMP=y -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_PIDFILE=y -CONFIG_FEATURE_SUID=y -CONFIG_FEATURE_SUID_CONFIG=y -CONFIG_FEATURE_SUID_CONFIG_QUIET=y -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_PIE is not set -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_EXTRA_CFLAGS="" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set - -# -# Installation Options ("make install" behavior) -# -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="/tmp/package-mkinitrd/usr/share/mkinitrd/initrd-tree" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -CONFIG_FEATURE_EDITING_VI=y -CONFIG_FEATURE_EDITING_HISTORY=64 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_EDITING_ASK_TERMINAL=y -# CONFIG_FEATURE_NON_POSIX_CP is not set -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -# CONFIG_FEATURE_HWIB is not set - -# -# Applets -# - -# -# Archival Utilities -# -CONFIG_FEATURE_SEAMLESS_XZ=y -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -CONFIG_FEATURE_SEAMLESS_BZ2=y -CONFIG_FEATURE_SEAMLESS_GZ=y -CONFIG_FEATURE_SEAMLESS_Z=y -CONFIG_AR=y -CONFIG_FEATURE_AR_LONG_FILENAMES=y -# CONFIG_FEATURE_AR_CREATE is not set -CONFIG_BUNZIP2=y -CONFIG_BZIP2=y -CONFIG_CPIO=y -CONFIG_FEATURE_CPIO_O=y -CONFIG_FEATURE_CPIO_P=y -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -CONFIG_GZIP=y -CONFIG_FEATURE_GZIP_LONG_OPTIONS=y -CONFIG_LZOP=y -CONFIG_LZOP_COMPR_HIGH=y -CONFIG_RPM2CPIO=y -# CONFIG_RPM is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_AUTODETECT=y -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y -# CONFIG_FEATURE_TAR_TO_COMMAND is not set -CONFIG_FEATURE_TAR_UNAME_GNAME=y -CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y -# CONFIG_FEATURE_TAR_SELINUX is not set -CONFIG_UNCOMPRESS=y -CONFIG_UNLZMA=y -CONFIG_FEATURE_LZMA_FAST=y -CONFIG_LZMA=y -CONFIG_UNXZ=y -CONFIG_XZ=y -CONFIG_UNZIP=y - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -# CONFIG_FEATURE_DATE_NANO is not set -# CONFIG_FEATURE_DATE_COMPAT is not set -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -CONFIG_FEATURE_TR_EQUIV=y -CONFIG_BASE64=y -CONFIG_CAL=y -CONFIG_CATV=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set -CONFIG_CHROOT=y -CONFIG_CKSUM=y -CONFIG_COMM=y -CONFIG_CP=y -CONFIG_FEATURE_CP_LONG_OPTIONS=y -CONFIG_CUT=y -CONFIG_DD=y -CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set -CONFIG_FEATURE_DD_IBS_OBS=y -CONFIG_DF=y -CONFIG_FEATURE_DF_FANCY=y -CONFIG_DIRNAME=y -CONFIG_DOS2UNIX=y -CONFIG_UNIX2DOS=y -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y -CONFIG_EXPAND=y -CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y -CONFIG_FALSE=y -CONFIG_FOLD=y -CONFIG_FSYNC=y -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y -CONFIG_ID=y -CONFIG_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LENGTH=y -CONFIG_LN=y -CONFIG_LOGNAME=y -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -CONFIG_NICE=y -CONFIG_NOHUP=y -CONFIG_OD=y -CONFIG_PRINTENV=y -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_REALPATH=y -CONFIG_RM=y -CONFIG_RMDIR=y -# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set -CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SHA256SUM=y -CONFIG_SHA512SUM=y -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -# CONFIG_FEATURE_FLOAT_SLEEP is not set -CONFIG_SORT=y -CONFIG_FEATURE_SORT_BIG=y -CONFIG_SPLIT=y -CONFIG_FEATURE_SPLIT_FANCY=y -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -CONFIG_STTY=y -CONFIG_SUM=y -CONFIG_SYNC=y -CONFIG_TAC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TOUCH=y -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNEXPAND=y -CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y -CONFIG_UNIQ=y -CONFIG_USLEEP=y -CONFIG_UUDECODE=y -CONFIG_UUENCODE=y -CONFIG_WC=y -CONFIG_FEATURE_WC_LARGE=y -CONFIG_WHO=y -CONFIG_WHOAMI=y -CONFIG_YES=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum, sha256sum, sha512sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_FGCONSOLE=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -CONFIG_KBD_MODE=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -CONFIG_RESIZE=y -CONFIG_FEATURE_RESIZE_PRINT=y -CONFIG_SETCONSOLE=y -CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y -CONFIG_SETFONT=y -CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y -CONFIG_DEFAULT_SETFONT_DIR="/usr/share/kbd/consolefonts" -CONFIG_SETKEYCODES=y -CONFIG_SETLOGCONS=y -CONFIG_SHOWKEY=y - -# -# Common options for loadfont and setfont -# -# CONFIG_FEATURE_LOADFONT_PSF2 is not set -CONFIG_FEATURE_LOADFONT_RAW=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -CONFIG_PIPE_PROGRESS=y -CONFIG_RUN_PARTS=y -CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -CONFIG_FEATURE_RUN_PARTS_FANCY=y -CONFIG_START_STOP_DAEMON=y -CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y -CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_PATCH=y -CONFIG_AWK=y -CONFIG_FEATURE_AWK_LIBM=y -CONFIG_CMP=y -CONFIG_DIFF=y -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -CONFIG_FEATURE_DIFF_DIR=y -CONFIG_ED=y -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=1024 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -CONFIG_FEATURE_ALLOW_EXEC=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_MMIN=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_MAXDEPTH=y -CONFIG_FEATURE_FIND_NEWER=y -CONFIG_FEATURE_FIND_INUM=y -CONFIG_FEATURE_FIND_EXEC=y -CONFIG_FEATURE_FIND_USER=y -CONFIG_FEATURE_FIND_GROUP=y -CONFIG_FEATURE_FIND_NOT=y -CONFIG_FEATURE_FIND_DEPTH=y -CONFIG_FEATURE_FIND_PAREN=y -CONFIG_FEATURE_FIND_SIZE=y -CONFIG_FEATURE_FIND_PRUNE=y -# CONFIG_FEATURE_FIND_DELETE is not set -CONFIG_FEATURE_FIND_PATH=y -CONFIG_FEATURE_FIND_REGEX=y -# CONFIG_FEATURE_FIND_CONTEXT is not set -CONFIG_FEATURE_FIND_LINKS=y -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y - -# -# Init Utilities -# -# CONFIG_BOOTCHARTD is not set -# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set -# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set -CONFIG_HALT=y -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -CONFIG_INIT=y -CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_KILL_REMOVED=y -CONFIG_FEATURE_KILL_DELAY=10 -CONFIG_FEATURE_INIT_SCTTY=y -CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_INIT_TERMINAL_TYPE="linux" -CONFIG_MESG=y - -# -# Login/Password Management Utilities -# -CONFIG_ADD_SHELL=y -CONFIG_REMOVE_SHELL=y -CONFIG_FEATURE_SHADOWPASSWDS=y -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -CONFIG_USE_BB_CRYPT=y -CONFIG_USE_BB_CRYPT_SHA=y -CONFIG_ADDUSER=y -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -CONFIG_FEATURE_CHECK_NAMES=y -CONFIG_FIRST_SYSTEM_ID=1000 -CONFIG_LAST_SYSTEM_ID=12000 -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y -CONFIG_DELUSER=y -CONFIG_DELGROUP=y -CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -CONFIG_GETTY=y -CONFIG_LOGIN=y -# CONFIG_PAM is not set -CONFIG_LOGIN_SCRIPTS=y -CONFIG_FEATURE_NOLOGIN=y -# CONFIG_FEATURE_SECURETTY is not set -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y -CONFIG_CRYPTPW=y -CONFIG_CHPASSWD=y -CONFIG_SU=y -CONFIG_FEATURE_SU_SYSLOG=y -CONFIG_FEATURE_SU_CHECKS_SHELLS=y -CONFIG_SULOGIN=y -CONFIG_VLOCK=y - -# -# Linux Ext2 FS Progs -# -CONFIG_CHATTR=y -CONFIG_FSCK=y -CONFIG_LSATTR=y -CONFIG_TUNE2FS=y - -# -# Linux Module Utilities -# -CONFIG_MODINFO=y -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_INSMOD=y -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_BLACKLIST=y -CONFIG_DEPMOD=y - -# -# Options common to multiple modutils -# -CONFIG_FEATURE_2_4_MODULES=y -# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -CONFIG_FEATURE_MODUTILS_ALIAS=y -CONFIG_FEATURE_MODUTILS_SYMBOLS=y -CONFIG_DEFAULT_MODULES_DIR="/lib/modules" -CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" - -# -# Linux System Utilities -# -CONFIG_BLOCKDEV=y -CONFIG_REV=y -CONFIG_ACPID=y -CONFIG_FEATURE_ACPID_COMPAT=y -CONFIG_BLKID=y -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -CONFIG_FEATURE_FBSET_READMODE=y -CONFIG_FDFLUSH=y -CONFIG_FDFORMAT=y -CONFIG_FDISK=y -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -CONFIG_FEATURE_OSF_LABEL=y -CONFIG_FEATURE_GPT_LABEL=y -CONFIG_FEATURE_FDISK_ADVANCED=y -CONFIG_FINDFS=y -# CONFIG_FLOCK is not set -CONFIG_FREERAMDISK=y -CONFIG_FSCK_MINIX=y -# CONFIG_MKFS_EXT2 is not set -CONFIG_MKFS_MINIX=y -CONFIG_FEATURE_MINIX2=y -# CONFIG_MKFS_REISER is not set -CONFIG_MKFS_VFAT=y -CONFIG_GETOPT=y -CONFIG_FEATURE_GETOPT_LONG=y -CONFIG_HEXDUMP=y -CONFIG_FEATURE_HEXDUMP_REVERSE=y -CONFIG_HD=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y -CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y -CONFIG_IPCRM=y -CONFIG_IPCS=y -CONFIG_LOSETUP=y -CONFIG_LSPCI=y -CONFIG_LSUSB=y -CONFIG_MDEV=y -CONFIG_FEATURE_MDEV_CONF=y -CONFIG_FEATURE_MDEV_RENAME=y -CONFIG_FEATURE_MDEV_RENAME_REGEXP=y -CONFIG_FEATURE_MDEV_EXEC=y -CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y -CONFIG_MKSWAP=y -CONFIG_FEATURE_MKSWAP_UUID=y -CONFIG_MORE=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -# CONFIG_FEATURE_MOUNT_VERBOSE is not set -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y -CONFIG_RDEV=y -CONFIG_READPROFILE=y -CONFIG_RTCWAKE=y -CONFIG_SCRIPT=y -CONFIG_SCRIPTREPLAY=y -CONFIG_SETARCH=y -CONFIG_SWAPONOFF=y -CONFIG_FEATURE_SWAPON_PRI=y -CONFIG_SWITCH_ROOT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MOUNT_LOOP_CREATE=y -CONFIG_FEATURE_MTAB_SUPPORT=y -CONFIG_VOLUMEID=y - -# -# Filesystem/Volume identification -# -CONFIG_FEATURE_VOLUMEID_EXT=y -# CONFIG_FEATURE_VOLUMEID_BTRFS is not set -CONFIG_FEATURE_VOLUMEID_REISERFS=y -CONFIG_FEATURE_VOLUMEID_FAT=y -CONFIG_FEATURE_VOLUMEID_HFS=y -CONFIG_FEATURE_VOLUMEID_JFS=y -CONFIG_FEATURE_VOLUMEID_XFS=y -CONFIG_FEATURE_VOLUMEID_NTFS=y -CONFIG_FEATURE_VOLUMEID_ISO9660=y -CONFIG_FEATURE_VOLUMEID_UDF=y -CONFIG_FEATURE_VOLUMEID_LUKS=y -CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y -CONFIG_FEATURE_VOLUMEID_CRAMFS=y -CONFIG_FEATURE_VOLUMEID_ROMFS=y -CONFIG_FEATURE_VOLUMEID_SYSV=y -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -CONFIG_FEATURE_VOLUMEID_LINUXRAID=y - -# -# Miscellaneous Utilities -# -# CONFIG_CONSPY is not set -# CONFIG_NANDWRITE is not set -# CONFIG_NANDDUMP is not set -# CONFIG_UBIATTACH is not set -# CONFIG_UBIDETACH is not set -CONFIG_ADJTIMEX=y -CONFIG_BBCONFIG=y -CONFIG_FEATURE_COMPRESS_BBCONFIG=y -CONFIG_BEEP=y -CONFIG_FEATURE_BEEP_FREQ=4000 -CONFIG_FEATURE_BEEP_LENGTH_MS=30 -CONFIG_CHAT=y -CONFIG_FEATURE_CHAT_NOFAIL=y -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -CONFIG_FEATURE_CHAT_IMPLICIT_CR=y -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -CONFIG_CHRT=y -CONFIG_CROND=y -CONFIG_FEATURE_CROND_D=y -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="/var/spool/cron" -CONFIG_CRONTAB=y -CONFIG_DC=y -CONFIG_FEATURE_DC_LIBM=y -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -CONFIG_DEVMEM=y -CONFIG_EJECT=y -CONFIG_FEATURE_EJECT_SCSI=y -CONFIG_FBSPLASH=y -# CONFIG_FLASHCP is not set -CONFIG_FLASH_LOCK=y -CONFIG_FLASH_UNLOCK=y -CONFIG_FLASH_ERASEALL=y -CONFIG_IONICE=y -CONFIG_INOTIFYD=y -CONFIG_LAST=y -CONFIG_FEATURE_LAST_SMALL=y -# CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -CONFIG_FEATURE_LESS_MARKS=y -CONFIG_FEATURE_LESS_REGEXP=y -CONFIG_FEATURE_LESS_WINCH=y -CONFIG_FEATURE_LESS_DASHCMD=y -CONFIG_FEATURE_LESS_LINENUMS=y -CONFIG_HDPARM=y -CONFIG_FEATURE_HDPARM_GET_IDENTITY=y -CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y -CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y -CONFIG_MAKEDEVS=y -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -CONFIG_FEATURE_MAKEDEVS_TABLE=y -# CONFIG_MAN is not set -# CONFIG_MICROCOM is not set -CONFIG_MOUNTPOINT=y -CONFIG_MT=y -CONFIG_RAIDAUTORUN=y -CONFIG_READAHEAD=y -# CONFIG_RFKILL is not set -CONFIG_RUNLEVEL=y -CONFIG_RX=y -CONFIG_SETSID=y -CONFIG_STRINGS=y -CONFIG_TASKSET=y -CONFIG_FEATURE_TASKSET_FANCY=y -CONFIG_TIME=y -CONFIG_TIMEOUT=y -CONFIG_TTYSIZE=y -CONFIG_VOLNAME=y -# CONFIG_WALL is not set -CONFIG_WATCHDOG=y - -# -# Networking Utilities -# -CONFIG_NBDCLIENT=y -CONFIG_NC=y -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -# CONFIG_NC_110_COMPAT is not set -CONFIG_FEATURE_IPV6=y -CONFIG_FEATURE_UNIX_LOCAL=y -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -CONFIG_ARP=y -CONFIG_ARPING=y -CONFIG_BRCTL=y -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set -CONFIG_DNSD=y -CONFIG_ETHER_WAKE=y -CONFIG_FAKEIDENTD=y -CONFIG_FTPD=y -CONFIG_FEATURE_FTP_WRITE=y -CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y -CONFIG_FTPGET=y -CONFIG_FTPPUT=y -CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -# CONFIG_FEATURE_HTTPD_GZIP is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -CONFIG_IFENSLAVE=y -CONFIG_IFPLUGD=y -CONFIG_IFUPDOWN=y -CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" -CONFIG_FEATURE_IFUPDOWN_IP=y -CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -CONFIG_FEATURE_IFUPDOWN_IPV4=y -CONFIG_FEATURE_IFUPDOWN_IPV6=y -CONFIG_FEATURE_IFUPDOWN_MAPPING=y -CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_SHORT_FORMS=y -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y -CONFIG_IPCALC=y -CONFIG_FEATURE_IPCALC_FANCY=y -CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y -CONFIG_NAMEIF=y -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set -CONFIG_FEATURE_NETSTAT_PRG=y -CONFIG_NSLOOKUP=y -# CONFIG_NTPD is not set -# CONFIG_FEATURE_NTPD_SERVER is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -CONFIG_PSCAN=y -CONFIG_ROUTE=y -CONFIG_SLATTACH=y -CONFIG_TCPSVD=y -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -CONFIG_TELNETD=y -CONFIG_FEATURE_TELNETD_STANDALONE=y -# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set -CONFIG_TFTP=y -# CONFIG_TFTPD is not set - -# -# Common options for tftp/tftpd -# -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y -CONFIG_FEATURE_TFTP_BLOCKSIZE=y -CONFIG_FEATURE_TFTP_PROGRESS_BAR=y -CONFIG_TFTP_DEBUG=y -CONFIG_TRACEROUTE=y -CONFIG_TRACEROUTE6=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -CONFIG_TUNCTL=y -CONFIG_FEATURE_TUNCTL_UG=y -# CONFIG_UDHCPD is not set -# CONFIG_DHCPRELAY is not set -# CONFIG_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_DHCPD_LEASES_FILE="" -# CONFIG_UDHCPC is not set -# CONFIG_FEATURE_UDHCPC_ARPING is not set -# CONFIG_FEATURE_UDHCP_PORT is not set -CONFIG_UDHCP_DEBUG=0 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set -CONFIG_UDHCPC_DEFAULT_SCRIPT="" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" -CONFIG_UDPSVD=y -CONFIG_VCONFIG=y -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_FEATURE_WGET_TIMEOUT=y -CONFIG_ZCIP=y - -# -# Print Utilities -# -# CONFIG_LPD is not set -CONFIG_LPR=y -# CONFIG_LPQ is not set - -# -# Mail Utilities -# -CONFIG_MAKEMIME=y -CONFIG_FEATURE_MIME_CHARSET="us-ascii" -CONFIG_POPMAILDIR=y -CONFIG_FEATURE_POPMAILDIR_DELIVERY=y -CONFIG_REFORMIME=y -CONFIG_FEATURE_REFORMIME_COMPAT=y -# CONFIG_SENDMAIL is not set - -# -# Process Utilities -# -CONFIG_IOSTAT=y -CONFIG_MPSTAT=y -CONFIG_PMAP=y -CONFIG_POWERTOP=y -# CONFIG_SMEMCAP is not set -CONFIG_FREE=y -CONFIG_FUSER=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_KILLALL5=y -CONFIG_NMETER=y -CONFIG_PGREP=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -CONFIG_PKILL=y -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -CONFIG_FEATURE_PS_TIME=y -CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -CONFIG_RENICE=y -CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -CONFIG_FEATURE_TOP_SMP_CPU=y -CONFIG_FEATURE_TOP_DECIMALS=y -CONFIG_FEATURE_TOP_SMP_PROCESS=y -CONFIG_FEATURE_TOPMEM=y -CONFIG_FEATURE_SHOW_THREADS=y -CONFIG_UPTIME=y -CONFIG_WATCH=y - -# -# Runit Utilities -# -CONFIG_RUNSV=y -CONFIG_RUNSVDIR=y -CONFIG_FEATURE_RUNSVDIR_LOG=y -CONFIG_SV=y -CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" -CONFIG_SVLOGD=y -CONFIG_CHPST=y -CONFIG_SETUIDGID=y -CONFIG_ENVUIDGID=y -CONFIG_ENVDIR=y -CONFIG_SOFTLIMIT=y -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# Shells -# -CONFIG_ASH=y -CONFIG_ASH_BASH_COMPAT=y -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y -CONFIG_ASH_MAIL=y -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -CONFIG_ASH_RANDOM_SUPPORT=y -CONFIG_ASH_EXPAND_PRMT=y -CONFIG_CTTYHACK=y -# CONFIG_HUSH is not set -# CONFIG_HUSH_BASH_COMPAT is not set -# CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_SAVEHISTORY is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_HUSH_CASE is not set -# CONFIG_HUSH_FUNCTIONS is not set -# CONFIG_HUSH_LOCAL is not set -# CONFIG_HUSH_RANDOM_SUPPORT is not set -# CONFIG_HUSH_EXPORT_N is not set -# CONFIG_HUSH_MODE_X is not set -# CONFIG_MSH is not set -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -# CONFIG_FEATURE_BASH_IS_ASH is not set -# CONFIG_FEATURE_BASH_IS_HUSH is not set -CONFIG_FEATURE_BASH_IS_NONE=y -CONFIG_SH_MATH_SUPPORT=y -CONFIG_SH_MATH_SUPPORT_64=y -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_FEATURE_SH_NOFORK is not set - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -CONFIG_FEATURE_REMOTE_LOG=y -# CONFIG_FEATURE_SYSLOGD_DUP is not set -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 -CONFIG_FEATURE_IPC_SYSLOG=y -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y -CONFIG_KLOGD=y -CONFIG_FEATURE_KLOGD_KLOGCTL=y -CONFIG_LOGGER=y diff --git a/source/a/mkinitrd/busybox-dot-config b/source/a/mkinitrd/busybox-dot-config new file mode 120000 index 00000000..09ac6817 --- /dev/null +++ b/source/a/mkinitrd/busybox-dot-config @@ -0,0 +1 @@ +busybox-dot-config.1.20.x \ No newline at end of file diff --git a/source/a/mkinitrd/busybox-dot-config.1.18.x b/source/a/mkinitrd/busybox-dot-config.1.18.x new file mode 100644 index 00000000..35b32a4f --- /dev/null +++ b/source/a/mkinitrd/busybox-dot-config.1.18.x @@ -0,0 +1,990 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.18.4 +# Fri Mar 25 23:08:06 2011 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT is not set +CONFIG_INCLUDE_SUSv2=y +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_FEATURE_COMPRESS_USAGE=y +CONFIG_FEATURE_INSTALLER=y +CONFIG_INSTALL_NO_USR=y +CONFIG_LOCALE_SUPPORT=y +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set +CONFIG_LONG_OPTS=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_WTMP=y +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_PIDFILE=y +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +CONFIG_FEATURE_SUID_CONFIG_QUIET=y +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +CONFIG_FEATURE_HAVE_RPC=y + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_EXTRA_CFLAGS="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set + +# +# Installation Options ("make install" behavior) +# +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="/tmp/package-mkinitrd/usr/share/mkinitrd/initrd-tree" + +# +# Busybox Library Tuning +# +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=2 +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +CONFIG_FEATURE_EDITING_VI=y +CONFIG_FEATURE_EDITING_HISTORY=64 +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +CONFIG_FEATURE_TAB_COMPLETION=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_EDITING_ASK_TERMINAL=y +# CONFIG_FEATURE_NON_POSIX_CP is not set +CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y +# CONFIG_FEATURE_HWIB is not set + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_FEATURE_SEAMLESS_XZ=y +# CONFIG_FEATURE_SEAMLESS_LZMA is not set +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y +CONFIG_FEATURE_SEAMLESS_Z=y +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +# CONFIG_FEATURE_AR_CREATE is not set +CONFIG_BUNZIP2=y +CONFIG_BZIP2=y +CONFIG_CPIO=y +CONFIG_FEATURE_CPIO_O=y +CONFIG_FEATURE_CPIO_P=y +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +CONFIG_GZIP=y +CONFIG_FEATURE_GZIP_LONG_OPTIONS=y +CONFIG_LZOP=y +CONFIG_LZOP_COMPR_HIGH=y +CONFIG_RPM2CPIO=y +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_AUTODETECT=y +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +# CONFIG_FEATURE_TAR_TO_COMMAND is not set +CONFIG_FEATURE_TAR_UNAME_GNAME=y +CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y +# CONFIG_FEATURE_TAR_SELINUX is not set +CONFIG_UNCOMPRESS=y +CONFIG_UNLZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y +CONFIG_UNZIP=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_NANO is not set +# CONFIG_FEATURE_DATE_COMPAT is not set +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_BASE64=y +CONFIG_CAL=y +CONFIG_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set +CONFIG_CHROOT=y +CONFIG_CKSUM=y +CONFIG_COMM=y +CONFIG_CP=y +CONFIG_FEATURE_CP_LONG_OPTIONS=y +CONFIG_CUT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_DF=y +CONFIG_FEATURE_DF_FANCY=y +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPAND=y +CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_FSYNC=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_HOSTID=y +CONFIG_ID=y +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LENGTH=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +CONFIG_PRINTENV=y +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +# CONFIG_FEATURE_FLOAT_SLEEP is not set +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +CONFIG_STTY=y +CONFIG_SUM=y +CONFIG_SYNC=y +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TOUCH=y +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNEXPAND=y +CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_FGCONSOLE=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_KBD_MODE=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_RESIZE=y +CONFIG_FEATURE_RESIZE_PRINT=y +CONFIG_SETCONSOLE=y +CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y +CONFIG_SETFONT=y +CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y +CONFIG_DEFAULT_SETFONT_DIR="/usr/share/kbd/consolefonts" +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +CONFIG_SHOWKEY=y + +# +# Common options for loadfont and setfont +# +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +CONFIG_FEATURE_LOADFONT_RAW=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_RUN_PARTS=y +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y +CONFIG_FEATURE_RUN_PARTS_FANCY=y +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_PATCH=y +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_CMP=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=1024 +CONFIG_FEATURE_VI_8BIT=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_MAXDEPTH=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_GROUP=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +# CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_FEATURE_FIND_LINKS=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set +CONFIG_HALT=y +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +CONFIG_INIT=y +CONFIG_FEATURE_USE_INITTAB=y +CONFIG_FEATURE_KILL_REMOVED=y +CONFIG_FEATURE_KILL_DELAY=10 +CONFIG_FEATURE_INIT_SCTTY=y +CONFIG_FEATURE_INIT_SYSLOG=y +CONFIG_FEATURE_EXTRA_QUIET=y +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +CONFIG_INIT_TERMINAL_TYPE="linux" +CONFIG_MESG=y + +# +# Login/Password Management Utilities +# +CONFIG_ADD_SHELL=y +CONFIG_REMOVE_SHELL=y +CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_SHADOW is not set +CONFIG_USE_BB_CRYPT=y +CONFIG_USE_BB_CRYPT_SHA=y +CONFIG_ADDUSER=y +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +CONFIG_FEATURE_CHECK_NAMES=y +CONFIG_FIRST_SYSTEM_ID=1000 +CONFIG_LAST_SYSTEM_ID=12000 +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELUSER=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_GETTY=y +CONFIG_LOGIN=y +# CONFIG_PAM is not set +CONFIG_LOGIN_SCRIPTS=y +CONFIG_FEATURE_NOLOGIN=y +# CONFIG_FEATURE_SECURETTY is not set +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +CONFIG_CRYPTPW=y +CONFIG_CHPASSWD=y +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +CONFIG_SULOGIN=y +CONFIG_VLOCK=y + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_FSCK=y +CONFIG_LSATTR=y +CONFIG_TUNE2FS=y + +# +# Linux Module Utilities +# +CONFIG_MODINFO=y +# CONFIG_MODPROBE_SMALL is not set +# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set +# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +CONFIG_INSMOD=y +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_BLACKLIST=y +CONFIG_DEPMOD=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_2_4_MODULES=y +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +CONFIG_FEATURE_MODUTILS_ALIAS=y +CONFIG_FEATURE_MODUTILS_SYMBOLS=y +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" + +# +# Linux System Utilities +# +CONFIG_BLOCKDEV=y +CONFIG_REV=y +CONFIG_ACPID=y +CONFIG_FEATURE_ACPID_COMPAT=y +CONFIG_BLKID=y +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +CONFIG_FDFLUSH=y +CONFIG_FDFORMAT=y +CONFIG_FDISK=y +CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +CONFIG_FEATURE_OSF_LABEL=y +CONFIG_FEATURE_GPT_LABEL=y +CONFIG_FEATURE_FDISK_ADVANCED=y +CONFIG_FINDFS=y +# CONFIG_FLOCK is not set +CONFIG_FREERAMDISK=y +CONFIG_FSCK_MINIX=y +# CONFIG_MKFS_EXT2 is not set +CONFIG_MKFS_MINIX=y +CONFIG_FEATURE_MINIX2=y +# CONFIG_MKFS_REISER is not set +CONFIG_MKFS_VFAT=y +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +CONFIG_FEATURE_HEXDUMP_REVERSE=y +CONFIG_HD=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +CONFIG_IPCRM=y +CONFIG_IPCS=y +CONFIG_LOSETUP=y +CONFIG_LSPCI=y +CONFIG_LSUSB=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_MKSWAP=y +CONFIG_FEATURE_MKSWAP_UUID=y +CONFIG_MORE=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +CONFIG_RDEV=y +CONFIG_READPROFILE=y +CONFIG_RTCWAKE=y +CONFIG_SCRIPT=y +CONFIG_SCRIPTREPLAY=y +CONFIG_SETARCH=y +CONFIG_SWAPONOFF=y +CONFIG_FEATURE_SWAPON_PRI=y +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +CONFIG_FEATURE_MTAB_SUPPORT=y +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +CONFIG_FEATURE_VOLUMEID_EXT=y +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set +CONFIG_FEATURE_VOLUMEID_REISERFS=y +CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_JFS=y +CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_NTFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_LUKS=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SYSV=y +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y + +# +# Miscellaneous Utilities +# +# CONFIG_CONSPY is not set +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set +CONFIG_ADJTIMEX=y +CONFIG_BBCONFIG=y +CONFIG_FEATURE_COMPRESS_BBCONFIG=y +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=4000 +CONFIG_FEATURE_BEEP_LENGTH_MS=30 +CONFIG_CHAT=y +CONFIG_FEATURE_CHAT_NOFAIL=y +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +CONFIG_FEATURE_CHAT_IMPLICIT_CR=y +# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set +# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set +# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set +# CONFIG_FEATURE_CHAT_CLR_ABORT is not set +CONFIG_CHRT=y +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" +CONFIG_CRONTAB=y +CONFIG_DC=y +CONFIG_FEATURE_DC_LIBM=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +CONFIG_DEVMEM=y +CONFIG_EJECT=y +CONFIG_FEATURE_EJECT_SCSI=y +CONFIG_FBSPLASH=y +# CONFIG_FLASHCP is not set +CONFIG_FLASH_LOCK=y +CONFIG_FLASH_UNLOCK=y +CONFIG_FLASH_ERASEALL=y +CONFIG_IONICE=y +CONFIG_INOTIFYD=y +CONFIG_LAST=y +CONFIG_FEATURE_LAST_SMALL=y +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +CONFIG_FEATURE_LESS_WINCH=y +CONFIG_FEATURE_LESS_DASHCMD=y +CONFIG_FEATURE_LESS_LINENUMS=y +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y +CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +# CONFIG_MAN is not set +# CONFIG_MICROCOM is not set +CONFIG_MOUNTPOINT=y +CONFIG_MT=y +CONFIG_RAIDAUTORUN=y +CONFIG_READAHEAD=y +# CONFIG_RFKILL is not set +CONFIG_RUNLEVEL=y +CONFIG_RX=y +CONFIG_SETSID=y +CONFIG_STRINGS=y +CONFIG_TASKSET=y +CONFIG_FEATURE_TASKSET_FANCY=y +CONFIG_TIME=y +CONFIG_TIMEOUT=y +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y +# CONFIG_WALL is not set +CONFIG_WATCHDOG=y + +# +# Networking Utilities +# +CONFIG_NBDCLIENT=y +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +# CONFIG_NC_110_COMPAT is not set +CONFIG_FEATURE_IPV6=y +CONFIG_FEATURE_UNIX_LOCAL=y +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +CONFIG_ARP=y +CONFIG_ARPING=y +CONFIG_BRCTL=y +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_FEATURE_BRCTL_SHOW is not set +CONFIG_DNSD=y +CONFIG_ETHER_WAKE=y +CONFIG_FAKEIDENTD=y +CONFIG_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FTPGET=y +CONFIG_FTPPUT=y +CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +# CONFIG_FEATURE_HTTPD_PROXY is not set +# CONFIG_FEATURE_HTTPD_GZIP is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +CONFIG_FEATURE_IFCONFIG_SLIP=y +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +CONFIG_IFENSLAVE=y +CONFIG_IFPLUGD=y +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_FEATURE_IFUPDOWN_IP=y +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y +CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y +CONFIG_NAMEIF=y +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +CONFIG_NETSTAT=y +# CONFIG_FEATURE_NETSTAT_WIDE is not set +CONFIG_FEATURE_NETSTAT_PRG=y +CONFIG_NSLOOKUP=y +# CONFIG_NTPD is not set +# CONFIG_FEATURE_NTPD_SERVER is not set +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_PSCAN=y +CONFIG_ROUTE=y +CONFIG_SLATTACH=y +CONFIG_TCPSVD=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y +# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +CONFIG_TFTP=y +# CONFIG_TFTPD is not set + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y +CONFIG_TFTP_DEBUG=y +CONFIG_TRACEROUTE=y +CONFIG_TRACEROUTE6=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y +# CONFIG_UDHCPD is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_UDHCPC is not set +# CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCP_PORT is not set +CONFIG_UDHCP_DEBUG=0 +# CONFIG_FEATURE_UDHCP_RFC3397 is not set +CONFIG_UDHCPC_DEFAULT_SCRIPT="" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +CONFIG_UDPSVD=y +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y +CONFIG_ZCIP=y + +# +# Print Utilities +# +# CONFIG_LPD is not set +CONFIG_LPR=y +# CONFIG_LPQ is not set + +# +# Mail Utilities +# +CONFIG_MAKEMIME=y +CONFIG_FEATURE_MIME_CHARSET="us-ascii" +CONFIG_POPMAILDIR=y +CONFIG_FEATURE_POPMAILDIR_DELIVERY=y +CONFIG_REFORMIME=y +CONFIG_FEATURE_REFORMIME_COMPAT=y +# CONFIG_SENDMAIL is not set + +# +# Process Utilities +# +CONFIG_IOSTAT=y +CONFIG_MPSTAT=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +# CONFIG_SMEMCAP is not set +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_KILLALL5=y +CONFIG_NMETER=y +CONFIG_PGREP=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +CONFIG_PKILL=y +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_FEATURE_PS_TIME=y +CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_DECIMALS=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y +CONFIG_FEATURE_SHOW_THREADS=y +CONFIG_UPTIME=y +CONFIG_WATCH=y + +# +# Runit Utilities +# +CONFIG_RUNSV=y +CONFIG_RUNSVDIR=y +CONFIG_FEATURE_RUNSVDIR_LOG=y +CONFIG_SV=y +CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" +CONFIG_SVLOGD=y +CONFIG_CHPST=y +CONFIG_SETUIDGID=y +CONFIG_ENVUIDGID=y +CONFIG_ENVDIR=y +CONFIG_SOFTLIMIT=y +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Shells +# +CONFIG_ASH=y +CONFIG_ASH_BASH_COMPAT=y +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_CMDCMD=y +CONFIG_ASH_MAIL=y +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y +CONFIG_CTTYHACK=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_HUSH_CASE is not set +# CONFIG_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y +CONFIG_SH_MATH_SUPPORT=y +CONFIG_SH_MATH_SUPPORT_64=y +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_FEATURE_SH_NOFORK is not set + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +# CONFIG_FEATURE_SYSLOGD_DUP is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_FEATURE_KLOGD_KLOGCTL=y +CONFIG_LOGGER=y diff --git a/source/a/mkinitrd/busybox-dot-config.1.19.x b/source/a/mkinitrd/busybox-dot-config.1.19.x new file mode 100644 index 00000000..864fed9d --- /dev/null +++ b/source/a/mkinitrd/busybox-dot-config.1.19.x @@ -0,0 +1,1013 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.19.3 +# Sat Dec 10 20:40:02 2011 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT is not set +CONFIG_INCLUDE_SUSv2=y +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_FEATURE_COMPRESS_USAGE=y +CONFIG_FEATURE_INSTALLER=y +CONFIG_INSTALL_NO_USR=y +CONFIG_LOCALE_SUPPORT=y +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set +CONFIG_LONG_OPTS=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y +CONFIG_FEATURE_PIDFILE=y +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +CONFIG_FEATURE_SUID_CONFIG_QUIET=y +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +CONFIG_FEATURE_HAVE_RPC=y + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_EXTRA_CFLAGS="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set + +# +# Installation Options ("make install" behavior) +# +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="/tmp/package-mkinitrd/usr/share/mkinitrd/initrd-tree" + +# +# Busybox Library Tuning +# +# CONFIG_FEATURE_SYSTEMD is not set +CONFIG_FEATURE_RTMINMAX=y +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=2 +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +CONFIG_FEATURE_EDITING_VI=y +CONFIG_FEATURE_EDITING_HISTORY=64 +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_REVERSE_SEARCH is not set +CONFIG_FEATURE_TAB_COMPLETION=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_EDITING_ASK_TERMINAL=y +# CONFIG_FEATURE_NON_POSIX_CP is not set +CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +CONFIG_FEATURE_COPYBUF_KB=4 +# CONFIG_FEATURE_SKIP_ROOTFS is not set +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y +# CONFIG_FEATURE_HWIB is not set + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_FEATURE_SEAMLESS_XZ=y +# CONFIG_FEATURE_SEAMLESS_LZMA is not set +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y +CONFIG_FEATURE_SEAMLESS_Z=y +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +# CONFIG_FEATURE_AR_CREATE is not set +CONFIG_BUNZIP2=y +CONFIG_BZIP2=y +CONFIG_CPIO=y +CONFIG_FEATURE_CPIO_O=y +CONFIG_FEATURE_CPIO_P=y +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +CONFIG_GZIP=y +CONFIG_FEATURE_GZIP_LONG_OPTIONS=y +CONFIG_LZOP=y +CONFIG_LZOP_COMPR_HIGH=y +CONFIG_RPM2CPIO=y +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_AUTODETECT=y +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +# CONFIG_FEATURE_TAR_TO_COMMAND is not set +CONFIG_FEATURE_TAR_UNAME_GNAME=y +CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y +# CONFIG_FEATURE_TAR_SELINUX is not set +CONFIG_UNCOMPRESS=y +CONFIG_UNLZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y +CONFIG_UNZIP=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_NANO is not set +# CONFIG_FEATURE_DATE_COMPAT is not set +CONFIG_ID=y +# CONFIG_GROUPS is not set +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_BASE64=y +CONFIG_WHO=y +CONFIG_USERS=y +CONFIG_CAL=y +CONFIG_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set +CONFIG_CHROOT=y +CONFIG_CKSUM=y +CONFIG_COMM=y +CONFIG_CP=y +CONFIG_FEATURE_CP_LONG_OPTIONS=y +CONFIG_CUT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_DF=y +CONFIG_FEATURE_DF_FANCY=y +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPAND=y +CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_FSYNC=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_HOSTID=y +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +CONFIG_PRINTENV=y +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +# CONFIG_FEATURE_FLOAT_SLEEP is not set +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +CONFIG_STTY=y +CONFIG_SUM=y +CONFIG_SYNC=y +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNEXPAND=y +CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_FGCONSOLE=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_KBD_MODE=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_RESIZE=y +CONFIG_FEATURE_RESIZE_PRINT=y +CONFIG_SETCONSOLE=y +CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y +CONFIG_SETFONT=y +CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y +CONFIG_DEFAULT_SETFONT_DIR="/usr/share/kbd/consolefonts" +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +CONFIG_SHOWKEY=y + +# +# Common options for loadfont and setfont +# +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +CONFIG_FEATURE_LOADFONT_RAW=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_RUN_PARTS=y +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y +CONFIG_FEATURE_RUN_PARTS_FANCY=y +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_PATCH=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=1024 +CONFIG_FEATURE_VI_8BIT=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_CMP=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y +CONFIG_SED=y +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_MAXDEPTH=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_GROUP=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +# CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_FEATURE_FIND_LINKS=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set +CONFIG_HALT=y +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +CONFIG_INIT=y +CONFIG_FEATURE_USE_INITTAB=y +CONFIG_FEATURE_KILL_REMOVED=y +CONFIG_FEATURE_KILL_DELAY=10 +CONFIG_FEATURE_INIT_SCTTY=y +CONFIG_FEATURE_INIT_SYSLOG=y +CONFIG_FEATURE_EXTRA_QUIET=y +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +CONFIG_INIT_TERMINAL_TYPE="linux" +CONFIG_MESG=y +CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y + +# +# Login/Password Management Utilities +# +CONFIG_ADD_SHELL=y +CONFIG_REMOVE_SHELL=y +CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_SHADOW is not set +CONFIG_USE_BB_CRYPT=y +CONFIG_USE_BB_CRYPT_SHA=y +CONFIG_ADDUSER=y +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +CONFIG_FEATURE_CHECK_NAMES=y +CONFIG_FIRST_SYSTEM_ID=1000 +CONFIG_LAST_SYSTEM_ID=12000 +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELUSER=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_GETTY=y +CONFIG_LOGIN=y +# CONFIG_PAM is not set +CONFIG_LOGIN_SCRIPTS=y +CONFIG_FEATURE_NOLOGIN=y +# CONFIG_FEATURE_SECURETTY is not set +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +CONFIG_CRYPTPW=y +CONFIG_CHPASSWD=y +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +CONFIG_SULOGIN=y +CONFIG_VLOCK=y + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_FSCK=y +CONFIG_LSATTR=y +CONFIG_TUNE2FS=y + +# +# Linux Module Utilities +# +CONFIG_MODINFO=y +# CONFIG_MODPROBE_SMALL is not set +# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set +# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +CONFIG_INSMOD=y +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_BLACKLIST=y +CONFIG_DEPMOD=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_2_4_MODULES=y +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +CONFIG_FEATURE_MODUTILS_ALIAS=y +CONFIG_FEATURE_MODUTILS_SYMBOLS=y +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" + +# +# Linux System Utilities +# +CONFIG_BLOCKDEV=y +CONFIG_REV=y +CONFIG_ACPID=y +CONFIG_FEATURE_ACPID_COMPAT=y +CONFIG_BLKID=y +CONFIG_FEATURE_BLKID_TYPE=y +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +CONFIG_FDFLUSH=y +CONFIG_FDFORMAT=y +CONFIG_FDISK=y +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +CONFIG_FEATURE_OSF_LABEL=y +CONFIG_FEATURE_GPT_LABEL=y +CONFIG_FEATURE_FDISK_ADVANCED=y +CONFIG_FINDFS=y +# CONFIG_FLOCK is not set +CONFIG_FREERAMDISK=y +CONFIG_FSCK_MINIX=y +# CONFIG_MKFS_EXT2 is not set +CONFIG_MKFS_MINIX=y +CONFIG_FEATURE_MINIX2=y +# CONFIG_MKFS_REISER is not set +CONFIG_MKFS_VFAT=y +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +CONFIG_FEATURE_HEXDUMP_REVERSE=y +CONFIG_HD=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +CONFIG_IPCRM=y +CONFIG_IPCS=y +CONFIG_LOSETUP=y +CONFIG_LSPCI=y +CONFIG_LSUSB=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_MKSWAP=y +CONFIG_FEATURE_MKSWAP_UUID=y +CONFIG_MORE=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +CONFIG_RDEV=y +CONFIG_READPROFILE=y +CONFIG_RTCWAKE=y +CONFIG_SCRIPT=y +CONFIG_SCRIPTREPLAY=y +CONFIG_SETARCH=y +CONFIG_SWAPONOFF=y +CONFIG_FEATURE_SWAPON_PRI=y +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +CONFIG_FEATURE_MTAB_SUPPORT=y +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +CONFIG_FEATURE_VOLUMEID_EXT=y +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set +CONFIG_FEATURE_VOLUMEID_REISERFS=y +CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_JFS=y +CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_NTFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_LUKS=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SYSV=y +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y + +# +# Miscellaneous Utilities +# +# CONFIG_CONSPY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +CONFIG_FEATURE_LESS_WINCH=y +CONFIG_FEATURE_LESS_ASK_TERMINAL=y +CONFIG_FEATURE_LESS_DASHCMD=y +CONFIG_FEATURE_LESS_LINENUMS=y +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +CONFIG_SETSERIAL=y +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set +CONFIG_ADJTIMEX=y +CONFIG_BBCONFIG=y +CONFIG_FEATURE_COMPRESS_BBCONFIG=y +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=4000 +CONFIG_FEATURE_BEEP_LENGTH_MS=30 +CONFIG_CHAT=y +CONFIG_FEATURE_CHAT_NOFAIL=y +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +CONFIG_FEATURE_CHAT_IMPLICIT_CR=y +# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set +# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set +# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set +# CONFIG_FEATURE_CHAT_CLR_ABORT is not set +CONFIG_CHRT=y +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" +CONFIG_CRONTAB=y +CONFIG_DC=y +CONFIG_FEATURE_DC_LIBM=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +CONFIG_DEVMEM=y +CONFIG_EJECT=y +CONFIG_FEATURE_EJECT_SCSI=y +CONFIG_FBSPLASH=y +# CONFIG_FLASHCP is not set +CONFIG_FLASH_LOCK=y +CONFIG_FLASH_UNLOCK=y +CONFIG_FLASH_ERASEALL=y +CONFIG_IONICE=y +CONFIG_INOTIFYD=y +CONFIG_LAST=y +CONFIG_FEATURE_LAST_SMALL=y +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y +CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +# CONFIG_MAN is not set +# CONFIG_MICROCOM is not set +CONFIG_MOUNTPOINT=y +CONFIG_MT=y +CONFIG_RAIDAUTORUN=y +CONFIG_READAHEAD=y +# CONFIG_RFKILL is not set +CONFIG_RUNLEVEL=y +CONFIG_RX=y +CONFIG_SETSID=y +CONFIG_STRINGS=y +CONFIG_TASKSET=y +CONFIG_FEATURE_TASKSET_FANCY=y +CONFIG_TIME=y +CONFIG_TIMEOUT=y +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y +# CONFIG_WALL is not set +CONFIG_WATCHDOG=y + +# +# Networking Utilities +# +CONFIG_NAMEIF=y +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +CONFIG_NBDCLIENT=y +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +# CONFIG_NC_110_COMPAT is not set +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_WHOIS is not set +CONFIG_FEATURE_IPV6=y +CONFIG_FEATURE_UNIX_LOCAL=y +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +CONFIG_ARP=y +CONFIG_ARPING=y +CONFIG_BRCTL=y +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_FEATURE_BRCTL_SHOW is not set +CONFIG_DNSD=y +CONFIG_ETHER_WAKE=y +CONFIG_FAKEIDENTD=y +CONFIG_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FTPGET=y +CONFIG_FTPPUT=y +CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +# CONFIG_FEATURE_HTTPD_PROXY is not set +# CONFIG_FEATURE_HTTPD_GZIP is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +CONFIG_FEATURE_IFCONFIG_SLIP=y +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +CONFIG_IFENSLAVE=y +CONFIG_IFPLUGD=y +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_FEATURE_IFUPDOWN_IP=y +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y +CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y +CONFIG_NETSTAT=y +# CONFIG_FEATURE_NETSTAT_WIDE is not set +CONFIG_FEATURE_NETSTAT_PRG=y +CONFIG_NSLOOKUP=y +# CONFIG_NTPD is not set +# CONFIG_FEATURE_NTPD_SERVER is not set +CONFIG_PSCAN=y +CONFIG_ROUTE=y +CONFIG_SLATTACH=y +CONFIG_TCPSVD=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y +# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +CONFIG_TFTP=y +# CONFIG_TFTPD is not set + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y +CONFIG_TFTP_DEBUG=y +CONFIG_TRACEROUTE=y +CONFIG_TRACEROUTE6=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y +# CONFIG_UDHCPD is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_UDHCPC is not set +# CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCP_PORT is not set +CONFIG_UDHCP_DEBUG=0 +# CONFIG_FEATURE_UDHCP_RFC3397 is not set +# CONFIG_FEATURE_UDHCP_8021Q is not set +CONFIG_UDHCPC_DEFAULT_SCRIPT="" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +CONFIG_UDPSVD=y +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y +CONFIG_ZCIP=y + +# +# Print Utilities +# +# CONFIG_LPD is not set +CONFIG_LPR=y +# CONFIG_LPQ is not set + +# +# Mail Utilities +# +CONFIG_MAKEMIME=y +CONFIG_FEATURE_MIME_CHARSET="us-ascii" +CONFIG_POPMAILDIR=y +CONFIG_FEATURE_POPMAILDIR_DELIVERY=y +CONFIG_REFORMIME=y +CONFIG_FEATURE_REFORMIME_COMPAT=y +# CONFIG_SENDMAIL is not set + +# +# Process Utilities +# +CONFIG_IOSTAT=y +CONFIG_MPSTAT=y +CONFIG_NMETER=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +# CONFIG_PSTREE is not set +# CONFIG_PWDX is not set +# CONFIG_SMEMCAP is not set +CONFIG_UPTIME=y +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_KILLALL5=y +CONFIG_PGREP=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +CONFIG_PKILL=y +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_FEATURE_PS_TIME=y +CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_DECIMALS=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y +CONFIG_FEATURE_SHOW_THREADS=y +CONFIG_WATCH=y + +# +# Runit Utilities +# +CONFIG_RUNSV=y +CONFIG_RUNSVDIR=y +CONFIG_FEATURE_RUNSVDIR_LOG=y +CONFIG_SV=y +CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" +CONFIG_SVLOGD=y +CONFIG_CHPST=y +CONFIG_SETUIDGID=y +CONFIG_ENVUIDGID=y +CONFIG_ENVDIR=y +CONFIG_SOFTLIMIT=y +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Shells +# +CONFIG_ASH=y +CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_IDLE_TIMEOUT is not set +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_CMDCMD=y +CONFIG_ASH_MAIL=y +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y +CONFIG_CTTYHACK=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_HUSH_CASE is not set +# CONFIG_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y +CONFIG_SH_MATH_SUPPORT=y +CONFIG_SH_MATH_SUPPORT_64=y +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_FEATURE_SH_NOFORK is not set +CONFIG_FEATURE_SH_HISTFILESIZE=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +# CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_SYSLOGD_CFG is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_FEATURE_KLOGD_KLOGCTL=y +CONFIG_LOGGER=y diff --git a/source/a/mkinitrd/busybox-dot-config.1.20.x b/source/a/mkinitrd/busybox-dot-config.1.20.x new file mode 100644 index 00000000..3184ac28 --- /dev/null +++ b/source/a/mkinitrd/busybox-dot-config.1.20.x @@ -0,0 +1,1024 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.20.1 +# Tue Jun 12 09:42:03 2012 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT is not set +CONFIG_INCLUDE_SUSv2=y +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_FEATURE_COMPRESS_USAGE=y +CONFIG_FEATURE_INSTALLER=y +CONFIG_INSTALL_NO_USR=y +CONFIG_LOCALE_SUPPORT=y +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set +CONFIG_LONG_OPTS=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y +CONFIG_FEATURE_PIDFILE=y +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +CONFIG_FEATURE_SUID_CONFIG_QUIET=y +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +CONFIG_FEATURE_HAVE_RPC=y + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_SYSROOT="" +CONFIG_EXTRA_CFLAGS="" +CONFIG_EXTRA_LDFLAGS="" +CONFIG_EXTRA_LDLIBS="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set + +# +# Installation Options ("make install" behavior) +# +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="/tmp/package-mkinitrd/usr/share/mkinitrd/initrd-tree" + +# +# Busybox Library Tuning +# +# CONFIG_FEATURE_SYSTEMD is not set +CONFIG_FEATURE_RTMINMAX=y +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SMALL=1 +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +CONFIG_FEATURE_EDITING_VI=y +CONFIG_FEATURE_EDITING_HISTORY=64 +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set +# CONFIG_FEATURE_REVERSE_SEARCH is not set +CONFIG_FEATURE_TAB_COMPLETION=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_EDITING_ASK_TERMINAL=y +# CONFIG_FEATURE_NON_POSIX_CP is not set +CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +CONFIG_FEATURE_COPYBUF_KB=4 +# CONFIG_FEATURE_SKIP_ROOTFS is not set +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y +# CONFIG_FEATURE_HWIB is not set + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_FEATURE_SEAMLESS_XZ=y +# CONFIG_FEATURE_SEAMLESS_LZMA is not set +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y +CONFIG_FEATURE_SEAMLESS_Z=y +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +# CONFIG_FEATURE_AR_CREATE is not set +CONFIG_BUNZIP2=y +CONFIG_BZIP2=y +CONFIG_CPIO=y +CONFIG_FEATURE_CPIO_O=y +CONFIG_FEATURE_CPIO_P=y +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +CONFIG_GZIP=y +CONFIG_FEATURE_GZIP_LONG_OPTIONS=y +CONFIG_GZIP_FAST=0 +CONFIG_LZOP=y +CONFIG_LZOP_COMPR_HIGH=y +CONFIG_RPM2CPIO=y +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_AUTODETECT=y +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +# CONFIG_FEATURE_TAR_TO_COMMAND is not set +CONFIG_FEATURE_TAR_UNAME_GNAME=y +CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y +# CONFIG_FEATURE_TAR_SELINUX is not set +CONFIG_UNCOMPRESS=y +CONFIG_UNLZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y +CONFIG_UNZIP=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_NANO is not set +# CONFIG_FEATURE_DATE_COMPAT is not set +CONFIG_HOSTID=y +CONFIG_ID=y +# CONFIG_GROUPS is not set +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_SUSV3=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_BASE64=y +CONFIG_WHO=y +CONFIG_USERS=y +CONFIG_CAL=y +CONFIG_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set +CONFIG_CHROOT=y +CONFIG_CKSUM=y +CONFIG_COMM=y +CONFIG_CP=y +CONFIG_FEATURE_CP_LONG_OPTIONS=y +CONFIG_CUT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_DF=y +CONFIG_FEATURE_DF_FANCY=y +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPAND=y +CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_FSYNC=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +CONFIG_PRINTENV=y +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +# CONFIG_FEATURE_FLOAT_SLEEP is not set +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +CONFIG_STTY=y +CONFIG_SUM=y +CONFIG_SYNC=y +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNEXPAND=y +CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_FGCONSOLE=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_KBD_MODE=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_RESIZE=y +CONFIG_FEATURE_RESIZE_PRINT=y +CONFIG_SETCONSOLE=y +CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y +CONFIG_SETFONT=y +CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y +CONFIG_DEFAULT_SETFONT_DIR="/usr/share/kbd/consolefonts" +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +CONFIG_SHOWKEY=y + +# +# Common options for loadfont and setfont +# +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +CONFIG_FEATURE_LOADFONT_RAW=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_RUN_PARTS=y +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y +CONFIG_FEATURE_RUN_PARTS_FANCY=y +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_PATCH=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=1024 +CONFIG_FEATURE_VI_8BIT=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_CMP=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y +CONFIG_SED=y +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_MAXDEPTH=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_GROUP=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +# CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_FEATURE_FIND_LINKS=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set +CONFIG_HALT=y +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +CONFIG_INIT=y +CONFIG_FEATURE_USE_INITTAB=y +CONFIG_FEATURE_KILL_REMOVED=y +CONFIG_FEATURE_KILL_DELAY=10 +CONFIG_FEATURE_INIT_SCTTY=y +CONFIG_FEATURE_INIT_SYSLOG=y +CONFIG_FEATURE_EXTRA_QUIET=y +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +CONFIG_INIT_TERMINAL_TYPE="linux" +CONFIG_MESG=y +CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y + +# +# Login/Password Management Utilities +# +CONFIG_ADD_SHELL=y +CONFIG_REMOVE_SHELL=y +CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_SHADOW is not set +CONFIG_USE_BB_CRYPT=y +CONFIG_USE_BB_CRYPT_SHA=y +CONFIG_ADDUSER=y +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +CONFIG_FEATURE_CHECK_NAMES=y +CONFIG_FIRST_SYSTEM_ID=1000 +CONFIG_LAST_SYSTEM_ID=12000 +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELUSER=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_GETTY=y +CONFIG_LOGIN=y +# CONFIG_LOGIN_SESSION_AS_CHILD is not set +# CONFIG_PAM is not set +CONFIG_LOGIN_SCRIPTS=y +CONFIG_FEATURE_NOLOGIN=y +# CONFIG_FEATURE_SECURETTY is not set +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +CONFIG_CRYPTPW=y +CONFIG_CHPASSWD=y +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="s" +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +CONFIG_SULOGIN=y +CONFIG_VLOCK=y + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_FSCK=y +CONFIG_LSATTR=y +CONFIG_TUNE2FS=y + +# +# Linux Module Utilities +# +CONFIG_MODINFO=y +# CONFIG_MODPROBE_SMALL is not set +# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set +# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +CONFIG_INSMOD=y +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_BLACKLIST=y +CONFIG_DEPMOD=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_2_4_MODULES=y +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +CONFIG_FEATURE_MODUTILS_ALIAS=y +CONFIG_FEATURE_MODUTILS_SYMBOLS=y +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" + +# +# Linux System Utilities +# +CONFIG_BLOCKDEV=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_REV=y +CONFIG_ACPID=y +CONFIG_FEATURE_ACPID_COMPAT=y +CONFIG_BLKID=y +CONFIG_FEATURE_BLKID_TYPE=y +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +CONFIG_FDFLUSH=y +CONFIG_FDFORMAT=y +CONFIG_FDISK=y +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +CONFIG_FEATURE_OSF_LABEL=y +CONFIG_FEATURE_GPT_LABEL=y +CONFIG_FEATURE_FDISK_ADVANCED=y +CONFIG_FINDFS=y +# CONFIG_FLOCK is not set +CONFIG_FREERAMDISK=y +CONFIG_FSCK_MINIX=y +# CONFIG_MKFS_EXT2 is not set +CONFIG_MKFS_MINIX=y +CONFIG_FEATURE_MINIX2=y +# CONFIG_MKFS_REISER is not set +CONFIG_MKFS_VFAT=y +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +CONFIG_FEATURE_HEXDUMP_REVERSE=y +CONFIG_HD=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +CONFIG_IPCRM=y +CONFIG_IPCS=y +CONFIG_LOSETUP=y +CONFIG_LSPCI=y +CONFIG_LSUSB=y +CONFIG_MKSWAP=y +CONFIG_FEATURE_MKSWAP_UUID=y +CONFIG_MORE=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +CONFIG_RDEV=y +CONFIG_READPROFILE=y +CONFIG_RTCWAKE=y +CONFIG_SCRIPT=y +CONFIG_SCRIPTREPLAY=y +CONFIG_SETARCH=y +CONFIG_SWAPONOFF=y +CONFIG_FEATURE_SWAPON_PRI=y +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +CONFIG_FEATURE_MTAB_SUPPORT=y +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +CONFIG_FEATURE_VOLUMEID_EXT=y +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set +CONFIG_FEATURE_VOLUMEID_REISERFS=y +CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_JFS=y +CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_NTFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_LUKS=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SYSV=y +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y + +# +# Miscellaneous Utilities +# +# CONFIG_CONSPY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +CONFIG_FEATURE_LESS_WINCH=y +CONFIG_FEATURE_LESS_ASK_TERMINAL=y +CONFIG_FEATURE_LESS_DASHCMD=y +CONFIG_FEATURE_LESS_LINENUMS=y +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +CONFIG_SETSERIAL=y +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set +CONFIG_ADJTIMEX=y +CONFIG_BBCONFIG=y +CONFIG_FEATURE_COMPRESS_BBCONFIG=y +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=4000 +CONFIG_FEATURE_BEEP_LENGTH_MS=30 +CONFIG_CHAT=y +CONFIG_FEATURE_CHAT_NOFAIL=y +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +CONFIG_FEATURE_CHAT_IMPLICIT_CR=y +# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set +# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set +# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set +# CONFIG_FEATURE_CHAT_CLR_ABORT is not set +CONFIG_CHRT=y +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" +CONFIG_CRONTAB=y +CONFIG_DC=y +CONFIG_FEATURE_DC_LIBM=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +CONFIG_DEVMEM=y +CONFIG_EJECT=y +CONFIG_FEATURE_EJECT_SCSI=y +CONFIG_FBSPLASH=y +# CONFIG_FLASHCP is not set +CONFIG_FLASH_LOCK=y +CONFIG_FLASH_UNLOCK=y +CONFIG_FLASH_ERASEALL=y +CONFIG_IONICE=y +CONFIG_INOTIFYD=y +CONFIG_LAST=y +CONFIG_FEATURE_LAST_SMALL=y +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y +CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +# CONFIG_MAN is not set +# CONFIG_MICROCOM is not set +CONFIG_MOUNTPOINT=y +CONFIG_MT=y +CONFIG_RAIDAUTORUN=y +CONFIG_READAHEAD=y +# CONFIG_RFKILL is not set +CONFIG_RUNLEVEL=y +CONFIG_RX=y +CONFIG_SETSID=y +CONFIG_STRINGS=y +CONFIG_TASKSET=y +CONFIG_FEATURE_TASKSET_FANCY=y +CONFIG_TIME=y +CONFIG_TIMEOUT=y +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y +# CONFIG_WALL is not set +CONFIG_WATCHDOG=y + +# +# Networking Utilities +# +CONFIG_NAMEIF=y +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +CONFIG_NBDCLIENT=y +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +# CONFIG_NC_110_COMPAT is not set +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_WHOIS is not set +CONFIG_FEATURE_IPV6=y +CONFIG_FEATURE_UNIX_LOCAL=y +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +CONFIG_ARP=y +CONFIG_ARPING=y +CONFIG_BRCTL=y +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_FEATURE_BRCTL_SHOW is not set +CONFIG_DNSD=y +CONFIG_ETHER_WAKE=y +CONFIG_FAKEIDENTD=y +CONFIG_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FTPGET=y +CONFIG_FTPPUT=y +CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +# CONFIG_FEATURE_HTTPD_PROXY is not set +# CONFIG_FEATURE_HTTPD_GZIP is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +CONFIG_FEATURE_IFCONFIG_SLIP=y +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +CONFIG_IFENSLAVE=y +CONFIG_IFPLUGD=y +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_FEATURE_IFUPDOWN_IP=y +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y +CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y +CONFIG_NETSTAT=y +# CONFIG_FEATURE_NETSTAT_WIDE is not set +CONFIG_FEATURE_NETSTAT_PRG=y +CONFIG_NSLOOKUP=y +# CONFIG_NTPD is not set +# CONFIG_FEATURE_NTPD_SERVER is not set +CONFIG_PSCAN=y +CONFIG_ROUTE=y +CONFIG_SLATTACH=y +CONFIG_TCPSVD=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y +# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +CONFIG_TFTP=y +# CONFIG_TFTPD is not set + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y +CONFIG_TFTP_DEBUG=y +CONFIG_TRACEROUTE=y +CONFIG_TRACEROUTE6=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y +CONFIG_UDHCPC6=y +# CONFIG_UDHCPD is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_UDHCPC is not set +# CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCP_PORT is not set +CONFIG_UDHCP_DEBUG=0 +# CONFIG_FEATURE_UDHCP_RFC3397 is not set +# CONFIG_FEATURE_UDHCP_8021Q is not set +CONFIG_UDHCPC_DEFAULT_SCRIPT="" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +CONFIG_UDPSVD=y +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y +CONFIG_ZCIP=y + +# +# Print Utilities +# +# CONFIG_LPD is not set +CONFIG_LPR=y +# CONFIG_LPQ is not set + +# +# Mail Utilities +# +CONFIG_MAKEMIME=y +CONFIG_FEATURE_MIME_CHARSET="us-ascii" +CONFIG_POPMAILDIR=y +CONFIG_FEATURE_POPMAILDIR_DELIVERY=y +CONFIG_REFORMIME=y +CONFIG_FEATURE_REFORMIME_COMPAT=y +# CONFIG_SENDMAIL is not set + +# +# Process Utilities +# +CONFIG_IOSTAT=y +CONFIG_LSOF=y +CONFIG_MPSTAT=y +CONFIG_NMETER=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +# CONFIG_PSTREE is not set +# CONFIG_PWDX is not set +# CONFIG_SMEMCAP is not set +CONFIG_UPTIME=y +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_KILLALL5=y +CONFIG_PGREP=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +CONFIG_PKILL=y +CONFIG_PS=y +# CONFIG_FEATURE_PS_WIDE is not set +# CONFIG_FEATURE_PS_LONG is not set +CONFIG_FEATURE_PS_TIME=y +CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_DECIMALS=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y +CONFIG_FEATURE_SHOW_THREADS=y +CONFIG_WATCH=y + +# +# Runit Utilities +# +CONFIG_RUNSV=y +CONFIG_RUNSVDIR=y +CONFIG_FEATURE_RUNSVDIR_LOG=y +CONFIG_SV=y +CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" +CONFIG_SVLOGD=y +CONFIG_CHPST=y +CONFIG_SETUIDGID=y +CONFIG_ENVUIDGID=y +CONFIG_ENVDIR=y +CONFIG_SOFTLIMIT=y +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Shells +# +CONFIG_ASH=y +CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_IDLE_TIMEOUT is not set +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_CMDCMD=y +CONFIG_ASH_MAIL=y +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y +CONFIG_CTTYHACK=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_HUSH_CASE is not set +# CONFIG_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y +CONFIG_SH_MATH_SUPPORT=y +CONFIG_SH_MATH_SUPPORT_64=y +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_FEATURE_SH_NOFORK is not set +CONFIG_FEATURE_SH_HISTFILESIZE=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +# CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_SYSLOGD_CFG is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_FEATURE_KLOGD_KLOGCTL=y +CONFIG_LOGGER=y diff --git a/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-ash.patch b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-ash.patch new file mode 100644 index 00000000..a012a706 --- /dev/null +++ b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-ash.patch @@ -0,0 +1,12 @@ +--- busybox-1.20.1/shell/ash.c ++++ busybox-1.20.1-ash/shell/ash.c +@@ -6846,8 +6846,7 @@ evalvar(char *p, int flags, struct strli + patloc = expdest - (char *)stackblock(); + if (NULL == subevalvar(p, /* varname: */ NULL, patloc, subtype, + startloc, varflags, +-//TODO: | EXP_REDIR too? All other such places do it too +- /* quotes: */ flags & (EXP_FULL | EXP_CASE), ++ /* quotes: */ flags & (EXP_FULL | EXP_CASE | EXP_REDIR), + var_str_list) + ) { + int amount = expdest - ( diff --git a/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-ifupdown.patch b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-ifupdown.patch new file mode 100644 index 00000000..b2a94561 --- /dev/null +++ b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-ifupdown.patch @@ -0,0 +1,75 @@ +--- busybox-1.20.1/networking/ifupdown.c ++++ busybox-1.20.1-ifupdown/networking/ifupdown.c +@@ -140,8 +140,6 @@ static const char keywords_up_down[] ALI + "up\0" + "down\0" + "pre-up\0" +- "pre-down\0" +- "post-up\0" + "post-down\0" + ; + +@@ -895,6 +893,11 @@ static struct interfaces_file_t *read_in + if (rest_of_line[0] == '\0') + bb_error_msg_and_die("option with empty value \"%s\"", buf); + ++ if (strcmp(first_word, "post-up") == 0) ++ first_word += 5; /* "up" */ ++ else if (strcmp(first_word, "pre-down") == 0) ++ first_word += 4; /* "down" */ ++ + /* If not one of "up", "down",... words... */ + if (index_in_strings(keywords_up_down, first_word) < 0) { + int i; +@@ -963,7 +966,7 @@ static char *setlocalenv(const char *for + return result; + } + +-static void set_environ(struct interface_defn_t *iface, const char *mode) ++static void set_environ(struct interface_defn_t *iface, const char *mode, const char *opt) + { + int i; + char **pp; +@@ -976,7 +979,7 @@ static void set_environ(struct interface + } + + /* note: last element will stay NULL: */ +- G.my_environ = xzalloc(sizeof(char *) * (iface->n_options + 6)); ++ G.my_environ = xzalloc(sizeof(char *) * (iface->n_options + 7)); + pp = G.my_environ; + + for (i = 0; i < iface->n_options; i++) { +@@ -990,6 +993,7 @@ static void set_environ(struct interface + *pp++ = setlocalenv("%s=%s", "ADDRFAM", iface->address_family->name); + *pp++ = setlocalenv("%s=%s", "METHOD", iface->method->name); + *pp++ = setlocalenv("%s=%s", "MODE", mode); ++ *pp++ = setlocalenv("%s=%s", "PHASE", opt); + if (G.startup_PATH) + *pp++ = setlocalenv("%s=%s", "PATH", G.startup_PATH); + } +@@ -1044,21 +1048,21 @@ static int check(char *str) + static int iface_up(struct interface_defn_t *iface) + { + if (!iface->method->up(iface, check)) return -1; +- set_environ(iface, "start"); ++ set_environ(iface, "start", "pre-up"); + if (!execute_all(iface, "pre-up")) return 0; + if (!iface->method->up(iface, doit)) return 0; ++ set_environ(iface, "start", "post-up"); + if (!execute_all(iface, "up")) return 0; +- if (!execute_all(iface, "post-up")) return 0; + return 1; + } + + static int iface_down(struct interface_defn_t *iface) + { + if (!iface->method->down(iface,check)) return -1; +- set_environ(iface, "stop"); +- if (!execute_all(iface, "pre-down")) return 0; ++ set_environ(iface, "stop", "pre-down"); + if (!execute_all(iface, "down")) return 0; + if (!iface->method->down(iface, doit)) return 0; ++ set_environ(iface, "stop", "post-down"); + if (!execute_all(iface, "post-down")) return 0; + return 1; + } diff --git a/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-man.patch b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-man.patch new file mode 100644 index 00000000..f382e078 --- /dev/null +++ b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-man.patch @@ -0,0 +1,34 @@ +--- busybox-1.20.1/miscutils/man.c ++++ busybox-1.20.1-man/miscutils/man.c +@@ -129,27 +129,21 @@ static int show_manpage(const char *page + #endif + #if ENABLE_FEATURE_SEAMLESS_XZ + strcpy(ext, "xz"); +- if (run_pipe(pager, man_filename, man, level)) ++ if (run_pipe(pager, filename_with_zext, man, level)) + return 1; + #endif + #if ENABLE_FEATURE_SEAMLESS_BZ2 + strcpy(ext, "bz2"); +- if (run_pipe(pager, man_filename, man, level)) ++ if (run_pipe(pager, filename_with_zext, man, level)) + return 1; + #endif + #if ENABLE_FEATURE_SEAMLESS_GZ + strcpy(ext, "gz"); +- if (run_pipe(pager, man_filename, man, level)) ++ if (run_pipe(pager, filename_with_zext, man, level)) + return 1; + #endif + +-#if SEAMLESS_COMPRESSION +- ext[-1] = '\0'; +-#endif +- if (run_pipe(pager, man_filename, man, level)) +- return 1; +- +- return 0; ++ return run_pipe(pager, man_filename, man, level); + } + + int man_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; diff --git a/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-tar.patch b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-tar.patch new file mode 100644 index 00000000..4129b651 --- /dev/null +++ b/source/a/mkinitrd/fixes-1.20.1/busybox-1.20.1-tar.patch @@ -0,0 +1,11 @@ +--- busybox-1.20.1/archival/libarchive/get_header_tar.c ++++ busybox-1.20.1-tar/archival/libarchive/get_header_tar.c +@@ -84,7 +84,7 @@ static unsigned long long getOctal(char + first >>= 1; /* now 7th bit = 6th bit */ + v = first; /* sign-extend 8 bits to 64 */ + while (--len != 0) +- v = (v << 8) + (unsigned char) *str++; ++ v = (v << 8) + (uint8_t) *++str; + } + return v; + } diff --git a/source/a/mkinitrd/init b/source/a/mkinitrd/init index 2205a592..ae475d89 100755 --- a/source/a/mkinitrd/init +++ b/source/a/mkinitrd/init @@ -78,6 +78,7 @@ PATH="/sbin:/bin:/usr/sbin:/usr/bin" # Mount /proc and /sys: mount -n proc /proc -t proc mount -n sysfs /sys -t sysfs +mount -n tmpfs /run -t tmpfs -o mode=0755 if grep devtmpfs /proc/filesystems 1>/dev/null 2>/dev/null ; then DEVTMPFS=1 @@ -123,7 +124,17 @@ for ARG in $(cat /proc/cmdline); do esac done -# Load kernel modules: +# If udevd is available, use it to generate block devices +# else use mdev to read sysfs and generate the needed devices +if [ -x /sbin/udevd -a -x /sbin/udevadm ]; then + /sbin/udevd --daemon --resolve-names=never + /sbin/udevadm trigger --subsystem-match=block --action=add + /sbin/udevadm settle --timeout=10 +else + [ "$DEVTMPFS" != "1" ] && mdev -s +fi + +# Load kernel modules (ideally this was already done by udev): if [ ! -d /lib/modules/$(uname -r) ]; then echo "No kernel modules found for Linux $(uname -r)." elif [ -x ./load_kernel_modules ]; then # use load_kernel_modules script: @@ -143,16 +154,6 @@ fi # A root filesystem on USB is a good example of that. sleep $WAIT -# If udevd is available, use it to generate block devices -# else use mdev to read sysfs and generate the needed devices -if [ -x /sbin/udevd -a -x /sbin/udevadm ]; then - /sbin/udevd --daemon --resolve-names=never - /sbin/udevadm trigger --subsystem-match=block --action=add - /sbin/udevadm settle --timeout=10 -else - [ "$DEVTMPFS" != "1" ] && mdev -s -fi - # Load a custom keyboard mapping: if [ -n "$KEYMAP" ]; then echo "${INITRD}: Loading '$KEYMAP' keyboard mapping:" @@ -222,7 +223,9 @@ if [ "$RESCUE" = "" ]; then # Initialize LVM: if [ -x /sbin/vgchange ]; then - /sbin/vgchange -ay --ignorelockingfailure + mkdir -p /var/lock/lvm # this avoids useless warnings + /sbin/vgchange -ay --ignorelockingfailure 2>/dev/null + /sbin/udevadm settle --timeout=10 fi # Unlock any LUKS encrypted devices that were deferred above but have now @@ -247,8 +250,14 @@ if [ "$RESCUE" = "" ]; then echo "LUKS device '${LUKSDEV}' unavailable for unlocking!" fi done + /sbin/udevadm settle --timeout=10 fi + # Scan for btrfs multi-device filesystems: + if [ -x /sbin/btrfs ]; then + /sbin/btrfs device scan + fi + # Find root device if a label or UUID was given: if echo $ROOTDEV | grep -q "LABEL=" || \ echo $ROOTDEV | grep -q "UUID=" ; then @@ -264,14 +273,16 @@ if [ "$RESCUE" = "" ]; then # Resume state from swap if [ "$RESUMEDEV" != "" ]; then if ls -l $RESUMEDEV | grep -q "^l" ; then - RESUMEDEV=$(ls -l $RESUMEDEV | awk '{ print $NF }') + #RESUMEDEV=$(ls -l $RESUMEDEV | awk '{ print $NF }') + RESUMEDEV=$(readlink -f $RESUMEDEV) fi echo "Trying to resume from $RESUMEDEV" RESMAJMIN=$(ls -l $RESUMEDEV | tr , : | awk '{ print $5$6 }') echo $RESMAJMIN > /sys/power/resume fi - + # Switch to real root partition: + /sbin/udevadm settle --timeout=10 echo 0x0100 > /proc/sys/kernel/real-root-dev mount -o ro -t $ROOTFS $ROOTDEV /mnt @@ -296,14 +307,16 @@ else /bin/sh fi -if pgrep udevd >/dev/null ; then - /sbin/udevadm settle --timeout=30 - pkill udevd -fi +# Need to make sure OPTIONS+="db_persist" exists for all dm devices +# That should be handled in /sbin/mkinitrd now +/sbin/udevadm info --cleanup-db +/sbin/udevadm control --exit unset ERR mount -o move /proc /mnt/proc mount -o move /sys /mnt/sys +mount -o move /run /mnt/run + [ "$DEVTMPFS" = "1" ] && mount -o move /dev /mnt/dev echo "${INITRD}: exiting" exec switch_root /mnt $INIT $RUNLEVEL diff --git a/source/a/mkinitrd/mkinitrd b/source/a/mkinitrd/mkinitrd index 1a5b7731..c5e30218 100644 --- a/source/a/mkinitrd/mkinitrd +++ b/source/a/mkinitrd/mkinitrd @@ -42,13 +42,15 @@ # Add lukskey option (-K). Automatically add kernel modules listed in # load-kernel-modules if that file is executable. # Yada yada yada. +# Modified by Patrick Volkerding 21 August 2012 +# Add Btrfs multi-device filesystem support option (-B). -MKINITRD_VERSION=1.4.6 +MKINITRD_VERSION=1.4.7 # Don't include these things from /lib/udev/ in the initrd image LIBUDEV_BLACKLIST="\ ipod-set-info \ - check-mtp-camera \ + check-mtp-device \ check-ptp-camera \ udev-configure-printer" @@ -97,6 +99,8 @@ initrd, and the script is easy to modify. Be creative. :-) For example, if your USB thumb drive has a FAT partition with label "TRAVELSTICK" and the actual keyfile is called "/keys/alien.luks", then you need to pass: -K LABEL=TRAVELSTICK:/keys/alien.luks + -B Add /sbin/btrfs to enable scanning for a root filesystem that is + part of a Btrfs multi-device filesystem. -M Add the files in /etc/modprobe.d/ to the initrd -R Add support for RAID partitions -V Display version number @@ -234,8 +238,9 @@ copy_libs() { } copy_modconf() { - mkdir -p $SOURCE_TREE/etc + mkdir -p $SOURCE_TREE/etc $SOURCE_TREE/lib cp -a /etc/modprobe.d $SOURCE_TREE/etc + cp -a /lib/modprobe.d $SOURCE_TREE/lib/ } # If --help is given, print_usage and exit: @@ -255,6 +260,8 @@ fi SOURCE_TREE=${SOURCE_TREE:-/boot/initrd-tree} OUTPUT_IMAGE=${OUTPUT_IMAGE:-""} KERNEL_VERSION=${KERNEL_VERSION:-"$(uname -r)"} +# The initrd requires udev to function correctly: +UDEV=1 # Default actions without options: if [ -z "$1" ]; then @@ -356,6 +363,10 @@ while [ ! -z "$1" ]; do LVM=1 shift ;; + -B) + BTRFS=1 + shift + ;; -M) MODCONF=1 shift @@ -459,12 +470,28 @@ fi # Include RAID support in initrd if [ ! -z "$RAID" ]; then - if [ -r /sbin/mdadm ]; then + if [ -r /sbin/mdadm -a -r /sbin/mdmon ]; then mkdir -p $SOURCE_TREE/sbin cp /sbin/mdadm $SOURCE_TREE/sbin/mdadm + cp /sbin/mdmon $SOURCE_TREE/sbin/mdmon chmod 0755 $SOURCE_TREE/sbin/mdadm + chmod 0755 $SOURCE_TREE/sbin/mdmon + mkdir -p $SOURCE_TREE/lib/udev/rules.d + echo 'KERNEL=="dm-[0-9]*", OPTIONS+="db_persist"' > \ + $SOURCE_TREE/lib/udev/rules.d/95-dm-initrd.rules + else + echo "ERROR: mdadm and/or mdmon binary is missing, RAID support not installed" + fi +fi + +# Include Btrfs support in initrd +if [ ! -z "$BTRFS" ]; then + if [ -r /sbin/btrfs ]; then + mkdir -p $SOURCE_TREE/sbin + cp /sbin/btrfs $SOURCE_TREE/sbin/btrfs + chmod 0755 $SOURCE_TREE/sbin/btrfs else - echo "ERROR: mdadm binary is missing, RAID support not installed" + echo "ERROR: btrfs binary is missing, Btrfs support not installed" fi fi @@ -474,7 +501,11 @@ if [ ! -z "$UDEV" ]; then cp -a /lib/udev $SOURCE_TREE/lib/ # But we don't want all of /lib/udev for file in $(echo $LIBUDEV_BLACKLIST) ; do - rm -f $SOURCE_TREE/lib/udev/$file ; + # Replace with a null script (avoids error spew): + cat << EOF > $SOURCE_TREE/lib/udev/$file +#!/bin/ash +# This space is intentionally left blank +EOF done fi @@ -493,6 +524,9 @@ if [ ! -z "$LVM" ]; then elif ! echo ${MODULE_LIST} | grep -q dm-mod ; then MODULE_LIST="$MODULE_LIST:dm-mod" fi + mkdir -p $SOURCE_TREE/lib/udev/rules.d + echo 'KERNEL=="dm-[0-9]*", OPTIONS+="db_persist"' > \ + $SOURCE_TREE/lib/udev/rules.d/95-dm-initrd.rules else echo "LVM binary is missing, LVM support isn't installed" fi @@ -528,6 +562,16 @@ if [ ! -d $SOURCE_TREE/lib/modules/$KERNEL_VERSION ]; then mkdir -p $SOURCE_TREE/lib/modules/$KERNEL_VERSION fi +# Copy kmod/modprobe stuff to initrd: +for i in kmod depmod insmod lsmod modinfo modprobe rmmod ; do + rm -f $SOURCE_TREE/sbin/$i ; + cp -a /sbin/$i $SOURCE_TREE/sbin ; +done + +# Make sure modules.builtin and modules.order are there (for kmod): +cp /lib/modules/$KERNEL_VERSION/modules.{builtin,order} \ + $SOURCE_TREE/lib/modules/$KERNEL_VERSION + # If an executable $SOURCE_TREE/load_kernel_modules already exists, then # we assume you will want to load the kernel modules mentioned in there. # This means, you do not have to explicitly add those on the commandline: @@ -589,8 +633,8 @@ if [ ! -z "$MODULE_LIST" ]; then /sbin/modprobe --set-version $KERNEL_VERSION --show-depends --ignore-install $MODULE 2>/dev/null \ | grep "^insmod " | cut -f 2 -d ' ' | while read SRCMOD; do - if ! grep -q "$(basename $SRCMOD .ko)" $SOURCE_TREE/load_kernel_modules 2>/dev/null ; then - LINE="$(echo "modprobe -v $(basename $SRCMOD .ko)" )" + if ! grep -Eq " $(basename $SRCMOD .ko)(\.| |$)" $SOURCE_TREE/load_kernel_modules 2>/dev/null ; then + LINE="$(echo "modprobe -v $(basename ${SRCMOD%%.gz} .ko)" )" # Test to see if arguments should be passed # Over-ride the previously defined LINE variable if so @@ -611,6 +655,15 @@ if [ ! -z "$MODULE_LIST" ]; then # replacement. if cp -a --parents $SRCMOD $SOURCE_TREE 2>/dev/null; then echo "OK: $SRCMOD added." + # If a module needs firmware, copy that too + /sbin/modinfo -F firmware "$SRCMOD" | sed 's/^/\/lib\/firmware\//' | + while read SRCFW; do + if cp -a --parents "$SRCFW" $SOURCE_TREE 2>/dev/null; then + echo "OK: $SRCFW added." + else + echo "WARNING: Could not find firmware \"$SRCFW\"" + fi + done else echo "WARNING: Could not find module \"$SRCMOD\"" fi @@ -631,6 +684,11 @@ fi # Copy needed libraries copy_libs +# Make sure all libraries have symlinks: +/sbin/ldconfig $(readlink -f $SOURCE_TREE)/lib/ 2> /dev/null +/sbin/ldconfig $(readlink -f $SOURCE_TREE)/lib64/ 2> /dev/null +/sbin/ldconfig + # And finally, build the initrd: build_initrd_image diff --git a/source/a/mkinitrd/mkinitrd.8 b/source/a/mkinitrd/mkinitrd.8 index be4e9d42..6ee25bdd 100644 --- a/source/a/mkinitrd/mkinitrd.8 +++ b/source/a/mkinitrd/mkinitrd.8 @@ -52,6 +52,9 @@ mkinitrd \- create or rebuilt an initrd (initial ramdisk) using initramfs (simpl .B \-K luks_keyfile ] [ +.B \-B +] +[ .B \-L ] [ @@ -171,6 +174,11 @@ you need to set: -K LABEL=TRAVELSTICK:/keys/alien.luks .TP +.B \-B +This option adds the btrfs utility to the initrd so that multi-device filesystems +will be picked up by a scan (/sbin/btrfs device scan). This is needed if the +root filesystem is a Btrfs multi-device filesystem. +.TP .B \-L This option adds LVM support to the initrd, if the tools are available on the system. diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild index 953d3cf8..322fa8c5 100755 --- a/source/a/mkinitrd/mkinitrd.SlackBuild +++ b/source/a/mkinitrd/mkinitrd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,9 +21,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-1.4.6} -BB=1.18.4 -BUILD=${BUILD:-11} +VERSION=${VERSION:-1.4.7} +BB=1.20.1 +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -54,6 +54,12 @@ rm -rf busybox-$BB tar xvf $CWD/busybox-$BB.tar.?z* || exit 1 cd busybox-$BB +if [ -d $CWD/fixes-$BB ]; then + for pfile in $CWD/fixes-$BB/*.patch ; do + patch -p1 < $pfile || exit 1 + done +fi + chown -R root:root . sed -e \ 's#^CONFIG_PREFIX=.*#CONFIG_PREFIX="'$PKG'/usr/share/mkinitrd/initrd-tree"#' \ @@ -105,29 +111,18 @@ chown root:root $PKG/etc/mkinitrd.conf.sample chmod 644 $PKG/etc/mkinitrd.conf.sample mkdir -p $PKG/usr/doc/mkinitrd-$VERSION -cp -a $CWD/README.initrd $PKG/usr/doc/mkinitrd-$VERSION - -( cd $PKG/usr/doc/mkinitrd-$VERSION - DATE="$(date)" - KERNEL_VERSION="$(uname -r)" - PACKAGE_VERSION="$(uname -r | tr - _)" - LILO_KERNEL_NAME="$(echo $(uname -r) | tr -d . | tr -d - )" - cat README.initrd | sed -e s/@DATE@/"$DATE"/ > README.initrd1 - cat README.initrd1 | sed -e s/@KERNEL_VERSION@/"$KERNEL_VERSION"/ > README.initrd2 - cat README.initrd2 | sed -e s/@PACKAGE_VERSION@/"$PACKAGE_VERSION"/ > README.initrd3 - cat README.initrd3 | sed -e s/@LILO_KERNEL_NAME@/"$LILO_KERNEL_NAME"/ > README.initrd4 - cat README.initrd4 | sed -e s/@MKINITRD_VERSION@/"$VERSION"/ > README.initrd5 - cat README.initrd5 | sed -e s/@ARCH@/"$ARCH"/ > README.initrd6 - cat README.initrd6 | sed -e s/@BUILD@/"$BUILD"/ > README.initrd - rm -f README.initrd{1,2,3,4,5,6} -) -chmod 644 $PKG/usr/doc/mkinitrd-$VERSION/* -chown root:root $PKG/usr/doc/mkinitrd-$VERSION/* +sed $CWD/README.initrd \ + -e "s,@DATE@,$(date),g" \ + -e "s,@KERNEL_VERSION@,$(uname -r),g" \ + -e "s,@PACKAGE_VERSION@,$(uname -r | tr - _),g" \ + -e "s,@LILO_KERNEL_NAME@,$(echo $(uname -r) | tr -d . | tr -d - ),g" \ + -e "s,@MKINITRD_VERSION@,$VERSION,g" \ + -e "s,@ARCH@,$ARCH,g" \ + -e "s,@BUILD@,$BUILD,g" \ + > $PKG/usr/doc/mkinitrd-$VERSION/README.initrd mkdir $PKG/boot -( cd $PKG/boot - ln -sf /usr/doc/mkinitrd-$VERSION/README.initrd . -) +ln -sf /usr/doc/mkinitrd-$VERSION/README.initrd $PKG/boot/README.initrd find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/a/module-init-tools/doinst.sh b/source/a/module-init-tools/doinst.sh deleted file mode 100644 index f455be89..00000000 --- a/source/a/module-init-tools/doinst.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Remove/move obsolete configuration: -if [ -L etc/modprobe.d/modprobe.conf ]; then - rm -f etc/modprobe.d/modprobe.conf -fi -if [ -e etc/modprobe.conf ]; then - mv etc/modprobe.conf etc/modprobe.conf.obsolete -fi diff --git a/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff b/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff deleted file mode 100644 index 5517502b..00000000 --- a/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff +++ /dev/null @@ -1,41 +0,0 @@ -diff -Nur module-init-tools-3.12.orig//modprobe.c module-init-tools-3.12/modprobe.c ---- module-init-tools-3.12.orig//modprobe.c 2010-05-04 00:19:27.000000000 -0500 -+++ module-init-tools-3.12/modprobe.c 2010-06-08 04:32:46.655088739 -0500 -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - - #include "util.h" - #include "elfops.h" -@@ -789,6 +790,20 @@ - return strsep(string, delim); - } - -+/* Let's exclude a few file extensions */ -+static int valid_file_name(const char *filename) -+{ -+ static regex_t *re = NULL; -+ -+ if (!re) { -+ re = NOFAIL(malloc(sizeof(regex_t))); -+ if (regcomp(re, "(^(\\.|\\.\\.)|\\.(new|orig|bak)$)", -+ REG_EXTENDED|REG_NOSUB) != 0) -+ fatal("regcomp failed: %s\n", strerror(errno)); -+ } -+ return regexec(re, filename, 0, NULL, 0); -+} -+ - static int parse_config_scan(const char *filename, - struct modprobe_conf *conf, - int dump_only, -@@ -1066,6 +1081,8 @@ - while ((i = readdir(dir)) != NULL) { - size_t len; - -+ if (!valid_file_name(i->d_name)) -+ continue; - if (i->d_name[0] == '.') - continue; - if (!config_filter(i->d_name)) diff --git a/source/a/module-init-tools/module-init-tools.SlackBuild b/source/a/module-init-tools/module-init-tools.SlackBuild deleted file mode 100755 index a8dc73ab..00000000 --- a/source/a/module-init-tools/module-init-tools.SlackBuild +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh - -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -VERSION=${VERSION:-$(echo module-init-tools-*.tar.?z* | cut -d - -f 4 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:--j7} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-module-init-tools - -rm -rf $PKG -mkdir -p $TMP $PKG - -cd $TMP -rm -rf module-init-tools-$VERSION -tar xvf $CWD/module-init-tools-$VERSION.tar.?z* || exit 1 -cd module-init-tools-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Exclude *.{old,new,bak} files (and a few others that obviously aren't -# valid for this... Thanks to Marco d'Itri for the patch that it's based on -zcat $CWD/modprobe.ignore_some_suffixes.diff.gz | patch -p1 || exit 1 - -# Using --bindir=/sbin to make lsmod go there too -CFLAGS= \ -./configure \ - --prefix=/ \ - --bindir=/sbin \ - --docdir=/usr/doc/module-init-tools-$VERSION \ - --mandir=/usr/man \ - --enable-zlib \ - --build=$ARCH-slackware-linux - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Create the config directory just in case -mkdir -p $PKG/etc/modprobe.d/ - -# Link lsmod into /bin -mkdir -p $PKG/bin -( cd $PKG/bin ; ln -sf /sbin/lsmod . ) - -# Compress manpages -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/module-init-tools-$VERSION -cp -a \ - AUTHORS CODING COPYING FAQ README TODO \ - $PKG/usr/doc/module-init-tools-$VERSION - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/module-init-tools-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/a/module-init-tools/slack-desc b/source/a/module-init-tools/slack-desc deleted file mode 100644 index 99d071b0..00000000 --- a/source/a/module-init-tools/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-------------------------------------------------------| -module-init-tools: module-init-tools (kernel module utilities) -module-init-tools: -module-init-tools: Utilities to load and unload kernel modules. These are used on Linux -module-init-tools: to load extra drivers or other features into the running kernel. -module-init-tools: -module-init-tools: -module-init-tools: -module-init-tools: -module-init-tools: -module-init-tools: -module-init-tools: diff --git a/source/a/ntfs-3g/99-ntfs-3g.rules b/source/a/ntfs-3g/99-ntfs-3g.rules new file mode 100644 index 00000000..c27c3cbb --- /dev/null +++ b/source/a/ntfs-3g/99-ntfs-3g.rules @@ -0,0 +1,2 @@ +# Use ntfs-3g rather than regular ntfs for devices detected through udev: +ENV{ID_FS_TYPE}=="ntfs", ENV{ID_FS_TYPE}="ntfs-3g" diff --git a/source/a/ntfs-3g/ntfs-3g.SlackBuild b/source/a/ntfs-3g/ntfs-3g.SlackBuild index ab5b1f71..086cb3e8 100755 --- a/source/a/ntfs-3g/ntfs-3g.SlackBuild +++ b/source/a/ntfs-3g/ntfs-3g.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for ntfs-3g # Copyright 2008 Antonio Hernandez Blas +# Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -26,9 +27,10 @@ # Modified by Eric Hameleers PKGNAM=ntfs-3g -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +VERSION=2012.1.15 +BUILD=${BUILD:-2} +SRCNAM=ntfs-3g_ntfsprogs NUMJOBS=${NUMJOBS:-" -j7 "} # Automatically determine the architecture we're building on: @@ -62,9 +64,9 @@ PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP || exit 1 -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +cd $SRCNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -90,17 +92,45 @@ CXXFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# I hate to do this (it worked without it before), but recently /bin/ntfs-3g +# ceased to work for non-root users unless it is setuid root. If anyone has +# any better ideas, I'd like to hear them. +chmod 4711 $PKG/bin/ntfs-3g + # Add the HAL fdi file so that automount uses ntfs-3g for mounting # This should work with the "volume.fstype.alternative.*" in hal-0.5.12+ mkdir -p $PKG/usr/share/hal/fdi/policy/10osvendor cat $CWD/10-ntfs-3g-policy.fdi \ > $PKG/usr/share/hal/fdi/policy/10osvendor/10-ntfs-3g-policy.fdi +# Create a mount.ntfs -> mount.ntfs-3g symlink. +# This causes ntfs-3g to always be used when mounting NTFS filesystems. +# NOTE: This also seems to make mounting with the old ntfs filesystem +# impossible. But does anyone care? +( cd $PKG/sbin ; ln -s mount.ntfs-3g mount.ntfs ) + +## Add a udev rule to use ntfs-3g instead of ntfs: +## (This is not needed if the mount.ntfs symlink is made) +#mkdir -p $PKG/lib/udev/rules.d +#cat $CWD/99-ntfs-3g.rules > $PKG/lib/udev/rules.d/99-ntfs-3g.rules + find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi rm -rf $PKG/usr/share/doc mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/a/patch/patch.281537bcd92515ae3b9f154acd579ce97260f99b.diff b/source/a/patch/patch.281537bcd92515ae3b9f154acd579ce97260f99b.diff new file mode 100644 index 00000000..b882b725 --- /dev/null +++ b/source/a/patch/patch.281537bcd92515ae3b9f154acd579ce97260f99b.diff @@ -0,0 +1,78 @@ +From 281537bcd92515ae3b9f154acd579ce97260f99b Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Thu, 13 Sep 2012 14:13:08 +0000 +Subject: In a git-style diff, make sure not to unlink the original by accident + +* src/patch.c (main): Fail if a file is not empty as expected. +(output_files): In a git-style diff, make sure not to unlink the original when +making a backup of an unmodified file. +* tests/create-delete: Fix failed-file-deletion test and add +successful-file-deletion test. +--- +diff --git a/src/patch.c b/src/patch.c +index 1c6fb4b..ce81bbe 100644 +--- a/src/patch.c ++++ b/src/patch.c +@@ -508,6 +508,7 @@ main (int argc, char **argv) + && ! (merge && somefailed)) + { + mismatch = true; ++ somefailed = true; + if (verbosity != SILENT) + say ("File %s is not empty after patch, as expected\n", + quotearg (outname)); +@@ -1865,7 +1866,7 @@ output_files (struct stat const *st) + output_file_now (file_to_output->from, &from_needs_removal, + from_st, file_to_output->to, + file_to_output->mode, file_to_output->backup); +- if (from_needs_removal) ++ if (file_to_output->to && from_needs_removal) + unlink (file_to_output->from); + + if (st && st->st_dev == from_st->st_dev && st->st_ino == from_st->st_ino) +diff --git a/tests/create-delete b/tests/create-delete +index 9a6e1bb..7eed11f 100644 +--- a/tests/create-delete ++++ b/tests/create-delete +@@ -176,12 +176,37 @@ EOF + echo data > target + cat > p.diff < p.diff < +Date: Tue, 18 Sep 2012 10:51:17 +0000 +Subject: Fix file truncation when switching from git diff to non-git diff + +* src/patch.c (main): Output queued output files only when switching from a git +diff to a non-git diff. This can modify the input file, so make sure to +stat() it again. +* tests/concat-git-diff: Add test case growing a file with a git diff and then +with a non-git diff; without this fix; the result would be truncated. +--- +diff --git a/src/patch.c b/src/patch.c +index 0bce8fb..0b0fdd4 100644 +--- a/src/patch.c ++++ b/src/patch.c +@@ -196,8 +196,12 @@ main (int argc, char **argv) + + if (have_git_diff != pch_git_diff ()) + { ++ if (have_git_diff) ++ { ++ output_files (NULL); ++ inerrno = -1; ++ } + have_git_diff = ! have_git_diff; +- output_files (NULL); + } + + if (TMPREJNAME_needs_removal) +diff --git a/tests/concat-git-diff b/tests/concat-git-diff +index 927eb5a..c78da53 100644 +--- a/tests/concat-git-diff ++++ b/tests/concat-git-diff +@@ -56,11 +56,7 @@ check 'cat f' < f < f + + cat > concat2.diff < f ++ ++cat > concat3.diff < $PKG/usr/sbin/update-pciids -chmod 0755 $PKG/usr/sbin/update-pciids +zcat $CWD/pciutils.dontcompress.diff.gz | patch -p1 || exit 1 +zcat $CWD/pciutils.update.pci.ids.url.diff.gz | patch -p1 || exit 1 +# Make and install the shared library make \ PREFIX=/usr \ SBINDIR=/sbin \ LIBDIR=/usr/lib${LIBDIRSUFFIX} \ MANDIR=/usr/man \ + IDSDIR=/usr/share/hwdata \ + PCI_IDS=pci.ids \ + PCI_COMPRESSED_IDS=0 \ + SHARED=no \ OPT="$SLKCFLAGS" \ $NUMJOBS || exit 1 @@ -88,26 +86,52 @@ make install install-lib \ SBINDIR=/sbin \ LIBDIR=/usr/lib${LIBDIRSUFFIX} \ MANDIR=/usr/man \ + IDSDIR=/usr/share/hwdata \ + PCI_IDS=pci.ids \ + PCI_COMPRESSED_IDS=0 \ + SHARED=no \ DESTDIR=$PKG -# Do not compress pci.ids - hal needs it uncompressed +mkdir -p $PKG/usr/sbin +mv $PKG/sbin/update-pciids $PKG/usr/sbin/update-pciids + +# Do not compress pci.ids ( cd $PKG/usr/share ; gzip -d pci.ids.gz ) -# Remove the update-pciids script that 'make install' placed -rm -f $PKG/sbin/update-pciids -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +# Put a compat symlink in place +ln -s hwdata/pci.ids $PKG/usr/share/pci.ids + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null mkdir -p $PKG/usr/doc/pciutils-$VERSION cp -a \ - ChangeLog README TODO \ + COPYING* README TODO \ $PKG/usr/doc/pciutils-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/a/pciutils/pciutils.dontcompress.diff b/source/a/pciutils/pciutils.dontcompress.diff new file mode 100644 index 00000000..91089b8e --- /dev/null +++ b/source/a/pciutils/pciutils.dontcompress.diff @@ -0,0 +1,11 @@ +--- ./update-pciids.sh.orig 2012-01-14 08:29:38.000000000 -0600 ++++ ./update-pciids.sh 2012-07-02 21:27:47.524912718 -0500 +@@ -5,7 +5,7 @@ + set -e + SRC="http://pci-ids.ucw.cz/v2.2/pci.ids" + DEST=pci.ids +-PCI_COMPRESSED_IDS= ++PCI_COMPRESSED_IDS=0 + GREP=grep + + # if pci.ids is read-only (because the filesystem is read-only), diff --git a/source/a/pciutils/pciutils.ids.dest.diff b/source/a/pciutils/pciutils.ids.dest.diff deleted file mode 100644 index 98d152c2..00000000 --- a/source/a/pciutils/pciutils.ids.dest.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur pciutils-3.1.3.orig/update-pciids.sh pciutils-3.1.3/update-pciids.sh ---- pciutils-3.1.3.orig/update-pciids.sh 2008-11-10 17:11:51.000000000 -0600 -+++ pciutils-3.1.3/update-pciids.sh 2009-07-29 02:23:53.102308103 -0500 -@@ -3,8 +3,8 @@ - [ "$1" = "-q" ] && quiet=true || quiet=false - - set -e --SRC="http://pciids.sourceforge.net/v2.2/pci.ids" --DEST=pci.ids -+SRC="http://pciids.sourceforge.net/pci.ids" -+DEST=/usr/share/pci.ids - PCI_COMPRESSED_IDS= - GREP=grep - diff --git a/source/a/pciutils/pciutils.update.pci.ids.url.diff b/source/a/pciutils/pciutils.update.pci.ids.url.diff new file mode 100644 index 00000000..1588f729 --- /dev/null +++ b/source/a/pciutils/pciutils.update.pci.ids.url.diff @@ -0,0 +1,11 @@ +--- ./update-pciids.sh.orig 2012-07-02 21:45:31.280890064 -0500 ++++ ./update-pciids.sh 2012-07-02 21:46:03.875889369 -0500 +@@ -3,7 +3,7 @@ + [ "$1" = "-q" ] && quiet=true || quiet=false + + set -e +-SRC="http://pci-ids.ucw.cz/v2.2/pci.ids" ++SRC="http://pciids.sourceforge.net/pci.ids" + DEST=pci.ids + PCI_COMPRESSED_IDS=0 + GREP=grep diff --git a/source/a/pciutils/pciutils.url b/source/a/pciutils/pciutils.url index e77494b5..66d422ce 100644 --- a/source/a/pciutils/pciutils.url +++ b/source/a/pciutils/pciutils.url @@ -1,2 +1,3 @@ -#ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ -ftp.kernel.org:/pub/software/utils/pciutils/ +ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ +ftp://ftp.kernel.org/pub/software/utils/pciutils/ +ftp://metalab.unc.edu/pub/Linux/hardware/ \ No newline at end of file diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index 4d3a07bf..c5bc2d43 100755 --- a/source/a/pkgtools/pkgtools.SlackBuild +++ b/source/a/pkgtools/pkgtools.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,9 +27,9 @@ fi PKG=$TMP/package-pkgtools # *** UPDATE THESE WITH EACH BUILD: -VERSION=13.37 +VERSION=14.0 ARCH=${ARCH:-noarch} -BUILD=9 +BUILD=2 if [ ! -d $TMP ]; then mkdir -p $TMP # location to build the source diff --git a/source/a/pkgtools/scripts/pkgtool b/source/a/pkgtools/scripts/pkgtool index a64ef09c..ba8ecd0a 100644 --- a/source/a/pkgtools/scripts/pkgtool +++ b/source/a/pkgtools/scripts/pkgtool @@ -212,7 +212,7 @@ else # there were no arguments, so we'll get the needed information from the CMD_START="true" rm -f $TMP/SeT* while [ 0 ]; do - dialog --title "Slackware Package Tool (pkgtool version 13.37)" \ + dialog --title "Slackware Package Tool (pkgtool version 14.0)" \ --menu "\nWelcome to the Slackware package tool.\n\ \nWhich option would you like?\n" 17 75 7 \ "Current" "Install packages from the current directory" \ diff --git a/source/a/pkgtools/scripts/setup.services b/source/a/pkgtools/scripts/setup.services index aee2599f..f700a8df 100644 --- a/source/a/pkgtools/scripts/setup.services +++ b/source/a/pkgtools/scripts/setup.services @@ -148,7 +148,7 @@ if [ -r etc/rc.d/rc.messagebus ]; then RC_MESSAGEBUS=off fi cat << EOF >> $TMP/tmpscript - "rc.messagebus" "D-Bus system message bus" $RC_MESSAGEBUS "Used for communication by HAL and other programs." \\ + "rc.messagebus" "D-Bus system message bus" $RC_MESSAGEBUS "Used for interprocess communication and coordination." \\ EOF fi diff --git a/source/a/shadow/adduser b/source/a/shadow/adduser index 5b674a85..ce06aac5 100644 --- a/source/a/shadow/adduser +++ b/source/a/shadow/adduser @@ -3,6 +3,7 @@ # Copyright 1995 Hrvoje Dogan, Croatia. # Copyright 2002-2004, 2008, 2009, 2010 Stuart Winter, Surrey, England, UK. # Copyright 2004, 2008-2010 Slackware Linux, Inc., Concord, CA, USA +# Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,12 +30,16 @@ # Author : Stuart Winter # Based on the original Slackware adduser by Hrvoje Dogan # with modifications by Patrick Volkerding -# Version: 1.13 +# Version: 1.15 ########################################################################## # Usage..: adduser [] ########################################################################## # History # ########### +# v1.15 - 2012-09-13 +# * Added scanner group, which may be required by third party drivers. +# v1.14 - 2012-08-24 +# * Added lp group, which is now required for scanning. # v1.13 - 13/01/10 # * Fixed bug that removed underscore characters from UNIX group names. # Thanks to mRgOBLIN for the report and Jim Hawkins for the fix. @@ -107,7 +112,7 @@ defhome=/home defshell=/bin/bash defchmod=711 # home dir permissions - may be preferable to use 701, however. defgroup=users -AGID="audio cdrom floppy plugdev video power netdev" # additional groups for desktop users +AGID="audio cdrom floppy plugdev video power netdev lp scanner" # additional groups for desktop users # Determine what the minimum UID is (for UID recycling) # (we ignore it if it's not at the beginning of the line (i.e. commented out with #)) diff --git a/source/a/shadow/login.defs b/source/a/shadow/login.defs index dde37c97..e52f91a5 100644 --- a/source/a/shadow/login.defs +++ b/source/a/shadow/login.defs @@ -300,7 +300,7 @@ CHFN_RESTRICT frwh # If set to DES, DES-based algorithm will be used for encrypting password (default) # Overrides the MD5_CRYPT_ENAB option # -ENCRYPT_METHOD MD5 +ENCRYPT_METHOD SHA256 # # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512. @@ -327,7 +327,9 @@ ENCRYPT_METHOD MD5 # access to these groups, even when not logged in on the console. # How to do it is left as an exercise for the reader... # -# Most of these groups are self-explanatory. +# Most of these groups are self-explanatory, but in the case of +# "lp", it is because group lp is needed to use a scanner that +# is part of a multifunction printer. # # Note that users are added to these default groups only when # logging into a shell with /bin/login, not when using a login @@ -336,7 +338,7 @@ ENCRYPT_METHOD MD5 # when the user is added with adduser or useradd, or by editing # /etc/group directly, preferably using "vigr" # -CONSOLE_GROUPS floppy:audio:cdrom:video:scanner +CONSOLE_GROUPS floppy:audio:cdrom:video:lp:scanner # # Should login be allowed if we can't cd to the home directory? diff --git a/source/a/shadow/patches/README_PATCHES b/source/a/shadow/patches/README_PATCHES index 0c639d1a..1d1f2173 100644 --- a/source/a/shadow/patches/README_PATCHES +++ b/source/a/shadow/patches/README_PATCHES @@ -4,6 +4,7 @@ r3055.diff: Help output to stderr not stdout. r3060.diff: Fix memory leaks r3062.diff: Avoid memzero() on a possibly NULL pointer. r3096.diff: Fix parsing of gshadow entries. +r3090.diff: Fix improper sanitizing of locale variables. r3160.diff: Fixed limits support (non PAM enabled versions only) r3194.diff: shell's name must be -su when a su fakes a login. r3299.diff: man/ru/Makefile.am: Remove double inclusion of $(man_nopam) diff --git a/source/a/shadow/patches/r3090.diff b/source/a/shadow/patches/r3090.diff new file mode 100644 index 00000000..46057673 --- /dev/null +++ b/source/a/shadow/patches/r3090.diff @@ -0,0 +1,11 @@ +--- libmisc/env.c.orig 2011-02-13 11:58:11.000000000 -0600 ++++ libmisc/env.c 2012-08-14 10:38:25.304917619 -0500 +@@ -251,7 +251,7 @@ + if (strncmp (*cur, *bad, strlen (*bad)) != 0) { + continue; + } +- if (strchr (*cur, '/') != NULL) { ++ if (strchr (*cur, '/') == NULL) { + continue; /* OK */ + } + for (move = cur; NULL != *move; move++) { diff --git a/source/a/shadow/patches/r3299.diff b/source/a/shadow/patches/r3299.diff deleted file mode 100644 index a46b18f0..00000000 --- a/source/a/shadow/patches/r3299.diff +++ /dev/null @@ -1,12 +0,0 @@ -Index: man/ru/Makefile.am -=================================================================== ---- man/ru/Makefile.am (revision 3298) -+++ man/ru/Makefile.am (revision 3299) -@@ -1,7 +1,6 @@ - mandir = @mandir@/ru - - man_MANS = \ -- $(man_nopam) \ - chage.1 \ - chfn.1 \ - chgpasswd.8 \ diff --git a/source/a/shadow/patches/unused/r3299.diff b/source/a/shadow/patches/unused/r3299.diff new file mode 100644 index 00000000..a46b18f0 --- /dev/null +++ b/source/a/shadow/patches/unused/r3299.diff @@ -0,0 +1,12 @@ +Index: man/ru/Makefile.am +=================================================================== +--- man/ru/Makefile.am (revision 3298) ++++ man/ru/Makefile.am (revision 3299) +@@ -1,7 +1,6 @@ + mandir = @mandir@/ru + + man_MANS = \ +- $(man_nopam) \ + chage.1 \ + chfn.1 \ + chgpasswd.8 \ diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild index c3d2e9c7..41e9353b 100755 --- a/source/a/shadow/shadow.SlackBuild +++ b/source/a/shadow/shadow.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ PKGNAM=shadow VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -63,8 +63,12 @@ for patch in $CWD/patches/*.diff.gz ; do zcat $patch | patch -p0 --verbose || exit 1 done +# Don't duplicate Russian man page installations: +zcat $CWD/shadow.man.nodups.diff.gz | patch -p1 --verbose || exit 1 + # Re-run automake because of r3299 patch to man/ru/Makefile.am: -automake -f +# (not used because it doesn't work... above patch does the intended fix) +#automake -f chown -R root:root . find . \ diff --git a/source/a/shadow/shadow.man.nodups.diff b/source/a/shadow/shadow.man.nodups.diff new file mode 100644 index 00000000..425321b9 --- /dev/null +++ b/source/a/shadow/shadow.man.nodups.diff @@ -0,0 +1,11 @@ +--- ./man/ru/Makefile.in.orig 2011-02-15 16:18:21.000000000 -0600 ++++ ./man/ru/Makefile.in 2012-06-26 23:21:34.866292111 -0500 +@@ -228,7 +228,7 @@ + grpunconv.8 gshadow.5 lastlog.8 login.1 login.defs.5 logoutd.8 \ + newgrp.1 newusers.8 nologin.8 passwd.1 passwd.5 pwck.8 \ + pwconv.8 pwunconv.8 sg.1 shadow.3 shadow.5 su.1 suauth.5 \ +- useradd.8 userdel.8 usermod.8 vigr.8 vipw.8 $(am__append_1) ++ useradd.8 userdel.8 usermod.8 vigr.8 vipw.8 + man_nopam = \ + limits.5 \ + login.access.5 \ diff --git a/source/a/slocate/slocate.CVE-2007-0277.diff b/source/a/slocate/slocate.CVE-2007-0277.diff new file mode 100644 index 00000000..4f109922 --- /dev/null +++ b/source/a/slocate/slocate.CVE-2007-0277.diff @@ -0,0 +1,42 @@ +--- slocate-3.1.orig/src/utils.c ++++ slocate-3.1/src/utils.c +@@ -524,6 +524,7 @@ + { + struct stat path_stat; + int ret = 0; ++ char *path_copy = NULL; + char *ptr = NULL; + + if (lstat(path, &path_stat) == -1) +@@ -532,15 +533,25 @@ + if (!S_ISLNK(path_stat.st_mode)) { + if (access(path, F_OK) != 0) + goto EXIT; +- } else if ((ptr = rindex(path, '/'))) { +- *ptr = 0; +- if (access(path, F_OK) == 0) +- ret = 1; +- *ptr = '/'; +- goto EXIT; + } + ++ /* "path" is const, so we shouldn't modify it. Also, for speed, ++ * I suspect strdup/free is less expensive than the deep access ++ * checks... */ ++ if (!(path_copy = strdup(path))) ++ goto EXIT; ++ + ret = 1; ++ ++ /* Each directory leading to the file (symlink or not) must be ++ * readable for us to allow it to be listed in search results. */ ++ while (ret && (ptr=rindex(path_copy,'/'))) { ++ *ptr=0; ++ if (*path_copy && access(path_copy, R_OK) != 0) ++ ret = 0; ++ } ++ free(path_copy); ++ + EXIT: + return ret; + } diff --git a/source/a/slocate/slocate.SlackBuild b/source/a/slocate/slocate.SlackBuild index eef2fd1f..def08b8c 100755 --- a/source/a/slocate/slocate.SlackBuild +++ b/source/a/slocate/slocate.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=3.1 -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -55,8 +55,12 @@ explodepkg $CWD/_slocate.tar.gz cd $TMP rm -rf slocate-$VERSION -tar xzvf $CWD/slocate-$VERSION.tar.gz -cd slocate-$VERSION +tar xzvf $CWD/slocate-$VERSION.tar.gz || exit 1 +cd slocate-$VERSION || exit 1 + +zcat $CWD/slocate.bigfile.diff.gz | patch -p0 --verbose || exit 1 +zcat $CWD/slocate.CVE-2007-0277.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 2750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -65,7 +69,7 @@ find . \ -exec chmod 644 {} \; cd src -make CFLAGS="$SLKCFLAGS" +make CFLAGS="$SLKCFLAGS -D_LARGEFILE64_SOURCE" || exit 1 cd .. strip --strip-unneeded src/slocate mkdir -p $PKG/usr/bin diff --git a/source/a/slocate/slocate.bigfile.diff b/source/a/slocate/slocate.bigfile.diff new file mode 100644 index 00000000..6ccd1202 --- /dev/null +++ b/source/a/slocate/slocate.bigfile.diff @@ -0,0 +1,33 @@ +Fix 2GB limitation - brought to you by mancha + +--- src/utils.c.orig 2012-08-25 ++++ src/utils.c 2012-08-25 +@@ -284,12 +284,12 @@ int + verify_slocate_db(struct g_data_s *g_data, char *file) + { + char ch[1]; +- struct stat tf_stat; ++ struct stat64 tf_stat; + int bytes = 0; + int fd = -1; + + if (access(file, W_OK | R_OK) == 0) { +- if (lstat(file, &tf_stat) == -1) { ++ if (lstat64(file, &tf_stat) == -1) { + if (!report_error(g_data, FATAL, "get_temp_file: fstat(): %s: %s\n", file, strerror(errno))) + goto EXIT; + +@@ -522,11 +522,11 @@ EXIT: + * to check them separately */ + int verify_access(const char *path) + { +- struct stat path_stat; ++ struct stat64 path_stat; + int ret = 0; + char *ptr = NULL; + +- if (lstat(path, &path_stat) == -1) ++ if (lstat64(path, &path_stat) == -1) + goto EXIT; + + if (!S_ISLNK(path_stat.st_mode)) { diff --git a/source/a/syslinux/syslinux-3.84.tar.bz2.sign b/source/a/syslinux/syslinux-3.84.tar.bz2.sign deleted file mode 100644 index 987a8ed9..00000000 --- a/source/a/syslinux/syslinux-3.84.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBLLBRQyGugalF9Dw4RAmsiAJ9geAzuilvLYCEc03sP1mJLG77UaQCeJlV+ -TgEccKCkyIkwwpBYDHesUjA= -=1AUa ------END PGP SIGNATURE----- diff --git a/source/a/syslinux/syslinux-4.05.tar.sign b/source/a/syslinux/syslinux-4.05.tar.sign new file mode 100644 index 00000000..892883ae --- /dev/null +++ b/source/a/syslinux/syslinux-4.05.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iQIcBAABAgAGBQJO4mUDAAoJEIiuZH1Y96v+Dg8P/1Pn+22CIUHfgPtDse6U1+Wj +A7/c5AdtezK/UQlhCh/Po7mRdCGzm/Tb6pCnHOWvpEFMeRQARGx5ElqDUmH1Y6SW +NGrPxwj40eTdVrA6TE9/Jj1QkKnFZGTTzsSm5njt06cJM1s0kABlyS0MEx++YGyX +hEnO5C6oyfh30KkTsUFLljFev1wz5FdQVHtL4e0//dh5KXgulPCIDEufIdvdIM1o +4RB2vTwpcxm1Fuqd9Th73pD1u4V9mjCwKEazKpmmCkwebn6KAzyUlcKxXMUG+Q4C +mbqRDlNCL8ia9LajJKj00wz0428M3eIT9kVxROYWdZnQGC0gDbcD8/6AAvt06bL+ +ZrlUGl02JASMk2lO9QVp74zTdlnTKQef3V9/SIPk2zLcYuVsKni87ZnEEhDke6vn +DF4S2OySfZjBw7ohou7fkbiw/1uJTYLbh9gXXgEi+GKRkLEmEzrjalRc5I9X+D18 +kEg2rMZS4bpTKTk9IZEsCncyaO8tGrevLiMijoRnqDqzOPGjnYLBDrm+rNNn4cQ9 +biiF19uapF97goGzC315PKHKeMohFWhk3YGIUIwFzzShC0bKAYaZmMWC5Dcj1Udw +XOo0/CL0uRuneS5z4TfN4mh0nVZTTgUeY3n2SbIEpTPGJdT+GGGGg06uq9PpY5WS +Jx4uX40HrNIAw2qaR+fY +=gTaU +-----END PGP SIGNATURE----- diff --git a/source/a/syslinux/syslinux.SlackBuild b/source/a/syslinux/syslinux.SlackBuild index 1e7baad7..e7ec5fbb 100755 --- a/source/a/syslinux/syslinux.SlackBuild +++ b/source/a/syslinux/syslinux.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ PKGNAM=syslinux -VERSION=${VERSION:-3.84} +VERSION=${VERSION:-4.05} BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: @@ -43,9 +43,11 @@ mkdir -p $TMP $PKG cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 cd ${PKGNAM}-$VERSION +zcat $CWD/syslinux.altmbr.diff.gz | patch -p1 --verbose || exit 1 + # Make sure ownerships and permissions are sane: chown -R root:root . find . \ diff --git a/source/a/syslinux/syslinux.altmbr.diff b/source/a/syslinux/syslinux.altmbr.diff new file mode 100644 index 00000000..ee2dfbee --- /dev/null +++ b/source/a/syslinux/syslinux.altmbr.diff @@ -0,0 +1,11 @@ +--- ./mbr/altmbr.S.orig 2011-12-09 12:28:17.000000000 -0600 ++++ ./mbr/altmbr.S 2012-08-17 17:10:33.903688084 -0500 +@@ -204,7 +204,7 @@ + 5: + decb (partition) + jz boot +- addw $16, %bx ++ addw $16, %si + loopw 5b + + popw %cx /* %cx <- 4 */ diff --git a/source/a/sysvinit-scripts/scripts/inittab b/source/a/sysvinit-scripts/scripts/inittab index 9f8b422d..ba6fe79e 100644 --- a/source/a/sysvinit-scripts/scripts/inittab +++ b/source/a/sysvinit-scripts/scripts/inittab @@ -49,7 +49,7 @@ pf::powerfail:/sbin/genpowerfail start pg::powerokwait:/sbin/genpowerfail stop # These are the standard console login getties in multiuser mode: -c1:12345:respawn:/sbin/agetty 38400 tty1 linux +c1:12345:respawn:/sbin/agetty --noclear 38400 tty1 linux c2:12345:respawn:/sbin/agetty 38400 tty2 linux c3:12345:respawn:/sbin/agetty 38400 tty3 linux c4:12345:respawn:/sbin/agetty 38400 tty4 linux diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6 index ca1b4c8e..465a0a4a 100644 --- a/source/a/sysvinit-scripts/scripts/rc.6 +++ b/source/a/sysvinit-scripts/scripts/rc.6 @@ -124,6 +124,13 @@ if echo "$PS" | /bin/grep -q -w pppd ; then fi fi +# Shut down YP services: +if [ -x /etc/rc.d/rc.yp ]; then + if grep -wq stop /etc/rc.d/rc.yp ; then + /etc/rc.d/rc.yp stop + fi +fi + # Bring down the networking system, but first make sure that this # isn't a diskless client with the / partition mounted via NFS: if ! /bin/mount | /bin/grep -q 'on / type nfs' ; then @@ -158,14 +165,17 @@ if [ -x /etc/rc.d/rc.acpid -a -r /var/run/acpid.pid ]; then # quit . /etc/rc.d/rc.acpid stop fi -# Kill all processes. -# INIT is supposed to handle this entirely now, but this didn't always -# work correctly without this second pass at killing off the processes. -# Since INIT already notified the user that processes were being killed, -# we'll avoid echoing this info this time around. -if [ ! "$1" = "fast" ]; then # shutdown did not already kill all processes +# Stop udev: +if [ -x /etc/rc.d/rc.udev ]; then + sh /etc/rc.d/rc.udev force-stop +fi + +# Kill all remaining processes. +if [ ! "$1" = "fast" ]; then + echo "Sending all processes the SIGTERM signal." /sbin/killall5 -15 /bin/sleep 5 + echo "Sending all processes the SIGKILL signal." /sbin/killall5 -9 fi diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M index 8772409e..63cb8801 100644 --- a/source/a/sysvinit-scripts/scripts/rc.M +++ b/source/a/sysvinit-scripts/scripts/rc.M @@ -83,8 +83,9 @@ if [ -x /usr/bin/fc-cache ]; then /usr/bin/fc-cache -f & fi -# If we are returning from single-user mode we will need to restart -# udevd on systems that use udev: +# Run rc.udev again. This will start udev if it is not already running +# (for example, upon return from runlevel 1), otherwise it will trigger it +# to look for device changes and to generate persistent rules if needed. if grep -wq sysfs /proc/mounts && grep -q tmpfs /proc/filesystems ; then if ! grep -wq nohotplug /proc/cmdline ; then if [ -x /etc/rc.d/rc.udev ]; then @@ -187,9 +188,11 @@ if [ -x /etc/rc.d/rc.bluetooth ]; then sh /etc/rc.d/rc.bluetooth start fi -# Start wicd: -if [ -x /etc/rc.d/rc.wicd ]; then +# Start wicd or networkmanager: +if [ -x /etc/rc.d/rc.wicd -a -x /usr/sbin/wicd ]; then sh /etc/rc.d/rc.wicd start +elif [ -x /etc/rc.d/rc.networkmanager ]; then + sh /etc/rc.d/rc.networkmanager start fi # These GTK+/pango files need to be kept up to date for @@ -225,7 +228,7 @@ fi # Start netatalk. (a file/print server for Macs using Appletalk) if [ -x /etc/rc.d/rc.atalk ]; then - /etc/rc.d/rc.atalk + /etc/rc.d/rc.atalk start fi # Start smartd, which monitors the status of S.M.A.R.T. compatible diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S index c02f1e27..97ff7be4 100644 --- a/source/a/sysvinit-scripts/scripts/rc.S +++ b/source/a/sysvinit-scripts/scripts/rc.S @@ -19,21 +19,27 @@ if [ -d /sys ]; then fi fi +# If /run exists, mount a tmpfs on it (unless the +# initrd has already done so): +if [ -d /run ]; then + if ! grep -wq "tmpfs /run tmpfs" /proc/mounts ; then + /sbin/mount -v -n -t tmpfs tmpfs /run -o mode=0755 + fi +fi + # Load the loop device kernel module: if [ -x /etc/rc.d/rc.loop ]; then . /etc/rc.d/rc.loop start fi -# Initialize udev to manage /dev entries and hotplugging for 2.6.x kernels. +# Initialize udev to manage /dev entries and hotplugging for 3.x kernels. # You may turn off udev by making the /etc/rc.d/rc.udev file non-executable -# or giving the "nohotplug" option at boot, but in the 2.6.x+ kernels udev -# has taken over the job of hotplug (finding hardware and loading the kernel -# modules for it, as well as creating device nodes in /dev). Realize that -# if you turn off udev that you will have to load all the kernel modules -# that you need yourself (possibly in /etc/rc.d/rc.modules, which does not -# promise to list all of them), and make any additional device nodes that you -# need in the /dev directory. Even USB and IEEE1394 devices will need to have -# the modules loaded by hand if udev is not used with a 2.6 kernel. So use it. :-) +# or giving the "nohotplug" option at boot, but realize that if you turn off +# udev that you will have to load all the kernel modules that you need +# yourself (possibly in /etc/rc.d/rc.modules, which does not promise to list +# all of them), and make any additional device nodes that you need in the +# /dev directory. Even USB and IEEE1394 devices will need to have the +# modules loaded by hand if udev is not used. So use it. :-) if grep -wq sysfs /proc/mounts && grep -q tmpfs /proc/filesystems ; then if ! grep -wq nohotplug /proc/cmdline ; then if [ -x /etc/rc.d/rc.udev ]; then @@ -103,10 +109,7 @@ if [ -f /etc/crypttab -a -x /sbin/cryptsetup ]; then echo "${PASS}" | /sbin/cryptsetup ${LUKSOPTS} luksOpen $DEV $LUKS fi else - for i in seq 1 3 ; do - /sbin/cryptsetup ${LUKSOPTS} luksOpen $DEV $LUKS /dev/tty0 2>&1 - [ $? -eq 0 ] && break - done + /sbin/cryptsetup ${LUKSOPTS} luksOpen $DEV $LUKS /dev/tty0 2>&1 fi elif echo $OPTS | grep -wq swap ; then # If any of the volumes is to be used as encrypted swap, @@ -134,12 +137,13 @@ if [ -x /sbin/hwclock ]; then CLOCK_OPT="--directisa" fi if grep -wq "^UTC" /etc/hardwareclock ; then - echo "Setting system time from the hardware clock (UTC)." + echo -n "Setting system time from the hardware clock (UTC): " /sbin/hwclock $CLOCK_OPT --utc --hctosys else - echo "Setting system time from the hardware clock (localtime)." + echo -n "Setting system time from the hardware clock (localtime): " /sbin/hwclock $CLOCK_OPT --localtime --hctosys fi + date fi # Test to see if the root partition is read-only, like it ought to be. @@ -250,18 +254,14 @@ else read junk; fi # Done checking root filesystem -# Any /etc/mtab that exists here is old, so we delete it to start over: -/bin/rm -f /etc/mtab* -# Remounting the / partition will initialize the new /etc/mtab: -/sbin/mount -w -o remount / -# Read in the correct / filesystem complete with arguments so mount will -# show them correctly. This does not stop those arguments from functioning -# but does prevent a small bug with /etc/mtab. -/bin/grep ' / ' /proc/mounts | grep -v "^rootfs" > /etc/mtab +# Any /etc/mtab that exists here is old, so we start with a new one: +/bin/rm -f /etc/mtab{,~,.tmp} && /bin/touch /etc/mtab + +# Add entry for / to /etc/mtab: +/sbin/mount -f -w / -# Fix /etc/mtab to list sys and proc if they were not yet entered in -# /etc/mtab because / was still mounted read-only: +# Add /proc and /sys mounts to /etc/mtab: if [ -d /proc/sys ]; then /sbin/mount -f proc /proc -t proc fi diff --git a/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh b/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh index 5ef34d4d..0bfca50d 100644 --- a/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh +++ b/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh @@ -1,9 +1,11 @@ #!/bin/bash # Skript to rescan SCSI bus, using the # scsi add-single-device mechanism -# (c) 1998--2008 Kurt Garloff , GNU GPL v2 or later +# (c) 1998--2010 Kurt Garloff , GNU GPL v2 or v3 # (c) 2006--2008 Hannes Reinecke, GNU GPL v2 or later -# $Id: rescan-scsi-bus.sh,v 1.48 2010/08/10 19:32:22 garloff Exp $ +# $Id: rescan-scsi-bus.sh,v 1.56 2012/01/14 22:23:53 garloff Exp $ + +SCAN_WILD_CARD=4294967295 setcolor () { @@ -47,8 +49,9 @@ white_out () # Return hosts. sysfs must be mounted findhosts_26 () { - hosts= - for hostdir in /sys/class/scsi_host/host*; do + hosts=`find /sys/class/scsi_host/host* -maxdepth 4 -type d -o -type l 2> /dev/null | awk -F'/' '{print $5}' | sed -e 's~host~~' | sort -nu` + scsi_host_data=`echo "$hosts" | sed -e 's~^~/sys/class/scsi_host/host~'` + for hostdir in $scsi_host_data; do hostno=${hostdir#/sys/class/scsi_host/host} if [ -f $hostdir/isp_name ] ; then hostname="qla2xxx" @@ -57,14 +60,15 @@ findhosts_26 () else hostname=`cat $hostdir/proc_name` fi - hosts="$hosts $hostno" + #hosts="$hosts $hostno" echo "Host adapter $hostno ($hostname) found." done if [ -z "$hosts" ] ; then echo "No SCSI host adapters found in sysfs" exit 1; fi - hosts=`echo $hosts | sed 's/ /\n/g' | sort -n` + # Not necessary just use double quotes around variable to preserve new lines + #hosts=`echo $hosts | tr ' ' '\n'` } # Return hosts. /proc/scsi/HOSTADAPTER/? must exist @@ -337,11 +341,22 @@ idlist () getluns() { sgdevice - if test -z "$SGDEV"; then return; fi - if test ! -x /usr/bin/sg_luns; then echo 0; return; fi - LLUN=`sg_luns -d /dev/$SGDEV 2>/dev/null` - if test $? != 0; then echo 0; return; fi - echo "$LLUN" | sed -n 's/.*lun=\(.*\)/\1/p' + if test -z "$SGDEV"; then return 1; fi + if test ! -x /usr/bin/sg_luns; then echo 0; return 1; fi + LLUN=`sg_luns /dev/$SGDEV 2>/dev/null | sed -n 's/ \(.*\)/\1/p'` + if test $? != 0; then echo 0; return 1; fi + #echo "$LLUN" | sed -n 's/.*lun=\(.*\)/\1/p' + for lun in $LLUN ; do + # Swap LUN number + l0=$(printf '%u' 0x$lun) + l1=$(( ($l0 >> 48) & 0xffff )) + l2=$(( ($l0 >> 32) & 0xffff )) + l3=$(( ($l0 >> 16) & 0xffff )) + l4=$(( $l0 & 0xffff )) + l0=$(( ( ( ($l4 * 0xffff) + $l3 ) * 0xffff + $l2 ) * 0xffff + $l1 )) + printf "%u\n" $l0 + done + return 0 } # Wait for udev to settle (create device nodes etc.) @@ -351,6 +366,10 @@ udevadm_settle() print_and_scroll_back " Calling udevadm settle (can take a while) " /sbin/udevadm settle white_out + elif test -x /sbin/udevsettle; then + print_and_scroll_back " Calling udevsettle (can take a while) " + /sbin/udevsettle + white_out else usleep 20000 fi @@ -361,7 +380,7 @@ dolunscan() { SCSISTR= devnr="$host $channel $id $lun" - echo "Scanning for device $devnr ... " + echo -e " Scanning for device $devnr ... " printf "${yellow}OLD: $norm" testexist # Special case: lun 0 just got added (for reportlunscan), @@ -382,10 +401,6 @@ dolunscan() echo -e "${norm}\e[B\e[B" if test -e /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device; then echo 1 > /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device/delete - if test $RC -eq 1 -o $lun -eq 0 ; then - # Try readding, should fail if device is gone - echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan - fi # FIXME: Can we skip udevadm settle for removal? #udevadm_settle usleep 20000 @@ -440,7 +455,7 @@ doreportlun() lun=0 SCSISTR= devnr="$host $channel $id $lun" - echo -en "Scanning for device $devnr ...\r" + echo -en " Scanning for device $devnr ...\r" lun0added= #printf "${yellow}OLD: $norm" # Phase one: If LUN0 does not exist, try to add @@ -470,10 +485,31 @@ doreportlun() fi fi targetluns=`getluns` + REPLUNSTAT=$? lunremove= #echo "getluns reports " $targetluns + olddev=`find /sys/class/scsi_device/ -name $host:$channel:$id:* 2>/dev/null` + oldluns=`echo "$olddev" | awk -F'/' '{print $5}' | awk -F':' '{print $4}'` + oldtargets="$targetluns" + # OK -- if we don't have a LUN to send a REPORT_LUNS to, we could + # fall back to wildcard scanning. Same thing if the device does not + # support REPORT_LUNS + # TODO: We might be better off to ALWAYS use wildcard scanning if + # it works + if test "$REPLUNSTAT" = "1"; then + if test -e /sys/class/scsi_host/host${host}/scan; then + echo "$channel $id -" > /sys/class/scsi_host/host${host}/scan 2> /dev/null + udevadm_settle + else + echo "scsi add-single-device $host $channel $id $SCAN_WILD_CARD" > /proc/scsi/scsi + fi + targetluns=`find /sys/class/scsi_device/ -name $host:$channel:$id:* 2>/dev/null | awk -F'/' '{print $5}' | awk -F':' '{print $4}' | sort -n` + let found+=`echo "$targetluns" | wc -l` + let found-=`echo "$olddev" | wc -l` + fi + if test -z "$targetluns"; then targetluns="$oldtargets"; fi # Check existing luns - for dev in /sys/class/scsi_device/${host}:${channel}:${id}:*; do + for dev in $olddev; do [ -d "$dev" ] || continue lun=${dev##*:} newsearch= @@ -589,11 +625,14 @@ if test -x /usr/bin/sg_inq; then sg_version=$(sg_inq -V 2>&1 | cut -d " " -f 3) sg_version=${sg_version##0.} #echo "\"$sg_version\"" - if [ -z "$sg_version" -o "$sg_version" -lt 70 ] ; then - sg_len_arg="-36" - else + #if [ -z "$sg_version" -o "$sg_version" -lt 70 ] ; then + #sg_len_arg="-36" + #else sg_len_arg="--len=36" - fi + #fi +else + echo "WARN: /usr/bin/sg_inq not present -- please install sg3_utils" + echo " or rescan-scsi-bus.sh might not fully work." fi # defaults @@ -677,12 +716,15 @@ for host in $hosts; do # It's pointless to do a target scan on FC if test -n "$lipreset" ; then echo 1 > /sys/class/fc_host/host$host/issue_lip 2> /dev/null; + udevadm_settle fi - # Always trigger a rescan for FC to update channels and targets - echo "- - -" > /sys/class/scsi_host/host$host/scan 2> /dev/null; + # We used to always trigger a rescan for FC to update channels and targets + # Commented out -- as discussed with Hannes we should rely + # on the main loop doing the scan, no need to do it here. + #echo "- - -" > /sys/class/scsi_host/host$host/scan 2> /dev/null; + #udevadm_settle channelsearch= idsearch= - udevadm_settle else channelsearch=$opt_channelsearch idsearch=$opt_idsearch @@ -707,3 +749,7 @@ fi echo "$found new device(s) found. " echo "$rmvd device(s) removed. " +# Local Variables: +# sh-basic-offset: 2 +# End: + diff --git a/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh.diff b/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh.diff new file mode 100644 index 00000000..89e27693 --- /dev/null +++ b/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh.diff @@ -0,0 +1,18 @@ +--- rescan-scsi-bus.sh.orig 2012-01-14 16:43:33.000000000 -0600 ++++ rescan-scsi-bus.sh 2012-09-07 12:51:52.003994404 -0500 +@@ -625,11 +625,11 @@ + sg_version=$(sg_inq -V 2>&1 | cut -d " " -f 3) + sg_version=${sg_version##0.} + #echo "\"$sg_version\"" +- if [ -z "$sg_version" -o "$sg_version" -lt 70 ] ; then +- sg_len_arg="-36" +- else ++ #if [ -z "$sg_version" -o "$sg_version" -lt 70 ] ; then ++ #sg_len_arg="-36" ++ #else + sg_len_arg="--len=36" +- fi ++ #fi + else + echo "WARN: /usr/bin/sg_inq not present -- please install sg3_utils" + echo " or rescan-scsi-bus.sh might not fully work." diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index c0b17ad8..cbc12030 100755 --- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild +++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,9 +21,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-1.2} +VERSION=${VERSION:-2.0} ARCH=noarch -BUILD=${BUILD:-43} +BUILD=${BUILD:-13} CWD=$(pwd) TMP=${TMP:-/tmp} diff --git a/source/a/sysvinit/sysvinit-2.86-timeval.patch b/source/a/sysvinit/sysvinit-2.86-timeval.patch deleted file mode 100644 index acb0d5b6..00000000 --- a/source/a/sysvinit/sysvinit-2.86-timeval.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- sysvinit-2.86/src/utmp.c.timeval 1999-06-09 07:11:33.000000000 -0400 -+++ sysvinit-2.86/src/utmp.c 2006-08-09 19:46:26.000000000 -0400 -@@ -47,7 +47,8 @@ - int fd; - struct utmp utmp; - struct utsname uname_buf; -- -+ struct timeval tv; -+ - /* - * Try to open the wtmp file. Note that we even try - * this if we have updwtmp() so we can see if the -@@ -76,7 +77,9 @@ - */ - memset(&utmp, 0, sizeof(utmp)); - #if defined(__GLIBC__) -- gettimeofday(&utmp.ut_tv, NULL); -+ gettimeofday(&tv, NULL); -+ utmp.ut_tv.tv_sec = tv.tv_sec; -+ utmp.ut_tv.tv_usec = tv.tv_usec; - #else - time(&utmp.ut_time); - #endif -@@ -113,6 +116,7 @@ - struct utmp utmp; - struct utmp tmp; - struct utmp *utmptr; -+ struct timeval tv; - - /* - * Can't do much if UTMP_FILE is not present. -@@ -144,7 +148,9 @@ - utmp.ut_pid = pid; - strncpy(utmp.ut_id, id, sizeof(utmp.ut_id)); - #if defined(__GLIBC__) -- gettimeofday(&utmp.ut_tv, NULL); -+ gettimeofday(&tv, NULL); -+ utmp.ut_tv.tv_sec = tv.tv_sec; -+ utmp.ut_tv.tv_usec = tv.tv_usec; - #else - time(&utmp.ut_time); - #endif diff --git a/source/a/sysvinit/sysvinit.SlackBuild b/source/a/sysvinit/sysvinit.SlackBuild index 194ebf14..2a9459c2 100755 --- a/source/a/sysvinit/sysvinit.SlackBuild +++ b/source/a/sysvinit/sysvinit.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-2.86} -BUILD=${BUILD:-6} +VERSION=${VERSION:-2.88dsf} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -43,29 +43,23 @@ mkdir -p $TMP $PKG cd $TMP rm -rf sysvinit-$VERSION -tar xzvf $CWD/sysvinit-$VERSION.tar.gz || exit 1 +tar xvf $CWD/sysvinit-$VERSION.tar.xz || exit 1 cd sysvinit-$VERSION chown -R root:root . -zcat $CWD/sysvinit.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1 -zcat $CWD/sysvinit.pidof.rhforkseverything.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1 -if [ "$ARCH" = "x86_64" ]; then - # Don't overwrite ut_addr_v6 in utmp records on 64-bit platforms - zcat $CWD/sysvinit-2.86-timeval.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1 -fi + +# Fix paths for /etc/forcefsck and /etc/fastboot: +zcat $CWD/sysvinit.paths.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1 cd doc mkdir -p $PKG/usr/doc/sysvinit-$VERSION -cp -a Install Propaganda sysvinit-$VERSION.lsm \ +cp -a Install Propaganda sysvinit-2.86.lsm \ + ../COPYING* ../COPYRIGHT ../README* \ $PKG/usr/doc/sysvinit-$VERSION chmod -R 644 $PKG/usr/doc/sysvinit-$VERSION/* chmod 755 $PKG/usr/doc/sysvinit-$VERSION cd ../src -if [ "$ARCH" = "x86_64" ]; then - # static 'init' segfaults, so your computer never reaches command prompt: - sed -i -e "s/-static//" Makefile -fi -make clobber +make clobber || exit 1 make || exit 1 mkdir -p $PKG/sbin diff --git a/source/a/sysvinit/sysvinit.diff b/source/a/sysvinit/sysvinit.diff deleted file mode 100644 index 11477be7..00000000 --- a/source/a/sysvinit/sysvinit.diff +++ /dev/null @@ -1,125 +0,0 @@ -diff -Naur sysvinit-2.86.orig/man/init.8 sysvinit-2.86/man/init.8 ---- sysvinit-2.86.orig/man/init.8 2004-07-29 13:21:31.000000000 +0200 -+++ sysvinit-2.86/man/init.8 2007-12-23 12:22:51.000000000 +0100 -@@ -76,7 +76,7 @@ - are processed. - .PP - When starting a new process, \fBinit\fP first checks whether the file --\fI/etc/initscript\fP exists. If it does, it uses this script to -+\fI/sbin/initscript\fP exists. If it does, it uses this script to - start the process. - .PP - Each time a child terminates, \fBinit\fP records the fact and the reason -@@ -240,7 +240,7 @@ - .SH FILES - .nf - /etc/inittab --/etc/initscript -+/sbin/initscript - /dev/console - /var/run/utmp - /var/log/wtmp -diff -Naur sysvinit-2.86.orig/man/initscript.5 sysvinit-2.86/man/initscript.5 ---- sysvinit-2.86.orig/man/initscript.5 2004-06-09 14:47:45.000000000 +0200 -+++ sysvinit-2.86/man/initscript.5 2007-12-23 12:22:51.000000000 +0100 -@@ -2,15 +2,15 @@ - .SH NAME - initscript \- script that executes inittab commands. - .SH SYNOPSIS --/bin/sh /etc/initscript id runlevels action process -+/bin/sh /sbin/initscript id runlevels action process - .SH DESCRIPTION --When the shell script \fI/etc/initscript\fP is present, \fBinit\fP -+When the shell script \fI/sbin/initscript\fP is present, \fBinit\fP - will use it to execute the commands from \fIinittab\fP. - This script can be used to set things like \fBulimit\fP and - \fBumask\fP default values for every process. - .SH EXAMPLES - This is a sample initscript, which might be installed on your --system as \fI/etc/initscript.sample\fP. -+system as \fI/sbin/initscript.sample\fP. - .RS - .sp - .nf -@@ -20,7 +20,7 @@ - # initscript Executed by init(8) for every program it - # wants to spawn like this: - # --# /bin/sh /etc/initscript -+# /bin/sh /sbin/initscript - # - - # Set umask to safe level, and enable core dumps. -@@ -48,7 +48,7 @@ - .RE - .SH FILES - /etc/inittab, --/etc/initscript. -+/sbin/initscript. - .SH AUTHOR - Miquel van Smoorenburg , - .SH "SEE ALSO" -diff -Naur sysvinit-2.86.orig/src/Makefile sysvinit-2.86/src/Makefile ---- sysvinit-2.86.orig/src/Makefile 2004-06-09 14:47:45.000000000 +0200 -+++ sysvinit-2.86/src/Makefile 2007-12-23 12:22:51.000000000 +0100 -@@ -11,7 +11,7 @@ - CC = gcc - CFLAGS = -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE - LDFLAGS = -s --STATIC = -+STATIC = -static - - # For some known distributions we do not build all programs, otherwise we do. - BIN = -diff -Naur sysvinit-2.86.orig/src/initscript.sample sysvinit-2.86/src/initscript.sample ---- sysvinit-2.86.orig/src/initscript.sample 1997-11-26 14:06:33.000000000 +0100 -+++ sysvinit-2.86/src/initscript.sample 2007-12-23 12:22:51.000000000 +0100 -@@ -1,14 +1,14 @@ - # --# initscript If this script is intalled as /etc/initscript, -+# initscript If this script is intalled as /sbin/initscript, - # it is executed by init(8) for every program it - # wants to spawn like this: - # --# /bin/sh /etc/initscript -+# /bin/sh /sbin/initscript - # - # It can be used to set the default umask and ulimit - # of all processes. By default this script is installed --# as /etc/initscript.sample, so to enable it you must --# rename this script first to /etc/initscript. -+# as /sbin/initscript.sample, so to enable it you must -+# rename this script first to /sbin/initscript. - # - # Version: @(#)initscript 1.10 10-Dec-1995 MvS. - # -diff -Naur sysvinit-2.86.orig/src/paths.h sysvinit-2.86/src/paths.h ---- sysvinit-2.86.orig/src/paths.h 2004-06-09 14:47:45.000000000 +0200 -+++ sysvinit-2.86/src/paths.h 2007-12-23 12:23:50.000000000 +0100 -@@ -20,21 +20,21 @@ - #define INITTAB "/etc/inittab" /* Location of inittab */ - #define INIT "/sbin/init" /* Location of init itself. */ - #define NOLOGIN "/etc/nologin" /* Stop user logging in. */ --#define FASTBOOT "/fastboot" /* Enable fast boot. */ --#define FORCEFSCK "/forcefsck" /* Force fsck on boot */ -+#define FASTBOOT "/etc/fastboot" /* Enable fast boot. */ -+#define FORCEFSCK "/etc/forcefsck" /* Force fsck on boot */ - #define SDPID "/var/run/shutdown.pid" /* PID of shutdown program */ - #define SHELL "/bin/sh" /* Default shell */ - #define SULOGIN "/sbin/sulogin" /* Sulogin */ --#define INITSCRIPT "/etc/initscript" /* Initscript. */ -+#define INITSCRIPT "/sbin/initscript" /* Initscript. */ - #define PWRSTAT "/etc/powerstatus" /* COMPAT: SIGPWR reason (OK/BAD) */ - - #if 0 - #define INITLVL "/etc/initrunlvl" /* COMPAT: New runlevel */ - #define INITLVL2 "/var/log/initrunlvl" /* COMPAT: New runlevel */ - /* Note: INITLVL2 definition needs INITLVL */ --#define HALTSCRIPT1 "/etc/init.d/halt" /* Called by "fast" shutdown */ -+#define HALTSCRIPT1 "/etc/init.d/rc.halt" /* Called by "fast" shutdown */ - #define HALTSCRIPT2 "/etc/rc.d/rc.0" /* Called by "fast" shutdown */ --#define REBOOTSCRIPT1 "/etc/init.d/reboot" /* Ditto. */ -+#define REBOOTSCRIPT1 "/etc/init.d/rc.reboot" /* Ditto. */ - #define REBOOTSCRIPT2 "/etc/rc.d/rc.6" /* Ditto. */ - #endif - diff --git a/source/a/sysvinit/sysvinit.paths.diff b/source/a/sysvinit/sysvinit.paths.diff new file mode 100644 index 00000000..453a677c --- /dev/null +++ b/source/a/sysvinit/sysvinit.paths.diff @@ -0,0 +1,13 @@ +--- ./src/paths.h.orig 2010-04-11 04:30:27.000000000 -0500 ++++ ./src/paths.h 2012-07-31 11:43:40.646053052 -0500 +@@ -29,8 +29,8 @@ + #define INITTAB "/etc/inittab" /* Location of inittab */ + #define INIT "/sbin/init" /* Location of init itself. */ + #define NOLOGIN "/etc/nologin" /* Stop user logging in. */ +-#define FASTBOOT "/fastboot" /* Enable fast boot. */ +-#define FORCEFSCK "/forcefsck" /* Force fsck on boot */ ++#define FASTBOOT "/etc/fastboot" /* Enable fast boot. */ ++#define FORCEFSCK "/etc/forcefsck" /* Force fsck on boot */ + #define SDPID "/var/run/shutdown.pid" /* PID of shutdown program */ + #define SHELL "/bin/sh" /* Default shell */ + #define SULOGIN "/sbin/sulogin" /* Sulogin */ diff --git a/source/a/sysvinit/sysvinit.pidof.rhforkseverything.diff b/source/a/sysvinit/sysvinit.pidof.rhforkseverything.diff deleted file mode 100644 index db94dcf1..00000000 --- a/source/a/sysvinit/sysvinit.pidof.rhforkseverything.diff +++ /dev/null @@ -1,81 +0,0 @@ ---- sysvinit-2.86/man/pidof.8.chroot 1998-09-02 08:49:33.000000000 -0400 -+++ sysvinit-2.86/man/pidof.8 2005-12-19 15:37:40.000000000 -0500 -@@ -4,6 +4,7 @@ - .SH SYNOPSIS - .B pidof - .RB [ \-s ] -+.RB [ \-c ] - .RB [ \-x ] - .RB [ \-o - .IR omitpid ] -@@ -24,6 +25,10 @@ - .SH OPTIONS - .IP -s - Single shot - this instructs the program to only return one \fIpid\fP. -+.IP -c -+Only return process ids that are running with the same root directory. -+This option does not make sense for non-root users, as they will be -+unable to check the current root directory of processes they do not own. - .IP -x - Scripts too - this causes the program to also return process id's of - shells running the named scripts. ---- sysvinit-2.86/src/killall5.c.chroot 2004-07-30 08:16:23.000000000 -0400 -+++ sysvinit-2.86/src/killall5.c 2005-12-19 15:38:47.000000000 -0500 -@@ -476,16 +476,22 @@ - int f; - int first = 1; - int i, oind, opt, flags = 0; -+ int chroot_check = 0; -+ struct stat st; -+ char tmp[512]; - - for (oind = PIDOF_OMITSZ-1; oind > 0; oind--) - opid[oind] = 0; - opterr = 0; - -- while ((opt = getopt(argc,argv,"ho:sx")) != EOF) switch (opt) { -+ while ((opt = getopt(argc,argv,"hco:sx")) != EOF) switch (opt) { - case '?': - nsyslog(LOG_ERR,"invalid options on command line!\n"); - closelog(); - exit(1); -+ case 'c': -+ chroot_check = 1; -+ break; - case 'o': - if (oind >= PIDOF_OMITSZ -1) { - nsyslog(LOG_ERR,"omit pid buffer size %d " -@@ -518,6 +524,16 @@ - argc -= optind; - argv += optind; - -+ /* Check if we are in a chroot */ -+ if (chroot_check) { -+ snprintf(tmp, 512, "/proc/%d/root", getpid()); -+ if (stat(tmp, &st) < 0) { -+ nsyslog(LOG_ERR, "stat failed for %s!\n", tmp); -+ closelog(); -+ exit(1); -+ } -+ } -+ - /* Print out process-ID's one by one. */ - readproc(); - for(f = 0; f < argc; f++) { -@@ -541,6 +557,16 @@ - else - spid = 1; - } -+ if (chroot_check) { -+ struct stat st2; -+ snprintf(tmp, 512, "/proc/%d/root", -+ p->pid); -+ if (stat(tmp, &st2) < 0 || -+ st.st_dev != st2.st_dev || -+ st.st_ino != st2.st_ino) { -+ continue; -+ } -+ } - if (!first) - printf(" "); - printf("%d", p->pid); diff --git a/source/a/tcsh/tcsh.SlackBuild b/source/a/tcsh/tcsh.SlackBuild index 8cf4feb4..c8134a80 100755 --- a/source/a/tcsh/tcsh.SlackBuild +++ b/source/a/tcsh/tcsh.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=6.17.00 +VERSION=6.18.01 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/a/tree/tree.SlackBuild b/source/a/tree/tree.SlackBuild index 540b2047..7085fc99 100755 --- a/source/a/tree/tree.SlackBuild +++ b/source/a/tree/tree.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2007-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2007-2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,7 +20,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.5.3 +VERSION=1.6.0 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -56,10 +56,12 @@ mkdir -p $PKG/usr/bin cat tree > $PKG/usr/bin/tree chmod 755 $PKG/usr/bin/tree mkdir -p $PKG/usr/man/man1 -cat man/tree.1 | gzip -9c > $PKG/usr/man/man1/tree.1.gz +cat doc/tree.1 | gzip -9c > $PKG/usr/man/man1/tree.1.gz +mkdir -p $PKG/usr/man/fr/man1 +cat doc/tree.1.fr | gzip -9c > $PKG/usr/man/fr/man1/tree.1.gz mkdir -p $PKG/usr/doc/tree-$VERSION cp -a \ - CHANGES LICENSE README* \ + CHANGES LICENSE README* TODO \ $PKG/usr/doc/tree-$VERSION ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/a/udev/config/modprobe.d/8139cp.conf b/source/a/udev/config/modprobe.d/8139cp.conf new file mode 100644 index 00000000..65f0af0d --- /dev/null +++ b/source/a/udev/config/modprobe.d/8139cp.conf @@ -0,0 +1,7 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# Alternate 8139 driver. Some 8139 cards need this specific driver, though... +blacklist 8139cp + diff --git a/source/a/udev/config/modprobe.d/README b/source/a/udev/config/modprobe.d/README new file mode 100644 index 00000000..43355e82 --- /dev/null +++ b/source/a/udev/config/modprobe.d/README @@ -0,0 +1,11 @@ +# /etc/modprobe.d/README +# +# The monolithic "blacklist" file (and others) that used to be here in this +# directory have been split into several more fine-grained files and moved +# to the /lib/modprobe.d/ directory. Any file in /lib/modprobe.d/ will be +# overridden by an identically named file in this directory (/etc/modprobe.d/) +# or /run/modprobe.d/ (but since /run is on a tmpfs, it's not persistent +# across reboots, so you probably don't want to use it). +# +# See "man modprobe.d" for more information. +# diff --git a/source/a/udev/config/modprobe.d/bcm43xx.conf b/source/a/udev/config/modprobe.d/bcm43xx.conf new file mode 100644 index 00000000..55b3c2ab --- /dev/null +++ b/source/a/udev/config/modprobe.d/bcm43xx.conf @@ -0,0 +1,7 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# Deprecated BCM4318 driver. +blacklist bcm43xx + diff --git a/source/a/udev/config/modprobe.d/blacklist.conf.new b/source/a/udev/config/modprobe.d/blacklist.conf.new deleted file mode 100644 index 25811703..00000000 --- a/source/a/udev/config/modprobe.d/blacklist.conf.new +++ /dev/null @@ -1,270 +0,0 @@ -# -# Listing a module here prevents the hotplug scripts from loading it. -# Usually that'd be so that some other driver will bind it instead, -# no matter which driver happens to get probed first. Sometimes user -# mode tools can also control driver binding. - -# PC Speaker support: -# This one is loaded by /etc/rc.d/rc.modules. If you don't like -# the beeps and buzz from speaker, edit /etc/rc.d/rc.modules. -blacklist pcspkr - -# tulip ... de4x5, xircom_tulip_cb, dmfe (...) handle same devices -blacklist de4x5 - -# At least 2.4.3 and later xircom_tulip doesn't have that conflict -# xircom_tulip_cb -blacklist dmfe - -#evbug is a debug tool and should be loaded explicitly -blacklist evbug - -# Alternate Intel EtherExpress Pro/100 support driver. List it -# here so it won't conflict with an already-loaded e100 module. -blacklist eepro100 - -# Alternate 8139 driver. Some 8139 cards need this specific driver, -# though... -blacklist 8139cp - -# Deprecated BCM4318 driver. -blacklist bcm43xx - -# Modules used to run a wireless adaptor as an access point. These -# conflict with the normal driver for the device, and so should be -# loaded manually. -blacklist hostap_cs -blacklist hostap_pci -blacklist hostap_plx -blacklist hostap - -# Ethernet over IEEE1394 module. In too many cases this will load -# when there's no eth1394 device present (just an IEEE1394 port) -blacklist eth1394 - -# This module has also been known to cause crashes with some hardware. -blacklist hw_random - -# The kernel lists this as "experimental", but for now it's "broken" -blacklist via-ircc - -# ALSA modules to support sound modems. These should be loaded manually -# if needed. For most people they just break sound support... -blacklist snd-atiixp-modem -blacklist snd-intel8x0m -blacklist snd-via82xx-modem - -# OSS (Open Sound System) modules. This is the old and deprecated Linux -# sound system. If you want to use OSS, remove the alsa-driver package -# and cut out (or comment out) this list. With these modules -# blacklisted ALSA will load by default. -blacklist ac97 -blacklist ac97_codec -blacklist aci -blacklist ad1816 -blacklist ad1848 -blacklist ad1889 -blacklist adlib_card -blacklist aedsp16 -blacklist ali5455 -blacklist awe_wave -blacklist btaudio -blacklist cmpci -blacklist cs4232 -blacklist cs4281 -blacklist cs46xx -blacklist emu10k1 -blacklist es1370 -blacklist es1371 -blacklist esssolo1 -blacklist forte -blacklist gus -blacklist i810_audio -blacklist kahlua -blacklist mad16 -blacklist maestro -blacklist maestro3 -blacklist maui -blacklist mpu401 -blacklist msnd -blacklist msnd_classic -blacklist msnd_pinnacle -blacklist nm256_audio -blacklist opl3 -blacklist opl3sa -blacklist opl3sa2 -blacklist pas2 -blacklist pss -blacklist rme96xx -blacklist sb -blacklist sb_lib -blacklist sgalaxy -blacklist sonicvibes -blacklist sound -blacklist sscape -blacklist trident -blacklist trix -blacklist uart401 -blacklist uart6850 -blacklist v_midi -blacklist via82cxxx_audio -blacklist wavefront -blacklist ymfpci - -# Hardware specific video framebuffer modules. If the user wants -# these, they can load them manually or de-blacklist them. Having -# them load automatically may lead to funny side effects with -# certain revisions of video hardware. -blacklist arcfb -blacklist aty128fb -blacklist atyfb -blacklist cirrusfb -blacklist clgenfb -blacklist cyber2000fb -blacklist fbcon-cfb2 -blacklist fbcon-cfb4 -blacklist fbcon-hga -blacklist fbcon-mfb -blacklist fbcon-vga-planes -blacklist fbgen -blacklist hgafb -blacklist i2c-matroxfb -blacklist i810fb -blacklist intelfb -blacklist kyrofb -blacklist matroxfb_DAC1064 -blacklist matroxfb_Ti3026 -blacklist matroxfb_accel -blacklist matroxfb_base -blacklist matroxfb_crtc2 -blacklist matroxfb_g450 -blacklist matroxfb_maven -blacklist matroxfb_misc -blacklist neofb -blacklist nvidiafb -blacklist pm2fb -blacklist pm3fb -blacklist radeonfb -blacklist rivafb -blacklist savagefb -blacklist sisfb -blacklist sstfb -blacklist tdfxfb -blacklist tridentfb -blacklist vga16fb - -# SCSI and SATA controller modules. Typically these are either -# built into the kernel or loaded with an initrd already. -blacklist 3w-xxxx -blacklist 53c7,8xx -blacklist AM53C974 -blacklist BusLogic -blacklist NCR53c406a -blacklist a100u2w -blacklist advansys -blacklist aha152x -blacklist aha1542 -blacklist aha1740 -blacklist aic79xx -blacklist aic7xxx -blacklist aic7xxx_old -blacklist aic94xx -blacklist ata_piix -blacklist atp870u -blacklist cpqfc -blacklist dc395x -blacklist dmx3191d -blacklist dpt_i2o -blacklist dtc -blacklist eata -blacklist eata_dma -blacklist eata_pio -blacklist fdomain -blacklist g_NCR5380 -blacklist g_NCR5380_mmio -blacklist gdth -blacklist ide-scsi -blacklist imm -blacklist in2000 -blacklist initio -blacklist ipr -blacklist ips -blacklist libata -blacklist megaraid -blacklist ncr53c8xx -blacklist nsp32 -blacklist osst -blacklist pas16 -blacklist pci2000 -blacklist pci2220i -blacklist ppa -blacklist psi240i -blacklist qla1280 -blacklist qla2100 -blacklist qla2200 -blacklist qla2300 -blacklist qla2322 -blacklist qla2xxx -blacklist qla6312 -blacklist qla6322 -blacklist qlogicfas -blacklist qlogicfas408 -blacklist qlogicfc -blacklist qlogicisp -blacklist seagate -blacklist sim710 -blacklist sata_promise -blacklist sata_sil -blacklist sata_sis -blacklist sata_svw -blacklist sata_sx4 -blacklist sata_via -blacklist sata_vsc -blacklist scsi_debug -blacklist scsi_transport_fc -blacklist scsi_transport_spi -blacklist sym53c416 -blacklist sym53c8xx -blacklist sym53c8xx -blacklist t128 -blacklist tmscsim -blacklist u14-34f - -# Blacklist all watchdog modules. Many motherboards hangs with them and, -# if you really need an watchdog you probably know how to load the module -blacklist acquirewdt -blacklist advantechwdt -blacklist alim1535_wdt -blacklist alim7101_wdt -blacklist cpu5wdt -blacklist eurotechwdt -blacklist hpwdt -blacklist i6300esb -blacklist iTCO_vendor_support -blacklist iTCO_wdt -blacklist ib700wdt -blacklist ibmasr -blacklist it8712f_wdt -blacklist machzwd -blacklist mixcomwd -blacklist pc87413_wdt -blacklist pcwd -blacklist pcwd_pci -blacklist pcwd_usb -blacklist sbc60xxwdt -blacklist sbc7240_wdt -blacklist sbc8360 -blacklist sbc_epx_c3 -blacklist sc1200wdt -blacklist sc520_wdt -blacklist scx200_wdt -blacklist smsc37b787_wdt -blacklist softdog -blacklist w83627hf_wdt -blacklist w83697hf_wdt -blacklist w83877f_wdt -blacklist w83977f_wdt -blacklist wafer5823wdt -blacklist wdt -blacklist wdt_pci - diff --git a/source/a/udev/config/modprobe.d/eepro100.conf b/source/a/udev/config/modprobe.d/eepro100.conf new file mode 100644 index 00000000..a7ca4aae --- /dev/null +++ b/source/a/udev/config/modprobe.d/eepro100.conf @@ -0,0 +1,8 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# Alternate Intel EtherExpress Pro/100 support driver. List it +# here so it won't conflict with an already-loaded e100 module. +blacklist eepro100 + diff --git a/source/a/udev/config/modprobe.d/eth1394.conf b/source/a/udev/config/modprobe.d/eth1394.conf new file mode 100644 index 00000000..a2f475af --- /dev/null +++ b/source/a/udev/config/modprobe.d/eth1394.conf @@ -0,0 +1,8 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# Ethernet over IEEE1394 module. In too many cases this will load +# when there's no eth1394 device present (just an IEEE1394 port) +blacklist eth1394 + diff --git a/source/a/udev/config/modprobe.d/evbug.conf b/source/a/udev/config/modprobe.d/evbug.conf new file mode 100644 index 00000000..0af0a83c --- /dev/null +++ b/source/a/udev/config/modprobe.d/evbug.conf @@ -0,0 +1,7 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +#evbug is a debug tool and should be loaded explicitly +blacklist evbug + diff --git a/source/a/udev/config/modprobe.d/framebuffers.conf b/source/a/udev/config/modprobe.d/framebuffers.conf new file mode 100644 index 00000000..770ce420 --- /dev/null +++ b/source/a/udev/config/modprobe.d/framebuffers.conf @@ -0,0 +1,48 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# Hardware specific video framebuffer modules. If the user wants +# these, they can load them manually or de-blacklist them. Having +# them load automatically may lead to funny side effects with +# certain revisions of video hardware. +blacklist arcfb +blacklist aty128fb +blacklist atyfb +blacklist cirrusfb +blacklist clgenfb +blacklist cyber2000fb +blacklist fbcon-cfb2 +blacklist fbcon-cfb4 +blacklist fbcon-hga +blacklist fbcon-mfb +blacklist fbcon-vga-planes +blacklist fbgen +blacklist hgafb +blacklist i2c-matroxfb +blacklist i810fb +blacklist intelfb +blacklist kyrofb +blacklist matroxfb_DAC1064 +blacklist matroxfb_Ti3026 +blacklist matroxfb_accel +blacklist matroxfb_base +blacklist matroxfb_crtc2 +blacklist matroxfb_g450 +blacklist matroxfb_maven +blacklist matroxfb_misc +blacklist neofb +blacklist nvidiafb +blacklist pm2fb +blacklist pm3fb +blacklist radeonfb +blacklist rivafb +blacklist savagefb +blacklist sisfb +blacklist sstfb +blacklist tdfxfb +blacklist tridentfb +blacklist vga16fb +blacklist viafb +blacklist virgefb + diff --git a/source/a/udev/config/modprobe.d/hostap.conf b/source/a/udev/config/modprobe.d/hostap.conf new file mode 100644 index 00000000..4254d3da --- /dev/null +++ b/source/a/udev/config/modprobe.d/hostap.conf @@ -0,0 +1,12 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# Modules used to run a wireless adapter as an access point. These +# conflict with the normal driver for the device, and so should be +# loaded manually. +blacklist hostap_cs +blacklist hostap_pci +blacklist hostap_plx +blacklist hostap + diff --git a/source/a/udev/config/modprobe.d/hw_random.conf b/source/a/udev/config/modprobe.d/hw_random.conf new file mode 100644 index 00000000..b912e012 --- /dev/null +++ b/source/a/udev/config/modprobe.d/hw_random.conf @@ -0,0 +1,7 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# This module has also been known to cause crashes with some hardware. +blacklist hw_random + diff --git a/source/a/udev/config/modprobe.d/isapnp.conf b/source/a/udev/config/modprobe.d/isapnp.conf new file mode 100644 index 00000000..a89ad6bb --- /dev/null +++ b/source/a/udev/config/modprobe.d/isapnp.conf @@ -0,0 +1,24 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# These aliases are here because many PnP modules do not provide them. +# +# NOTE: Commented out due to noise pollution from udev. +# In the unlikely event that your machine needs these aliases, copy this +# file to /etc/modprobe.d/isapnp.conf and uncomment them there. + +#alias pnp:dPNP0400 parport_pc +#alias pnp:dPNP0401 parport_pc +#alias pnp:dPNP0510 irtty-sir +#alias pnp:dPNP0511 irtty-sir +#alias pnp:dPNP0700 floppy +#alias pnp:dPNP0B00 rtc +#alias acpi:PNP0B00: rtc-cmos +#alias acpi:PNP0B01: rtc-cmos +#alias acpi:PNP0B02: rtc-cmos +#alias pnp:dPNPB02F analog +#alias pnp:dPNP0F13 psmouse +#alias pnp:dPNP0800 pcspkr +#alias pnp:dPNP0303 atkbd + diff --git a/source/a/udev/config/modprobe.d/isapnp.conf.new b/source/a/udev/config/modprobe.d/isapnp.conf.new deleted file mode 100644 index 2ed9305e..00000000 --- a/source/a/udev/config/modprobe.d/isapnp.conf.new +++ /dev/null @@ -1,15 +0,0 @@ -# These aliases are here because many PnP modules do not -# provide aliases for them. -alias pnp:dPNP0400 parport_pc -alias pnp:dPNP0401 parport_pc -alias pnp:dPNP0510 irtty-sir -alias pnp:dPNP0511 irtty-sir -alias pnp:dPNP0700 floppy -alias pnp:dPNP0B00 rtc -alias acpi:PNP0B00: rtc-cmos -alias acpi:PNP0B01: rtc-cmos -alias acpi:PNP0B02: rtc-cmos -alias pnp:dPNPB02F analog -alias pnp:dPNP0F13 psmouse -alias pnp:dPNP0800 pcspkr -alias pnp:dPNP0303 atkbd diff --git a/source/a/udev/config/modprobe.d/isdn.conf b/source/a/udev/config/modprobe.d/isdn.conf new file mode 100644 index 00000000..7f736753 --- /dev/null +++ b/source/a/udev/config/modprobe.d/isdn.conf @@ -0,0 +1,11 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# These two come from the hwdata project +# Bug numbers are Fedora/RH specific + +# ISDN - see bugs 154799, 159068 +blacklist hisax +blacklist hisax_fcpcipnp + diff --git a/source/a/udev/config/modprobe.d/oss.conf b/source/a/udev/config/modprobe.d/oss.conf new file mode 100644 index 00000000..52ed2f59 --- /dev/null +++ b/source/a/udev/config/modprobe.d/oss.conf @@ -0,0 +1,61 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# OSS (Open Sound System) modules. This is the old and deprecated Linux +# sound system. If you want to use OSS, remove the alsa-driver package +# and cut out (or comment out) this list. With these modules +# blacklisted ALSA will load by default. +blacklist ac97 +blacklist ac97_codec +blacklist aci +blacklist ad1816 +blacklist ad1848 +blacklist ad1889 +blacklist adlib_card +blacklist aedsp16 +blacklist ali5455 +blacklist awe_wave +blacklist btaudio +blacklist cmpci +blacklist cs4232 +blacklist cs4281 +blacklist cs46xx +blacklist emu10k1 +blacklist es1370 +blacklist es1371 +blacklist esssolo1 +blacklist forte +blacklist gus +blacklist i810_audio +blacklist kahlua +blacklist mad16 +blacklist maestro +blacklist maestro3 +blacklist maui +blacklist mpu401 +blacklist msnd +blacklist msnd_classic +blacklist msnd_pinnacle +blacklist nm256_audio +blacklist opl3 +blacklist opl3sa +blacklist opl3sa2 +blacklist pas2 +blacklist pss +blacklist rme96xx +blacklist sb +blacklist sb_lib +blacklist sgalaxy +blacklist sonicvibes +blacklist sound +blacklist sscape +blacklist trident +blacklist trix +blacklist uart401 +blacklist uart6850 +blacklist v_midi +blacklist via82cxxx_audio +blacklist wavefront +blacklist ymfpci + diff --git a/source/a/udev/config/modprobe.d/pcspkr.conf b/source/a/udev/config/modprobe.d/pcspkr.conf new file mode 100644 index 00000000..66de6b74 --- /dev/null +++ b/source/a/udev/config/modprobe.d/pcspkr.conf @@ -0,0 +1,9 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# PC Speaker support: +# This one is loaded by /etc/rc.d/rc.modules. If you don't like +# the beeps and buzz from speaker, edit /etc/rc.d/rc.modules. +blacklist pcspkr + diff --git a/source/a/udev/config/modprobe.d/psmouse.conf b/source/a/udev/config/modprobe.d/psmouse.conf new file mode 100644 index 00000000..cc414141 --- /dev/null +++ b/source/a/udev/config/modprobe.d/psmouse.conf @@ -0,0 +1,10 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# PS/2 mouse support: +# The default options when the psmouse module can cause problems with KVM +# switches. If you experience this, you may want to uncomment the line +# below to use a more basic mouse protocol with the psmouse module: +#options psmouse proto=imps + diff --git a/source/a/udev/config/modprobe.d/psmouse.conf.new b/source/a/udev/config/modprobe.d/psmouse.conf.new deleted file mode 100644 index 70c0d819..00000000 --- a/source/a/udev/config/modprobe.d/psmouse.conf.new +++ /dev/null @@ -1,6 +0,0 @@ -# PS/2 mouse support: -# The default options when the psmouse module can cause problems with KVM -# switches. If you experience this, you may want to uncomment the line -# below to use a more basic mouse protocol with the psmouse module: -#options psmouse proto=imps - diff --git a/source/a/udev/config/modprobe.d/scsi-sata-controllers.conf b/source/a/udev/config/modprobe.d/scsi-sata-controllers.conf new file mode 100644 index 00000000..61470416 --- /dev/null +++ b/source/a/udev/config/modprobe.d/scsi-sata-controllers.conf @@ -0,0 +1,81 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# SCSI and SATA controller modules. Typically these are either +# built into the kernel or loaded with an initrd already. +blacklist 3w-xxxx +blacklist 53c7,8xx +blacklist AM53C974 +blacklist BusLogic +blacklist NCR53c406a +blacklist a100u2w +blacklist advansys +blacklist aha152x +blacklist aha1542 +blacklist aha1740 +blacklist aic79xx +blacklist aic7xxx +blacklist aic7xxx_old +blacklist aic94xx +blacklist ata_piix +blacklist atp870u +blacklist cpqfc +blacklist dc395x +blacklist dmx3191d +blacklist dpt_i2o +blacklist dtc +blacklist eata +blacklist eata_dma +blacklist eata_pio +blacklist fdomain +blacklist g_NCR5380 +blacklist g_NCR5380_mmio +blacklist gdth +blacklist ide-scsi +blacklist imm +blacklist in2000 +blacklist initio +blacklist ipr +blacklist ips +blacklist libata +blacklist megaraid +blacklist ncr53c8xx +blacklist nsp32 +blacklist osst +blacklist pas16 +blacklist pci2000 +blacklist pci2220i +blacklist ppa +blacklist psi240i +blacklist qla1280 +blacklist qla2100 +blacklist qla2200 +blacklist qla2300 +blacklist qla2322 +blacklist qla2xxx +blacklist qla6312 +blacklist qla6322 +blacklist qlogicfas +blacklist qlogicfas408 +blacklist qlogicfc +blacklist qlogicisp +blacklist seagate +blacklist sim710 +blacklist sata_promise +blacklist sata_sil +blacklist sata_sis +blacklist sata_svw +blacklist sata_sx4 +blacklist sata_via +blacklist sata_vsc +blacklist scsi_debug +blacklist scsi_transport_fc +blacklist scsi_transport_spi +blacklist sym53c416 +blacklist sym53c8xx +blacklist sym53c8xx +blacklist t128 +blacklist tmscsim +blacklist u14-34f + diff --git a/source/a/udev/config/modprobe.d/sound-modems.conf b/source/a/udev/config/modprobe.d/sound-modems.conf new file mode 100644 index 00000000..f458346d --- /dev/null +++ b/source/a/udev/config/modprobe.d/sound-modems.conf @@ -0,0 +1,10 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# ALSA modules to support sound modems. These should be loaded manually +# if needed. For most people they just break sound support... +blacklist snd-atiixp-modem +blacklist snd-intel8x0m +blacklist snd-via82xx-modem + diff --git a/source/a/udev/config/modprobe.d/tulip.conf b/source/a/udev/config/modprobe.d/tulip.conf new file mode 100644 index 00000000..64b6a5ca --- /dev/null +++ b/source/a/udev/config/modprobe.d/tulip.conf @@ -0,0 +1,11 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# tulip ... de4x5, xircom_tulip_cb, dmfe (...) handle same devices +blacklist de4x5 + +# At least 2.4.3 and later xircom_tulip doesn't have that conflict +# xircom_tulip_cb +blacklist dmfe + diff --git a/source/a/udev/config/modprobe.d/usb-controller.conf b/source/a/udev/config/modprobe.d/usb-controller.conf new file mode 100644 index 00000000..f5e4e502 --- /dev/null +++ b/source/a/udev/config/modprobe.d/usb-controller.conf @@ -0,0 +1,9 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# The EHCI driver should be loaded before the ones for low speed controllers +# or some devices may be confused when they are disconnected and reconnected. +softdep uhci-hcd pre: ehci-hcd +softdep ohci-hcd pre: ehci-hcd + diff --git a/source/a/udev/config/modprobe.d/usb-controller.conf.new b/source/a/udev/config/modprobe.d/usb-controller.conf.new deleted file mode 100644 index 4b77fd82..00000000 --- a/source/a/udev/config/modprobe.d/usb-controller.conf.new +++ /dev/null @@ -1,4 +0,0 @@ -# Make sure that ehci-hcd is always loaded before uhci-hci -# # or ohci-hcd to prevent a kernel warning: -install uhci-hcd /sbin/modprobe ehci-hcd ; /sbin/modprobe -i uhci-hcd -install ohci-hcd /sbin/modprobe ehci-hcd ; /sbin/modprobe -i ohci-hcd diff --git a/source/a/udev/config/modprobe.d/via-ircc.conf b/source/a/udev/config/modprobe.d/via-ircc.conf new file mode 100644 index 00000000..3dfa5731 --- /dev/null +++ b/source/a/udev/config/modprobe.d/via-ircc.conf @@ -0,0 +1,7 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# The kernel lists this as "experimental", but for now it's "broken" +blacklist via-ircc + diff --git a/source/a/udev/config/modprobe.d/watchdog.conf b/source/a/udev/config/modprobe.d/watchdog.conf new file mode 100644 index 00000000..66d1f837 --- /dev/null +++ b/source/a/udev/config/modprobe.d/watchdog.conf @@ -0,0 +1,43 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# Blacklist all watchdog modules. Many motherboards hang with them, and +# if you really need a watchdog, you probably know how to load the module +blacklist acquirewdt +blacklist advantechwdt +blacklist alim1535_wdt +blacklist alim7101_wdt +blacklist cpu5wdt +blacklist eurotechwdt +blacklist hpwdt +blacklist i6300esb +blacklist i8xx_tco +blacklist iTCO_vendor_support +blacklist iTCO_wdt +blacklist ib700wdt +blacklist ibmasr +blacklist it8712f_wdt +blacklist machzwd +blacklist mixcomwd +blacklist pc87413_wdt +blacklist pcwd +blacklist pcwd_pci +blacklist pcwd_usb +blacklist sbc60xxwdt +blacklist sbc7240_wdt +blacklist sbc8360 +blacklist sbc_epx_c3 +blacklist sc1200wdt +blacklist sc520_wdt +blacklist scx200_wdt +blacklist smsc37b787_wdt +blacklist softdog +blacklist w83627hf_wdt +blacklist w83697hf_wdt +blacklist w83877f_wdt +blacklist w83977f_wdt +blacklist wafer5823wdt +blacklist wdt +blacklist wdt_pci + diff --git a/source/a/udev/config/rc.d/rc.udev.new b/source/a/udev/config/rc.d/rc.udev.new index 6a6218f6..2bbd9819 100644 --- a/source/a/udev/config/rc.d/rc.udev.new +++ b/source/a/udev/config/rc.d/rc.udev.new @@ -4,7 +4,6 @@ # appropriate kernel modules, and configures the devices. PATH="/sbin:/bin" -OPT="" . /etc/udev/udev.conf @@ -25,26 +24,38 @@ mount_devpts() { case "$1" in start) - # Sanity check #1, udev requires that the kernel support tmpfs: + # Sanity check #1, udev requires that the kernel support devtmpfs: + if ! grep -wq devtmpfs /proc/filesystems ; then + echo "Sorry, but you need devtmpfs support in the kernel to use udev." + echo "Both of these options are needed: CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y" + echo + echo "FATAL: Refusing to run /etc/rc.d/rc.udev." + sleep 10 + exit 1 + fi + + # Sanity check #2, udev requires that the kernel support tmpfs: if ! grep -wq tmpfs /proc/filesystems ; then echo "Sorry, but you need tmpfs support in the kernel to use udev." echo echo "FATAL: Refusing to run /etc/rc.d/rc.udev." + sleep 10 exit 1 fi - # Sanity check #2, make sure that a 2.6.x kernel is new enough: + # Sanity check #3, make sure that a 2.6.x kernel is new enough: if [ "$(uname -r | cut -f 1,2 -d .)" = "2.6" ]; then if [ "$(uname -r | cut -f 3 -d . | sed 's/[^[:digit:]].*//')" -lt "32" ]; then echo "Sorry, but you need a 2.6.32+ kernel to use this udev." echo "Your kernel version is only $(uname -r)." echo echo "FATAL: Refusing to run /etc/rc.d/rc.udev." + sleep 10 exit 1 fi fi - # Sanity check #3, make sure the udev package was not removed. If udevd + # Sanity check #4, make sure the udev package was not removed. If udevd # is not there, this will also shut off this script to prevent further # problems: if [ ! -x /sbin/udevd ]; then @@ -52,6 +63,7 @@ case "$1" in echo "No udevd daemon found." echo "Turning off udev: chmod 644 /etc/rc.d/rc.udev" echo "FATAL: Refusing to run /etc/rc.d/rc.udev." + sleep 10 exit 1 fi @@ -90,47 +102,41 @@ case "$1" in # Mount devpts mount_devpts - # Start udevd. - /sbin/udevd --daemon 2>/dev/null - - # If udevd was already running, then it will return !=0 exit code, - # so we'll try to re-run failed events - if [ $? != 0 ]; then - OPT="--type=failed $OPT" - ( cd ${UDEV_ROOT}/.udev - for TMPFILE in tmp-rules-*.rules ; do - mv $TMPFILE /etc/udev/rules.d/${TMPFILE/tmp-rules--/} 2>/dev/null - done - ) - else # udev is just now being started, so we'll do some initial setup: - - # Create rootdev rules - DEVICENUMBER=$( /bin/stat -c %d / ) - MAJORNUMBER=$(($DEVICENUMBER / 256)) - MINORNUMBER=$(($DEVICENUMBER % 256)) - - echo 'ACTION!="remove", SUBSYSTEM=="block", ENV{MAJOR}=="'$MAJORNUMBER'", ENV{MINOR}=="'$MINORNUMBER'", SYMLINK+="root"' > /dev/.udev/rules.d/61-dev-root-link.rules - - # Set OPT="--action=add" to generate add events on coldplug - OPT="--action=add" - - fi - - echo "Triggering udev events: /sbin/udevadm trigger $OPT" - # Call udevtrigger and udevsettle to do the device configuration: - /sbin/udevadm trigger $OPT && /sbin/udevadm settle --timeout=120 - - ;; + if ! /sbin/pidof udevd 1>/dev/null 2>/dev/null; then # start udevd + echo "Starting udevd: /sbin/udevd --daemon" + /sbin/udevd --daemon + # Since udev is just now being started we want to use add events: + echo "Triggering udev events: /sbin/udevadm trigger --action=add" + # Call udevtrigger and udevsettle to do the device configuration: + /sbin/udevadm trigger --type=subsystems --action=add + /sbin/udevadm trigger --type=devices --action=add + else # trigger changes for already running udevd + # If the persistent rules files do not exist, trigger an add event: + if [ ! -r /etc/udev/rules.d/70-persistent-net.rules ]; then + # Test that we can actually write to the directory first: + if touch /etc/udev/rules.d/testfile 2> /dev/null ; then + rm -f /etc/udev/rules.d/testfile + # This should add persistent net/cd rules: + echo "Triggering udev to write persistent rules to /etc/udev/rules.d/" + /sbin/udevadm trigger --type=devices --action=add + sleep 3 + fi + fi + # Since udevd is running, most of the time we only need change events: + echo "Triggering udev events: /sbin/udevadm trigger --action=change" + /sbin/udevadm trigger --type=subsystems --action=change + /sbin/udevadm trigger --type=devices --action=change + fi + /sbin/udevadm settle --timeout=120 + ;; stop) echo "Stopping udevd is STRONGLY discouraged and not supported." echo "If you are sure you want to do this, use 'force-stop' instead." ;; force-stop) echo "Stopping udevd" - if [ -e /proc/sys/kernel/hotplug ]; then - echo /sbin/hotplug > /proc/sys/kernel/hotplug - fi - killall udevd + udevadm control --exit + killall udevd 2>/dev/null ;; restart) echo "Restarting udevd is STRONGLY discouraged and not supported." @@ -138,18 +144,18 @@ case "$1" in ;; force-restart) echo "Restarting udevd" - killall udevd - sleep 5 + udevadm control --exit + sleep 3 udevd --daemon ;; reload) echo "Reloading udev rules" - udevadm control --reload-rules + udevadm control --reload cp --preserve=all --recursive --update /lib/udev/devices/* $UDEV_ROOT ;; force-reload) echo "Updating all available device nodes in $UDEV_ROOT" - udevadm control --reload-rules + udevadm control --reload rm -rf $UDEV_ROOT/.udev $UDEV_ROOT/disk cp --preserve=all --recursive --update /lib/udev/devices/* $UDEV_ROOT ;; diff --git a/source/a/udev/config/rules.d/40-slackware.rules b/source/a/udev/config/rules.d/40-slackware.rules index 6883f526..9e8c6342 100644 --- a/source/a/udev/config/rules.d/40-slackware.rules +++ b/source/a/udev/config/rules.d/40-slackware.rules @@ -17,3 +17,6 @@ KERNEL=="mice", SYMLINK+="mouse" # Set rfkill device writable by netdev group KERNEL=="rfkill", GROUP:="netdev", MODE:="0664" +# Mount fusectl filesystem +KERNEL=="fuse", ACTION=="add", RUN+="/bin/mount -t fusectl fusectl /sys/fs/fuse/connections" + diff --git a/source/a/udev/config/rules.d/90-network.rules b/source/a/udev/config/rules.d/90-network.rules deleted file mode 100644 index 03f2ddc7..00000000 --- a/source/a/udev/config/rules.d/90-network.rules +++ /dev/null @@ -1,5 +0,0 @@ -# This file will be overwritten in next upgrade. Please put your -# custom rules somewhere else (90-local.rules is a good idea) - -SUBSYSTEM=="net", NAME=="?*", ACTION=="add", RUN+="nethelper.sh $env{INTERFACE} start" -SUBSYSTEM=="net", NAME=="?*", ACTION=="remove", RUN+="nethelper.sh $env{INTERFACE} stop" diff --git a/source/a/udev/config/scripts/nethelper.sh b/source/a/udev/config/scripts/nethelper.sh deleted file mode 100755 index 9e172027..00000000 --- a/source/a/udev/config/scripts/nethelper.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -DEVNAME="$1" -COMMAND="$2" - -testwrite() { - if touch /var/run/checkrw 2>/dev/null ; then - rm -rf /var/run/checkrw - RW=1 - fi -} - -case $DEVNAME in - eth*|ath*|wlan*|ra*|sta*|ctc*|lcs*|hsi*) - case $COMMAND in - 'start') - testwrite - - if [ $RW ]; then - if [ -x /etc/rc.d/rc.inet1 ]; then - if ! /sbin/ifconfig | /bin/grep -q "^${DEVNAME} "; then - /etc/rc.d/rc.inet1 ${DEVNAME}_start - fi - fi - exit 0 - else - exit 1 - fi - ;; - 'stop') - if [ -x /etc/rc.d/rc.inet1 ]; then - if /sbin/ifconfig | /bin/grep -q "^${DEVNAME} "; then - /etc/rc.d/rc.inet1 ${DEVNAME}_stop - fi - fi - # Does dhcpcd appear to still be running on the - # interface? If so, try to stop it. - if [ -r /etc/dhcpc/dhcpcd-$DEVNAME.pid -o -r /var/run/dhcpcd-$DEVNAME.pid ]; then - /sbin/dhcpcd -k -d $DEVNAME - # Force garbage removal, if needed: - if [ -r /etc/dhcpc/dhcpcd-$DEVNAME.pid ]; then - /bin/rm -f /etc/dhcpc/dhcpcd-$DEVNAME.pid - elif [ -r /var/run/dhcpcd-$DEVNAME.pid ]; then - /bin/rm -f /var/run/dhcpcd-$DEVNAME.pid - fi - fi - # If the interface is now down, exit with a status of 0: - if /sbin/ifconfig | /bin/grep -q "^${DEVNAME} " ; then - exit 0 - fi - ;; - *) - echo "usage $0 interface start|stop" - exit 1 - ;; - esac - ;; - *) - echo "Interface $DEVNAME not supported." - exit 1 - ;; -esac -exit 0 diff --git a/source/a/udev/doinst.sh b/source/a/udev/doinst.sh index 5b7f5f90..2912e5c8 100644 --- a/source/a/udev/doinst.sh +++ b/source/a/udev/doinst.sh @@ -25,17 +25,12 @@ fi # This should catch *all* files in /etc/modprobe.d/ and move them over to # have .conf extensions for modfile in $(ls etc/modprobe.d/ | grep -v "\.\(conf\|bak\|orig\|new\)"); do - if [ -e etc/modprobe.d/$modfile -a ! -e etc/modprobe.d/$modfile.conf ]; then + if [ "$modfile" = README ]; then + true # do nothing + elif [ -e etc/modprobe.d/$modfile -a ! -e etc/modprobe.d/$modfile.conf ]; then mv etc/modprobe.d/$modfile etc/modprobe.d/$modfile.conf elif [ -e etc/modprobe.d/$modfile -a -e etc/modprobe.d/$modfile.conf ]; then mv etc/modprobe.d/$modfile etc/modprobe.d/$modfile.bak fi done -config etc/modprobe.d/blacklist.conf.new -config etc/modprobe.d/isapnp.conf.new -config etc/modprobe.d/psmouse.conf.new -config etc/modprobe.d/usb-controller.conf.new - -/sbin/udevadm info --convert-db 1>/dev/null 2>/dev/null - diff --git a/source/a/udev/fix-42-usb-hid-pm.rules.diff b/source/a/udev/fix-42-usb-hid-pm.rules.diff new file mode 100644 index 00000000..2a1d529f --- /dev/null +++ b/source/a/udev/fix-42-usb-hid-pm.rules.diff @@ -0,0 +1,18 @@ +diff -u -r --new-file udev-182.orig/rules/42-usb-hid-pm.rules udev-182/rules/42-usb-hid-pm.rules +--- udev-182.orig/rules/42-usb-hid-pm.rules 2012-03-12 16:40:40.569534100 -0500 ++++ udev-182/rules/42-usb-hid-pm.rules 2012-09-10 13:36:44.171054934 -0500 +@@ -43,7 +43,13 @@ + ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="04b3", ATTR{idProduct}=="4012", TEST=="power/control", ATTR{power/control}="auto" + + # Raritan Computer, Inc KVM. +-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="14dd", ATTR{idProduct}="0002", TEST=="power/control", ATTR{power/control}="auto" ++ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="14dd", ATTR{idProduct}=="0002", TEST=="power/control", ATTR{power/control}="auto" + + # USB HID devices that are internal to the machine should also be safe to autosuspend ++ ++ACTION=="add", SUBSYSTEM=="usb", SUBSYSTEMS=="usb", ATTRS{removable}=="removable", GOTO="usb_hid_pm_end" ++ACTION=="add", SUBSYSTEM=="usb", SUBSYSTEMS=="usb", ATTRS{removable}=="unknown", GOTO="usb_hid_pm_end" ++ + ACTION=="add", SUBSYSTEM=="usb", ATTR{bInterfaceClass}=="03", ATTRS{removable}=="fixed", TEST=="../power/control", ATTR{../power/control}="auto" ++ ++LABEL="usb_hid_pm_end" diff --git a/source/a/udev/rule_generator.diff b/source/a/udev/rule_generator.diff index 212c09f1..25c72b84 100644 --- a/source/a/udev/rule_generator.diff +++ b/source/a/udev/rule_generator.diff @@ -1,6 +1,6 @@ -diff -Nur udev-159.orig//extras/rule_generator/write_cd_rules udev-159/extras/rule_generator/write_cd_rules ---- udev-159.orig//extras/rule_generator/write_cd_rules 2010-06-25 04:37:36.000000000 -0500 -+++ udev-159/extras/rule_generator/write_cd_rules 2010-07-07 02:44:14.501947041 -0500 +diff -Nur udev-182.orig/src/rule_generator/write_cd_rules udev-182/src/rule_generator/write_cd_rules +--- udev-182.orig/src/rule_generator/write_cd_rules 2012-03-24 22:47:53.138527732 -0500 ++++ udev-182/src/rule_generator/write_cd_rules 2012-03-24 22:59:42.595889830 -0500 @@ -3,7 +3,8 @@ # This script is run if an optical drive lacks a rule for persistent naming. # @@ -21,58 +21,58 @@ diff -Nur udev-159.orig//extras/rule_generator/write_cd_rules udev-159/extras/ru comment="$ID_MODEL ($ID_PATH)" - - write_rule "$match" "cdrom$link_num" "$comment" + write_rule "$match" "cdrom$link_num" "$comment" -[ "$ID_CDROM_CD_R" -o "$ID_CDROM_CD_RW" ] && \ -- write_rule "$match" "cdrw$link_num" +- write_rule "$match" "cdrw$link_num" -[ "$ID_CDROM_DVD" ] && \ -- write_rule "$match" "dvd$link_num" +- write_rule "$match" "dvd$link_num" -[ "$ID_CDROM_DVD_R" -o "$ID_CDROM_DVD_RW" -o "$ID_CDROM_DVD_RAM" ] && \ -- write_rule "$match" "dvdrw$link_num" -+ if [ "$(find_all_rules 'SYMLINK+=' cdrom)" = "" ]; then -+ write_rule "$match" "cdrom" -+ fi +- write_rule "$match" "dvdrw$link_num" ++ if [ "$(find_all_rules 'SYMLINK+=' cdrom)" = "" ]; then ++ write_rule "$match" "cdrom" ++ fi + -+ if [ "$ID_CDROM_CD_R" ]; then -+ write_rule "$match" "cdr$link_num" -+ if [ "$(find_all_rules 'SYMLINK+=' cdr)" = "" ]; then -+ write_rule "$match" "cdr" -+ fi ++ if [ "$ID_CDROM_CD_R" ]; then ++ write_rule "$match" "cdr$link_num" ++ if [ "$(find_all_rules 'SYMLINK+=' cdr)" = "" ]; then ++ write_rule "$match" "cdr" ++ fi + -+ write_rule "$match" "cdwriter$link_num" -+ if [ "$(find_all_rules 'SYMLINK+=' cdwriter)" = "" ]; then -+ write_rule "$match" "cdwriter" -+ fi ++ write_rule "$match" "cdwriter$link_num" ++ if [ "$(find_all_rules 'SYMLINK+=' cdwriter)" = "" ]; then ++ write_rule "$match" "cdwriter" ++ fi + -+ if [ "$ID_CDROM_CD_RW" ]; then -+ write_rule "$match" "cdrw$link_num" -+ if [ "$(find_all_rules 'SYMLINK+=' cdrw)" = "" ]; then -+ write_rule "$match" "cdrw" -+ fi -+ fi ++ if [ "$ID_CDROM_CD_RW" ]; then ++ write_rule "$match" "cdrw$link_num" ++ if [ "$(find_all_rules 'SYMLINK+=' cdrw)" = "" ]; then ++ write_rule "$match" "cdrw" ++ fi ++ fi + -+ if [ "$(find_all_rules 'SYMLINK+=' writer)" = "" ]; then -+ write_rule "$match" "writer" -+ fi -+ fi ++ if [ "$(find_all_rules 'SYMLINK+=' writer)" = "" ]; then ++ write_rule "$match" "writer" ++ fi ++ fi + -+ if [ "$ID_CDROM_DVD" ]; then -+ write_rule "$match" "dvd$link_num" -+ if [ "$(find_all_rules 'SYMLINK+=' dvd)" = "" ]; then -+ write_rule "$match" "dvd" -+ fi ++ if [ "$ID_CDROM_DVD" ]; then ++ write_rule "$match" "dvd$link_num" ++ if [ "$(find_all_rules 'SYMLINK+=' dvd)" = "" ]; then ++ write_rule "$match" "dvd" ++ fi + -+ if [ "$ID_CDROM_DVD_R" -o "$ID_CDROM_DVD_RW" -o "$ID_CDROM_DVD_RAM" ]; then -+ write_rule "$match" "dvdrw$link_num" -+ if [ "$(find_all_rules 'SYMLINK+=' dvdrw)" = "" ]; then -+ write_rule "$match" "dvdrw" -+ fi ++ if [ "$ID_CDROM_DVD_R" -o "$ID_CDROM_DVD_RW" -o "$ID_CDROM_DVD_RAM" ]; then ++ write_rule "$match" "dvdrw$link_num" ++ if [ "$(find_all_rules 'SYMLINK+=' dvdrw)" = "" ]; then ++ write_rule "$match" "dvdrw" ++ fi + -+ write_rule "$match" "dvdwriter$link_num" -+ if [ "$(find_all_rules 'SYMLINK+=' dvdwriter)" = "" ]; then -+ write_rule "$match" "dvdwriter" -+ fi -+ fi -+ fi ++ write_rule "$match" "dvdwriter$link_num" ++ if [ "$(find_all_rules 'SYMLINK+=' dvdwriter)" = "" ]; then ++ write_rule "$match" "dvdwriter" ++ fi ++ fi ++ fi echo >> $RULES_FILE unlock_rules_file diff --git a/source/a/udev/udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_rev.patch b/source/a/udev/udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_rev.patch new file mode 100644 index 00000000..bfa0c76a --- /dev/null +++ b/source/a/udev/udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_rev.patch @@ -0,0 +1,27 @@ +Adapted from the following patch (path and actual line number changes): + +From daa9cf546ce7265645ced9592dd54c6b2fc04302 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Thu, 5 Jul 2012 16:53:08 +0200 +Subject: [PATCH] udev: ata_id - fixup all 8 not only 6 bytes of the fw_rev + string + +The last two digits are in the wrong order: + $ hdparm -I /dev/sda | grep Revision + 4PC10362 + + $ /lib/udev/ata_id -x /dev/sda | grep REVISION + 4PC10326 + +diff -Nur udev-182.orig/src/ata_id/ata_id.c udev-182/src/ata_id/ata_id.c +--- udev-182.orig/src/ata_id/ata_id.c 2012-03-13 19:00:51.220734316 -0500 ++++ udev-182/src/ata_id/ata_id.c 2012-07-14 19:48:34.224478831 -0500 +@@ -511,7 +511,7 @@ + * use and copy it into the hd_driveid struct for convenience + */ + disk_identify_fixup_string (identify, 10, 20); /* serial */ +- disk_identify_fixup_string (identify, 23, 6); /* fwrev */ ++ disk_identify_fixup_string (identify, 23, 8); /* fwrev */ + disk_identify_fixup_string (identify, 27, 40); /* model */ + disk_identify_fixup_uint16 (identify, 0); /* configuration */ + disk_identify_fixup_uint16 (identify, 75); /* queue depth */ diff --git a/source/a/udev/udev.SlackBuild b/source/a/udev/udev.SlackBuild index c6f83a0e..183c6667 100755 --- a/source/a/udev/udev.SlackBuild +++ b/source/a/udev/udev.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=${VERSION:-$(echo udev-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-5} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -58,29 +58,35 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# So this is a major bug. At least, it triggers one in the kernel. -# We'll revert it for now. If left in place, machines using ATA -# (especially PATA) are liable to randomly crash on reboot. -# The last little bit of this patch fails to reverse but it won't matter. -if [ $VERSION = 165 ]; then - zcat $CWD/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch.gz | patch -p1 -R -fi +# Fix ata_id (remove with udev-186+) +zcat $CWD/udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_rev.patch.gz | patch -p1 || exit 1 + +# Fix 42-usb-hid-pm.rules (remove with udev-187+) +zcat $CWD/fix-42-usb-hid-pm.rules.diff.gz | patch -p1 --verbose || exit 1 # Fixup the rule generator for our use -zcat $CWD/rule_generator.diff.gz | patch -p1 || exit 1 +zcat $CWD/rule_generator.diff.gz | patch -p1 --verbose || exit 1 # static libudev is needed for lvm2 +# --enable-udev_acl was removed (will be part of future CK release) +# --enable-floppy support was also disabled by default in 173 +# --enable-rule_generator was disabled by default in 175 ./configure \ - --enable-static \ --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/sbin \ + --with-rootprefix=/ \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --with-rootlibdir=/lib${LIBDIRSUFFIX} \ - --libexecdir=/lib/udev \ - --disable-introspection \ + --with-firmware-path=/lib/firmware/updates:/lib/firmware \ + --sysconfdir=/etc \ + --bindir=/sbin \ + --sbindir=/sbin \ + --libexecdir=/lib \ + --enable-introspection \ --mandir=/usr/man \ --docdir=/usr/doc/udev-$VERSION \ + --enable-floppy \ + --enable-static \ + --enable-rule_generator \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 @@ -92,8 +98,13 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ # scsi_id is needed by multipath ( cd $PKG/sbin ; ln -s ../lib/udev/scsi_id scsi_id ) +# Put udevd back in /sbin +mv $PKG/lib/udev/udevd $PKG/sbin +ln -s /sbin/udevd $PKG/lib/udev/udevd + mkdir -p \ - $PKG/etc/modprobe.d \ + $PKG/run \ + $PKG/{etc,lib}/modprobe.d \ $PKG/etc/rc.d \ $PKG/etc/udev/rules.d \ $PKG/lib/firmware @@ -106,32 +117,23 @@ cp -a $CWD/config/rules.d/* $PKG/lib/udev/rules.d/ # Now the init script and module-init-tools stuff cp -a $CWD/config/rc.d/rc.udev.new $PKG/etc/rc.d/rc.udev.new -cp -a $CWD/config/modprobe.d/* $PKG/etc/modprobe.d +cp -a $CWD/config/modprobe.d/*.conf $PKG/lib/modprobe.d/ +cp -a $CWD/config/modprobe.d/README $PKG/etc/modprobe.d/ -chown -R root:root $PKG/etc -find $PKG/etc -type f -exec chmod 644 {} \; +chown -R root:root $PKG/etc $PKG/lib/modprobe.d +find $PKG/etc $PKG/lib/modprobe.d -type f -exec chmod 644 {} \; find $PKG/etc -type d -exec chmod 755 {} \; chmod 0755 $PKG/etc/rc.d/rc.udev.new # Add extra device nodes to the package that udev doesn't make: -# As of 156, some of these aren't be needed any more: -# removed core@ fd@ stderr@ stdin@ stdout@ tar xvf $CWD/udev-fixed-devices.tar.gz -C $PKG -# Add various helper scripts: -for file in $CWD/config/scripts/* ; do - cp -a $file $PKG/lib/udev/ -done chown -R root:root $PKG/lib/udev chmod 0755 $PKG/lib/udev/* -# Move the pkgconfig file to where we expect it -mv $PKG/usr/share/pkgconfig/* $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig -rmdir $PKG/usr/share/pkgconfig - mkdir -p $PKG/usr/doc/udev-$VERSION cp -a \ - COPYING* README* TODO extras/keymap/README.keymap.txt \ + COPYING* README* TODO \ $PKG/usr/doc/udev-$VERSION # Don't package the API docs: diff --git a/source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch b/source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch deleted file mode 100644 index fc991b9a..00000000 --- a/source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch +++ /dev/null @@ -1,305 +0,0 @@ -From 560de575148b7efda3b34a7f7073abd483c5f08e Mon Sep 17 00:00:00 2001 -From: David Zeuthen -Date: Thu, 4 Nov 2010 08:55:58 -0400 -Subject: [PATCH 1/1] Use ata_id, not scsi_id, on ATAPI devices - -The major benefit here, is that we get the ATAPI device serial -number. With SCSI ID we didn't get this since it's not part of the -SCSI INQUIRY command. Specifically this means that we get symlinks to -empty optical drives, e.g. - - /dev/disk/by-id/ata-VBOX_CD-ROM_VB2-01700376 - -which we didn't get earlier. So this is a major win. - -Also make ata_id work on CD-ROM devices when using /dev/bsg nodes so -this works on both the scsi_device as well as the block device. We do -this, basically, by issuing the ATA IDENTIFY PACKET DEVICE command -instead of the ATA IDENTIFY command. We also use 16-byte pass-through -ATA passthrough instead of 12-byte passthrough to avoid clashing with -the MMC BLANK command. - -This means that we get this output - - # udevadm info -q all -p /sys/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 - P: /devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 - E: UDEV_LOG=3 - E: DEVPATH=/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 - E: DEVTYPE=scsi_device - E: DRIVER=sr - E: MODALIAS=scsi:t-0x05 - E: SUBSYSTEM=scsi - E: ID_ATA=1 - E: ID_TYPE=cd - E: ID_BUS=ata - E: ID_MODEL=VBOX_CD-ROM - E: ID_MODEL_ENC=VBOX\x20CD-ROM\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x 20\x20\x20\x20\x20\x20\x20 - E: ID_REVISION=1.0 - E: ID_SERIAL=VBOX_CD-ROM_VB2-01700376 - E: ID_SERIAL_SHORT=VB2-01700376 - -instead of just - - # udevadm info -q all -p /sys/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 - P: /devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 - E: UDEV_LOG=3 - E: DEVPATH=/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 - E: DEVTYPE=scsi_device - E: DRIVER=sr - E: MODALIAS=scsi:t-0x05 - E: SUBSYSTEM=scsi - E: ID_SCSI=1 - E: ID_VENDOR=VBOX - E: ID_VENDOR_ENC=VBOX\x20\x20\x20\x20 - E: ID_MODEL=CD-ROM - E: ID_MODEL_ENC=CD-ROM\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20 - E: ID_REVISION=1.0 - E: ID_TYPE=cd - -Signed-off-by: David Zeuthen ---- - extras/ata_id/ata_id.c | 122 ++++++++++++++++++++++++++--- - rules/rules.d/60-persistent-storage.rules | 4 + - 2 files changed, 114 insertions(+), 12 deletions(-) - -diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c -index 41544e9..92387e5 100644 ---- a/extras/ata_id/ata_id.c -+++ b/extras/ata_id/ata_id.c -@@ -202,6 +202,89 @@ static int disk_identify_command(int fd, - return ret; - } - -+static int disk_identify_packet_device_command(int fd, -+ void *buf, -+ size_t buf_len) -+{ -+ struct sg_io_v4 io_v4; -+ uint8_t cdb[16]; -+ uint8_t sense[32]; -+ uint8_t *desc = sense+8; -+ int ret; -+ -+ /* -+ * ATA Pass-Through 16 byte command, as described in -+ * -+ * T10 04-262r8 ATA Command Pass-Through -+ * -+ * from http://www.t10.org/ftp/t10/document.04/04-262r8.pdf -+ */ -+ memset(cdb, 0, sizeof(cdb)); -+ cdb[0] = 0x85; /* OPERATION CODE: 16 byte pass through */ -+ cdb[1] = 4 << 1; /* PROTOCOL: PIO Data-in */ -+ cdb[2] = 0x2e; /* OFF_LINE=0, CK_COND=1, T_DIR=1, BYT_BLOK=1, T_LENGTH=2 */ -+ cdb[3] = 0; /* FEATURES */ -+ cdb[4] = 0; /* FEATURES */ -+ cdb[5] = 0; /* SECTORS */ -+ cdb[6] = 1; /* SECTORS */ -+ cdb[7] = 0; /* LBA LOW */ -+ cdb[8] = 0; /* LBA LOW */ -+ cdb[9] = 0; /* LBA MID */ -+ cdb[10] = 0; /* LBA MID */ -+ cdb[11] = 0; /* LBA HIGH */ -+ cdb[12] = 0; /* LBA HIGH */ -+ cdb[13] = 0; /* DEVICE */ -+ cdb[14] = 0xA1; /* Command: ATA IDENTIFY PACKET DEVICE */; -+ cdb[15] = 0; /* CONTROL */ -+ memset(sense, 0, sizeof(sense)); -+ -+ memset(&io_v4, 0, sizeof(struct sg_io_v4)); -+ io_v4.guard = 'Q'; -+ io_v4.protocol = BSG_PROTOCOL_SCSI; -+ io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD; -+ io_v4.request_len = sizeof (cdb); -+ io_v4.request = (uintptr_t) cdb; -+ io_v4.max_response_len = sizeof (sense); -+ io_v4.response = (uintptr_t) sense; -+ io_v4.din_xfer_len = buf_len; -+ io_v4.din_xferp = (uintptr_t) buf; -+ io_v4.timeout = COMMAND_TIMEOUT_MSEC; -+ -+ ret = ioctl(fd, SG_IO, &io_v4); -+ if (ret != 0) { -+ /* could be that the driver doesn't do version 4, try version 3 */ -+ if (errno == EINVAL) { -+ struct sg_io_hdr io_hdr; -+ -+ memset(&io_hdr, 0, sizeof(struct sg_io_hdr)); -+ io_hdr.interface_id = 'S'; -+ io_hdr.cmdp = (unsigned char*) cdb; -+ io_hdr.cmd_len = sizeof (cdb); -+ io_hdr.dxferp = buf; -+ io_hdr.dxfer_len = buf_len; -+ io_hdr.sbp = sense; -+ io_hdr.mx_sb_len = sizeof (sense); -+ io_hdr.dxfer_direction = SG_DXFER_FROM_DEV; -+ io_hdr.timeout = COMMAND_TIMEOUT_MSEC; -+ -+ ret = ioctl(fd, SG_IO, &io_hdr); -+ if (ret != 0) -+ goto out; -+ } else { -+ goto out; -+ } -+ } -+ -+ if (!(sense[0] == 0x72 && desc[0] == 0x9 && desc[1] == 0x0c)) { -+ errno = EIO; -+ ret = -1; -+ goto out; -+ } -+ -+ out: -+ return ret; -+} -+ - /** - * disk_identify_get_string: - * @identify: A block of IDENTIFY data -@@ -256,31 +339,36 @@ static void disk_identify_fixup_uint16 (uint8_t identify[512], unsigned int offs - * @udev: The libudev context. - * @fd: File descriptor for the block device. - * @out_identify: Return location for IDENTIFY data. -+ * @out_is_packet_device: Return location for whether returned data is from a IDENTIFY PACKET DEVICE. - * -- * Sends the IDENTIFY DEVICE command to the device represented by -- * @fd. If successful, then the result will be copied into -- * @out_identify. -+ * Sends the IDENTIFY DEVICE or IDENTIFY PACKET DEVICE command to the -+ * device represented by @fd. If successful, then the result will be -+ * copied into @out_identify and @out_is_packet_device. - * - * This routine is based on code from libatasmart, Copyright 2008 - * Lennart Poettering, LGPL v2.1. - * -- * Returns: 0 if the IDENTIFY data was successfully obtained, -- * otherwise non-zero with errno set. -+ * Returns: 0 if the data was successfully obtained, otherwise -+ * non-zero with errno set. - */ - static int disk_identify (struct udev *udev, - int fd, -- uint8_t out_identify[512]) -+ uint8_t out_identify[512], -+ int *out_is_packet_device) - { - int ret; - uint8_t inquiry_buf[36]; - int peripheral_device_type; - int all_nul_bytes; - int n; -+ int is_packet_device; - - assert (out_identify != NULL); -+ - /* init results */ - ret = -1; - memset (out_identify, '\0', 512); -+ is_packet_device = 0; - - /* If we were to use ATA PASS_THROUGH (12) on an ATAPI device - * we could accidentally blank media. This is because MMC's BLANK -@@ -309,6 +397,12 @@ static int disk_identify (struct udev *udev, - - /* SPC-4, section 6.4.2: Standard INQUIRY data */ - peripheral_device_type = inquiry_buf[0] & 0x1f; -+ if (peripheral_device_type == 0x05) -+ { -+ is_packet_device = 1; -+ ret = disk_identify_packet_device_command(fd, out_identify, 512); -+ goto check_nul_bytes; -+ } - if (peripheral_device_type != 0x00) { - ret = -1; - errno = EIO; -@@ -320,6 +414,7 @@ static int disk_identify (struct udev *udev, - if (ret != 0) - goto out; - -+ check_nul_bytes: - /* Check if IDENTIFY data is all NUL bytes - if so, bail */ - all_nul_bytes = 1; - for (n = 0; n < 512; n++) { -@@ -336,6 +431,8 @@ static int disk_identify (struct udev *udev, - } - - out: -+ if (out_is_packet_device != NULL) -+ *out_is_packet_device = is_packet_device; - return ret; - } - -@@ -350,7 +447,7 @@ int main(int argc, char *argv[]) - { - struct udev *udev; - struct hd_driveid id; -- uint8_t identify[512]; -+ uint8_t identify[512]; - char model[41]; - char model_enc[256]; - char serial[21]; -@@ -358,8 +455,9 @@ int main(int argc, char *argv[]) - const char *node = NULL; - int export = 0; - int fd; -- uint16_t word; -+ uint16_t word; - int rc = 0; -+ int is_packet_device = 0; - static const struct option options[] = { - { "export", no_argument, NULL, 'x' }, - { "help", no_argument, NULL, 'h' }, -@@ -408,7 +506,7 @@ int main(int argc, char *argv[]) - goto exit; - } - -- if (disk_identify(udev, fd, identify) == 0) { -+ if (disk_identify(udev, fd, identify, &is_packet_device) == 0) { - /* - * fix up only the fields from the IDENTIFY data that we are going to - * use and copy it into the hd_driveid struct for convenience -@@ -416,7 +514,7 @@ int main(int argc, char *argv[]) - disk_identify_fixup_string (identify, 10, 20); /* serial */ - disk_identify_fixup_string (identify, 23, 6); /* fwrev */ - disk_identify_fixup_string (identify, 27, 40); /* model */ -- disk_identify_fixup_uint16 (identify, 0); /* configuration */ -+ disk_identify_fixup_uint16 (identify, 0); /* configuration */ - disk_identify_fixup_uint16 (identify, 75); /* queue depth */ - disk_identify_fixup_uint16 (identify, 75); /* SATA capabilities */ - disk_identify_fixup_uint16 (identify, 82); /* command set supported */ -@@ -457,8 +555,8 @@ int main(int argc, char *argv[]) - udev_util_replace_chars(revision, NULL); - - if (export) { -- /* Set this to convey the disk speaks the ATA protocol */ -- printf("ID_ATA=1\n"); -+ /* Set this to convey the disk speaks the ATA protocol */ -+ printf("ID_ATA=1\n"); - - if ((id.config >> 8) & 0x80) { - /* This is an ATAPI device */ -diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules -index d3f2f73..8baabc2 100644 ---- a/rules/rules.d/60-persistent-storage.rules -+++ b/rules/rules.d/60-persistent-storage.rules -@@ -12,6 +12,8 @@ ACTION=="remove", GOTO="persistent_storage_end" - - # run scsi_id and ata_id on the actual SCSI device - SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", ATTR{vendor}=="ATA", IMPORT{program}="ata_id --export $root/bsg/$kernel" -+# ATA/ATAPI devices is of type 0x05 and vendor is usually not ATA -+SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", ATTR{type}=="5", IMPORT{program}="ata_id --export $root/bsg/$kernel" - SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --whitelisted --export --device $root/bsg/$kernel" - - # from this point on, only care about block devices -@@ -40,6 +42,8 @@ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program - KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="ata", IMPORT{program}="ata_id --export $tempnode" - # ATA devices using the "scsi" subsystem - KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", IMPORT{program}="ata_id --export $tempnode" -+# ATA/ATAPI devices using the "scsi" subsystem -+KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{type}=="5", IMPORT{program}="ata_id --export $tempnode" - # scsi devices - KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode", ENV{ID_BUS}="scsi" - KERNEL=="cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode", ENV{ID_BUS}="cciss" --- -1.7.3.4 - diff --git a/source/a/udisks/slack-desc b/source/a/udisks/slack-desc new file mode 100644 index 00000000..a85adeb4 --- /dev/null +++ b/source/a/udisks/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +udisks: udisks (storage device daemon) +udisks: +udisks: The udisks project provides a storage daemon that implements D-Bus +udisks: interfaces that can be used to query and manipulate storage devices. +udisks: +udisks: It also includes a command-line tool, udisks(1), that can be used to +udisks: query and control the daemon. +udisks: +udisks: Homepage: http://www.freedesktop.org/wiki/Software/udisks +udisks: +udisks: diff --git a/source/a/udisks/udisks.SlackBuild b/source/a/udisks/udisks.SlackBuild new file mode 100755 index 00000000..9d12e783 --- /dev/null +++ b/source/a/udisks/udisks.SlackBuild @@ -0,0 +1,119 @@ +#!/bin/sh + +# Slackware build script for udisks + +# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Modified 2012 by Eric Hameleers for ARM port. + + +PKGNAM=udisks +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$TARGET + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Move the bash completion file to the right place +mkdir -p $PKG/etc/bash_completion.d +mv $PKG/etc/profile.d/udisks-bash-completion.sh \ + $PKG/etc/bash_completion.d/udisks + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README \ + $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/udisks/udisks.url b/source/a/udisks/udisks.url new file mode 100644 index 00000000..cef0134b --- /dev/null +++ b/source/a/udisks/udisks.url @@ -0,0 +1 @@ +http://hal.freedesktop.org/releases/ diff --git a/source/a/udisks2/doinst.sh b/source/a/udisks2/doinst.sh new file mode 100644 index 00000000..c186599a --- /dev/null +++ b/source/a/udisks2/doinst.sh @@ -0,0 +1,12 @@ +# udisks2 is stupid about testing files before using them. If /etc/crypttab +# does not exist, it will fill the log with "errors" as it tries to open the +# nonexistent file. There's really no reason that a system without encrypted +# volumes should require this file, but nobody upstream cares to fix the +# problem (and the code's too messy for me to find it), so we have little +# choice but to trowel over this. (sigh) + +if [ ! -r etc/crypttab ]; then + # echo "HEY, EVERYONE SHOULD HAVE A CRYPTTAB!!!" (just kidding) + touch etc/crypttab +fi + diff --git a/source/a/udisks2/slack-desc b/source/a/udisks2/slack-desc new file mode 100644 index 00000000..0d6d4427 --- /dev/null +++ b/source/a/udisks2/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +udisks2: udisks2 (storage device daemon v2) +udisks2: +udisks2: The udisks project provides a storage daemon that implements D-Bus +udisks2: interfaces that can be used to query and manipulate storage devices. +udisks2: +udisks2: It also includes a command-line tool, udisks(1), that can be used to +udisks2: query and control the daemon. +udisks2: +udisks2: Homepage: http://www.freedesktop.org/wiki/Software/udisks +udisks2: +udisks2: diff --git a/source/a/udisks2/udisks2.SlackBuild b/source/a/udisks2/udisks2.SlackBuild new file mode 100755 index 00000000..4316488e --- /dev/null +++ b/source/a/udisks2/udisks2.SlackBuild @@ -0,0 +1,139 @@ +#!/bin/sh + +# Slackware build script for udisks + +# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Modified 2012 by Eric Hameleers for ARM port. + +PKGNAM=udisks2 +SRCNAM=udisks +VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.xz || exit 1 +cd $SRCNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$TARGET || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* HACKING INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/upower/doinst.sh b/source/a/upower/doinst.sh new file mode 100644 index 00000000..46abf401 --- /dev/null +++ b/source/a/upower/doinst.sh @@ -0,0 +1,15 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/UPower/UPower.conf.new + diff --git a/source/a/upower/slack-desc b/source/a/upower/slack-desc new file mode 100644 index 00000000..b4401b93 --- /dev/null +++ b/source/a/upower/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +upower: UPower (power management abstraction daemon) +upower: +upower: UPower is an abstraction for enumerating power devices, listening to +upower: device events and querying history and statistics. Any application or +upower: service on the system can access the org.freedesktop.UPower service +upower: via the system message bus. Some operations (such as suspending the +upower: system) are restricted using PolicyKit. +upower: +upower: Homepage: http://upower.freedesktop.org/ +upower: +upower: diff --git a/source/a/upower/upower.SlackBuild b/source/a/upower/upower.SlackBuild new file mode 100755 index 00000000..e5831960 --- /dev/null +++ b/source/a/upower/upower.SlackBuild @@ -0,0 +1,121 @@ +#!/bin/sh + +# Slackware build script for upower + +# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Modified 2012 by Eric Hameleers for ARM port. + + +PKGNAM=upower +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --enable-man-pages \ + --build=$TARGET + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Don't clobber the config file on upgrades +mv $PKG/etc/UPower/UPower.conf $PKG/etc/UPower/UPower.conf.new + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README \ + $PKG/usr/doc/$PKGNAM-$VERSION +cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/upower/upower.url b/source/a/upower/upower.url new file mode 100644 index 00000000..30c25b7f --- /dev/null +++ b/source/a/upower/upower.url @@ -0,0 +1 @@ +http://upower.freedesktop.org/releases/ diff --git a/source/a/usb_modeswitch/device_reference.txt b/source/a/usb_modeswitch/device_reference.txt index 10fb5fe8..db7ac8c0 100644 --- a/source/a/usb_modeswitch/device_reference.txt +++ b/source/a/usb_modeswitch/device_reference.txt @@ -1,7 +1,7 @@ # # Device and Configuration Reference (UTF-8 encoding used) # -# Last modified: 2010-08-26 +# Last modified: 2012-01-20 # # Collection of configurations for usb_modeswitch, a mode switching # tool for controlling flip flop (multiple mode) USB devices @@ -13,22 +13,12 @@ # http://www.draisberghof.de/usb_modeswitch/device_reference.txt -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # +# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# Important! This file is just a reference! Use the data package! +# Don't use this file directly; for your own experiments, create a +# config file, copy data from here, and use it with the -c parameter! # -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # - - -# In order to activate a device included here you might remove the -# comment signs (";") from the respective entry. -# -# It is rather recommended to copy device information to a different -# file, to ease editing work and oversight and to avoid possible -# conflicts by activating multiple entries. -# There is no guarantee that this file is error-free! -# -# The actual entries are further down, after the command reference. +# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # For custom settings: @@ -43,7 +33,8 @@ # * DefaultProduct -p # # This is the ID the USB device shows after having been plugged in. -# The program needs this; if not found -> no action. +# The program needs this, either on the command line or in the config +# file; if not found -> no action. # # # * TargetVendor -V @@ -67,11 +58,10 @@ # # # * MessageEndpoint -m -# +# # A kind of address inside the interface to which the "message" # (the sequence that does the actual switching) is directed. -# Starting from version 0.9.7 the MessageEndpoint is autodetected -# if not given +# Obsolete since version 0.9.7, only useful for testing # # # * MessageContent -M @@ -88,6 +78,7 @@ # * ReleaseDelay -w # # Waiting time after message transfers. Helps with some sensitive devices +# that don't want any traffic after the mode switch initialisation # # # * ResponseEndpoint -r @@ -101,42 +92,43 @@ # # * DetachStorageOnly <0/1> -d # -# Some devices just need to be detached from the usb-storage -# driver to initiate the mode switching. Using this feature -# instead of removing the whole usbstorage module keeps other -# storage devices working. +# Some early devices just needed to be detached from the usb-storage +# driver to initiate the mode switching. Now paractically obsolete for +# switching, but still comes handy sometimes # # # * HuaweiMode <0/1> -H # -# Some Huawei devices can be switched by a special control -# message. -# -# -# * SierraMode <0/1> -S -# -# Some Sierra devices can be switched by a special control -# message. +# Some early Huawei devices can be switched by a special control +# message. Don't use with recent devices # # # * SonyMode <0/1> -O # # Some Sony-Ericsson devices can be switched by a special control -# message. This is experimental and might not have a stable result +# message. May take a long time (20+ seconds). +# +# +# * SierraMode <0/1> -S +# * KobilMode <0/1> -T +# * GCTMode <0/1> -G +# * SequansMode <0/1> -N +# * MobileActionMode <0/1> -A +# * QisdaMode <0/1> -B +# * CiscoMode <0/1> -B # -# * KobilMode <0/1> -T # -# Some Kobil devices can be switched by a special control -# message. +# Flags to support devices that need special control messages. +# The names are referring to the respective manufacturers. # # # * ResetUSB <0/1> -R # -# Some devices need a rougher treatment. If the switching seems -# to do something (run udevmonitor), but your system does not reflect -# it, try this somewhat brutal method to do a reset after switching. -# Mind that if your device switched OK before, this will probably set -# it back to storage mode ... +# Few devices or systems need a rougher treatment. If the switching seems +# to do something but your system does not reflect it, try this somewhat +# brutal method to do a reset after switching. +# Mind that if your device switched OK before, this may set it back to +# storage mode ... # # # * Interface -i @@ -175,16 +167,27 @@ # # The binary tells the wrapper script NOT to check for and initiate # binding of the serial driver after switching. -# Mostly useful for non-modem devices +# Mostly useful for non-modem devices. +# +# +# * WaitBefore (no command line parameter) # +# Waiting time before taking any action. Helps with some sensitive setups. # -# -> All other entries are just ignored <- +# +# +# -> All other entries in config files are just ignored <- # Additional command line flags: -# +# # Verbose output -W # No output at all -q -# Other config file -c +# Use config file -c +# Use stdin for long config -t +# Give long config as string -f +# Give bus number for ID'ing -b +# Give dev number for ID'ing -g + # For filling in all this information for an unknown device, # see instructions and links on the homepage: @@ -197,47 +200,47 @@ ####################################################### # Option GlobeSurfer Icon (aka "Vodafone EasyBox") # -# The message SHOULD be the same for all Option devices +# The MessageContent is identical for all Option devices -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x0af0 -;TargetProduct= 0x6600 +TargetVendor= 0x0af0 +TargetProduct= 0x6600 -;MessageContent="55534243123456780000000000000601000000000000000000000000000000" +MessageContent="55534243123456780000000000000601000000000000000000000000000000" ####################################################### -# Option GlobeSurfer Icon 7.2 +# Option GlobeSurfer Icon 7.2 # # Contributor: The Pharscape Forum -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x0af0 -;TargetProduct= 0x6901 +TargetVendor= 0x0af0 +TargetProduct= 0x6901 -;MessageContent="55534243123456780000000000000601000000000000000000000000000000" +MessageContent="55534243123456780000000000000601000000000000000000000000000000" ######################################################## # Option GlobeTrotter GT MAX 3.6 (aka "T-Mobile Web'n'walk Card Compact II") # -# Contributor: Bernd Holzmüller +# Contributor: Bernd Holzmüller -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x0af0 -;TargetProduct= 0x6600 +TargetVendor= 0x0af0 +TargetProduct= 0x6600 -;MessageContent="55534243123456780000000000000601000000000000000000000000000000" +MessageContent="55534243123456780000000000000601000000000000000000000000000000" # ResponseEndpoint=0x84 -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -245,13 +248,13 @@ # # Contributors: Lucas Benedicic, Morgwai Kotarbinski -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x0af0 -;TargetProduct= 0x6701 +TargetVendor= 0x0af0 +TargetProduct= 0x6701 -;MessageContent="55534243123456780000000000000601000000000000000000000000000000" +MessageContent="55534243123456780000000000000601000000000000000000000000000000" ######################################################## @@ -259,33 +262,92 @@ # # Contributor: Fridtjof Busse -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x0af0 -;TargetProduct= 0x6701 +TargetVendor= 0x0af0 +TargetProduct= 0x6701 -;MessageContent="55534243123456780000000000000601000000000000000000000000000000" +MessageContent="55534243123456780000000000000601000000000000000000000000000000" # Response reading needed according to one (1) report -;NeedResponse=1 +NeedResponse=1 ####################################################### # Option GlobeSurfer Icon 7.2, new firmware (HSO driver) # # Vendor/ProductID don't change when switching, only the device -# class does. Most new Option devices work with this. Just adapt IDs! -# HSO driver support is available at Pharscape (www.pharscape.org) -# -# Contributor: Paul Hardwick +# class does. Most new Option devices work with this. Just adapt the IDs. +# +# Option's HSO driver is part of the mainstream kernel; support is +# available at Pharscape (www.pharscape.org) +# +# Contributors: Paul Hardwick, Philip Aben + +DefaultVendor= 0x0af0 +DefaultProduct= 0x6911 + +TargetClass= 0xff + +MessageContent="55534243123456780000000000000601000000000000000000000000000000" + +# Here is a list with all currently supported Option default IDs: +# +# 0af0:6711 +# 0af0:6731 +# 0af0:6751 +# 0af0:6771 +# 0af0:6791 +# 0af0:6811 +# 0af0:6911 +# 0af0:6951 +# 0af0:6971 +# 0af0:7011 +# 0af0:7031 +# 0af0:7051 +# 0af0:7071 +# 0af0:7111 +# 0af0:7211 +# 0af0:7251 +# 0af0:7271 +# 0af0:7301 +# 0af0:7311 +# 0af0:7361 +# 0af0:7381 +# 0af0:7401 +# 0af0:7501 +# 0af0:7601 +# 0af0:7701 +# 0af0:7801 +# 0af0:7901 +# 0af0:7a01 +# 0af0:7a05 +# 0af0:8200 +# 0af0:8201 +# 0af0:8300 +# 0af0:8302 +# 0af0:8304 +# 0af0:8400 +# 0af0:8600 +# 0af0:8800 +# 0af0:8900 +# 0af0:9000 +# 0af0:c031 +# 0af0:c100 +# 0af0:d013 +# 0af0:d031 +# 0af0:d033 +# 0af0:d035 +# 0af0:d055 +# 0af0:d057 +# 0af0:d058 +# 0af0:d155 +# 0af0:d157 +# 0af0:d255 +# 0af0:d257 +# 0af0:d357 -;DefaultVendor= 0x0af0 -;DefaultProduct= 0x6911 - -;TargetClass= 0xff - -;MessageContent="55534243123456780000000000000601000000000000000000000000000000" ######################################################## @@ -298,75 +360,15 @@ # # Contributor: wahlm, Peter Kraker, Pakdhetimin Sekum -;DefaultVendor= 0x1e0e -;DefaultProduct= 0xf000 - -;TargetVendor= 0x1e0e -;TargetProduct= 0x9000 - -;MessageContent="555342431234567800000000000006bd000000020000000000000000000000" - -;NeedResponse=1 - - -####################################################### -# Option iCON 225 HSDPA -# -# New Firmware. HSO driver support is available at Pharscape (www.pharscape.org) -# -# Contributor: Matti Viljanen - -;DefaultVendor= 0x0af0 -;DefaultProduct= 0x6971 - -;TargetClass= 0xff - -;MessageContent="555342431223456780100000080000601000000000000000000000000000000" - - -####################################################### -# Option GlobeTrotter HSUPA Modem (aka "T-Mobile Web'n'walk Card Compact III') -# -# New Firmware. HSO driver support is available at Pharscape (www.pharscape.org) -# -# Contributor: Gerold Gruber - -;DefaultVendor= 0x0af0 -;DefaultProduct= 0x7011 - -;TargetClass= 0xff - -;MessageContent="55534243785634120100000080000601000000000000000000000000000000" - - -###################################################### -# Option iCON 401 -# -# HSO driver -# -# Contributor: Vincent Teoh - -;DefaultVendor= 0x0af0 -;DefaultProduct= 0x7401 - -;TargetClass= 0xff - -;MessageContent="55534243785634120100000080000601000000000000000000000000000000" - -;NeedResponse=1 - - -######################################################## -# Vodafone K3760 (made by Option, HSO driver) -# -# Contributor: The Solutor +DefaultVendor= 0x1e0e +DefaultProduct= 0xf000 -;DefaultVendor= 0x0af0 -;DefaultProduct= 0x7501 +TargetVendor= 0x1e0e +TargetProduct= 0x9000 -;TargetClass= 0xff +MessageContent="555342431234567800000000000006bd000000020000000000000000000000" -;MessageContent="55534243785634120100000080000601000000000000000000000000000000" +NeedResponse=1 ######################################################## @@ -374,12 +376,12 @@ # # Contributor: sissie from Bullteam -;DefaultVendor= 0x0af0 -;DefaultProduct= 0xd033 +DefaultVendor= 0x0af0 +DefaultProduct= 0xd033 -;TargetClass= 0xff +TargetClass= 0xff -;MessageContent="55534243785634120100000080000601000000000000000000000000000000" +MessageContent="55534243785634120100000080000601000000000000000000000000000000" ######################################################## @@ -387,27 +389,27 @@ # # Contributor: Hans Kurent, Denis Sutter, Vincent Teoh -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1003 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1003 -;TargetClass= 0xff +TargetClass= 0xff -;HuaweiMode=1 +HuaweiMode=1 ######################################################## -# Huawei E169 +# Huawei E169 and others # # Contributor: Dale Lane -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1001 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1001 -;TargetClass= 0xff +TargetClass= 0xff # choose one of these: -;DetachStorageOnly=1 -;HuaweiMode=1 +DetachStorageOnly=1 +HuaweiMode=1 ######################################################## @@ -415,12 +417,12 @@ # # Contributor: Tom Dawahare -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1414 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1414 -;TargetClass= 0xff +TargetClass= 0xff -;HuaweiMode=1 +HuaweiMode=1 ######################################################## @@ -431,13 +433,13 @@ # # Contributor: Joakim Wenrgren -;DefaultVendor= 0x1033 -;DefaultProduct= 0x0035 +DefaultVendor= 0x1033 +DefaultProduct= 0x0035 -;TargetVendor= 0x12d1 -;TargetProduct= 0x1003 +TargetVendor= 0x12d1 +TargetProduct= 0x1003 -;HuaweiMode=1 +HuaweiMode=1 ######################################################## @@ -445,18 +447,18 @@ # # Probably works with DetachStorageOnly too # -# Contributor: Flávio Moringa and others +# Contributor: Flávio Moringa and others -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProductList="0001" +TargetVendor= 0x19d2 +TargetProductList="0001" -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -464,16 +466,16 @@ # # Contributor: andylog -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0002 +TargetVendor= 0x19d2 +TargetProduct= 0x0002 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -484,28 +486,28 @@ # # Contributor: Alvaro Lopes -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 # To modem mode: -;TargetVendor= 0x19d2 -;TargetProduct= 0x0015 +TargetVendor= 0x19d2 +TargetProduct= 0x0015 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 # To SD slot mode: -;TargetVendor= 0x05c6 -;TargetProduct= 0x2001 +TargetVendor= 0x05c6 +TargetProduct= 0x2001 -;MessageContent="55534243123456782000000080000a86010101180101010101000000000000" +MessageContent="55534243123456782000000080000a86010101180101010101000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -515,19 +517,20 @@ # ZTE MF633 # ZTE MF636 (aka "Telstra / BigPond 7.2 Mobile Card") # ZTE MF637 +# and probably others not listed here # # Contributor: Joakim Wennergren and others -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0031 +TargetVendor= 0x19d2 +TargetProduct= 0x0031 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -535,16 +538,16 @@ # # Contributor: andylog -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0037 +TargetVendor= 0x19d2 +TargetProduct= 0x0037 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -557,29 +560,29 @@ # # Contributor: Michael Khurtsiya, Amit Pundir and others -;DefaultVendor= 0x19d2 -;DefaultProduct= 0xfff5 +DefaultVendor= 0x19d2 +DefaultProduct= 0xfff5 -;TargetVendor= 0x19d2 -;TargetProduct= 0xffff +TargetVendor= 0x19d2 +TargetProduct= 0xffff # No. 2 -;DefaultVendor= 0x19d2 -;DefaultProduct= 0xfff6 +DefaultVendor= 0x19d2 +DefaultProduct= 0xfff6 -;TargetVendor= 0x19d2 -;TargetProduct= 0xfff1 +TargetVendor= 0x19d2 +TargetProduct= 0xfff1 # No. 3 -;DefaultVendor= 0x19d2 -;DefaultProduct= 0xfff5 +DefaultVendor= 0x19d2 +DefaultProduct= 0xfff5 -;TargetVendor= 0x19d2 -;TargetProduct= 0xfff1 +TargetVendor= 0x19d2 +TargetProduct= 0xfff1 -;MessageContent="5553424312345678c00000008000069f030000000000000000000000000000" +MessageContent="5553424312345678c00000008000069f030000000000000000000000000000" ######################################################## @@ -587,13 +590,13 @@ # # Contributor: Wasim Baig -;DefaultVendor= 0x19d2 -;DefaultProduct= 0xfff5 +DefaultVendor= 0x19d2 +DefaultProduct= 0xfff5 -;TargetVendor= 0x19d2 -;TargetProduct= 0xffff +TargetVendor= 0x19d2 +TargetProduct= 0xffff -;MessageContent="5553424312345678c00000008000069f010000000000000000000000000000" +MessageContent="5553424312345678c00000008000069f010000000000000000000000000000" # Just for information: try it with the message from the AC8710 ... @@ -603,16 +606,16 @@ # # Contributor: David Taillandier -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0052 +TargetVendor= 0x19d2 +TargetProduct= 0x0052 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -620,16 +623,16 @@ # # Contributor: Lucio Asnaghi a.k.a. kRAkEn/gORe -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0002 +TargetVendor= 0x19d2 +TargetProduct= 0x0002 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -637,16 +640,16 @@ # # Contributor: Alex Scortegagna -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0002 +TargetVendor= 0x19d2 +TargetProduct= 0x0002 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -656,14 +659,14 @@ # # Contributor: Razvan Dragomirescu, Mike Kirk -;DefaultVendor= 0x1410 -;DefaultProduct= 0x5010 +DefaultVendor= 0x1410 +DefaultProduct= 0x5010 -;TargetVendor= 0x1410 -;TargetProduct= 0x4400 +TargetVendor= 0x1410 +TargetProduct= 0x4400 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 ######################################################## @@ -673,14 +676,14 @@ # # Contributor: Chris Thielen -;DefaultVendor= 0x1410 -;DefaultProduct= 0x5010 +DefaultVendor= 0x1410 +DefaultProduct= 0x5010 -;TargetVendor= 0x1410 -;TargetProduct= 0x4100 +TargetVendor= 0x1410 +TargetProduct= 0x4100 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 ######################################################## @@ -688,13 +691,19 @@ # # Contributor: Joakim Wennergren -;DefaultVendor= 0x1410 -;DefaultProduct= 0x5020 +DefaultVendor= 0x1410 +DefaultProduct=0x5020 -;Interface= 5 +DefaultVendor= 0x1410 +TargetProductList="6000,7001" -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +# Don't use this, original report must be wrong, +# https://bugzilla.redhat.com/show_bug.cgi?id=728318 +# +# Interface=5 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 ######################################################## @@ -702,14 +711,14 @@ # # Contributor: Richard Laager -;DefaultVendor= 0x1410 -;DefaultProduct= 0x5030 +DefaultVendor= 0x1410 +DefaultProduct= 0x5030 -;TargetVendor= 0x1410 -;TargetProduct= 0x6000 +TargetVendor= 0x1410 +TargetProduct= 0x6000 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 ######################################################## @@ -718,25 +727,25 @@ # # Contributor: Aleksandar Samardzic, Marcelo Fernandez -;DefaultVendor= 0x1c9e -;DefaultProduct= 0x1001 +DefaultVendor= 0x1c9e +DefaultProduct= 0x1001 -;TargetVendor= 0x1c9e -;TargetProduct= 0x6061 +TargetVendor= 0x1c9e +TargetProduct= 0x6061 -;MessageContent="55534243123456780000000000000606f50402527000000000000000000000" +MessageContent="55534243123456780000000000000606f50402527000000000000000000000" ######################################################## # Alcatel X200/X060S -;DefaultVendor= 0x1bbb -;DefaultProduct= 0xf000 +DefaultVendor= 0x1bbb +DefaultProduct= 0xf000 -;TargetVendor= 0x1bbb -;TargetProduct= 0x0000 +TargetVendor= 0x1bbb +TargetProduct= 0x0000 -;MessageContent="55534243123456788000000080000606f50402527000000000000000000000" +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" ######################################################## @@ -748,14 +757,14 @@ # # Contributor: Vladimir Poluektov, Gabriel Smolar -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x16d5 -;TargetProduct= 0x6502 +TargetVendor= 0x16d5 +TargetProduct= 0x6502 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 ######################################################## @@ -767,15 +776,15 @@ # # Contributor: Alexander Czigler -;DefaultVendor= 0x1a8d -;DefaultProduct= 0x1000 +DefaultVendor= 0x1a8d +DefaultProduct= 0x1000 -;TargetVendor= 0x1a8d -;TargetProduct= 0x1002 +TargetVendor= 0x1a8d +TargetProduct= 0x1002 -;MessageContent="55534243123456781200000080000603000000020000000000000000000000" +MessageContent="55534243123456781200000080000603000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -785,15 +794,15 @@ # # Contributor: Alexander Czigler -;DefaultVendor= 0x1dd6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x1dd6 +DefaultProduct= 0x1000 -;TargetVendor= 0x1dd6 -;TargetProduct= 0x1002 +TargetVendor= 0x1dd6 +TargetProduct= 0x1002 -;MessageContent="55534243123456781200000080000603000000020000000000000000000000" +MessageContent="55534243123456781200000080000603000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -804,13 +813,13 @@ # # Contributor: Alexander Czigler -;DefaultVendor= 0x16d8 -;DefaultProduct= 0x6803 +DefaultVendor= 0x16d8 +DefaultProduct= 0x6803 -;TargetVendor= 0x16d8 -;TargetProduct= 0x680a +TargetVendor= 0x16d8 +TargetProduct= 0x680a -;MessageContent="555342431234567824000000800008ff524445564348470000000000000000" +MessageContent="555342431234567824000000800008ff524445564348470000000000000000" ######################################################## @@ -818,13 +827,13 @@ # # Contributor: Mathias Picker -;DefaultVendor= 0x16d8 -;DefaultProduct= 0xf000 +DefaultVendor= 0x16d8 +DefaultProduct= 0xf000 -;TargetVendor= 0x16d8 -;TargetProduct= 0x6006 +TargetVendor= 0x16d8 +TargetProduct= 0x6006 -;MessageContent="55534243d85dd88524000000800008ff524445564348470000000000000000" +MessageContent="55534243d85dd88524000000800008ff524445564348470000000000000000" ######################################################## @@ -832,15 +841,15 @@ # # Contributor: Mijail Anton -;DefaultVendor= 0x0930 -;DefaultProduct= 0x0d46 +DefaultVendor= 0x0930 +DefaultProduct= 0x0d46 -;TargetVendor= 0x0930 -;TargetProduct= 0x0d45 +TargetVendor= 0x0930 +TargetProduct= 0x0d45 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -848,13 +857,13 @@ # # Contributor: Mark A. Ziesemer -;DefaultVendor= 0x106c -;DefaultProduct= 0x3b03 +DefaultVendor= 0x106c +DefaultProduct= 0x3b03 -;TargetVendor= 0x106c -;TargetProduct= 0x3715 +TargetVendor= 0x106c +TargetProduct= 0x3715 -;MessageContent="555342431234567824000000800008ff024445564348470000000000000000" +MessageContent="555342431234567824000000800008ff024445564348470000000000000000" ######################################################## @@ -862,15 +871,15 @@ # # Contributor: "paul" -;DefaultVendor= 0x1ab7 -;DefaultProduct= 0x5700 +DefaultVendor= 0x1ab7 +DefaultProduct= 0x5700 -;TargetVendor= 0x1ab7 -;TargetProduct= 0x5731 +TargetVendor= 0x1ab7 +TargetProduct= 0x5731 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -878,15 +887,15 @@ # # Contributor: A-Link Europe Ltd. -;DefaultVendor= 0x1e0e -;DefaultProduct= 0xf000 +DefaultVendor= 0x1e0e +DefaultProduct= 0xf000 -;TargetVendor= 0x1e0e -;TargetProduct= 0x9200 +TargetVendor= 0x1e0e +TargetProduct= 0x9200 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -894,13 +903,13 @@ # # Contributor: Vincent Teoh -;DefaultVendor= 0x1199 -;DefaultProduct= 0x0fff +DefaultVendor= 0x1199 +DefaultProduct= 0x0fff -;TargetVendor= 0x1199 -;TargetProduct= 0x0023 +TargetVendor= 0x1199 +TargetProduct= 0x0023 -;SierraMode=1 +SierraMode=1 ######################################################## @@ -908,13 +917,13 @@ # # Contributor: Vincent Teoh -;DefaultVendor= 0x1199 -;DefaultProduct= 0x0fff +DefaultVendor= 0x1199 +DefaultProduct= 0x0fff -;TargetVendor= 0x1199 -;TargetProduct= 0x6856 +TargetVendor= 0x1199 +TargetProduct= 0x6856 -;SierraMode=1 +SierraMode=1 ######################################################## @@ -922,13 +931,13 @@ # # Special procedure, takes around 25 secs. on the whole -;DefaultVendor= 0x0fce -;DefaultProduct= 0xd0e1 +DefaultVendor= 0x0fce +DefaultProduct= 0xd0e1 -;TargetClass= 0x02 +TargetClass= 0x02 -;SonyMode=1 -;Configuration=2 +SonyMode=1 +Configuration=2 ######################################################## @@ -936,12 +945,12 @@ # # Recommended init command: ATE0V1&D2&C1S0=0 # -# Contributor: Jérôme Oufella +# Contributor: Jérôme Oufella -;DefaultVendor= 0x1004 -;DefaultProduct= 0x1000 +DefaultVendor= 0x1004 +DefaultProduct= 0x1000 -;MessageContent="55534243123456780000000000000aff554d53434847000000000000000000" +MessageContent="55534243123456780000000000000aff554d53434847000000000000000000" ######################################################## @@ -954,13 +963,13 @@ # # Contributor: A Friend -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x04e8 -;TargetProduct= 0x6601 +TargetVendor= 0x04e8 +TargetProduct= 0x6601 -;MessageContent="55534243123456780000000000000616000000000000000000000000000000" +MessageContent="55534243123456780000000000000616000000000000000000000000000000" ######################################################## @@ -968,13 +977,13 @@ # # Contributor: Stefan Olejnik -;DefaultVendor= 0x1c9e -;DefaultProduct= 0xf000 +DefaultVendor= 0x1c9e +DefaultProduct= 0xf000 -;TargetVendor= 0x1c9e -;TargetProduct= 0x9000 +TargetVendor= 0x1c9e +TargetProduct= 0x9000 -;MessageContent="55534243123456788000000080000606f50402527000000000000000000000" +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" ######################################################## @@ -984,13 +993,13 @@ # # Contributor: Vincent Teoh -;DefaultVendor= 0x1c9e -;DefaultProduct= 0xf000 +DefaultVendor= 0x1c9e +DefaultProduct= 0xf000 -;TargetVendor= 0x1c9e -;TargetProduct= 0x9063 +TargetVendor= 0x1c9e +TargetProduct= 0x9063 -;MessageContent="55534243123456788000000080000606f50402527000000000000000000000" +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" ######################################################## @@ -1000,13 +1009,13 @@ # # Contributor: Aaron Guidazzi -;DefaultVendor= 0x1c9e -;DefaultProduct= 0x9200 +DefaultVendor= 0x1c9e +DefaultProduct= 0x9200 -;TargetVendor= 0x1c9e -;TargetProduct= 0x9202 +TargetVendor= 0x1c9e +TargetProduct= 0x9202 -;MessageContent="55534243123456780000000000000606f50402527000000000000000000000" +MessageContent="55534243123456780000000000000606f50402527000000000000000000000" ######################################################## @@ -1016,13 +1025,13 @@ # # Contributor: Jeffrey Hoogland -;DefaultVendor= 0x1f28 -;DefaultProduct= 0x0021 +DefaultVendor= 0x1f28 +DefaultProduct= 0x0021 -;TargetVendor= 0x1f28 -;TargetProduct= 0x0020 +TargetVendor= 0x1f28 +TargetProduct= 0x0020 -;MessageContent="555342431234567824000000800108df200000000000000000000000000000" +MessageContent="555342431234567824000000800108df200000000000000000000000000000" # Afterwards (optional): "usb_modeswitch -v 0x1f28 -p 0x0020 -R" @@ -1032,13 +1041,13 @@ # # Contributor: Chris Wright -;DefaultVendor= 0x1b7d -;DefaultProduct= 0x0700 +DefaultVendor= 0x1b7d +DefaultProduct= 0x0700 -;TargetVendor= 0x1b7d -;TargetProduct= 0x0001 +TargetVendor= 0x1b7d +TargetProduct= 0x0001 -;MessageContent="555342431234567824000000800008FF05B112AEE102000000000000000000" +MessageContent="555342431234567824000000800008FF05B112AEE102000000000000000000" ######################################################## @@ -1048,13 +1057,13 @@ # # Contributor: Arif Ahmed -;DefaultVendor= 0x04e8 -;DefaultProduct= 0xf000 +DefaultVendor= 0x04e8 +DefaultProduct= 0xf000 -;TargetVendor= 0x04e8 -;TargetProduct= 0x6601 +TargetVendor= 0x04e8 +TargetProduct= 0x6601 -;MessageContent="55534243123456780000000000000616000000000000000000000000000000" +MessageContent="55534243123456780000000000000616000000000000000000000000000000" ######################################################## @@ -1064,13 +1073,13 @@ # # Contributor: Paranoid Paranoia -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1446 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1446 -;TargetVendor= 0x12d1 -;TargetProduct= 0x14ac +TargetVendor= 0x12d1 +TargetProduct= 0x14ac -;MessageContent="55534243123456780000000000000011060000000000000000000000000000" +MessageContent="55534243123456780000000000000011060000000000000000000000000000" ######################################################## @@ -1079,13 +1088,13 @@ # # Contributor: Anders Blomdell, Ahmed Soliman -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1446 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1446 -;TargetVendor= 0x12d1 -;TargetProduct= 0x1001 +TargetVendor= 0x12d1 +TargetProduct= 0x1001 -;MessageContent="55534243123456780000000000000011060000000000000000000000000000" +MessageContent="55534243123456780000000000000011060000000000000000000000000000" ######################################################## @@ -1093,16 +1102,16 @@ # # Contributor: Paul McDermott -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0055 +TargetVendor= 0x19d2 +TargetProduct= 0x0055 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1111,13 +1120,13 @@ # # Contributor: Chris -;DefaultVendor= 0x1c9e -;DefaultProduct= 0xf000 +DefaultVendor= 0x1c9e +DefaultProduct= 0xf000 -;TargetVendor= 0x1c9e -;TargetProduct= 0x9603 +TargetVendor= 0x1c9e +TargetProduct= 0x9603 -;MessageContent="55534243123456788000000080000606f50402527000000000000000000000" +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" ######################################################## @@ -1125,15 +1134,15 @@ # # Contributor: Zhang Le -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x2001 +DefaultVendor= 0x05c6 +DefaultProduct= 0x2001 -;TargetVendor= 0x1e0e -;TargetProductList="ce16,cefe" +TargetVendor= 0x1e0e +TargetProductList="ce16,cefe" -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1141,15 +1150,15 @@ # # Contributor: Matt Roberds -;DefaultVendor= 0x1410 -;DefaultProduct= 0x5031 +DefaultVendor= 0x1410 +DefaultProduct= 0x5031 -;TargetVendor= 0x1410 -;TargetProduct= 0x6002 +TargetVendor= 0x1410 +TargetProduct= 0x6002 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1157,31 +1166,31 @@ # # Contributor: Moritz Grosse-Wentrup -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x0053 +DefaultVendor= 0x19d2 +DefaultProduct= 0x0053 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0031 +TargetVendor= 0x19d2 +TargetProduct= 0x0031 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;MessageContent2="55534243876543212000000080000c85010101180101010101000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent2="55534243876543212000000080000c85010101180101010101000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## # Philips TalkTalk (NXP Semiconductors "Dragonfly") # -;DefaultVendor= 0x0471 -;DefaultProduct= 0x1237 +DefaultVendor= 0x0471 +DefaultProduct= 0x1237 -;TargetVendor= 0x0471 -;TargetProduct= 0x1234 +TargetVendor= 0x0471 +TargetProduct= 0x1234 -;MessageContent="5553424312345678000000000000061b000000030000000000000000000000" +MessageContent="5553424312345678000000000000061b000000030000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1189,33 +1198,33 @@ # # Contributor: Emfox Zhou -;DefaultVendor= 0x0471 -;DefaultProduct= 0x1237 +DefaultVendor= 0x0471 +DefaultProduct= 0x1237 -;TargetVendor= 0x0471 -;TargetProduct= 0x1206 +TargetVendor= 0x0471 +TargetProduct= 0x1206 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 -;Configuration=2 +Configuration=2 ######################################################## # ZTE K3565 # -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0063 +TargetVendor= 0x19d2 +TargetProduct= 0x0063 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1223,15 +1232,15 @@ # # Contributor: Prashad Prashant -;DefaultVendor= 0x148f -;DefaultProduct= 0x2578 +DefaultVendor= 0x148f +DefaultProduct= 0x2578 -;TargetVendor= 0x148f -;TargetProduct= 0x9021 +TargetVendor= 0x148f +TargetProduct= 0x9021 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1239,13 +1248,13 @@ # # Contributor: Genar Codina -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1446 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1446 -;TargetVendor= 0x12d1 -;TargetProduct= 0x1406 +TargetVendor= 0x12d1 +TargetProduct= 0x1406 -;MessageContent="55534243123456780000000000000011060000000000000000000000000000" +MessageContent="55534243123456780000000000000011060000000000000000000000000000" ######################################################## @@ -1255,25 +1264,25 @@ # # Contributor: Carolin Latze and others -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1446 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1446 -;TargetVendor= 0x12d1 -;TargetProduct= 0x140c +TargetVendor= 0x12d1 +TargetProduct= 0x140c -;MessageContent="55534243123456780000000000000011060000000000000000000000000000" +MessageContent="55534243123456780000000000000011060000000000000000000000000000" ######################################################## # C-motech CHU-629S # -;DefaultVendor= 0x16d8 -;DefaultProduct= 0x700a +DefaultVendor= 0x16d8 +DefaultProduct= 0x700a -;TargetClass=0xff +TargetClass=0xff -;MessageContent="55534243123456782400000080000dfe524445564348473d4e444953000000" +MessageContent="55534243123456782400000080000dfe524445564348473d4e444953000000" ######################################################## @@ -1281,13 +1290,13 @@ # # Contributor: Yaroslav Levandovskiy -;DefaultVendor= 0x1076 -;DefaultProduct= 0x7f40 +DefaultVendor= 0x1076 +DefaultProduct= 0x7f40 -;TargetVendor= 0x1076 -;TargetProduct= 0x7f00 +TargetVendor= 0x1076 +TargetProduct= 0x7f00 -;GCTMode=1 +GCTMode=1 ######################################################## @@ -1295,15 +1304,13 @@ # # Contributor: Antti Turunen -;DefaultVendor= 0x0421 -;DefaultProduct= 0x0610 - -;TargetVendor= 0x0421 -;TargetProduct= 0x0612 +DefaultVendor= 0x0421 +DefaultProduct= 0x0610 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +TargetVendor= 0x0421 +TargetProduct= 0x0612 -;NeedResponse=1 +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" ######################################################## @@ -1311,13 +1318,13 @@ # # Contributor: Felix Schwarz -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1520 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1520 -;TargetVendor= 0x12d1 -;TargetProduct= 0x1465 +TargetVendor= 0x12d1 +TargetProduct= 0x1465 -;MessageContent="55534243123456780000000000000011060000000000000000000000000000" +MessageContent="55534243123456780000000000000011060000000000000000000000000000" ######################################################## @@ -1325,13 +1332,13 @@ # # Contributor: Nikolaos Koutsianas -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x1521 +DefaultVendor= 0x12d1 +DefaultProduct= 0x1521 -;TargetVendor= 0x12d1 -;TargetProduct= 0x1464 +TargetVendor= 0x12d1 +TargetProduct= 0x1464 -;MessageContent="55534243123456780000000000000011060000000000000000000000000000" +MessageContent="55534243123456780000000000000011060000000000000000000000000000" ######################################### @@ -1339,8 +1346,8 @@ # # Contributor: Bob Williams -;DefaultVendor= 0x0471 -;DefaultProduct= 0x1210 +DefaultVendor= 0x0471 +DefaultProduct= 0x1210 # The report said that giving the target IDs prevented # the device from switching. Got to try it out ... @@ -1348,9 +1355,9 @@ #TargetVendor= 0x1dbc #TargetProduct= 0x0005 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1358,13 +1365,13 @@ # # Contributor: Antti Turunen -;DefaultVendor= 0x05c6 -;DefaultProduct= 0xf000 +DefaultVendor= 0x05c6 +DefaultProduct= 0xf000 -;TargetVendor= 0x05c6 -;TargetProduct= 0x9000 +TargetVendor= 0x05c6 +TargetProduct= 0x9000 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" ######################################################## @@ -1372,12 +1379,12 @@ # # WLAN devices from Linux kernel -;DefaultVendor= 0x0ace -;DefaultProduct= 0x2011 +DefaultVendor= 0x0ace +DefaultProduct= 0x2011 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1385,12 +1392,12 @@ # # WLAN devices from Linux kernel -;DefaultVendor= 0x0ace -;DefaultProduct= 0x20ff +DefaultVendor= 0x0ace +DefaultProduct= 0x20ff -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1398,28 +1405,28 @@ # # Contributor: Reinis Danne -;DefaultVendor= 0x05c6 -;DefaultProduct= 0x1000 +DefaultVendor= 0x05c6 +DefaultProduct= 0x1000 -;TargetVendor= 0x1fe7 -;TargetProduct= 0x0100 +TargetVendor= 0x1fe7 +TargetProduct= 0x0100 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## # AVM Fritz!Wlan USB Stick N # -;DefaultVendor= 0x057c -;DefaultProduct= 0x84ff +DefaultVendor= 0x057c +DefaultProduct= 0x84ff -;TargetVendor= 0x057c -;TargetProduct= 0x8401 +TargetVendor= 0x057c +TargetProduct= 0x8401 -;MessageContent="5553424312345678000000000000061b000000ff0000000000000000000000" +MessageContent="5553424312345678000000000000061b000000ff0000000000000000000000" ######################################################## @@ -1427,13 +1434,13 @@ # # Contributor: Bicio -;DefaultVendor= 0x072f -;DefaultProduct= 0x100d +DefaultVendor= 0x072f +DefaultProduct= 0x100d -;TargetVendor= 0x072f -;TargetProduct= 0x90cc +TargetVendor= 0x072f +TargetProduct= 0x90cc -;MessageContent="01b0000000000000000000000000000000000000000000000000000000000000" +MessageContent="01b0000000000000000000000000000000000000000000000000000000000000" ######################################################## @@ -1441,13 +1448,13 @@ # # Contributor: Jason Smith -;DefaultVendor= 0x106c -;DefaultProduct= 0x3b06 +DefaultVendor= 0x106c +DefaultProduct= 0x3b06 -;TargetVendor= 0x106c -;TargetProduct= 0x3717 +TargetVendor= 0x106c +TargetProduct= 0x3717 -;MessageContent="555342431234567824000000800008ff020000000000000000000000000000 +MessageContent="555342431234567824000000800008ff020000000000000000000000000000 ######################################################## @@ -1455,16 +1462,16 @@ # # Contributor: Alberto Maurizi -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x0026 +DefaultVendor= 0x19d2 +DefaultProduct= 0x0026 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0094 +TargetVendor= 0x19d2 +TargetProduct= 0x0094 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1472,12 +1479,12 @@ # # Contributor: Isaac Salgado -;DefaultVendor= 0x12d1 -;DefaultProduct= 0x101e +DefaultVendor= 0x12d1 +DefaultProduct= 0x101e -;TargetClass=0xff +TargetClass=0xff -;MessageContent="55534243123456780600000080000601000000000000000000000000000000" +MessageContent="55534243123456780600000080000601000000000000000000000000000000" ######################################################## @@ -1485,11 +1492,11 @@ # # Contributor: Alexander Gordeev -;DefaultVendor= 0x198f -;DefaultProduct=0xbccd +DefaultVendor= 0x198f +DefaultProduct=0xbccd -;TargetVendor= 0x198f -;TargetProduct= 0x0220 +TargetVendor= 0x198f +TargetProduct= 0x0220 MessageContent="555342431234567824000000800006bc626563240000000000000000000000" @@ -1497,15 +1504,15 @@ MessageContent="555342431234567824000000800006bc626563240000000000000000000000" ######################################################## # LG HDM-2100 (EVDO Rev.A USB modem) # -# Contributor: Jérôme Oufella +# Contributor: Jérôme Oufella -;DefaultVendor= 0x1004 -;DefaultProduct=0x607f +DefaultVendor= 0x1004 +DefaultProduct=0x607f -;TargetVendor= 0x1004 -;TargetProduct= 0x6114 +TargetVendor= 0x1004 +TargetProduct= 0x6114 -;MessageContent="1201100102000040041014610000010200018006000100001200" +MessageContent="1201100102000040041014610000010200018006000100001200" ######################################################## @@ -1513,10 +1520,10 @@ MessageContent="555342431234567824000000800006bc626563240000000000000000000000" # # Contributor: Ying-Hung Lo -;DefaultVendor= 0x0482 -;DefaultProduct=0x024d +DefaultVendor= 0x0482 +DefaultProduct=0x024d -;Configuration=2 +Configuration=2 ######################################################## @@ -1524,16 +1531,16 @@ MessageContent="555342431234567824000000800006bc626563240000000000000000000000" # # Contributor: Alberto Ciampini -;DefaultVendor= 0x1266 -;DefaultProduct=0x1000 +DefaultVendor= 0x1266 +DefaultProduct=0x1000 -;TargetVendor= 0x1266 -;TargetProduct= 0x1009 +TargetVendor= 0x1266 +TargetProduct= 0x1009 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424387654321000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424387654321000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1541,13 +1548,13 @@ MessageContent="555342431234567824000000800006bc626563240000000000000000000000" # # Contributor: Betavine Project -;DefaultVendor= 0x0fce -;DefaultProduct=0xd0cf +DefaultVendor= 0x0fce +DefaultProduct=0xd0cf -;TargetClass=0x02 +TargetClass=0x02 -;DetachStorageOnly=1 -;Configuration=3 +DetachStorageOnly=1 +Configuration=3 ######################################################## @@ -1576,15 +1583,13 @@ NeedResponse=1 # # Contributor: Adam J. Porter -;DefaultVendor= 0x1fac -;DefaultProduct=0x0130 +DefaultVendor= 0x1fac +DefaultProduct=0x0130 -;TargetVendor= 0x1fac -;TargetProduct= 0x0131 +TargetVendor= 0x1fac +TargetProduct= 0x0131 -;CheckSuccess=20 - -;MessageContent="555342431234567824000000800108df200000000000000000000000000000" +MessageContent="555342431234567824000000800108df200000000000000000000000000000" ######################################################## @@ -1592,13 +1597,13 @@ NeedResponse=1 # # Contributor: John Watt -;DefaultVendor= 0x1bbb -;DefaultProduct= 0xf000 +DefaultVendor= 0x1bbb +DefaultProduct= 0xf000 -;TargetVendor= 0x1bbb -;TargetProduct= 0x0017 +TargetVendor= 0x1bbb +TargetProduct= 0x0017 -;MessageContent="55534243123456788000000080000606f50402527000000000000000000000" +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" ######################################################## @@ -1606,16 +1611,16 @@ NeedResponse=1 # # Contributors: Akos Ladanyi, John Talbut -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x0103 +DefaultVendor= 0x19d2 +DefaultProduct= 0x0103 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0031 +TargetVendor= 0x19d2 +TargetProduct= 0x0031 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;MessageContent2="55534243876543212000000080000c85010101180101010101000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent2="55534243876543212000000080000c85010101180101010101000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1623,15 +1628,15 @@ NeedResponse=1 # # Contributor: Nils Radtke -;DefaultVendor= 0x0b3c -;DefaultProduct= 0xc700 +DefaultVendor= 0x0b3c +DefaultProduct= 0xc700 -;TargetVendor= 0x0b3c -;TargetProductList="c000,c001,c002" +TargetVendor= 0x0b3c +TargetProductList="c000,c001,c002" -;MessageContent="5553424312345678000000000000061b000000030000000000000000000000" +MessageContent="5553424312345678000000000000061b000000030000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1639,42 +1644,42 @@ NeedResponse=1 # # Contributor: uusrlnx -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x0083 +DefaultVendor= 0x19d2 +DefaultProduct= 0x0083 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0124 +TargetVendor= 0x19d2 +TargetProduct= 0x0124 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## # ZTE MU351 -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x0003 +DefaultVendor= 0x19d2 +DefaultProduct= 0x0003 -;TargetClass=0xff +TargetClass=0xff -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## # LG L-05A -;DefaultVendor= 0x1004 -;DefaultProduct= 0x613a +DefaultVendor= 0x1004 +DefaultProduct= 0x613a -;TargetVendor= 0x1004 -;TargetProduct= 0x6124 +TargetVendor= 0x1004 +TargetProduct= 0x6124 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1682,15 +1687,15 @@ NeedResponse=1 # # Contributor: Chris Jager -;DefaultVendor= 0x1004 -;DefaultProduct= 0x613f +DefaultVendor= 0x1004 +DefaultProduct= 0x613f -;TargetVendor= 0x1004 -;TargetProduct= 0x6141 +TargetVendor= 0x1004 +TargetProduct= 0x6141 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1698,58 +1703,47 @@ NeedResponse=1 # # Contributor: Oliver Mattos -;DefaultVendor= 0x1004 -;DefaultProduct=0x607f +DefaultVendor= 0x1004 +DefaultProduct=0x607f -;TargetVendor= 0x1004 -;TargetProduct= 0x6000 +TargetVendor= 0x1004 +TargetProduct= 0x6000 -;MessageContent="555342431234567803000000800006f1022000000000000000000000000000" -;MessageContent2="555342438765432103000000800006f1010100000000000000000000000000" +MessageContent="555342431234567803000000800006f1022000000000000000000000000000" +MessageContent2="555342438765432103000000800006f1010100000000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## # Royaltek Q110 - UNCONFIRMED! -;DefaultVendor= 0x1266 -;DefaultProduct= 0x1000 - -;TargetVendor= 0x1266 -;TargetProduct= 0x1009 - -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424387654321000000000000061b000000020000000000000000000000" - -;NeedResponse=1 +DefaultVendor= 0x1266 +DefaultProduct=0x1000 +TargetVendor= 0x1266 +TargetProduct= 0x1009 -######################################################## -# Rogers Rocket Stick (a Sony Ericsson device) - -;DefaultVendor= 0x0fce -;DefaultProduct= 0xd103 +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424387654321000000000000061b000000020000000000000000000000" -;TargetClass= 0x02 - -;SonyMode=1 +NeedResponse=1 ######################################################## # BandRich BandLuxe C170, BandLuxe C270 -;DefaultVendor= 0x1a8d -;DefaultProduct=0x1000 +DefaultVendor= 0x1a8d +DefaultProduct=0x1000 -;TargetVendor= 0x1a8d -;TargetProduct= 0x1009 +TargetVendor= 0x1a8d +TargetProduct= 0x1009 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;ReleaseDelay=4000 +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +ReleaseDelay=4000 -;NeedResponse=1 +NeedResponse=1 ######################################################## @@ -1763,8 +1757,6 @@ DefaultProduct=0x14c1 TargetVendor= 0x12d1 TargetProduct= 0x14c6 -CheckSuccess=20 - MessageContent="55534243123456780000000000000011060000000000000000000000000000" @@ -1779,8 +1771,6 @@ DefaultProduct=0x1523 TargetVendor= 0x12d1 TargetProduct= 0x1491 -CheckSuccess=20 - MessageContent="55534243123456780000000000000011060000000000000000000000000000" @@ -1795,7 +1785,6 @@ DefaultProduct=0x20ff TargetVendor= 0x0cf3 TargetProduct= 0x7010 -CheckSuccess=10 NoDriverLoading=1 MessageContent="5553424329000000000000000000061b000000020000000000000000000000" @@ -1813,16 +1802,14 @@ DefaultProduct=0x0013 TargetVendor= 0x1ee8 TargetProduct= 0x0012 -CheckSuccess=20 - MessageContent="555342431234567800000000000010ff000000000000000000000000000000" ResponseNeeded=1 ######################################################## -# Huawei U8110 / Joy, Vodafone 845 (Android smartphone) +# Huawei U8110 / U8300 / Joy, Vodafone 845 (Android smartphone) # -# Contributor: David Erosa García +# Contributor: David Erosa García DefaultVendor= 0x12d1 DefaultProduct=0x1031 @@ -1830,8 +1817,6 @@ DefaultProduct=0x1031 TargetVendor= 0x12d1 TargetProduct= 0x1035 -CheckSuccess=20 - MessageContent="55534243123456780600000080010a11060000000000000000000000000000" # for Android SDK @@ -1841,7 +1826,7 @@ NoDriverLoading=1 ######################################################## # Nokia CS-10 # -# Contributor: WacÅ‚aw Sierek +# Contributor: WacÅ‚aw Sierek DefaultVendor= 0x0421 DefaultProduct=0x060c @@ -1849,8 +1834,6 @@ DefaultProduct=0x060c TargetVendor= 0x0421 TargetProduct= 0x060e -CheckSuccess=20 - MessageContent="5553424312345678000000000000061b000000020000000000000000000000" @@ -1859,41 +1842,41 @@ MessageContent="5553424312345678000000000000061b000000020000000000000000000000" # # Contributor: Anoop John -;DefaultVendor= 0x19d2 -;DefaultProduct= 0x2000 +DefaultVendor= 0x19d2 +DefaultProduct= 0x2000 -;TargetVendor= 0x19d2 -;TargetProduct= 0x0108 +TargetVendor= 0x19d2 +TargetProduct= 0x0108 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NeedResponse=1 +NeedResponse=1 ######################################################## # BSNL Capitel -;DefaultVendor= 0x1c9e -;DefaultProduct= 0x9e00 +DefaultVendor= 0x1c9e +DefaultProduct= 0x9e00 -;TargetClass=0xff +TargetClass=0xff -;MessageContent="55534243123456780000000000000606f50402527000000000000000000000" +MessageContent="55534243123456780000000000000606f50402527000000000000000000000" ####################################################### # Samsung GT-B3730 # -# Contributor: Per Øyvind Karlsen +# Contributor: Per Øyvind Karlsen -;DefaultVendor= 0x04e8 -;DefaultProduct=0x689a +DefaultVendor= 0x04e8 +DefaultProduct=0x689a -;TargetVendor= 0x04e8 -;TargetProduct= 0x6889 +TargetVendor= 0x04e8 +TargetProduct= 0x6889 -;MessageContent="55534243785634120100000080000601000000000000000000000000000000" +MessageContent="55534243785634120100000080000601000000000000000000000000000000" ####################################################### # Kobil mIdentity 3G (1) @@ -1928,14 +1911,14 @@ KobilMode=1 # # Contributor: Enrico Mioso -;DefaultVendor= 0x1ee8 -;DefaultProduct=0x0009 +DefaultVendor= 0x1ee8 +DefaultProduct=0x0009 -;TargetVendor= 0x1ee8 -;TargetProduct= 0x000b +TargetVendor= 0x1ee8 +TargetProduct= 0x000b -;MessageContent="555342431234567800000000000010ff000000000000000000000000000000" -;NeedResponse=1 +MessageContent="555342431234567800000000000010ff000000000000000000000000000000" +NeedResponse=1 ######################################################## @@ -1943,28 +1926,28 @@ KobilMode=1 # # Contributor: Pierre-Andre Cornillon -;DefaultVendor= 0x0b3c -;DefaultProduct=0xf000 +DefaultVendor= 0x0b3c +DefaultProduct=0xf000 -;TargetVendor= 0x0b3c -;TargetProduct= 0xc003 +TargetVendor= 0x0b3c +TargetProduct= 0xc003 -;MessageContent="5553424312345678c000000080010606f50402527000000000000000000000" -;NeedResponse=1 +MessageContent="5553424312345678c000000080010606f50402527000000000000000000000" +NeedResponse=1 ####################################################### # Huawei EC168C (from Zantel) # -# Contributor: Ã…smund Hjulstad +# Contributor: Ã…smund Hjulstad -;DefaultVendor= 0x12d1 -;DefaultProduct=0x1446 +DefaultVendor= 0x12d1 +DefaultProduct=0x1446 -;TargetVendor= 0x12d1 -;TargetProduct= 0x1412 +TargetVendor= 0x12d1 +TargetProduct= 0x1412 -;MessageContent="55534243123456780000000000000011060000000000000000000000000000" +MessageContent="55534243123456780000000000000011060000000000000000000000000000" ####################################################### @@ -1972,13 +1955,13 @@ KobilMode=1 # # Contributor: Juho Frits -;DefaultVendor= 0x0421 -;DefaultProduct=0x0622 +DefaultVendor= 0x0421 +DefaultProduct=0x0622 -;TargetVendor= 0x0421 -;TargetProduct= 0x0623 +TargetVendor= 0x0421 +TargetProduct= 0x0623 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" ####################################################### @@ -1986,13 +1969,13 @@ KobilMode=1 # # Contributor: Thomas Behan -;DefaultVendor= 0x0421 -;DefaultProduct=0x0627 +DefaultVendor= 0x0421 +DefaultProduct=0x0627 -;TargetVendor= 0x0421 -;TargetProduct= 0x0612 +TargetVendor= 0x0421 +TargetProduct= 0x0612 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" ####################################################### @@ -2000,25 +1983,25 @@ KobilMode=1 # # Contributor: Alexey Charkov -;DefaultVendor= 0x05c7 -;DefaultProduct=0x1000 +DefaultVendor= 0x05c7 +DefaultProduct=0x1000 -;TargetVendor= 0x05c7 -;TargetProduct= 0x6000 +TargetVendor= 0x05c7 +TargetProduct= 0x6000 -;MessageContent="5553424312345678c00000008000069f140000000000000000000000000000" +MessageContent="5553424312345678c00000008000069f140000000000000000000000000000" ####################################################### # GW D301 (Advinne AMC) # -;DefaultVendor= 0x0fd1 -;DefaultProduct=0x1000 +DefaultVendor= 0x0fd1 +DefaultProduct=0x1000 -;TargetClass=0xff +TargetClass=0xff -;Configuration=3 +Configuration=3 ####################################################### @@ -2026,13 +2009,13 @@ KobilMode=1 # # Contributor: Shawn J. Goff -;DefaultVendor= 0x1004 -;DefaultProduct=0x6190 +DefaultVendor= 0x1004 +DefaultProduct=0x6190 -;TargetVendor= 0x1004 -;TargetProduct= 0x61a7 +TargetVendor= 0x1004 +TargetProduct= 0x61a7 -;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" ####################################################### @@ -2040,25 +2023,25 @@ KobilMode=1 # # Contributor: Noel J. Bergman, Gus Esquivel -;DefaultVendor= 0x106c -;DefaultProduct=0x3b05 +DefaultVendor= 0x106c +DefaultProduct=0x3b05 -;TargetVendor= 0x106c -;TargetProduct= 0x3716 +TargetVendor= 0x106c +TargetProduct= 0x3716 -;MessageContent="555342431234567824000000800008ff020000000000000000000000000000" +MessageContent="555342431234567824000000800008ff020000000000000000000000000000" ####################################################### # AirPlus MCD-800 # -;DefaultVendor= 0x1edf -;DefaultProduct=0x6003 +DefaultVendor= 0x1edf +DefaultProduct=0x6003 -;TargetClass=0xff +TargetClass=0xff -;Configuration=3 +Configuration=3 ####################################################### @@ -2066,37 +2049,1373 @@ KobilMode=1 # # Contributor: Amit Mendapara -;DefaultVendor= 0x230d -;DefaultProduct=0x0001 +DefaultVendor= 0x230d +DefaultProduct=0x0001 -;TargetClass=0xff +TargetClass=0xff -;Configuration=3 +Configuration=3 ######################################################## # MediaTek Wimax USB Card # -;DefaultVendor= 0x0e8d -;DefaultProduct=0x7109 +DefaultVendor= 0x0e8d +DefaultProduct=0x7109 -;TargetVendor= 0x0e8d -;TargetProduct= 0x7118 +TargetVendor= 0x0e8d +TargetProduct= 0x7118 -;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" -;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" -;NoDriverLoading=1 +NoDriverLoading=1 ######################################################## # C-motech CHU-628S +# +# Contributor: Jungwon Seo + +DefaultVendor= 0x16d8 +DefaultProduct=0x6281 + +TargetClass=0xff + +MessageContent="555342431234567824000000800008ff524445564348470000000000000000" + + +######################################################## +# HSDPA USB modem from dealextreme +# +# Contributor: Andrew 'Necromant' Andrianov + +DefaultVendor= 0x05c6 +DefaultProduct=0x2000 + +TargetVendor= 0x05c6 +TargetProduct= 0x0015 + +MessageContent="5553424368032c882400000080000612000000240000000000000000000000" + +NeedResponse=1 + +# This modem doesn't react fast - it pauses for some 30-40 seconds +CheckSuccess=40 + + +######################################################## +# Exiss Mobile E-190 series (made by C-motech) +# +# Contributor: Tri Mulya Saputra + +DefaultVendor= 0x8888 +DefaultProduct= 0x6500 + +TargetVendor= 0x16d8 +TargetProduct= 0x6533 + +MessageContent="5553424398e2c4812400000080000bff524445564348473d43440000000000" + + +######################################################## +# D-Link DWM-156 HSUPA 3.75G USB Modem +# +# Contributor: Fuego + +DefaultVendor= 0x07d1 +DefaultProduct=0xa800 + +TargetVendor= 0x07d1 +TargetProduct= 0x3e02 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" -;DefaultVendor= 0x16d8 -;DefaultProduct=0x6281 -;TargetClass=0xff +######################################################## +# Franklin Wireless U210 (Variant) + +DefaultVendor= 0x1fac +DefaultProduct=0x0032 + +Configuration=2 + + +######################################################## +# Haier CE 100 + +DefaultVendor= 0x201e +DefaultProduct=0x2009 + +TargetClass=0xff + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +NeedResponse=1 + + +####################################################### +# Huawei BM358 WiMAX + +DefaultVendor= 0x12d1 +DefaultProduct=0x380b + +TargetClass=0x02 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +NeedResponse=1 + + +######################################################## +# Huawei E352 +# +# Contributor: Antonio Talarico + +DefaultVendor= 0x12d1 +DefaultProduct=0x1449 + +TargetVendor= 0x12d1 +TargetProduct= 0x1444 + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +######################################################## +# Huawei ET8282 +# +# Contributor: Emfox Zhou + +DefaultVendor= 0x12d1 +DefaultProduct=0x1da1 + +DefaultVendor= 0x12d1 +TargetProduct= 0x1d09 + +HuaweiMode=1 + + +######################################################## +# Huawei V725 Phone (aka Vodafone 725) + +DefaultVendor= 0x12d1 +DefaultProduct=0x1009 + +TargetClass=0xff + +HuaweiMode=1 + + +######################################################## +# Onda MW836UP-K + +DefaultVendor= 0x1ee8 +DefaultProduct=0x0040 + +TargetVendor= 0x1ee8 +TargetProduct= 0x003e + +MessageContent="555342431234567800000000000010ff000000000000000000000000000000" + +NeedResponse=1 + -;MessageContent="555342431234567824000000800008ff524445564348470000000000000000" +######################################################## +# ZTE MF637 (Variant for Orange France) +# +# Contributor: David Vigier + +DefaultVendor= 0x19d2 +DefaultProduct=0x0110 +TargetVendor= 0x19d2 +TargetProduct= 0x0121 + +MessageContent="5553424302000000000000000000061b000000020000000000000000000000" + +NeedResponse=1 + + +######################################################## +# Prolink P2000 CDMA +# +# Test string: uMa=SSE + +DefaultVendor= 0x05c6 +DefaultProduct=0x1000 + +TargetVendor= 0x05c6 +TargetProduct= 0x6000 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# Vibe 3G Modem +# +# Contributor: Steven James Drinnan + +DefaultVendor= 0x1c9e +DefaultProduct=0x6061 + +TargetClass=0xff + +MessageContent="55534243123456780000000000000606f50402527000000000000000000000" + + +######################################################## +# Vodafone/ZTE K3806-Z + +DefaultVendor= 0x19d2 +DefaultProduct=0x0013 + +TargetVendor= 0x19d2 +TargetProduct= 0x0015 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +NeedResponse=1 + +######################################################## +# T-Mobile NL (Huawei E352) +# +# Contributor: Alex Hermann + +DefaultVendor= 0x12d1 +DefaultProduct=0x14fe + +TargetVendor= 0x12d1 +TargetProduct= 0x1506 + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +######################################################## +# Huawei U8220, T-Mobile Pulse (Android smartphone) +# +# Contributor: Mobile Stream Team + +DefaultVendor= 0x12d1 +DefaultProduct=0x1030 + +TargetVendor= 0x12d1 +TargetProduct= 0x1034 + +MessageContent="55534243123456780600000080010a11060000000000000000000000000000" + +# for Android SDK +NoDriverLoading=1 + + +######################################################## +# D-Link DWM-156 HSUPA 3.75G USB Modem +# +# Contributor: Ari Suutari + +DefaultVendor= 0x07d1 +DefaultProduct=0xa804 + +TargetVendor= 0x07d1 +TargetProduct= 0x7e11 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# Sony Ericsson MD400G (Rogers) +# +# Contributor: Kjartan Adolfsson + +DefaultVendor= 0x0fce +DefaultProduct= 0xd103 + +TargetClass= 0x02 + +SonyMode=1 + + +######################################################## +# ZTE "ffe" devices 1 (e.g. Cricket A605) +# +# Contributor: Matt Eaton + +DefaultVendor= 0x19d2 +DefaultProduct=0xffe6 + +TargetVendor= 0x19d2 +TargetProduct= 0xffe5 + +MessageContent="5553424330f4cf8124000000800108df200000000000000000000000000000" + + +######################################################## +# ZTE MF190 +# +# Contributor: Eshwar Andhavarapu + +DefaultVendor= 0x19d2 +DefaultProduct= 0x1224 + +TargetVendor= 0x19d2 +TargetProduct= 0x0082 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +NeedResponse=1 + + +######################################################## +# JOA Telecom LM-700r + +DefaultVendor= 0x198a +DefaultProduct=0x0003 + +TargetVendor= 0x198a +TargetProduct= 0x0002 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# Huawei E173 (Viettel 3G) + +TargetVendor= 0x12d1 +TargetProduct= 0x14a8 + +DefaultVendor= 0x12d1 +DefaultProduct=0x14b5 + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +######################################################## +# C-motech CHU-629S (Variant) +# +# Contributor: "wlsloi" + +DefaultVendor= 0x16d8 +DefaultProduct=0x700b + +TargetClass=0xff + +MessageContent="55534243123456782400000080000dfe524445564348473d4e444953000000" + + +######################################################## +# ZTE MF691 (T-Mobile Rocket 2.0) +# +# Contributor: Michael Fogel + +DefaultVendor= 0x19d2 +DefaultProduct=0x1201 + +TargetVendor= 0x19d2 +TargetProduct= 0x1203 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# ZTE MF192 + +DefaultVendor= 0x19d2 +DefaultProduct=0x1216 + +TargetVendor= 0x19d2 +TargetProduct= 0x1218 + +#MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +# Different MessageContent enables cdc_ether interface which is preferable. +# Thanks to Alex Orlov! + +MessageContent="555342431234567800000000000010ff000000000000000000000000000000" + + +######################################################## +# ZTE MF190 (Variant) +# +# Contributor: Jean-Baptiste Dubois + +DefaultVendor= 0x19d2 +DefaultProduct=0x0149 + +TargetVendor= 0x19d2 +TargetProduct= 0x0124 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +MessageContent3="55534243123456702000000080000c85010101180101010101000000000000" + +NeedResponse=1 + + +####################################################### +# Visiontek 82GH 3G + +DefaultVendor= 0x230d +DefaultProduct=0x0007 + +TargetClass=0xff + +Configuration=3 + + +####################################################### +# HP LaserJet Professional P1102 + +DefaultVendor= 0x03f0 +DefaultProduct=0x002a + +TargetClass=0x07 + +MessageContent="555342431234567800000000000006d0000000000000000000000000000000" + +NeedResponse=1 + + +####################################################### +# Mobile Action ("Smart Cable") +# +# No success check, device will vanish completely + +DefaultVendor= 0x0df7 +DefaultProduct=0x0800 + +TargetClass=0xff + +MobileActionMode=1 + +NoDriverLoading=1 + + +######################################################## +# Vodafone/Huawei K3770 +# +# Contributor: Alex Chiang + +DefaultVendor= 0x12d1 +DefaultProduct=0x14d1 + +TargetVendor= 0x12d1 +TargetProduct= 0x14c9 + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +######################################################## +# Vodafone/Huawei K3771 +# +# Contributor: Ben Knight + +DefaultVendor= 0x12d1 +DefaultProduct=0x14c4 + +TargetVendor= 0x12d1 +TargetProduct= 0x14ca + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +######################################################## +# Option iCon 461 +# +# Contributor: Samit Basu + +DefaultVendor= 0x0af0 +DefaultProduct= 0x7a05 + +TargetClass= 0xff + +MessageContent="55534243123456780000000000000601000000000000000000000000000000" + +######################################################## +# ZTE AX226 WiMax +# +# may be supported by the Beceem driver + +DefaultVendor= 0x19d2 +DefaultProduct=0xbccd + +TargetVendor= 0x19d2 +TargetProduct= 0x0172 + +MessageContent="555342431234567824000000800006bc626563240000000000000000000000" + +NoDriverLoading=1 + + +######################################################## +# Huawei EC156 + +DefaultVendor= 0x12d1 +DefaultProduct=0x1505 + +TargetVendor= 0x12d1 +TargetProduct= 0x140b + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +######################################################## +# Longcheer SU9800 + +DefaultVendor= 0x1c9e +DefaultProduct=0x9800 + +TargetClass=0xff + +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" + + +######################################################## +# SpeedUp SU-8000U + +DefaultVendor= 0x2020 +DefaultProduct=0xf00e + +TargetVendor= 0x2020 +TargetProduct= 0x1005 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# Cisco AM10 "Valet Connector" +# +# Contributor: David S. + +DefaultVendor= 0x1307 +DefaultProduct=0x1169 + +TargetVendor= 0x13b1 +TargetProduct= 0x0031 + +CiscoMode=1 + + +######################################################## +# Alcatel OT X220L +# +# Contributor: Sylvain Gros-Desormeaux + +DefaultVendor= 0x1bbb +DefaultProduct=0xf052 + +TargetVendor= 0x1bbb +TargetProduct= 0x0052 + +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" + + +######################################################## +# Nokia CS-19 +# +# Contributor: ThatGuy + +DefaultVendor= 0x0421 +DefaultProduct=0x062c + +TargetVendor= 0x0421 +TargetProduct= 0x062d + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# Huawei ET302 + +DefaultVendor= 0x12d1 +DefaultProduct=0x1d50 + +Configuration=2 + + +######################################################## +# 3GO 3GO11 HSUPA + +DefaultVendor= 0x1e89 +DefaultProduct=0xf000 + +TargetVendor= 0x1e89 +TargetProduct= 0x1a20 + +MessageContent="5553424312345678800000008000060619181a207000000000000000000000" + + +######################################################## +# Novatel Wireless MC545 HSPA + +DefaultVendor= 0x1410 +DefaultProduct=0x5059 + +TargetVendor= 0x1410 +TargetProduct= 0x7042 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# ZTE AC682 (a.k.a. SmartFren Connex) + +DefaultVendor= 0x19d2 +DefaultProduct=0xffde + +TargetVendor= 0x19d2 +TargetProduct= 0xffdd + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# ZTE MF820 4G LTE +# +# Contributor: Kenny Lam + +DefaultVendor= 0x19d2 +DefaultProduct=0x0166 + +TargetVendor= 0x19d2 +TargetProduct= 0x0167 + +MessageContent="55534243123456782400000080000685000000240000000000000000000000" + + +######################################################## +# Philips PicoPix 1020 Projector +# +# No known driver or application yet + +DefaultVendor= 0x1de1 +DefaultProduct=0x1101 + +TargetVendor= 0x21e7 +TargetProduct= 0x000e + +MessageContent="55534243123456780000000000000cff020000000000000000000000000000" + + +######################################################## +# AnyDATA APE-540H +# +# Contributor: Robert Gabriel + +DefaultVendor= 0x05c6 +DefaultProduct=0x6503 + +TargetVendor= 0x16d5 +TargetProduct= 0x6502 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# ZTE MF192 (Variant) +# +# Contributor: C!chy + +DefaultVendor= 0x19d2 +DefaultProduct=0x1517 + +TargetVendor= 0x19d2 +TargetProduct= 0x1519 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +NeedResponse=1 + + +######################################################## +# Qisda H21 Flying Beetle +# +# Contributor: Chi-Hang Long + +DefaultVendor= 0x1da5 +DefaultProduct=0xf000 + +TargetVendor= 0x1da5 +TargetProduct= 0x4512 + +QisdaMode=1 + + +######################################################## +# C-motech CDU-685a +# +# Contributor: Tom Cumming + +DefaultVendor= 0x16d8 +DefaultProduct=0x6804 + +TargetClass=0xff + +MessageContent="555342431234567824000000800008ff524445564348470000000000000000" + + +######################################################## +# StrongRising (China Telcom), Air FlexiNet + +DefaultVendor= 0x21f5 +DefaultProduct=0x1000 + +TargetVendor= 0x21f5 +TargetProduct= 0x2008 + +MessageContent="5553424312345678c000000080000671010000000000000000000000000000 + + +######################################################## +# BandRich BandLuxe C339 + +DefaultVendor= 0x1a8d +DefaultProduct=0x2000 + +TargetVendor= 0x1a8d +TargetProduct= 0x2006 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +NeedResponse=1 + + +######################################################## +# Celot CT-680 + +DefaultVendor= 0x05c6 +DefaultProduct=0x1000 + +TargetVendor= 0x211f +TargetProduct= 0x6802 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Huawei E353 (3.se) +# +# Contributor: Ulf Eklund + +DefaultVendor= 0x12d1 +DefaultProduct=0x1f01 + +TargetVendor= 0x12d1 +TargetProduct= 0x14db + +MessageContent="55534243123456780000000000000a11062000000000000100000000000000" + +# Driver is cdc_ether +NoDriverLoading=1 + + +######################################################## +# Haier CE682 (EVDO) +# +# Contributor: Ebedsat + +DefaultVendor= 0x201e +DefaultProduct=0x1023 + +TargetVendor= 0x201e +TargetProduct= 0x1022 + +MessageContent="55534243123456780000000000000600000000000000000000000000000000" +MessageContent2="5553424312345679c000000080000671030000000000000000000000000000" +NeedResponse=1 + + +####################################################### +# LG L-02C LTE +# +# Contributor: Yoshiaki Katsumata + +DefaultVendor= 0x1004 +DefaultProduct=0x61dd + +TargetVendor= 0x1004 +TargetProduct= 0x618f + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +####################################################### +# LG SD711 +# +# Contributor: Ryan Jenkins + +DefaultVendor= 0x1004 +DefaultProduct=0x61e7 + +TargetVendor= 0x1004 +TargetProduct= 0x61e6 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# LG L-08C (NTT docomo) +# +# Contributor: Shlomi Cohen + +DefaultVendor= 0x1004 +DefaultProduct=0x61eb + +TargetVendor= 0x1004 +TargetProduct= 0x61ea + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# I-O Data WMX2-U Wimax +# +# Contributor: Shlomi Cohen + +DefaultVendor= 0x04bb +DefaultProduct=0xbccd + +TargetVendor= 0x04bb +TargetProduct= 0x0949 + +MessageContent="55534243f0298d8124000000800006bc626563240000000000000000000000" + + +######################################################## +# Option GlobeTrotter GI1515 + +DefaultVendor= 0x0af0 +DefaultProduct=0xd001 + +TargetVendor= 0x0af0 +TargetProduct= 0xd157 + +MessageContent="55534243785634120100000080000601000000000000000000000000000000" + + +####################################################### +# LG L-07A +# +# Contributor: Shin Sterneck + +DefaultVendor= 0x1004 +DefaultProduct=0x614e + +TargetVendor= 0x1004 +TargetProduct= 0x6135 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# ZTE A371B +# +# Contributor: Wang Lei + +DefaultVendor= 0x19d2 +DefaultProduct=0x0169 + +TargetVendor= 0x19d2 +TargetProduct= 0x0170 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# ZTE MF652 +# +# Contributor: Björn Andreas Höfer + +DefaultVendor= 0x19d2 +DefaultProduct=0x1520 + +TargetVendor= 0x19d2 +TargetProduct= 0x0142 + +MessageContent="5553424312345679000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# ZTE MF652 (Variant) +# +# Contributor: Jackzy + +DefaultVendor= 0x19d2 +DefaultProduct=0x0146 + +TargetVendor= 0x19d2 +TargetProduct= 0x0143 + +MessageContent="5553424312345679000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# Telenet 3G dongle (T&W WU160) +# +# Contributor: Ben Van Mechelen + +DefaultVendor= 0x2077 +DefaultProduct=0xf000 + +TargetVendor= 0x2077 +TargetProduct= 0x9000 + +MessageContent="5553424308902082000000000000061b000000020000000000000000000000" + + +######################################################## +# Nokia CS-21M-02 +# +# Contributor: Wojciech Wiercho.a, Tore Anderson + +DefaultVendor= 0x0421 +DefaultProduct=0x0637 + +TargetVendor= 0x0421 +TargetProduct= 0x0638 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# Telewell TW-3G HSPA+ +# +# Contributor: Teemu Merikumpu + +DefaultVendor= 0x1c9e +DefaultProduct=0x98ff + +TargetVendor= 0x1c9e +TargetProduct= 0x9801 + +MessageContent="55534243123456780000000080000606f50402527000000000000000000000" + + +######################################################## +# ZTE MF637 +# +# Contributor: Johannes Hubertz + +DefaultVendor= 0x19d2 +DefaultProduct=0x0031 + +TargetVendor= 0x19d2 +TargetProduct= 0x0094 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# TW-3G HSPA+ +# +# Contributor: Nordic Nurse + +DefaultVendor= 0x1c9e +DefaultProduct=0x98ff + +TargetVendor= 0x1c9e +TargetProduct= 0x9801 + +MessageContent="55534243123456780000000080000606f50402527000000000000000000000" + + +######################################################## +# Samsung GT-B1110 +# +# Contributor: Spelroth + +DefaultVendor= 0x04e8 +DefaultProduct=0x680c + +TargetVendor= 0x04e8 +TargetProduct= 0x6792 + +MessageContent="0902200001010080fa0904000002080650000705010200020007058102000200" + + +######################################################## +# ZTE MF192 (yet annother variant) +# +# Contributor: Paul Hedderly + +DefaultVendor= 0x19d2 +DefaultProduct=0x1514 + +TargetVendor= 0x19d2 +TargetProduct= 0x1515 + +MessageContent="5553424348c4758600000000000010ff000000000000000000000000000000" + + +######################################################## +# MediaTek MT6276M +# +# Contributor: Meng Zhang + +DefaultVendor= 0x0e8d +DefaultProduct=0x0002 + +TargetVendor= 0x0e8d +TargetProductList="00a1,00a2" + +MessageContent="555342431234567800000000000006f0010300000000000000000000000000" + + +######################################################## +# Tata Photon+ +# +# Contributor: Nirbheek Chauhan + +DefaultVendor= 0x22f4 +DefaultProduct=0x0021 + +TargetClass=0xff + +MessageContent="555342439f000000000000000000061b000000020000000000000000000000" + + +######################################################## +# Option Globetrotter (Variant) +# +# Contributor: Roman Samarev + +DefaultVendor= 0x0af0 +DefaultProduct= 0x8006 + +TargetVendor= 0x0af0 +TargetProduct= 0x9100 + +MessageContent="55534243785634120100000080000601000000000000000000000000000000" + + +####################################################### +# Option iCon 711 +# +# Contributor: Rene Falcon + +DefaultVendor= 0x0af0 +DefaultProduct=0x4007 + +TargetVendor= 0x0af0 +TargetProduct= 0x4005 + +SierraMode=1 + + +####################################################### +# Celot K-300 +# +# Contributor: Jan Vecek + +DefaultVendor= 0x05c6 +DefaultProduct=0x1000 + +TargetVendor= 0x211f +TargetProduct= 0x6801 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Hisense E910 EVDO Phone +# +# Contributor: Zang MingJie + +DefaultVendor= 0x109b +DefaultProduct=0xf009 + +TargetVendor= 0x109b +TargetProduct= 0x9114 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +############################################################################# +# Yota Router (Quanta 1QDLZZZ0ST2) +# +# Contributor: Ilya Voronin + +DefaultVendor= 0x0408 +DefaultProduct=0xf000 + +TargetVendor= 0x0408 +TargetProduct= 0xd009 + +MessageContent="5553424312345678000000000000061b004600000000000000000000000000" + + +############################################################################# +# K5005 Vodafone/Huawei +# +# Contributor: Thomas Schaefer + +DefaultVendor= 0x12d1 +DefaultProduct=0x14c3 + +TargetVendor= 0x12d1 +TargetProduct= 0x14c8 + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + + +############################################################################# +# D-Link DWM-156 (Variant) +# +# Contributor: ZML + +DefaultVendor= 0x2001 +DefaultProduct=0xa80b + +TargetVendor= 0x2001 +TargetProduct= 0x7d00 + +MessageContent="555342431234567800000000000003f0010100000000000000000000000000" + + +######################################################## +# Huawei E173 (Moviestar) +# +# Contributor: Molipha + +DefaultVendor= 0x12d1 +DefaultProduct=0x1c24 + +TargetVendor= 0x12d1 +TargetProduct= 0x1c12 + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +######################################################## +# Onda MSA 14.4 (TIM Brasil) +# +# Contributor: Rafael Pagliuca + +DefaultVendor= 0x1ee8 +DefaultProduct=0x0060 + +TargetVendor= 0x1ee8 +TargetProduct= 0x005f + +MessageContent="555342431234567800000000000008ff000000000000030000000000000000" + + +######################################################## +# Alcatel OT-X220D +# +# Contributor: Javier Llorente + +DefaultVendor= 0x1bbb +DefaultProduct=0xf017 + +TargetVendor= 0x1bbb +TargetProduct= 0x0017 + +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" + + +######################################################## +# Alcatel OT-X080C +# +# Contributor: Hicham Haouari + +DefaultVendor= 0x1bbb +DefaultProduct=0x00ca + +TargetClass=0xff + +MessageContent="55534243123456788000000080000606f50402527000000000000000000000" + + +######################################################## +# TP-Link MA180 +# +# Contributor: complexgeek + +DefaultVendor= 0x2357 +DefaultProduct=0x0200 + +TargetVendor= 0x2357 +TargetProduct= 0x0201 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# ZTE MF821D +# +# Contributor: Thomas Schäfer + +DefaultVendor= 0x19d2 +DefaultProduct=0x0325 + +TargetVendor= 0x12d1 +TargetProduct= 0x0326 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# Dymo LabelManager PnP +# +# Contributor: Kjell M. Myksvoll + +DefaultVendor= 0x0922 +DefaultProduct=0x1001 + +TargetVendor= 0x0922 +TargetProduct= 0x1002 + +MessageEndpoint= 0x01 +ResponseEndpoint=0x01 + +MessageContent="1b5a01" +NoDriverLoading=1 + + +######################################################## +# Onda MDC655 HSDPA 900/2100 MHz 14.4 Mbps +# +# Contributor: lmctv + +DefaultVendor = 0x1ee8 +DefaultProduct =0x004a + +TargetVendor = 0x1ee8 +TargetProduct = 0x0049 + +MessageContent="555342431234567800000000000010ff000000000000000000000000000000" + + +######################################################## +# Vodafone K5006Z (MF821) +# +# Contributor: Thomas Schäfer + +DefaultVendor= 0x19d2 +DefaultProduct=0x1017 + +TargetVendor= 0x12d1 +TargetProduct= 0x1018 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Option GI0643 (aka XYFI) +# +# Contributor: Amish Chana + +DefaultVendor= 0x0af0 +DefaultProduct=0x8700 + +TargetClass=0xff + +MessageContent="55534243785634120100000080000601000000000000000000000000000000" +NoDriverLoading=1 + + +####################################################### +# WeTelecom WM-D300 +# +# Contributor: Viktor Remennik + +DefaultVendor= 0x22de +DefaultProduct=0x6803 + +TargetVendor= 0x22de +TargetProduct= 0x6801 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + + +####################################################### +# China TeleCom CBP7.0 +# +# Contributor: tricky + +DefaultVendor= 0x15eb +DefaultProduct=0x7153 + +TargetVendor= 0x15eb +TargetProduct= 0x7152 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Linktop LW272/LW273 (BSNL Teracom) +# +# Contributor: Jigish Gohil + +DefaultVendor= 0x230d +DefaultProduct=0x0101 + +TargetClass=0xff + +Configuration=2 + + +####################################################### +# Nokia CS-11 +# +# Contributor: Alessandro Martins + +DefaultVendor= 0x0421 +DefaultProduct=0x061d + +TargetVendor= 0x0421 +TargetProduct= 0x061e + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# ZTE MF190 (Variant) +# +# Contributor: Radu C + +DefaultVendor= 0x19d2 +DefaultProduct=0x0154 + +TargetVendor= 0x19d2 +TargetProduct= 0x0117 + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +NeedResponse=1 + + +####################################################### +# Huawei E535 +# +# Contributor: Andres Septer + +DefaultVendor= 0x12d1 +DefaultProduct=0x14fe + +TargetVendor= 0x12d1 +TargetProduct= 0x1506 + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +####################################################### diff --git a/source/a/usb_modeswitch/usb_modeswitch.SlackBuild b/source/a/usb_modeswitch/usb_modeswitch.SlackBuild index 67b2070a..e71d6876 100755 --- a/source/a/usb_modeswitch/usb_modeswitch.SlackBuild +++ b/source/a/usb_modeswitch/usb_modeswitch.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for usb_modeswitch. -# Copyright 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # Copyright 2010 David Somero, Athens, TN, USA # All rights reserved. # @@ -24,9 +24,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=usb_modeswitch -VERSION=${VERSION:-1.1.6} -DATAVER=${DATAVER:-20101222} -BUILD=${BUILD:-1} +VERSION=${VERSION:-1.2.4} +DATAVER=${DATAVER:-20120812} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -73,11 +73,30 @@ find . \ -exec chmod 644 {} \; make clean -gcc $SLKCFLAGS $LDFLAGS -lusb -Wall -o usb_modeswitch usb_modeswitch.c || exit 1 - -install -D -s -m 0755 usb_modeswitch $PKG/usr/sbin/usb_modeswitch -install -D -m 0755 usb_modeswitch.tcl $PKG/lib/udev/usb_modeswitch -install -D -m 0644 usb_modeswitch.conf $PKG/etc/usb_modeswitch.conf.new +# "make static" uses the embedded "jim" Tcl interpreter +make static + +install -D -s --mode=755 usb_modeswitch $PKG/usr/sbin/usb_modeswitch +install -D --mode=755 usb_modeswitch.sh $PKG/lib/udev/usb_modeswitch +install -D --mode=644 usb_modeswitch.conf $PKG/etc/usb_modeswitch.conf.new +install -D --mode=644 usb_modeswitch.1 $PKG/usr/man/man1/usb_modeswitch.1 +install -d $PKG/var/lib/usb_modeswitch +install -D -s --mode=755 usb_modeswitch_dispatcher $PKG/usr/sbin/usb_modeswitch_dispatcher + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ @@ -85,6 +104,10 @@ cp -a \ $PKG/usr/doc/$PKGNAM-$VERSION # http://www.draisberghof.de/usb_modeswitch/device_reference.txt.gz cat $CWD/device_reference.txt.gz > $PKG/usr/doc/$PKGNAM-$VERSION/device_reference.txt +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/jim +cp -a \ + jim/{AUTHORS,LICENSE,README*} \ + $PKG/usr/doc/$PKGNAM-$VERSION/jim # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: @@ -105,9 +128,7 @@ find . \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -install -D -m 0644 40-usb_modeswitch.rules $PKG/lib/udev/rules.d/40-usb_modeswitch.rules -mkdir -p $PKG/etc -cp -a usb_modeswitch.d $PKG/etc +make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/doc/usb-modeswitch-data-${DATAVER} cat ChangeLog | head -n 1000 > $PKG/usr/doc/usb-modeswitch-data-${DATAVER}/ChangeLog touch -r ChangeLog $PKG/usr/doc/usb-modeswitch-data-${DATAVER}/ChangeLog diff --git a/source/a/usbutils/usbutils-002.tar.bz2.sign b/source/a/usbutils/usbutils-002.tar.bz2.sign deleted file mode 100644 index 9d96e9be..00000000 --- a/source/a/usbutils/usbutils-002.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBNgpmUyGugalF9Dw4RAkkCAJ9AOpNKjFebxdbPfj3LYK+roL7UaACgiKtR -7L3j4M7iAo15yh6B4WP6uCI= -=fb1T ------END PGP SIGNATURE----- diff --git a/source/a/usbutils/usbutils.SlackBuild b/source/a/usbutils/usbutils.SlackBuild index 163b5378..15694392 100755 --- a/source/a/usbutils/usbutils.SlackBuild +++ b/source/a/usbutils/usbutils.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-$(echo usbutils-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo usbutils-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -58,7 +58,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf usbutils-$VERSION -tar xvf $CWD/usbutils-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/usbutils-$VERSION.tar.xz || exit 1 cd usbutils-$VERSION || exit 1 chown -R root:root . @@ -72,19 +72,27 @@ find . \ rm -f usb.ids* wget $(grep 'SRC=' update-usbids.sh.in | cut -d= -f2- | tr -d \") +# Use --datadir=/usr/share/hwdata so usb.ids is expected to be there CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sbindir=/sbin \ --mandir=/usr/man \ + --datadir=/usr/share/hwdata \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 # Get rid of this redundant file: -rm -f $PKG/usr/share/usb.ids.gz +rm -f $PKG/usr/share/hwdata/usb.ids.gz + +## Use the usb.ids file shipped with the hwdata package +#rm -f $PKG/usr/share/hwdata/usb.ids* + +# Put a compat symlink in place for stuff that doesn't know about pkgconfig +ln -s hwdata/usb.ids $PKG/usr/share/usb.ids # The usbids are kept under /usr, so it makes no sense at all to have # this util in /sbin rather than /usr/sbin: @@ -100,10 +108,6 @@ mv $PKG/sbin/update-usbids.sh $PKG/usr/sbin/update-usbids.sh # upstream name available there too... ( cd $PKG/sbin ; ln -sf /usr/sbin/update-usbids.sh . ) -# Move the pkgconfig directory to @libdir@ instead of @datadir@ -mkdir $PKG/usr/lib${LIBDIRSUFFIX} -mv $PKG/usr/share/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX} - find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/a/usbutils/usbutils.ids.dest b/source/a/usbutils/usbutils.ids.dest deleted file mode 100644 index 67111881..00000000 --- a/source/a/usbutils/usbutils.ids.dest +++ /dev/null @@ -1,11 +0,0 @@ ---- ./update-usbids.sh.orig 2005-01-22 17:03:47.000000000 -0600 -+++ ./update-usbids.sh 2007-01-04 17:14:28.000000000 -0600 -@@ -4,7 +4,7 @@ - - set -e - SRC="http://www.linux-usb.org/usb.ids" --DEST=usb.ids -+DEST=/usr/share/usb.ids - - if which wget >/dev/null ; then - DL="wget -O $DEST.new $SRC" diff --git a/source/a/usbutils/usbutils.url b/source/a/usbutils/usbutils.url new file mode 100644 index 00000000..57e0013b --- /dev/null +++ b/source/a/usbutils/usbutils.url @@ -0,0 +1 @@ +http://www.kernel.org/pub/linux/utils/usb/usbutils/ diff --git a/source/a/util-linux/0001-mount-old-fix-encryption-usage.patch b/source/a/util-linux/0001-mount-old-fix-encryption-usage.patch new file mode 100644 index 00000000..afe6e5c9 --- /dev/null +++ b/source/a/util-linux/0001-mount-old-fix-encryption-usage.patch @@ -0,0 +1,88 @@ +--- ./mount/mount.c.orig 2012-05-25 04:44:58.993195438 -0500 ++++ ./mount/mount.c 2012-08-02 12:04:52.455435631 -0500 +@@ -41,6 +41,7 @@ + #include "nls.h" + #include "blkdev.h" + #include "strutils.h" ++#include "xgetpass.h" + + #define DO_PS_FIDDLING + +@@ -1238,6 +1239,8 @@ + int looptype; + uintmax_t offset = 0, sizelimit = 0; + struct loopdev_cxt lc; ++ char *pwd = NULL; ++ int ret = EX_FAIL; + + /* + * In the case of a loop mount, either type is of the form lo@/dev/loop5 +@@ -1317,8 +1320,18 @@ + return EX_FAIL; + } + ++ if (opt_encryption) { ++#ifdef MCL_FUTURE ++ if (mlockall(MCL_CURRENT | MCL_FUTURE)) { ++ error(_("mount: couldn't lock into memory")); ++ return EX_FAIL; ++ } ++#endif ++ pwd = xgetpass(pfd, _("Password: ")); ++ } ++ + loopcxt_init(&lc, 0); +- /* loopcxt_enable_debug(&lc, 1); */ ++ /*loopcxt_enable_debug(&lc, 1);*/ + + if (*loopdev && **loopdev) + loopcxt_set_device(&lc, *loopdev); /* use loop= */ +@@ -1343,6 +1356,8 @@ + rc = loopcxt_set_offset(&lc, offset); + if (!rc && sizelimit) + rc = loopcxt_set_sizelimit(&lc, sizelimit); ++ if (!rc && opt_encryption && pwd) ++ loopcxt_set_encryption(&lc, opt_encryption, pwd); + if (!rc) + loopcxt_set_flags(&lc, loop_opts); + +@@ -1358,8 +1373,7 @@ + break; /* success */ + + if (rc != -EBUSY) { +- if (verbose) +- printf(_("mount: failed setting up loop device\n")); ++ error(_("mount: %s: failed setting up loop device: %m"), *loopfile); + if (!opt_loopdev) { + my_free(*loopdev); + *loopdev = NULL; +@@ -1399,9 +1413,15 @@ + } + } + +- return 0; ++ ret = 0; + err: +- return EX_FAIL; ++ if (pwd) { ++ char *p = pwd; ++ while (*p) ++ *p++ = '\0'; ++ free(pwd); ++ } ++ return ret; + } + + +--- ./mount/Makefile.am.orig 2012-05-25 04:44:58.000000000 -0500 ++++ ./mount/Makefile.am 2012-08-02 12:04:14.958439138 -0500 +@@ -23,7 +23,8 @@ + $(top_srcdir)/lib/at.c \ + $(top_srcdir)/lib/sysfs.c \ + $(top_srcdir)/lib/loopdev.c \ +- $(top_srcdir)/lib/strutils.c ++ $(top_srcdir)/lib/strutils.c \ ++ $(top_srcdir)/lib/xgetpass.c + + # generic flags for all programs + # -- note that pkg-config autoconf macros (pkg.m4) does not differentiate diff --git a/source/a/util-linux/0002-fdisk-don-t-ignore-1MiB-granularity-on-512-byte-sect.patch b/source/a/util-linux/0002-fdisk-don-t-ignore-1MiB-granularity-on-512-byte-sect.patch new file mode 100644 index 00000000..4d3622c3 --- /dev/null +++ b/source/a/util-linux/0002-fdisk-don-t-ignore-1MiB-granularity-on-512-byte-sect.patch @@ -0,0 +1,31 @@ +--- ./fdisk/fdisk.c.orig 2012-05-25 04:44:58.977195366 -0500 ++++ ./fdisk/fdisk.c 2012-08-02 12:00:59.692457377 -0500 +@@ -569,6 +569,19 @@ + lba_is_aligned(unsigned long long lba) + { + unsigned int granularity = max(phy_sector_size, min_io_size); ++ unsigned long long offset; ++ ++ if (grain > granularity) ++ granularity = grain; ++ offset = (lba * sector_size) & (granularity - 1); ++ ++ return !((granularity + alignment_offset - offset) & (granularity - 1)); ++} ++ ++static int ++lba_is_phy_aligned(unsigned long long lba) ++{ ++ unsigned int granularity = max(phy_sector_size, min_io_size); + unsigned long long offset = (lba * sector_size) & (granularity - 1); + + return !((granularity + alignment_offset - offset) & (granularity - 1)); +@@ -1808,7 +1821,7 @@ + static void + check_alignment(unsigned long long lba, int partition) + { +- if (!lba_is_aligned(lba)) ++ if (!lba_is_phy_aligned(lba)) + printf(_("Partition %i does not start on physical sector boundary.\n"), + partition + 1); + } diff --git a/source/a/util-linux/adjtimex_1.23-1.diff b/source/a/util-linux/adjtimex_1.23-1.diff deleted file mode 100644 index 8c250157..00000000 --- a/source/a/util-linux/adjtimex_1.23-1.diff +++ /dev/null @@ -1,5456 +0,0 @@ ---- adjtimex-1.23.orig/config.sub -+++ adjtimex-1.23/config.sub -@@ -0,0 +1,1622 @@ -+#! /bin/sh -+# Configuration validation subroutine script. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -+# Inc. -+ -+timestamp='2007-01-18' -+ -+# This file is (in principle) common to ALL GNU software. -+# The presence of a machine in this file suggests that SOME GNU software -+# can handle that machine. It does not imply ALL GNU software can. -+# -+# 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., 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 . 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. -+# If it is invalid, we print an error message on stderr and exit with code 1. -+# Otherwise, we print the canonical config type on stdout and succeed. -+ -+# This file is supposed to be the same for all GNU packages -+# and recognize all the CPU types, system types and aliases -+# that are meaningful with *any* GNU software. -+# Each package is responsible for reporting which valid configurations -+# it does not support. The user should be able to distinguish -+# a failure to support a valid configuration from a meaningless -+# configuration. -+ -+# The goal of this file is to map all the various variations of a given -+# machine specification into a single specification in the form: -+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -+# or in some cases, the newer four-part form: -+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -+# It is wrong to echo any other type of specification. -+ -+me=`echo "$0" | sed -e 's,.*/,,'` -+ -+usage="\ -+Usage: $0 [OPTION] CPU-MFR-OPSYS -+ $0 [OPTION] ALIAS -+ -+Canonicalize a configuration name. -+ -+Operation modes: -+ -h, --help print this help, then exit -+ -t, --time-stamp print date of last modification, then exit -+ -v, --version print version number, then exit -+ -+Report bugs and patches to ." -+ -+version="\ -+GNU config.sub ($timestamp) -+ -+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 -+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -+ -+help=" -+Try \`$me --help' for more information." -+ -+# Parse command line -+while test $# -gt 0 ; do -+ case $1 in -+ --time-stamp | --time* | -t ) -+ echo "$timestamp" ; exit ;; -+ --version | -v ) -+ echo "$version" ; exit ;; -+ --help | --h* | -h ) -+ echo "$usage"; exit ;; -+ -- ) # Stop option processing -+ shift; break ;; -+ - ) # Use stdin as input. -+ break ;; -+ -* ) -+ echo "$me: invalid option $1$help" -+ exit 1 ;; -+ -+ *local*) -+ # First pass through any local machine types. -+ echo $1 -+ exit ;; -+ -+ * ) -+ break ;; -+ esac -+done -+ -+case $# in -+ 0) echo "$me: missing argument$help" >&2 -+ exit 1;; -+ 1) ;; -+ *) echo "$me: too many arguments$help" >&2 -+ exit 1;; -+esac -+ -+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -+# 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* | 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/'` -+ ;; -+ *) -+ basic_machine=`echo $1 | sed 's/-[^-]*$//'` -+ if [ $basic_machine != $1 ] -+ then os=`echo $1 | sed 's/.*-/-/'` -+ else os=; fi -+ ;; -+esac -+ -+### Let's recognize common machines as not being operating systems so -+### that things like config.sub decstation-3100 work. We also -+### recognize some manufacturers as not being operating systems, so we -+### can provide default operating systems below. -+case $os in -+ -sun*os*) -+ # Prevent following clause from handling this invalid input. -+ ;; -+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ -+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ -+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ -+ -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 | -knuth | -cray) -+ os= -+ basic_machine=$1 -+ ;; -+ -sim | -cisco | -oki | -wec | -winbond) -+ os= -+ basic_machine=$1 -+ ;; -+ -scout) -+ ;; -+ -wrs) -+ os=-vxworks -+ basic_machine=$1 -+ ;; -+ -chorusos*) -+ os=-chorusos -+ basic_machine=$1 -+ ;; -+ -chorusrdb) -+ os=-chorusrdb -+ basic_machine=$1 -+ ;; -+ -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/'` -+ ;; -+ -sco4) -+ os=-sco3.2v4 -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; -+ -sco3.2.[4-9]*) -+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; -+ -sco3.2v[4-9]*) -+ # 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/'` -+ ;; -+ -udk*) -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; -+ -isc) -+ os=-isc2.2 -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; -+ -clix*) -+ basic_machine=clipper-intergraph -+ ;; -+ -isc*) -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; -+ -lynx*) -+ os=-lynxos -+ ;; -+ -ptx*) -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` -+ ;; -+ -windowsnt*) -+ os=`echo $os | sed -e 's/windowsnt/winnt/'` -+ ;; -+ -psos*) -+ os=-psos -+ ;; -+ -mint | -mint[0-9]*) -+ basic_machine=m68k-atari -+ os=-mint -+ ;; -+esac -+ -+# Decode aliases for certain CPU-COMPANY combinations. -+case $basic_machine in -+ # Recognize the basic CPU types without company name. -+ # Some are omitted here because they have special meanings below. -+ 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) -+ # Motorola 68HC11/12. -+ basic_machine=$basic_machine-unknown -+ os=-none -+ ;; -+ 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 -+ # (2) the word "unknown" tends to confuse beginning users. -+ i*86 | x86_64) -+ basic_machine=$basic_machine-pc -+ ;; -+ # Object if more than one company name word. -+ *-*-*) -+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 -+ exit 1 -+ ;; -+ # Recognize the basic CPU types with company name. -+ 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. -+ 386bsd) -+ basic_machine=i386-unknown -+ os=-bsd -+ ;; -+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) -+ basic_machine=m68000-att -+ ;; -+ 3b*) -+ basic_machine=we32k-att -+ ;; -+ a29khif) -+ basic_machine=a29k-amd -+ os=-udi -+ ;; -+ abacus) -+ basic_machine=abacus-unknown -+ ;; -+ adobe68k) -+ basic_machine=m68010-adobe -+ os=-scout -+ ;; -+ alliant | fx80) -+ basic_machine=fx80-alliant -+ ;; -+ altos | altos3068) -+ basic_machine=m68k-altos -+ ;; -+ am29k) -+ 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 -+ ;; -+ amiga | amiga-*) -+ basic_machine=m68k-unknown -+ ;; -+ amigaos | amigados) -+ basic_machine=m68k-unknown -+ os=-amigaos -+ ;; -+ amigaunix | amix) -+ basic_machine=m68k-unknown -+ os=-sysv4 -+ ;; -+ apollo68) -+ basic_machine=m68k-apollo -+ os=-sysv -+ ;; -+ apollo68bsd) -+ basic_machine=m68k-apollo -+ os=-bsd -+ ;; -+ aux) -+ basic_machine=m68k-apple -+ os=-aux -+ ;; -+ balance) -+ basic_machine=ns32k-sequent -+ os=-dynix -+ ;; -+ c90) -+ basic_machine=c90-cray -+ os=-unicos -+ ;; -+ convex-c1) -+ basic_machine=c1-convex -+ os=-bsd -+ ;; -+ convex-c2) -+ basic_machine=c2-convex -+ os=-bsd -+ ;; -+ convex-c32) -+ basic_machine=c32-convex -+ os=-bsd -+ ;; -+ convex-c34) -+ basic_machine=c34-convex -+ os=-bsd -+ ;; -+ convex-c38) -+ basic_machine=c38-convex -+ os=-bsd -+ ;; -+ cray | j90) -+ basic_machine=j90-cray -+ os=-unicos -+ ;; -+ craynv) -+ basic_machine=craynv-cray -+ os=-unicosmp -+ ;; -+ cr16c) -+ basic_machine=cr16c-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 -+ ;; -+ delta88) -+ basic_machine=m88k-motorola -+ os=-sysv3 -+ ;; -+ djgpp) -+ basic_machine=i586-pc -+ os=-msdosdjgpp -+ ;; -+ dpx20 | dpx20-*) -+ basic_machine=rs6000-bull -+ os=-bosx -+ ;; -+ dpx2* | dpx2*-bull) -+ basic_machine=m68k-bull -+ os=-sysv3 -+ ;; -+ ebmon29k) -+ basic_machine=a29k-amd -+ os=-ebmon -+ ;; -+ elxsi) -+ basic_machine=elxsi-elxsi -+ os=-bsd -+ ;; -+ encore | umax | mmax) -+ basic_machine=ns32k-encore -+ ;; -+ es1800 | OSE68k | ose68k | ose | OSE) -+ basic_machine=m68k-ericsson -+ os=-ose -+ ;; -+ fx2800) -+ basic_machine=i860-alliant -+ ;; -+ genix) -+ basic_machine=ns32k-ns -+ ;; -+ gmicro) -+ basic_machine=tron-gmicro -+ os=-sysv -+ ;; -+ go32) -+ basic_machine=i386-pc -+ os=-go32 -+ ;; -+ h3050r* | hiux*) -+ basic_machine=hppa1.1-hitachi -+ os=-hiuxwe2 -+ ;; -+ h8300hms) -+ basic_machine=h8300-hitachi -+ os=-hms -+ ;; -+ h8300xray) -+ basic_machine=h8300-hitachi -+ os=-xray -+ ;; -+ h8500hms) -+ basic_machine=h8500-hitachi -+ os=-hms -+ ;; -+ harris) -+ basic_machine=m88k-harris -+ os=-sysv3 -+ ;; -+ hp300-*) -+ basic_machine=m68k-hp -+ ;; -+ hp300bsd) -+ basic_machine=m68k-hp -+ os=-bsd -+ ;; -+ hp300hpux) -+ basic_machine=m68k-hp -+ os=-hpux -+ ;; -+ hp3k9[0-9][0-9] | hp9[0-9][0-9]) -+ basic_machine=hppa1.0-hp -+ ;; -+ hp9k2[0-9][0-9] | hp9k31[0-9]) -+ basic_machine=m68000-hp -+ ;; -+ hp9k3[2-9][0-9]) -+ basic_machine=m68k-hp -+ ;; -+ hp9k6[0-9][0-9] | hp6[0-9][0-9]) -+ basic_machine=hppa1.0-hp -+ ;; -+ hp9k7[0-79][0-9] | hp7[0-79][0-9]) -+ basic_machine=hppa1.1-hp -+ ;; -+ hp9k78[0-9] | hp78[0-9]) -+ # FIXME: really hppa2.0-hp -+ basic_machine=hppa1.1-hp -+ ;; -+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) -+ # FIXME: really hppa2.0-hp -+ basic_machine=hppa1.1-hp -+ ;; -+ hp9k8[0-9][13679] | hp8[0-9][13679]) -+ basic_machine=hppa1.1-hp -+ ;; -+ hp9k8[0-9][0-9] | hp8[0-9][0-9]) -+ basic_machine=hppa1.0-hp -+ ;; -+ hppa-next) -+ os=-nextstep3 -+ ;; -+ hppaosf) -+ basic_machine=hppa1.1-hp -+ os=-osf -+ ;; -+ hppro) -+ basic_machine=hppa1.1-hp -+ os=-proelf -+ ;; -+ i370-ibm* | ibm*) -+ basic_machine=i370-ibm -+ ;; -+# I'm not sure what "Sysv32" means. Should this be sysv3.2? -+ i*86v32) -+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` -+ os=-sysv32 -+ ;; -+ i*86v4*) -+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` -+ os=-sysv4 -+ ;; -+ i*86v) -+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` -+ os=-sysv -+ ;; -+ i*86sol2) -+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` -+ os=-solaris2 -+ ;; -+ i386mach) -+ basic_machine=i386-mach -+ os=-mach -+ ;; -+ i386-vsta | vsta) -+ basic_machine=i386-unknown -+ os=-vsta -+ ;; -+ iris | iris4d) -+ basic_machine=mips-sgi -+ case $os in -+ -irix*) -+ ;; -+ *) -+ os=-irix4 -+ ;; -+ esac -+ ;; -+ isi68 | isi) -+ basic_machine=m68k-isi -+ os=-sysv -+ ;; -+ m88k-omron*) -+ basic_machine=m88k-omron -+ ;; -+ magnum | m3230) -+ basic_machine=mips-mips -+ os=-sysv -+ ;; -+ merlin) -+ basic_machine=ns32k-utek -+ os=-sysv -+ ;; -+ mingw32) -+ basic_machine=i386-pc -+ os=-mingw32 -+ ;; -+ miniframe) -+ basic_machine=m68000-convergent -+ ;; -+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) -+ basic_machine=m68k-atari -+ os=-mint -+ ;; -+ mips3*-*) -+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` -+ ;; -+ mips3*) -+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown -+ ;; -+ 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 -+ ;; -+ ncr3000) -+ basic_machine=i486-ncr -+ os=-sysv4 -+ ;; -+ netbsd386) -+ basic_machine=i386-unknown -+ os=-netbsd -+ ;; -+ netwinder) -+ basic_machine=armv4l-rebel -+ os=-linux -+ ;; -+ news | news700 | news800 | news900) -+ basic_machine=m68k-sony -+ os=-newsos -+ ;; -+ news1000) -+ basic_machine=m68030-sony -+ os=-newsos -+ ;; -+ news-3600 | risc-news) -+ basic_machine=mips-sony -+ os=-newsos -+ ;; -+ necv70) -+ basic_machine=v70-nec -+ os=-sysv -+ ;; -+ next | m*-next ) -+ basic_machine=m68k-next -+ case $os in -+ -nextstep* ) -+ ;; -+ -ns2*) -+ os=-nextstep2 -+ ;; -+ *) -+ os=-nextstep3 -+ ;; -+ esac -+ ;; -+ nh3000) -+ basic_machine=m68k-harris -+ os=-cxux -+ ;; -+ nh[45]000) -+ basic_machine=m88k-harris -+ os=-cxux -+ ;; -+ nindy960) -+ basic_machine=i960-intel -+ os=-nindy -+ ;; -+ mon960) -+ basic_machine=i960-intel -+ os=-mon960 -+ ;; -+ nonstopux) -+ basic_machine=mips-compaq -+ os=-nonstopux -+ ;; -+ np1) -+ basic_machine=np1-gould -+ ;; -+ nsr-tandem) -+ basic_machine=nsr-tandem -+ ;; -+ op50n-* | op60c-*) -+ 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 -+ ;; -+ os68k) -+ basic_machine=m68k-none -+ os=-os68k -+ ;; -+ pa-hitachi) -+ basic_machine=hppa1.1-hitachi -+ os=-hiuxwe2 -+ ;; -+ paragon) -+ basic_machine=i860-intel -+ os=-osf -+ ;; -+ pbd) -+ basic_machine=sparc-tti -+ ;; -+ pbb) -+ basic_machine=m68k-tti -+ ;; -+ pc532 | pc532-*) -+ basic_machine=ns32k-pc532 -+ ;; -+ 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 | athlon_*) -+ basic_machine=i686-pc -+ ;; -+ pentiumii | pentium2 | pentiumiii | pentium3) -+ basic_machine=i686-pc -+ ;; -+ 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-* | 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 -+ ;; -+ pw32) -+ basic_machine=i586-unknown -+ os=-pw32 -+ ;; -+ rdos) -+ basic_machine=i386-pc -+ os=-rdos -+ ;; -+ rom68k) -+ basic_machine=m68k-rom68k -+ os=-coff -+ ;; -+ rm[46]00) -+ basic_machine=mips-siemens -+ ;; -+ 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 -+ ;; -+ sh) -+ basic_machine=sh-hitachi -+ os=-hms -+ ;; -+ sh5el) -+ basic_machine=sh5le-unknown -+ ;; -+ sh64) -+ basic_machine=sh64-unknown -+ ;; -+ sparclite-wrs | simso-wrs) -+ basic_machine=sparclite-wrs -+ os=-vxworks -+ ;; -+ sps7) -+ basic_machine=m68k-bull -+ os=-sysv2 -+ ;; -+ spur) -+ basic_machine=spur-unknown -+ ;; -+ st2000) -+ basic_machine=m68k-tandem -+ ;; -+ stratus) -+ basic_machine=i860-stratus -+ os=-sysv4 -+ ;; -+ sun2) -+ basic_machine=m68000-sun -+ ;; -+ sun2os3) -+ basic_machine=m68000-sun -+ os=-sunos3 -+ ;; -+ sun2os4) -+ basic_machine=m68000-sun -+ os=-sunos4 -+ ;; -+ sun3os3) -+ basic_machine=m68k-sun -+ os=-sunos3 -+ ;; -+ sun3os4) -+ basic_machine=m68k-sun -+ os=-sunos4 -+ ;; -+ sun4os3) -+ basic_machine=sparc-sun -+ os=-sunos3 -+ ;; -+ sun4os4) -+ basic_machine=sparc-sun -+ os=-sunos4 -+ ;; -+ sun4sol2) -+ basic_machine=sparc-sun -+ os=-solaris2 -+ ;; -+ sun3 | sun3-*) -+ basic_machine=m68k-sun -+ ;; -+ sun4) -+ basic_machine=sparc-sun -+ ;; -+ sun386 | sun386i | roadrunner) -+ basic_machine=i386-sun -+ ;; -+ sv1) -+ basic_machine=sv1-cray -+ os=-unicos -+ ;; -+ symmetry) -+ basic_machine=i386-sequent -+ os=-dynix -+ ;; -+ t3e) -+ 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 -+ ;; -+ ultra3) -+ basic_machine=a29k-nyu -+ os=-sym1 -+ ;; -+ v810 | necv810) -+ basic_machine=v810-nec -+ os=-none -+ ;; -+ vaxv) -+ basic_machine=vax-dec -+ os=-sysv -+ ;; -+ vms) -+ basic_machine=vax-dec -+ os=-vms -+ ;; -+ vpp*|vx|vx-*) -+ basic_machine=f301-fujitsu -+ ;; -+ vxworks960) -+ basic_machine=i960-wrs -+ os=-vxworks -+ ;; -+ vxworks68) -+ basic_machine=m68k-wrs -+ os=-vxworks -+ ;; -+ vxworks29k) -+ basic_machine=a29k-wrs -+ os=-vxworks -+ ;; -+ w65*) -+ basic_machine=w65-wdc -+ os=-none -+ ;; -+ w89k-*) -+ basic_machine=hppa1.1-winbond -+ os=-proelf -+ ;; -+ xbox) -+ basic_machine=i686-pc -+ os=-mingw32 -+ ;; -+ xps | xps100) -+ basic_machine=xps100-honeywell -+ ;; -+ ymp) -+ basic_machine=ymp-cray -+ os=-unicos -+ ;; -+ z8k-*-coff) -+ basic_machine=z8k-unknown -+ os=-sim -+ ;; -+ none) -+ basic_machine=none-none -+ os=-none -+ ;; -+ -+# Here we handle the default manufacturer of certain CPU types. It is in -+# some cases the only manufacturer, in others, it is the most popular. -+ w89k) -+ basic_machine=hppa1.1-winbond -+ ;; -+ op50n) -+ basic_machine=hppa1.1-oki -+ ;; -+ op60c) -+ basic_machine=hppa1.1-oki -+ ;; -+ romp) -+ basic_machine=romp-ibm -+ ;; -+ mmix) -+ basic_machine=mmix-knuth -+ ;; -+ rs6000) -+ basic_machine=rs6000-ibm -+ ;; -+ vax) -+ basic_machine=vax-dec -+ ;; -+ pdp10) -+ # there are many clones, so DEC is not a safe bet -+ basic_machine=pdp10-unknown -+ ;; -+ pdp11) -+ basic_machine=pdp11-dec -+ ;; -+ we32k) -+ basic_machine=we32k-att -+ ;; -+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) -+ basic_machine=sh-unknown -+ ;; -+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) -+ basic_machine=sparc-sun -+ ;; -+ cydra) -+ basic_machine=cydra-cydrome -+ ;; -+ orion) -+ basic_machine=orion-highlevel -+ ;; -+ orion105) -+ basic_machine=clipper-highlevel -+ ;; -+ mac | mpw | mac-mpw) -+ basic_machine=m68k-apple -+ ;; -+ pmac | pmac-mpw) -+ basic_machine=powerpc-apple -+ ;; -+ *-unknown) -+ # Make sure to match an already-canonicalized machine name. -+ ;; -+ *) -+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 -+ exit 1 -+ ;; -+esac -+ -+# Here we canonicalize certain aliases for manufacturers. -+case $basic_machine in -+ *-digital*) -+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` -+ ;; -+ *-commodore*) -+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` -+ ;; -+ *) -+ ;; -+esac -+ -+# Decode manufacturer-specific aliases for certain operating systems. -+ -+if [ x"$os" != x"" ] -+then -+case $os in -+ # First match some system type aliases -+ # that might get confused with valid system types. -+ # -solaris* is a basic system type, with this one exception. -+ -solaris1 | -solaris1.*) -+ os=`echo $os | sed -e 's|solaris1|sunos4|'` -+ ;; -+ -solaris) -+ os=-solaris2 -+ ;; -+ -svr4*) -+ os=-sysv4 -+ ;; -+ -unixware*) -+ os=-sysv4.2uw -+ ;; -+ -gnu/linux*) -+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` -+ ;; -+ # First accept the basic system types. -+ # The portable systems comes first. -+ # Each alternative MUST END IN A *, to match a version number. -+ # -sysv* is not here because it comes later, after sysvr4. -+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ -+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -+ | -aos* \ -+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ -+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -+ | -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* | -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* | -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*) -+ case $basic_machine in -+ x86-* | i*86-*) -+ ;; -+ *) -+ os=-nto$os -+ ;; -+ esac -+ ;; -+ -nto-qnx*) -+ ;; -+ -nto*) -+ os=`echo $os | sed -e 's|nto|nto-qnx|'` -+ ;; -+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ -+ | -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|'` -+ ;; -+ -sunos5*) -+ os=`echo $os | sed -e 's|sunos5|solaris2|'` -+ ;; -+ -sunos6*) -+ os=`echo $os | sed -e 's|sunos6|solaris3|'` -+ ;; -+ -opened*) -+ os=-openedition -+ ;; -+ -os400*) -+ os=-os400 -+ ;; -+ -wince*) -+ os=-wince -+ ;; -+ -osfrose*) -+ os=-osfrose -+ ;; -+ -osf*) -+ os=-osf -+ ;; -+ -utek*) -+ os=-bsd -+ ;; -+ -dynix*) -+ os=-bsd -+ ;; -+ -acis*) -+ os=-aos -+ ;; -+ -atheos*) -+ os=-atheos -+ ;; -+ -syllable*) -+ os=-syllable -+ ;; -+ -386bsd) -+ os=-bsd -+ ;; -+ -ctix* | -uts*) -+ os=-sysv -+ ;; -+ -nova*) -+ os=-rtmk-nova -+ ;; -+ -ns2 ) -+ os=-nextstep2 -+ ;; -+ -nsk*) -+ os=-nsk -+ ;; -+ # Preserve the version number of sinix5. -+ -sinix5.*) -+ os=`echo $os | sed -e 's|sinix|sysv|'` -+ ;; -+ -sinix*) -+ os=-sysv4 -+ ;; -+ -tpf*) -+ os=-tpf -+ ;; -+ -triton*) -+ os=-sysv3 -+ ;; -+ -oss*) -+ os=-sysv3 -+ ;; -+ -svr4) -+ os=-sysv4 -+ ;; -+ -svr3) -+ os=-sysv3 -+ ;; -+ -sysvr4) -+ os=-sysv4 -+ ;; -+ # This must come after -sysvr4. -+ -sysv*) -+ ;; -+ -ose*) -+ os=-ose -+ ;; -+ -es1800*) -+ os=-ose -+ ;; -+ -xenix) -+ os=-xenix -+ ;; -+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -+ os=-mint -+ ;; -+ -aros*) -+ os=-aros -+ ;; -+ -kaos*) -+ os=-kaos -+ ;; -+ -zvmoe) -+ os=-zvmoe -+ ;; -+ -none) -+ ;; -+ *) -+ # Get rid of the `-' at the beginning of $os. -+ os=`echo $os | sed 's/[^-]*-//'` -+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 -+ exit 1 -+ ;; -+esac -+else -+ -+# Here we handle the default operating systems that come with various machines. -+# The value should be what the vendor currently ships out the door with their -+# machine or put another way, the most popular os provided with the machine. -+ -+# Note that if you're going to try to match "-MANUFACTURER" here (say, -+# "-sun"), then you have to tell the case statement up towards the top -+# that MANUFACTURER isn't an operating system. Otherwise, code above -+# will signal an error saying that MANUFACTURER isn't an operating -+# system, and we'll never get to this point. -+ -+case $basic_machine in -+ score-*) -+ os=-elf -+ ;; -+ spu-*) -+ os=-elf -+ ;; -+ *-acorn) -+ os=-riscix1.2 -+ ;; -+ arm*-rebel) -+ os=-linux -+ ;; -+ arm*-semi) -+ os=-aout -+ ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ # This must come before the *-dec entry. -+ pdp10-*) -+ os=-tops20 -+ ;; -+ pdp11-*) -+ os=-none -+ ;; -+ *-dec | vax-*) -+ os=-ultrix4.2 -+ ;; -+ m68*-apollo) -+ os=-domain -+ ;; -+ i386-sun) -+ os=-sunos4.0.2 -+ ;; -+ m68000-sun) -+ os=-sunos3 -+ # This also exists in the configure program, but was not the -+ # default. -+ # os=-sunos4 -+ ;; -+ 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 -+ ;; -+ sparc-* | *-sun) -+ os=-sunos4.1.1 -+ ;; -+ *-be) -+ os=-beos -+ ;; -+ *-haiku) -+ os=-haiku -+ ;; -+ *-ibm) -+ os=-aix -+ ;; -+ *-knuth) -+ os=-mmixware -+ ;; -+ *-wec) -+ os=-proelf -+ ;; -+ *-winbond) -+ os=-proelf -+ ;; -+ *-oki) -+ os=-proelf -+ ;; -+ *-hp) -+ os=-hpux -+ ;; -+ *-hitachi) -+ os=-hiux -+ ;; -+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) -+ os=-sysv -+ ;; -+ *-cbm) -+ os=-amigaos -+ ;; -+ *-dg) -+ os=-dgux -+ ;; -+ *-dolphin) -+ os=-sysv3 -+ ;; -+ m68k-ccur) -+ os=-rtu -+ ;; -+ m88k-omron*) -+ os=-luna -+ ;; -+ *-next ) -+ os=-nextstep -+ ;; -+ *-sequent) -+ os=-ptx -+ ;; -+ *-crds) -+ os=-unos -+ ;; -+ *-ns) -+ os=-genix -+ ;; -+ i370-*) -+ os=-mvs -+ ;; -+ *-next) -+ os=-nextstep3 -+ ;; -+ *-gould) -+ os=-sysv -+ ;; -+ *-highlevel) -+ os=-bsd -+ ;; -+ *-encore) -+ os=-bsd -+ ;; -+ *-sgi) -+ os=-irix -+ ;; -+ *-siemens) -+ os=-sysv4 -+ ;; -+ *-masscomp) -+ os=-rtu -+ ;; -+ f30[01]-fujitsu | f700-fujitsu) -+ os=-uxpv -+ ;; -+ *-rom68k) -+ os=-coff -+ ;; -+ *-*bug) -+ os=-coff -+ ;; -+ *-apple) -+ os=-macos -+ ;; -+ *-atari*) -+ os=-mint -+ ;; -+ *) -+ os=-none -+ ;; -+esac -+fi -+ -+# Here we handle the case where we know the os, and the CPU type, but not the -+# manufacturer. We pick the logical manufacturer. -+vendor=unknown -+case $basic_machine in -+ *-unknown) -+ case $os in -+ -riscix*) -+ vendor=acorn -+ ;; -+ -sunos*) -+ vendor=sun -+ ;; -+ -aix*) -+ vendor=ibm -+ ;; -+ -beos*) -+ vendor=be -+ ;; -+ -hpux*) -+ vendor=hp -+ ;; -+ -mpeix*) -+ vendor=hp -+ ;; -+ -hiux*) -+ vendor=hitachi -+ ;; -+ -unos*) -+ vendor=crds -+ ;; -+ -dgux*) -+ vendor=dg -+ ;; -+ -luna*) -+ vendor=omron -+ ;; -+ -genix*) -+ vendor=ns -+ ;; -+ -mvs* | -opened*) -+ vendor=ibm -+ ;; -+ -os400*) -+ vendor=ibm -+ ;; -+ -ptx*) -+ vendor=sequent -+ ;; -+ -tpf*) -+ vendor=ibm -+ ;; -+ -vxsim* | -vxworks* | -windiss*) -+ vendor=wrs -+ ;; -+ -aux*) -+ vendor=apple -+ ;; -+ -hms*) -+ vendor=hitachi -+ ;; -+ -mpw* | -macos*) -+ vendor=apple -+ ;; -+ -*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 -+ -+# Local variables: -+# eval: (add-hook 'write-file-hooks 'time-stamp) -+# time-stamp-start: "timestamp='" -+# time-stamp-format: "%:y-%02m-%02d" -+# time-stamp-end: "'" -+# End: ---- adjtimex-1.23.orig/config.guess -+++ adjtimex-1.23/config.guess -@@ -0,0 +1,1516 @@ -+#! /bin/sh -+# Attempt to guess a canonical system name. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -+# Inc. -+ -+timestamp='2007-03-06' -+ -+# 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., 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. -+ -+ -+# 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 -+# exits with 0. Otherwise, it exits with 1. -+# -+# The plan is that this can be called by configure scripts if you -+# don't specify an explicit build system type. -+ -+me=`echo "$0" | sed -e 's,.*/,,'` -+ -+usage="\ -+Usage: $0 [OPTION] -+ -+Output the configuration name of the system \`$me' is run on. -+ -+Operation modes: -+ -h, --help print this help, then exit -+ -t, --time-stamp print date of last modification, then exit -+ -v, --version print version number, then exit -+ -+Report bugs and patches to ." -+ -+version="\ -+GNU config.guess ($timestamp) -+ -+Originally written by Per Bothner. -+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 -+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -+ -+help=" -+Try \`$me --help' for more information." -+ -+# Parse command line -+while test $# -gt 0 ; do -+ case $1 in -+ --time-stamp | --time* | -t ) -+ echo "$timestamp" ; exit ;; -+ --version | -v ) -+ echo "$version" ; exit ;; -+ --help | --h* | -h ) -+ echo "$usage"; exit ;; -+ -- ) # Stop option processing -+ shift; break ;; -+ - ) # Use stdin as input. -+ break ;; -+ -* ) -+ echo "$me: invalid option $1$help" >&2 -+ exit 1 ;; -+ * ) -+ break ;; -+ esac -+done -+ -+if test $# != 0; then -+ echo "$me: too many arguments$help" >&2 -+ exit 1 -+fi -+ -+trap '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. -+ -+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -+# use `HOST_CC' if defined, but it is deprecated. -+ -+# 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 ; -+ 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 ; 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) -+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then -+ PATH=$PATH:/.attbin ; export PATH -+fi -+ -+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -+ -+# Note: order is significant - the case branches are not exclusive. -+ -+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -+ *:NetBSD:*:*) -+ # 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. -+ # -+ # 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_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 -+ then -+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). -+ # Return netbsd for either. FIX? -+ os=netbsd -+ else -+ os=netbsdelf -+ fi -+ ;; -+ *) -+ os=netbsd -+ ;; -+ esac -+ # The OS release -+ # 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 ;; -+ *: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:*:*) -+ case $UNAME_RELEASE in -+ *4.0) -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` -+ ;; -+ *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. -+ 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 ;; -+ 21064:Windows_NT:50:3) -+ echo alpha-dec-winnt3.5 -+ exit ;; -+ Amiga*:UNIX_System_V:4.0:*) -+ echo m68k-unknown-sysv4 -+ exit ;; -+ *:[Aa]miga[Oo][Ss]:*:*) -+ echo ${UNAME_MACHINE}-unknown-amigaos -+ exit ;; -+ *:[Mm]orph[Oo][Ss]:*:*) -+ echo ${UNAME_MACHINE}-unknown-morphos -+ exit ;; -+ *:OS/390:*:*) -+ echo i370-ibm-openedition -+ 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 ;; -+ arm:riscos:*:*|arm:RISCOS:*:*) -+ echo arm-unknown-riscos -+ exit ;; -+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -+ echo hppa1.1-hitachi-hiuxmpp -+ 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 -+ echo pyramid-pyramid-sysv3 -+ else -+ echo pyramid-pyramid-bsd -+ fi -+ exit ;; -+ NILE*:*:*:dcosx) -+ echo pyramid-pyramid-svr4 -+ 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 ;; -+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) -+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; -+ i86pc:SunOS:5.*:*) -+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ 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 ;; -+ sun4*:SunOS:*:*) -+ case "`/usr/bin/arch -k`" in -+ Series*|S4*) -+ UNAME_RELEASE=`uname -v` -+ ;; -+ esac -+ # Japanese Language versions have a version number like `4.1.3-JL'. -+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` -+ exit ;; -+ sun3*:SunOS:*:*) -+ echo m68k-sun-sunos${UNAME_RELEASE} -+ exit ;; -+ sun*:*:4.2BSD:*) -+ 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) -+ echo m68k-sun-sunos${UNAME_RELEASE} -+ ;; -+ sun4) -+ echo sparc-sun-sunos${UNAME_RELEASE} -+ ;; -+ esac -+ exit ;; -+ aushp:SunOS:*:*) -+ echo sparc-auspex-sunos${UNAME_RELEASE} -+ 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 -+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT" -+ # to the lowercase version "mint" (or "freemint"). Finally -+ # the system name "TOS" denotes a system which is actually not -+ # MiNT. But MiNT is downward compatible to TOS, so this should -+ # be no problem. -+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -+ echo m68k-atari-mint${UNAME_RELEASE} -+ exit ;; -+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) -+ echo m68k-atari-mint${UNAME_RELEASE} -+ exit ;; -+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -+ echo m68k-atari-mint${UNAME_RELEASE} -+ exit ;; -+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; -+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; -+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; -+ m68k:machten:*:*) -+ echo m68k-apple-machten${UNAME_RELEASE} -+ exit ;; -+ powerpc:machten:*:*) -+ echo powerpc-apple-machten${UNAME_RELEASE} -+ exit ;; -+ RISC*:Mach:*:*) -+ echo mips-dec-mach_bsd4.3 -+ exit ;; -+ RISC*:ULTRIX:*:*) -+ echo mips-dec-ultrix${UNAME_RELEASE} -+ exit ;; -+ VAX*:ULTRIX*:*:*) -+ echo vax-dec-ultrix${UNAME_RELEASE} -+ exit ;; -+ 2020:CLIX:*:* | 2430:CLIX:*:*) -+ echo clipper-intergraph-clix${UNAME_RELEASE} -+ exit ;; -+ mips:*:*:UMIPS | mips:*:*:RISCos) -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+#ifdef __cplusplus -+#include /* for printf() prototype */ -+ int main (int argc, char *argv[]) { -+#else -+ int main (argc, argv) int argc; char *argv[]; { -+#endif -+ #if defined (host_mips) && defined (MIPSEB) -+ #if defined (SYSTYPE_SYSV) -+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); -+ #endif -+ #if defined (SYSTYPE_SVR4) -+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); -+ #endif -+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) -+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); -+ #endif -+ #endif -+ exit (-1); -+ } -+EOF -+ $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 ;; -+ Motorola:PowerMAX_OS:*:*) -+ echo powerpc-motorola-powermax -+ 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 ;; -+ m88k:CX/UX:7*:*) -+ echo m88k-harris-cxux7 -+ exit ;; -+ m88k:*:4*:R4*) -+ echo m88k-motorola-sysv4 -+ exit ;; -+ m88k:*:3*:R3*) -+ echo m88k-motorola-sysv3 -+ exit ;; -+ AViiON:dgux:*:*) -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` -+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] -+ then -+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -+ [ ${TARGET_BINARY_INTERFACE}x = x ] -+ then -+ echo m88k-dg-dgux${UNAME_RELEASE} -+ else -+ echo m88k-dg-dguxbcs${UNAME_RELEASE} -+ fi -+ else -+ echo i586-dg-dgux${UNAME_RELEASE} -+ fi -+ exit ;; -+ M88*:DolphinOS:*:*) # DolphinOS (SVR3) -+ echo m88k-dolphin-sysv3 -+ exit ;; -+ M88*:*:R3*:*) -+ # Delta 88k system running SVR3 -+ echo m88k-motorola-sysv3 -+ exit ;; -+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) -+ echo m88k-tektronix-sysv3 -+ exit ;; -+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) -+ echo m68k-tektronix-bsd -+ exit ;; -+ *:IRIX*:*:*) -+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` -+ 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 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' -+ i*86:AIX:*:*) -+ echo i386-ibm-aix -+ exit ;; -+ ia64:AIX:*:*) -+ if [ -x /usr/bin/oslevel ] ; then -+ IBM_REV=`/usr/bin/oslevel` -+ else -+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} -+ fi -+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} -+ 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 -+ -+ main() -+ { -+ if (!__power_pc()) -+ exit(1); -+ puts("powerpc-ibm-aix3.2.5"); -+ exit(0); -+ } -+EOF -+ 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 ;; -+ *:AIX:*:[45]) -+ 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 -+ IBM_ARCH=powerpc -+ fi -+ if [ -x /usr/bin/oslevel ] ; then -+ IBM_REV=`/usr/bin/oslevel` -+ else -+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} -+ fi -+ echo ${IBM_ARCH}-ibm-aix${IBM_REV} -+ exit ;; -+ *:AIX:*:*) -+ echo rs6000-ibm-aix -+ exit ;; -+ ibmrt:4.4BSD:*|romp-ibm:BSD:*) -+ echo romp-ibm-bsd4.4 -+ exit ;; -+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and -+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to -+ exit ;; # report: romp-ibm BSD 4.3 -+ *:BOSX:*:*) -+ echo rs6000-bull-bosx -+ exit ;; -+ DPX/2?00:B.O.S.:*:*) -+ echo m68k-bull-sysv3 -+ exit ;; -+ 9000/[34]??:4.3bsd:1.*:*) -+ echo m68k-hp-bsd -+ exit ;; -+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) -+ echo m68k-hp-bsd4.4 -+ 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]) -+ 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 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ 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 -+ if [ "${HP_ARCH}" = "" ]; then -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ -+ #define _HPUX_SOURCE -+ #include -+ #include -+ -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); -+ -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } -+EOF -+ (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 ;; -+ ia64:HP-UX:*:*) -+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` -+ echo ia64-hp-hpux${HPUX_REV} -+ exit ;; -+ 3050*:HI-UX:*:*) -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #include -+ int -+ main () -+ { -+ long cpu = sysconf (_SC_CPU_VERSION); -+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns -+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct -+ results, however. */ -+ if (CPU_IS_PA_RISC (cpu)) -+ { -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; -+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; -+ default: puts ("hppa-hitachi-hiuxwe2"); break; -+ } -+ } -+ else if (CPU_IS_HP_MC68K (cpu)) -+ puts ("m68k-hitachi-hiuxwe2"); -+ else puts ("unknown-hitachi-hiuxwe2"); -+ exit (0); -+ } -+EOF -+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } -+ echo unknown-hitachi-hiuxwe2 -+ exit ;; -+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) -+ echo hppa1.1-hp-bsd -+ exit ;; -+ 9000/8??:4.3bsd:*:*) -+ echo hppa1.0-hp-bsd -+ exit ;; -+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) -+ echo hppa1.0-hp-mpeix -+ exit ;; -+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) -+ echo hppa1.1-hp-osf -+ exit ;; -+ hp8??:OSF1:*:*) -+ echo hppa1.0-hp-osf -+ exit ;; -+ i*86:OSF1:*:*) -+ if [ -x /usr/sbin/sysversion ] ; then -+ echo ${UNAME_MACHINE}-unknown-osf1mk -+ else -+ echo ${UNAME_MACHINE}-unknown-osf1 -+ fi -+ exit ;; -+ parisc*:Lites*:*:*) -+ echo hppa1.1-hp-lites -+ exit ;; -+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) -+ echo c1-convex-bsd -+ exit ;; -+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) -+ if getsysinfo -f scalar_acc -+ then echo c32-convex-bsd -+ else echo c2-convex-bsd -+ fi -+ exit ;; -+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) -+ echo c34-convex-bsd -+ exit ;; -+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) -+ echo c38-convex-bsd -+ exit ;; -+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) -+ echo c4-convex-bsd -+ exit ;; -+ CRAY*Y-MP:*:*:*) -+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ 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 ;; -+ CRAY*TS:*:*:*) -+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ exit ;; -+ CRAY*T3E:*:*:*) -+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ exit ;; -+ CRAY*SV1:*:*:*) -+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ 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 ;; -+ 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 ;; -+ sparc*:BSD/OS:*:*) -+ echo sparc-unknown-bsdi${UNAME_RELEASE} -+ exit ;; -+ *:BSD/OS:*:*) -+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} -+ exit ;; -+ *:FreeBSD:*:*) -+ 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 ;; -+ *:MINGW*:*) -+ echo ${UNAME_MACHINE}-pc-mingw32 -+ exit ;; -+ i*:windows32*:*) -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 -+ exit ;; -+ i*:PW*:*) -+ echo ${UNAME_MACHINE}-pc-pw32 -+ 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 i586-pc-interix -+ exit ;; -+ i*:UWIN*:*) -+ echo ${UNAME_MACHINE}-pc-uwin -+ exit ;; -+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) -+ echo x86_64-unknown-cygwin -+ exit ;; -+ p*:CYGWIN*:*) -+ echo powerpcle-unknown-cygwin -+ exit ;; -+ prep*:SunOS:5.*:*) -+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; -+ *:GNU:*:*) -+ # the GNU system -+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -+ 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 ;; -+ arm*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ 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-gnu -+ exit ;; -+ m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ m68*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ mips:Linux:*:*) -+ 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 ;; -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu -+ exit ;; -+ alpha:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ EV5) UNAME_MACHINE=alphaev5 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) 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 ;; -+ parisc:Linux:*:* | hppa:Linux:*:*) -+ # Look for CPU level -+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -+ PA7*) echo hppa1.1-unknown-linux-gnu ;; -+ PA8*) echo hppa2.0-unknown-linux-gnu ;; -+ *) echo hppa-unknown-linux-gnu ;; -+ esac -+ exit ;; -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu -+ exit ;; -+ s390:Linux:*:* | s390x:Linux:*:*) -+ echo ${UNAME_MACHINE}-ibm-linux -+ exit ;; -+ sh64*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ sh*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ sparc:Linux:*:* | sparc64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-gnu -+ exit ;; -+ x86_64:Linux:*:*) -+ echo x86_64-unknown-linux-gnu -+ 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. -+ # 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: *// -+ s/ .*// -+ p'` -+ case "$ld_supported_targets" in -+ elf32-i386) -+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -+ ;; -+ a.out-i386-linux) -+ echo "${UNAME_MACHINE}-pc-linux-gnuaout" -+ exit ;; -+ coff-i386) -+ echo "${UNAME_MACHINE}-pc-linux-gnucoff" -+ 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 ;; -+ esac -+ # Determine whether the default compiler is a.out or elf -+ eval $set_cc_for_build -+ 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 ;; -+ i*86:UNIX_SV:4.2MP:2.*) -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, -+ # I just have to hope. -- rms. -+ # Use sysv4.2uw... so that sysv4* matches it. -+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} -+ 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 -+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} -+ else -+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} -+ fi -+ 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 ;; -+ 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|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|grep '^Machine.*Pent *II' >/dev/null) \ -+ && UNAME_MACHINE=i686 -+ (/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 ;; -+ 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 ;; -+ Intel:Mach:3*:*) -+ echo i386-pc-mach3 -+ exit ;; -+ paragon:*:*:*) -+ echo i860-intel-osf1 -+ 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 ;; -+ mini*:CTIX:SYS*5:*) -+ # "miniframe" -+ echo m68010-convergent-sysv -+ 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; } -+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -+ && { 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; } ;; -+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) -+ echo m68k-unknown-lynxos${UNAME_RELEASE} -+ exit ;; -+ mc68030:UNIX_System_V:4.*:*) -+ echo m68k-atari-sysv4 -+ exit ;; -+ TSUNAMI:LynxOS:2.*:*) -+ echo sparc-unknown-lynxos${UNAME_RELEASE} -+ exit ;; -+ rs6000:LynxOS:2.*:*) -+ echo rs6000-unknown-lynxos${UNAME_RELEASE} -+ exit ;; -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ echo powerpc-unknown-lynxos${UNAME_RELEASE} -+ exit ;; -+ SM[BE]S:UNIX_SV:*:*) -+ echo mips-dde-sysv${UNAME_RELEASE} -+ exit ;; -+ RM*:ReliantUNIX-*:*:*) -+ echo mips-sni-sysv4 -+ exit ;; -+ RM*:SINIX-*:*:*) -+ echo mips-sni-sysv4 -+ exit ;; -+ *:SINIX-*:*:*) -+ if uname -p 2>/dev/null >/dev/null ; then -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ echo ${UNAME_MACHINE}-sni-sysv4 -+ else -+ echo ns32k-sni-sysv -+ fi -+ exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says -+ echo i586-unisys-sysv4 -+ exit ;; -+ *:UNIX_System_V:4*:FTX*) -+ # From Gerald Hewes . -+ # How about differentiating between stratus architectures? -djm -+ echo hppa1.1-stratus-sysv4 -+ exit ;; -+ *:*:*:FTX*) -+ # From seanf@swdc.stratus.com. -+ echo i860-stratus-sysv4 -+ 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 ;; -+ news*:NEWS-OS:6*:*) -+ echo mips-sony-newsos6 -+ 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 ;; -+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. -+ echo powerpc-be-beos -+ exit ;; -+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. -+ echo powerpc-apple-beos -+ exit ;; -+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. -+ echo i586-pc-beos -+ exit ;; -+ SX-4:SUPER-UX:*:*) -+ echo sx4-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-5:SUPER-UX:*:*) -+ echo sx5-nec-superux${UNAME_RELEASE} -+ 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 ;; -+ *:Rhapsody:*:*) -+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} -+ exit ;; -+ *:Darwin:*:*) -+ 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]*:*) -+ UNAME_PROCESSOR=`uname -p` -+ if test "$UNAME_PROCESSOR" = "x86"; then -+ UNAME_PROCESSOR=i386 -+ UNAME_MACHINE=pc -+ fi -+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} -+ exit ;; -+ *:QNX:*:4*) -+ echo i386-pc-qnx -+ exit ;; -+ NSE-?:NONSTOP_KERNEL:*:*) -+ echo nse-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSR-?:NONSTOP_KERNEL:*:*) -+ echo nsr-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ *:NonStop-UX:*:*) -+ echo mips-compaq-nonstopux -+ exit ;; -+ BS2000:POSIX*:*:*) -+ echo bs2000-siemens-sysv -+ exit ;; -+ DS/*:UNIX_System_V:*:*) -+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} -+ exit ;; -+ *:Plan9:*:*) -+ # "uname -m" is not consistent, so use $cputype instead. 386 -+ # is converted to i386 for consistency with other x86 -+ # operating systems. -+ if test "$cputype" = "386"; then -+ UNAME_MACHINE=i386 -+ else -+ UNAME_MACHINE="$cputype" -+ fi -+ echo ${UNAME_MACHINE}-unknown-plan9 -+ exit ;; -+ *:TOPS-10:*:*) -+ echo pdp10-unknown-tops10 -+ exit ;; -+ *:TENEX:*:*) -+ echo pdp10-unknown-tenex -+ exit ;; -+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) -+ echo pdp10-dec-tops20 -+ exit ;; -+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) -+ echo pdp10-xkl-tops20 -+ exit ;; -+ *:TOPS-20:*:*) -+ echo pdp10-unknown-tops20 -+ exit ;; -+ *:ITS:*:*) -+ echo pdp10-unknown-its -+ 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 < -+# include -+#endif -+main () -+{ -+#if defined (sony) -+#if defined (MIPSEB) -+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, -+ I don't know.... */ -+ printf ("mips-sony-bsd\n"); exit (0); -+#else -+#include -+ printf ("m68k-sony-newsos%s\n", -+#ifdef NEWSOS4 -+ "4" -+#else -+ "" -+#endif -+ ); exit (0); -+#endif -+#endif -+ -+#if defined (__arm) && defined (__acorn) && defined (__unix) -+ printf ("arm-acorn-riscix\n"); exit (0); -+#endif -+ -+#if defined (hp300) && !defined (hpux) -+ printf ("m68k-hp-bsd\n"); exit (0); -+#endif -+ -+#if defined (NeXT) -+#if !defined (__ARCHITECTURE__) -+#define __ARCHITECTURE__ "m68k" -+#endif -+ int version; -+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; -+ if (version < 4) -+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); -+ else -+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); -+ exit (0); -+#endif -+ -+#if defined (MULTIMAX) || defined (n16) -+#if defined (UMAXV) -+ printf ("ns32k-encore-sysv\n"); exit (0); -+#else -+#if defined (CMU) -+ printf ("ns32k-encore-mach\n"); exit (0); -+#else -+ printf ("ns32k-encore-bsd\n"); exit (0); -+#endif -+#endif -+#endif -+ -+#if defined (__386BSD__) -+ printf ("i386-pc-bsd\n"); exit (0); -+#endif -+ -+#if defined (sequent) -+#if defined (i386) -+ printf ("i386-sequent-dynix\n"); exit (0); -+#endif -+#if defined (ns32000) -+ printf ("ns32k-sequent-dynix\n"); exit (0); -+#endif -+#endif -+ -+#if defined (_SEQUENT_) -+ struct utsname un; -+ -+ uname(&un); -+ -+ if (strncmp(un.version, "V2", 2) == 0) { -+ printf ("i386-sequent-ptx2\n"); exit (0); -+ } -+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ -+ printf ("i386-sequent-ptx1\n"); exit (0); -+ } -+ printf ("i386-sequent-ptx\n"); exit (0); -+ -+#endif -+ -+#if defined (vax) -+# if !defined (ultrix) -+# include -+# if defined (BSD) -+# if BSD == 43 -+ printf ("vax-dec-bsd4.3\n"); exit (0); -+# else -+# if BSD == 199006 -+ printf ("vax-dec-bsd4.3reno\n"); exit (0); -+# else -+ printf ("vax-dec-bsd\n"); exit (0); -+# endif -+# endif -+# else -+ printf ("vax-dec-bsd\n"); exit (0); -+# endif -+# else -+ printf ("vax-dec-ultrix\n"); exit (0); -+# endif -+#endif -+ -+#if defined (alliant) && defined (i860) -+ printf ("i860-alliant-bsd\n"); exit (0); -+#endif -+ -+ exit (1); -+} -+EOF -+ -+$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; } -+ -+# Convex versions that predate uname can use getsysinfo(1) -+ -+if [ -x /usr/convex/getsysinfo ] -+then -+ case `getsysinfo -f cpu_type` in -+ c1*) -+ echo c1-convex-bsd -+ exit ;; -+ c2*) -+ if getsysinfo -f scalar_acc -+ then echo c32-convex-bsd -+ else echo c2-convex-bsd -+ fi -+ exit ;; -+ c34*) -+ echo c34-convex-bsd -+ exit ;; -+ c38*) -+ echo c38-convex-bsd -+ exit ;; -+ c4*) -+ echo c4-convex-bsd -+ exit ;; -+ esac -+fi -+ -+cat >&2 < in order to provide the needed -+information to handle your system. -+ -+config.guess timestamp = $timestamp -+ -+uname -m = `(uname -m) 2>/dev/null || echo unknown` -+uname -r = `(uname -r) 2>/dev/null || echo unknown` -+uname -s = `(uname -s) 2>/dev/null || echo unknown` -+uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ -+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -+/bin/uname -X = `(/bin/uname -X) 2>/dev/null` -+ -+hostinfo = `(hostinfo) 2>/dev/null` -+/bin/universe = `(/bin/universe) 2>/dev/null` -+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -+/bin/arch = `(/bin/arch) 2>/dev/null` -+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -+ -+UNAME_MACHINE = ${UNAME_MACHINE} -+UNAME_RELEASE = ${UNAME_RELEASE} -+UNAME_SYSTEM = ${UNAME_SYSTEM} -+UNAME_VERSION = ${UNAME_VERSION} -+EOF -+ -+exit 1 -+ -+# Local variables: -+# eval: (add-hook 'write-file-hooks 'time-stamp) -+# time-stamp-start: "timestamp='" -+# time-stamp-format: "%:y-%02m-%02d" -+# time-stamp-end: "'" -+# End: ---- adjtimex-1.23.orig/debian/control -+++ adjtimex-1.23/debian/control -@@ -0,0 +1,20 @@ -+Source: adjtimex -+Section: admin -+Priority: optional -+Maintainer: James R. Van Zandt -+Build-Depends: debhelper (>= 5), po-debconf -+Standards-Version: 3.7.2 -+ -+Package: adjtimex -+Architecture: any -+Depends: ${shlibs:Depends}, debconf | debconf-2.0 -+Suggests: ntpdate -+Description: Utility to display or set the kernel time variables -+ This program gives you raw access to the kernel time variables. For -+ a machine connected to the Internet, or equipped with a precision -+ oscillator or radio clock, the best way to keep the system clock -+ correct is with ntpd. However, for a standalone or intermittently -+ connected machine, you may use adjtimex instead to at least correct -+ for systematic drift. adjtimex can optionally adjust the system -+ clock using the CMOS clock as a reference, and can log times for -+ long-term estimation of drift rates. ---- adjtimex-1.23.orig/debian/po/POTFILES.in -+++ adjtimex-1.23/debian/po/POTFILES.in -@@ -0,0 +1 @@ -+[type: gettext/rfc822deb] templates ---- adjtimex-1.23.orig/debian/po/templates.pot -+++ adjtimex-1.23/debian/po/templates.pot -@@ -0,0 +1,59 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR , YEAR. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -+"Last-Translator: FULL NAME \n" -+"Language-Team: LANGUAGE \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=CHARSET\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" ---- adjtimex-1.23.orig/debian/po/fr.po -+++ adjtimex-1.23/debian/po/fr.po -@@ -0,0 +1,87 @@ -+# translation of fr.po to French -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+# Christian Perrier , 2006. -+msgid "" -+msgstr "" -+"Project-Id-Version: fr\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2006-12-17 14:01+0100\n" -+"Last-Translator: Christian Perrier \n" -+"Language-Team: French \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.11.4\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Faut-il lancer adjtimex lors de l'installation et à chaque démarrage du " -+"système ?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"Adjtimex peut être lancé au démarrage du système afin de régler les " -+"paramètres d'horloge du noyau en fonction des valeurs contenues dans /etc/" -+"default/adjtimex. Ne choisissez pas cette option si vous souhaitez " -+"simplement vous servir d'adjtimex pour consulter les paramètres actuels." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Faut-il lancer adjtimexconfig lors de l'installation ?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Le script adjtimexconfig utilise adjtimex afin de trouver les valeurs " -+"appropriées pour les variables du noyau concernant le battement (« tick ») " -+"et la fréquence d'horloge. Cela permettra à l'horloge du système d'être à " -+"peu près en accord avec l'horloge matérielle (parfois appelée « horloge " -+"CMOS »). Ces valeurs seront alors conservées dans le fichier de " -+"configuration /etc/default/adjtimex ce qui permettra de les restaurer à " -+"chaque démarrage quand /etc/init.d/adjtimex s'exécutera. " -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"La durée d'exécution du script est de 70 secondes. Vous pouvez également " -+"utiliser adjtimexconfig vous-même plus tard ou déterminer les valeurs des " -+"variables du noyau d'une autre manière (il en existe plusieurs : voir la " -+"page de manuel d'adjtimex). Ces valeurs devront ensuite être placées dans /" -+"etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/es.po -+++ adjtimex-1.23/debian/po/es.po -@@ -0,0 +1,81 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -+"Last-Translator: Vicente H. \n" -+"Language-Team: LANGUAGE \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=ISO-8859-15\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "¿Debe ejecutarse adjtimex ahora y en cada arranque?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+#, fuzzy -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"Adjtimex puede ser ejecutado en el arranque del sistema para poner los " -+"parámetros de tiempo del núcleo en /etc/default/adjtimex. Si usted solamente " -+"quiere usar adjtimex para inspeccionar los parámetros actuales, conteste \"No" -+"\"." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "¿Debe ejecutarse adjtimexconfig ahora?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"El guión adjtimexconfig usará adjtimex para encontrar los valores para el " -+"núcleo de la señal y frecuencia que será tomada por el reloj del sistema " -+"para estar de acuerdo con el reloj del hardware (también conocido como el " -+"reloj CMOS). Este guión guardará los valores en el archivo de configuración /" -+"etc/default/adjtimex para que los ajustes sean restaurados en cada arranque " -+"del sistema, cuando /etc/init.d/adjtimex sea ejecutado." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"El guión toma 70 seg. para ser ejecutado. O bien, usted mismo puede ejecutar " -+"adjtimexconfig más tarde, o determinar las variables del núcleo de varias " -+"formas (mire la página man de adjtimex) y anótelos en /etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/pl.po -+++ adjtimex-1.23/debian/po/pl.po -@@ -0,0 +1,83 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -+"Last-Translator: Bartosz Zapa³owski \n" -+"Language-Team: Polish Debian Documentation Project \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=iso-8859-2\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Czy adjtimex ma byæ uruchomiany podczas instalacji i ka¿dego startu systemu?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex mo¿e byæ uruchamiany podczas ka¿dego uruchomienia systemu,by " -+"ustawiæ parametry czasu w j±drze na warto¶ci znajduj±ce siê w pliku/etc/" -+"default/adjtimex. Nie wyra¿aj zgody, je¶li chcesz u¿ywaæ adjtimextylko do " -+"sprawdzania aktualnych warto¶ci." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Czy adjtimexconfig ma byæ uruchomiony podczas instalacji?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Skrypt adjtimexconfig skorzysta z programu adjtimex do znalezienia " -+"takichwarto¶ci parametrów j±dra tick i frequency, ¿eby zegar systemowy by³ " -+"zbli¿onydo zegara sprzêtowego (zegara CMOS). Nastêpnie zapisze ustawienia w " -+"plikukonfiguracyjnym /etc/default/adjtimex, dziêki czemu warto¶ci te " -+"bêd±przywrócane przy ka¿dym starcie systemu w momencie wykonywania skryptu/" -+"etc/init.d/adjtimex." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Skrypt bêdzie dzia³a³ przez 70 sekund. Mo¿esz te¿ uruchomiæ " -+"w³asnorêcznieadjtimexconfig w dowolnym czasie lub dobraæ paramterty j±dra w " -+"innysposób (zapoznaj siê ze stron± manuala adjtimex) i zapisaæ je w pliku/" -+"etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/nl.po -+++ adjtimex-1.23/debian/po/nl.po -@@ -0,0 +1,82 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2003-10-04 16:05+0100\n" -+"Last-Translator: Michiel Sikkes \n" -+"Language-Team: Dutch \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Wilt u dat adjtimex bij elke installatie en bij elke opstartprocedure " -+"gedraaid wordt?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex kan gedraaid worden bij het opstarten van het systeem om de " -+"kerneltijd parameters in te stellen zoals gedefinieerd in /etc/default/" -+"adjtimex. Accepteer deze optie niet als u adjtimex wilt gebruiken om de " -+"huidige parameters te bekijken." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Wilt u dat adjtimexconfig bij het installeren wordt gedraaid?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Het adjtimexconfig script zal adjtimex gebruiken om de eigenschappen voor de " -+"kernelvariablen tick en frequency te vinden. Dit zal zorgen dat de " -+"systeemklok gelijk loopt met de hardware klok (ook bekend onder de naam CMOS " -+"klok). Het slaat deze eigenschappen op in het configuratiebestand /etc/" -+"default/adjtimex, dus de instellingen worden bij elke " -+"systeemopstartprocedure hersteld als /etc/init.d/adjtimex draait." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Het script doet er 70 seconden over om te draaien. Als alternatief kunt u " -+"adjtimexconfig later handmatig draaien, of de kerneleigenschappen op een " -+"andere manier bepalen (zie de adjtimex man-pagina) en deze zelf in /etc/" -+"default/adjtimex zetten." ---- adjtimex-1.23.orig/debian/po/da.po -+++ adjtimex-1.23/debian/po/da.po -@@ -0,0 +1,79 @@ -+# translation of adjtimex_1.16-1-da.po to Danish -+# translation of adjtimex_1.16-1_templates.po to Danish -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -+# Developers do not need to manually edit POT or PO files. -+# Claus Hindsgaul , 2004. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex_1.16-1-da\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2004-03-24 17:57+0100\n" -+"Last-Translator: Claus Hindsgaul \n" -+"Language-Team: Danish \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.3.1\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "Skal adjtimex køres under installation og ved hver opstart?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex kan køres under opstart af systemet for at sætte kernens " -+"tidsparametre til værdierne i /etC/default/adjtimex. Acceptér ikke dette, " -+"hvis du kun vil bruge adjtimex til at gennemse de aktuelle parametre." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Skal adjtimexconfig køres under installationen?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Skriftet adjtimexconfig vil bruge adjtimex til at finde de værdier til " -+"kernevariablene tick og frequency, der vil fÃ¥ systemuret til at passe med " -+"computerens indbyggede ur (CMOS-uret). Den gemmer derefter værdierne i " -+"opsætningsfilen /etc/default/edjtimex, sÃ¥ indstillingerne bliver sat under " -+"hver opstart, nÃ¥r skriptet /etC/init.d/adjtimex køres." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Det tager 70 sekunder at køre skriptet. Alternativt kan du selv køre " -+"adjtimexconfig senere, eller finde kernevariablene pÃ¥ en anden mÃ¥de (se " -+"manualsiden adjtimex) og installere dem i /etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/ja.po -+++ adjtimex-1.23/debian/po/ja.po -@@ -0,0 +1,78 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2003-11-21 00:02+0900\n" -+"Last-Translator: Hideki Yamane \n" -+"Language-Team: Japanese \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=EUC-JP\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "adjtimex ¤ò¥¤¥ó¥¹¥È¡¼¥ë»þ¤ª¤è¤ÓËè²ó¤Îµ¯Æ°»þ¤ËÆ°ºî¤µ¤»¤Þ¤¹¤«?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex ¤ò¥·¥¹¥Æ¥à¤Îµ¯Æ°»þ¤ËÆ°ºî¤µ¤»¤Æ¥«¡¼¥Í¥ë¤Î»þ´Ö¥Ñ¥é¥á¡¼¥¿¤ò /etc/" -+"default/adjtimex ¤ÎÃͤËÀßÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£ adjtimex ¤ò¸½ºß¤Î¥Ñ¥é¥á¡¼¥¿¤Î" -+"Ä´ºº¤Ë¤À¤±¤Ë»È¤¤¤¿¤¤¤È¤¤¤¦¾ì¹ç¤ÏÆ°ºî¤ò¤µ¤»¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "adjtimexconfig ¤ò¥¤¥ó¥¹¥È¡¼¥ë»þ¤ËÆ°ºî¤µ¤»¤Þ¤¹¤«?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"adjtimexconfig ¥¹¥¯¥ê¥×¥È¤Ï adjtimex ¤ò»ÈÍѤ·¤Æ¡¢¥·¥¹¥Æ¥à¥¯¥í¥Ã¥¯¤ò¥Ï¡¼¥É¥¦¥§" -+"¥¢¥¯¥í¥Ã¥¯ (CMOS ¥¯¥í¥Ã¥¯¤È¤·¤Æ¤âÃΤé¤ì¤Æ¤¤¤Þ¤¹) ¤È¤ª¤ª¤è¤½Æ±´ü¤¹¤ë¤è¤¦¤Ë¥«¡¼" -+"¥Í¥ëÊÑ¿ô tick ¤È frequency ¤ËÍ¿¤¨¤ëÃͤò¸«¤Ä¤±¤Þ¤¹¡£¤½¤·¤Æ¡¢¤³¤ÎÃͤòÀßÄê¥Õ¥¡¥¤" -+"¥ë /etc/default/adjtimex ¤ËÊݸ¤¹¤ë¤³¤È¤ÇËè²óµ¯Æ°»þ¤Ë /etc/init.d/adjtimex ¤¬" -+"Æ°ºî¤¹¤ëºÝ¤ËÀßÄ꤬Éü¸µ¤µ¤ì¤Þ¤¹¡£" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"¥¹¥¯¥ê¥×¥È¤ÏÆ°ºî¤Ë 70 É䫤«¤ê¤Þ¤¹¡£Ê̲ò¤È¤·¤Æ¤Ï adjtimexconfig ¤ò¸å¤Û¤É¼Â¹Ô" -+"¤¹¤ë¡¢¤Þ¤¿¤Ï¾¤ÎÊýË¡¤Ç¥«¡¼¥Í¥ëÊÑ¿ô¤ò·è¤á¤Æ (adjtimex ¤Î man ¥Ú¡¼¥¸¤ò»²¾È) /" -+"etc/default/adjtimex ¤Ø¤ÎÀßÄê¤ò¹Ô¤¦¤Ê¤É¤¬²Äǽ¤Ç¤¹¡£" ---- adjtimex-1.23.orig/debian/po/pt_BR.po -+++ adjtimex-1.23/debian/po/pt_BR.po -@@ -0,0 +1,82 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex_1.16-1\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2004-01-17 20:55-0300\n" -+"Last-Translator: André Luís Lopes \n" -+"Language-Team: Debian-BR Project \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=ISO-8859-1\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "Executar o adjtimex durante a instalação e a cada reinicialização ?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"O adjtimex pode ser executado na inicialização do sistema para definir " -+"parâmetros de tempo de kernel para os valores em /etc/default/adjtimex. Não " -+"aceite caso você somente queira usar o adjtimex para inspecionar os " -+"parâmetros atuais." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Executar o adjtimexconfig durante a instalação ?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"O script adjtimex irá utilizar o adjtimex para encontrar valores para " -+"variáveis de kernel tick e frequency que farão com que o relógio do sistema " -+"concorde aproimadamente com o relógio de hardware (também conhecido como " -+"relógio CMOS). Ele irá então gravar esses valores no arquivo de " -+"configuração /etc/default/adjtimex de modo que as configurações sejam " -+"restauradas a cada renicialização, quando o /etc/init.d/adjtimex é executado." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"O script leva cerca de 70 segundos para ser executado. Alternativamente, " -+"você pode executar o adjtimexconfig você mesmo posteriormente, ou ainda " -+"determinar as variáveis de kernel usando uma das diversas maneiras possíveis " -+"(consulte a página de manul adjtimex) e instalar as mesmas em /etc/default/" -+"adjtimex." ---- adjtimex-1.23.orig/debian/po/de.po -+++ adjtimex-1.23/debian/po/de.po -@@ -0,0 +1,83 @@ -+# translation of adjtimex_1.21.1-2_de.po to German -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -+# Developers do not need to manually edit POT or PO files. -+# -+# Erik Schanze , 2004-2007. -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex_1.21.1-2_de\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2007-08-06 20:50+0200\n" -+"Last-Translator: Erik Schanze \n" -+"Language-Team: German \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.11.4\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Soll Adjtimex nach der Installation und bei jedem Hochfahren gestartet " -+"werden?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"Adjtimex kann beim Hochfahren des Systems ablaufen, um die Zeitparameter im " -+"Kernel auf die Werte in /etc/defaults/adjtimex zu setzen. Stimmen Sie dem " -+"nicht zu, wenn Sie mit Adjtimex nur die aktuellen Parameter ermitteln wollen." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Soll »adjtimexconfig« zur Installation aufgerufen werden?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Das Skript »adjtimexconfig« nutzt Adjtimex, um die Werte der Kernelvariablen " -+"»tick« und »frequency« zu finden, damit die Systemuhr ungefähr mit der " -+"Rechneruhr (auch bekannt als CMOS-Uhr) übereinstimmt. Das Skript speichert " -+"diese Werte in der Konfigurationsdatei /etc/default/adjtimex, sodass die " -+"Einstellung bei jedem Systemstart wiederhergestellt wird, wenn /etc/init.d/" -+"adjtimex startet." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Das Skript benötigt 70 Sekunden, um durchzulaufen. Andererseits können Sie " -+"»adjtimexconfig« später selbst starten oder finden die Kernelvariablen auf " -+"einem anderen Weg (siehe Handbuchseite von Adjtimex) und speichern die Werte " -+"in der Datei /etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/vi.po -+++ adjtimex-1.23/debian/po/vi.po -@@ -0,0 +1,75 @@ -+# Vietnamese Translation for adjtimex. -+# Copyright © 2005 Free Software Foundation, Inc. -+# Clytie Siddall , 2005. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex 1.20-4\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2005-05-04 15:44+0930\n" -+"Last-Translator: Clytie Siddall \n" -+"Language-Team: Vietnamese \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=utf-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=1; plural=0\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Bạn có muốn chạy trình adjtimex khi cài đặt và má»i khi khởi Ä‘á»™ng không?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"Trình adjtimex (adjust time: Ä‘iá»u chỉnh thá»i gian) thì có thể chạy khi khởi " -+"Ä‘á»™ng hệ thống, để lập những tham số thá»i gian của hạt nhân thành những giá " -+"trị trong /etc/default/adjtimex. Äừng hiệu lá»±c tùy chá»n này nếu bạn chỉ muốn " -+"sá»­ dụng trình adjtimex để kiểm tra những tham số hiện thá»i." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Bạn có muốn chạy tập lệnh adjtimexconfig khi cài đặt không?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Tập lệnh adjtimexconfig (adjust time configuration: Ä‘iá»u chỉnh cấu hình thá»i " -+"gian) thì sẽ dùng trinh adjtimex để tìm giá trị cho biến hạt nhân «tick» và " -+"«frequency» để khá»›p đồng hồ hệ thống xấp xi vá»›i đồng hồ phần cứng (cÅ©ng được " -+"biết nhÆ° là đồng hồ CMOS). NhÆ° thế thì nó lÆ°u nhÆ°ng giá trị này trong tập " -+"tin cấu hình /etc/default/adjtimex vì vậy sẽ phục hồi cách thiết lập ấy má»i " -+"khi khởi Ä‘á»™ng, khi chạy /etc/init.d/adjtimex." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Tập lệnh này chạy được 70 giây. Hoặc bạn có thể tá»± chạy tập lệnh " -+"adjtimexconfig vào lúc sau, hoặc quyết định những biến hạt nhân má»™t của vài " -+"cách khác (hãy xem trang hÆ°á»›ng dẫn: lệnh\n" -+"man adjtimex\n" -+"mà «man» là trình hiển thị trang hÆ°á»›ng dẫn), và cài đặt chúng vào /etc/" -+"default/adjtimex." ---- adjtimex-1.23.orig/debian/po/cs.po -+++ adjtimex-1.23/debian/po/cs.po -@@ -0,0 +1,67 @@ -+# Czech translation of adjtimex templates -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex 1.20-3\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2005-4-10 22:13+0200\n" -+"Last-Translator: Martin Sin \n" -+"Language-Team: Czech \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=ISO-8859-2\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "Má být adjtimex spu¹tìn pøi instalaci a pøi ka¾dém spu¹tìní?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex mù¾e bì¾et pøi ka¾dém startu systému a nastavit parametry jádra na " -+"hodnoty z /etc/default/adjtimex. Pøi nesouhlasu bude adjtimex nastaven na " -+"zji¹tìní aktuálních parametrù." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Má být adjtimexconfig spu¹tìn pøi instalaci?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Skript adjtimexconfig pou¾ije adjtimex k nalezení hodnot pro promìnné " -+"èasovaèe a frekvence jádra tak, ¾e nastaví systémové hodiny pøibli¾nì na " -+"hodnotu hardwarových hodin (také známých jako CMOS hodiny). Pak ulo¾í tyto " -+"hodnoty do konfiguraèního souboru /etc/default/adjtimex aby mohlo být " -+"nastavení obnoveno pøi ka¾dém startu, v¾dy pøi spu¹tìní /etc/init.d/adjtimex." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Spu¹tìní skriptu zabere 70 sekund. Nebo mù¾ete spustit adjtimexconfig " -+"samostatnì pozdìji, pøípadnì urèit promìnné jádra jedním z nìkolika rùzných " -+"zpùsobù (podívejte se na manuálovou stránku adjtimex) a umístìte je do /etc/" -+"default/adjtimex." ---- adjtimex-1.23.orig/debian/po/pt.po -+++ adjtimex-1.23/debian/po/pt.po -@@ -0,0 +1,71 @@ -+# 2005-10-27 - Marco Ferra (initial translation) -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex 1.20-5\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2005-10-27 01:11+0100\n" -+"Last-Translator: Marco Ferra \n" -+"Language-Team: Portuguese \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "" -+"Deve o adjtimex correr enquanto o instala e depois sempre que o sistema " -+"inicia?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"O adjtimex pode correr quando o sistema inicia para ajustar os paramêtros " -+"temporais do kernel para os valores especificados em /etc/default/adjtimex. " -+"Por favor recuse se apenas deseja usar o adjtimex para inspecionar os " -+"paramêtros actuais." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Deve o adjtimexconfig correr enquanto o instala?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"O script adjtimexconfig irá usar o comando adjtimex para encontrar os " -+"valores para variáveis do kernel que o farão aproximar e estar de acordo com " -+"o relógio por hardware (tambem conhecido pelo CMOS clock). Este então " -+"guarda esses valores no ficheiro /etc/default/adjtimex para que estes " -+"paramêtros sejam reavidos sempre que o sistema inicia, nomeadamente quando " -+"o /etc/init.d/adjtimex corre." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Este script demora 70 segundos a correr. De forma alternativa pode correr o " -+"adjtimexconfig por si próprio numa altura mais tarde ou determinar as " -+"variáveis do kernel de outras formas (leia a página do manual do adjtimex) e " -+"instale-os em /etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/po/sv.po -+++ adjtimex-1.23/debian/po/sv.po -@@ -0,0 +1,77 @@ -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# Developers do not need to manually edit POT or PO files. -+# , fuzzy -+# -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: adjtimex 1.20-5\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2005-10-11 16:31+0200\n" -+"Last-Translator: Daniel Nylander \n" -+"Language-Team: Swedish \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=iso-8859-1\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "Ska adjtimex köras vid installation och vid varje uppstart?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex kan köra vid systemets uppstart för att sätta kärntidsparametrar " -+"till värdena i /etc/default/adjtimex. Acceptera inte om du bara vill använda " -+"adjtimex för att inspektera de nuvarande parametrarna." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Ska adjtimexconfig köras vid installationstid?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Skriptet adjtimexconfig kommer att använda adjtimex för att hitta värden för " -+"kärnvariablerna tick och frequency som gör att systemklockan kommer överens " -+"med hårdvaruklockan (också kallad CMOS-klockan). Den sparar sedan dessa " -+"värden i konfigurationsfilen /etc/default/adjtimex så att inställningarna " -+"kommer att användas vid varje uppstart, när /etc/init.d/adjtimex körs." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"Skriptet tar 70 sekunder att köras. Alternativt kan du köra adjtimexconfig " -+"själv vid en senare tid eller bestämma variabler för kärnan på ett eller " -+"flera sätt (se adjtimes manualsida) och installera dom i /etc/default/" -+"adjtimex)." ---- adjtimex-1.23.orig/debian/po/ru.po -+++ adjtimex-1.23/debian/po/ru.po -@@ -0,0 +1,80 @@ -+# translation of adjtimex_1.20-5_templates_ru.po to Russian -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -+# Developers do not need to manually edit POT or PO files. -+# Yuri Kozlov , 2005. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: template_adjtimex_1.20-5\n" -+"Report-Msgid-Bugs-To: jrv@debian.org\n" -+"POT-Creation-Date: 2007-08-06 21:41-0400\n" -+"PO-Revision-Date: 2005-11-07 19:24+0300\n" -+"Last-Translator: Yuri Kozlov \n" -+"Language-Team: Russian \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.9.1\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "Should adjtimex be run at installation and at every startup?" -+msgstr "Должен adjtimex быть запущен ÑÐµÐ¹Ñ‡Ð°Ñ Ð¸ каждый раз при Ñтарте ÑиÑтемы?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:1001 -+msgid "" -+"adjtimex can run at system startup to set the kernel time parameters to the " -+"values in /etc/default/adjtimex. Don't accept if you just want to use " -+"adjtimex to inspect the current parameters." -+msgstr "" -+"adjtimex можно запуÑкать при Ñтарте ÑиÑтемы Ð´Ð»Ñ ÑƒÑтановки значений " -+"параметров времени Ñдра из файла /etc/default/adjtimex. Ðе ÑоглашайтеÑÑŒ, " -+"еÑли проÑто хотите иÑпользовать adjtimex Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ текущих параметров." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should adjtimexconfig be run at installation time?" -+msgstr "Должен adjtimexconfig быть запущен ÑейчаÑ?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The adjtimexconfig script will use adjtimex to find values for the kernel " -+"variables tick and frequency that will make the system clock approximately " -+"agree with the hardware clock (also known as the CMOS clock). It then saves " -+"these values in the configuration file /etc/default/adjtimex so the settings " -+"will be restored on every boot, when /etc/init.d/adjtimex runs." -+msgstr "" -+"Сценарий adjtimexconfig иÑпользует adjtimex Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка значений переменных " -+"Ñдра импульÑа Ñигнала и чаÑтоты, которые помогают ÑоглаÑовывать ÑиÑтемные " -+"чаÑÑ‹ Ñ Ð°Ð¿Ð¿Ð°Ñ€Ð°Ñ‚Ð½Ñ‹Ð¼Ð¸ чаÑами (так называемые чаÑÑ‹ CMOS). Затем он ÑохранÑет Ñти " -+"Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð² конфигурационный файл /etc/default/adjtimex, Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾ чтобы " -+"воÑÑтанавливать их при каждой загрузке Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ /etc/init.d/" -+"adjtimex." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " -+"yourself at a later time, or determine the kernel variables one of several " -+"other ways (see the adjtimex man page) and install them in /etc/default/" -+"adjtimex." -+msgstr "" -+"ДлительноÑÑ‚ÑŒ работы ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ -- 70 Ñекунд. Ð’ качеÑтве альтернативы вы можете " -+"запуÑтить adjtimexconfig вручную позже, или определить переменные Ñдра одним " -+"из неÑкольких других ÑпоÑобов (Ñмотрите Ñтраницу руководÑтва по adjtimex) и " -+"Ñохранить их в файл /etc/default/adjtimex." ---- adjtimex-1.23.orig/debian/README.Debian -+++ adjtimex-1.23/debian/README.Debian -@@ -0,0 +1,21 @@ -+adjtimex for DEBIAN -+---------------------- -+ -+This is the Debian Linux prepackaged version of adjtimex. -+ -+This package was put together by Jim Van Zandt , -+who also maintains the program and therefore used the master sources. -+ -+further Information: -+ -+* adjtimex manpage -+* copying policy -+ /usr/share/doc/adjtimex/copyright -+ (or debian/copyright in the source package) -+* changelog for debian package -+ /usr/share/doc/adjtimex/changelog.Debian -+* adjtimex's README: -+ /usr/share/doc/adjtimex/README -+ -+ -+James R. Van Zandt , Sun, 7 Mar 1999 21:58:51 -0500 ---- adjtimex-1.23.orig/debian/templates -+++ adjtimex-1.23/debian/templates -@@ -0,0 +1,22 @@ -+Template: adjtimex/run_daemon -+Type: boolean -+Default: true -+_Description: Should adjtimex be run at installation and at every startup? -+ adjtimex can run at system startup to set the kernel time parameters to -+ the values in /etc/default/adjtimex. Don't accept if you just want to -+ use adjtimex to inspect the current parameters. -+ -+Template: adjtimex/compare_rtc -+Type: boolean -+Default: true -+_Description: Should adjtimexconfig be run at installation time? -+ The adjtimexconfig script will use adjtimex to find values for the kernel -+ variables tick and frequency that will make the system clock approximately -+ agree with the hardware clock (also known as the CMOS clock). It then -+ saves these values in the configuration file /etc/default/adjtimex so the -+ settings will be restored on every boot, when /etc/init.d/adjtimex runs. -+ . -+ The script takes 70 sec to run. Alternatively, you can run adjtimexconfig -+ yourself at a later time, or determine the kernel variables one of several -+ other ways (see the adjtimex man page) and install them in -+ /etc/default/adjtimex. ---- adjtimex-1.23.orig/debian/changelog -+++ adjtimex-1.23/debian/changelog -@@ -0,0 +1,530 @@ -+adjtimex (1.23-1) unstable; urgency=low -+ -+ * New upstream release -+ -+ * adjtimex.c (compare): In case of absence of /etc/adjtime, do not fail, -+ and do not force users to manually create it with 0.0 -+ content. Instead, proceed assuming zero values (meaning RTC does not -+ drift). Also replace redundant code by a call to -+ get_cmos_adjustment(). README: Rewrite USAGE paragraph. Remove point -+ about creating zero adjfile. Document new behaviour without -+ adjfile. Remove reference to the long outdated clock(8). Update URL -+ for hwclock(8). (Thanks to Alain Guibert , -+ closes:bug#445448) -+ -+ * adjtimex.c (busy_wait): timestamp more closely the RTC clock beat -+ (thanks to Alain Guibert , see Debian -+ bug#443814). (usage): --directisa switch forces adjtimex to poll the -+ update-in-process (UIP) flag of the CMOS clock (thanks to Alain -+ Guibert , closes:bug#443773). -+ -+ -- James R. Van Zandt Sat, 06 Oct 2007 21:57:04 -0400 -+ -+adjtimex (1.22-1) unstable; urgency=low -+ -+ * New upstream release: fix these bugs in ntpdate output -+ interpretation (closes:bug#438718): -+ adjtimex has a bug in evaluating the output of ntpdate, because -+ 1. it assumes ntpdate outputs "adjust time server", but ntpdate -+ may output "step time server" also -+ 2. it doesnt stop at last line but as soon as it has found "filter -+ offset:" lines, and because of this it will not find the "offset ..." -+ information in the last line. -+ -+ -- James R. Van Zandt Sun, 23 Sep 2007 12:51:52 -0400 -+ -+adjtimex (1.21.1-3) unstable; urgency=low -+ -+ * update German translation of debconf templates, thanks to Erik Schanze -+ and Helge Kreutzmann -+ (closes:#436080) -+ -+ * debian/rules don't ignore failure of "make distclean" -+ -+ * debian/adjtimex.init: make LSB compliant -+ -+ -- James R. Van Zandt Mon, 06 Aug 2007 21:39:47 -0400 -+ -+adjtimex (1.21.1-2) unstable; urgency=low -+ -+ * Update French translation of debconf templates, thanks to Christian -+ Perrier (closes:Bug#403472) -+ -+ -- James R. Van Zandt Sun, 7 Jan 2007 18:10:32 -0500 -+ -+adjtimex (1.21.1-1) unstable; urgency=low -+ -+ * New upstream release. -+ -+ * adjtimex.c: don't declare adjtimex syscall (should already be getting -+ the declaration from sys/timex.h) Thanks to Andreas Jochens -+ (closes:#390989) -+ -+ -- James R. Van Zandt Sat, 7 Oct 2006 08:04:52 -0400 -+ -+adjtimex (1.21-2) unstable; urgency=low -+ -+ * Makefile: correct version number to 1.21 (error in importing upstream -+ sources) -+ -+ * debian/control: depend on po-debconf -+ -+ -- James R. Van Zandt Fri, 6 Oct 2006 20:41:00 -0400 -+ -+adjtimex (1.21-1) unstable; urgency=low -+ -+ * New upstream release. use /dev/rtc if available (closes:#196692). Use -+ heuristic to correct for DST changes or lacking --utc flag -+ (closes:#308396). check return code in probe_time() so if root -+ privileges are needed (e.g. "adjtimex -r") and lacking, command will -+ fail rather than printing bogus results. (closes:#364060) -+ -+ * debian/postinst: start with invoke-rc.d if available (closes:#367746) -+ -+ * debian/control: update to policy 3.7.2 -+ -+ -- James R. Van Zandt Sat, 20 May 2006 08:33:05 -0400 -+ -+adjtimex (1.20-7) unstable; urgency=low -+ -+ * debian/README.Debian: correct references to files, which are no longer -+ in /usr/doc/adjtimex (closes:#365761) -+ * debian/rules: declare debhelper compat level 5 -+ * debian/control: build-depends on debhelper ver 5 -+ -+ -- James R. Van Zandt Thu, 4 May 2006 21:54:33 -0400 -+ -+adjtimex (1.20-6) unstable; urgency=low -+ -+ * control: depend on debconf | debconf-2.0 (closes: #331733), update to -+ policy 3.6.2 -+ * debian/po/de.po: fix spelling error in German translation, thanks to -+ Philipp Meier (closes: #279254) -+ * debian/po/sv.po: Swedish translation for debconf template, courtesy -+ of Daniel Nylander (closes: #333124) -+ * debian/po: Add Portugese translation for debconf template, courtesy of -+ Miguel Figueiredo (closes: #336333) -+ * debian/po: Add Russian translation for debconf template, courtesy of -+ Yuri Kozlov (closes: #337967) -+ * debian/copyright: update FSF address. -+ -+ -- James R. Van Zandt Fri, 25 Nov 2005 21:04:08 -0500 -+ -+adjtimex (1.20-5) unstable; urgency=low -+ -+ * debian/po/vi.po: Vietnamese translation for debconf template, courtesy -+ of Clytie Siddall (closes:Bug#307600) -+ -+ -- James R. Van Zandt Sat, 7 May 2005 11:58:47 -0400 -+ -+adjtimex (1.20-4) unstable; urgency=low -+ -+ * debian/po/cs.po: Czech translation for debconf template, courtesy of -+ Martin Šín (closes:Bug#304377) -+ -+ -- James R. Van Zandt Mon, 25 Apr 2005 20:14:42 -0400 -+ -+adjtimex (1.20-3) unstable; urgency=low -+ -+ * debian/adjtimex.init: adjust printout to conform to Debian standard, -+ output error to stderr (Thanks to Thomas Hood, closes:bug#294824) -+ -+ -- James R. Van Zandt Sun, 13 Mar 2005 17:20:28 -0500 -+ -+adjtimex (1.20-2) unstable; urgency=low -+ -+ * debian/po/de.po: replace corrupted file (closes: #250250) -+ -+ -- James R. Van Zandt Mon, 20 Sep 2004 20:08:47 -0400 -+ -+adjtimex (1.20-1) unstable; urgency=low -+ -+ * New upstream release -+ -+ * adjtimex.c (compare): in "compare" or "adjust", return immediately -+ after printing last result, instead of sleeping an extra $interval -+ seconds. (Thanks to Alain Guibert , -+ closes:Bug#243652) -+ -+ * postinst: remove /etc/rcS.d/S20adjtimex link if configured not to run -+ at startup (thanks to Mario 'BitKoenig' Holbe, closes:Bug#267229) -+ -+ -- James R. Van Zandt Sun, 19 Sep 2004 12:41:37 -0400 -+ -+adjtimex (1.19-1) unstable; urgency=high -+ -+ * copyright: report upstream source address (closes:Bug#269691) -+ -+ * control: don't depend on either mawk or awk, since either works and -+ awk is required (closes:Bug#267228) -+ -+ * New upstream release -+ -+ * adjtimex.c (compare): Account for the current frequency value -+ when calculating the recommended frequency value. Simplify -+ calculation of recommended tick. (compare): print estimated system -+ error in ppm instead of obscure "second diff". -+ -+ * adjtimex.8: use 2^16 instead of the more obscure 1<<16. -+ -+ * adjtimex.c: revert to poll-wait instead of using /dev/rtc, because the -+ latter only provides time with one second precision and so gives -+ wildly inaccurate adjustments. (closes:Bug#269498,Bug#265839) -+ -+ -- James R. Van Zandt Sat, 11 Sep 2004 16:01:52 -0400 -+ -+adjtimex (1.18-1.1) unstable; urgency=medium -+ -+ * Non-maintainer upload prepared by Joshua Kwan and Ken Bloom. -+ * Applied patch from Jurij Smakov to #263401: -+ - Fixes the regular expression used to extract the baseline value -+ from the adjtimex output. Closes: #263401 -+ - Replaces non-POSIX compliant calls to ('tail -1') by the -+ POSIX-compliant ones ('tail -n 1') -+ - Cosmetic changes to the adjtimexconfig output, making it -+ consistent with the general Debian style. -+ * Add German debconf template translations (closes: #250250) -+ -+ -- Ken Bloom Thu, 12 Aug 2004 23:34:33 -0700 -+ -+adjtimex (1.18-1) unstable; urgency=low -+ -+ * New upstream release -+ -+ * call reset_time_status() only when explicitly told to (thanks to Alain -+ Guibert , closes:bug#243031) -+ -+ * Add debconf translations for Japanese (closes:bug#223462), Danish -+ (closes:bug#239865), and Brazilian Portuguese (closes:bug#228281). -+ -+ -- James R. Van Zandt Sun, 11 Apr 2004 18:32:33 -0400 -+ -+adjtimex (1.17-1) unstable; urgency=low -+ -+ * New upstream release -+ -+ * control: compliant with Debian policy version 3.6.1 -+ -+ * es.po: decode "quoted-printable" encoding. -+ -+ * adjtimex.c: update email -+ (main): If adjtimex() returns an error, print HZ and legal ranges -+ for tick and freq. (thanks to Sami Farin ) -+ (review): calculate reasonable tick and frequency when HZ != 100. -+ (cmos_init): use /dev/rtc when available (thanks to Richard -+ Henderson ). -+ -+ * adjtimex.c: --status switch sets clock status (courtesy of Alain -+ Guibert ) (closes:bug#242732) -+ -+ * adjtimexconfig: set reasonable tick and frequency when HZ != -+ 100. (closes:Bug#241726) -+ -+ * adjtimex.c (longopt): fix spelling to match documentation: --esterror -+ and --maxerror (thanks to Alain Guibert) (fixes:Bug#241863) -+ -+ -- James R. Van Zandt Sat, 3 Apr 2004 21:13:09 -0500 -+ -+adjtimex (1.16-3) unstable; urgency=low -+ -+ * Dutch translation of gettext debconf templates (courtesy of Michiel Sikkes, closes:bug#215162) -+ -+ -- James R. Van Zandt Sun, 12 Oct 2003 17:33:55 -0400 -+ -+adjtimex (1.16-2) unstable; urgency=low -+ -+ * Polish translation of gettext debconf templates (courtesy of Bartosz -+ Zapalowski, closes:bug#208955) -+ -+ -- James R. Van Zandt Sun, 7 Sep 2003 16:26:30 -0400 -+ -+adjtimex (1.16-1) unstable; urgency=low -+ -+ * New upstream release (closes:Bug#204382)(closes:Bug#204377) -+ -+ -- James R. Van Zandt Sun, 24 Aug 2003 20:52:32 -0400 -+ -+adjtimex (1.15.1-2) unstable; urgency=low -+ -+ * gettext-based debconf templates (closes:bug#205788) -+ * French translation of gettext debconf templates (closes:Bug#206430) -+ * Spanish translation of gettext debconf templates (closes:Bug#197485) -+ -+ -- James R. Van Zandt Sun, 24 Aug 2003 18:01:56 -0400 -+ -+adjtimex (1.15.1-1) unstable; urgency=low -+ -+ * New upstream release. Add explicit newlines in multi-line help text -+ (closes:bug#194858) -+ -+ -- James R. Van Zandt Sat, 31 May 2003 20:53:14 -0400 -+ -+adjtimex (1.15-1) unstable; urgency=low -+ -+ * New upstream release. Now compiles on ia64 (closes:bug#141655). -+ -+ -- James R. Van Zandt Wed, 30 Apr 2003 19:38:11 -0400 -+ -+adjtimex (1.14-1) unstable; urgency=low -+ -+ * New Upstream Release. Expanded documentation (closes:bug#142967) -+ * convert to debhelper -+ * debian/control: depend on debconf -+ * debian/postinst: configure adjtimex to run on startup, and run -+ adjtimexconfig on installation, only if asked by sysadmin (via -+ debconf) (closes:bug#158047) -+ * debian/postrm: purge debconf db entry -+ * debian/adjtimexconfig: config file is now /etc/default/adjtimex -+ -+ -- James R. Van Zandt Sun, 27 Apr 2003 21:28:40 -0400 -+ -+adjtimex (1.13-1) unstable; urgency=low -+ -+ * New upstream release (closes:Bug#127483) -+ -+ -- James R. Van Zandt Sun, 6 Jan 2002 21:06:23 -0500 -+ -+adjtimex (1.12-3) unstable; urgency=low -+ -+ * New maintainer email (fix remaining references) -+ -+ -- James R. Van Zandt Sun, 9 Dec 2001 15:25:06 -0500 -+ -+adjtimex (1.12-2) unstable; urgency=low -+ -+ * New maintainer email -+ -+ -- James R. Van Zandt Sun, 9 Dec 2001 13:24:59 -0500 -+ -+adjtimex (1.12-1) unstable; urgency=low -+ -+ * New upstream release -+ * debian/control: move Build-Depends entry to source section -+ (closes:bug#91928). Policy version 3.5.2 -+ * debian/rules: by default, compile without -g option. Honor -+ DEB_BUILD_OPTIONS. -+ -+ -- James R. Van Zandt Wed, 22 Nov 2000 01:37:58 -0500 -+ -+adjtimex (1.11-3) unstable; urgency=low -+ -+ * adjtimexconfig: install new values in /etc/adjtimex.conf rather than -+ the startup script /etc/init.d/adjtimex (thanks to Zsolt Szabo -+ ). -+ -+ -- James R. Van Zandt Sat, 30 Sep 2000 09:34:58 -0400 -+ -+adjtimex (1.11-2) unstable; urgency=low -+ -+ * build-depends on debmake -+ -+ -- James R. Van Zandt Sun, 3 Sep 2000 13:50:02 -0400 -+ -+adjtimex (1.11-1) unstable; urgency=low -+ -+ * /etc/init.d/adjtimex: restart|force-reload also run adjtimex -+ (closes:bug#69514), add comment explaining precedence of -+ /etc/adjtimex.conf -+ -+ * New upstream release -+ -+ -- James R. Van Zandt Mon, 28 Aug 2000 21:19:48 -0400 -+ -+adjtimex (1.10-1) frozen unstable; urgency=high -+ -+ * New upstream release - security fix: use popen() to recover output from -+ ntpdate, instead of an unsafe temporary file (thanks to Colin Phipps -+ ) (closes:bug#56752) -+ -+ -- James R. Van Zandt Tue, 1 Feb 2000 21:29:03 -0500 -+ -+adjtimex (1.9-2) unstable; urgency=low -+ -+ * Suggest ntpdate (closes:bug#56751) -+ -+ -- James R. Van Zandt Mon, 31 Jan 2000 19:26:16 -0500 -+ -+adjtimex (1.9-1) unstable; urgency=low -+ -+ * New upstream release -+ * Removed pointer to /usr/doc/copyright/GPL -+ -+ -- James R. Van Zandt Mon, 3 Jan 2000 21:34:59 -0500 -+ -+adjtimex (1.8.1-1) unstable; urgency=low -+ -+ * New upstream release (closes:bug#52637) -+ -+ -- James R. Van Zandt Thu, 16 Dec 1999 20:13:43 -0500 -+ -+adjtimex (1.8-4) unstable; urgency=low -+ -+ * Change references from /usr/sbin/adjtimex to /sbin/adjtimex in -+ adjtimexconfig -+ -+ -- James R. Van Zandt Tue, 2 Nov 1999 20:21:48 -0500 -+ -+adjtimex (1.8-3) unstable; urgency=low -+ -+ * *Really* install binary into /sbin, so it is available -+ even if /usr is not mounted (closes:Bug#44399) -+ -+ -- James R. Van Zandt Sat, 30 Oct 1999 17:57:57 -0400 -+ -+adjtimex (1.8-2) unstable; urgency=low -+ -+ * Install compatibility symlink /usr/doc/adjtimex. -+ -+ -- James R. Van Zandt Sun, 24 Oct 1999 10:54:01 -0400 -+ -+adjtimex (1.8-1) unstable; urgency=low -+ -+ * New upstream release: Install binary into /sbin, so it is available -+ even if /usr is not mounted (closes:Bug#44399) -+ -+ -- James R. Van Zandt Mon, 6 Sep 1999 13:08:15 -0400 -+ -+adjtimex (1.7-2) unstable; urgency=low -+ -+ * Link against glibc2.1 -+ * Upgrade to FHS -+ * Include full license statement in copyright file -+ * Revise GPL reference in copyright file -+ -+ -- James R. Van Zandt Sat, 4 Sep 1999 12:04:34 -0400 -+ -+adjtimex (1.7-1) unstable; urgency=low -+ -+ * install configuration file in /etc/init.d rather than /etc/rc.boot -+ closes: #30120, #32436. -+ * New upstream release (incorporates Paul Slootman's alpha patch) -+ -+ -- James R. Van Zandt Sat, 28 Nov 1998 20:33:38 -0500 -+ -+adjtimex (1.6-2) unstable; urgency=low -+ -+ * corrected reference in man page: clock -> hwclock (Bug#27854) -+ -+ -- James R. Van Zandt Sat, 24 Oct 1998 14:40:45 -0400 -+ -+adjtimex (1.6-1.1) unstable; urgency=low -+ -+ * non-maintainer (binary-only) upload for Alpha -+ * changed architecture back to 'any'. Why should it be i386 only? -+ * don't use syscall1() to declare adjtimex() for Alpha -+ -+ -- Paul Slootman Tue, 8 Sep 1998 20:42:52 +0200 -+ -+adjtimex (1.6-1) unstable; urgency=low -+ -+ * New upstream release: Default log file is "/var/log/clocks.log". -+ Create log file if it does not exist. (Bug#25834) -+ -+ -- James R. Van Zandt Sat, 22 Aug 1998 20:33:22 -0400 -+ -+adjtimex (1.5-3) unstable; urgency=low -+ -+ * architecture is i386 only -+ -+ -- James R. Van Zandt Mon, 29 Jun 1998 19:35:22 -0400 -+ -+adjtimex (1.5-2) unstable; urgency=low -+ -+ * eliminate question in postinst, by eliminating postinst entirely -+ (Bug#22288) -+ -+ -- James R. Van Zandt Sun, 7 Jun 1998 20:51:42 -0400 -+ -+adjtimex (1.5-1) frozen unstable; urgency=low -+ -+ * New upstream release. No functional changes, but adjtimex is now -+ covered by the GNU GPL. (Bug#21358) -+ -+ -- James R. Van Zandt Mon, 20 Apr 1998 21:38:53 -0400 -+ -+adjtimex (1.4-2) unstable; urgency=low -+ -+ * Ensure that changelog is compressed *before* calculating md5sum -+ (Bug#19266) -+ -+ -- James R. Van Zandt Sat, 14 Mar 1998 20:47:52 -0500 -+ -+adjtimex (1.4-1) unstable; urgency=low -+ -+ * New upstream release. Log times for long-term estimation of drifts. -+ -+ -- James R. Van Zandt Thu, 11 Dec 1997 21:48:01 -0500 -+ -+adjtimex (1.3-3) stable; urgency=medium -+ -+ * Moved temporary files from /tmp to /etc, to eliminate security -+ hole (bug #11610). -+ -+ -- Jim Van Zandt Sun, 3 Aug 1997 11:34:48 -0400 -+ -+adjtimex (1.3-2) stable; urgency=medium -+ -+ * Removed conflict with xntp, since ntpdate from the xntp package -+ is still compatible with adjtimex. -+ -+ -- Jim Van Zandt Wed, 12 Mar 1997 21:01:05 -0500 -+ -+adjtimex (1.3-1) unstable; urgency=HIGH -+ -+ * New upstream version: Previous version allows 2.0 kernel to reset -+ the CMOS clock periodically. Now using different method of -+ preventing this. -+ * New --compare switch to compare system and CMOS clocks (replacing -+ the separate program clockdiff) and suggest better values of time -+ parameters. New --adjust switch to actually install the suggested -+ values. GNU format long switches, including --help and --version. -+ * Revised conftimex to use --adjust switch instead of clockdiff. -+ * Renamed conftimex to adjtimexconfig per Debian recommendation. -+ * Added conftimex man page. -+ * Revised messages in postinst to better explain what is going on. -+ * Conflicts with xntp -+ * New maintainer -+ -+ -- Jim Van Zandt Sat, 1 Mar 1997 18:03:35 -0500 -+ -+adjtimex (1.2-5) unstable; urgency=LOW -+ -+ * New packaging format -+ * Corrected comment in /etc/rc.boot/adjtimex -+ * Corrected the installation of doc files -+ -+ -- Michael Meskes Wed, 18 Sep 1996 09:22:51 +0200 -+ -+Fri May 17 12:48:07 MET DST 1996 Michael Meskes (meskes@debian.org) -+ -+ adjtimex (1.2-1): -+ -+ * Added Debian Linux package maintenance system files. -+ -+Fri May 17 20:39:30 MET DST 1996 Michael Meskes (meskes@debian.org) -+ -+ adjtimex (1.2-2): -+ -+ * Corrected mode for /etc/rc.boot/adjtimex -+ -+ * Added conftimex script -+ -+ * Automatically configure system -+ -+Sun Jun 30 13:17:53 MET DST 1996 Michael Meskes (meskes@debian.org) -+ -+ adjtimex (1.2-3): -+ -+ * Corrected rules file for new naming scheme -+ -+ * Gzip manpage -+ -+ * Strip binaries -+ -+Tue Jul 2 10:01:35 MET DST 1996 Michael Meskes (meskes@debian.org) -+ -+ adjtimex (1.2-4): -+ -+ * Really say what we're doing in postinst (Bug#3474) -+ -+ ---- adjtimex-1.23.orig/debian/dirs -+++ adjtimex-1.23/debian/dirs -@@ -0,0 +1,4 @@ -+usr/bin -+usr/sbin -+sbin -+usr/share/man/man8 ---- adjtimex-1.23.orig/debian/postrm -+++ adjtimex-1.23/debian/postrm -@@ -0,0 +1,25 @@ -+#! /bin/sh -e -+ -+case "$1" in -+ purge) -+ rm -f /etc/adjtimex.conf /etc/default/adjtimex -+ update-rc.d adjtimex remove >/dev/null -+ if [ -e /usr/share/debconf/confmodule ]; then -+ # Source debconf library. -+ . /usr/share/debconf/confmodule -+ # Remove my changes to the db. -+echo "removing debconf db entries" -+ db_purge -+echo "removed debconf db entries" -+ fi -+ ;; -+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) -+ exit 0 -+ ;; -+ *) -+ echo "postrm called with unknown argument \`$1'" >&2 -+ exit 0 -+ ;; -+esac -+ -+#DEBHELPER# ---- adjtimex-1.23.orig/debian/copyright -+++ adjtimex-1.23/debian/copyright -@@ -0,0 +1,28 @@ -+This package was debianized by James R. Van Zandt jrv@debian.org on -+Thu, 11 Dec 1997 21:48:01 -0500. -+ -+This package was put together by Jim Van Zandt , -+who also maintains the program and therefore used the master sources. -+ -+Copyright: -+ -+adjtimex is Copyright (C) 1997 Steven S. Dick and James R. Van Zandt -+ -+ 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; version 2 dated June, -+ 1991, or 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 St, Fifth Floor, Boston, MA -+ 02110-1301, USA. -+ -+On Debian GNU/Linux systems, the complete text of the GNU Public -+License can be found in `/usr/share/common-licenses/' -+ ---- adjtimex-1.23.orig/debian/rules -+++ adjtimex-1.23/debian/rules -@@ -0,0 +1,113 @@ -+#!/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) -+ -+ -+package=adjtimex -+ -+CFLAGS = -Wall -g -+INSTALL = install -+INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 -+INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 -+INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755 -+INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 -+ -+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -+CFLAGS += -O0 -+else -+CFLAGS += -O2 -+endif -+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -+INSTALL_PROGRAM += -s -+endif -+ -+ -+config.status: configure -+ dh_testdir -+ # 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 -+ -+ # compile the package. -+ $(MAKE) CFLAGS="$(CFLAGS)" -+ #/usr/bin/docbook-to-man debian/adjtimex.sgml > adjtimex.1 -+ -+ touch build-stamp -+ -+clean: -+ dh_testdir -+ dh_testroot -+ rm -f build-stamp -+ -+ # clean up after the build process. -+ debconf-updatepo -+ [ ! -f Makefile ] || $(MAKE) veryclean -+ rm -rf adjtimex *.o config.* -+ -test -r /usr/share/misc/config.sub && \ -+ cp -f /usr/share/misc/config.sub config.sub -+ -test -r /usr/share/misc/config.guess && \ -+ cp -f /usr/share/misc/config.guess config.guess -+ -+ -+ dh_clean -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ -+ # install the package into debian/$(package). -+ $(INSTALL_PROGRAM) adjtimex $(CURDIR)/debian/$(package)/sbin -+ $(INSTALL_SCRIPT) debian/adjtimexconfig \ -+ $(CURDIR)/debian/$(package)/usr/sbin/adjtimexconfig -+ -+# Build architecture-independent files here. -+binary-indep: build install -+# We have nothing to do -+ -+# Build architecture-dependent files here. -+binary-arch: build install -+ dh_testdir -+ dh_testroot -+ dh_installdebconf -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+# dh_installlogrotate -+# dh_installemacsen -+# dh_installpam -+# dh_installmime -+ dh_installinit -n -+ dh_installcron -+ dh_installman adjtimex.8 debian/adjtimexconfig.8 -+ dh_installinfo -+# dh_undocumented -+ dh_installchangelogs ChangeLog -+ dh_link -+ dh_strip -+ dh_compress -+ dh_fixperms -+# dh_makeshlibs -+ dh_installdeb -+# dh_perl -+ dh_shlibdeps -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install ---- adjtimex-1.23.orig/debian/docs -+++ adjtimex-1.23/debian/docs -@@ -0,0 +1,2 @@ -+README -+README.ru ---- adjtimex-1.23.orig/debian/adjtimexconfig -+++ adjtimex-1.23/debian/adjtimexconfig -@@ -0,0 +1,67 @@ -+#!/bin/sh -+ -+conffile=/etc/default/adjtimex -+startfile=/etc/init.d/adjtimex -+ -+echo -n "Comparing clocks (this will take 70 sec)..." -+ -+# Get the parameters -+ -+/sbin/adjtimex --print --tick 0 >/etc/adj.adjust 2>/dev/null -+baseline=`awk '/<= tick/{print ($1+$NF)/2}' /etc/adj.adjust` -+hz=`awk '/USER_HZ/{print $3}' /etc/adj.adjust` -+/sbin/adjtimex --tick $baseline --frequency 0 -+/sbin/adjtimex --adjust >/etc/adj.adjust -+echo "done." -+ticks=`tail -n 1 /etc/adj.adjust|awk '{print $6}'` -+freq=`tail -n 1 /etc/adj.adjust|awk '{print $7}'` -+# cat /etc/adj.adjust -+# echo hz=$hz baseline=$baseline ticks=$ticks freq=$freq -+rm /etc/adj.adjust -+adjt=`awk "BEGIN{print (($ticks-$baseline)*$hz + $freq/65536.)*.0864}"` -+echo -n "Adjusting system time by ${adjt} sec/day to agree with CMOS clock..." -+ -+# Recreate /etc/adjtimex.conf if necessary -+ -+if [ -f $conffile ]; then -+# echo "using existing $conffile"; -+ true; -+else -+cat >$conffile <$conffile.TMP && \ -+ mv $conffile.TMP $conffile -+ -+# grep "TICK=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.tick -+# grep "FREQ=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.freq -+# -+# TICKLINE="`echo -n "TICK="$ticks" # old: "; cat /etc/adj.tick`" -+# FREQLINE="`echo -n "FREQ="$freq" # old: "; cat /etc/adj.freq`" -+# -+# cp /etc/init.d/adjtimex /etc/init.d/adjtimex.TMP -+# sed -e "s/^TICK=.*/$TICKLINE/" -e "s/^FREQ=.*/$FREQLINE/" \ -+# < /etc/init.d/adjtimex.TMP > /etc/init.d/adjtimex -+# -+# if [ -s /etc/init.d/adjtimex ] -+# then -+# rm -f /etc/init.d/adjtimex.TMP -+# fi -+# rm -f /etc/adj.tick /etc/adj.freq /etc/adj.adjust -+rm -f /etc/adj.adjust -+echo "done." -+ ---- adjtimex-1.23.orig/debian/adjtimexconfig.8 -+++ adjtimex-1.23/debian/adjtimexconfig.8 -@@ -0,0 +1,41 @@ -+.\"{{{ Title Emacs major mode should be: -*- nroff -*- -+.TH ADJTIMEXCONFIG 8 "April 27, 2003" -+.\"}}} -+.\"{{{ Name -+.SH NAME -+adjtimexconfig \- find kernel clock variables and save for reboots -+.\"}}} -+.\"{{{ Synopsis -+.SH SYNOPSIS -+.ad l -+.\" commands only -+.B /sbin/adjtimexconfig -+.\"}}} -+.\"{{{ Config -+.SH DESCRIPTION -+This script uses \fBadjtimex\fP(8) to find values for the kernel -+variables \fBtick\fP and \fBfrequency\fP that will make the system -+clock approximately agree with the CMOS clock. It then saves these -+values in the configuration file \fI/etc/default/adjtimex\fP so the -+settings will be restored on every boot, when -+\fI/etc/init.d/adjtimex\fP runs. -+.P -+\fPadjtimexconfig\fP uses the drift rate recorded in -+\fI/etc/adjtime\fP to adjust the times it reads from the CMOS clock. -+If you find the CMOS clock has a systematic drift, read the -+\fBclock\fP(8) or \fBhwclock\fP(8) manual page, modify -+\fI/etc/adjtime\fP as required, and run \fBadjtimexconfig\fP again. -+.SH AUTHOR -+Michael Meskes . -+.\"}}} -+.\"{{{ -+.SH FILES -+.nf -+\fI/etc/default/adjtimex\fP -+\fI/etc/init.d/adjtimex\fP -+.fi -+.\"}}} -+.\"{{{ See also -+.SH "SEE ALSO" -+.BR adjtimex "(8), "clock "(8), "hwclock "(8), "ntpd (8) -+.\"}}} ---- adjtimex-1.23.orig/debian/config -+++ adjtimex-1.23/debian/config -@@ -0,0 +1,8 @@ -+#! /bin/sh -e -+ -+# Source debconf library. -+. /usr/share/debconf/confmodule -+ -+db_input medium adjtimex/run_daemon || true -+db_input medium adjtimex/compare_rtc || true -+db_go ---- adjtimex-1.23.orig/debian/postinst -+++ adjtimex-1.23/debian/postinst -@@ -0,0 +1,119 @@ -+#! /bin/sh -+ -+set -e -+ -+# Source debconf library. -+. /usr/share/debconf/confmodule -+ -+# old scripts -+oldfile=/etc/adjtimex.conf -+olderfile=/etc/rc.boot/adjtimex -+# new starting script -+startfile=/etc/init.d/adjtimex -+# new configuration file -+conffile=/etc/default/adjtimex -+ -+create_adjtimex_conf() -+{ -+ -+ TICK=10000 -+ FREQ=0 -+ -+ if [ -f $oldfile ]; then -+ TICK=`awk ' -+ BEGIN{tick=10000;} -+ /[ \t]*TICK[ \t]*=[ \t]*"?[0-9]+"?/ { -+ sub(/[ \t]*TICK[ \t]*=[ \t]*"?/,""); -+ tick=$0+0; -+ } -+ END {print tick;} -+ ' $oldfile` -+ -+ FREQ=`awk ' -+ BEGIN{freq=0;} -+ /[ \t]*FREQ[ \t]*=[ \t]*"?[0-9]+"?/ { -+ sub(/[ \t]*FREQ[ \t]*=[ \t]*"?/,""); -+ freq=$0+0; -+ } -+ END {print freq;} -+ ' $oldfile` -+ -+# echo "parameters from $oldfile: TICK=$TICK FREQ=$FREQ"; -+ else -+ if [ -f $olderfile ]; then -+ TICK=`awk ' -+ BEGIN{tick=10000;} -+ /[ \t]*TICK[ \t]*=[ \t]*"?[0-9]+"?/ { -+ sub(/[ \t]*TICK[ \t]*=[ \t]*"?/,""); -+ tick=$0+0; -+ } -+ END {print tick;} -+ ' $olderfile` -+ -+ FREQ=`awk ' -+ BEGIN{freq=0;} -+ /[ \t]*FREQ[ \t]*=[ \t]*"?[0-9]+"?/ { -+ sub(/[ \t]*FREQ[ \t]*=[ \t]*"?/,""); -+ freq=$0+0; -+ } -+ END {print freq;} -+ ' $olderfile` -+ -+# echo "parameters from $olderfile: TICK=$TICK FREQ=$FREQ"; -+ fi -+ fi -+ -+ if [ -f $conffile ]; then -+# echo "using existing $conffile"; -+ true; -+ else -+ if [ -d /etc/default ]; then true; else mkdir /etc/default; fi -+ cat >$conffile </dev/null -+ -+ if which invoke-rc.d >/dev/null 2>&1; then -+ invoke-rc.d adjtimex start -+ else -+ /etc/init.d/adjtimex start -+ fi -+ fi -+ -+ db_get adjtimex/compare_rtc -+ if [ "$RET" = "true" ]; then -+ /usr/sbin/adjtimexconfig -+ fi -+ -+ ;; -+ abort-upgrade|abort-remove|abort-deconfigure) -+ exit 0 -+ ;; -+ *) -+ echo "postinst called with unknown argument \`$1'" >&2 -+ exit 0 -+ ;; -+esac -+ -+#DEBHELPER# ---- adjtimex-1.23.orig/debian/adjtimex.init -+++ adjtimex-1.23/debian/adjtimex.init -@@ -0,0 +1,45 @@ -+#!/bin/sh -+# -+# Run ADJTIMEX at startup. -+ -+### BEGIN INIT INFO -+# Provides: adjtimex -+# Required-Start: -+# Required-Stop: -+# Should-Start: -+# Should-Stop: -+# Default-Start: 2 3 4 5 -+# Default-Stop: 0 1 6 -+# Short-Description: set the kernel time variables -+# Description: set the kernel time variables -+### END INIT INFO -+ -+test -x /sbin/adjtimex || exit 0 -+ -+# default values -+TICK=10000 -+FREQ=0 -+ -+# values in $cfg take precedence over the values here -+cfg=/etc/default/adjtimex -+ -+if [ -f $cfg ]; then -+ . $cfg -+fi -+ -+case "$1" in -+ start|restart|force-reload) -+ echo -n "Regulating system clock..." -+ /sbin/adjtimex -tick "$TICK" -frequency "$FREQ" -+ echo "done." -+ ;; -+ stop|status) -+ ;; -+ *) -+ echo "/etc/init.d/adjtimex: unknown command $1" >&2 -+ echo "Usage: /etc/init.d/adjtimex {start|stop|restart|force-reload}" >&2 -+ exit 3 -+ ;; -+esac -+ -+exit 0 ---- adjtimex-1.23.orig/debian/adjust -+++ adjtimex-1.23/debian/adjust -@@ -0,0 +1,15 @@ -+ mode: 16384 -+ offset: 0 -+ frequency: 0 -+ maxerror: 0 -+ esterror: 0 -+ status: 0 -+time_constant: 0 -+ precision: 0 -+ tolerance: 0 -+ tick: 0 -+ raw time: 0s 0us = 0.000000 -+for this kernel: -+ USER_HZ = 100 (nominally 100 ticks per second) -+ 9000 <= tick <= 11000 -+ -33554432 <= frequency <= 33554432 ---- adjtimex-1.23.orig/debian/compat -+++ adjtimex-1.23/debian/compat -@@ -0,0 +1 @@ -+5 ---- adjtimex-1.23.orig/Makefile -+++ adjtimex-1.23/Makefile -@@ -0,0 +1,70 @@ -+# Generated automatically from Makefile.in by configure. -+#### Start of system configuration section. -*-makefile-*- #### -+ srcdir = . -+ -+VERSION=1.22 -+ -+CFLAGS = -g -O2 -Wall -+prefix = /usr -+man1dir=${prefix}/share/man/man1 -+exec_prefix = ${prefix} -+bindir=/sbin -+ -+INSTALL=/usr/bin/install -c -+ -+# Extension (not including `.') for the manual page filenames. -+manext = 8 -+# Where to put the manual pages. -+mandir = $(prefix)/share/man/man$(manext) -+ -+#### End of system configuration section. #### -+ -+SHELL = /bin/sh -+ -+SRC = adjtimex.c adjtimex.8 mat.c mat.h install-sh configure.in \ -+ configure Makefile.in README README.ru adjtimex.lsm adjtimex.lsm.in \ -+ COPYING COPYRIGHT ChangeLog -+ -+all: adjtimex adjtimex.lsm -+ -+adjtimex: adjtimex.c mat.o -+ $(CC) $(CFLAGS) -I. -DVERSION=\"$(VERSION)\" -o adjtimex adjtimex.c \ -+ mat.o -lm -+ -+adjtimex.lsm: adjtimex.lsm.in Makefile.in -+ sed -e 's/@VERSION@/$(VERSION)/' \ -+ -e "s/@DATE@/`date +%d%b%y|tr [a-z] [A-Z]`/" \ -+ adjtimex.lsm.in >adjtimex.lsm -+ -+mat.o: mat.c -+ $(CC) $(CFLAGS) -c mat.c -+ -+install: all -+ $(INSTALL) -g bin -m 755 -o root adjtimex $(bindir)/adjtimex -+ $(INSTALL) -d -g root -m 755 -o root $(mandir) -+ -$(INSTALL) -g root -m 644 -o root $(srcdir)/adjtimex.8 \ -+ $(mandir)/adjtimex.$(manext) -+ -+uninstall: -+ rm -f $(bindir)/adjtimex $(mandir)/adjtimex.$(manext) -+ -+clean: -+ rm -f core *.o -+veryclean: clean -+ rm -f adjtimex -+ -+shar: $(SRC) -+ distname=adjtimex-$(VERSION); \ -+ shar $(SRC) >$$distname.shar -+ -+dist: $(SRC) -+ distname=adjtimex-$(VERSION); \ -+ rm -fr $$distname; \ -+ mkdir $$distname; \ -+ for file in $(SRC); do \ -+ ln $$file $$distname/$$file \ -+ || { echo copying $$file instead; cp -p $$file $$distname/$$file;}; \ -+ done; \ -+ chmod -R a+rX $$distname; \ -+ tar -chz -f $$distname.tar.gz $$distname; \ -+ rm -fr $$distname diff --git a/source/a/util-linux/adjtimex_1.29-2.2.diff b/source/a/util-linux/adjtimex_1.29-2.2.diff new file mode 100644 index 00000000..62ac1db3 --- /dev/null +++ b/source/a/util-linux/adjtimex_1.29-2.2.diff @@ -0,0 +1,6564 @@ +--- adjtimex-1.29.orig/adjtimex.lsm ++++ adjtimex-1.29/adjtimex.lsm +@@ -1,7 +1,7 @@ + Begin4 + Title: adjtimex - display or set the kernel time variables + Version: 1.29 +-Entered-date: 2010-04-16 ++Entered-date: 2010-05-26 + Description: Display or set the kernel time variables. + This program gives you raw access to the kernel time variables. For + a machine connected to the Internet, or equipped with a precision +--- adjtimex-1.29.orig/config.h ++++ adjtimex-1.29/config.h +@@ -0,0 +1,80 @@ ++/* config.h. Generated from config.h.in by configure. */ ++/* config.h.in. Generated from configure.in by autoheader. */ ++ ++/* Define to 1 if you have the `gettimeofday' function. */ ++#define HAVE_GETTIMEOFDAY 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_INTTYPES_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_LINUX_RTC_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_MEMORY_H 1 ++ ++/* Define to 1 if you have the `mktime' function. */ ++#define HAVE_MKTIME 1 ++ ++/* Define to 1 if you have the `putenv' function. */ ++#define HAVE_PUTENV 1 ++ ++/* Define to 1 if you have the `select' function. */ ++#define HAVE_SELECT 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDINT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDLIB_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STRINGS_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STRING_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_STAT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_TIME_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_TYPES_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_UNISTD_H 1 ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#define PACKAGE_BUGREPORT "" ++ ++/* Define to the full name of this package. */ ++#define PACKAGE_NAME "" ++ ++/* Define to the full name and version of this package. */ ++#define PACKAGE_STRING "" ++ ++/* Define to the one symbol short name of this package. */ ++#define PACKAGE_TARNAME "" ++ ++/* Define to the version of this package. */ ++#define PACKAGE_VERSION "" ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#define STDC_HEADERS 1 ++ ++/* Define to 1 if you can safely include both and . */ ++#define TIME_WITH_SYS_TIME 1 ++ ++/* Define to 1 if your declares `struct tm'. */ ++/* #undef TM_IN_SYS_TIME */ ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++/* #undef const */ ++ ++/* 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 +--- adjtimex-1.29.orig/config.sub ++++ adjtimex-1.29/config.sub +@@ -0,0 +1,1760 @@ ++#! /bin/sh ++# Configuration validation subroutine script. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011 Free Software Foundation, Inc. ++ ++timestamp='2011-03-23' ++ ++# This file is (in principle) common to ALL GNU software. ++# The presence of a machine in this file suggests that SOME GNU software ++# can handle that machine. It does not imply ALL GNU software can. ++# ++# 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., 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 . Submit a context ++# diff and a properly formatted GNU ChangeLog entry. ++# ++# Configuration subroutine to validate and canonicalize a configuration type. ++# Supply the specified configuration type as an argument. ++# If it is invalid, we print an error message on stderr and exit with code 1. ++# Otherwise, we print the canonical config type on stdout and succeed. ++ ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ ++# This file is supposed to be the same for all GNU packages ++# and recognize all the CPU types, system types and aliases ++# that are meaningful with *any* GNU software. ++# Each package is responsible for reporting which valid configurations ++# it does not support. The user should be able to distinguish ++# a failure to support a valid configuration from a meaningless ++# configuration. ++ ++# The goal of this file is to map all the various variations of a given ++# machine specification into a single specification in the form: ++# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM ++# or in some cases, the newer four-part form: ++# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM ++# It is wrong to echo any other type of specification. ++ ++me=`echo "$0" | sed -e 's,.*/,,'` ++ ++usage="\ ++Usage: $0 [OPTION] CPU-MFR-OPSYS ++ $0 [OPTION] ALIAS ++ ++Canonicalize a configuration name. ++ ++Operation modes: ++ -h, --help print this help, then exit ++ -t, --time-stamp print date of last modification, then exit ++ -v, --version print version number, then exit ++ ++Report bugs and patches to ." ++ ++version="\ ++GNU config.sub ($timestamp) ++ ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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." ++ ++help=" ++Try \`$me --help' for more information." ++ ++# Parse command line ++while test $# -gt 0 ; do ++ case $1 in ++ --time-stamp | --time* | -t ) ++ echo "$timestamp" ; exit ;; ++ --version | -v ) ++ echo "$version" ; exit ;; ++ --help | --h* | -h ) ++ echo "$usage"; exit ;; ++ -- ) # Stop option processing ++ shift; break ;; ++ - ) # Use stdin as input. ++ break ;; ++ -* ) ++ echo "$me: invalid option $1$help" ++ exit 1 ;; ++ ++ *local*) ++ # First pass through any local machine types. ++ echo $1 ++ exit ;; ++ ++ * ) ++ break ;; ++ esac ++done ++ ++case $# in ++ 0) echo "$me: missing argument$help" >&2 ++ exit 1;; ++ 1) ;; ++ *) echo "$me: too many arguments$help" >&2 ++ exit 1;; ++esac ++ ++# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). ++# 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* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) ++ os=-$maybe_os ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ++ ;; ++ *) ++ basic_machine=`echo $1 | sed 's/-[^-]*$//'` ++ if [ $basic_machine != $1 ] ++ then os=`echo $1 | sed 's/.*-/-/'` ++ else os=; fi ++ ;; ++esac ++ ++### Let's recognize common machines as not being operating systems so ++### that things like config.sub decstation-3100 work. We also ++### recognize some manufacturers as not being operating systems, so we ++### can provide default operating systems below. ++case $os in ++ -sun*os*) ++ # Prevent following clause from handling this invalid input. ++ ;; ++ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ ++ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ ++ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ ++ -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 | -knuth | -cray | -microblaze) ++ os= ++ basic_machine=$1 ++ ;; ++ -bluegene*) ++ os=-cnk ++ ;; ++ -sim | -cisco | -oki | -wec | -winbond) ++ os= ++ basic_machine=$1 ++ ;; ++ -scout) ++ ;; ++ -wrs) ++ os=-vxworks ++ basic_machine=$1 ++ ;; ++ -chorusos*) ++ os=-chorusos ++ basic_machine=$1 ++ ;; ++ -chorusrdb) ++ os=-chorusrdb ++ basic_machine=$1 ++ ;; ++ -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/'` ++ ;; ++ -sco4) ++ os=-sco3.2v4 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco3.2.[4-9]*) ++ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco3.2v[4-9]*) ++ # 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/'` ++ ;; ++ -udk*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -isc) ++ os=-isc2.2 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -clix*) ++ basic_machine=clipper-intergraph ++ ;; ++ -isc*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -lynx*) ++ os=-lynxos ++ ;; ++ -ptx*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` ++ ;; ++ -windowsnt*) ++ os=`echo $os | sed -e 's/windowsnt/winnt/'` ++ ;; ++ -psos*) ++ os=-psos ++ ;; ++ -mint | -mint[0-9]*) ++ basic_machine=m68k-atari ++ os=-mint ++ ;; ++esac ++ ++# Decode aliases for certain CPU-COMPANY combinations. ++case $basic_machine in ++ # Recognize the basic CPU types without company name. ++ # Some are omitted here because they have special meanings below. ++ 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 \ ++ | lm32 \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | mcore | mep | metag \ ++ | mips | mipsbe | mipseb | mipsel | mipsle \ ++ | mips16 \ ++ | mips64 | mips64el \ ++ | mips64octeon | mips64octeonel \ ++ | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ ++ | mips64vr4100 | mips64vr4100el \ ++ | mips64vr4300 | mips64vr4300el \ ++ | mips64vr5000 | mips64vr5000el \ ++ | mips64vr5900 | mips64vr5900el \ ++ | mipsisa32 | mipsisa32el \ ++ | mipsisa32r2 | mipsisa32r2el \ ++ | mipsisa64 | mipsisa64el \ ++ | mipsisa64r2 | mipsisa64r2el \ ++ | mipsisa64sb1 | mipsisa64sb1el \ ++ | mipsisa64sr71k | mipsisa64sr71kel \ ++ | mipstx39 | mipstx39el \ ++ | mn10200 | mn10300 \ ++ | moxie \ ++ | mt \ ++ | msp430 \ ++ | nds32 | nds32le | nds32be \ ++ | nios | nios2 \ ++ | ns16k | ns32k \ ++ | open8 \ ++ | or32 \ ++ | pdp10 | pdp11 | pj | pjl \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ ++ | pyramid \ ++ | rx \ ++ | score \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | 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 \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | ubicom32 \ ++ | v850 | v850e \ ++ | we32k \ ++ | x86 | xc16x | xstormy16 | xtensa \ ++ | z8k | z80) ++ basic_machine=$basic_machine-unknown ++ ;; ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | picochip) ++ # Motorola 68HC11/12. ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ++ ;; ++ ms1) ++ basic_machine=mt-unknown ++ ;; ++ ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; ++ ++ # We use `pc' rather than `unknown' ++ # because (1) that's what they normally are, and ++ # (2) the word "unknown" tends to confuse beginning users. ++ i*86 | x86_64) ++ basic_machine=$basic_machine-pc ++ ;; ++ # Object if more than one company name word. ++ *-*-*) ++ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 ++ exit 1 ++ ;; ++ # Recognize the basic CPU types with company name. ++ 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-* \ ++ | 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-* \ ++ | lm32-* \ ++ | m32c-* | m32r-* | m32rle-* \ ++ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ ++ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ++ | mips16-* \ ++ | mips64-* | mips64el-* \ ++ | mips64octeon-* | mips64octeonel-* \ ++ | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ ++ | 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-* \ ++ | nds32-* | nds32le-* | nds32be-* \ ++ | nios-* | nios2-* \ ++ | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ ++ | orion-* \ ++ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ ++ | pyramid-* \ ++ | romp-* | rs6000-* | rx-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | 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-* | sv1-* | sx?-* \ ++ | tahoe-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile-* | tilegx-* \ ++ | tron-* \ ++ | ubicom32-* \ ++ | v850-* | v850e-* | vax-* \ ++ | we32k-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ ++ | xstormy16-* | xtensa*-* \ ++ | ymp-* \ ++ | z8k-* | z80-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown ++ ;; ++ # Recognize the various machine names and aliases which stand ++ # for a CPU type and a company and sometimes even an OS. ++ 386bsd) ++ basic_machine=i386-unknown ++ os=-bsd ++ ;; ++ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) ++ basic_machine=m68000-att ++ ;; ++ 3b*) ++ basic_machine=we32k-att ++ ;; ++ a29khif) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ abacus) ++ basic_machine=abacus-unknown ++ ;; ++ adobe68k) ++ basic_machine=m68010-adobe ++ os=-scout ++ ;; ++ alliant | fx80) ++ basic_machine=fx80-alliant ++ ;; ++ altos | altos3068) ++ basic_machine=m68k-altos ++ ;; ++ am29k) ++ 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 ++ ;; ++ amiga | amiga-*) ++ basic_machine=m68k-unknown ++ ;; ++ amigaos | amigados) ++ basic_machine=m68k-unknown ++ os=-amigaos ++ ;; ++ amigaunix | amix) ++ basic_machine=m68k-unknown ++ os=-sysv4 ++ ;; ++ apollo68) ++ basic_machine=m68k-apollo ++ os=-sysv ++ ;; ++ apollo68bsd) ++ basic_machine=m68k-apollo ++ os=-bsd ++ ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; ++ aux) ++ basic_machine=m68k-apple ++ os=-aux ++ ;; ++ balance) ++ basic_machine=ns32k-sequent ++ os=-dynix ++ ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c90) ++ basic_machine=c90-cray ++ os=-unicos ++ ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; ++ convex-c1) ++ basic_machine=c1-convex ++ os=-bsd ++ ;; ++ convex-c2) ++ basic_machine=c2-convex ++ os=-bsd ++ ;; ++ convex-c32) ++ basic_machine=c32-convex ++ os=-bsd ++ ;; ++ convex-c34) ++ basic_machine=c34-convex ++ os=-bsd ++ ;; ++ convex-c38) ++ basic_machine=c38-convex ++ os=-bsd ++ ;; ++ cray | j90) ++ basic_machine=j90-cray ++ os=-unicos ++ ;; ++ craynv) ++ basic_machine=craynv-cray ++ os=-unicosmp ++ ;; ++ cr16 | 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 ++ ;; ++ delta88) ++ basic_machine=m88k-motorola ++ os=-sysv3 ++ ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; ++ djgpp) ++ basic_machine=i586-pc ++ os=-msdosdjgpp ++ ;; ++ dpx20 | dpx20-*) ++ basic_machine=rs6000-bull ++ os=-bosx ++ ;; ++ dpx2* | dpx2*-bull) ++ basic_machine=m68k-bull ++ os=-sysv3 ++ ;; ++ ebmon29k) ++ basic_machine=a29k-amd ++ os=-ebmon ++ ;; ++ elxsi) ++ basic_machine=elxsi-elxsi ++ os=-bsd ++ ;; ++ encore | umax | mmax) ++ basic_machine=ns32k-encore ++ ;; ++ es1800 | OSE68k | ose68k | ose | OSE) ++ basic_machine=m68k-ericsson ++ os=-ose ++ ;; ++ fx2800) ++ basic_machine=i860-alliant ++ ;; ++ genix) ++ basic_machine=ns32k-ns ++ ;; ++ gmicro) ++ basic_machine=tron-gmicro ++ os=-sysv ++ ;; ++ go32) ++ basic_machine=i386-pc ++ os=-go32 ++ ;; ++ h3050r* | hiux*) ++ basic_machine=hppa1.1-hitachi ++ os=-hiuxwe2 ++ ;; ++ h8300hms) ++ basic_machine=h8300-hitachi ++ os=-hms ++ ;; ++ h8300xray) ++ basic_machine=h8300-hitachi ++ os=-xray ++ ;; ++ h8500hms) ++ basic_machine=h8500-hitachi ++ os=-hms ++ ;; ++ harris) ++ basic_machine=m88k-harris ++ os=-sysv3 ++ ;; ++ hp300-*) ++ basic_machine=m68k-hp ++ ;; ++ hp300bsd) ++ basic_machine=m68k-hp ++ os=-bsd ++ ;; ++ hp300hpux) ++ basic_machine=m68k-hp ++ os=-hpux ++ ;; ++ hp3k9[0-9][0-9] | hp9[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hp9k2[0-9][0-9] | hp9k31[0-9]) ++ basic_machine=m68000-hp ++ ;; ++ hp9k3[2-9][0-9]) ++ basic_machine=m68k-hp ++ ;; ++ hp9k6[0-9][0-9] | hp6[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hp9k7[0-79][0-9] | hp7[0-79][0-9]) ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k78[0-9] | hp78[0-9]) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[0-9][13679] | hp8[0-9][13679]) ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[0-9][0-9] | hp8[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hppa-next) ++ os=-nextstep3 ++ ;; ++ hppaosf) ++ basic_machine=hppa1.1-hp ++ os=-osf ++ ;; ++ hppro) ++ basic_machine=hppa1.1-hp ++ os=-proelf ++ ;; ++ i370-ibm* | ibm*) ++ basic_machine=i370-ibm ++ ;; ++# I'm not sure what "Sysv32" means. Should this be sysv3.2? ++ i*86v32) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-sysv32 ++ ;; ++ i*86v4*) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-sysv4 ++ ;; ++ i*86v) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-sysv ++ ;; ++ i*86sol2) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-solaris2 ++ ;; ++ i386mach) ++ basic_machine=i386-mach ++ os=-mach ++ ;; ++ i386-vsta | vsta) ++ basic_machine=i386-unknown ++ os=-vsta ++ ;; ++ iris | iris4d) ++ basic_machine=mips-sgi ++ case $os in ++ -irix*) ++ ;; ++ *) ++ os=-irix4 ++ ;; ++ esac ++ ;; ++ isi68 | isi) ++ basic_machine=m68k-isi ++ os=-sysv ++ ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ m88k-omron*) ++ basic_machine=m88k-omron ++ ;; ++ magnum | m3230) ++ basic_machine=mips-mips ++ os=-sysv ++ ;; ++ merlin) ++ basic_machine=ns32k-utek ++ os=-sysv ++ ;; ++ microblaze) ++ basic_machine=microblaze-xilinx ++ ;; ++ mingw32) ++ basic_machine=i386-pc ++ os=-mingw32 ++ ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; ++ miniframe) ++ basic_machine=m68000-convergent ++ ;; ++ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) ++ basic_machine=m68k-atari ++ os=-mint ++ ;; ++ mips3*-*) ++ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ++ ;; ++ mips3*) ++ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ++ ;; ++ 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 ++ ;; ++ ncr3000) ++ basic_machine=i486-ncr ++ os=-sysv4 ++ ;; ++ netbsd386) ++ basic_machine=i386-unknown ++ os=-netbsd ++ ;; ++ netwinder) ++ basic_machine=armv4l-rebel ++ os=-linux ++ ;; ++ news | news700 | news800 | news900) ++ basic_machine=m68k-sony ++ os=-newsos ++ ;; ++ news1000) ++ basic_machine=m68030-sony ++ os=-newsos ++ ;; ++ news-3600 | risc-news) ++ basic_machine=mips-sony ++ os=-newsos ++ ;; ++ necv70) ++ basic_machine=v70-nec ++ os=-sysv ++ ;; ++ next | m*-next ) ++ basic_machine=m68k-next ++ case $os in ++ -nextstep* ) ++ ;; ++ -ns2*) ++ os=-nextstep2 ++ ;; ++ *) ++ os=-nextstep3 ++ ;; ++ esac ++ ;; ++ nh3000) ++ basic_machine=m68k-harris ++ os=-cxux ++ ;; ++ nh[45]000) ++ basic_machine=m88k-harris ++ os=-cxux ++ ;; ++ nindy960) ++ basic_machine=i960-intel ++ os=-nindy ++ ;; ++ mon960) ++ basic_machine=i960-intel ++ os=-mon960 ++ ;; ++ nonstopux) ++ basic_machine=mips-compaq ++ os=-nonstopux ++ ;; ++ np1) ++ basic_machine=np1-gould ++ ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; ++ nsr-tandem) ++ basic_machine=nsr-tandem ++ ;; ++ op50n-* | op60c-*) ++ 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 ++ ;; ++ os68k) ++ basic_machine=m68k-none ++ os=-os68k ++ ;; ++ pa-hitachi) ++ basic_machine=hppa1.1-hitachi ++ os=-hiuxwe2 ++ ;; ++ paragon) ++ basic_machine=i860-intel ++ os=-osf ++ ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ pbd) ++ basic_machine=sparc-tti ++ ;; ++ pbb) ++ basic_machine=m68k-tti ++ ;; ++ pc532 | pc532-*) ++ basic_machine=ns32k-pc532 ++ ;; ++ 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 | athlon_*) ++ basic_machine=i686-pc ++ ;; ++ pentiumii | pentium2 | pentiumiii | pentium3) ++ basic_machine=i686-pc ++ ;; ++ 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-* | 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 | ppcbe) basic_machine=powerpc-unknown ++ ;; ++ ppc-* | ppcbe-*) ++ 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 ++ ;; ++ pw32) ++ basic_machine=i586-unknown ++ os=-pw32 ++ ;; ++ rdos) ++ basic_machine=i386-pc ++ os=-rdos ++ ;; ++ rom68k) ++ basic_machine=m68k-rom68k ++ os=-coff ++ ;; ++ rm[46]00) ++ basic_machine=mips-siemens ++ ;; ++ 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 ++ ;; ++ sh) ++ basic_machine=sh-hitachi ++ os=-hms ++ ;; ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; ++ sh64) ++ basic_machine=sh64-unknown ++ ;; ++ sparclite-wrs | simso-wrs) ++ basic_machine=sparclite-wrs ++ os=-vxworks ++ ;; ++ sps7) ++ basic_machine=m68k-bull ++ os=-sysv2 ++ ;; ++ spur) ++ basic_machine=spur-unknown ++ ;; ++ st2000) ++ basic_machine=m68k-tandem ++ ;; ++ stratus) ++ basic_machine=i860-stratus ++ os=-sysv4 ++ ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ sun2) ++ basic_machine=m68000-sun ++ ;; ++ sun2os3) ++ basic_machine=m68000-sun ++ os=-sunos3 ++ ;; ++ sun2os4) ++ basic_machine=m68000-sun ++ os=-sunos4 ++ ;; ++ sun3os3) ++ basic_machine=m68k-sun ++ os=-sunos3 ++ ;; ++ sun3os4) ++ basic_machine=m68k-sun ++ os=-sunos4 ++ ;; ++ sun4os3) ++ basic_machine=sparc-sun ++ os=-sunos3 ++ ;; ++ sun4os4) ++ basic_machine=sparc-sun ++ os=-sunos4 ++ ;; ++ sun4sol2) ++ basic_machine=sparc-sun ++ os=-solaris2 ++ ;; ++ sun3 | sun3-*) ++ basic_machine=m68k-sun ++ ;; ++ sun4) ++ basic_machine=sparc-sun ++ ;; ++ sun386 | sun386i | roadrunner) ++ basic_machine=i386-sun ++ ;; ++ sv1) ++ basic_machine=sv1-cray ++ os=-unicos ++ ;; ++ symmetry) ++ basic_machine=i386-sequent ++ os=-dynix ++ ;; ++ t3e) ++ basic_machine=alphaev5-cray ++ os=-unicos ++ ;; ++ t90) ++ basic_machine=t90-cray ++ os=-unicos ++ ;; ++ # This must be matched before tile*. ++ tilegx*) ++ basic_machine=tilegx-unknown ++ os=-linux-gnu ++ ;; ++ tile*) ++ basic_machine=tile-unknown ++ os=-linux-gnu ++ ;; ++ 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 ++ ;; ++ ultra3) ++ basic_machine=a29k-nyu ++ os=-sym1 ++ ;; ++ v810 | necv810) ++ basic_machine=v810-nec ++ os=-none ++ ;; ++ vaxv) ++ basic_machine=vax-dec ++ os=-sysv ++ ;; ++ vms) ++ basic_machine=vax-dec ++ os=-vms ++ ;; ++ vpp*|vx|vx-*) ++ basic_machine=f301-fujitsu ++ ;; ++ vxworks960) ++ basic_machine=i960-wrs ++ os=-vxworks ++ ;; ++ vxworks68) ++ basic_machine=m68k-wrs ++ os=-vxworks ++ ;; ++ vxworks29k) ++ basic_machine=a29k-wrs ++ os=-vxworks ++ ;; ++ w65*) ++ basic_machine=w65-wdc ++ os=-none ++ ;; ++ w89k-*) ++ basic_machine=hppa1.1-winbond ++ os=-proelf ++ ;; ++ xbox) ++ basic_machine=i686-pc ++ os=-mingw32 ++ ;; ++ xps | xps100) ++ basic_machine=xps100-honeywell ++ ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; ++ ymp) ++ basic_machine=ymp-cray ++ os=-unicos ++ ;; ++ z8k-*-coff) ++ basic_machine=z8k-unknown ++ os=-sim ++ ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; ++ none) ++ basic_machine=none-none ++ os=-none ++ ;; ++ ++# Here we handle the default manufacturer of certain CPU types. It is in ++# some cases the only manufacturer, in others, it is the most popular. ++ w89k) ++ basic_machine=hppa1.1-winbond ++ ;; ++ op50n) ++ basic_machine=hppa1.1-oki ++ ;; ++ op60c) ++ basic_machine=hppa1.1-oki ++ ;; ++ romp) ++ basic_machine=romp-ibm ++ ;; ++ mmix) ++ basic_machine=mmix-knuth ++ ;; ++ rs6000) ++ basic_machine=rs6000-ibm ++ ;; ++ vax) ++ basic_machine=vax-dec ++ ;; ++ pdp10) ++ # there are many clones, so DEC is not a safe bet ++ basic_machine=pdp10-unknown ++ ;; ++ pdp11) ++ basic_machine=pdp11-dec ++ ;; ++ we32k) ++ basic_machine=we32k-att ++ ;; ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) ++ basic_machine=sh-unknown ++ ;; ++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) ++ basic_machine=sparc-sun ++ ;; ++ cydra) ++ basic_machine=cydra-cydrome ++ ;; ++ orion) ++ basic_machine=orion-highlevel ++ ;; ++ orion105) ++ basic_machine=clipper-highlevel ++ ;; ++ mac | mpw | mac-mpw) ++ basic_machine=m68k-apple ++ ;; ++ pmac | pmac-mpw) ++ basic_machine=powerpc-apple ++ ;; ++ *-unknown) ++ # Make sure to match an already-canonicalized machine name. ++ ;; ++ *) ++ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 ++ exit 1 ++ ;; ++esac ++ ++# Here we canonicalize certain aliases for manufacturers. ++case $basic_machine in ++ *-digital*) ++ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` ++ ;; ++ *-commodore*) ++ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` ++ ;; ++ *) ++ ;; ++esac ++ ++# Decode manufacturer-specific aliases for certain operating systems. ++ ++if [ x"$os" != x"" ] ++then ++case $os in ++ # First match some system type aliases ++ # that might get confused with valid system types. ++ # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; ++ -solaris1 | -solaris1.*) ++ os=`echo $os | sed -e 's|solaris1|sunos4|'` ++ ;; ++ -solaris) ++ os=-solaris2 ++ ;; ++ -svr4*) ++ os=-sysv4 ++ ;; ++ -unixware*) ++ os=-sysv4.2uw ++ ;; ++ -gnu/linux*) ++ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ++ ;; ++ # First accept the basic system types. ++ # The portable systems comes first. ++ # Each alternative MUST END IN A *, to match a version number. ++ # -sysv* is not here because it comes later, after sysvr4. ++ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ ++ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ++ | -aos* | -aros* \ ++ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ ++ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ++ | -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* | -cegcc* \ ++ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -linux-gnu* | -linux-android* \ ++ | -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* | -vos* | -palmos* | -uclinux* | -nucleus* \ ++ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) ++ # Remember, each alternative MUST END IN *, to match a version number. ++ ;; ++ -qnx*) ++ case $basic_machine in ++ x86-* | i*86-*) ++ ;; ++ *) ++ os=-nto$os ++ ;; ++ esac ++ ;; ++ -nto-qnx*) ++ ;; ++ -nto*) ++ os=`echo $os | sed -e 's|nto|nto-qnx|'` ++ ;; ++ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ ++ | -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|'` ++ ;; ++ -sunos5*) ++ os=`echo $os | sed -e 's|sunos5|solaris2|'` ++ ;; ++ -sunos6*) ++ os=`echo $os | sed -e 's|sunos6|solaris3|'` ++ ;; ++ -opened*) ++ os=-openedition ++ ;; ++ -os400*) ++ os=-os400 ++ ;; ++ -wince*) ++ os=-wince ++ ;; ++ -osfrose*) ++ os=-osfrose ++ ;; ++ -osf*) ++ os=-osf ++ ;; ++ -utek*) ++ os=-bsd ++ ;; ++ -dynix*) ++ os=-bsd ++ ;; ++ -acis*) ++ os=-aos ++ ;; ++ -atheos*) ++ os=-atheos ++ ;; ++ -syllable*) ++ os=-syllable ++ ;; ++ -386bsd) ++ os=-bsd ++ ;; ++ -ctix* | -uts*) ++ os=-sysv ++ ;; ++ -nova*) ++ os=-rtmk-nova ++ ;; ++ -ns2 ) ++ os=-nextstep2 ++ ;; ++ -nsk*) ++ os=-nsk ++ ;; ++ # Preserve the version number of sinix5. ++ -sinix5.*) ++ os=`echo $os | sed -e 's|sinix|sysv|'` ++ ;; ++ -sinix*) ++ os=-sysv4 ++ ;; ++ -tpf*) ++ os=-tpf ++ ;; ++ -triton*) ++ os=-sysv3 ++ ;; ++ -oss*) ++ os=-sysv3 ++ ;; ++ -svr4) ++ os=-sysv4 ++ ;; ++ -svr3) ++ os=-sysv3 ++ ;; ++ -sysvr4) ++ os=-sysv4 ++ ;; ++ # This must come after -sysvr4. ++ -sysv*) ++ ;; ++ -ose*) ++ os=-ose ++ ;; ++ -es1800*) ++ os=-ose ++ ;; ++ -xenix) ++ os=-xenix ++ ;; ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ++ os=-mint ++ ;; ++ -aros*) ++ os=-aros ++ ;; ++ -kaos*) ++ os=-kaos ++ ;; ++ -zvmoe) ++ os=-zvmoe ++ ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -nacl*) ++ ;; ++ -none) ++ ;; ++ *) ++ # Get rid of the `-' at the beginning of $os. ++ os=`echo $os | sed 's/[^-]*-//'` ++ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 ++ exit 1 ++ ;; ++esac ++else ++ ++# Here we handle the default operating systems that come with various machines. ++# The value should be what the vendor currently ships out the door with their ++# machine or put another way, the most popular os provided with the machine. ++ ++# Note that if you're going to try to match "-MANUFACTURER" here (say, ++# "-sun"), then you have to tell the case statement up towards the top ++# that MANUFACTURER isn't an operating system. Otherwise, code above ++# will signal an error saying that MANUFACTURER isn't an operating ++# system, and we'll never get to this point. ++ ++case $basic_machine in ++ score-*) ++ os=-elf ++ ;; ++ spu-*) ++ os=-elf ++ ;; ++ *-acorn) ++ os=-riscix1.2 ++ ;; ++ arm*-rebel) ++ os=-linux ++ ;; ++ arm*-semi) ++ os=-aout ++ ;; ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff ++ ;; ++ # This must come before the *-dec entry. ++ pdp10-*) ++ os=-tops20 ++ ;; ++ pdp11-*) ++ os=-none ++ ;; ++ *-dec | vax-*) ++ os=-ultrix4.2 ++ ;; ++ m68*-apollo) ++ os=-domain ++ ;; ++ i386-sun) ++ os=-sunos4.0.2 ++ ;; ++ m68000-sun) ++ os=-sunos3 ++ # This also exists in the configure program, but was not the ++ # default. ++ # os=-sunos4 ++ ;; ++ 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 ++ ;; ++ sparc-* | *-sun) ++ os=-sunos4.1.1 ++ ;; ++ *-be) ++ os=-beos ++ ;; ++ *-haiku) ++ os=-haiku ++ ;; ++ *-ibm) ++ os=-aix ++ ;; ++ *-knuth) ++ os=-mmixware ++ ;; ++ *-wec) ++ os=-proelf ++ ;; ++ *-winbond) ++ os=-proelf ++ ;; ++ *-oki) ++ os=-proelf ++ ;; ++ *-hp) ++ os=-hpux ++ ;; ++ *-hitachi) ++ os=-hiux ++ ;; ++ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) ++ os=-sysv ++ ;; ++ *-cbm) ++ os=-amigaos ++ ;; ++ *-dg) ++ os=-dgux ++ ;; ++ *-dolphin) ++ os=-sysv3 ++ ;; ++ m68k-ccur) ++ os=-rtu ++ ;; ++ m88k-omron*) ++ os=-luna ++ ;; ++ *-next ) ++ os=-nextstep ++ ;; ++ *-sequent) ++ os=-ptx ++ ;; ++ *-crds) ++ os=-unos ++ ;; ++ *-ns) ++ os=-genix ++ ;; ++ i370-*) ++ os=-mvs ++ ;; ++ *-next) ++ os=-nextstep3 ++ ;; ++ *-gould) ++ os=-sysv ++ ;; ++ *-highlevel) ++ os=-bsd ++ ;; ++ *-encore) ++ os=-bsd ++ ;; ++ *-sgi) ++ os=-irix ++ ;; ++ *-siemens) ++ os=-sysv4 ++ ;; ++ *-masscomp) ++ os=-rtu ++ ;; ++ f30[01]-fujitsu | f700-fujitsu) ++ os=-uxpv ++ ;; ++ *-rom68k) ++ os=-coff ++ ;; ++ *-*bug) ++ os=-coff ++ ;; ++ *-apple) ++ os=-macos ++ ;; ++ *-atari*) ++ os=-mint ++ ;; ++ *) ++ os=-none ++ ;; ++esac ++fi ++ ++# Here we handle the case where we know the os, and the CPU type, but not the ++# manufacturer. We pick the logical manufacturer. ++vendor=unknown ++case $basic_machine in ++ *-unknown) ++ case $os in ++ -riscix*) ++ vendor=acorn ++ ;; ++ -sunos*) ++ vendor=sun ++ ;; ++ -cnk*|-aix*) ++ vendor=ibm ++ ;; ++ -beos*) ++ vendor=be ++ ;; ++ -hpux*) ++ vendor=hp ++ ;; ++ -mpeix*) ++ vendor=hp ++ ;; ++ -hiux*) ++ vendor=hitachi ++ ;; ++ -unos*) ++ vendor=crds ++ ;; ++ -dgux*) ++ vendor=dg ++ ;; ++ -luna*) ++ vendor=omron ++ ;; ++ -genix*) ++ vendor=ns ++ ;; ++ -mvs* | -opened*) ++ vendor=ibm ++ ;; ++ -os400*) ++ vendor=ibm ++ ;; ++ -ptx*) ++ vendor=sequent ++ ;; ++ -tpf*) ++ vendor=ibm ++ ;; ++ -vxsim* | -vxworks* | -windiss*) ++ vendor=wrs ++ ;; ++ -aux*) ++ vendor=apple ++ ;; ++ -hms*) ++ vendor=hitachi ++ ;; ++ -mpw* | -macos*) ++ vendor=apple ++ ;; ++ -*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 ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "timestamp='" ++# time-stamp-format: "%:y-%02m-%02d" ++# time-stamp-end: "'" ++# End: +--- adjtimex-1.29.orig/Makefile ++++ adjtimex-1.29/Makefile +@@ -0,0 +1,78 @@ ++#### Start of system configuration section. -*-makefile-*- #### ++ srcdir = . ++VPATH = . ++ ++VERSION=1.29 ++ ++CFLAGS = -Wall -g -O2 -Wall ++prefix = /usr ++man1dir=${prefix}/share/man/man1 ++exec_prefix = ${prefix} ++bindir=/sbin ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++ ++INSTALL=/usr/bin/install -c ++ ++ ++# Extension (not including `.') for the manual page filenames. ++manext = 8 ++# Where to put the manual pages. ++mandir = $(prefix)/share/man/man$(manext) ++ ++#### End of system configuration section. #### ++ ++SRC = adjtimex.c adjtimex.8 mat.c mat.h install-sh configure.in \ ++ configure Makefile.in config.h.in README README.ru adjtimex.lsm \ ++ adjtimex.lsm.in COPYING COPYRIGHT ChangeLog ++ ++all: adjtimex adjtimex.lsm Makefile ++ ++configure config.h.in: configure.in ++ autoconf ++ autoheader ++Makefile config.h: Makefile.in config.h.in ++ ./configure ++ ++adjtimex: adjtimex.c mat.o config.h Makefile ++ $(CC) $(CFLAGS) -I. -DVERSION=\"$(VERSION)\" -o adjtimex \ ++ adjtimex.c mat.o -lm ++ ++mat.o: mat.c ++ $(CC) $(CFLAGS) -c mat.c ++ ++install: all ++ $(INSTALL) -g bin -m 755 -o root adjtimex $(bindir)/adjtimex ++ $(INSTALL) -d -g root -m 755 -o root $(mandir) ++ -$(INSTALL) -g root -m 644 -o root $(srcdir)/adjtimex.8 \ ++ $(mandir)/adjtimex.$(manext) ++ ++uninstall: ++ rm -f $(bindir)/adjtimex $(mandir)/adjtimex.$(manext) ++ ++clean: ++ rm -f core *.o ++veryclean: clean ++ rm -f adjtimex ++ ++adjtimex.lsm: adjtimex.lsm.in Makefile ++ sed -e 's/@VERSION@/$(VERSION)/' \ ++ -e "s/@DATE@/`date +%Y-%m-%d`/" \ ++ adjtimex.lsm.in >adjtimex.lsm ++ ++shar: $(SRC) ++ distname=adjtimex-$(VERSION); \ ++ shar $(SRC) >$$distname.shar ++ ++dist: $(SRC) ++ distname=adjtimex-$(VERSION); \ ++ rm -fr $$distname; \ ++ mkdir $$distname; \ ++ for file in $(SRC); do \ ++ ln $$file $$distname/$$file \ ++ || { echo copying $$file instead; cp -p $$file $$distname/$$file;}; \ ++ done; \ ++ chmod -R a+rX $$distname; \ ++ tar -chz -f $$distname.tar.gz $$distname; \ ++ rm -fr $$distname ++ +--- adjtimex-1.29.orig/config.guess ++++ adjtimex-1.29/config.guess +@@ -0,0 +1,1517 @@ ++#! /bin/sh ++# Attempt to guess a canonical system name. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011 Free Software Foundation, Inc. ++ ++timestamp='2011-05-11' ++ ++# 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., 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. ++ ++ ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a 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 ++# exits with 0. Otherwise, it exits with 1. ++# ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++ ++me=`echo "$0" | sed -e 's,.*/,,'` ++ ++usage="\ ++Usage: $0 [OPTION] ++ ++Output the configuration name of the system \`$me' is run on. ++ ++Operation modes: ++ -h, --help print this help, then exit ++ -t, --time-stamp print date of last modification, then exit ++ -v, --version print version number, then exit ++ ++Report bugs and patches to ." ++ ++version="\ ++GNU config.guess ($timestamp) ++ ++Originally written by Per Bothner. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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." ++ ++help=" ++Try \`$me --help' for more information." ++ ++# Parse command line ++while test $# -gt 0 ; do ++ case $1 in ++ --time-stamp | --time* | -t ) ++ echo "$timestamp" ; exit ;; ++ --version | -v ) ++ echo "$version" ; exit ;; ++ --help | --h* | -h ) ++ echo "$usage"; exit ;; ++ -- ) # Stop option processing ++ shift; break ;; ++ - ) # Use stdin as input. ++ break ;; ++ -* ) ++ echo "$me: invalid option $1$help" >&2 ++ exit 1 ;; ++ * ) ++ break ;; ++ esac ++done ++ ++if test $# != 0; then ++ echo "$me: too many arguments$help" >&2 ++ exit 1 ++fi ++ ++trap '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. ++ ++# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still ++# use `HOST_CC' if defined, but it is deprecated. ++ ++# 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 ; ++ 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 ; 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) ++if (test -f /.attbin/uname) >/dev/null 2>&1 ; then ++ PATH=$PATH:/.attbin ; export PATH ++fi ++ ++UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown ++UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown ++UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown ++UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown ++ ++# Note: order is significant - the case branches are not exclusive. ++ ++case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ++ *:NetBSD:*:*) ++ # 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. ++ # ++ # 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_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 -q __ELF__ ++ then ++ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). ++ # Return netbsd for either. FIX? ++ os=netbsd ++ else ++ os=netbsdelf ++ fi ++ ;; ++ *) ++ os=netbsd ++ ;; ++ esac ++ # The OS release ++ # 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 ;; ++ *: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:*:*) ++ case $UNAME_RELEASE in ++ *4.0) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ++ ;; ++ *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. ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; ++ 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 ;; ++ 21064:Windows_NT:50:3) ++ echo alpha-dec-winnt3.5 ++ exit ;; ++ Amiga*:UNIX_System_V:4.0:*) ++ echo m68k-unknown-sysv4 ++ exit ;; ++ *:[Aa]miga[Oo][Ss]:*:*) ++ echo ${UNAME_MACHINE}-unknown-amigaos ++ exit ;; ++ *:[Mm]orph[Oo][Ss]:*:*) ++ echo ${UNAME_MACHINE}-unknown-morphos ++ exit ;; ++ *:OS/390:*:*) ++ echo i370-ibm-openedition ++ 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 ;; ++ arm:riscos:*:*|arm:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; ++ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) ++ echo hppa1.1-hitachi-hiuxmpp ++ 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 ++ echo pyramid-pyramid-sysv3 ++ else ++ echo pyramid-pyramid-bsd ++ fi ++ exit ;; ++ NILE*:*:*:dcosx) ++ echo pyramid-pyramid-svr4 ++ 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 ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4H:SunOS:5.*:*) ++ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) ++ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ 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 ;; ++ sun4*:SunOS:*:*) ++ case "`/usr/bin/arch -k`" in ++ Series*|S4*) ++ UNAME_RELEASE=`uname -v` ++ ;; ++ esac ++ # Japanese Language versions have a version number like `4.1.3-JL'. ++ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` ++ exit ;; ++ sun3*:SunOS:*:*) ++ echo m68k-sun-sunos${UNAME_RELEASE} ++ exit ;; ++ sun*:*:4.2BSD:*) ++ 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) ++ echo m68k-sun-sunos${UNAME_RELEASE} ++ ;; ++ sun4) ++ echo sparc-sun-sunos${UNAME_RELEASE} ++ ;; ++ esac ++ exit ;; ++ aushp:SunOS:*:*) ++ echo sparc-auspex-sunos${UNAME_RELEASE} ++ 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 ++ # > m68000). The system name ranges from "MiNT" over "FreeMiNT" ++ # to the lowercase version "mint" (or "freemint"). Finally ++ # the system name "TOS" denotes a system which is actually not ++ # MiNT. But MiNT is downward compatible to TOS, so this should ++ # be no problem. ++ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; ++ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; ++ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten${UNAME_RELEASE} ++ exit ;; ++ powerpc:machten:*:*) ++ echo powerpc-apple-machten${UNAME_RELEASE} ++ exit ;; ++ RISC*:Mach:*:*) ++ echo mips-dec-mach_bsd4.3 ++ exit ;; ++ RISC*:ULTRIX:*:*) ++ echo mips-dec-ultrix${UNAME_RELEASE} ++ exit ;; ++ VAX*:ULTRIX*:*:*) ++ echo vax-dec-ultrix${UNAME_RELEASE} ++ exit ;; ++ 2020:CLIX:*:* | 2430:CLIX:*:*) ++ echo clipper-intergraph-clix${UNAME_RELEASE} ++ exit ;; ++ mips:*:*:UMIPS | mips:*:*:RISCos) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++#ifdef __cplusplus ++#include /* for printf() prototype */ ++ int main (int argc, char *argv[]) { ++#else ++ int main (argc, argv) int argc; char *argv[]; { ++#endif ++ #if defined (host_mips) && defined (MIPSEB) ++ #if defined (SYSTYPE_SYSV) ++ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); ++ #endif ++ #if defined (SYSTYPE_SVR4) ++ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); ++ #endif ++ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) ++ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); ++ #endif ++ #endif ++ exit (-1); ++ } ++EOF ++ $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 ;; ++ Motorola:PowerMAX_OS:*:*) ++ echo powerpc-motorola-powermax ++ 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 ;; ++ m88k:CX/UX:7*:*) ++ echo m88k-harris-cxux7 ++ exit ;; ++ m88k:*:4*:R4*) ++ echo m88k-motorola-sysv4 ++ exit ;; ++ m88k:*:3*:R3*) ++ echo m88k-motorola-sysv3 ++ exit ;; ++ AViiON:dgux:*:*) ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] ++ then ++ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ ++ [ ${TARGET_BINARY_INTERFACE}x = x ] ++ then ++ echo m88k-dg-dgux${UNAME_RELEASE} ++ else ++ echo m88k-dg-dguxbcs${UNAME_RELEASE} ++ fi ++ else ++ echo i586-dg-dgux${UNAME_RELEASE} ++ fi ++ exit ;; ++ M88*:DolphinOS:*:*) # DolphinOS (SVR3) ++ echo m88k-dolphin-sysv3 ++ exit ;; ++ M88*:*:R3*:*) ++ # Delta 88k system running SVR3 ++ echo m88k-motorola-sysv3 ++ exit ;; ++ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) ++ echo m88k-tektronix-sysv3 ++ exit ;; ++ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) ++ echo m68k-tektronix-bsd ++ exit ;; ++ *:IRIX*:*:*) ++ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` ++ 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 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ i*86:AIX:*:*) ++ echo i386-ibm-aix ++ exit ;; ++ ia64:AIX:*:*) ++ if [ -x /usr/bin/oslevel ] ; then ++ IBM_REV=`/usr/bin/oslevel` ++ else ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi ++ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} ++ 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 ++ ++ main() ++ { ++ if (!__power_pc()) ++ exit(1); ++ puts("powerpc-ibm-aix3.2.5"); ++ exit(0); ++ } ++EOF ++ 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 ;; ++ *:AIX:*:[4567]) ++ 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 ++ IBM_ARCH=powerpc ++ fi ++ if [ -x /usr/bin/oslevel ] ; then ++ IBM_REV=`/usr/bin/oslevel` ++ else ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi ++ echo ${IBM_ARCH}-ibm-aix${IBM_REV} ++ exit ;; ++ *:AIX:*:*) ++ echo rs6000-ibm-aix ++ exit ;; ++ ibmrt:4.4BSD:*|romp-ibm:BSD:*) ++ echo romp-ibm-bsd4.4 ++ exit ;; ++ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and ++ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to ++ exit ;; # report: romp-ibm BSD 4.3 ++ *:BOSX:*:*) ++ echo rs6000-bull-bosx ++ exit ;; ++ DPX/2?00:B.O.S.:*:*) ++ echo m68k-bull-sysv3 ++ exit ;; ++ 9000/[34]??:4.3bsd:1.*:*) ++ echo m68k-hp-bsd ++ exit ;; ++ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) ++ echo m68k-hp-bsd4.4 ++ 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]) ++ 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 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ 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 ++ if [ "${HP_ARCH}" = "" ]; then ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } ++EOF ++ (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 -q __LP64__ ++ then ++ HP_ARCH="hppa2.0w" ++ else ++ HP_ARCH="hppa64" ++ fi ++ fi ++ echo ${HP_ARCH}-hp-hpux${HPUX_REV} ++ exit ;; ++ ia64:HP-UX:*:*) ++ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` ++ echo ia64-hp-hpux${HPUX_REV} ++ exit ;; ++ 3050*:HI-UX:*:*) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #include ++ int ++ main () ++ { ++ long cpu = sysconf (_SC_CPU_VERSION); ++ /* The order matters, because CPU_IS_HP_MC68K erroneously returns ++ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct ++ results, however. */ ++ if (CPU_IS_PA_RISC (cpu)) ++ { ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; ++ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; ++ default: puts ("hppa-hitachi-hiuxwe2"); break; ++ } ++ } ++ else if (CPU_IS_HP_MC68K (cpu)) ++ puts ("m68k-hitachi-hiuxwe2"); ++ else puts ("unknown-hitachi-hiuxwe2"); ++ exit (0); ++ } ++EOF ++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } ++ echo unknown-hitachi-hiuxwe2 ++ exit ;; ++ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) ++ echo hppa1.1-hp-bsd ++ exit ;; ++ 9000/8??:4.3bsd:*:*) ++ echo hppa1.0-hp-bsd ++ exit ;; ++ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) ++ echo hppa1.0-hp-mpeix ++ exit ;; ++ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) ++ echo hppa1.1-hp-osf ++ exit ;; ++ hp8??:OSF1:*:*) ++ echo hppa1.0-hp-osf ++ exit ;; ++ i*86:OSF1:*:*) ++ if [ -x /usr/sbin/sysversion ] ; then ++ echo ${UNAME_MACHINE}-unknown-osf1mk ++ else ++ echo ${UNAME_MACHINE}-unknown-osf1 ++ fi ++ exit ;; ++ parisc*:Lites*:*:*) ++ echo hppa1.1-hp-lites ++ exit ;; ++ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) ++ echo c1-convex-bsd ++ exit ;; ++ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) ++ if getsysinfo -f scalar_acc ++ then echo c32-convex-bsd ++ else echo c2-convex-bsd ++ fi ++ exit ;; ++ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) ++ echo c34-convex-bsd ++ exit ;; ++ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) ++ echo c38-convex-bsd ++ exit ;; ++ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) ++ echo c4-convex-bsd ++ exit ;; ++ CRAY*Y-MP:*:*:*) ++ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ 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 ;; ++ CRAY*TS:*:*:*) ++ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*T3E:*:*:*) ++ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*SV1:*:*:*) ++ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ 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 ;; ++ 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 ;; ++ sparc*:BSD/OS:*:*) ++ echo sparc-unknown-bsdi${UNAME_RELEASE} ++ exit ;; ++ *:BSD/OS:*:*) ++ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} ++ exit ;; ++ *:FreeBSD:*:*) ++ 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 ;; ++ *:MINGW*:*) ++ echo ${UNAME_MACHINE}-pc-mingw32 ++ exit ;; ++ i*:windows32*:*) ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 ++ exit ;; ++ i*:PW*:*) ++ echo ${UNAME_MACHINE}-pc-pw32 ++ exit ;; ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ authenticamd | genuineintel | EM64T) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-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 ;; ++ 8664:Windows_NT:*) ++ echo x86_64-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 i586-pc-interix ++ exit ;; ++ i*:UWIN*:*) ++ echo ${UNAME_MACHINE}-pc-uwin ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) ++ echo x86_64-unknown-cygwin ++ exit ;; ++ p*:CYGWIN*:*) ++ echo powerpcle-unknown-cygwin ++ exit ;; ++ prep*:SunOS:5.*:*) ++ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ *:GNU:*:*) ++ # the GNU system ++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` ++ 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 ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; ++ arm*:Linux:*:*) ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi ++ fi ++ 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 ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ;; ++ ia64:Linux:*:*) ++ 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 ;; ++ mips:Linux:*:* | mips64:Linux:*:*) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #undef CPU ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el ++ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ++ CPU=${UNAME_MACHINE}el ++ #else ++ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ++ CPU=${UNAME_MACHINE} ++ #else ++ CPU= ++ #endif ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ++ ;; ++ or32:Linux:*:*) ++ echo or32-unknown-linux-gnu ++ exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; ++ parisc:Linux:*:* | hppa:Linux:*:*) ++ # Look for CPU level ++ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in ++ PA7*) echo hppa1.1-unknown-linux-gnu ;; ++ PA8*) echo hppa2.0-unknown-linux-gnu ;; ++ *) echo hppa-unknown-linux-gnu ;; ++ esac ++ exit ;; ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu ++ exit ;; ++ s390:Linux:*:* | s390x:Linux:*:*) ++ echo ${UNAME_MACHINE}-ibm-linux ++ exit ;; ++ sh64*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ sh*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ sparc:Linux:*:* | sparc64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-tilera-linux-gnu ++ exit ;; ++ vax:Linux:*:*) ++ echo ${UNAME_MACHINE}-dec-linux-gnu ++ exit ;; ++ x86_64:Linux:*:*) ++ echo x86_64-unknown-linux-gnu ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ 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 ;; ++ i*86:UNIX_SV:4.2MP:2.*) ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, ++ # I just have to hope. -- rms. ++ # Use sysv4.2uw... so that sysv4* matches it. ++ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} ++ 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.[02]*:*) ++ 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 ++ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} ++ else ++ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} ++ fi ++ 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 ;; ++ 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|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|grep '^Machine.*Pent *II' >/dev/null) \ ++ && UNAME_MACHINE=i686 ++ (/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 ;; ++ 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 i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; ++ Intel:Mach:3*:*) ++ echo i386-pc-mach3 ++ exit ;; ++ paragon:*:*:*) ++ echo i860-intel-osf1 ++ 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 ;; ++ mini*:CTIX:SYS*5:*) ++ # "miniframe" ++ echo m68010-convergent-sysv ++ 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; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { 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; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ 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; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; ++ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) ++ echo m68k-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ mc68030:UNIX_System_V:4.*:*) ++ echo m68k-atari-sysv4 ++ exit ;; ++ TSUNAMI:LynxOS:2.*:*) ++ echo sparc-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ rs6000:LynxOS:2.*:*) ++ echo rs6000-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) ++ echo powerpc-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ SM[BE]S:UNIX_SV:*:*) ++ echo mips-dde-sysv${UNAME_RELEASE} ++ exit ;; ++ RM*:ReliantUNIX-*:*:*) ++ echo mips-sni-sysv4 ++ exit ;; ++ RM*:SINIX-*:*:*) ++ echo mips-sni-sysv4 ++ exit ;; ++ *:SINIX-*:*:*) ++ if uname -p 2>/dev/null >/dev/null ; then ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ echo ${UNAME_MACHINE}-sni-sysv4 ++ else ++ echo ns32k-sni-sysv ++ fi ++ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; ++ *:UNIX_System_V:4*:FTX*) ++ # From Gerald Hewes . ++ # How about differentiating between stratus architectures? -djm ++ echo hppa1.1-stratus-sysv4 ++ exit ;; ++ *:*:*:FTX*) ++ # From seanf@swdc.stratus.com. ++ echo i860-stratus-sysv4 ++ 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 ;; ++ news*:NEWS-OS:6*:*) ++ echo mips-sony-newsos6 ++ 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 ;; ++ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. ++ echo powerpc-be-beos ++ exit ;; ++ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. ++ echo powerpc-apple-beos ++ exit ;; ++ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. ++ echo i586-pc-beos ++ exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ SX-4:SUPER-UX:*:*) ++ echo sx4-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-5:SUPER-UX:*:*) ++ echo sx5-nec-superux${UNAME_RELEASE} ++ 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 ;; ++ *:Rhapsody:*:*) ++ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} ++ exit ;; ++ *:Darwin:*:*) ++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ++ case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; ++ unknown) UNAME_PROCESSOR=powerpc ;; ++ esac ++ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} ++ exit ;; ++ *:procnto*:*:* | *:QNX:[0123456789]*:*) ++ UNAME_PROCESSOR=`uname -p` ++ if test "$UNAME_PROCESSOR" = "x86"; then ++ UNAME_PROCESSOR=i386 ++ UNAME_MACHINE=pc ++ fi ++ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} ++ exit ;; ++ *:QNX:*:4*) ++ echo i386-pc-qnx ++ exit ;; ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-?:NONSTOP_KERNEL:*:*) ++ echo nse-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSR-?:NONSTOP_KERNEL:*:*) ++ echo nsr-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ *:NonStop-UX:*:*) ++ echo mips-compaq-nonstopux ++ exit ;; ++ BS2000:POSIX*:*:*) ++ echo bs2000-siemens-sysv ++ exit ;; ++ DS/*:UNIX_System_V:*:*) ++ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} ++ exit ;; ++ *:Plan9:*:*) ++ # "uname -m" is not consistent, so use $cputype instead. 386 ++ # is converted to i386 for consistency with other x86 ++ # operating systems. ++ if test "$cputype" = "386"; then ++ UNAME_MACHINE=i386 ++ else ++ UNAME_MACHINE="$cputype" ++ fi ++ echo ${UNAME_MACHINE}-unknown-plan9 ++ exit ;; ++ *:TOPS-10:*:*) ++ echo pdp10-unknown-tops10 ++ exit ;; ++ *:TENEX:*:*) ++ echo pdp10-unknown-tenex ++ exit ;; ++ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) ++ echo pdp10-dec-tops20 ++ exit ;; ++ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) ++ echo pdp10-xkl-tops20 ++ exit ;; ++ *:TOPS-20:*:*) ++ echo pdp10-unknown-tops20 ++ exit ;; ++ *:ITS:*:*) ++ echo pdp10-unknown-its ++ 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 ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ 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 < ++# include ++#endif ++main () ++{ ++#if defined (sony) ++#if defined (MIPSEB) ++ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, ++ I don't know.... */ ++ printf ("mips-sony-bsd\n"); exit (0); ++#else ++#include ++ printf ("m68k-sony-newsos%s\n", ++#ifdef NEWSOS4 ++ "4" ++#else ++ "" ++#endif ++ ); exit (0); ++#endif ++#endif ++ ++#if defined (__arm) && defined (__acorn) && defined (__unix) ++ printf ("arm-acorn-riscix\n"); exit (0); ++#endif ++ ++#if defined (hp300) && !defined (hpux) ++ printf ("m68k-hp-bsd\n"); exit (0); ++#endif ++ ++#if defined (NeXT) ++#if !defined (__ARCHITECTURE__) ++#define __ARCHITECTURE__ "m68k" ++#endif ++ int version; ++ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; ++ if (version < 4) ++ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); ++ else ++ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); ++ exit (0); ++#endif ++ ++#if defined (MULTIMAX) || defined (n16) ++#if defined (UMAXV) ++ printf ("ns32k-encore-sysv\n"); exit (0); ++#else ++#if defined (CMU) ++ printf ("ns32k-encore-mach\n"); exit (0); ++#else ++ printf ("ns32k-encore-bsd\n"); exit (0); ++#endif ++#endif ++#endif ++ ++#if defined (__386BSD__) ++ printf ("i386-pc-bsd\n"); exit (0); ++#endif ++ ++#if defined (sequent) ++#if defined (i386) ++ printf ("i386-sequent-dynix\n"); exit (0); ++#endif ++#if defined (ns32000) ++ printf ("ns32k-sequent-dynix\n"); exit (0); ++#endif ++#endif ++ ++#if defined (_SEQUENT_) ++ struct utsname un; ++ ++ uname(&un); ++ ++ if (strncmp(un.version, "V2", 2) == 0) { ++ printf ("i386-sequent-ptx2\n"); exit (0); ++ } ++ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ ++ printf ("i386-sequent-ptx1\n"); exit (0); ++ } ++ printf ("i386-sequent-ptx\n"); exit (0); ++ ++#endif ++ ++#if defined (vax) ++# if !defined (ultrix) ++# include ++# if defined (BSD) ++# if BSD == 43 ++ printf ("vax-dec-bsd4.3\n"); exit (0); ++# else ++# if BSD == 199006 ++ printf ("vax-dec-bsd4.3reno\n"); exit (0); ++# else ++ printf ("vax-dec-bsd\n"); exit (0); ++# endif ++# endif ++# else ++ printf ("vax-dec-bsd\n"); exit (0); ++# endif ++# else ++ printf ("vax-dec-ultrix\n"); exit (0); ++# endif ++#endif ++ ++#if defined (alliant) && defined (i860) ++ printf ("i860-alliant-bsd\n"); exit (0); ++#endif ++ ++ exit (1); ++} ++EOF ++ ++$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; } ++ ++# Convex versions that predate uname can use getsysinfo(1) ++ ++if [ -x /usr/convex/getsysinfo ] ++then ++ case `getsysinfo -f cpu_type` in ++ c1*) ++ echo c1-convex-bsd ++ exit ;; ++ c2*) ++ if getsysinfo -f scalar_acc ++ then echo c32-convex-bsd ++ else echo c2-convex-bsd ++ fi ++ exit ;; ++ c34*) ++ echo c34-convex-bsd ++ exit ;; ++ c38*) ++ echo c38-convex-bsd ++ exit ;; ++ c4*) ++ echo c4-convex-bsd ++ exit ;; ++ esac ++fi ++ ++cat >&2 < in order to provide the needed ++information to handle your system. ++ ++config.guess timestamp = $timestamp ++ ++uname -m = `(uname -m) 2>/dev/null || echo unknown` ++uname -r = `(uname -r) 2>/dev/null || echo unknown` ++uname -s = `(uname -s) 2>/dev/null || echo unknown` ++uname -v = `(uname -v) 2>/dev/null || echo unknown` ++ ++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` ++/bin/uname -X = `(/bin/uname -X) 2>/dev/null` ++ ++hostinfo = `(hostinfo) 2>/dev/null` ++/bin/universe = `(/bin/universe) 2>/dev/null` ++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` ++/bin/arch = `(/bin/arch) 2>/dev/null` ++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` ++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` ++ ++UNAME_MACHINE = ${UNAME_MACHINE} ++UNAME_RELEASE = ${UNAME_RELEASE} ++UNAME_SYSTEM = ${UNAME_SYSTEM} ++UNAME_VERSION = ${UNAME_VERSION} ++EOF ++ ++exit 1 ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "timestamp='" ++# time-stamp-format: "%:y-%02m-%02d" ++# time-stamp-end: "'" ++# End: +--- adjtimex-1.29.orig/debian/compat ++++ adjtimex-1.29/debian/compat +@@ -0,0 +1 @@ ++5 +--- adjtimex-1.29.orig/debian/changelog ++++ adjtimex-1.29/debian/changelog +@@ -0,0 +1,753 @@ ++adjtimex (1.29-2.2) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * Make the package multiarch-ready: add build-arch and build-indep ++ build targets ++ * Fix pending l10n issues. Debconf translations: ++ - Vietnamese (Clytie Siddall). Closes: #601529 ++ - Brazilian Portuguese (Flamarion Jorge). Closes: #610409 ++ - Dutch (Michiel Sikkes). Closes: #625744 ++ ++ -- Christian Perrier Mon, 04 Jul 2011 07:06:43 +0200 ++ ++adjtimex (1.29-2.1) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * Fix pending l10n issues. Debconf translations: ++ - Czech (Martin Sin). Closes: #589289 ++ - BokmÃ¥l, Norwegian (Bjørn Steensrud). Closes: #600279 ++ ++ -- Christian Perrier Tue, 19 Oct 2010 07:14:50 +0200 ++ ++adjtimex (1.29-2) unstable; urgency=low ++ ++ * debian/postinst: check conffile for corruption (Closes:Bug#571633, ++ thanks to Savvas Radevic for the idea, though I ++ chose a different implementation.) ++ ++ -- James R. Van Zandt Tue, 25 May 2010 20:49:21 -0400 ++ ++adjtimex (1.29-1) unstable; urgency=low ++ ++ * New upstream release: Document the --force-adjust ++ option. --force-adjust suppresses warning printouts. Relax sanity ++ check to +- 1 percent. ++ ++ * debian/adjtimexconfig: Use --force-adjust option, so adjustment is ++ applied even if system clock is way off. (Thanks to Santiago Vila ++ for helping to diagnose the problem. ++ Closes:Bug#557949, #559882) ++ ++ * debian/adjtimex.init: fix LSB comment header: require $local_fs, start ++ in S ++ ++ -- James R. Van Zandt Fri, 16 Apr 2010 20:08:49 -0400 ++ ++adjtimex (1.28-4) unstable; urgency=low ++ ++ * Update debconf template translations: ++ Swedish (Thanks to Martin Bagge , Closes:Bug#572579) ++ ++ -- James R. Van Zandt Wed, 17 Mar 2010 19:51:06 -0400 ++ ++adjtimex (1.28-3) unstable; urgency=low ++ ++ * Update debconf template translations: ++ Swedish (Thanks to Martin Bagge , Closes:Bug#562932) ++ Russian (thanks to Yuri Kozlov , Closes:Bug#563347) ++ Finnish (thanks to Esko =?UTF-8?Q?Araj=C3=A4rvi?= , ++ Closes:Bug#564508) ++ ++ * debian/control: bump standards version to 3.8.4 (no changes needed) ++ ++ -- James R. Van Zandt Mon, 08 Feb 2010 20:19:44 -0500 ++ ++adjtimex (1.28-2) unstable; urgency=low ++ ++ * Move Swedish and Russian template translations to the correct directory ++ (thanks to Martin Bagge for pointing out the ++ problem). ++ ++ * debian/control: bump standards version to 3.8.3 (no changes needed) ++ ++ -- James R. Van Zandt Fri, 05 Feb 2010 21:42:54 -0500 ++ ++adjtimex (1.28-1) unstable; urgency=low ++ ++ * New upstream release: (compare): Correctly apply +-500 ppm sanity ++ check (Thanks to Jacques luder ) ++ ++ * Update debconf template translations: ++ Swedish (thanks to: Martin Bagge , ++ Closes:Bug#533567) ++ Russian (thanks to: Yuri Kozlov , ++ Closes:Bug#532068) ++ ++ -- James R. Van Zandt Sat, 07 Nov 2009 11:59:29 -0500 ++ ++adjtimex (1.27.1-4) unstable; urgency=low ++ ++ * Update translations: ++ Japanese (thanks to: Hideki Yamane, henrich @ debian.or.jp. ++ Closes:Bug#538242) ++ Spanish (Thanks to Francisco Javier Cuadrado , ++ Closes:Bug#538425) ++ ++ -- James R. Van Zandt Sun, 26 Jul 2009 17:36:16 -0400 ++ ++adjtimex (1.27.1-3) unstable; urgency=low ++ ++ * Update translations: ++ Japanese (thanks to: Hideki Yamane, henrich @ debian.or.jp. ++ Closes:Bug#525233) ++ Swedish (thanks to: Martin Bagge . Closes:Bug#525924) ++ Spanish (thanks to: Francisco Javier Cuadrado , ++ Closes:Bug#528621) ++ Russian (thanks to: Yuri Kozlov , Closes:Bug#529047) ++ Czech (thanks to: Martin Sin , Closes:Bug#529652) ++ ++ -- James R. Van Zandt Tue, 26 May 2009 20:47:42 -0400 ++ ++adjtimex (1.27.1-2) unstable; urgency=low ++ ++ * Debconf templates and debian/control reviewed by the debian-l10n- ++ english team as part of the Smith review project. Closes: #519431 ++ * Update translation: ++ French (Closes:Bug#520986) ++ ++ -- James R. Van Zandt Wed, 20 May 2009 22:03:38 -0400 ++ ++adjtimex (1.27.1-1) unstable; urgency=low ++ ++ * New upstream release. Provide workaround if linux/rtc.h ++ is missing (Closes:#308864) ++ ++ * debian/rules: delete config temporaries, but not config.h.in ++ * debian/control: bump version to 3.8.1 (no changes needed) ++ ++ * Update translations: ++ Japanese (Thanks to: henrich@debian.or.jp [188] Closes:Bug#522188) ++ Czech (Thanks to: martin.sin@zshk.cz [219] Closes:Bug#522193) ++ Swedish (Thanks to: brother@bsnet.se [194] Closes:Bug#522979) ++ Basque (Thanks to: pi+debian@beobide.net [207] Closes:Bug#523079) ++ Italian (Thanks to: vinz65@gmail.com [197] Closes:Bug#523419) ++ Spanish (Thanks to: fcocuadrado@gmail.com [193] Closes:Bug#523915) ++ Russian (Thanks to: yuray@komyakino.ru [223] Closes:Bug#524069) ++ German (Thanks to: schanzi_@gmx.de [226] Closes:Bug#524224) ++ Portuguese (Thanks to: carloslisboa@gmail.com [170] Closes:Bug#524283) ++ Danish (Thanks to: debian@overbygaard.dk [209] Closes:Bug#524368) ++ Galician (Thanks to: mvillarino@gmail.com [216] Closes:Bug#524397) ++ ++ -- James R. Van Zandt Sat, 18 Apr 2009 16:35:22 -0400 ++ ++adjtimex (1.27-1) unstable; urgency=low ++ ++ * New upstream release. If using update interrupt, sanity check the ++ delay. Sometimes the status includes an update complete flag, but it ++ actually didn't wait. Fall back to another method of reading RTC ++ (closes:Bug#517732) Calculate RTC correction as PPM of RTC time ++ (Thanks to Alain Guibert, closes:Bug#308863). ++ ++ * debian/control: add ${misc:Depends} per lintian warning. ++ ++ -- James R. Van Zandt Sun, 22 Mar 2009 21:54:51 -0400 ++ ++adjtimex (1.26-2) unstable; urgency=low ++ ++ * debian/templates: Clarify wording: ask about running "when installed ++ or upgraded" not just "at installation time" (thanks to Uwe Storbeck ++ and Michael Meskes , ++ Closes:Bug#514987) ++ ++ * debian/postinst: don't prepend path to command running adjtimexconfig ++ to silence lintian complaint. (The package management system already ++ puts /usr/sbin in path, because that's where install-info is.) ++ ++ -- James R. Van Zandt Sat, 14 Feb 2009 11:46:24 -0500 ++ ++adjtimex (1.26-1) unstable; urgency=low ++ ++ * New upstream release. Fix a possible hang with the Intersil ISL1208, ++ one of those new non-PC-compatible RTCs. Cleanly exits with an error ++ message, instead of either hang or returning garbage. (Thanks to Alain ++ Guibert). ++ ++ * debian/control: bump Debian policy version to 3.8.0 (no changes needed) ++ ++ * debian/rules: use "filter" instead of "findstring" to parse ++ DEB_BUILD_OPTIONS. ++ ++ -- James R. Van Zandt Sun, 17 Aug 2008 17:52:14 -0400 ++ ++adjtimex (1.25-1) unstable; urgency=low ++ ++ * New upstream release. Set an alarm to avoid blocking even if /dev/rtc ++ never becomes readable, then fall back to busywait. New --nointerrupt ++ option to force busywait without first waiting for the interrupt ++ timeout (thanks to Alain Guibert). (closes:Bug#477637,Bug#474337). ++ Update man page (closes:Bug#435956). ++ ++ -- James R. Van Zandt Fri, 08 Aug 2008 19:43:38 -0400 ++ ++adjtimex (1.24-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ * adjtimex.c: Reorganize cmos_read_time() to properly integrate the ++ fallback case for when /dev/rtc has no interrupts. Make this fallback ++ actually work. fixes partially(?) Debian bug #460065 (Thanks to Alain ++ Guibert ) (closes:Bug#471203) ++ ++ * (cmos_read_time): Fix Y2K bug: read century from byte 50, instead of ++ assuming we're in the range 1969-2068. ++ ++ * Implement second kind of busywait (busywait_second_change): when ++ /dev/rtc interrupt is not available, fallbacks to loops around ++ ioctl(RTC_RD_TIME) until the RTC second changes. Patch applies to ++ adjtimex 1.23 above first no-interrupt-fallback.patch fixes ++ partially(?) Debian bug #460065 (Thanks to: Alain Guibert ++ ) ++ ++ * (cmos_read_time) If /dev/rtc does not exist then automatically ++ fallback to /dev/rtc0, so it works even without symlink. (Thanks to: ++ Alain Guibert ) ++ ++ * adjtimex.c (main): fix typo in options handling (thanks to Miroslav ++ Lichvar ) ++ ++ * debian/control: bump Debian policy version to 3.7.3 (no changes needed) ++ ++ * debian/dirs: don't install empty directory /usr/bin ++ ++ -- James R. Van Zandt Fri, 04 Apr 2008 22:05:01 -0400 ++ ++adjtimex (1.23-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ * adjtimex.c (compare): In case of absence of /etc/adjtime, do not fail, ++ and do not force users to manually create it with 0.0 ++ content. Instead, proceed assuming zero values (meaning RTC does not ++ drift). Also replace redundant code by a call to ++ get_cmos_adjustment(). README: Rewrite USAGE paragraph. Remove point ++ about creating zero adjfile. Document new behaviour without ++ adjfile. Remove reference to the long outdated clock(8). Update URL ++ for hwclock(8). (Thanks to Alain Guibert , ++ closes:bug#445448) ++ ++ * adjtimex.c (busy_wait): timestamp more closely the RTC clock beat ++ (thanks to Alain Guibert , see Debian ++ bug#443814). (usage): --directisa switch forces adjtimex to poll the ++ update-in-process (UIP) flag of the CMOS clock (thanks to Alain ++ Guibert , closes:bug#443773). ++ ++ -- James R. Van Zandt Sat, 06 Oct 2007 21:57:04 -0400 ++ ++adjtimex (1.22-1) unstable; urgency=low ++ ++ * New upstream release: fix these bugs in ntpdate output ++ interpretation (closes:bug#438718): ++ adjtimex has a bug in evaluating the output of ntpdate, because ++ 1. it assumes ntpdate outputs "adjust time server", but ntpdate ++ may output "step time server" also ++ 2. it doesnt stop at last line but as soon as it has found "filter ++ offset:" lines, and because of this it will not find the "offset ..." ++ information in the last line. ++ ++ -- James R. Van Zandt Sun, 23 Sep 2007 12:51:52 -0400 ++ ++adjtimex (1.21.1-3) unstable; urgency=low ++ ++ * update German translation of debconf templates, thanks to Erik Schanze ++ and Helge Kreutzmann ++ (closes:#436080) ++ ++ * debian/rules don't ignore failure of "make distclean" ++ ++ * debian/adjtimex.init: make LSB compliant ++ ++ -- James R. Van Zandt Mon, 06 Aug 2007 21:39:47 -0400 ++ ++adjtimex (1.21.1-2) unstable; urgency=low ++ ++ * Update French translation of debconf templates, thanks to Christian ++ Perrier (closes:Bug#403472) ++ ++ -- James R. Van Zandt Sun, 7 Jan 2007 18:10:32 -0500 ++ ++adjtimex (1.21.1-1) unstable; urgency=low ++ ++ * New upstream release. ++ ++ * adjtimex.c: don't declare adjtimex syscall (should already be getting ++ the declaration from sys/timex.h) Thanks to Andreas Jochens ++ (closes:#390989) ++ ++ -- James R. Van Zandt Sat, 7 Oct 2006 08:04:52 -0400 ++ ++adjtimex (1.21-2) unstable; urgency=low ++ ++ * Makefile: correct version number to 1.21 (error in importing upstream ++ sources) ++ ++ * debian/control: depend on po-debconf ++ ++ -- James R. Van Zandt Fri, 6 Oct 2006 20:41:00 -0400 ++ ++adjtimex (1.21-1) unstable; urgency=low ++ ++ * New upstream release. use /dev/rtc if available (closes:#196692). Use ++ heuristic to correct for DST changes or lacking --utc flag ++ (closes:#308396). check return code in probe_time() so if root ++ privileges are needed (e.g. "adjtimex -r") and lacking, command will ++ fail rather than printing bogus results. (closes:#364060) ++ ++ * debian/postinst: start with invoke-rc.d if available (closes:#367746) ++ ++ * debian/control: update to policy 3.7.2 ++ ++ -- James R. Van Zandt Sat, 20 May 2006 08:33:05 -0400 ++ ++adjtimex (1.20-7) unstable; urgency=low ++ ++ * debian/README.Debian: correct references to files, which are no longer ++ in /usr/doc/adjtimex (closes:#365761) ++ * debian/rules: declare debhelper compat level 5 ++ * debian/control: build-depends on debhelper ver 5 ++ ++ -- James R. Van Zandt Thu, 4 May 2006 21:54:33 -0400 ++ ++adjtimex (1.20-6) unstable; urgency=low ++ ++ * control: depend on debconf | debconf-2.0 (closes: #331733), update to ++ policy 3.6.2 ++ * debian/po/de.po: fix spelling error in German translation, thanks to ++ Philipp Meier (closes: #279254) ++ * debian/po/sv.po: Swedish translation for debconf template, courtesy ++ of Daniel Nylander (closes: #333124) ++ * debian/po: Add Portugese translation for debconf template, courtesy of ++ Miguel Figueiredo (closes: #336333) ++ * debian/po: Add Russian translation for debconf template, courtesy of ++ Yuri Kozlov (closes: #337967) ++ * debian/copyright: update FSF address. ++ ++ -- James R. Van Zandt Fri, 25 Nov 2005 21:04:08 -0500 ++ ++adjtimex (1.20-5) unstable; urgency=low ++ ++ * debian/po/vi.po: Vietnamese translation for debconf template, courtesy ++ of Clytie Siddall (closes:Bug#307600) ++ ++ -- James R. Van Zandt Sat, 7 May 2005 11:58:47 -0400 ++ ++adjtimex (1.20-4) unstable; urgency=low ++ ++ * debian/po/cs.po: Czech translation for debconf template, courtesy of ++ Martin Šín (closes:Bug#304377) ++ ++ -- James R. Van Zandt Mon, 25 Apr 2005 20:14:42 -0400 ++ ++adjtimex (1.20-3) unstable; urgency=low ++ ++ * debian/adjtimex.init: adjust printout to conform to Debian standard, ++ output error to stderr (Thanks to Thomas Hood, closes:bug#294824) ++ ++ -- James R. Van Zandt Sun, 13 Mar 2005 17:20:28 -0500 ++ ++adjtimex (1.20-2) unstable; urgency=low ++ ++ * debian/po/de.po: replace corrupted file (closes: #250250) ++ ++ -- James R. Van Zandt Mon, 20 Sep 2004 20:08:47 -0400 ++ ++adjtimex (1.20-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ * adjtimex.c (compare): in "compare" or "adjust", return immediately ++ after printing last result, instead of sleeping an extra $interval ++ seconds. (Thanks to Alain Guibert , ++ closes:Bug#243652) ++ ++ * postinst: remove /etc/rcS.d/S20adjtimex link if configured not to run ++ at startup (thanks to Mario 'BitKoenig' Holbe, closes:Bug#267229) ++ ++ -- James R. Van Zandt Sun, 19 Sep 2004 12:41:37 -0400 ++ ++adjtimex (1.19-1) unstable; urgency=high ++ ++ * copyright: report upstream source address (closes:Bug#269691) ++ ++ * control: don't depend on either mawk or awk, since either works and ++ awk is required (closes:Bug#267228) ++ ++ * New upstream release ++ ++ * adjtimex.c (compare): Account for the current frequency value ++ when calculating the recommended frequency value. Simplify ++ calculation of recommended tick. (compare): print estimated system ++ error in ppm instead of obscure "second diff". ++ ++ * adjtimex.8: use 2^16 instead of the more obscure 1<<16. ++ ++ * adjtimex.c: revert to poll-wait instead of using /dev/rtc, because the ++ latter only provides time with one second precision and so gives ++ wildly inaccurate adjustments. (closes:Bug#269498,Bug#265839) ++ ++ -- James R. Van Zandt Sat, 11 Sep 2004 16:01:52 -0400 ++ ++adjtimex (1.18-1.1) unstable; urgency=medium ++ ++ * Non-maintainer upload prepared by Joshua Kwan and Ken Bloom. ++ * Applied patch from Jurij Smakov to #263401: ++ - Fixes the regular expression used to extract the baseline value ++ from the adjtimex output. Closes: #263401 ++ - Replaces non-POSIX compliant calls to ('tail -1') by the ++ POSIX-compliant ones ('tail -n 1') ++ - Cosmetic changes to the adjtimexconfig output, making it ++ consistent with the general Debian style. ++ * Add German debconf template translations (closes: #250250) ++ ++ -- Ken Bloom Thu, 12 Aug 2004 23:34:33 -0700 ++ ++adjtimex (1.18-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ * call reset_time_status() only when explicitly told to (thanks to Alain ++ Guibert , closes:bug#243031) ++ ++ * Add debconf translations for Japanese (closes:bug#223462), Danish ++ (closes:bug#239865), and Brazilian Portuguese (closes:bug#228281). ++ ++ -- James R. Van Zandt Sun, 11 Apr 2004 18:32:33 -0400 ++ ++adjtimex (1.17-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ * control: compliant with Debian policy version 3.6.1 ++ ++ * es.po: decode "quoted-printable" encoding. ++ ++ * adjtimex.c: update email ++ (main): If adjtimex() returns an error, print HZ and legal ranges ++ for tick and freq. (thanks to Sami Farin ) ++ (review): calculate reasonable tick and frequency when HZ != 100. ++ (cmos_init): use /dev/rtc when available (thanks to Richard ++ Henderson ). ++ ++ * adjtimex.c: --status switch sets clock status (courtesy of Alain ++ Guibert ) (closes:bug#242732) ++ ++ * adjtimexconfig: set reasonable tick and frequency when HZ != ++ 100. (closes:Bug#241726) ++ ++ * adjtimex.c (longopt): fix spelling to match documentation: --esterror ++ and --maxerror (thanks to Alain Guibert) (fixes:Bug#241863) ++ ++ -- James R. Van Zandt Sat, 3 Apr 2004 21:13:09 -0500 ++ ++adjtimex (1.16-3) unstable; urgency=low ++ ++ * Dutch translation of gettext debconf templates (courtesy of Michiel Sikkes, closes:bug#215162) ++ ++ -- James R. Van Zandt Sun, 12 Oct 2003 17:33:55 -0400 ++ ++adjtimex (1.16-2) unstable; urgency=low ++ ++ * Polish translation of gettext debconf templates (courtesy of Bartosz ++ Zapalowski, closes:bug#208955) ++ ++ -- James R. Van Zandt Sun, 7 Sep 2003 16:26:30 -0400 ++ ++adjtimex (1.16-1) unstable; urgency=low ++ ++ * New upstream release (closes:Bug#204382)(closes:Bug#204377) ++ ++ -- James R. Van Zandt Sun, 24 Aug 2003 20:52:32 -0400 ++ ++adjtimex (1.15.1-2) unstable; urgency=low ++ ++ * gettext-based debconf templates (closes:bug#205788) ++ * French translation of gettext debconf templates (closes:Bug#206430) ++ * Spanish translation of gettext debconf templates (closes:Bug#197485) ++ ++ -- James R. Van Zandt Sun, 24 Aug 2003 18:01:56 -0400 ++ ++adjtimex (1.15.1-1) unstable; urgency=low ++ ++ * New upstream release. Add explicit newlines in multi-line help text ++ (closes:bug#194858) ++ ++ -- James R. Van Zandt Sat, 31 May 2003 20:53:14 -0400 ++ ++adjtimex (1.15-1) unstable; urgency=low ++ ++ * New upstream release. Now compiles on ia64 (closes:bug#141655). ++ ++ -- James R. Van Zandt Wed, 30 Apr 2003 19:38:11 -0400 ++ ++adjtimex (1.14-1) unstable; urgency=low ++ ++ * New Upstream Release. Expanded documentation (closes:bug#142967) ++ * convert to debhelper ++ * debian/control: depend on debconf ++ * debian/postinst: configure adjtimex to run on startup, and run ++ adjtimexconfig on installation, only if asked by sysadmin (via ++ debconf) (closes:bug#158047) ++ * debian/postrm: purge debconf db entry ++ * debian/adjtimexconfig: config file is now /etc/default/adjtimex ++ ++ -- James R. Van Zandt Sun, 27 Apr 2003 21:28:40 -0400 ++ ++adjtimex (1.13-1) unstable; urgency=low ++ ++ * New upstream release (closes:Bug#127483) ++ ++ -- James R. Van Zandt Sun, 6 Jan 2002 21:06:23 -0500 ++ ++adjtimex (1.12-3) unstable; urgency=low ++ ++ * New maintainer email (fix remaining references) ++ ++ -- James R. Van Zandt Sun, 9 Dec 2001 15:25:06 -0500 ++ ++adjtimex (1.12-2) unstable; urgency=low ++ ++ * New maintainer email ++ ++ -- James R. Van Zandt Sun, 9 Dec 2001 13:24:59 -0500 ++ ++adjtimex (1.12-1) unstable; urgency=low ++ ++ * New upstream release ++ * debian/control: move Build-Depends entry to source section ++ (closes:bug#91928). Policy version 3.5.2 ++ * debian/rules: by default, compile without -g option. Honor ++ DEB_BUILD_OPTIONS. ++ ++ -- James R. Van Zandt Wed, 22 Nov 2000 01:37:58 -0500 ++ ++adjtimex (1.11-3) unstable; urgency=low ++ ++ * adjtimexconfig: install new values in /etc/adjtimex.conf rather than ++ the startup script /etc/init.d/adjtimex (thanks to Zsolt Szabo ++ ). ++ ++ -- James R. Van Zandt Sat, 30 Sep 2000 09:34:58 -0400 ++ ++adjtimex (1.11-2) unstable; urgency=low ++ ++ * build-depends on debmake ++ ++ -- James R. Van Zandt Sun, 3 Sep 2000 13:50:02 -0400 ++ ++adjtimex (1.11-1) unstable; urgency=low ++ ++ * /etc/init.d/adjtimex: restart|force-reload also run adjtimex ++ (closes:bug#69514), add comment explaining precedence of ++ /etc/adjtimex.conf ++ ++ * New upstream release ++ ++ -- James R. Van Zandt Mon, 28 Aug 2000 21:19:48 -0400 ++ ++adjtimex (1.10-1) frozen unstable; urgency=high ++ ++ * New upstream release - security fix: use popen() to recover output from ++ ntpdate, instead of an unsafe temporary file (thanks to Colin Phipps ++ ) (closes:bug#56752) ++ ++ -- James R. Van Zandt Tue, 1 Feb 2000 21:29:03 -0500 ++ ++adjtimex (1.9-2) unstable; urgency=low ++ ++ * Suggest ntpdate (closes:bug#56751) ++ ++ -- James R. Van Zandt Mon, 31 Jan 2000 19:26:16 -0500 ++ ++adjtimex (1.9-1) unstable; urgency=low ++ ++ * New upstream release ++ * Removed pointer to /usr/doc/copyright/GPL ++ ++ -- James R. Van Zandt Mon, 3 Jan 2000 21:34:59 -0500 ++ ++adjtimex (1.8.1-1) unstable; urgency=low ++ ++ * New upstream release (closes:bug#52637) ++ ++ -- James R. Van Zandt Thu, 16 Dec 1999 20:13:43 -0500 ++ ++adjtimex (1.8-4) unstable; urgency=low ++ ++ * Change references from /usr/sbin/adjtimex to /sbin/adjtimex in ++ adjtimexconfig ++ ++ -- James R. Van Zandt Tue, 2 Nov 1999 20:21:48 -0500 ++ ++adjtimex (1.8-3) unstable; urgency=low ++ ++ * *Really* install binary into /sbin, so it is available ++ even if /usr is not mounted (closes:Bug#44399) ++ ++ -- James R. Van Zandt Sat, 30 Oct 1999 17:57:57 -0400 ++ ++adjtimex (1.8-2) unstable; urgency=low ++ ++ * Install compatibility symlink /usr/doc/adjtimex. ++ ++ -- James R. Van Zandt Sun, 24 Oct 1999 10:54:01 -0400 ++ ++adjtimex (1.8-1) unstable; urgency=low ++ ++ * New upstream release: Install binary into /sbin, so it is available ++ even if /usr is not mounted (closes:Bug#44399) ++ ++ -- James R. Van Zandt Mon, 6 Sep 1999 13:08:15 -0400 ++ ++adjtimex (1.7-2) unstable; urgency=low ++ ++ * Link against glibc2.1 ++ * Upgrade to FHS ++ * Include full license statement in copyright file ++ * Revise GPL reference in copyright file ++ ++ -- James R. Van Zandt Sat, 4 Sep 1999 12:04:34 -0400 ++ ++adjtimex (1.7-1) unstable; urgency=low ++ ++ * install configuration file in /etc/init.d rather than /etc/rc.boot ++ closes: #30120, #32436. ++ * New upstream release (incorporates Paul Slootman's alpha patch) ++ ++ -- James R. Van Zandt Sat, 28 Nov 1998 20:33:38 -0500 ++ ++adjtimex (1.6-2) unstable; urgency=low ++ ++ * corrected reference in man page: clock -> hwclock (Bug#27854) ++ ++ -- James R. Van Zandt Sat, 24 Oct 1998 14:40:45 -0400 ++ ++adjtimex (1.6-1.1) unstable; urgency=low ++ ++ * non-maintainer (binary-only) upload for Alpha ++ * changed architecture back to 'any'. Why should it be i386 only? ++ * don't use syscall1() to declare adjtimex() for Alpha ++ ++ -- Paul Slootman Tue, 8 Sep 1998 20:42:52 +0200 ++ ++adjtimex (1.6-1) unstable; urgency=low ++ ++ * New upstream release: Default log file is "/var/log/clocks.log". ++ Create log file if it does not exist. (Bug#25834) ++ ++ -- James R. Van Zandt Sat, 22 Aug 1998 20:33:22 -0400 ++ ++adjtimex (1.5-3) unstable; urgency=low ++ ++ * architecture is i386 only ++ ++ -- James R. Van Zandt Mon, 29 Jun 1998 19:35:22 -0400 ++ ++adjtimex (1.5-2) unstable; urgency=low ++ ++ * eliminate question in postinst, by eliminating postinst entirely ++ (Bug#22288) ++ ++ -- James R. Van Zandt Sun, 7 Jun 1998 20:51:42 -0400 ++ ++adjtimex (1.5-1) frozen unstable; urgency=low ++ ++ * New upstream release. No functional changes, but adjtimex is now ++ covered by the GNU GPL. (Bug#21358) ++ ++ -- James R. Van Zandt Mon, 20 Apr 1998 21:38:53 -0400 ++ ++adjtimex (1.4-2) unstable; urgency=low ++ ++ * Ensure that changelog is compressed *before* calculating md5sum ++ (Bug#19266) ++ ++ -- James R. Van Zandt Sat, 14 Mar 1998 20:47:52 -0500 ++ ++adjtimex (1.4-1) unstable; urgency=low ++ ++ * New upstream release. Log times for long-term estimation of drifts. ++ ++ -- James R. Van Zandt Thu, 11 Dec 1997 21:48:01 -0500 ++ ++adjtimex (1.3-3) stable; urgency=medium ++ ++ * Moved temporary files from /tmp to /etc, to eliminate security ++ hole (bug #11610). ++ ++ -- Jim Van Zandt Sun, 3 Aug 1997 11:34:48 -0400 ++ ++adjtimex (1.3-2) stable; urgency=medium ++ ++ * Removed conflict with xntp, since ntpdate from the xntp package ++ is still compatible with adjtimex. ++ ++ -- Jim Van Zandt Wed, 12 Mar 1997 21:01:05 -0500 ++ ++adjtimex (1.3-1) unstable; urgency=HIGH ++ ++ * New upstream version: Previous version allows 2.0 kernel to reset ++ the CMOS clock periodically. Now using different method of ++ preventing this. ++ * New --compare switch to compare system and CMOS clocks (replacing ++ the separate program clockdiff) and suggest better values of time ++ parameters. New --adjust switch to actually install the suggested ++ values. GNU format long switches, including --help and --version. ++ * Revised conftimex to use --adjust switch instead of clockdiff. ++ * Renamed conftimex to adjtimexconfig per Debian recommendation. ++ * Added conftimex man page. ++ * Revised messages in postinst to better explain what is going on. ++ * Conflicts with xntp ++ * New maintainer ++ ++ -- Jim Van Zandt Sat, 1 Mar 1997 18:03:35 -0500 ++ ++adjtimex (1.2-5) unstable; urgency=LOW ++ ++ * New packaging format ++ * Corrected comment in /etc/rc.boot/adjtimex ++ * Corrected the installation of doc files ++ ++ -- Michael Meskes Wed, 18 Sep 1996 09:22:51 +0200 ++ ++Fri May 17 12:48:07 MET DST 1996 Michael Meskes (meskes@debian.org) ++ ++ adjtimex (1.2-1): ++ ++ * Added Debian Linux package maintenance system files. ++ ++Fri May 17 20:39:30 MET DST 1996 Michael Meskes (meskes@debian.org) ++ ++ adjtimex (1.2-2): ++ ++ * Corrected mode for /etc/rc.boot/adjtimex ++ ++ * Added conftimex script ++ ++ * Automatically configure system ++ ++Sun Jun 30 13:17:53 MET DST 1996 Michael Meskes (meskes@debian.org) ++ ++ adjtimex (1.2-3): ++ ++ * Corrected rules file for new naming scheme ++ ++ * Gzip manpage ++ ++ * Strip binaries ++ ++Tue Jul 2 10:01:35 MET DST 1996 Michael Meskes (meskes@debian.org) ++ ++ adjtimex (1.2-4): ++ ++ * Really say what we're doing in postinst (Bug#3474) ++ ++ +--- adjtimex-1.29.orig/debian/adjtimexconfig.8 ++++ adjtimex-1.29/debian/adjtimexconfig.8 +@@ -0,0 +1,41 @@ ++.\"{{{ Title Emacs major mode should be: -*- nroff -*- ++.TH ADJTIMEXCONFIG 8 "April 27, 2003" ++.\"}}} ++.\"{{{ Name ++.SH NAME ++adjtimexconfig \- find kernel clock variables and save for reboots ++.\"}}} ++.\"{{{ Synopsis ++.SH SYNOPSIS ++.ad l ++.\" commands only ++.B /sbin/adjtimexconfig ++.\"}}} ++.\"{{{ Config ++.SH DESCRIPTION ++This script uses \fBadjtimex\fP(8) to find values for the kernel ++variables \fBtick\fP and \fBfrequency\fP that will make the system ++clock approximately agree with the CMOS clock. It then saves these ++values in the configuration file \fI/etc/default/adjtimex\fP so the ++settings will be restored on every boot, when ++\fI/etc/init.d/adjtimex\fP runs. ++.P ++\fPadjtimexconfig\fP uses the drift rate recorded in ++\fI/etc/adjtime\fP to adjust the times it reads from the CMOS clock. ++If you find the CMOS clock has a systematic drift, read the ++\fBclock\fP(8) or \fBhwclock\fP(8) manual page, modify ++\fI/etc/adjtime\fP as required, and run \fBadjtimexconfig\fP again. ++.SH AUTHOR ++Michael Meskes . ++.\"}}} ++.\"{{{ ++.SH FILES ++.nf ++\fI/etc/default/adjtimex\fP ++\fI/etc/init.d/adjtimex\fP ++.fi ++.\"}}} ++.\"{{{ See also ++.SH "SEE ALSO" ++.BR adjtimex "(8), "clock "(8), "hwclock "(8), "ntpd (8) ++.\"}}} +--- adjtimex-1.29.orig/debian/adjust ++++ adjtimex-1.29/debian/adjust +@@ -0,0 +1,15 @@ ++ mode: 16384 ++ offset: 0 ++ frequency: 0 ++ maxerror: 0 ++ esterror: 0 ++ status: 0 ++time_constant: 0 ++ precision: 0 ++ tolerance: 0 ++ tick: 0 ++ raw time: 0s 0us = 0.000000 ++for this kernel: ++ USER_HZ = 100 (nominally 100 ticks per second) ++ 9000 <= tick <= 11000 ++ -33554432 <= frequency <= 33554432 +--- adjtimex-1.29.orig/debian/dirs ++++ adjtimex-1.29/debian/dirs +@@ -0,0 +1,3 @@ ++usr/sbin ++sbin ++usr/share/man/man8 +--- adjtimex-1.29.orig/debian/adjtimexconfig ++++ adjtimex-1.29/debian/adjtimexconfig +@@ -0,0 +1,67 @@ ++#!/bin/sh ++ ++conffile=/etc/default/adjtimex ++startfile=/etc/init.d/adjtimex ++ ++echo -n "Comparing clocks (this will take 70 sec)..." ++ ++# Get the parameters ++ ++/sbin/adjtimex --print --tick 0 >/etc/adj.adjust 2>/dev/null ++baseline=`awk '/<= tick/{print ($1+$NF)/2}' /etc/adj.adjust` ++hz=`awk '/USER_HZ/{print $3}' /etc/adj.adjust` ++/sbin/adjtimex --tick $baseline --frequency 0 ++/sbin/adjtimex --adjust --force-adjust >/etc/adj.adjust ++echo "done." ++ticks=`tail -n 1 /etc/adj.adjust|awk '{print $6}'` ++freq=`tail -n 1 /etc/adj.adjust|awk '{print $7}'` ++# cat /etc/adj.adjust ++# echo hz=$hz baseline=$baseline ticks=$ticks freq=$freq ++rm /etc/adj.adjust ++adjt=`awk "BEGIN{print (($ticks-$baseline)*$hz + $freq/65536.)*.0864}"` ++echo -n "Adjusting system time by ${adjt} sec/day to agree with CMOS clock..." ++ ++# Recreate /etc/adjtimex.conf if necessary ++ ++if [ -f $conffile ]; then ++# echo "using existing $conffile"; ++ true; ++else ++cat >$conffile <$conffile.TMP && \ ++ mv $conffile.TMP $conffile ++ ++# grep "TICK=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.tick ++# grep "FREQ=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.freq ++# ++# TICKLINE="`echo -n "TICK="$ticks" # old: "; cat /etc/adj.tick`" ++# FREQLINE="`echo -n "FREQ="$freq" # old: "; cat /etc/adj.freq`" ++# ++# cp /etc/init.d/adjtimex /etc/init.d/adjtimex.TMP ++# sed -e "s/^TICK=.*/$TICKLINE/" -e "s/^FREQ=.*/$FREQLINE/" \ ++# < /etc/init.d/adjtimex.TMP > /etc/init.d/adjtimex ++# ++# if [ -s /etc/init.d/adjtimex ] ++# then ++# rm -f /etc/init.d/adjtimex.TMP ++# fi ++# rm -f /etc/adj.tick /etc/adj.freq /etc/adj.adjust ++rm -f /etc/adj.adjust ++echo "done." ++ +--- adjtimex-1.29.orig/debian/postrm ++++ adjtimex-1.29/debian/postrm +@@ -0,0 +1,25 @@ ++#! /bin/sh -e ++ ++case "$1" in ++ purge) ++ rm -f /etc/adjtimex.conf /etc/default/adjtimex ++ update-rc.d adjtimex remove >/dev/null ++ if [ -e /usr/share/debconf/confmodule ]; then ++ # Source debconf library. ++ . /usr/share/debconf/confmodule ++ # Remove my changes to the db. ++echo "removing debconf db entries" ++ db_purge ++echo "removed debconf db entries" ++ fi ++ ;; ++ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ++ exit 0 ++ ;; ++ *) ++ echo "postrm called with unknown argument \`$1'" >&2 ++ exit 0 ++ ;; ++esac ++ ++#DEBHELPER# +--- adjtimex-1.29.orig/debian/control ++++ adjtimex-1.29/debian/control +@@ -0,0 +1,20 @@ ++Source: adjtimex ++Section: admin ++Priority: optional ++Maintainer: James R. Van Zandt ++Build-Depends: debhelper (>= 5), po-debconf ++Standards-Version: 3.8.4 ++ ++Package: adjtimex ++Architecture: any ++Depends: ${misc:Depends}, ${shlibs:Depends}, debconf | debconf-2.0 ++Suggests: ntpdate ++Description: kernel time variables configuration utility ++ This package provides a utility to manipulate the kernel time ++ variables. For a machine connected to the Internet, or equipped with ++ a precision oscillator or radio clock, the best way to keep the ++ system clock accurate is using NTP (Network Time Protocol). However, ++ for a standalone or intermittently connected machine, you may use ++ adjtimex instead to at least correct for systematic drift. It can ++ optionally adjust the system clock using the CMOS clock as a ++ reference, and can log times for long-term estimation of drift rates. +--- adjtimex-1.29.orig/debian/adjtimex.init ++++ adjtimex-1.29/debian/adjtimex.init +@@ -0,0 +1,45 @@ ++#!/bin/sh ++# ++# Run ADJTIMEX at startup. ++ ++### BEGIN INIT INFO ++# Provides: adjtimex ++# Required-Start: $local_fs ++# Required-Stop: ++# Should-Start: ++# Should-Stop: ++# Default-Start: S ++# Default-Stop: ++# Short-Description: set the kernel time variables ++# Description: set the kernel time variables ++### END INIT INFO ++ ++test -x /sbin/adjtimex || exit 0 ++ ++# default values ++TICK=10000 ++FREQ=0 ++ ++# values in $cfg take precedence over the values here ++cfg=/etc/default/adjtimex ++ ++if [ -f $cfg ]; then ++ . $cfg ++fi ++ ++case "$1" in ++ start|restart|force-reload) ++ echo -n "Regulating system clock..." ++ /sbin/adjtimex -tick "$TICK" -frequency "$FREQ" ++ echo "done." ++ ;; ++ stop|status) ++ ;; ++ *) ++ echo "/etc/init.d/adjtimex: unknown command $1" >&2 ++ echo "Usage: /etc/init.d/adjtimex {start|stop|restart|force-reload}" >&2 ++ exit 3 ++ ;; ++esac ++ ++exit 0 +--- adjtimex-1.29.orig/debian/copyright ++++ adjtimex-1.29/debian/copyright +@@ -0,0 +1,28 @@ ++This package was debianized by James R. Van Zandt jrv@debian.org on ++Thu, 11 Dec 1997 21:48:01 -0500. ++ ++This package was put together by Jim Van Zandt , ++who also maintains the program and therefore used the master sources. ++ ++Copyright: ++ ++adjtimex is Copyright (C) 1997 Steven S. Dick and James R. Van Zandt ++ ++ 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; version 2 dated June, ++ 1991, or 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 St, Fifth Floor, Boston, MA ++ 02110-1301, USA. ++ ++On Debian GNU/Linux systems, the complete text of the GNU Public ++License can be found in `/usr/share/common-licenses/' ++ +--- adjtimex-1.29.orig/debian/templates ++++ adjtimex-1.29/debian/templates +@@ -0,0 +1,35 @@ ++# These templates have been reviewed by the debian-l10n-english ++# team ++# ++# If modifications/additions/rewording are needed, please ask ++# debian-l10n-english@lists.debian.org for advice. ++# ++# Even minor modifications require translation updates and such ++# changes should be coordinated with translators and reviewers. ++ ++Template: adjtimex/run_daemon ++Type: boolean ++Default: true ++_Description: Should adjtimex be run at installation and at every startup? ++ Running adjtimex at system startup will set the kernel time parameters to ++ the values in /etc/default/adjtimex. ++ . ++ You should not choose this option if you just want to ++ use adjtimex to inspect the current parameters. ++ ++Template: adjtimex/compare_rtc ++Type: boolean ++Default: true ++#flag:comment:2 ++# Translators: do not translate "tick" and "frequency" ++_Description: Run adjtimexconfig when adjtimex is installed or upgraded? ++ The adjtimexconfig script will use adjtimex to find values for the kernel ++ variables "tick" and "frequency" that will make the system clock approximately ++ agree with the hardware clock (also known as the CMOS clock). It then ++ saves these values in the configuration file /etc/default/adjtimex so the ++ settings will be restored on every boot, when /etc/init.d/adjtimex runs. ++ . ++ The script takes 70 seconds to run, so running it for every upgrade ++ may be a waste of time. Alternatively, you can run adjtimexconfig ++ manually when needed, or determine the kernel variables by using other ++ methods and set them manually in /etc/default/adjtimex. +--- adjtimex-1.29.orig/debian/docs ++++ adjtimex-1.29/debian/docs +@@ -0,0 +1,2 @@ ++README ++README.ru +--- adjtimex-1.29.orig/debian/config ++++ adjtimex-1.29/debian/config +@@ -0,0 +1,8 @@ ++#! /bin/sh -e ++ ++# Source debconf library. ++. /usr/share/debconf/confmodule ++ ++db_input medium adjtimex/run_daemon || true ++db_input medium adjtimex/compare_rtc || true ++db_go +--- adjtimex-1.29.orig/debian/rules ++++ adjtimex-1.29/debian/rules +@@ -0,0 +1,117 @@ ++#!/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) ++ ++ ++package=adjtimex ++ ++CFLAGS = -Wall -g ++INSTALL = install ++INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 ++INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 ++INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755 ++INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 ++ ++ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) ++CFLAGS += -O0 ++else ++CFLAGS += -O2 ++endif ++ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) ++INSTALL_PROGRAM += -s ++endif ++# parallel build isn't worth while ++ ++config.status: configure ++ dh_testdir ++ # configure the package. ++ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info ++ touch config.h ++ ++build: build-arch build-indep ++ ++build-arch: build-stamp ++ ++build-indep: build-stamp ++ ++build-stamp: config.status ++ dh_testdir ++ ++ # compile the package. ++ $(MAKE) CFLAGS="$(CFLAGS)" ++ #/usr/bin/docbook-to-man debian/adjtimex.sgml > adjtimex.1 ++ ++ touch build-stamp ++ ++clean: ++ dh_testdir ++ dh_testroot ++ rm -f build-stamp ++ ++ # clean up after the build process. ++ debconf-updatepo ++ [ ! -f Makefile ] || $(MAKE) veryclean ++ rm -rf adjtimex *.o config.cache config.log config.status ++ -test -r /usr/share/misc/config.sub && \ ++ cp -f /usr/share/misc/config.sub config.sub ++ -test -r /usr/share/misc/config.guess && \ ++ cp -f /usr/share/misc/config.guess config.guess ++ ++ ++ dh_clean ++ ++install: build ++ dh_testdir ++ dh_testroot ++ dh_clean -k ++ dh_installdirs ++ ++ # install the package into debian/$(package). ++ $(INSTALL_PROGRAM) adjtimex $(CURDIR)/debian/$(package)/sbin ++ $(INSTALL_SCRIPT) debian/adjtimexconfig \ ++ $(CURDIR)/debian/$(package)/usr/sbin/adjtimexconfig ++ ++# Build architecture-independent files here. ++binary-indep: build install ++# We have nothing to do ++ ++# Build architecture-dependent files here. ++binary-arch: build install ++ dh_testdir ++ dh_testroot ++ dh_installdebconf ++ dh_installdocs ++ dh_installexamples ++ dh_installmenu ++# dh_installlogrotate ++# dh_installemacsen ++# dh_installpam ++# dh_installmime ++ dh_installinit -n ++ dh_installcron ++ dh_installman adjtimex.8 debian/adjtimexconfig.8 ++ dh_installinfo ++# dh_undocumented ++ dh_installchangelogs ChangeLog ++ dh_link ++ dh_strip ++ dh_compress ++ dh_fixperms ++# dh_makeshlibs ++ dh_installdeb ++# dh_perl ++ dh_shlibdeps ++ dh_gencontrol ++ dh_md5sums ++ dh_builddeb ++ ++binary: binary-indep binary-arch ++.PHONY: build clean binary-indep binary-arch binary install +--- adjtimex-1.29.orig/debian/postinst ++++ adjtimex-1.29/debian/postinst +@@ -0,0 +1,123 @@ ++#! /bin/sh ++ ++set -e ++ ++# Source debconf library. ++. /usr/share/debconf/confmodule ++ ++# old scripts ++oldfile=/etc/adjtimex.conf ++olderfile=/etc/rc.boot/adjtimex ++# new starting script ++startfile=/etc/init.d/adjtimex ++# new configuration file ++conffile=/etc/default/adjtimex ++ ++create_adjtimex_conf() ++{ ++ ++ TICK=10000 ++ FREQ=0 ++ ++ if [ -f $oldfile ]; then ++ TICK=`awk ' ++ BEGIN{tick=10000;} ++ /[ \t]*TICK[ \t]*=[ \t]*"?[0-9]+"?/ { ++ sub(/[ \t]*TICK[ \t]*=[ \t]*"?/,""); ++ tick=$0+0; ++ } ++ END {print tick;} ++ ' $oldfile` ++ ++ FREQ=`awk ' ++ BEGIN{freq=0;} ++ /[ \t]*FREQ[ \t]*=[ \t]*"?[0-9]+"?/ { ++ sub(/[ \t]*FREQ[ \t]*=[ \t]*"?/,""); ++ freq=$0+0; ++ } ++ END {print freq;} ++ ' $oldfile` ++ ++# echo "parameters from $oldfile: TICK=$TICK FREQ=$FREQ"; ++ else ++ if [ -f $olderfile ]; then ++ TICK=`awk ' ++ BEGIN{tick=10000;} ++ /[ \t]*TICK[ \t]*=[ \t]*"?[0-9]+"?/ { ++ sub(/[ \t]*TICK[ \t]*=[ \t]*"?/,""); ++ tick=$0+0; ++ } ++ END {print tick;} ++ ' $olderfile` ++ ++ FREQ=`awk ' ++ BEGIN{freq=0;} ++ /[ \t]*FREQ[ \t]*=[ \t]*"?[0-9]+"?/ { ++ sub(/[ \t]*FREQ[ \t]*=[ \t]*"?/,""); ++ freq=$0+0; ++ } ++ END {print freq;} ++ ' $olderfile` ++ ++# echo "parameters from $olderfile: TICK=$TICK FREQ=$FREQ"; ++ fi ++ fi ++ ++ if [ -f $conffile ]; then ++# echo "using existing $conffile"; ++ true; ++ else ++ if [ -d /etc/default ]; then true; else mkdir /etc/default; fi ++ cat >$conffile </dev/null ++ ++ if which invoke-rc.d >/dev/null 2>&1; then ++ invoke-rc.d adjtimex start ++ else ++ /etc/init.d/adjtimex start ++ fi ++ fi ++ ++ db_get adjtimex/compare_rtc ++ if [ "$RET" = "true" ]; then ++ adjtimexconfig ++ fi ++ ++ ;; ++ abort-upgrade|abort-remove|abort-deconfigure) ++ exit 0 ++ ;; ++ *) ++ echo "postinst called with unknown argument \`$1'" >&2 ++ exit 0 ++ ;; ++esac ++ ++#DEBHELPER# +--- adjtimex-1.29.orig/debian/README.Debian ++++ adjtimex-1.29/debian/README.Debian +@@ -0,0 +1,21 @@ ++adjtimex for DEBIAN ++---------------------- ++ ++This is the Debian Linux prepackaged version of adjtimex. ++ ++This package was put together by Jim Van Zandt , ++who also maintains the program and therefore used the master sources. ++ ++further Information: ++ ++* adjtimex manpage ++* copying policy ++ /usr/share/doc/adjtimex/copyright ++ (or debian/copyright in the source package) ++* changelog for debian package ++ /usr/share/doc/adjtimex/changelog.Debian ++* adjtimex's README: ++ /usr/share/doc/adjtimex/README ++ ++ ++James R. Van Zandt , Sun, 7 Mar 1999 21:58:51 -0500 +--- adjtimex-1.29.orig/debian/po/fr.po ++++ adjtimex-1.29/debian/po/fr.po +@@ -0,0 +1,90 @@ ++# Translation of adjtimex debconf screen to French ++# Copyright (C) 2005-2009 Debian French l10n team ++# This file is distributed under the same license as the adjtimex package. ++# ++# Christian Perrier , 2006, 2009. ++# Translators: ++msgid "" ++msgstr "" ++"Project-Id-Version: fr\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-03-17 07:45+0100\n" ++"Last-Translator: Christian Perrier \n" ++"Language-Team: French \n" ++"Language: fr\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Faut-il lancer adjtimex lors de l'installation et à chaque démarrage du " ++"système ?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Adjtimex peut être lancé au démarrage du système afin de régler les " ++"paramètres d'horloge du noyau en fonction des valeurs contenues dans /etc/" ++"default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Vous ne devriez pas choisir cette option si vous souhaitez simplement vous " ++"servir d'adjtimex pour consulter les paramètres actuels." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Faut-il lancer adjtimexconfig lors de l'installation ou de la mise à jour ?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Le script adjtimexconfig utilise adjtimex afin de trouver les valeurs " ++"appropriées pour les variables du noyau concernant le battement (« tick ») " ++"et la fréquence d'horloge. Cela permettra à l'horloge du système d'être à " ++"peu près en accord avec l'horloge matérielle (parfois appelée « horloge " ++"CMOS »). Ces valeurs seront alors conservées dans le fichier de " ++"configuration /etc/default/adjtimex ce qui permettra de les restaurer à " ++"chaque démarrage quand /etc/init.d/adjtimex s'exécutera. " ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"La durée d'exécution du script est de 70 secondes, ce qui peut être vu comme " ++"une perte de temps au démarrage. Vous pouvez également utiliser " ++"adjtimexconfig vous-même plus tard ou déterminer les valeurs des variables " ++"du noyau d'une autre manière. Ces valeurs devront ensuite être placées dans /" ++"etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/it.po ++++ adjtimex-1.29/debian/po/it.po +@@ -0,0 +1,85 @@ ++# ITALIAN TRANSLATION OF ADJTIMEX'S.PO-DEBCONF FILE ++# COPYRIGHT (C) 2009 THE ADJTIMEX'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the adjtimex package. ++# ++# Vincenzo Campanella , 2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.26-3\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-01 14:15+0200\n" ++"Last-Translator: Vincenzo Campanella \n" ++"Language-Team: Italian \n" ++"Language: it\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Eseguire adjtimex all'installazione e con ogni avvio del sistema?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"L'esecuzione di adjtimex all'avvio del sistema imposterà i parametri di " ++"tempo del kernel ai valori contenuti in «/etc/default/adjtimex»." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Non si dovrebbe scegliere questa opzione se si prevede di usare adjtimex " ++"solo per verificare i parametri attuali." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Eseguire adjtimexconfig quando adjtimex viene installato o aggiornato?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Lo script adjtimexconfig userà adjtimex per trovare i valori delle variabili " ++"del kernel «tick» e «frequency» per fare in modo che l'orario del sistema " ++"coincida approssimativamente a quello dell'orologio dell'hardware (anche " ++"conosciuto come orologio CMOS). Questi valori vengono poi salvati nel file " ++"di configurazione «/etc/default/adjtimex», in modo che le impostazioni " ++"vengano ripristinate a ogni avvio, quando «/etc/init.d/adjtimex» viene " ++"eseguito." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Lo script necessita di 70 secondi per essere eseguito, per cui lanciarlo a " ++"ogni aggiornamento potrebbe essere uno spreco di tempo. In alternativa è " ++"possibile eseguire manualmente adjtimexconfig quando è necessario, oppure " ++"determinare le variabili del kernel usando altri metodi e impostandole " ++"manualmente in «/etc/default/adjtimex»." +--- adjtimex-1.29.orig/debian/po/pt_BR.po ++++ adjtimex-1.29/debian/po/pt_BR.po +@@ -0,0 +1,96 @@ ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans ++# ++# Developers do not need to manually edit POT or PO files. ++# André Luís Lopes , 2010. ++# Flamarion Jorge , 2010. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.29-2.1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-11-11 22:16-0200\n" ++"Last-Translator: Flamarion Jorge \n" ++"Language-Team: Brazilian Portuguese \n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n > 1);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "O adjtimex deve ser executado na instalação e em cada inicialização?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Executar o adjtimex na inicialização do sistema configurará os parâmetros de " ++"tempo do kernel para os valores em /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Você não deve escolher esta opção se você apenas quer usar o adjtimex para " ++"inspecionar os parâmetros atuais." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Executar o adjtimexconfig quando o adjtimex for instalado ou atualizado?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"O script adjtimexconfig usará o adjtimex para encontrar valores para as " ++"variáveis \"tick\" e \"frequency\" do kernel, que farão o relógio do sistema " ++"o mais próximo do relógio do hardware (também conhecido como o relógio da " ++"CMOS). Ele então salva estes valores no arquivo de configuração /etc/default/" ++"adjtimex, assim as configurações serão restauradas a cada inicialização, " ++"quando o /etc/init.d/adjtimex executar." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"O script leva 70 segundos para rodar, portanto rodá-lo a cada atualização " ++"pode ser um desperdício de tempo. Alternativamente, você pode executar o " ++"adjtimexconfig manualmente quando necessário, ou determinar as variáveis de " ++"kernel usando outros métodos e configurá-las manualmente em /etc/default/" ++"adjtimex." +--- adjtimex-1.29.orig/debian/po/templates.pot ++++ adjtimex-1.29/debian/po/templates.pot +@@ -0,0 +1,68 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR , YEAR. ++# ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" ++"Last-Translator: FULL NAME \n" ++"Language-Team: LANGUAGE \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=CHARSET\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" +--- adjtimex-1.29.orig/debian/po/gl.po ++++ adjtimex-1.29/debian/po/gl.po +@@ -0,0 +1,85 @@ ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# marce villarino , 2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: templates_[OK3397]\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-16 22:09+0200\n" ++"Last-Translator: marce villarino \n" ++"Language-Team: Galician \n" ++"Language: gl\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 0.2\n" ++"Plural-Forms: nplurals=2; plural=n != 1;\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Debe executarse adjtimex durante a instalación e con cada inicio do sistema?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Se executa adjtimex durante o inicio do sistema axustará os parámetros de " ++"hora do núcleo cos valores que haxa en /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Non debería escoller esta opción se só desexa empregar adjtimex para " ++"inspeccionar os parámetros actuais." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Desexa executar adjtimexconfig se instala ou actualiza?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"O script adjtimexconfig empregará adjtimex para achar valores paras as " ++"variábeis do núcleo «tick» e «frequency» que fagan que o reloxo do sistema " ++"se corresponda aproximadamente co do hardware (o chamado reloxo da BIOS). " ++"Logo garda eses valores no ficheiro de configuración /etc/default/adjtimex " ++"de xeito que os valores se restauren en cada arranque, cando se executa /etc/" ++"init.d/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"O script tarda 70 segundos en executarse, pode que executalo cada vez que se " ++"actualice pode ser un desperdicio de tempo. En alternativa, pode executar " ++"adjtimexconfig manualmente cando o precise, ou determinar as variábeis do " ++"núcleo empregando outros métodos e axustalas manualmente en /etc/default/" ++"adjtimex." +--- adjtimex-1.29.orig/debian/po/vi.po ++++ adjtimex-1.29/debian/po/vi.po +@@ -0,0 +1,82 @@ ++# Vietnamese Translation for adjtimex. ++# Copyright © 2010 Free Software Foundation, Inc. ++# Clytie Siddall , 2005-2010. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.29-2.1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-10-27 14:39+1030\n" ++"Last-Translator: Clytie Siddall \n" ++"Language-Team: Vietnamese \n" ++"Language: vi\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=1; plural=0;\n" ++"X-Generator: LocFactoryEditor 1.8\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "adjtimex có nên chạy vào lúc cài đặt và khi nào khởi Ä‘á»™ng không?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Chạy adjtimex vào lúc khởi chạy hệ thống thì lập các tham số thá»i gian của " ++"hạt nhân thành những giá trị trong tập tin « /etc/default/adjtimex »." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Không nên bật tuỳ chá»n này nếu bạn chỉ muốn sá»­ dụng adjtimex để kiểm tra " ++"những tham số hiện thá»i." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Chạy adjtimexconfig khi adjtimex được cài đặt hay nâng cấp ?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Văn lệnh cấu hình adjtimexconfig thì sá»­ dụng adjtimex để tìm giá trị cho hai " ++"biến hạt nhân « tick » và « frequency », để làm cho đồng hồ hệ thống tÆ°Æ¡ng " ++"ứng xấp xỉ vá»›i đồng hồ phần cứng (cÅ©ng được gá»i nhÆ° là đồng hồ CMOS). Văn " ++"lệnh này lÆ°u các giá trị đó vào tập tin cấu hình « /etc/default/adjtimex », " ++"để phục hồi thiết lập khi nào việc khởi Ä‘á»™ng chạy « /etc/init.d/adjtimex »." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Văn lệnh này chạy trong khoảng 70 giây thì có thể là bạn không muốn chạy nó " ++"vào má»—i lúc nâng cấp. Bạn cÅ©ng có thể chạy adjtimexconfig bằng tay khi cần " ++"thiết, hoặc quyết định những biến hạt nhân bằng phÆ°Æ¡ng pháp khác và lập bằng " ++"tay trong tập tin « /etc/default/adjtimex »." +--- adjtimex-1.29.orig/debian/po/fi.po ++++ adjtimex-1.29/debian/po/fi.po +@@ -0,0 +1,84 @@ ++# Copyright (C) 2009 ++# This file is distributed under the same license as the adjtimex package. ++# ++# Esko Arajärvi , 2010. ++msgid "" ++msgstr "" ++"Project-Id-Version: \n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-01-09 22:59+0200\n" ++"Last-Translator: Esko Arajärvi \n" ++"Language-Team: Finnish \n" ++"Language: fi\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 1.0\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Tulisiko adjtimex ajaa asennuksen yhteydessä ja aina kun järjestelmä " ++"käynnistetään?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Jos adjtimex ajetaan käynnistettäessä järjestelmä, ytimen aikaparametrit " ++"asetetaan tiedostossa /etc/default/adjtimex annettuihin arvoihin." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Älä valitse tätä vaihtoehtoa, jos haluat käyttää adjtimexiä vain nykyisten " ++"parametriarvojen tarkasteluun." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Tulisiko adjtimexconfig ajaa, kun adjtimex asennetaan tai päivitetään?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Komentosarja adjtimexconfig etsii ohjelman adjtimex avulla ytimen " ++"muuttujille â€tick†ja â€frequency†arvot, joilla järjestelmän kello näyttää " ++"suunnilleen samaa kuin laitteiston kello (CMOS-kello). Se tallentaa nämä " ++"arvot asetustiedostoon /etc/default/adjtimex, jolloin ne palautetaan " ++"järjestelmän käynnistyessä, kun /etc/init.d/adjtimex ajetaan." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Komentosarjan ajaminen kestää 70 sekuntia, joten sen ajaminen jokaisen " ++"päivityksen yhteydessä saattaa olla ajanhukkaa. Voit vaihtoehtoisesti ajaa " ++"adjtimexconfigin käsin tarvittaessa tai määrittää ytimen muuttujien arvot " ++"muilla keinoin ja asettaa ne käsin tiedostoon /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/pl.po ++++ adjtimex-1.29/debian/po/pl.po +@@ -0,0 +1,123 @@ ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans ++# ++# Developers do not need to manually edit POT or PO files. ++# ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" ++"Last-Translator: Bartosz Zapa³owski \n" ++"Language-Team: Polish Debian Documentation Project \n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=iso-8859-2\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Czy adjtimex ma byæ uruchomiany podczas instalacji i ka¿dego startu systemu?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++#, fuzzy ++#| msgid "" ++#| "adjtimex can run at system startup to set the kernel time parameters to " ++#| "the values in /etc/default/adjtimex. Don't accept if you just want to use " ++#| "adjtimex to inspect the current parameters." ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"adjtimex mo¿e byæ uruchamiany podczas ka¿dego uruchomienia systemu,by " ++"ustawiæ parametry czasu w j±drze na warto¶ci znajduj±ce siê w pliku/etc/" ++"default/adjtimex. Nie wyra¿aj zgody, je¶li chcesz u¿ywaæ adjtimextylko do " ++"sprawdzania aktualnych warto¶ci." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++#, fuzzy ++#| msgid "" ++#| "adjtimex can run at system startup to set the kernel time parameters to " ++#| "the values in /etc/default/adjtimex. Don't accept if you just want to use " ++#| "adjtimex to inspect the current parameters." ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"adjtimex mo¿e byæ uruchamiany podczas ka¿dego uruchomienia systemu,by " ++"ustawiæ parametry czasu w j±drze na warto¶ci znajduj±ce siê w pliku/etc/" ++"default/adjtimex. Nie wyra¿aj zgody, je¶li chcesz u¿ywaæ adjtimextylko do " ++"sprawdzania aktualnych warto¶ci." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++#, fuzzy ++#| msgid "Should adjtimexconfig be run at installation time?" ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Czy adjtimexconfig ma byæ uruchomiony podczas instalacji?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++#, fuzzy ++#| msgid "" ++#| "The adjtimexconfig script will use adjtimex to find values for the kernel " ++#| "variables tick and frequency that will make the system clock " ++#| "approximately agree with the hardware clock (also known as the CMOS " ++#| "clock). It then saves these values in the configuration file /etc/" ++#| "default/adjtimex so the settings will be restored on every boot, when /" ++#| "etc/init.d/adjtimex runs." ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skrypt adjtimexconfig skorzysta z programu adjtimex do znalezienia " ++"takichwarto¶ci parametrów j±dra tick i frequency, ¿eby zegar systemowy by³ " ++"zbli¿onydo zegara sprzêtowego (zegara CMOS). Nastêpnie zapisze ustawienia w " ++"plikukonfiguracyjnym /etc/default/adjtimex, dziêki czemu warto¶ci te " ++"bêd±przywrócane przy ka¿dym starcie systemu w momencie wykonywania skryptu/" ++"etc/init.d/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++#, fuzzy ++#| msgid "" ++#| "The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " ++#| "yourself at a later time, or determine the kernel variables one of " ++#| "several other ways (see the adjtimex man page) and install them in /etc/" ++#| "default/adjtimex." ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Skrypt bêdzie dzia³a³ przez 70 sekund. Mo¿esz te¿ uruchomiæ " ++"w³asnorêcznieadjtimexconfig w dowolnym czasie lub dobraæ paramterty j±dra w " ++"innysposób (zapoznaj siê ze stron± manuala adjtimex) i zapisaæ je w pliku/" ++"etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/ru.po ++++ adjtimex-1.29/debian/po/ru.po +@@ -0,0 +1,95 @@ ++# translation of adjtimex_1.28-1_ru.po to Russian ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans# ++# Developers do not need to manually edit POT or PO files. ++# ++# Yuri Kozlov , 2005. ++# Yuri Kozlov , 2009, 2010. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.28-1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-01-02 09:43+0300\n" ++"Last-Translator: Yuri Kozlov \n" ++"Language-Team: Russian \n" ++"Language: ru\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" ++"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "ЗапуÑтить adjtimex ÑÐµÐ¹Ñ‡Ð°Ñ Ð¸ каждый раз при Ñтарте ÑиÑтемы?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"ЗапуÑк adjtimex при включении компьютера выполнит наÑтройку значений " ++"параметров времени Ñдра из файла /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Ответьте отрицательно, еÑли проÑто хотите иÑпользовать adjtimex Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ " ++"текущих параметров." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "ЗапуÑкать adjtimexconfig при уÑтановке или обновлении adjtimex?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Сценарий adjtimexconfig иÑпользует adjtimex при поиÑке значений переменных " ++"Ñдра \"tick\" и \"frequency\", которые помогают ÑоглаÑовывать ÑиÑтемные чаÑÑ‹ " ++"Ñ Ð°Ð¿Ð¿Ð°Ñ€Ð°Ñ‚Ð½Ñ‹Ð¼Ð¸ чаÑами (так называемые чаÑÑ‹ CMOS). Затем он ÑохранÑет Ñти " ++"Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð² файл наÑтройки /etc/default/adjtimex Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы " ++"воÑÑтанавливать их Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ /etc/init.d/adjtimex при каждом " ++"запуÑке ÑиÑтемы." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"ДлительноÑÑ‚ÑŒ работы ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ -- 70 Ñекунд, поÑтому при каждом обновлении " ++"будет Ñ‚Ð°ÐºÐ°Ñ Ð·Ð°Ð´ÐµÑ€Ð¶ÐºÐ° в работе. Ð’ качеÑтве альтернативы вы можете запуÑтить " ++"adjtimexconfig вручную позже, или определить переменные Ñдра одним из " ++"неÑкольких других ÑпоÑобов (Ñмотрите Ñправочную Ñтраницу по adjtimex) и " ++"Ñохранить их в файл /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/ja.po ++++ adjtimex-1.29/debian/po/ja.po +@@ -0,0 +1,91 @@ ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans ++# ++# Developers do not need to manually edit POT or PO files. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.27.1-3\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-07-24 18:05+0900\n" ++"Last-Translator: Hideki Yamane (Debian-JP) \n" ++"Language-Team: Japanese \n" ++"Language: ja\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "adjtimex をインストール時ãŠã‚ˆã³æ¯Žå›žã®èµ·å‹•æ™‚ã«å‹•ä½œã•ã›ã¾ã™ã‹?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"システムã®èµ·å‹•æ™‚ã«ã‚«ãƒ¼ãƒãƒ«ã§ã®æ™‚é–“ã®ãƒ‘ラメータを /etc/default/adjtimex ã®å€¤ã«" ++"設定ã™ã‚‹ã‚ˆã†ã« adjtimex を動作ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"システムã®èµ·å‹•æ™‚ã«ã‚«ãƒ¼ãƒãƒ«ã§ã®æ™‚é–“ã®ãƒ‘ラメータを /etc/default/adjtimex ã®å€¤ã«" ++"設定ã™ã‚‹ã‚ˆã†ã« adjtimex を動作ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"adjtimexconfig ã‚’ adjtimex をインストールã€ã‚ã‚‹ã„ã¯ã‚¢ãƒƒãƒ—グレードã—ãŸæ™‚ã«å®Ÿè¡Œ" ++"ã—ã¾ã™ã‹?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"adjtimexconfig スクリプト㯠adjtimex を使用ã—ã¦ã€ã‚·ã‚¹ãƒ†ãƒ ã‚¯ãƒ­ãƒƒã‚¯ã‚’ãƒãƒ¼ãƒ‰ã‚¦ã‚§" ++"アクロック (CMOS クロックã¨ã—ã¦ã‚‚知られã¦ã„ã¾ã™) ã¨ãŠãŠã‚ˆãåŒæœŸã™ã‚‹ã‚ˆã†ã«ã‚«ãƒ¼" ++"ãƒãƒ«å¤‰æ•°ã€Œtickã€ã¨ã€Œfrequencyã€ã«ä¸Žãˆã‚‹å€¤ã‚’見ã¤ã‘ã¾ã™ã€‚ãã—ã¦ã€ã“ã®å€¤ã‚’設定" ++"ファイル /etc/default/adjtimex ã«ä¿å­˜ã™ã‚‹ã“ã¨ã§æ¯Žå›žèµ·å‹•æ™‚ã« /etc/init.d/" ++"adjtimex ãŒå‹•ä½œã™ã‚‹éš›ã«è¨­å®šãŒå¾©å…ƒã•ã‚Œã¾ã™ã€‚" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"スクリプトã¯å‹•ä½œã« 70 秒もã‹ã‹ã‚‹ã®ã§ã‚¢ãƒƒãƒ—グレードã®åº¦ã«æ¯Žå›žå®Ÿè¡Œã™ã‚‹ã®ã¯æ™‚é–“" ++"ã®ç„¡é§„ã§ã™ã€‚別解ã¨ã—ã¦ã¯ adjtimexconfig を後ã»ã©å®Ÿè¡Œã™ã‚‹ã€ã¾ãŸã¯ä»–ã®æ–¹æ³•ã§" ++"カーãƒãƒ«å¤‰æ•°ã‚’決ã‚ã¦ã€æ‰‹å‹•ã§ /etc/default/adjtimex ã¸ã®è¨­å®šã‚’è¡Œã†ã€ãªã©ãŒå¯èƒ½" ++"ã§ã™ã€‚" +--- adjtimex-1.29.orig/debian/po/nb.po ++++ adjtimex-1.29/debian/po/nb.po +@@ -0,0 +1,82 @@ ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# Bjørn Steensrud , 2010. ++msgid "" ++msgstr "" ++"Project-Id-Version: \n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-10-15 14:50+0200\n" ++"Last-Translator: Bjørn Steensrud \n" ++"Language-Team: Norwegian BokmÃ¥l \n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 1.0\n" ++"Plural-Forms: nplurals=2; plural=n != 1;\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Skal adjtimex kjøres ved installasjon og hver gang systemet startes?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Om adjtimex kjøres ved oppstart blir kjernens tidsparametre satt til " ++"verdiene i /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Du bør ikke velge dette hvis du bare vil bruke adjtimex til Ã¥ se hva de " ++"gjeldende parametrene er." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Skal adjtimexconfig kjøres nÃ¥r adjtimex installeres eller oppgraderes?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skriptet adjtimexconfig vil bruke adjtimex til Ã¥ finne verdier for kjerne- " ++"variablene «tick» og «frequency» som vil fÃ¥ systemklokka til Ã¥ gÃ¥ omtrent " ++"lik maskinklokka (ogsÃ¥ kalt CMOS-klokka). Deretter lagres disse verdiene i " ++"oppsettsfila /etc/default/adjtimex, slik at de blir tilbakestilt ved hver " ++"oppstart nÃ¥t /etc/init.d/adjtimex kjører." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Skriptet tar 70 sekunder Ã¥ kjøre, sÃ¥ det kan være bortkastet tid Ã¥ kjøre det " ++"ved hver oppgradering. Du kan ellers kjøre adjtimexconfig manuelt nÃ¥r det " ++"trengs, eller bestemme kjernevariablene pÃ¥ annen mÃ¥te og sette dem inn " ++"manuelt i /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/sv.po ++++ adjtimex-1.29/debian/po/sv.po +@@ -0,0 +1,85 @@ ++# Translation of adjtimex debconf template to Swedish ++# Copyright (C) 2009 Martin Bagge ++# This file is distributed under the same license as the adjtimex package. ++# ++# Martin Bagge , 2009 ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.20-5\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-03-17 19:49-0400\n" ++"Last-Translator: Martin Bagge \n" ++"Language-Team: Swedish \n" ++"Language: sv\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Poedit-Language: Swedish\n" ++"X-Poedit-Country: Sweden\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Ska adjtimex köras vid installation och vid varje uppstart?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"adjtimex kan köra vid systemets uppstart för att sätta kärntidsparametrar " ++"till värdena i /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Aktivera inte denna funktion om du endast vill använda adjtime för att " ++"inspektera aktuella parameterar." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Ska adjtimexconfig köras efter installation eller uppgradering av adjtimex?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skriptet adjtimexconfig kommer att använda adjtimex för att hitta värden för " ++"kärnvariablerna \"tick\" och \"frequency\" som gör att systemklockan kommer " ++"överens med hÃ¥rdvaruklockan (ocksÃ¥ kallad CMOS-klockan). Den sparar sedan " ++"dessa värden i konfigurationsfilen /etc/default/adjtimex sÃ¥ att " ++"inställningarna kommer att användas vid varje uppstart, när /etc/init.d/" ++"adjtimex körs." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Skriptet tar 70 sekunder att köra vilket innebär att det kan vara slöseri " ++"med tid att köra vid varje uppgradering. Alternativt kan du köra " ++"adjtimexconfig själv när det behövs eller bestämma variabler för kärnan pÃ¥ " ++"andra sätt och ange dessa i /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/POTFILES.in ++++ adjtimex-1.29/debian/po/POTFILES.in +@@ -0,0 +1 @@ ++[type: gettext/rfc822deb] templates +--- adjtimex-1.29.orig/debian/po/pt.po ++++ adjtimex-1.29/debian/po/pt.po +@@ -0,0 +1,83 @@ ++# 2005-10-27 - Marco Ferra (initial translation) ++# 2009, Carlos Lisboa ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.20-5\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-15 22:00+0100\n" ++"Last-Translator: Carlos Lisboa \n" ++"Language-Team: Portuguese \n" ++"Language: pt\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Deve o adjtimex correr enquanto o instala e depois sempre que o sistema " ++"inicia?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Correr o adjtimex no arranque do sistema irá colocar os parâmetros de tempo " ++"do kernel para os valores em /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Não deve escolher esta opção se apenas deseja usar o adjtimex para verificar " ++"os parâmetros actuais." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Correr o adjtimexconfig quando o adjtimex é instalado ou actualizado?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"O script adjtimexconfig irá usar adjtimex para encontrar valores para as " ++"variáveis do kernel \"tick\" e \"frequency\" que irão tornar o relógio do " ++"sistema em concordância com o relógio de hardware (também conhecido por " ++"relógio CMOS). Irá então guardar os valores no ficheiro de configuração /etc/" ++"default/adjtimex para que as configurações sejam restauradas em cada " ++"arranque, quando o /etc/init.d/adjtimex é corrido." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Este script demora 70 segundos a correr, podendo ser um desperdício de tempo " ++"corrê-lo em cada actualização. Como alternativa, pode correr o " ++"adjtimexconfig manualmente quando necessário, ou determine as variáveis do " ++"kernel usando outro método e configure-as manualmente em /etc/default/" ++"adjtimex." +--- adjtimex-1.29.orig/debian/po/de.po ++++ adjtimex-1.29/debian/po/de.po +@@ -0,0 +1,96 @@ ++# translation of adjtimex_1.26-3_de.po to German ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans# ++# Developers do not need to manually edit POT or PO files. ++# ++# Erik Schanze , 2004-2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex_1.26-3_de\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-15 18:02+0200\n" ++"Last-Translator: Erik Schanze \n" ++"Language-Team: German \n" ++"Language: de\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Soll Adjtimex nach der Installation und bei jedem Hochfahren gestartet " ++"werden?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Wird Adjtimex beim Hochfahren des Systems gestartet, werden die " ++"Zeitparameter im Kernel auf die Werte in /etc/defaults/adjtimex gesetzt." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Stimmen Sie nicht zu, wenn Sie mit Adjtimex nur die aktuellen Parameter " ++"ermitteln wollen." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Adjtimexconfig zur Installation oder Aktualisierung von Adjtimex aufrufen?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Das Skript »adjtimexconfig« nutzt Adjtimex, um die Werte der Kernelvariablen " ++"»tick« und »frequency« zu finden, damit die Systemuhr ungefähr mit der " ++"Rechneruhr (auch bekannt als CMOS-Uhr) übereinstimmt. Das Skript speichert " ++"diese Werte in der Konfigurationsdatei /etc/default/adjtimex, sodass die " ++"Einstellung bei jedem Systemstart wiederhergestellt wird, wenn /etc/init.d/" ++"adjtimex ausgeführt wird." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Das Skript benötigt 70 Sekunden, um durchzulaufen, es bei jeder " ++"Aktualisierung laufen zu lassen, dürfte Zeitverschwendung sein. Andererseits " ++"können Sie »adjtimexconfig« selbst bei Bedarf starten oder Sie finden die " ++"Kernelvariablen auf einem anderen Weg heraus (siehe Handbuchseite von " ++"Adjtimex) und speichern die Werte in der Datei /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/eu.po ++++ adjtimex-1.29/debian/po/eu.po +@@ -0,0 +1,84 @@ ++# translation of adjtimex-eu.po to Euskara ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# Piarres Beobide , 2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex-eu\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-08 12:49+0200\n" ++"Last-Translator: Piarres Beobide \n" ++"Language-Team: Euskara \n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Adjtimex instalazio eta abiarazte bakoitzean exekutatu behar al da?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Adjtimex sistema abiaraztean exekutatzean kernelaren denbora parametroak /" ++"etc/default/adjtimex-eko balioetara ezarriko dira." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Ez zenuke aukera hau aukeratu beharko adjtimex uneko parametroak begiratzeko " ++"bakarrik erabili nahi baduzu." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Adjtimexconfig exekutatu adjtimex instalatu edo bertsio-berritzean?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Adjtimexconfig script-ak adjtimex erabiliko du kerneleko \"tick\" eta " ++"\"frequency\" aldagaien balioa aurkitzeko honekin sistema erlojuak hardware " ++"erlojuarekin (CMOS ordularia bezala ere ezagutua) bat egingo du. Orduan " ++"balio hauek /etc/default/adjtimex konfigurazio fitxategian gordeko ditu Abio " ++"bakoitzean balio horiek berrezarri daitezen /etc/init.d/adjtimex " ++"exekutatzean." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Script-ak 70 segundu behar ditu exekutatzeko, beraz berau bertsio-berritze " ++"bakoitzean exekutatzea denbora galtze bat izan daiteke. Bestela behar " ++"duzunean adjtimexconfig eskuz konfiguratu dezakezu edo kernel aldagaiak " ++"beste metodo batez atzeman eta /etc/default/adjtimex fitxategian eskuz ipini " ++"ditzakezu." +--- adjtimex-1.29.orig/debian/po/da.po ++++ adjtimex-1.29/debian/po/da.po +@@ -0,0 +1,92 @@ ++# translation of adjtimex_1.16-1-da.po to Danish ++# translation of adjtimex_1.16-1_templates.po to Danish ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans# ++# Developers do not need to manually edit POT or PO files. ++# Claus Hindsgaul , 2004. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex_1.16-1-da\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-16 16:56+0200\n" ++"Last-Translator: Frank Damgaard \n" ++"Language-Team: Danish\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.3.1\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Skal adjtimex køres under installation og ved hver opstart?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Køres adjtimex under opstart af systemet, sættes kernens tidsparametre til " ++"værdierne i /etc/default/adjtimex. " ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Vælg ikke dette hvis du ønsker at bruge adjtimex til at gemmense de aktuelle " ++"parametre." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Skal adjtimexconfig køres ved installation eller opgradering?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skriptet adjtimexconfig vil bruge adjtimex til at finde de værdier til " ++"kernevariablene \"tick\" og \"frequency\", der vil fÃ¥ systemuret til at " ++"passe med computerens indbyggede ur (CMOS-uret). Den gemmer derefter " ++"værdierne i opsætningsfilen /etc/default/edjtimex, sÃ¥ indstillingerne bliver " ++"sat under hver opstart, nÃ¥r skriptet /etC/init.d/adjtimex køres." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Det tager 70 sekunder at køre skriptet, sÃ¥ at køre skriptet ved hver " ++"opgradering kan være spild af tid. Alternativt kan du selv køre " ++"adjtimexconfig nÃ¥r der er behov, eller finde kernevariablene pÃ¥ en anden " ++"mÃ¥de og sætte dem manuelt i /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/nl.po ++++ adjtimex-1.29/debian/po/nl.po +@@ -0,0 +1,86 @@ ++# Dutch translation of adjtimex debconf templates. ++# Copyright (C) 2003-2011 THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the adjtimex package. ++# Michiel Sikkes , 2003. ++# Jeroen Schot , 2011. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex_1.29-2.1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2011-05-05 17:49+0200\n" ++"Last-Translator: Michiel Sikkes \n" ++"Language-Team: Debian l10n Dutch \n" ++"Language: nl\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Wilt u dat adjtimex bij de installatie en bij elke opstartprocedure gedraaid " ++"wordt?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Het draaien van adjtimex bij het opstarten van het systeem zal " ++"tijdparameters van de kernel instellen zoals gedefinieerd in /etc/default/" ++"adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Accepteer deze optie niet als u adjtimex alleen wilt gebruiken om de huidige " ++"parameters te bekijken." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Wilt u dat adjtimexconfig bij het installeren en opwaarderen wordt gedraaid?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Het adjtimexconfig-script zal adjtimex gebruiken om de eigenschappen voor de " ++"kernelvariabelen \"tick\" en \"frequency\" te vinden. Dit zal er voor zorgen " ++"dat de systeemklok gelijk loopt met de hardware-klok (ook bekend onder de " ++"naam CMOS-klok). Deze eigenschappen worden opgeslagen in het " ++"configuratiebestand /etc/default/adjtimex, dus de instellingen worden bij " ++"elke systeemopstartprocedure hersteld als /etc/init.d/adjtimex draait." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Het script doet er 70 seconden over om te draaien. Als alternatief kunt u " ++"adjtimexconfig later handmatig draaien, of de kernelvariabelen op een andere " ++"manier bepalen en deze zelf in /etc/default/adjtimex zetten." +--- adjtimex-1.29.orig/debian/po/cs.po ++++ adjtimex-1.29/debian/po/cs.po +@@ -0,0 +1,78 @@ ++# Czech translation of adjtimex templates ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.29-2\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-07-16 14:53+0200\n" ++"Last-Translator: Martin Sin \n" ++"Language-Team: Czech \n" ++"Language: cs\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Má být adjtimex spuÅ¡tÄ›n po instalaci a pÅ™i každém spuÅ¡tÄ›ní poÄítaÄe?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"SpuÅ¡tÄ›ní adjtimex pÅ™i startu poÄítaÄe nastaví Äasové parametry jádra na " ++"hodnoty uložené v /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Pokud chcete používat adjtimex pouze ke zjiÅ¡tÄ›ní aktuálních hodnot, pak tuto " ++"možnost nemusíte používat." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Spustit adjtimexconfig po instalaci nebo aktualizaci adjtimex?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skript adjtimexconfig použije adjtimex k nalezení hodnot „tick“ a " ++"„frequency“ jádra tak, že nastaví systémové hodiny pÅ™ibližnÄ› na hodnoty tÄ›ch " ++"hardwarových (také známých jako CMOS hodiny). Tyto hodnoty pak uloží do " ++"konfiguraÄního souboru /etc/default/adjtimex, aby mohlo být nastavení " ++"obnoveno pÅ™i každém startu, vždy pÅ™i spuÅ¡tÄ›ní /etc/init.d/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"SpuÅ¡tÄ›ní skriptu zabere 70 sekund, takže jeho spuÅ¡tÄ›ní pÅ™i každé aktualizaci " ++"může být ztrátou Äasu. VolitelnÄ› můžete adjtimexconfig spustit podle potÅ™eby " ++"také ruÄnÄ› nebo urÄit promÄ›nné jádra jinými způsoby a nastavit je ruÄnÄ› v " ++"souboru /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/es.po ++++ adjtimex-1.29/debian/po/es.po +@@ -0,0 +1,108 @@ ++# adjtimex po-debconf translation to Spanish ++# Copyright (C) 2009 Software in the Public Interest ++# This file is distributed under the same license as the adjtimex package. ++# ++# Changes: ++# - Initial translation ++# Vicente H. ++# ++# - Updates ++# Francisco Javier Cuadrado , 2009 ++# ++# Traductores, si no conocen el formato PO, merece la pena leer la ++# documentación de gettext, especialmente las secciones dedicadas a este ++# formato, por ejemplo ejecutando: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# ++# Equipo de traducción al español, por favor lean antes de traducir ++# los siguientes documentos: ++# ++# - El proyecto de traducción de Debian al español ++# http://www.debian.org/intl/spanish/coordinacion ++# especialmente las notas de traducción en ++# http://www.debian.org/intl/spanish/notas ++# ++# - La guía de traducción de po's de debconf: ++# /usr/share/doc/po-debconf/README-trans ++# o http://www.debian.org/intl/l10n/po-debconf/README-trans ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.27.1-3\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-07-25 20:18+0100\n" ++"Last-Translator: Francisco Javier Cuadrado \n" ++"Language-Team: Debian l10n Spanish \n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "¿Se debe ejecutar adjtimex ahora y en cada arranque?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Ejecutar adjtimex al inicio del sistema configurará los parámetros de tiempo " ++"del núcleo a los valores del archivo «/etc/default/adjtimex»." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"No debería escoger esta opción si sólo quiere utilizar adjtimex para " ++"inspeccionar los parámetros actuales." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "¿Desea ejecutar adjtimexconfig cuando adjtimex se instale o actualice?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"El script adjtimexconfig utilizará adjtimex para encontrar los valores de " ++"las variables «tick» y «frecuency» del núcleo que harán que el reloj del " ++"sistema concuerde aproximadamente con el reloj del hardware (también " ++"conocido como reloj CMOS). Entonces, se guardan estos valores en el archivo " ++"de configuración «/etc/default/adjtimex» de modo que los valores se " ++"restaurarán en cada arranque, cuando el script «/etc/init.d/adjtimex» se " ++"ejecute." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"El script tarda 70 segundos para ejecutarse, por lo que ejecutarlo en cada " ++"actualización puede ser una pérdida de tiempo. De forma alternativa, puede " ++"ejecutar manualmente ajdtimexconfig cuando lo necesite, o determinar las " ++"variables del núcleo utilizando otros métodos e configurándolas en el " ++"archivo «/etc/default/adjtimex»." diff --git a/source/a/util-linux/column-fix_long_opts.diff b/source/a/util-linux/column-fix_long_opts.diff new file mode 100644 index 00000000..e5215db7 --- /dev/null +++ b/source/a/util-linux/column-fix_long_opts.diff @@ -0,0 +1,15 @@ +diff -Naur util-linux-2.21.2/text-utils/column.c util-linux-2.21.2.patched//text-utils/column.c +--- util-linux-2.21.2/text-utils/column.c 2012-05-25 05:44:59.000000000 -0400 ++++ util-linux-2.21.2.patched//text-utils/column.c 2012-08-14 05:22:17.000000000 -0400 +@@ -121,9 +121,9 @@ + { + { "help", 0, 0, 'h' }, + { "version", 0, 0, 'V' }, +- { "columns", 0, 0, 'c' }, ++ { "columns", 1, 0, 'c' }, + { "table", 0, 0, 't' }, +- { "separator", 0, 0, 's' }, ++ { "separator", 1, 0, 's' }, + { "fillrows", 0, 0, 'x' }, + { NULL, 0, 0, 0 }, + }; diff --git a/source/a/util-linux/net-tools.config.h b/source/a/util-linux/net-tools.config.h new file mode 100644 index 00000000..e271f863 --- /dev/null +++ b/source/a/util-linux/net-tools.config.h @@ -0,0 +1,78 @@ +/* +* config.h Automatically generated configuration includefile +* +* NET-TOOLS A collection of programs that form the base set of the +* NET-3 Networking Distribution for the LINUX operating +* system. +* +* DO NOT EDIT DIRECTLY +* +*/ + +/* + * + * Internationalization + * + * The net-tools package has currently been translated to French, + * German and Brazilian Portugese. Other translations are, of + * course, welcome. Answer `n' here if you have no support for + * internationalization on your system. + * + */ +#define I18N 1 + +/* + * + * Protocol Families. + * + */ +#define HAVE_AFUNIX 1 +#define HAVE_AFINET 1 +#define HAVE_AFINET6 1 +#define HAVE_AFIPX 1 +#define HAVE_AFATALK 1 +#define HAVE_AFAX25 1 +#define HAVE_AFNETROM 1 +#define HAVE_AFROSE 0 +#define HAVE_AFX25 1 +#define HAVE_AFECONET 0 +#define HAVE_AFDECnet 0 +#define HAVE_AFASH 0 +#define HAVE_AFBLUETOOTH 1 + +/* + * + * Device Hardware types. + * + */ +#define HAVE_HWETHER 1 +#define HAVE_HWARC 1 +#define HAVE_HWSLIP 1 +#define HAVE_HWPPP 1 +#define HAVE_HWTUNNEL 1 +#define HAVE_HWSTRIP 1 +#define HAVE_HWTR 1 +#define HAVE_HWAX25 1 +#define HAVE_HWROSE 0 +#define HAVE_HWNETROM 1 +#define HAVE_HWX25 1 +#define HAVE_HWFR 1 +#define HAVE_HWSIT 0 +#define HAVE_HWFDDI 1 +#define HAVE_HWHIPPI 1 +#define HAVE_HWASH 0 +#define HAVE_HWHDLCLAPB 0 +#define HAVE_HWIRDA 1 +#define HAVE_HWEC 0 +#define HAVE_HWEUI64 1 +#define HAVE_HWIB 1 + +/* + * + * Other Features. + * + */ +#define HAVE_FW_MASQUERADE 1 +#define HAVE_IP_TOOLS 1 +#define HAVE_MII 1 +#define HAVE_SELINUX 0 diff --git a/source/a/util-linux/net-tools.diff b/source/a/util-linux/net-tools.diff deleted file mode 100644 index a19af202..00000000 --- a/source/a/util-linux/net-tools.diff +++ /dev/null @@ -1,77 +0,0 @@ ---- ./config.h.orig Wed Mar 21 21:23:31 2001 -+++ ./config.h Wed Mar 21 21:23:12 2001 -@@ -0,0 +1,74 @@ -+/* -+* config.h Automatically generated configuration includefile -+* -+* NET-TOOLS A collection of programs that form the base set of the -+* NET-3 Networking Distribution for the LINUX operating -+* system. -+* -+* DO NOT EDIT DIRECTLY -+* -+*/ -+ -+/* -+ * -+ * Internationalization -+ * -+ * The net-tools package has currently been translated to French, -+ * German and Brazilian Portugese. Other translations are, of -+ * course, welcome. Answer `n' here if you have no support for -+ * internationalization on your system. -+ * -+ */ -+#define I18N 1 -+ -+/* -+ * -+ * Protocol Families. -+ * -+ */ -+#define HAVE_AFUNIX 1 -+#define HAVE_AFINET 1 -+#define HAVE_AFINET6 1 -+#define HAVE_AFIPX 1 -+#define HAVE_AFATALK 1 -+#define HAVE_AFAX25 1 -+#define HAVE_AFNETROM 1 -+#define HAVE_AFROSE 0 -+#define HAVE_AFX25 1 -+#define HAVE_AFECONET 0 -+#define HAVE_AFDECnet 0 -+#define HAVE_AFASH 0 -+ -+/* -+ * -+ * Device Hardware types. -+ * -+ */ -+#define HAVE_HWETHER 1 -+#define HAVE_HWARC 1 -+#define HAVE_HWSLIP 1 -+#define HAVE_HWPPP 1 -+#define HAVE_HWTUNNEL 1 -+#define HAVE_HWSTRIP 1 -+#define HAVE_HWTR 1 -+#define HAVE_HWAX25 1 -+#define HAVE_HWROSE 0 -+#define HAVE_HWNETROM 1 -+#define HAVE_HWX25 1 -+#define HAVE_HWFR 1 -+#define HAVE_HWSIT 0 -+#define HAVE_HWFDDI 0 -+#define HAVE_HWHIPPI 0 -+#define HAVE_HWASH 0 -+#define HAVE_HWHDLCLAPB 0 -+#define HAVE_HWIRDA 1 -+#define HAVE_HWEC 0 -+ -+/* -+ * -+ * Other Features. -+ * -+ */ -+#define HAVE_FW_MASQUERADE 1 -+#define HAVE_IP_TOOLS 1 -+#define HAVE_MII 1 diff --git a/source/a/util-linux/net-tools_1.60-19.diff b/source/a/util-linux/net-tools_1.60-19.diff deleted file mode 100644 index f754f02d..00000000 --- a/source/a/util-linux/net-tools_1.60-19.diff +++ /dev/null @@ -1,29401 +0,0 @@ ---- net-tools-1.60.orig/lib/ether.c -+++ net-tools-1.60/lib/ether.c -@@ -2,7 +2,7 @@ - * lib/ether.c This file contains an implementation of the "Ethernet" - * support functions. - * -- * Version: $Id: ether.c,v 1.7 1999/09/27 11:00:47 philip Exp $ -+ * Version: $Id: ether.c,v 1.8 2002/07/30 05:17:29 ecki Exp $ - * - * Author: Fred N. van Kempen, - * Copyright 1993 MicroWalt Corporation -@@ -39,7 +39,7 @@ - { - static char buff[64]; - -- snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X", -+ snprintf(buff, sizeof(buff), "%02x:%02x:%02x:%02x:%02x:%02x", - (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), - (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377) - ); ---- net-tools-1.60.orig/lib/inet6.c -+++ net-tools-1.60/lib/inet6.c -@@ -3,7 +3,7 @@ - * support functions for the net-tools. - * (most of it copied from lib/inet.c 1.26). - * -- * Version: $Id: inet6.c,v 1.10 2000/10/28 11:04:00 pb Exp $ -+ * Version: $Id: inet6.c,v 1.12 2002/12/10 01:03:09 ecki Exp $ - * - * Author: Fred N. van Kempen, - * Copyright 1993 MicroWalt Corporation -@@ -44,6 +44,21 @@ - - extern int h_errno; /* some netdb.h versions don't export this */ - -+char * fix_v4_address(char *buf, struct in6_addr *in6) -+{ -+ if (IN6_IS_ADDR_V4MAPPED(in6->s6_addr)) { -+ char *s =strchr(buf, '.'); -+ if (s) { -+ while (s > buf && *s != ':') -+ --s; -+ if (*s == ':') ++s; -+ else s = NULL; -+ } -+ if (s) return s; -+ } -+ return buf; -+} -+ - static int INET6_resolve(char *name, struct sockaddr_in6 *sin6) - { - struct addrinfo req, *ai; -@@ -83,14 +98,14 @@ - return (-1); - } - if (numeric & 0x7FFF) { -- inet_ntop(AF_INET6, &sin6->sin6_addr, name, 80); -+ inet_ntop( AF_INET6, &sin6->sin6_addr, name, 80); - return (0); - } - if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) { - if (numeric & 0x8000) - strcpy(name, "default"); - else -- strcpy(name, "*"); -+ strcpy(name, "[::]"); - return (0); - } - -@@ -109,13 +124,14 @@ - } - - -+ - /* Display an Internet socket address. */ - static char *INET6_print(unsigned char *ptr) - { - static char name[80]; - - inet_ntop(AF_INET6, (struct in6_addr *) ptr, name, 80); -- return name; -+ return fix_v4_address(name, (struct in6_addr *)ptr); - } - - -@@ -129,13 +145,14 @@ - return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); - if (INET6_rresolve(buff, (struct sockaddr_in6 *) sap, numeric) != 0) - return safe_strncpy(buff, _("[UNKNOWN]"), sizeof(buff)); -- return (buff); -+ return (fix_v4_address(buff, &((struct sockaddr_in6 *)sap)->sin6_addr)); - } - - - static int INET6_getsock(char *bufp, struct sockaddr *sap) - { - struct sockaddr_in6 *sin6; -+ char *p; - - sin6 = (struct sockaddr_in6 *) sap; - sin6->sin6_family = AF_INET6; -@@ -143,7 +160,9 @@ - - if (inet_pton(AF_INET6, bufp, sin6->sin6_addr.s6_addr) <= 0) - return (-1); -- -+ p = fix_v4_address(bufp, &sin6->sin6_addr); -+ if (p != bufp) -+ memcpy(bufp, p, strlen(p)+1); - return 16; /* ?;) */ - } - ---- net-tools-1.60.orig/lib/inet6_gr.c -+++ net-tools-1.60/lib/inet6_gr.c -@@ -1,4 +1,4 @@ --/* -+ /* - Modifications: - 1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets, - snprintf instead of sprintf -@@ -71,11 +71,15 @@ - printf(_("INET6 (IPv6) not configured in this system.\n")); - return 1; - } -- printf(_("Kernel IPv6 routing table\n")); - -- printf(_("Destination " -- "Next Hop " -- "Flags Metric Ref Use Iface\n")); -+ if (numeric & RTF_CACHE) -+ printf(_("Kernel IPv6 routing cache\n")); -+ else -+ printf(_("Kernel IPv6 routing table\n")); -+ -+ printf(_("Destination " -+ "Next Hop " -+ "Flag Met Ref Use If\n")); - - while (fgets(buff, 1023, fp)) { - num = sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %08x %08x %08x %08x %s\n", -@@ -87,13 +91,19 @@ - &slen, - naddr6p[0], naddr6p[1], naddr6p[2], naddr6p[3], - naddr6p[4], naddr6p[5], naddr6p[6], naddr6p[7], -- &metric, &use, &refcnt, &iflags, iface); -+ &metric, &refcnt, &use, &iflags, iface); - #if 0 - if (num < 23) - continue; - #endif -- if (!(iflags & RTF_UP)) -- continue; -+ if (iflags & RTF_CACHE) { -+ if (!(numeric & RTF_CACHE)) -+ continue; -+ } else { -+ if (numeric & RTF_CACHE) -+ continue; -+ } -+ - /* Fetch and resolve the target address. */ - snprintf(addr6, sizeof(addr6), "%s:%s:%s:%s:%s:%s:%s:%s", - addr6p[0], addr6p[1], addr6p[2], addr6p[3], -@@ -112,7 +122,12 @@ - inet6_aftype.sprint((struct sockaddr *) &snaddr6, 1)); - - /* Decode the flags. */ -- strcpy(flags, "U"); -+ -+ flags[0]=0; -+ if (iflags & RTF_UP) -+ strcat(flags, "U"); -+ if (iflags & RTF_REJECT) -+ strcat(flags, "!"); - if (iflags & RTF_GATEWAY) - strcat(flags, "G"); - if (iflags & RTF_HOST) -@@ -123,9 +138,19 @@ - strcat(flags, "A"); - if (iflags & RTF_CACHE) - strcat(flags, "C"); -+ if (iflags & RTF_ALLONLINK) -+ strcat(flags, "a"); -+ if (iflags & RTF_EXPIRES) -+ strcat(flags, "e"); -+ if (iflags & RTF_MODIFIED) -+ strcat(flags, "m"); -+ if (iflags & RTF_NONEXTHOP) -+ strcat(flags, "n"); -+ if (iflags & RTF_FLOW) -+ strcat(flags, "f"); - - /* Print the info. */ -- printf("%-43s %-39s %-5s %-6d %-2d %7d %-8s\n", -+ printf("%-30s %-26s %-4s %-3d %-1d%6d %s\n", - addr6, naddr6, flags, metric, refcnt, use, iface); - } - -@@ -144,8 +169,7 @@ - char addr6p[8][5], haddrp[6][3]; - - if (!fp) { -- ESYSNOT("nd_print", "ND Table"); -- return 1; -+ return rprint_fib6(ext, numeric | RTF_CACHE); - } - printf(_("Kernel IPv6 Neighbour Cache\n")); - ---- net-tools-1.60.orig/lib/ipx_gr.c -+++ net-tools-1.60/lib/ipx_gr.c -@@ -38,21 +38,27 @@ - char net[128], router_net[128]; - char router_node[128]; - int num; -- FILE *fp = fopen(_PATH_PROCNET_IPX_ROUTE, "r"); -+ FILE *fp; - struct aftype *ap; - struct sockaddr sa; - -- if ((ap = get_afntype(AF_IPX)) == NULL) { -- EINTERN("lib/ipx_rt.c", "AF_IPX missing"); -- return (-1); -- } -+ fp = fopen(_PATH_PROCNET_IPX_ROUTE1, "r"); - - if (!fp) { -- perror(_PATH_PROCNET_IPX_ROUTE); -- printf(_("IPX not configured in this system.\n")); -+ fp = fopen(_PATH_PROCNET_IPX_ROUTE2, "r"); -+ } -+ -+ if (!fp) { -+ perror(NULL); -+ printf(_("IPX routing not in file %s or %s found.\n"), _PATH_PROCNET_IPX_ROUTE1, _PATH_PROCNET_IPX_ROUTE2); - return 1; - } - -+ if ((ap = get_afntype(AF_IPX)) == NULL) { -+ EINTERN("lib/ipx_rt.c", "AF_IPX missing"); -+ return (-1); -+ } -+ - printf(_("Kernel IPX routing table\n")); /* xxx */ - printf(_("Destination Router Net Router Node\n")); - ---- net-tools-1.60.orig/lib/proc.c -+++ net-tools-1.60/lib/proc.c -@@ -1,11 +1,12 @@ - /* Tolerant /proc file parser. Copyright 1998 Andi Kleen */ --/* $Id: proc.c,v 1.4 1999/01/05 20:54:00 philip Exp $ */ -+/* $Id: proc.c,v 1.5 2007/12/01 18:44:57 ecki Exp $ */ - /* Fixme: cannot currently cope with removed fields */ - - #include - #include - #include - #include -+#include - - /* Caller must free return string. */ - -@@ -72,3 +73,22 @@ - va_end(ap); - return flag; - } -+ -+ -+FILE *proc_fopen(const char *name) -+{ -+ static char *buffer; -+ static size_t pagesz; -+ FILE *fd = fopen(name, "r"); -+ -+ if (fd == NULL) -+ return NULL; -+ -+ if (!buffer) { -+ pagesz = getpagesize(); -+ buffer = malloc(pagesz); -+ } -+ -+ setvbuf(fd, buffer, _IOFBF, pagesz); -+ return fd; -+} ---- net-tools-1.60.orig/lib/proc.h -+++ net-tools-1.60/lib/proc.h -@@ -1,5 +1,7 @@ -- -- --/* Generate a suitable scanf format for a column title line */ -+/* -+ * prototypes for proc.c -+ */ - char *proc_gen_fmt(char *name, int more, FILE * fh,...); - int proc_guess_fmt(char *name, FILE* fh,...); -+FILE *proc_fopen(const char *name); -+ ---- net-tools-1.60.orig/lib/util-ank.c -+++ net-tools-1.60/lib/util-ank.c -@@ -293,7 +293,7 @@ - return 0; - } - --const char *format_host(int af, void *addr, __u8 *abuf, int alen) -+const char *format_host(int af, void *addr, char *abuf, int alen) - { - #ifdef RESOLVE_HOSTNAMES - if (resolve_hosts) { ---- net-tools-1.60.orig/lib/Makefile -+++ net-tools-1.60/lib/Makefile -@@ -16,7 +16,7 @@ - # - - --HWOBJS = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o -+HWOBJS = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o eui64.o - AFOBJS = unix.o inet.o inet6.o ax25.o ipx.o ddp.o ipx.o netrom.o af.o rose.o econet.o x25.o - AFGROBJS = inet_gr.o inet6_gr.o ipx_gr.o ddp_gr.o netrom_gr.o ax25_gr.o rose_gr.o getroute.o x25_gr.o - AFSROBJS = inet_sr.o inet6_sr.o netrom_sr.o ipx_sr.o setroute.o x25_sr.o ---- net-tools-1.60.orig/lib/ddp_gr.c -+++ net-tools-1.60/lib/ddp_gr.c -@@ -1,3 +1,20 @@ -+/* -+ * lib/ddp_gr.c Prinbting of DDP (AppleTalk) routing table -+ * used by the NET-LIB. -+ * -+ * NET-LIB -+ * -+ * Version: $Id: ddp_gr.c,v 1.4 2002/06/02 05:25:15 ecki Exp $ -+ * -+ * Author: Ajax -+ * -+ * Modification: -+ * 2002-06-02 integrated into main source by Bernd Eckenfels -+ * -+ */ -+ -+/* TODO: name lookups (/etc/atalk.names? NBP?) */ -+ - #include "config.h" - - #if HAVE_AFATALK -@@ -16,9 +33,61 @@ - #include "pathnames.h" - #include "intl.h" - -+/* stolen from inet_gr.c */ -+#define flags_decode(i,o) do { \ -+ o[0] = '\0'; \ -+ if (i & RTF_UP) strcat(o, "U"); \ -+ if (i & RTF_GATEWAY) strcat(o, "G"); \ -+ if (i & RTF_REJECT) strcat(o, "!"); \ -+ if (i & RTF_HOST) strcat(o, "H"); \ -+ if (i & RTF_REINSTATE) strcat(o, "R"); \ -+ if (i & RTF_DYNAMIC) strcat(o, "D"); \ -+ if (i & RTF_MODIFIED) strcat(o, "M"); \ -+ if (i & RTF_DEFAULT) strcat(o, "d"); \ -+ if (i & RTF_ALLONLINK) strcat(o, "a"); \ -+ if (i & RTF_ADDRCONF) strcat(o, "c"); \ -+ if (i & RTF_NONEXTHOP) strcat(o, "o"); \ -+ if (i & RTF_EXPIRES) strcat(o, "e"); \ -+ if (i & RTF_CACHE) strcat(o, "c"); \ -+ if (i & RTF_FLOW) strcat(o, "f"); \ -+ if (i & RTF_POLICY) strcat(o, "p"); \ -+ if (i & RTF_LOCAL) strcat(o, "l"); \ -+ if (i & RTF_MTU) strcat(o, "u"); \ -+ if (i & RTF_WINDOW) strcat(o, "w"); \ -+ if (i & RTF_IRTT) strcat(o, "i"); \ -+ if (i & RTF_NOTCACHED) strcat(o, "n"); \ -+ } while (0) -+ - int DDP_rprint(int options) - { -- fprintf(stderr, _("Routing table for `ddp' not yet supported.\n")); -- return (1); -+ FILE *fp; -+ char *dest, *gw, *dev, *flags; -+ char oflags[32]; -+ char *hdr = "Destination Gateway Device Flags"; -+ -+ fp = fopen(_PATH_PROCNET_ATALK_ROUTE, "r"); -+ -+ if (!fp) { -+ perror("Error opening " _PATH_PROCNET_ATALK_ROUTE); -+ fprintf(stderr, "DDP (AppleTalk) not configured on this system.\n"); -+ return 1; -+ } -+ -+ fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev); -+ free(dest); free(gw); free(dev); free(flags); -+ -+ printf("%s\n", hdr); -+ -+ while (fscanf(fp, "%as %as %as %as\n", &dest, &gw, &flags, &dev) == 4) { -+ int iflags = atoi(flags); -+ flags_decode(iflags, oflags); -+ printf("%-16s%-16s%-16s%-s\n", dest, gw, dev, oflags); -+ free(dest); free(gw); free(dev); free(flags); -+ } -+ -+ fclose(fp); -+ -+ return 0; -+ - } - #endif ---- net-tools-1.60.orig/lib/hw.c -+++ net-tools-1.60/lib/hw.c -@@ -2,7 +2,7 @@ - * lib/hw.c This file contains the top-level part of the hardware - * support functions module. - * -- * Version: $Id: hw.c,v 1.17 2000/05/20 13:38:10 pb Exp $ -+ * Version: $Id: hw.c,v 1.18 2001/11/12 02:12:05 ecki Exp $ - * - * Maintainer: Bernd 'eckes' Eckenfels, - * -@@ -73,6 +73,8 @@ - - extern struct hwtype ec_hwtype; - -+extern struct hwtype eui64_hwtype; -+ - static struct hwtype *hwtypes[] = - { - -@@ -144,6 +146,9 @@ - #if HAVE_HWX25 - &x25_hwtype, - #endif -+#if HAVE_HWEUI64 -+ &eui64_hwtype, -+#endif - &unspec_hwtype, - NULL - }; -@@ -217,6 +222,9 @@ - #if HAVE_HWEC - ec_hwtype.title = _("Econet"); - #endif -+#if HAVE_HWEUI64 -+ eui64_hwtype.title = _("Generic EUI-64"); -+#endif - sVhwinit = 1; - } - ---- net-tools-1.60.orig/lib/inet.c -+++ net-tools-1.60/lib/inet.c -@@ -3,7 +3,7 @@ - * support functions for the net-tools. - * (NET-3 base distribution). - * -- * Version: $Id: inet.c,v 1.13 1999/12/11 13:35:56 freitag Exp $ -+ * Version: $Id: inet.c,v 1.14 2003/10/19 11:57:37 pb Exp $ - * - * Author: Fred N. van Kempen, - * Copyright 1993 MicroWalt Corporation -@@ -144,7 +144,7 @@ - struct hostent *ent; - struct netent *np; - struct addr *pn; -- unsigned long ad, host_ad; -+ u_int32_t ad, host_ad; - int host = 0; - - /* Grmpf. -FvK */ -@@ -155,7 +155,7 @@ - errno = EAFNOSUPPORT; - return (-1); - } -- ad = (unsigned long) sin->sin_addr.s_addr; -+ ad = sin->sin_addr.s_addr; - #ifdef DEBUG - fprintf (stderr, "rresolve: %08lx, mask %08x, num %08x \n", ad, netmask, numeric); - #endif ---- net-tools-1.60.orig/lib/inet_sr.c -+++ net-tools-1.60/lib/inet_sr.c -@@ -3,6 +3,7 @@ - 1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets - 1999-10-07 - Kurt Garloff - for -host and gws: prefer host names - over networks (or even reject) -+ 2003-10-11 - Maik Broemme - gcc 3.x warnign fixes (default: break;) - */ - - #include "config.h" -@@ -104,7 +105,6 @@ - isnet = 1; break; - case 2: - isnet = 0; break; -- default: - } - - /* Fill in the other fields. */ ---- net-tools-1.60.orig/lib/ipx.c -+++ net-tools-1.60/lib/ipx.c -@@ -133,6 +133,9 @@ - char *ep; - int nbo; - -+ if (!sai) -+ return (-1); -+ - sai->sipx_family = AF_IPX; - sai->sipx_network = htonl(0); - sai->sipx_node[0] = sai->sipx_node[1] = sai->sipx_node[2] = ---- net-tools-1.60.orig/lib/interface.c -+++ net-tools-1.60/lib/interface.c -@@ -7,7 +7,7 @@ - 8/2000 Andi Kleen make the list operations a bit more efficient. - People are crazy enough to use thousands of aliases now. - -- $Id: interface.c,v 1.14 2001/02/10 19:31:15 pb Exp $ -+ $Id: interface.c,v 1.28 2003/05/29 02:09:14 ecki Exp $ - */ - - #include "config.h" -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #if HAVE_AFIPX - #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) -@@ -87,14 +88,20 @@ - - int ife_short; - -+int if_list_all = 0; /* do we have requested the complete proc list, yet? */ -+ - static struct interface *int_list, *int_last; - - static int if_readlist_proc(char *); - --static struct interface *add_interface(char *name) -+static struct interface *if_cache_add(char *name) - { - struct interface *ife, **nextp, *new; - -+ if (!int_list) -+ int_last = NULL; -+ -+ /* the cache is sorted, so if we hit a smaller if, exit */ - for (ife = int_last; ife; ife = ife->prev) { - int n = nstrcmp(ife->name, name); - if (n == 0) -@@ -104,7 +111,7 @@ - } - new(new); - safe_strncpy(new->name, name, IFNAMSIZ); -- nextp = ife ? &ife->next : &int_list; -+ nextp = ife ? &ife->next : &int_list; // keep sorting - new->prev = ife; - new->next = *nextp; - if (new->next) -@@ -117,19 +124,22 @@ - - struct interface *lookup_interface(char *name) - { -- struct interface *ife = NULL; -- -- if (if_readlist_proc(name) < 0) -- return NULL; -- ife = add_interface(name); -- return ife; -+ /* if we have read all, use it */ -+ if (if_list_all) -+ return if_cache_add(name); -+ -+ /* otherwise we read a limited list */ -+ if (if_readlist_proc(name) < 0) -+ return NULL; -+ -+ return if_cache_add(name); - } - - int for_all_interfaces(int (*doit) (struct interface *, void *), void *cookie) - { - struct interface *ife; - -- if (!int_list && (if_readlist() < 0)) -+ if (!if_list_all && (if_readlist() < 0)) - return -1; - for (ife = int_list; ife; ife = ife->next) { - int err = doit(ife, cookie); -@@ -139,13 +149,15 @@ - return 0; - } - --int free_interface_list(void) -+int if_cache_free(void) - { - struct interface *ife; - while ((ife = int_list) != NULL) { - int_list = ife->next; - free(ife); - } -+ int_last = NULL; -+ if_list_all = 0; - return 0; - } - -@@ -180,7 +192,7 @@ - } - if (ifc.ifc_len == sizeof(struct ifreq) * numreqs) { - /* assume it overflowed and try again */ -- numreqs += 10; -+ numreqs *= 2; - continue; - } - break; -@@ -188,7 +200,7 @@ - - ifr = ifc.ifc_req; - for (n = 0; n < ifc.ifc_len; n += sizeof(struct ifreq)) { -- add_interface(ifr->ifr_name); -+ if_cache_add(ifr->ifr_name); - ifr++; - } - err = 0; -@@ -198,7 +210,7 @@ - return err; - } - --static char *get_name(char *name, char *p) -+char *get_name(char *name, char *p) - { - while (isspace(*p)) - p++; -@@ -206,16 +218,19 @@ - if (isspace(*p)) - break; - if (*p == ':') { /* could be an alias */ -- char *dot = p, *dotname = name; -- *name++ = *p++; -- while (isdigit(*p)) -- *name++ = *p++; -- if (*p != ':') { /* it wasn't, backup */ -- p = dot; -- name = dotname; -+ char *dot = p++; -+ while (*p && isdigit(*p)) p++; -+ if (*p == ':') { -+ /* Yes it is, backup and copy it. */ -+ p = dot; -+ *name++ = *p++; -+ while (*p && isdigit(*p)) { -+ *name++ = *p++; -+ } -+ } else { -+ /* No, it isn't */ -+ p = dot; - } -- if (*p == '\0') -- return NULL; - p++; - break; - } -@@ -225,7 +240,7 @@ - return p; - } - --static int procnetdev_version(char *buf) -+int procnetdev_version(char *buf) - { - if (strstr(buf, "compressed")) - return 3; -@@ -234,12 +249,12 @@ - return 1; - } - --static int get_dev_fields(char *bp, struct interface *ife) -+int get_dev_fields(char *bp, struct interface *ife) - { - switch (procnetdev_vsn) { - case 3: - sscanf(bp, -- "%llu %llu %lu %lu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu %lu", -+ "%Lu %Lu %lu %lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu %lu", - &ife->stats.rx_bytes, - &ife->stats.rx_packets, - &ife->stats.rx_errors, -@@ -259,7 +274,7 @@ - &ife->stats.tx_compressed); - break; - case 2: -- sscanf(bp, "%llu %llu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu", -+ sscanf(bp, "%Lu %Lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu", - &ife->stats.rx_bytes, - &ife->stats.rx_packets, - &ife->stats.rx_errors, -@@ -277,7 +292,7 @@ - ife->stats.rx_multicast = 0; - break; - case 1: -- sscanf(bp, "%llu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu", -+ sscanf(bp, "%Lu %lu %lu %lu %lu %Lu %lu %lu %lu %lu %lu", - &ife->stats.rx_packets, - &ife->stats.rx_errors, - &ife->stats.rx_dropped, -@@ -300,22 +315,16 @@ - - static int if_readlist_proc(char *target) - { -- static int proc_read; - FILE *fh; - char buf[512]; - struct interface *ife; - int err; - -- if (proc_read) -- return 0; -- if (!target) -- proc_read = 1; -- - fh = fopen(_PATH_PROCNET_DEV, "r"); - if (!fh) { - fprintf(stderr, _("Warning: cannot open %s (%s). Limited output.\n"), - _PATH_PROCNET_DEV, strerror(errno)); -- return if_readconf(); -+ return -2; - } - fgets(buf, sizeof buf, fh); /* eat line */ - fgets(buf, sizeof buf, fh); -@@ -350,7 +359,7 @@ - while (fgets(buf, sizeof buf, fh)) { - char *s, name[IFNAMSIZ]; - s = get_name(name, buf); -- ife = add_interface(name); -+ ife = if_cache_add(name); - get_dev_fields(s, ife); - ife->statistics_valid = 1; - if (target && !strcmp(target,name)) -@@ -359,7 +368,6 @@ - if (ferror(fh)) { - perror(_PATH_PROCNET_DEV); - err = -1; -- proc_read = 0; - } - - #if 0 -@@ -371,9 +379,16 @@ - - int if_readlist(void) - { -- int err = if_readlist_proc(NULL); -- if (!err) -- err = if_readconf(); -+ /* caller will/should check not to call this too often -+ * (i.e. only if if_list_all == 0 -+ */ -+ int err = 0; -+ -+ err |= if_readlist_proc(NULL); -+ err |= if_readconf(); -+ -+ if_list_all = 1; -+ - return err; - } - -@@ -579,11 +594,11 @@ - - void ife_print_short(struct interface *ptr) - { -- printf("%-5.5s ", ptr->name); -- printf("%5d %3d", ptr->mtu, ptr->metric); -+ printf("%-9s ", ptr->name); -+ printf("%5d %-2d ", ptr->mtu, ptr->metric); - /* If needed, display the interface statistics. */ - if (ptr->statistics_valid) { -- printf("%8llu %6lu %6lu %6lu", -+ printf("%8llu %6lu %6lu %-6lu ", - ptr->stats.rx_packets, ptr->stats.rx_errors, - ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors); - printf("%8llu %6lu %6lu %6lu ", -@@ -636,8 +651,8 @@ - int hf; - int can_compress = 0; - unsigned long long rx, tx, short_rx, short_tx; -- char Rext[5]="b"; -- char Text[5]="b"; -+ const char *Rext = "B"; -+ const char *Text = "B"; - - #if HAVE_AFIPX - static struct aftype *ipxtype = NULL; -@@ -670,7 +685,7 @@ - if (hw == NULL) - hw = get_hwntype(-1); - -- printf(_("%-9.9s Link encap:%s "), ptr->name, hw->title); -+ printf(_("%-9s Link encap:%s "), ptr->name, hw->title); - /* For some hardware types (eg Ash, ATM) we don't print the - hardware address if it's null. */ - if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) && -@@ -843,10 +858,38 @@ - tx = ptr->stats.tx_bytes; - short_rx = rx * 10; - short_tx = tx * 10; -- if (rx > 1048576) { short_rx /= 1048576; strcpy(Rext, "Mb"); } -- else if (rx > 1024) { short_rx /= 1024; strcpy(Rext, "Kb"); } -- if (tx > 1048576) { short_tx /= 1048576; strcpy(Text, "Mb"); } -- else if (tx > 1024) { short_tx /= 1024; strcpy(Text, "Kb"); } -+ if (rx > 1125899906842624ull) { -+ short_rx /= 1125899906842624ull; -+ Rext = "PiB"; -+ } else if (rx > 1099511627776ull) { -+ short_rx /= 1099511627776ull; -+ Rext = "TiB"; -+ } else if (rx > 1073741824ull) { -+ short_rx /= 1073741824ull; -+ Rext = "GiB"; -+ } else if (rx > 1048576) { -+ short_rx /= 1048576; -+ Rext = "MiB"; -+ } else if (rx > 1024) { -+ short_rx /= 1024; -+ Rext = "KiB"; -+ } -+ if (tx > 1125899906842624ull) { -+ short_tx /= 1125899906842624ull; -+ Text = "PiB"; -+ } else if (tx > 1099511627776ull) { -+ short_tx /= 1099511627776ull; -+ Text = "TiB"; -+ } else if (tx > 1073741824ull) { -+ short_tx /= 1073741824ull; -+ Text = "GiB"; -+ } else if (tx > 1048576) { -+ short_tx /= 1048576; -+ Text = "MiB"; -+ } else if (tx > 1024) { -+ short_tx /= 1024; -+ Text = "KiB"; -+ } - - printf(" "); - printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"), -@@ -867,7 +910,7 @@ - } - - if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma || -- ptr->map.base_addr)) { -+ ptr->map.base_addr >= 0x100)) { - printf(" "); - if (ptr->map.irq) - printf(_("Interrupt:%d "), ptr->map.irq); ---- net-tools-1.60.orig/lib/net-features.h -+++ net-tools-1.60/lib/net-features.h -@@ -295,6 +295,13 @@ - "-" - #endif - "HDLC/LAPB " -+ -+#if HAVE_HWEUI64 -+"+" -+#else -+"-" -+#endif -+"EUI64 " - ; - - ---- net-tools-1.60.orig/lib/nstrcmp.c -+++ net-tools-1.60/lib/nstrcmp.c -@@ -1,34 +1,157 @@ - /* Copyright 1998 by Andi Kleen. Subject to the GPL. */ --/* $Id: nstrcmp.c,v 1.2 1998/11/15 20:11:38 freitag Exp $ */ -+/* rewritten by bernd eckenfels because of complicated alias semantic */ -+/* $Id: nstrcmp.c,v 1.4 2004/06/03 22:49:17 ecki Exp $ */ - #include - #include -+#include - #include "util.h" - --/* like strcmp(), but knows about numbers */ --int nstrcmp(const char *astr, const char *b) -+ -+/* return numerical :999 suffix or null. sideeffect: replace ':' with \0 */ -+char* cutalias(char* name) - { -- const char *a = astr; -+ int digit = 0; -+ int pos; -+ -+ for(pos=strlen(name); pos>0; pos--) -+ { -+ if (name[pos-1]==':' && digit) -+ { -+ name[pos-1]='\0'; -+ return name+pos; -+ } -+ if (!isdigit(name[pos-1])) -+ break; -+ digit = 1; -+ } -+ return NULL; -+} - -- while (*a == *b) { -- if (*a == '\0') -- return 0; -- a++; -- b++; -- } -- if (isdigit(*a)) { -- if (!isdigit(*b)) -- return -1; -- while (a > astr) { -- a--; -- if (!isdigit(*a)) { -- a++; -- break; -- } -- if (!isdigit(*b)) -- return -1; -- b--; -+ -+/* return index of last non digit or -1 if it does not end with digits */ -+int rindex_nondigit(char *name) -+{ -+ int pos = strlen(name); -+ -+ for(pos=strlen(name); pos>0; pos--) -+ { -+ if (!isdigit(name[pos-1])) -+ return pos; - } -- return atoi(a) > atoi(b) ? 1 : -1; -- } -- return *a - *b; -+ return 0; -+} -+ -+ -+/* like strcmp(), but knows about numbers and ':' alias suffix */ -+int nstrcmp(const char *ap, const char *bp) -+{ -+ char *a = (char*)strdup(ap); -+ char *b = (char*)strdup(bp); -+ char *an, *bn; -+ int av = 0, bv = 0; -+ char *aalias=cutalias(a); -+ char *balias=cutalias(b); -+ int aindex=rindex_nondigit(a); -+ int bindex=rindex_nondigit(b); -+ int complen=(aindex bindex) -+ { free(a); free(b); return 1; } -+ -+ if (aindex < bindex) -+ { free(a); free(b); return -1; } -+ -+ an = a+aindex; -+ bn = b+bindex; -+ -+ av = atoi(an); -+ bv = atoi(bn); -+ -+ if (av < bv) -+ { free(a); free(b); return -1; } -+ -+ if (av > bv) -+ { free(a); free(b); return 1; } -+ -+ av = -1; -+ if (aalias != NULL) -+ av = atoi(aalias); -+ -+ bv = -1; -+ if (balias != NULL) -+ bv = atoi(balias); -+ -+ free(a); free(b); -+ -+ if (av < bv) -+ return -1; -+ -+ if (av > bv) -+ return 1; -+ -+ return 0; -+} -+ -+ -+#ifdef NSTRCMP_TEST -+ -+int cs(int s) -+{ -+ if (s < 0) return -1; -+ if (s > 0) return 1; -+ return 0; -+} -+ -+ -+int dotest(char* a, char* b, int exp) -+{ -+ int res = nstrcmp(a, b); -+ int err = (cs(res) != cs(exp)); -+ printf("nstrcmp(\"%s\", \"%s\")=%d %d %s\n", a, b, res, exp, err?"WRONG":"OK"); -+ return err; - } -+ -+int main() -+{ -+ int err = 0; -+ -+ err |= dotest("eth1", "eth1", 0); -+ err |= dotest("eth0:1", "eth0:1", 0); -+ err |= dotest("lan", "lan", 0); -+ err |= dotest("100", "100", 0); -+ err |= dotest("", "", 0); -+ err |= dotest(":", ":", 0); -+ err |= dotest("a:b:c", "a:b:c", 0); -+ err |= dotest("a:", "a:", 0); -+ err |= dotest(":a", ":a", 0); -+ -+ err |= dotest("a", "aa", -1); -+ err |= dotest("eth0", "eth1", -1); -+ err |= dotest("eth1", "eth20", -1); -+ err |= dotest("eth20", "eth100", -1); -+ err |= dotest("eth1", "eth13", -1); -+ err |= dotest("eth", "eth2", -1); -+ err |= dotest("eth0:1", "eth0:2", -1); -+ err |= dotest("eth1:10", "eth13:10", -1); -+ err |= dotest("eth1:1", "eth1:13", -1); -+ err |= dotest("a", "a:", -1); -+ -+ err |= dotest("aa", "a", 1); -+ err |= dotest("eth2", "eth1", 1); -+ err |= dotest("eth13", "eth1", 1); -+ err |= dotest("eth2", "eth", 1); -+ err |= dotest("eth2:10", "eth2:1", 1); -+ err |= dotest("eth2:5", "eth2:4", 1); -+ err |= dotest("eth3:2", "eth2:3", 1); -+ err |= dotest("eth13:1", "eth1:0", 1); -+ err |= dotest("a:", "a", 1); -+ err |= dotest("a1b12", "a1b2", 1); -+ -+ return err; -+} -+ -+#endif ---- net-tools-1.60.orig/lib/pathnames.h -+++ net-tools-1.60/lib/pathnames.h -@@ -1,4 +1,3 @@ -- - /* - * lib/pathnames.h This file contains the definitions of the path - * names used by the NET-LIB. -@@ -29,8 +28,10 @@ - #define _PATH_PROCNET_NR_NODES "/proc/net/nr_nodes" - #define _PATH_PROCNET_ARP "/proc/net/arp" - #define _PATH_PROCNET_AX25 "/proc/net/ax25" --#define _PATH_PROCNET_IPX "/proc/net/ipx" --#define _PATH_PROCNET_IPX_ROUTE "/proc/net/ipx_route" -+#define _PATH_PROCNET_IPX_SOCKET1 "/proc/net/ipx/socket" -+#define _PATH_PROCNET_IPX_SOCKET2 "/proc/net/ipx" -+#define _PATH_PROCNET_IPX_ROUTE1 "/proc/net/ipx/route" -+#define _PATH_PROCNET_IPX_ROUTE2 "/proc/net/ipx_route" - #define _PATH_PROCNET_ATALK "/proc/net/appletalk" - #define _PATH_PROCNET_IP_BLK "/proc/net/ip_block" - #define _PATH_PROCNET_IP_FWD "/proc/net/ip_forward" -@@ -45,6 +46,7 @@ - #define _PATH_PROCNET_X25 "/proc/net/x25" - #define _PATH_PROCNET_X25_ROUTE "/proc/net/x25_routes" - #define _PATH_PROCNET_DEV_MCAST "/proc/net/dev_mcast" -+#define _PATH_PROCNET_ATALK_ROUTE "/proc/net/atalk_route" - - /* pathname for the netlink device */ - #define _PATH_DEV_ROUTE "/dev/route" ---- net-tools-1.60.orig/lib/tr.c -+++ net-tools-1.60/lib/tr.c -@@ -2,7 +2,7 @@ - * lib/tr.c This file contains an implementation of the "Tokenring" - * support functions. - * -- * Version: $Id: tr.c,v 1.8 2000/02/02 08:56:30 freitag Exp $ -+ * Version: $Id: tr.c,v 1.9 2005/05/16 03:15:12 ecki Exp $ - * - * Author: Fred N. van Kempen, - * Copyright 1993 MicroWalt Corporation -@@ -30,8 +30,14 @@ - #include "net-support.h" - #include "pathnames.h" - #include "intl.h" -+#include "util.h" - -+ -+/* actual definition at the end of file */ - extern struct hwtype tr_hwtype; -+#ifdef ARPHRD_IEEE802_TR -+extern struct hwtype tr_hwtype1; -+#endif - - static char *pr_tr(unsigned char *ptr) - { -@@ -42,7 +48,7 @@ - (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377) - ); - return (buff); --} -+ } - - - static int in_tr(char *bufp, struct sockaddr *sap) -@@ -51,7 +57,17 @@ - char c, *orig; - int i, val; - -+#ifdef ARPHRD_IEEE802_TR -+ if (kernel_version() < KRELEASE(2,3,30)) { -+ sap->sa_family = tr_hwtype.type; -+ } else { -+ sap->sa_family = tr_hwtype1.type; -+ } -+#else - sap->sa_family = tr_hwtype.type; -+ #warning "Limited functionality, no support for ARPHRD_IEEE802_TR (old kernel headers?)" -+#endif -+ - ptr = sap->sa_data; - - i = 0; ---- net-tools-1.60.orig/lib/util.h -+++ net-tools-1.60/lib/util.h -@@ -14,3 +14,6 @@ - - char *safe_strncpy(char *dst, const char *src, size_t size); - -+ -+#define netmin(a,b) ((a)<(b) ? (a) : (b)) -+#define netmax(a,b) ((a)>(b) ? (a) : (b)) ---- net-tools-1.60.orig/lib/irda.c -+++ net-tools-1.60/lib/irda.c -@@ -1,13 +1,15 @@ - /********************************************************************* - * - * Filename: irda.c -- * Version: 0.1 -- * Description: A first attempt to make ifconfig understand IrDA -+ * Version: 0.2 -+ * Description: A second attempt to make ifconfig understand IrDA - * Status: Experimental. - * Author: Dag Brattli - * Created at: Wed Apr 21 09:03:09 1999 - * Modified at: Wed Apr 21 09:17:05 1999 - * Modified by: Dag Brattli -+ * Modified at: Wed May 1 11:51:44 CEST 2002 -+ * Modified by: Christoph Bartelmus - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as -@@ -59,9 +61,9 @@ - */ - static char *irda_print(unsigned char *ptr) - { -- static char buff[8]; -+ static char buff[12]; - -- sprintf(&buff[strlen(buff)], "%02x:%02x:%02x:%02x", ptr[3], ptr[2], -+ snprintf(buff, 12, "%02x:%02x:%02x:%02x", ptr[3], ptr[2], - ptr[1], ptr[0]); - - return (buff); ---- net-tools-1.60.orig/lib/x25_sr.c -+++ net-tools-1.60/lib/x25_sr.c -@@ -67,7 +67,7 @@ - strcpy(target, *args++); - - /* Clean out the x25_route_struct structure. */ -- memset((char *) &rt, 0, sizeof(struct x25_route_struct)); -+ memset((char *) &rt, 0, sizeof(rt)); - - - if ((sigdigits = x25_aftype.input(0, target, (struct sockaddr *)&sx25)) < 0) { -@@ -76,8 +76,8 @@ - } - rt.sigdigits=sigdigits; - -- /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */ -- memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address)); -+ /* this works with 2.4 and 2.6 headers struct x25_address vs. typedef */ -+ memcpy(&rt.address, &sx25.sx25_addr, sizeof(sx25.sx25_addr)); - - while (*args) { - if (!strcmp(*args,"device") || !strcmp(*args,"dev")) { ---- net-tools-1.60.orig/lib/eui64.c -+++ net-tools-1.60/lib/eui64.c -@@ -0,0 +1,155 @@ -+/* -+ * lib/eui64.c This file contains support for generic EUI-64 hw addressing -+ * -+ * Version: $Id: eui64.c,v 1.1 2001/11/12 02:12:05 ecki Exp $ -+ * -+ * Author: Daniel Stodden -+ * Copyright 2001 Daniel Stodden -+ * -+ * blueprinted from ether.c -+ * Copyright 1993 MicroWalt Corporation -+ * -+ * 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. -+ */ -+#include "config.h" -+ -+#if HAVE_HWEUI64 -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "net-support.h" -+#include "pathnames.h" -+#include "intl.h" -+ -+/* -+ * EUI-64 constants -+ */ -+ -+#define EUI64_ALEN 8 -+ -+#ifndef ARPHRD_EUI64 -+#define ARPHRD_EUI64 27 -+#warning "ARPHRD_EUI64 not defined in . Using private value 27" -+#endif -+ -+struct hwtype eui64_hwtype; -+ -+/* Display an EUI-64 address in readable format. */ -+static char *pr_eui64( unsigned char *ptr ) -+{ -+ static char buff[64]; -+ -+ snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", -+ (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), (ptr[3] & 0377), -+ (ptr[4] & 0377), (ptr[5] & 0377), (ptr[6] & 0377), (ptr[7] & 0377) -+ ); -+ return (buff); -+} -+ -+/* Start the PPP encapsulation on the file descriptor. */ -+static int in_eui64( char *bufp, struct sockaddr *sap ) -+{ -+ unsigned char *ptr; -+ char c, *orig; -+ int i; -+ unsigned val; -+ -+ sap->sa_family = eui64_hwtype.type; -+ ptr = sap->sa_data; -+ -+ i = 0; -+ orig = bufp; -+ -+ while ((*bufp != '\0') && (i < EUI64_ALEN)) { -+ val = 0; -+ c = *bufp++; -+ if (isdigit(c)) -+ val = c - '0'; -+ else if (c >= 'a' && c <= 'f') -+ val = c - 'a' + 10; -+ else if (c >= 'A' && c <= 'F') -+ val = c - 'A' + 10; -+ else { -+#ifdef DEBUG -+ fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), -+ orig ); -+#endif -+ errno = EINVAL; -+ return (-1); -+ } -+ -+ val <<= 4; -+ c = *bufp; -+ if (isdigit(c)) -+ val |= c - '0'; -+ else if (c >= 'a' && c <= 'f') -+ val |= c - 'a' + 10; -+ else if (c >= 'A' && c <= 'F') -+ val |= c - 'A' + 10; -+ else if (c == ':' || c == 0) -+ val >>= 4; -+ else { -+#ifdef DEBUG -+ fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"), -+ orig ); -+#endif -+ errno = EINVAL; -+ return (-1); -+ } -+ -+ if (c != 0) -+ bufp++; -+ -+ *ptr++ = (unsigned char) (val & 0377); -+ i++; -+ -+ /* We might get a semicolon here - not required. */ -+ if (*bufp == ':') { -+ if (i == EUI64_ALEN) { -+#ifdef DEBUG -+ fprintf(stderr, _("in_eui64(%s): trailing : ignored!\n"), -+ orig) -+#endif -+ ; /* nothing */ -+ } -+ bufp++; -+ } -+ } -+ -+ /* That's it. Any trailing junk? */ -+ if ((i == EUI64_ALEN) && (*bufp != '\0')) { -+#ifdef DEBUG -+ fprintf(stderr, _("in_eui64(%s): trailing junk!\n"), orig); -+ errno = EINVAL; -+ return (-1); -+#endif -+ } -+#ifdef DEBUG -+ fprintf(stderr, "in_eui64(%s): %s\n", orig, pr_eui64(sap->sa_data)); -+#endif -+ -+ return (0); -+} -+ -+struct hwtype eui64_hwtype = -+{ -+ "eui64", NULL, /*"EUI-64 addressing", */ ARPHRD_EUI64, EUI64_ALEN, -+ pr_eui64, in_eui64, NULL, 0 -+}; -+ -+ -+#endif /* HAVE_EUI64 */ ---- net-tools-1.60.orig/rarp.c -+++ net-tools-1.60/rarp.c -@@ -3,7 +3,7 @@ - * that maintains the kernel's RARP cache. It is derived - * from Fred N. van Kempen's arp command. - * -- * Version: $Id: rarp.c,v 1.6 2001/04/08 17:05:05 pb Exp $ -+ * Version: $Id: rarp.c,v 1.9 2007/12/02 02:19:52 ecki Exp $ - * - * Usage: rarp -d hostname Delete entry - * rarp -s hostname ethernet_address Add entry -@@ -40,6 +40,7 @@ - #include "net-support.h" - #include "version.h" - #include "pathnames.h" -+#include "proc.h" - - static char no_rarp_message[] = N_("This kernel does not support RARP.\n"); - -@@ -154,7 +155,7 @@ - - static int display_cache(void) - { -- FILE *fd = fopen(_PATH_PROCNET_RARP, "r"); -+ FILE *fd = proc_fopen(_PATH_PROCNET_RARP); - char buffer[256]; - if (fd == NULL) { - if (errno == ENOENT) ---- net-tools-1.60.orig/slattach.c -+++ net-tools-1.60/slattach.c -@@ -73,7 +73,7 @@ - - - const char *Release = RELEASE, -- *Version = "@(#) slattach 1.21 (1999-11-21)", -+ *Version = "$Id: slattach.c,v 1.11 2005/12/04 05:15:36 ecki Exp $", - *Signature = "net-tools, Fred N. van Kempen et al."; - - -@@ -115,7 +115,7 @@ - int opt_k = 0; /* "keepalive" value */ - #endif - int opt_l = 0; /* "lock it" flag */ --int opt_L = 0; /* clocal flag */ -+int opt_L = 0; /* 3-wire mode flag */ - int opt_m = 0; /* "set RAW mode" flag */ - int opt_n = 0; /* "set No Mesg" flag */ - #ifdef SIOCSOUTFILL -@@ -342,9 +342,11 @@ - tty->c_oflag = (0); /* output flags */ - tty->c_lflag = (0); /* local flags */ - speed = (tty->c_cflag & CBAUD); /* save current speed */ -- tty->c_cflag = (CRTSCTS | HUPCL | CREAD); /* UART flags */ -+ tty->c_cflag = (HUPCL | CREAD); /* UART flags */ - if (opt_L) - tty->c_cflag |= CLOCAL; -+ else -+ tty->c_cflag |= CRTSCTS; - tty->c_cflag |= speed; /* restore speed */ - return(0); - } ---- net-tools-1.60.orig/include/util-ank.h -+++ net-tools-1.60/include/util-ank.h -@@ -75,6 +75,6 @@ - extern int do_class(int argc, char **argv); - extern int do_filter(int argc, char **argv); - --extern const char *format_host(int af, void *addr, __u8 *abuf, int alen); -+extern const char *format_host(int af, void *addr, char *abuf, int alen); - - #endif /* __UTILS_H__ */ ---- net-tools-1.60.orig/include/interface.h -+++ net-tools-1.60/include/interface.h -@@ -64,13 +64,17 @@ - extern int if_fetch(struct interface *ife); - - extern int for_all_interfaces(int (*)(struct interface *, void *), void *); --extern int free_interface_list(void); -+extern int if_cache_free(void); - extern struct interface *lookup_interface(char *name); - extern int if_readlist(void); - - extern int do_if_fetch(struct interface *ife); - extern int do_if_print(struct interface *ife, void *cookie); - -+extern int procnetdev_version(char *buf); -+extern int get_dev_fields(char *bp, struct interface *ife); -+extern char * get_name(char *name, char *p); -+ - extern void ife_print(struct interface *ptr); - - extern int ife_short; ---- net-tools-1.60.orig/include/mii.h -+++ net-tools-1.60/include/mii.h -@@ -6,11 +6,14 @@ - * Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org - */ - --#ifndef _LINUX_MII_H --#define _LINUX_MII_H -+#ifndef _NETTOOL_MII_H -+#define _NETTOOLS_MII_H -+ -+#include - - /* network interface ioctl's for MII commands */ - #ifndef SIOCGMIIPHY -+#warning "SIOCGMIIPHY is not defined by your kernel source" - #define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Read from current PHY */ - #define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read any PHY register */ - #define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write any PHY register */ -@@ -38,6 +41,7 @@ - #define MII_BMCR_RESTART 0x0200 - #define MII_BMCR_DUPLEX 0x0100 - #define MII_BMCR_COLTEST 0x0080 -+#define MII_BMCR_SPEED1000 0x0040 - - /* Basic Mode Status Register */ - #define MII_BMSR 0x01 -@@ -83,4 +87,17 @@ - #define MII_ANER_PAGE_RX 0x0002 - #define MII_ANER_LP_AN_ABLE 0x0001 - --#endif /* _LINUX_MII_H */ -+#define MII_CTRL1000 0x09 -+#define MII_BMCR2_1000FULL 0x0200 -+#define MII_BMCR2_1000HALF 0x0100 -+ -+#define MII_STAT1000 0x0a -+#define MII_LPA2_1000LOCALOK 0x2000 -+#define MII_LPA2_1000REMRXOK 0x1000 -+#define MII_LPA2_1000FULL 0x0800 -+#define MII_LPA2_1000HALF 0x0400 -+ -+/* Last register we need for show_basic_mii() */ -+#define MII_BASIC_MAX (MII_STAT1000+1) -+ -+#endif /* _NETTOOLS_MII_H */ ---- net-tools-1.60.orig/man/en_US/rarp.8 -+++ net-tools-1.60/man/en_US/rarp.8 -@@ -61,8 +61,8 @@ - Create a RARP address mapping entry for host - .B hostname - with hardware address set to --.B hw_addr --. The format of the hardware address is dependent on the hardware -+.BR hw_addr . -+The format of the hardware address is dependent on the hardware - class, but for most classes one can assume that the usual presentation - can be used. For the Ethernet class, this is 6 bytes in hexadecimal, - separated by colons. ---- net-tools-1.60.orig/man/en_US/arp.8 -+++ net-tools-1.60/man/en_US/arp.8 -@@ -1,56 +1,111 @@ --.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual" -+.TH ARP 8 "2007-12-01" "net-tools" "Linux Programmer's Manual" - .SH NAME - arp \- manipulate the system ARP cache - .SH SYNOPSIS - .B arp - .RB [ \-vn ] --.RB [ "\-H type" ] --.RB [ "-i if" ] --.B -a --.RB [ hostname ] -+.RB [ \-H -+.IR type ] -+.RB [ \-i -+.IR if ] -+.RB [ \-a ] -+.RI [ hostname ] - .PP - .B arp - .RB [ \-v ] --.RB [ "\-i if" ] --.B "\-d hostname" -+.RB [ \-i -+.IR if ] -+.B \-d -+.I hostname - .RB [ pub ] - .PP - .B arp - .RB [ \-v ] --.RB [ "\-H type" ] --.RB [ "\-i if" ] --.B -s hostname hw_addr -+.RB [ \-H -+.IR type ] -+.RB [ \-i -+.IR if ] -+.B \-s -+.I hostname hw_addr - .RB [ temp ] - .PP - .B arp - .RB [ \-v ] --.RB [ "\-H type" ] --.RB [ "\-i if" ] --.B -s hostname hw_addr --.RB [ "netmask nm" ] -+.RB [ \-H -+.IR type ] -+.RB [ \-i -+.IR if ] -+.B \-s -+.I hostname hw_addr -+.RB [ netmask -+.IR nm ] - .B pub - .PP - .B arp - .RB [ \-v ] --.RB [ "\-H type" ] --.RB [ "\-i if" ] --.B -Ds hostname ifa --.RB [ "netmask nm" ] -+.RB [ \-H -+.IR type ] -+.RB [ \-i -+.IR if ] -+.B \-Ds -+.I hostname -+.I ifname -+.RB [ netmask -+.IR nm ] - .B pub - .PP - .B arp - .RB [ \-vnD ] --.RB [ "\-H type" ] --.RB [ "-i if" ] --.B -f [filename] -+.RB [ \-H -+.IR type ] -+.RB [ \-i -+.IR if ] -+.B \-f -+.RI [ filename ] - - .SH DESCRIPTION - .B Arp --manipulates the kernel's ARP cache in various ways. The primary options --are clearing an address mapping entry and manually setting up one. For --debugging purposes, the -+manipulates or displays the kernel's IPv4 network neighbour cache. It can add -+entries to the table, delete one or display the current content. -+ -+.B ARP -+stands for Address Resolution Protocol, which is used to find the media -+access control address of a network neighbour for a given IPv4 Address. -+.SH MODES - .B arp --program also allows a complete dump of the ARP cache. -+with no mode specifier will print the current content of the table. It is -+possible to limit the number of entries printed, by specifying an hardware -+address type, interface name or host address. -+ -+.B arp -d -+.I address -+will delete a ARP table entry. Root or netadmin priveledge is required to do -+this. The entry is found by IP address. If a hostname is given, it will be -+resolved before looking up the entry in the ARP table. -+ -+.B arp -s -+.I address hw_addr -+is used to set up a new table entry. The format of the -+.I hw_addr -+parameter is dependent on the hardware class, but for most classes one can -+assume that the usual presentation can be used. For the Ethernet class, -+this is 6 bytes in hexadecimal, separated by colons. When adding proxy arp -+entries (that is those with the -+.BR pub lish -+flag set a -+.B netmask -+may be specified to proxy arp for entire subnets. This is not good -+practice, but is supported by older kernels because it can be -+useful. If the -+.B temp -+flag is not supplied entries will be permanent stored into the ARP -+cache. To simplyfy setting up entries for one of your own network interfaces, you can use the -+.B "arp \-Ds" -+.I address ifname -+form. In that case the hardware address is taken from the interface with the -+specified name. -+ -+.br - .SH OPTIONS - .TP - .B "\-v, \-\-verbose" -@@ -76,21 +131,13 @@ - and - .RB "NET/ROM (" netrom ")." - .TP --.B "\-a [hostname], \-\-display [hostname]" --Shows the entries of the specified hosts. If the --.B hostname --parameter is not used, --.B all --entries will be displayed. --.TP --.B "\-d hostname, \-\-delete hostname" --Remove any entry for the specified host. This can be used if the --indicated host is brought down, for example. -+.B \-a -+Use alternate BSD style output format (with no fixed columns). - .TP - .B "\-D, \-\-use-device" --Use the interface --.BR ifa "'s" --hardware address. -+Instead of a hw_addr, the given argument is the name of an interface. -+.B arp -+will use the MAC address of that interface for the table entry. This is usually the best option to set up a proxy ARP entry to yourself. - .TP - .B "\-i If, \-\-device If" - Select an interface. When dumping the ARP cache only entries matching -@@ -106,33 +153,15 @@ - .B NOTE: - This has to be different from the interface to which the IP - datagrams will be routed. --.TP --.B "\-s hostname hw_addr, \-\-set hostname" --Manually create an ARP address mapping entry for host --.B hostname --with hardware address set to --.B hw_addr --. The format of the hardware address is dependent on the hardware --class, but for most classes one can assume that the usual presentation --can be used. For the Ethernet class, this is 6 bytes in hexadecimal, --separated by colons. When adding proxy arp entries (that is those with --the --.BR pub lish --flag set a --.B netmask --may be specified to proxy arp for entire subnets. This is not good --practice, but is supported by older kernels because it can be --useful. If the --.B temp --flag is not supplied entries will be permanent stored into the ARP --cache. --.br - .B NOTE: - As of kernel 2.2.0 it is no longer possible to set an ARP entry for an - entire subnet. Linux instead does automagic proxy arp when a route - exists and it is forwarding. See - .BR arp (7) --for details. -+for details. Also the -+.B dontpub -+option which is available for delete and set operations cannot be -+used with 2.4 and newer kernels. - .TP - .B "\-f filename, \-\-file filename" - Similar to the -@@ -167,8 +196,18 @@ - and published entries have the - .B P - flag. -+.SH EXSAMPLES -+.B /usr/sbin/arp -i eth0 -Ds 10.0.0.2 eth1 pub -+ -+This will answer ARP requests for 10.0.0.2 on eth0 with the MAC address for -+eth1. -+ -+.B /usr/sbin/arp -i eth1 -d 10.0.0.1 -+ -+Delete the ARP table entry for 10.0.0.1 on interface eth1. This will match -+published proxy ARP entries and permanent entries. - .SH FILES --.I /proc/net/arp, -+.I /proc/net/arp - .br - .I /etc/networks - .br -@@ -178,5 +217,4 @@ - .SH SEE ALSO - rarp(8), route(8), ifconfig(8), netstat(8) - .SH AUTHORS --Fred N. van Kempen, with a lot of improvements --from net-tools Maintainer Bernd Eckenfels . -+Fred N. van Kempen , Bernd Eckenfels . ---- net-tools-1.60.orig/man/en_US/ethers.5 -+++ net-tools-1.60/man/en_US/ethers.5 -@@ -1,4 +1,4 @@ --.TH ETHERS 5 "April 26th, 1996" "" "File formats" -+.TH ETHERS 5 "May 15th, 2005" "" "File formats" - .SH NAME \"{{{roff}}}\"{{{ - ethers \- Ethernet address to IP number database - .\"}}} -@@ -10,8 +10,8 @@ - \fIEthernet-address\fP \fIIP-number\fP - .RE - .sp --The two items are separated by any number of SPACE and/or TAB char --acters. A \fB#\fP at the beginning of a line starts a comment -+The two items are separated by any number of SPACE and/or TAB characters. -+A \fB#\fP at the beginning of a line starts a comment - which extends to the end of the line. The \fIEthernet-address\fP is - written as - .IR x : x : x : x : x : x , ---- net-tools-1.60.orig/man/en_US/ifconfig.8 -+++ net-tools-1.60/man/en_US/ifconfig.8 -@@ -1,10 +1,10 @@ --.TH IFCONFIG 8 "14 August 2000" "net-tools" "Linux Programmer's Manual" -+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" - .SH NAME - ifconfig \- configure a network interface - .SH SYNOPSIS --.B "ifconfig [interface]" -+.B "ifconfig [-v] [-a] [-s] [interface]" - .br --.B "ifconfig interface [aftype] options | address ..." -+.B "ifconfig [-v] interface [aftype] options | address ..." - .SH DESCRIPTION - .B Ifconfig - is used to configure the kernel-resident network interfaces. It is -@@ -41,11 +41,27 @@ - (AMPR Packet radio). - .SH OPTIONS - .TP -+.B -a -+display all interfaces which are currently available, even if down -+.TP -+.B -s -+display a short list (like netstat -i) -+.TP -+.B -v -+be more verbose for some error conditions -+.TP - .B interface - The name of the interface. This is usually a driver name followed by - a unit number, for example - .B eth0 --for the first Ethernet interface. -+for the first Ethernet interface. If your kernel supports alias interfaces, -+you can specify them with -+.B eth0:0 -+for the first alias of eth0. You can use them to assign a second address. To -+delete an alias interface use -+.BR "ifconfig eth0:0 down" . -+Note: for every scope (i.e. same net with address/netmask combination) all -+aliases are deleted, if you delete the first (primary). - .TP - .B up - This flag causes the interface to be activated. It is implicitly -@@ -173,11 +189,20 @@ - are shared with all alias addresses on the same device. If you want per-address - statistics you should add explicit accounting - rules for the address using the --.BR ipchains(8) -+.BR ipchains (8) -+or -+.BR iptables (8) - command. - .LP --Interrupt problems with Ethernet device drivers fail with EAGAIN. See --.I http://cesdis.gsfc.nasa.gov/linux/misc/irq-conflict.html -+Since net-tools 1.60-4 ifconfig is printing byte counters and human readable -+counters with IEC 60027-2 units. So 1 KiB are 2^10 byte. Note, the numbers -+are truncated to one decimal (which can by quite a large error if you -+consider 0.1 PiB is 112.589.990.684.262 bytes :) -+.LP -+Interrupt problems with Ethernet device drivers fail with EAGAIN -+.I (SIOCSIIFLAGS: Resource temporarily unavailable) -+it is most likely a interrupt conflict. See -+.I http://www.scyld.com/expert/irq-conflict.html - for more information. - .SH FILES - .I /proc/net/socket -@@ -189,7 +214,9 @@ - While appletalk DDP and IPX addresses will be displayed they cannot be - altered by this command. - .SH SEE ALSO --route(8), netstat(8), arp(8), rarp(8), ipchains(8) -+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5). -+.br -+http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples - .SH AUTHORS - Fred N. van Kempen, - .br -@@ -198,3 +225,5 @@ - Phil Blundell, - .br - Andi Kleen -+.br -+Bernd Eckenfels, ---- net-tools-1.60.orig/man/en_US/netstat.8 -+++ net-tools-1.60/man/en_US/netstat.8 -@@ -8,7 +8,7 @@ - .\" Modified: Tuan Hoang tqhoang@bigfoot.com - .\" - .\" --.TH NETSTAT 8 "19 December 2000" "net-tools" "Linux Programmer's Manual" -+.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" - - .SH NAME - netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships -@@ -23,7 +23,7 @@ - .RB [ \-\-listening | \-l ] - .RB [ \-\-all | \-a ] - .RB [ \-\-numeric | \-n ] --.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ] -+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ] - .RB [ \-\-symbolic | \-N ] - .RB [ \-\-extend | \-e [ \-\-extend | \-e] ] - .RB [ \-\-timers | \-o ] -@@ -37,31 +37,30 @@ - .RB [ \-\-extend | \-e [ \-\-extend | \-e] ] - .RB [ \-\-verbose | \-v ] - .RB [ \-\-numeric | \-n ] --.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ] -+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ] - .RB [ \-\-continuous | \-c] - .P - .B netstat - .RB { \-\-interfaces | \-i } --.RI [ iface ] - .RB [ \-\-all | \-a ] - .RB [ \-\-extend | \-e [ \-\-extend | \-e] ] - .RB [ \-\-verbose | \-v ] - .RB [ \-\-program | \-p ] - .RB [ \-\-numeric | \-n ] --.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ] -+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ] - .RB [ \-\-continuous | \-c] - .P - .B netstat - .RB { \-\-groups | \-g } - .RB [ \-\-numeric | \-n ] --.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ] -+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ] - .RB [ \-\-continuous | \-c] - .P - .B netstat - .RB { \-\-masquerade | \-M } - .RB [ \-\-extend | \-e ] - .RB [ \-\-numeric | \-n ] --.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ] -+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ] - .RB [ \-\-continuous | \-c] - .P - .B netstat -@@ -78,6 +77,8 @@ - .P - .IR address_family_options : - .PP -+.RB [ -4 ] -+.RB [ -6 ] - .RB [ \-\-protocol= { inet , unix , ipx , ax25 , netrom , ddp }[, ...] ] - .RB [ \-\-unix | \-x ] - .RB [ \-\-inet | \-\-ip ] -@@ -98,12 +99,17 @@ - address families, then the active sockets of all configured address - families will be printed. - .SS "\-\-route , \-r" --Display the kernel routing tables. -+Display the kernel routing tables. See the description in -+.BR route (8) -+for details. -+.B netstat -r -+and -+.B route -e -+produce the same output. - .SS "\-\-groups , \-g" - Display multicast group membership information for IPv4 and IPv6. --.SS "\-\-interface=\fIiface \fR, \fB\-i" --Display a table of all network interfaces, or the specified --.IR iface ) . -+.SS "\-\-interfaces, \-i" -+Display a table of all network interfaces. - .SS "\-\-masquerade , \-M" - Display a list of masqueraded connections. - .SS "\-\-statistics , \-s" -@@ -165,12 +171,11 @@ - .SS "\-a, \-\-all" - Show both listening and non-listening sockets. With the - .B --interfaces --option, show interfaces that are not marked -+option, show interfaces that are not up - .SS "\-F" - Print routing information from the FIB. (This is the default.) - .SS "\-C" - Print routing information from the route cache. --.IR UP . - .P - .SH OUTPUT - .P -@@ -221,7 +226,7 @@ - The socket is waiting after close to handle packets still in the network. - .TP - .I --CLOSED -+CLOSE - The socket is not being used. - .TP - .I -@@ -438,7 +443,7 @@ - .P - .SH AUTHORS - The netstat user interface was written by Fred Baumgarten -- the man page basically -+, the man page basically - by Matt Welsh . It was updated by - Alan Cox but could do with a bit more - work. It was updated again by Tuan Hoang ---- net-tools-1.60.orig/man/en_US/route.8 -+++ net-tools-1.60/man/en_US/route.8 -@@ -1,4 +1,4 @@ --.TH ROUTE 8 "2 January 2000" "net-tools" "Linux Programmer's Manual" -+.TH ROUTE 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" - .SH NAME - route \- show / manipulate the IP routing table - .SH SYNOPSIS -@@ -141,7 +141,7 @@ - set the TCP Maximum Segment Size (MSS) for connections over this route - to M bytes. - The default is the device MTU minus headers, or a lower MTU when path mtu --discovery occured. This setting can be used to force smaller TCP packets on the -+discovery occurred. This setting can be used to force smaller TCP packets on the - other end when path mtu discovery does not work (usually because of - misconfigured firewalls that block ICMP Fragmentation Needed) - .TP -@@ -179,17 +179,20 @@ - - .SH EXAMPLES - .TP --.B route add -net 127.0.0.0 --adds the normal loopback entry, using netmask 255.0.0.0 (class A net, --determined from the destination address) and associated with the --"lo" device (assuming this device was prviously set up correctly with -+.B route add -net 127.0.0.0 netmask 255.0.0.0 dev lo -+adds the normal loopback entry, using netmask 255.0.0.0 and associated with the -+"lo" device (assuming this device was previously set up correctly with - .BR ifconfig (8)). - - .TP - .B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0 --adds a route to the network 192.56.76.x via --"eth0". The Class C netmask modifier is not really necessary here because --192.* is a Class C IP address. The word "dev" can be omitted here. -+adds a route to the local network 192.56.76.x via -+"eth0". The word "dev" can be omitted here. -+ -+.TP -+.B route del default -+deletes the current default route, which is labeled "default" or 0.0.0.0 -+in the destination field of the current routing table. - - .TP - .B route add default gw mango-gw -@@ -289,7 +292,7 @@ - Interface to which packets for this route will be sent. - .TP - .B MSS --Default maximum segement size for TCP connections over this route. -+Default maximum segment size for TCP connections over this route. - .TP - .B Window - Default window size for TCP connections over this route. -@@ -323,4 +326,4 @@ - Linus Torvalds for pl15. Alan Cox added the mss and window options for - Linux 1.1.22. irtt support and merged with netstat from Bernd Eckenfels. - .SH AUTHOR --Currently maintained by Phil Blundell . -+Currently maintained by Phil Blundell and Bernd Eckenfels . ---- net-tools-1.60.orig/man/en_US/slattach.8 -+++ net-tools-1.60/man/en_US/slattach.8 -@@ -1,4 +1,4 @@ --.TH SLATTACH 8 "12 Feb 1994" "" "" -+.TH SLATTACH 8 "10 Oct 2006" "" "" - .SH NAME - slattach \- attach a network interface to a serial line - .SH SYNOPSIS -@@ -24,6 +24,7 @@ - .B "[-h]" - Exit when the carrier is lost. This works on both /dev/tty and /dev/cua - devices by directly monitoring the carrier status every 15 seconds. -+.TP - .B "[-v]" - Enable verbose output. Useful in shell scripts. - .TP -@@ -41,7 +42,7 @@ - .TP - .B "[-e]" - Exit right after initializing device, instead of waiting for the --line to hangup. -+line to hang up. - .TP - .B "[-L]" - Enable 3 wire operation. The terminal is moved into CLOCAL mode, -@@ -50,8 +51,8 @@ - .B "[-p proto]" - Set a specific kind of protocol to use on the line. The default - is set to --.B "cslip" --, i.e. compressed SLIP. Other possible values are -+.BR "cslip" , -+i.e. compressed SLIP. Other possible values are - .B "slip" - (normal SLIP), - .B "adaptive" ---- net-tools-1.60.orig/man/en_US/mii-tool.8 -+++ net-tools-1.60/man/en_US/mii-tool.8 -@@ -1,7 +1,7 @@ - .\" Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org - .\" mii-tool.8 1.5 2000/04/25 22:58:19 - .\" --.TH MII-TOOL 8 "2000/04/25 22:58:19" "net-tools" -+.TH MII-TOOL 8 "2004/03/28 23:30:00" "net-tools" - - .SH NAME - mii-tool \- view, manipulate media-independent interface status -@@ -72,7 +72,24 @@ - commas. Valid media are \fB100baseT4\fR, \fB100baseTx-FD\fR, - \fB100baseTx-HD\fR, \fB10baseT-FD\fR, and \fB10baseT-HD\fR. - -+.SH DIAGNOSTICS -+.TP -+SIOCGMIIPHY on 'eth?' failed: Invalid argument -+If the interface is not running (up), kernel will refuse to report its link state. -+.TP -+SIOCGMIIPHY on 'eth?' failed: Operation not permitted -+Most kernels restrict access to root. -+.TP -+SIOCGMIIPHY on 'eth?' failed: No such device -+This error is shown, if the kernel does not know about the named device. -+.TP -+SIOCGMIIPHY on 'eth?' failed: Operation not supported -+The interface in question does not support MII queries. Most likely, it does not have -+MII transceivers, at all. -+ - .SH AUTHORS - David Hinds \- dhinds@pcmcia.sourceforge.org - .br - Donald Becker \- becker@scyld.com -+.br -+Bernd Eckenfels \- ecki@debian.org ---- net-tools-1.60.orig/man/fr_FR/arp.8 -+++ net-tools-1.60/man/fr_FR/arp.8 -@@ -140,8 +140,8 @@ - Similaire à l'option - .B \-s - , mais cette fois les informations d'adresses sont prises dans le fichier --.B nom_de_fichier --. Ceci peut être utilisé si les entrées ARP à configurer sont -+.BR nom_de_fichier . -+Ceci peut être utilisé si les entrées ARP à configurer sont - nombreuses. Le nom du fichier de données est très souvent nommé - .B /etc/ethers - , mais ce n'est pas officiel. -@@ -160,8 +160,8 @@ - .LP - Chaque entrée complète se trouvant dans le cache ARP est marquée de - l'indicateur --.B C --. Les entrées permanentes sont marquées de l'indicateur -+.BR C . -+Les entrées permanentes sont marquées de l'indicateur - .B M - et les entrées 'pub' ont l'indicateur - .B P ---- net-tools-1.60.orig/man/fr_FR/hostname.1 -+++ net-tools-1.60/man/fr_FR/hostname.1 -@@ -84,8 +84,8 @@ - .LP - .B hostname - fournit le nom du système tel qu'il est retourné par la fonction --.BR getdomainname (2) --. Ceci est connu comme nom de domaine YP/NIS du système. -+.BR getdomainname (2). -+Ceci est connu comme nom de domaine YP/NIS du système. - - - .LP -@@ -145,8 +145,8 @@ - .LP - La façon dont vous pouvez le changer dépend de la configuration - (habituellement dans --.IR /etc/host.conf ) --. Si le fichier 'hosts' est analysé avant d'interroger le DNS ou -+.IR /etc/host.conf ). -+Si le fichier 'hosts' est analysé avant d'interroger le DNS ou - NIS) vous pouvez le changer dans le fichier - .IR /etc/hosts . - ---- net-tools-1.60.orig/man/fr_FR/ifconfig.8 -+++ net-tools-1.60/man/fr_FR/ifconfig.8 -@@ -1,4 +1,4 @@ --.TH IFCONFIG 8 "4 August 1997" "net-tools" "Linux Programmer's Manual" -+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" - .SH NOM - ifconfig \- configure une interface réseau - .SH SYNOPSIS -@@ -60,14 +60,14 @@ - .TP - .B "[\-]promisc" - Valide ou invalide le mode --.B promiscuous --. S'il est validé, tous les paquets circulant sur le réseau -+.BR promiscuous . -+S'il est validé, tous les paquets circulant sur le réseau - seront reçus sur cette interface. - .TP - .B "[\-]allmulti" - Valide ou invalide le fonctionnement de l'interface en mode --.B all-multicast --. S'il est validé, tous les paquets multicast circulant sur le réseau -+.BR all-multicast . -+S'il est validé, tous les paquets multicast circulant sur le réseau - seront reçus sur cette interface. - .TP - .B "metric N" -@@ -196,7 +196,7 @@ - Même si les adresses appletalk DDP et IPX peuvent être affichées, - elles ne peuvent être modifiées avec cette commande. - .SH VOIR AUSSI --route(8), netstat(8), arp(8), rarp(8), ipchains(8) -+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5). - .SH AUTHORS - Fred N. van Kempen, - .br ---- net-tools-1.60.orig/man/fr_FR/netstat.8 -+++ net-tools-1.60/man/fr_FR/netstat.8 -@@ -8,7 +8,7 @@ - .\" Modified: Tuan Hoang tuan@optimus.mitre.org - .\" - .\" --.TH NETSTAT 8 "25 Fév 1999" "net-tools" "Linux Programmer's Manual" -+.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" - - .SH NAME - netstat \- Affiche les connexions réseau, les tables de routage, les -@@ -106,7 +106,7 @@ - .BR route (8) - pour plus de détails. - --.SS "\-i, \-\-interface \fIiface\fI" -+.SS "\-i, \-\-interfaces \fIiface\fI" - Si vous utilisez l'option - .BR -i ", " --interfaces - , une table de toutes (ou de l'interface -@@ -118,8 +118,8 @@ - .BR ifconfig (8). - .B "netstat -ei" - affiche une table ou une seule entrée d'interface comme la commande --.B ifconfig --. Avec le paramètre -+.BR ifconfig . -+Avec le paramètre - .B -a - , vous pouvez inclure les interfaces qui ne sont pas configurées (c.a.d qui - n'ont pas l'indicateur -@@ -249,7 +249,7 @@ - avant d'entreprendre la fermeture. - .TP - .I --CLOSED -+CLOSE - La socket n'est pas utilisée. - .TP - .I -@@ -409,8 +409,7 @@ - Depuis la version 2.2 du noyau, netstat -i n'affiche plus les statistiques - des interfaces alias. Pour obtenir les compteurs par interface alias, vous - devez définir des règles spécifiques à l'aide de la commande --.BR ipchains(8) --. -+.BR ipchains (8). - - .SH FICHIERS - .ta ---- net-tools-1.60.orig/man/fr_FR/rarp.8 -+++ net-tools-1.60/man/fr_FR/rarp.8 -@@ -55,8 +55,8 @@ - Crée manuellement une correspondance d'adresses RARP pour l'hôte - .B nom_d_hôte - avec l'adresse matérielle --.B adr_materielle --. Le format de l'adresse matérielle est dépendant du matériel, -+.BR adr_materielle . -+Le format de l'adresse matérielle est dépendant du matériel, - mais pour la plupart on peut considérer que la présentation classique - peut être utilisée. Pour la classe Ethernet, c'est 6 octets en hexadécimal, - séparés par des double-points. ---- net-tools-1.60.orig/man/fr_FR/route.8 -+++ net-tools-1.60/man/fr_FR/route.8 -@@ -1,4 +1,4 @@ --.TH ROUTE 8 "8 Août 1997" "net-tools" "Linux Programmer's Manual" -+.TH ROUTE 8 "2007-12-02" "net-tools" "Linux Programmer's Manual" - .SH NAME - route \- affiche / manipule la table de routage IP - .SH SYNOPSIS -@@ -330,6 +330,6 @@ - la gestion des fenêtres et MSS pour Linux 1.1.22. Le support de irtt - et la fusion avec netstat ont été réalisés par Bernd Eckenfels. - .SH AUTEUR --Maintenu par Phil Blundell . -+Maintenu par Phil Blundell et Bernd Eckenfels . - .SH TRADUCTION --Jean-Michel VANSTEENE (vanstee@worldnet.fr) -+Jean-Michel VANSTEENE ---- net-tools-1.60.orig/man/pt_BR/ifconfig.8 -+++ net-tools-1.60/man/pt_BR/ifconfig.8 -@@ -1,4 +1,4 @@ --.TH IFCONFIG 8 "10 de fevereiro de 1996" "net-tools" "Manual do Programador Linux" -+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Manual do Programador Linux" - .SH NOME - ifconfig \- configura uma interface de rede - .SH SINOPSE -@@ -169,7 +169,7 @@ - Os endereços appletalk DDP e IPX serão mostrados, mas não podem ser alterados - com este comando. - .SH VEJA TAMBÉM --route(8), netstat(8), arp(8), rarp(8), ipchains(8) -+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5). - .SH AUTORES - Fred N. van Kempen, - Alan Cox, ---- net-tools-1.60.orig/man/pt_BR/netstat.8 -+++ net-tools-1.60/man/pt_BR/netstat.8 -@@ -8,7 +8,7 @@ - .\" Traduzido para português por Arnaldo Carvalho de Melo - .\" Revisado por Jorge Luiz Godoy Filho - .\" --.TH NETSTAT 8 "19 de maio de 1997" "net-tools" "Manual do Programador Linux" -+.TH NETSTAT 8 "2007-12-02" "net-tools" "Manual do Programador Linux" - - .SH NOME - netstat \- Mostra conexões de rede, tabelas de roteamento, estatísticas de interface e conexões -@@ -97,7 +97,7 @@ - .BR route (8) - para maiores detalhes. - --.SS "\-i, \-\-interface \fIiface\fI" -+.SS "\-i, \-\-interfaces \fIiface\fI" - Se você usar a opção - .BR -i ", " --interfaces - , uma tabela de todas (ou da ---- net-tools-1.60.orig/man/pt_BR/rarp.8 -+++ net-tools-1.60/man/pt_BR/rarp.8 -@@ -50,8 +50,8 @@ - Cria um mapeamento de endereços RARP para a máquina - .B máquina - com endereço de hardware configurado para --.B endereço_hardware --. O formato do endereço de hardware depende da classe do hardware, mas -+.B endereço_hardware. -+O formato do endereço de hardware depende da classe do hardware, mas - para a maioria das classes você pode assumir que a apresentação usual pode - ser usada. Para a classe Ethernet, são 6 bytes em hexadecimal, separados - por dois pontos (:). ---- net-tools-1.60.orig/man/pt_BR/route.8 -+++ net-tools-1.60/man/pt_BR/route.8 -@@ -1,4 +1,4 @@ --.TH ROUTE 8 "27 Jan 1996" "net-tools" "Manual do Programador Linux" -+.TH ROUTE 8 "2007-12-02" "net-tools" "Manual do Programador Linux" - .SH NOME - route \- mostra / manipula a tabela de roteamento IP - .SH SINOPSE -@@ -321,7 +321,7 @@ - Linus Torvalds para a versão pl15. Alan Cox adicionou as opções para - mss e window no kernel 1.1.22. O suporte a irtt (compartilhado com o - netstat) foi feito por Bernd Eckenfels. -+.SH AUTHOR -+Currently maintained by Phil Blundell and Bernd Eckenfels . - .SH TRADUÇÃO - Arnaldo Carvalho de Melo - 13/04/1998 --.SH BUGS --nenhum :) ---- net-tools-1.60.orig/man/de_DE/ifconfig.8 -+++ net-tools-1.60/man/de_DE/ifconfig.8 -@@ -1,4 +1,4 @@ --.TH IFCONFIG 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" -+.TH IFCONFIG 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" - .SH NAME - ifconfig \- Konfiguration einer Netzwerkskarte - .SH SYNOPSIS -@@ -193,7 +193,7 @@ - W\(:ahrend AppleTalk DDP und IPX Adressen angezeigt werden, k\(:onnen sie mit - diesem Kommando nicht ge\(:andert werden. - .SH SIEHE AUCH --route(8), netstat(8), arp(8), rarp(8), ipchains(8) -+route(8), netstat(8), arp(8), rarp(8), ipchains(8), iptables(8), ifup(8), interfaces(5). - .SH AUTOREN - Fred N. van Kempen, - .br ---- net-tools-1.60.orig/man/de_DE/route.8 -+++ net-tools-1.60/man/de_DE/route.8 -@@ -1,4 +1,4 @@ --.TH ROUTE 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" -+.TH ROUTE 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" - .SH NAME - route \- Anzeigen der IP-Routen-Tabelle - .SH SYNOPSIS -@@ -345,6 +345,6 @@ - irtt beigesteuert und den Code mit dem von Netstat vereinigt. - .SH AUTOREN - .B Route --wird zur Zeit von Phil Blundel (Philip.Blundell@pobox.com) gewartet. -+wird zur Zeit von Phil Blundel und Bernd Eckenfels gewartet. - .SH \(:Ubersetzung - Ralf B\(:achle ---- net-tools-1.60.orig/man/de_DE/netstat.8 -+++ net-tools-1.60/man/de_DE/netstat.8 -@@ -9,7 +9,7 @@ - .\" Modified: Tuan Hoang tuan@optimus.mitre.org - .\" - .\" --.TH NETSTAT 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" -+.TH NETSTAT 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer" - - .SH NAME - netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstatistiken, maskierten Verbindungen, Netlink-Nachrichten und Mitgliedschaft in Multicastgruppen -@@ -44,7 +44,6 @@ - .B netstat - .RB [ \-veenpac ] - .RB { \-\-interfaces | \-i } --.RI [ Schnittstelle ] - - .PP - -@@ -68,6 +67,8 @@ - .SH BESCHREIBUNG - .B Netstat - zeigt Informationen des Linux Netzwerkssystems an. -+.PP -+.B Bitte beachten Sie, dass der Inhalt der deutschen man-page nicht vollst\(:andig ist, im Moment. - - .SS "(no option)" - Ohne Optionen zeigt -@@ -103,18 +104,17 @@ - Wegen Details siehe - .BR route (8). - --.SS "\-i, \-\-interface \fISchnittstelle\fI" -+.SS "\-i, \-\-interfaces" - Wird die - .BR -i ", " --interfaces --Option verwendet, so wird eine Tabelle aller (oder der angegebenen --.IR Schnittstellen ) -+Option verwendet, so wird eine Tabelle aller Schnittstellen - ausgedruckt. Die Ausgabe ist im Format von - .B "ifconfig -e" - und wird in - .BR ifconfig (8) - beschrieben. - .B "netstat -ei" --druckt eine Tabelle oder einen Eintrag f\(:ur einen einzelnes Interface wie -+druckt eine Tabelle f\(:ur Interfaces wie - .BR ifconfig . - Die - .B -a -@@ -182,7 +182,7 @@ - und - .BR \-\-ddp. - --.SS "\-c, \-\-continous" -+.SS "\-c, \-\-continuous" - Mit dieser Option wiederholt - .B netstat - im Sekundenabstand die Ausgabe, bis es abgebrochen wird. ---- net-tools-1.60.orig/po/pt_BR.po -+++ net-tools-1.60/po/pt_BR.po -@@ -10,275 +10,287 @@ - msgid "" - msgstr "" - "Project-Id-Version: net-tools 1.54\n" --"POT-Creation-Date: 2000-02-14 02:31+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" - "PO-Revision-Date: 1999-03-01 02:38+0100\n" - "Last-Translator: Arnaldo Carvalho de Melo \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO8859-9\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../arp.c:110 ../arp.c:269 -+#: ../arp.c:112 ../arp.c:279 -+#, c-format - msgid "arp: need host name\n" - msgstr "arp: preciso do nome da máquina\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "Nenhuma entrada ARP para %s\n" - --#: ../arp.c:239 -+#: ../arp.c:248 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "arp: não foi possível obter o endereço de hardware para `%s': %s.\n" - --#: ../arp.c:243 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "arp: erro no tipo do protocolo.\n" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" - msgstr "arp: o dispositivo `%s' tem endereço de hardware %s `%s'.\n" - --#: ../arp.c:282 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" - msgstr "arp: preciso do endereço de hardware\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "arp: endereço inválido de hardware\n" - --#: ../arp.c:387 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "arp: não foi possível abrir o arquivo etherfile %s!\n" - --#: ../arp.c:403 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "arp: erro de formato na linha %u do arquivo etherfile %s!\n" - --#: ../arp.c:416 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "arp: não foi possível configurar a linha %u do arquivo etherfile %s!\n" - --#: ../arp.c:437 --msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" -+#: ../arp.c:448 -+#, fuzzy, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" - msgstr "Endereço\t\tTipoHW\tEndereçoHW\t Flags Mascara\t\t Iface\n" - --#: ../arp.c:467 -+#: ../arp.c:476 -+#, fuzzy -+msgid "" -+msgstr "%s: interface desconhecida.\n" -+ -+#: ../arp.c:478 - msgid "(incomplete)" - msgstr "(incompleto)" - --#: ../arp.c:484 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "%s (%s) em " - --#: ../arp.c:490 -+#: ../arp.c:501 -+#, c-format - msgid " " - msgstr " " - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "mascara %s " - --#: ../arp.c:513 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "em %s\n" - --#: ../arp.c:592 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "Entradas: %d\tIgnorada: %d\tEncontrada: %d\n" - --#: ../arp.c:596 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "%s (%s) -- nenhuma entrada\n" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" - msgstr "arp: em %d entradas não foi encontrado.\n" - --#: ../arp.c:613 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [] [-i ] [-a] [] <-Display ARP " - "cache\n" - msgstr "" - "Uso:\n" --" arp [-vn] [] [-i ] [-a] [] <-Mostra cache " --"ARP\n" -+" arp [-vn] [] [-i ] [-a] [] <-Mostra cache ARP\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, fuzzy, c-format - msgid "" --" arp [-v] [-i ] -d [pub][nopub] <-Delete ARP " -+" arp [-v] [-i ] -d [pub] <-Delete ARP " - "entry\n" --msgstr "" --" arp [-v] [-i ] -d [pub][nopub] <-Remove entrada " --"ARP\n" -+msgstr " arp [-v] [-i ] -d [pub][nopub] <-Remove entrada ARP\n" - --#: ../arp.c:615 -+#: ../arp.c:628 -+#, fuzzy, c-format - msgid "" --" arp [-vnD] [] [-i ] -f [] <-Add entry from " -+" arp [-vnD] [] [-i ] -f [] <-Add entry from " - "file\n" - msgstr "" - " arp [-vnD] [] [-i ] -f [] <-Inclui entrada de " - "arquivo\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, fuzzy, c-format - msgid "" --" arp [-v] [] [-i ] -s [temp][nopub] <-Add " -+" arp [-v] [] [-i ] -s [temp] <-Add " - "entry\n" --msgstr "" --" arp [-v] [] [-i ] -s [temp][nopub] <-Inc. " --"Entrada\n" -- --#: ../arp.c:617 --msgid "" --" arp [-v] [] [-i ] -s [netmask ] pub " --"<-''-\n" --msgstr "" --" arp [-v] [] [-i ] -s [netmask ] pub " --"<-''-\n" -+msgstr " arp [-v] [] [-i ] -s [temp][nopub] <-Inc. Entrada\n" - --#: ../arp.c:618 -+#: ../arp.c:630 -+#, fuzzy, c-format - msgid "" --" arp [-v] [] [-i ] -Ds [netmask ] pub " -+" arp [-v] [] [-i ] -Ds [netmask ] pub " - "<-''-\n" - "\n" --msgstr "" --" arp [-v] [] [-i ] -Ds [netmask ] pub " --"<-''-\n" -+msgstr " arp [-v] [] [-i ] -Ds [netmask ] pub <-''-\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" --msgstr "" --" -a mostra (todas as) máquinas no estilo alternativo " --"(BSD)\n" -+msgstr " -a mostra (todas as) máquinas no estilo alternativo (BSD)\n" - --#: ../arp.c:621 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr " -s, --set define uma nova entrada ARP\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr " -d, --delete remove a entrada especificada\n" - --#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr " -v, --verbose listagem detalhada\n" - --#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, fuzzy, c-format -+msgid " -n, --numeric don't resolve names\n" - msgstr " -n, --numeric não resolve nomes\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" - msgstr "" - " -i, --device especifica a interface de rede (ex: eth0)\n" - --#: ../arp.c:626 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read from given device\n" - msgstr " -D, --use-device leia de um dispositivo\n" - --#: ../arp.c:627 -+#: ../arp.c:639 -+#, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -A, -p, --protocol especifica a família de protocolos\n" - --#: ../arp.c:628 -+#: ../arp.c:640 -+#, c-format - msgid "" --" -f, --file read new entries from file or from " --"/etc/ethers\n" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" - "\n" - msgstr "" --" -f, --file leia novas entradas de arquivo ou de " --"/etc/ethers\n" -+" -f, --file leia novas entradas de arquivo ou de /etc/" -+"ethers\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " =Use '-H ' to specify hardware address type. Default: %s\n" --msgstr "" --" =Use '-H ' para especificar o tipo de endereço de hw. Default: %s\n" -+msgstr " =Use '-H ' para especificar o tipo de endereço de hw. Default: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr " Lista dos tipos de hardware possíveis (que suportam ARP):\n" - --#: ../arp.c:664 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "%s: tipo de hardware não suportado!\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "%s: família de endereços não suportada!\n" - --#: ../arp.c:703 -+#: ../arp.c:716 -+#, c-format - msgid "arp: -N not yet supported.\n" - msgstr "arp: -N ainda não suportada.\n" - --#: ../arp.c:713 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "arp: %s: família de endereços desconhecida.\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "arp: %s: tipo de hardware desconhecido.\n" - --#: ../arp.c:741 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "arp: %s: kernel somente suporta ínet'.\n" - --#: ../arp.c:746 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "arp: %s: tipo de hardware sem suporte a ARP.\n" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" - msgstr "Configurando nome do nó como `%s'\n" - --#: ../hostname.c:74 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "%s: você deve ser root para mudar o nome do nó\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "%s: nome muito longo\n" - --#: ../hostname.c:89 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "Configurando nome da máquina para `%s'\n" - --#: ../hostname.c:94 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "%s: você deve ser root para mudar o nome da máquina\n" - --#: ../hostname.c:108 -+#: ../hostname.c:109 - #, c-format - msgid "Setting domainname to `%s'\n" - msgstr "Configurando nome do domínio para `%s'\n" - --#: ../hostname.c:113 -+#: ../hostname.c:114 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "%s: você deve ser root para mudar o nome do domínio\n" -@@ -303,37 +315,38 @@ - msgid "Result: h_addr_list=`%s'\n" - msgstr "Resultado: h_addr_list=`%s'\n" - --#: ../hostname.c:209 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" - msgstr "%s: não foi possível abrir `%s'\n" - --#: ../hostname.c:223 -+#: ../hostname.c:222 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" --msgstr "" --"Uso: hostname [-v] {máquina|-F arquivo} configura nome da máquina (de " --"arquivo)\n" -+msgstr "Uso: hostname [-v] {máquina|-F arquivo} configura nome da máquina (de arquivo)\n" - --#: ../hostname.c:224 -+#: ../hostname.c:223 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" - msgstr "" - " domainname [-v] {domínio_nis|-F file} configura nome do domínio NIS\n" - " (a partir de arquivo)\n" - --#: ../hostname.c:226 -+#: ../hostname.c:225 -+#, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" --msgstr "" --"Uso: hostname [-v] {máquina|-F arquivo} configura o nome do nó DECnet (de " --"arquivo)\n" -+msgstr "Uso: hostname [-v] {máquina|-F arquivo} configura o nome do nó DECnet (de arquivo)\n" - --#: ../hostname.c:228 -+#: ../hostname.c:227 -+#, c-format - msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" - msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] mostra nome formatado\n" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" -@@ -341,7 +354,8 @@ - " hostname [-v] mostra nome da máquina\n" - "\n" - --#: ../hostname.c:230 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" -@@ -349,7 +363,8 @@ - " hostname -V|--version|-h|--help mostra informações e termina\n" - "\n" - --#: ../hostname.c:231 -+#: ../hostname.c:230 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" -@@ -357,35 +372,43 @@ - " dnsdomainname=máquina -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr " -s, --short nome curto da máquina\n" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr " -a, --alias aliases para a máquina\n" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address endereços da máquina\n" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr " -f, --fqdn, --long nome longo da máquina (FQDN)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" - msgstr " -d, --domain nome do domínio DNS\n" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr " -y, --yp, --nis nome do domínio NIS/YP\n" - --#: ../hostname.c:239 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" - msgstr " -n, --node nome do nó DECnet\n" - --#: ../hostname.c:241 -+#: ../hostname.c:240 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" -@@ -393,7 +416,8 @@ - " -F, --file leia o nome da máquina ou domínio NIS do arquivo\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:242 -+#, c-format - msgid "" - " This command can read or set the hostname or the NIS domainname. You can\n" - " also read the DNS domain or the FQDN (fully qualified domain name).\n" -@@ -413,15 +437,16 @@ - msgstr "%s: Você não pode mudar o nome do domínio DNS com este comando\n" - - #: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" - msgstr "" - "\n" --"A menos que esteja usando bind ou NIS para resolução de nomes você pode " --"mudar\n" -+"A menos que esteja usando bind ou NIS para resolução de nomes você pode mudar\n" - - #: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "o nome do domínio DNS (que é parte do FQDN) no arquivo /etc/hosts.\n" - -@@ -440,552 +465,453 @@ - msgid "getnodename()=`%s'\n" - msgstr "getnodename()=`%s'\n" - --#: ../ifconfig.c:159 --#, c-format --msgid "%-9.9s Link encap:%s " --msgstr "%-9.9s Encapsulamento do Link: %s " -+#: ../ifconfig.c:107 -+#, fuzzy, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OV Opções\n" - --#: ../ifconfig.c:164 --#, c-format --msgid "HWaddr %s " --msgstr "Endereço de HW %s " -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, fuzzy, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "" -+"%s: erro obtendo informações da interface: %s\n" -+"\n" - --#: ../ifconfig.c:167 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 - #, c-format --msgid "Media:%s" --msgstr "Mídia:%s" -+msgid "No support for INET on this system.\n" -+msgstr "Este sistema não tem suporte a INET.\n" - --#: ../ifconfig.c:169 --msgid "(auto)" --msgstr "(auto)" -+#: ../ifconfig.c:193 -+#, fuzzy, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "" -+"%s: erro obtendo informações da interface: %s\n" -+"\n" - --#: ../ifconfig.c:176 --#, c-format --msgid " %s addr:%s " --msgstr " %s end.: %s " -+#: ../ifconfig.c:202 -+#, fuzzy, c-format -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] [[]
]\n" -+msgstr "" -+"Uso:\n" -+" ifconfig [-a] [-i] [-v] [[] ]\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:204 - #, c-format --msgid " P-t-P:%s " --msgstr " P-a-P:%s " -+msgid " [add
[/]]\n" -+msgstr " [add [/]]\n" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 - #, c-format --msgid " Bcast:%s " --msgstr " Bcast:%s " -+msgid " [del
[/]]\n" -+msgstr " [del [/]]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:206 - #, c-format --msgid " Mask:%s\n" --msgstr " Masc:%s\n" -+msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" -+msgstr " [[-]broadcast []] [[-]pointopoint []]\n" - --#: ../ifconfig.c:201 -+#: ../ifconfig.c:207 - #, c-format --msgid " inet6 addr: %s/%d" --msgstr " endereço inet6: %s/%d" -- --#: ../ifconfig.c:203 --msgid " Scope:" --msgstr " Escopo:" -- --#: ../ifconfig.c:206 --msgid "Global" --msgstr "Global" -+msgid " [netmask
] [dstaddr
] [tunnel
]\n" -+msgstr " [netmask ] [dstaddr ] [tunnel ]\n" - --#: ../ifconfig.c:209 --msgid "Link" --msgstr "Link" -+#: ../ifconfig.c:210 -+#, c-format -+msgid " [outfill ] [keepalive ]\n" -+msgstr " [outfill ] [keepalive ]\n" - - #: ../ifconfig.c:212 --msgid "Site" --msgstr "Site" -- --#: ../ifconfig.c:215 --msgid "Compat" --msgstr "Compat" -- --#: ../ifconfig.c:218 --msgid "Host" --msgstr "Máquina" -- --#: ../ifconfig.c:221 --msgid "Unknown" --msgstr "Desconhecido" -- --#: ../ifconfig.c:236 - #, c-format --msgid " IPX/Ethernet II addr:%s\n" --msgstr " Endereço IPX/Ethernet II:%s\n" -+msgid " [hw
] [metric ] [mtu ]\n" -+msgstr " [hw ] [metric ] [mtu ]\n" - --#: ../ifconfig.c:239 -+#: ../ifconfig.c:213 - #, c-format --msgid " IPX/Ethernet SNAP addr:%s\n" --msgstr " Endereço IPX/Ethernet SNAP:%s\n" -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:242 -+#: ../ifconfig.c:214 - #, c-format --msgid " IPX/Ethernet 802.2 addr:%s\n" --msgstr " Endereço IPX/Ethernet 802.2:%s\n" -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" - --#: ../ifconfig.c:245 -+#: ../ifconfig.c:215 - #, c-format --msgid " IPX/Ethernet 802.3 addr:%s\n" --msgstr " Endereço IPX/Ethernet 802.3:%s\n" -+msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" -+msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" - --#: ../ifconfig.c:255 -+#: ../ifconfig.c:217 - #, c-format --msgid " EtherTalk Phase 2 addr:%s\n" --msgstr " Endereço EtherTalk fase 2:%s\n" -+msgid " [txqueuelen ]\n" -+msgstr " [txqueuelen ]\n" - --#: ../ifconfig.c:264 -+#: ../ifconfig.c:220 - #, c-format --msgid " econet addr:%s\n" --msgstr " Endereço econet:%s\n" -- --#: ../ifconfig.c:270 --msgid "[NO FLAGS] " --msgstr "[NENHUMA FLAG] " -- --#: ../ifconfig.c:272 --msgid "UP " --msgstr "UP " -- --#: ../ifconfig.c:274 --msgid "BROADCAST " --msgstr "BROADCAST" -- --#: ../ifconfig.c:276 --msgid "DEBUG " --msgstr "DEBUG " -- --#: ../ifconfig.c:278 --msgid "LOOPBACK " --msgstr "LOOPBACK" -- --#: ../ifconfig.c:280 --msgid "POINTOPOINT " --msgstr "POINTOPOINT " -- --#: ../ifconfig.c:282 --msgid "NOTRAILERS " --msgstr "NOTRAILERS " -- --#: ../ifconfig.c:284 --msgid "RUNNING " --msgstr "RUNNING " -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:286 --msgid "NOARP " --msgstr "NOARP " -+#: ../ifconfig.c:222 -+#, c-format -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr "" -+" [up|down] ...\n" -+"\n" - --#: ../ifconfig.c:288 --msgid "PROMISC " --msgstr "PROMISC " -+#: ../ifconfig.c:224 -+#, c-format -+msgid " =Hardware Type.\n" -+msgstr " =Tipo de Hardware.\n" - --#: ../ifconfig.c:290 --msgid "ALLMULTI " --msgstr "ALLMULTI " -+#: ../ifconfig.c:225 -+#, c-format -+msgid " List of possible hardware types:\n" -+msgstr " Lista dos tipos possíveis de hardware:\n" - --#: ../ifconfig.c:292 --msgid "SLAVE " --msgstr "SLAVE " -+#. 1 = ARPable -+#: ../ifconfig.c:227 -+#, c-format -+msgid " =Address family. Default: %s\n" -+msgstr " =Família de endereços. Default: %s\n" - --#: ../ifconfig.c:294 --msgid "MASTER " --msgstr "MASTER " -+#: ../ifconfig.c:228 -+#, c-format -+msgid " List of possible address families:\n" -+msgstr " Lista de famílias de endereços possíveis:\n" - --#: ../ifconfig.c:296 --msgid "MULTICAST " --msgstr "MULTICAST " -+#: ../ifconfig.c:303 -+#, c-format -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" - --#: ../ifconfig.c:299 --msgid "DYNAMIC " --msgstr "DYNAMIC " -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" - --#: ../ifconfig.c:302 -+#: ../ifconfig.c:380 - #, c-format --msgid " MTU:%d Metric:%d" --msgstr " MTU:%d Métrica:%d" -+msgid "Unknown media type.\n" -+msgstr "Tipo desconhecido de mídia.\n" - --#: ../ifconfig.c:306 -+#: ../ifconfig.c:417 - #, c-format --msgid " Outfill:%d Keepalive:%d" --msgstr " Outfill:%d Keepalive:%d" -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" - --#: ../ifconfig.c:320 -+#: ../ifconfig.c:429 - #, c-format --msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" --msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposições:%lu frame:%lu\n" -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:325 -+#: ../ifconfig.c:441 - #, c-format --msgid " compressed:%lu\n" --msgstr " compactados:%lu\n" -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" - --#: ../ifconfig.c:329 -+#: ../ifconfig.c:465 - #, c-format --msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" - msgstr "" --"Pacotes TX:%lu erros:%lu descartados:%lu sobreposições:%lu portadora:%lu\n" - --#: ../ifconfig.c:333 -+#: ../ifconfig.c:523 - #, c-format --msgid " collisions:%lu " --msgstr " colisões:%lu " -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:335 -+#: ../ifconfig.c:652 - #, c-format --msgid "compressed:%lu " --msgstr "compactados:%lu " -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" - --#: ../ifconfig.c:337 -+#: ../ifconfig.c:684 - #, c-format --msgid "txqueuelen:%d " --msgstr "txqueuelen:%d " -- --#: ../ifconfig.c:345 --#, c-format --msgid "Interrupt:%d " --msgstr "IRQ:%d " -- --#. Only print devices using it for --#. I/O maps --#: ../ifconfig.c:348 --#, c-format --msgid "Base address:0x%x " --msgstr "Endereço de E/S:0x%x " -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "" - --#: ../ifconfig.c:350 -+#: ../ifconfig.c:693 - #, c-format --msgid "Memory:%lx-%lx " --msgstr "Memória:%lx-%lx " -+msgid "%s: invalid %s address.\n" -+msgstr "%s: endereço %s inválido.\n" - --#: ../ifconfig.c:353 -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 - #, c-format --msgid "DMA chan:%x " --msgstr "Canal DMA:%x " -+msgid "No support for INET6 on this system.\n" -+msgstr "Este sistema não tem suporte a INET6.\n" - --#: ../ifconfig.c:384 ../ifconfig.c:405 -+#: ../ifconfig.c:780 ../ifconfig.c:871 - #, c-format --msgid "%s: unknown interface: %s\n" --msgstr "%s: interface desconhecida: %s\n" -- --#: ../ifconfig.c:421 --msgid "" --"Usage:\n" --" ifconfig [-a] [-i] [-v] [[]
]\n" --msgstr "" --"Uso:\n" --" ifconfig [-a] [-i] [-v] [[] ]\n" -- --#: ../ifconfig.c:425 --msgid " [add
[/]]\n" --msgstr " [add [/]]\n" -- --#: ../ifconfig.c:427 --msgid " [del
[/]]\n" --msgstr " [del [/]]\n" -- --#: ../ifconfig.c:432 --msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" --msgstr " [[-]broadcast []] [[-]pointopoint []]\n" -- --#: ../ifconfig.c:433 --msgid " [netmask
] [dstaddr
] [tunnel
]\n" --msgstr " [netmask ] [dstaddr ] [tunnel ]\n" -- --#: ../ifconfig.c:436 --msgid " [outfill ] [keepalive ]\n" --msgstr " [outfill ] [keepalive ]\n" -- --#: ../ifconfig.c:438 --msgid " [hw
] [metric ] [mtu ]\n" --msgstr " [hw ] [metric ] [mtu ]\n" -- --#: ../ifconfig.c:439 --msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" --msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -- --#: ../ifconfig.c:440 --msgid " [multicast] [[-]promisc]\n" --msgstr " [multicast] [[-]promisc]\n" -- --#: ../ifconfig.c:441 --msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" --msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" -- --#: ../ifconfig.c:443 --msgid " [txqueuelen ]\n" --msgstr " [txqueuelen ]\n" -- --#: ../ifconfig.c:446 --msgid " [[-]dynamic]\n" --msgstr " [[-]dynamic]\n" -- --#: ../ifconfig.c:448 --msgid "" --" [up|down] ...\n" --"\n" -+msgid "Interface %s not initialized\n" - msgstr "" --" [up|down] ...\n" --"\n" -- --#: ../ifconfig.c:450 --msgid " =Hardware Type.\n" --msgstr " =Tipo de Hardware.\n" -- --#: ../ifconfig.c:451 --msgid " List of possible hardware types:\n" --msgstr " Lista dos tipos possíveis de hardware:\n" -- --#. 1 = ARPable --#: ../ifconfig.c:453 --#, c-format --msgid " =Address family. Default: %s\n" --msgstr " =Família de endereços. Default: %s\n" -- --#: ../ifconfig.c:454 --msgid " List of possible address families:\n" --msgstr " Lista de famílias de endereços possíveis:\n" -- --#: ../ifconfig.c:593 --msgid "Unknown media type.\n" --msgstr "Tipo desconhecido de mídia.\n" - --#: ../ifconfig.c:881 --#, c-format --msgid "%s: invalid %s address.\n" -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, fuzzy, c-format -+msgid "Bad address.\n" - msgstr "%s: endereço %s inválido.\n" - --#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 --msgid "No support for INET6 on this system.\n" --msgstr "Este sistema não tem suporte a INET6.\n" -- --#: ../ifconfig.c:983 -+#: ../ifconfig.c:885 -+#, c-format - msgid "Address deletion not supported on this system.\n" - msgstr "Remoção de endereço não suportada neste sistema.\n" - --#: ../ifconfig.c:1066 --msgid "No support for INET on this system.\n" --msgstr "Este sistema não tem suporte a INET.\n" -+#: ../ifconfig.c:957 -+#, fuzzy, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Não sei como configurar endereços para a família %d.\n" - --#: ../ifconfig.c:1076 -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "Este sistema não tem suporte a ECONET.\n" - --#: ../ifconfig.c:1084 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "Não sei como configurar endereços para a família %d.\n" - --#: ../netstat.c:383 -+#: ../ifconfig.c:1021 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "" -+ -+#: ../netstat.c:434 - #, c-format - msgid "" - "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" --msgstr "" --"(Não foi possível ler informações para \"-p\": geteuid()=%d mas você deve " --"ser root.)\n" -+msgstr "(Não foi possível ler informações para \"-p\": geteuid()=%d mas você deve ser root.)\n" - --#: ../netstat.c:387 -+#: ../netstat.c:438 -+#, c-format - msgid "" - "(Not all processes could be identified, non-owned process info\n" - " will not be shown, you would have to be root to see it all.)\n" - msgstr "" --"(Nem todos os processos puderam ser identificados, informações sobre " --"processos\n" -+"(Nem todos os processos puderam ser identificados, informações sobre processos\n" - " de outrem não serão mostrados, você deve ser root para vê-los todos.)\n" - --#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "OUVINDO" - --#: ../netstat.c:395 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "CONN ENVIADO" - --#: ../netstat.c:396 ../netstat.c:1168 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "DISC ENVIADO" - --#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "ESTABELECIDA" - --#: ../netstat.c:419 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "Ative sockets NET/ROM\n" - --#: ../netstat.c:420 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" --msgstr "" --"Usuário Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Usuário Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" - --#: ../netstat.c:430 ../netstat.c:1208 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "Problemas lendo dados de %s\n" - --#: ../netstat.c:465 -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "SYN_ENVIADO" - --#: ../netstat.c:466 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "SYN_RECEBIDO" - --#: ../netstat.c:467 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "ESPERA_FIN1" - --#: ../netstat.c:468 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "ESPERA_FIN2" - --#: ../netstat.c:469 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "TIME_WAIT" - --#: ../netstat.c:470 -+#: ../netstat.c:521 - msgid "CLOSE" - msgstr "FECHAR" - --#: ../netstat.c:471 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "ESPERANDO_FECHAR" - --#: ../netstat.c:472 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "ÚLTIMO_ACK" - --#: ../netstat.c:473 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "OUÇA" - --#: ../netstat.c:474 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "FECHANDO" - --#: ../netstat.c:544 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "atenção, recebi linha igmp6 inválida %d.\n" - --#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803 --#: ../netstat.c:935 ../netstat.c:940 -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "netstat: família de protocolos %d não suportada!\n" - --#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582 -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 - #, c-format - msgid "warning, got bogus igmp line %d.\n" - msgstr "atenção, recebi linha igmp inválida %d.\n" - --#: ../netstat.c:666 -+#: ../netstat.c:677 -+#, fuzzy, c-format -+msgid "Active X.25 sockets\n" -+msgstr "Ativar sockets AX.25\n" -+ -+#. IMHO, Vr/Vs is not very usefull --SF -+#: ../netstat.c:679 -+#, fuzzy, c-format -+msgid "" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" -+ -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "atenção, recebi linha tcp inválida.\n" - --#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "desligado (0.00/%ld/%ld)" - --#: ../netstat.c:708 -+#: ../netstat.c:804 - #, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "em (%2.2f/%ld/%d)" - --#: ../netstat.c:713 -+#: ../netstat.c:809 - #, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "keepalive (%2.2f/%ld/%d)" - --#: ../netstat.c:718 -+#: ../netstat.c:814 - #, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "timewait (%2.2f/%ld/%d)" - --#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "desconh.-%d (%2.2f/%ld)" - --#: ../netstat.c:799 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "atenção, recebi linha udp inválida.\n" - --#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "DESCONHECIDA" - --#: ../netstat.c:860 ../netstat.c:980 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "ligado %d (%2.2f/%ld)" - --#: ../netstat.c:949 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "atenção, recebi linha raw inválida.\n" - --#: ../netstat.c:1028 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "atenção, recebi linha unix inválida.\n" - --#: ../netstat.c:1055 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1059 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1063 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1067 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1071 -+#: ../netstat.c:1171 - msgid "SEQPACKET" - msgstr "SEQPACKET" - --#: ../netstat.c:1080 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "LIVRE" - --#: ../netstat.c:1096 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "CONECTANDO" - --#: ../netstat.c:1100 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "CONECTADO" - --#: ../netstat.c:1104 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "DESCONECTANDO" - --#: ../netstat.c:1135 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " - msgstr "Domain sockets UNIX ativos " - --#: ../netstat.c:1137 ../netstat.c:1666 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "(servidores e estabelecidas)" - --#: ../netstat.c:1140 ../netstat.c:1669 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "(sem os servidores)" - --#: ../netstat.c:1142 ../netstat.c:1671 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "(sem os servidores)" - --#: ../netstat.c:1145 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -993,114 +919,118 @@ - "\n" - "Proto CntRef Flags Tipo Estado I-Node Rota" - --#: ../netstat.c:1147 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr " Caminho\n" - --#: ../netstat.c:1167 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "SABM ENVIADO" - --#: ../netstat.c:1170 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "RECUPERAÇÃO" - --#: ../netstat.c:1184 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "Ativar sockets AX.25\n" - --#: ../netstat.c:1185 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "Destino Origem Dispositivo Estado Vr/Vs Send-Q Recv-Q\n" - --#: ../netstat.c:1228 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "problemas lendo dados de %s\n" - --#: ../netstat.c:1279 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " - "State" - msgstr "" - "Sockets IPX ativos\n" --"Proto Recv-Q Send-Q Endereço Local Endereço Remoto " --"Estado" -+"Proto Recv-Q Send-Q Endereço Local Endereço Remoto Estado" - --#: ../netstat.c:1281 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr " Usuário" - --#: ../netstat.c:1315 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "ESTAB" - --#: ../netstat.c:1323 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "DESC." - --#: ../netstat.c:1367 --msgid " - no statistics available -" --msgstr " - estatísticas não disponíveis -" -- --#: ../netstat.c:1370 --msgid "[NO FLAGS]" --msgstr "[SEM FLAGS]" -- --#: ../netstat.c:1400 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" - msgstr "Tabela de Interfaces do Kernel\n" - --#: ../netstat.c:1401 -+#: ../netstat.c:1465 -+#, fuzzy, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" --msgstr "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OV " --"Opções\n" -+msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OV Opções\n" - --#: ../netstat.c:1404 -+#: ../netstat.c:1469 - msgid "missing interface information" - msgstr "falta informação da interface" - --#: ../netstat.c:1425 -+#: ../netstat.c:1492 -+#, c-format - msgid "" --"usage: netstat [-veenNcCF] [] -r netstat " --"{-V|--version|-h|--help}\n" -+"usage: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" -+"help}\n" - msgstr "" - "uso: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--help}\n" - --#: ../netstat.c:1426 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [ ...]\n" - msgstr " netstat [-vnNcaeo] []\n" - --#: ../netstat.c:1427 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - msgstr " netstat [-vnNcaeo] []\n" - --#: ../netstat.c:1429 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr " -r, --route mostra tabela de roteamento\n" - --#: ../netstat.c:1430 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr " -i, --interfaces mostra tabela de interfaces\n" - --#: ../netstat.c:1431 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr "" - " -o, --timers mostra temporizadores\n" - "\n" - --#: ../netstat.c:1432 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr " -i, --interfaces mostra tabela de interfaces\n" - --#: ../netstat.c:1434 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" -@@ -1108,19 +1038,38 @@ - " -M, --masquerade mostra conexões mascaradas\n" - "\n" - --#: ../netstat.c:1438 ../route.c:87 -+#: ../netstat.c:1505 -+#, fuzzy, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr " -n, --numeric não resolve nomes\n" -+ -+#: ../netstat.c:1506 -+#, fuzzy, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr " -n, --numeric não resolve nomes\n" -+ -+#: ../netstat.c:1507 -+#, fuzzy, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr " -n, --numeric não resolve nomes\n" -+ -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -n, --numeric não resolve nomes\n" - --#: ../netstat.c:1439 ../route.c:88 -+#: ../netstat.c:1509 ../route.c:88 -+#, c-format - msgid " -e, --extend display other/more information\n" - msgstr " -e, --extend mostra outras/mais informações\n" - --#: ../netstat.c:1440 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr " -r, --route mostra tabela de roteamento\n" - --#: ../netstat.c:1441 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -1128,30 +1077,33 @@ - " -c, --continuous listagem contínua\n" - "\n" - --#: ../netstat.c:1442 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" - msgstr " -L, --netlink mostra mensagens netlink do kernel\n" - --#: ../netstat.c:1443 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr " -a, --all, --listening mostra tudo\n" - --#: ../netstat.c:1444 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr "" - " -o, --timers mostra temporizadores\n" - "\n" - --#: ../netstat.c:1445 ../route.c:89 -+#: ../netstat.c:1515 ../route.c:89 -+#, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" --msgstr "" --" -F, --fib mostra a Base de Informações de Repasse " --"(default)\n" -+msgstr " -F, --fib mostra a Base de Informações de Repasse (default)\n" - --#: ../netstat.c:1446 ../route.c:90 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" -@@ -1159,136 +1111,145 @@ - " -C, --cache mostra cache de roteamento no lugar da FIB\n" - "\n" - --#: ../netstat.c:1448 -+#: ../netstat.c:1518 -+#, c-format - msgid "" --" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - msgstr "" --" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - --#: ../netstat.c:1449 ../route.c:92 --#, c-format --msgid " =Use '-A ' or '--' Default: %s\n" -+#: ../netstat.c:1519 -+#, fuzzy, c-format -+msgid " =Use '-6|-4' or '-A ' or '--'; default: %s\n" - msgstr " =Use '-A ' ou [--' Default: %s\n" - --#: ../netstat.c:1450 ../route.c:93 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" --msgstr "" --" Lista das famílias de endereços possíveis (que suportam roteamento):\n" -+msgstr " Lista das famílias de endereços possíveis (que suportam roteamento):\n" - --#: ../netstat.c:1663 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "Conexões Internet Ativas " - --#: ../netstat.c:1673 -+#: ../netstat.c:1763 -+#, c-format - msgid "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - msgstr "" - "\n" --"Proto Recv-Q Send-Q Endereço Local Endereço Remoto Estado " --" " -+"Proto Recv-Q Send-Q Endereço Local Endereço Remoto Estado " - --#: ../netstat.c:1675 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr " Usuário " - --#: ../netstat.c:1678 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr " Temporizador" - --#: ../netstat.c:1708 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" - msgstr "IPv4 Group Memberships\n" - --#: ../netstat.c:1709 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "Interface CntRef Grupo\n" - --#: ../rarp.c:43 -+#: ../rarp.c:44 - msgid "This kernel does not support RARP.\n" - msgstr "Este kernel não tem suporte a RARP.\n" - --#: ../rarp.c:82 -+#: ../rarp.c:83 - #, c-format - msgid "no RARP entry for %s.\n" - msgstr "Sem entrada RARP para %s.\n" - --#: ../rarp.c:95 -+#: ../rarp.c:96 - #, c-format - msgid "%s: bad hardware address\n" - msgstr "%s: endereço de hardware inválido\n" - --#: ../rarp.c:127 -+#: ../rarp.c:128 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" - msgstr "rarp: não foi possível abrir o arquivo %s:%s.\n" - --#: ../rarp.c:139 -+#: ../rarp.c:140 - #, c-format - msgid "rarp: format error at %s:%u\n" - msgstr "rarp: erro de formato em %s:%u\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:144 ../rarp.c:289 - #, c-format - msgid "rarp: %s: unknown host\n" - msgstr "rarp: %s: máquina desconhecida\n" - --#: ../rarp.c:146 -+#: ../rarp.c:147 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" - msgstr "rarp: não é possível incluir uma entrada para %s:%u\n" - --#: ../rarp.c:175 -+#: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" - msgstr "" - "Uso: rarp -a lista entradas no cache\n" - --#: ../rarp.c:176 -+#: ../rarp.c:177 -+#, c-format - msgid " rarp -d delete entry from cache.\n" --msgstr "" --" rarp -d máquina remove entrada do cache\n" -+msgstr " rarp -d máquina remove entrada do cache\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 -+#, c-format - msgid " rarp [] -s add entry to cache.\n" --msgstr "" --" rarp [-t tipo-hw] -s máquina endereço-hw adiciona entrada ao cache\n" -+msgstr " rarp [-t tipo-hw] -s máquina endereço-hw adiciona entrada ao cache\n" - --#: ../rarp.c:178 -+#: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" - msgstr "" - " rarp -f adiciona entradas a partir do\n" - " arquivo ethers.\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" --msgstr "" --" rarp -V mostra versão do programa\n" -+msgstr " rarp -V mostra versão do programa\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "%s: mistura ilegal de opções.\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" - msgstr "rarp: %s: tipo desconhecido de hardware.\n" - --#: ../route.c:79 -+#: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [] List kernel routing tables\n" - msgstr "" --"Uso: route [-nNvee] [-FC] [famílias_de_endereços] Lista as tabelas de " --"rotea-\n" -+"Uso: route [-nNvee] [-FC] [famílias_de_endereços] Lista as tabelas de rotea-\n" - " mento do kernel\n" - --#: ../route.c:80 -+#: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" -@@ -1298,35 +1259,42 @@ - " mento da família.\n" - "\n" - --#: ../route.c:82 -+#: ../route.c:83 -+#, c-format - msgid "" - " route {-h|--help} [] Detailed usage syntax for " - "specified AF.\n" - msgstr "" --" route {-h|--help} [família_de_endereços] Sintaxe para a AF " --"(Família\n" --" de endereços) " --"espeficicada.\n" -+" route {-h|--help} [família_de_endereços] Sintaxe para a AF (Família\n" -+" de endereços) espeficicada.\n" - --#: ../route.c:83 -+#: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" - "\n" - msgstr "" --" route {-V|--version} Mostra a versão do " --"comando\n" -+" route {-V|--version} Mostra a versão do comando\n" - " e sai.\n" - -+#: ../route.c:92 -+#, fuzzy, c-format -+msgid " =Use '-A ' or '--'; default: %s\n" -+msgstr " =Use '-A ' ou [--' Default: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "Uso: ifconfig [-a] [-i] [-v] interface\n" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr " [[família] endereço]\n" - - #: ../plipconfig.c:68 -+#, c-format - msgid " plipconfig -V | --version\n" - msgstr " plipconfig -V | --version\n" - -@@ -1335,25 +1303,29 @@ - msgid "%s\tnibble %lu trigger %lu\n" - msgstr "%s\tnibble %lu trigger %lu\n" - --#: ../iptunnel.c:79 -+#: ../iptunnel.c:85 -+#, c-format - msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" - msgstr "Uso: iptunnel { add | change | del | show } [ NOME ]\n" - --#: ../iptunnel.c:80 -+#: ../iptunnel.c:86 -+#, c-format - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" --msgstr "" --" [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n" -+msgstr " [ mode { ipip | gre | sit } ] [ remote END ] [ local END ]\n" - --#: ../iptunnel.c:81 -+#: ../iptunnel.c:87 -+#, c-format - msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - msgstr " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - --#: ../iptunnel.c:82 -+#: ../iptunnel.c:88 -+#, c-format - msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" - msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev DISP_FÍSICO ]\n" - --#: ../iptunnel.c:83 -+#: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" -@@ -1361,451 +1333,734 @@ - " iptunnel -V | --version\n" - "\n" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "Onde: NAME := STRING\n" - --#: ../iptunnel.c:85 -+#: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr " END := { ENDEREÇO_IP | any }\n" - --#: ../iptunnel.c:86 -+#: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr " TOS := { NÚMERO | inherit }\n" - --#: ../iptunnel.c:87 -+#: ../iptunnel.c:93 -+#, c-format - msgid " TTL := { 1..255 | inherit }\n" - msgstr " TTL := { 1..255 | inherit }\n" - --#: ../iptunnel.c:88 -+#: ../iptunnel.c:94 -+#, c-format - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" - msgstr " KEY := { QUATRO_NÚMEROS_SEPARADOS_POR_PONTOS | NÚMERO }\n" - --#: ../iptunnel.c:326 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "Chaves não são permitidas com ipip e sit.\n" - --#: ../iptunnel.c:346 -+#: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "Um túnel de broadcast precisa de um endereço de origem.\n" - --#: ../iptunnel.c:361 -+#: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "ttl != 0 e noptmudisc são incompatíveis\n" - --#: ../iptunnel.c:373 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "não foi possível determinar o modo do túnel (ip, gre ou sit)\n" - --#: ../iptunnel.c:411 -+#: ../iptunnel.c:417 - #, c-format - msgid "%s: %s/ip remote %s local %s " - msgstr "%s: %s/ip remoto %s local %s " - --#: ../iptunnel.c:415 -+#: ../iptunnel.c:421 - msgid "unknown" - msgstr "Desconhecido" - --#: ../iptunnel.c:447 -+#: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr " Descarte pacotes fora de seqüência.\n" - --#: ../iptunnel.c:449 -+#: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr " É necessário checksum nos pacotes recebidos.\n" - --#: ../iptunnel.c:451 -+#: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr " Seqüencie pacotes na saída.\n" - --#: ../iptunnel.c:453 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr " Calcule o checksum para pacotes de saída.\n" - --#: ../iptunnel.c:481 -+#: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" - msgstr "Formato errado de /proc/net/dev. Desculpe.\n" - --#: ../iptunnel.c:494 -+#: ../iptunnel.c:500 - #, c-format - msgid "Failed to get type of [%s]\n" - msgstr "Não foi possível obter o tipo de [%s]\n" - --#: ../iptunnel.c:510 -+#: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "RX: Pacotes Bytes Erros CsunErrs ForaSeq Mcasts\n" - --#: ../iptunnel.c:513 -+#: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "TX: Pacotes Bytes Erros DeadLoop SemRota SemBufs\n" - --#: ../statistics.c:45 -+#: ../statistics.c:47 - msgid "ICMP input histogram:" - msgstr "Histograma de entrada ICMP:" - --#: ../statistics.c:46 -+#: ../statistics.c:48 - msgid "ICMP output histogram:" - msgstr "Histograma de saída ICMP" - --#: ../statistics.c:63 -+#: ../statistics.c:65 - #, c-format - msgid "Forwarding is %s" - msgstr "Repassagem está %s" - --#: ../statistics.c:64 --#, c-format --msgid "Default TTL is %d" -+#: ../statistics.c:66 -+#, fuzzy, c-format -+msgid "Default TTL is %u" - msgstr "Default TTL é %d" - --#: ../statistics.c:65 --#, c-format --msgid "%d total packets received" -+#: ../statistics.c:67 -+#, fuzzy, c-format -+msgid "%u total packets received" - msgstr "%d total de pacotes recebidos" - --#: ../statistics.c:66 --#, c-format --msgid "%d with invalid headers" -+#: ../statistics.c:68 -+#, fuzzy, c-format -+msgid "%u with invalid headers" - msgstr "%d com cabeçalhos inválidos" - --#: ../statistics.c:67 --#, c-format --msgid "%d with invalid addresses" -+#: ../statistics.c:69 -+#, fuzzy, c-format -+msgid "%u with invalid addresses" - msgstr "%d com endereços inválidos" - --#: ../statistics.c:68 --#, c-format --msgid "%d forwarded" -+#: ../statistics.c:70 -+#, fuzzy, c-format -+msgid "%u forwarded" - msgstr "%d repassados" - --#: ../statistics.c:69 --#, c-format --msgid "%d with unknown protocol" -+#: ../statistics.c:71 -+#, fuzzy, c-format -+msgid "%u with unknown protocol" - msgstr "%d com protocolo desconhecido" - --#: ../statistics.c:70 --#, c-format --msgid "%d incoming packets discarded" -+#: ../statistics.c:72 -+#, fuzzy, c-format -+msgid "%u incoming packets discarded" - msgstr "%d pacotes entrantes descartados" - --#: ../statistics.c:71 --#, c-format --msgid "%d incoming packets delivered" -+#: ../statistics.c:73 -+#, fuzzy, c-format -+msgid "%u incoming packets delivered" - msgstr "%d pacotes entrantes despachados" - --#: ../statistics.c:72 --#, c-format --msgid "%d requests sent out" -+#: ../statistics.c:74 -+#, fuzzy, c-format -+msgid "%u requests sent out" - msgstr "%d requisições enviadas" - - #. ? --#: ../statistics.c:73 --#, c-format --msgid "%d outgoing packets dropped" -+#: ../statistics.c:75 -+#, fuzzy, c-format -+msgid "%u outgoing packets dropped" - msgstr "%d pacotes saintes descartados" - --#: ../statistics.c:74 --#, c-format --msgid "%d dropped because of missing route" -+#: ../statistics.c:76 -+#, fuzzy, c-format -+msgid "%u dropped because of missing route" - msgstr "%d descartados devido a falta de rota" - --#: ../statistics.c:75 --#, c-format --msgid "%d fragments dropped after timeout" -+#: ../statistics.c:77 -+#, fuzzy, c-format -+msgid "%u fragments dropped after timeout" - msgstr "%d fragmentos descartados após estouro de tempo" - --#: ../statistics.c:76 --#, c-format --msgid "%d reassemblies required" -+#: ../statistics.c:78 -+#, fuzzy, c-format -+msgid "%u reassemblies required" - msgstr "%d remontagens requeridas" - - #. ? --#: ../statistics.c:77 --#, c-format --msgid "%d packets reassembled ok" -+#: ../statistics.c:79 -+#, fuzzy, c-format -+msgid "%u packets reassembled ok" - msgstr "%d pacotes remontados sem problemas" - --#: ../statistics.c:78 --#, c-format --msgid "%d packet reassembles failed" -+#: ../statistics.c:80 -+#, fuzzy, c-format -+msgid "%u packet reassembles failed" - msgstr "%d remontagens de pacotes falharam" - --#: ../statistics.c:79 --#, c-format --msgid "%d fragments received ok" -+#: ../statistics.c:81 -+#, fuzzy, c-format -+msgid "%u fragments received ok" - msgstr "%d fragmentos recebidos sem problemas" - --#: ../statistics.c:80 --#, c-format --msgid "%d fragments failed" -+#: ../statistics.c:82 -+#, fuzzy, c-format -+msgid "%u fragments failed" - msgstr "%d fragmentos falharam" - --#: ../statistics.c:81 --#, c-format --msgid "%d fragments created" -+#: ../statistics.c:83 -+#, fuzzy, c-format -+msgid "%u fragments created" - msgstr "%d fragmentos criados" - --#: ../statistics.c:86 --#, c-format --msgid "%d ICMP messages received" -+#: ../statistics.c:88 -+#, fuzzy, c-format -+msgid "%u ICMP messages received" - msgstr "%d mensagens ICMP recebidas" - --#: ../statistics.c:87 --#, c-format --msgid "%d input ICMP message failed." -+#: ../statistics.c:89 -+#, fuzzy, c-format -+msgid "%u input ICMP message failed." - msgstr "%d mensagens ICMP entrantes falharam." - --#: ../statistics.c:88 ../statistics.c:101 --#, c-format --msgid "destination unreachable: %d" -+#: ../statistics.c:90 ../statistics.c:103 -+#, fuzzy, c-format -+msgid "destination unreachable: %u" - msgstr "destino não alcançável: %d" - --#: ../statistics.c:89 --#, c-format --msgid "timeout in transit: %d" -+#: ../statistics.c:91 -+#, fuzzy, c-format -+msgid "timeout in transit: %u" - msgstr "estouro de tempo em trânsito: %d" - --#: ../statistics.c:90 ../statistics.c:103 --#, c-format --msgid "wrong parameters: %d" -+#: ../statistics.c:92 ../statistics.c:105 -+#, fuzzy, c-format -+msgid "wrong parameters: %u" - msgstr "parâmetros errados: %d" - - #. ? --#: ../statistics.c:91 --#, c-format --msgid "source quenchs: %d" -+#: ../statistics.c:93 -+#, fuzzy, c-format -+msgid "source quenches: %u" - msgstr "source quenchs: %d" - --#: ../statistics.c:92 --#, c-format --msgid "redirects: %d" -+#: ../statistics.c:94 -+#, fuzzy, c-format -+msgid "redirects: %u" - msgstr "redireções: %d" - --#: ../statistics.c:93 --#, c-format --msgid "echo requests: %d" -+#: ../statistics.c:95 -+#, fuzzy, c-format -+msgid "echo requests: %u" - msgstr "requisições de eco: %d" - --#: ../statistics.c:94 ../statistics.c:107 --#, c-format --msgid "echo replies: %d" -+#: ../statistics.c:96 ../statistics.c:109 -+#, fuzzy, c-format -+msgid "echo replies: %u" - msgstr "respostas de eco: %d" - --#: ../statistics.c:95 --#, c-format --msgid "timestamp request: %d" -+#: ../statistics.c:97 -+#, fuzzy, c-format -+msgid "timestamp request: %u" - msgstr "requisições de timestamp: %d" - --#: ../statistics.c:96 --#, c-format --msgid "timestamp reply: %d" -+#: ../statistics.c:98 -+#, fuzzy, c-format -+msgid "timestamp reply: %u" - msgstr "respostas a timestamps: %d" - --#: ../statistics.c:97 --#, c-format --msgid "address mask request: %d" -+#: ../statistics.c:99 -+#, fuzzy, c-format -+msgid "address mask request: %u" - msgstr "requisições de mascara de endereço: %d" - - #. ? --#: ../statistics.c:98 --msgid "address mask replies" --msgstr "resposta a mascara de endereço" -+#: ../statistics.c:100 ../statistics.c:113 -+#, fuzzy, c-format -+msgid "address mask replies: %u" -+msgstr "respostas a máscara de endereço: %d" - - #. ? --#: ../statistics.c:99 --#, c-format --msgid "%d ICMP messages sent" -+#: ../statistics.c:101 -+#, fuzzy, c-format -+msgid "%u ICMP messages sent" - msgstr "%d mensagens ICMP enviadas" - --#: ../statistics.c:100 --#, c-format --msgid "%d ICMP messages failed" -+#: ../statistics.c:102 -+#, fuzzy, c-format -+msgid "%u ICMP messages failed" - msgstr "%d mensagens ICMP falharam" - --#: ../statistics.c:102 --#, c-format --msgid "time exceeded: %d" -+#: ../statistics.c:104 -+#, fuzzy, c-format -+msgid "time exceeded: %u" - msgstr "tempo excedido: %d" - - #. ? --#: ../statistics.c:104 --#, c-format --msgid "source quench: %d" -+#: ../statistics.c:106 -+#, fuzzy, c-format -+msgid "source quench: %u" - msgstr "source quench: %d" - --#: ../statistics.c:105 --#, c-format --msgid "redirect: %d" -+#: ../statistics.c:107 -+#, fuzzy, c-format -+msgid "redirect: %u" - msgstr "redireções: %d" - --#: ../statistics.c:106 --#, c-format --msgid "echo request: %d" -+#: ../statistics.c:108 -+#, fuzzy, c-format -+msgid "echo request: %u" - msgstr "requisições de eco: %d" - --#: ../statistics.c:108 --#, c-format --msgid "timestamp requests: %d" -+#: ../statistics.c:110 -+#, fuzzy, c-format -+msgid "timestamp requests: %u" - msgstr "requisições de timestamp: %d" - --#: ../statistics.c:109 --#, c-format --msgid "timestamp replies: %d" -+#: ../statistics.c:111 -+#, fuzzy, c-format -+msgid "timestamp replies: %u" - msgstr "respostas a timestamp: %d" - --#: ../statistics.c:110 --#, c-format --msgid "address mask requests: %d" -+#: ../statistics.c:112 -+#, fuzzy, c-format -+msgid "address mask requests: %u" - msgstr "requisições de máscara de endereço: %d" - --#: ../statistics.c:111 --#, c-format --msgid "address mask replies: %d" --msgstr "respostas a máscara de endereço: %d" -- --#: ../statistics.c:116 -+#: ../statistics.c:118 - #, c-format - msgid "RTO algorithm is %s" - msgstr "Algorítmo RTO é %s" - --#: ../statistics.c:120 --#, c-format --msgid "%d active connections openings" -+#: ../statistics.c:122 -+#, fuzzy, c-format -+msgid "%u active connections openings" - msgstr "%d tentativas de conexão falharam" - --#: ../statistics.c:121 --#, c-format --msgid "%d passive connection openings" -+#: ../statistics.c:123 -+#, fuzzy, c-format -+msgid "%u passive connection openings" - msgstr "%d opens passivos" - --#: ../statistics.c:122 --#, c-format --msgid "%d failed connection attempts" -+#: ../statistics.c:124 -+#, fuzzy, c-format -+msgid "%u failed connection attempts" - msgstr "%d tentativas de conexão falharam" - --#: ../statistics.c:123 --#, c-format --msgid "%d connection resets received" -+#: ../statistics.c:125 -+#, fuzzy, c-format -+msgid "%u connection resets received" - msgstr "%d resets de conexão recebidas" - --#: ../statistics.c:124 --#, c-format --msgid "%d connections established" -+#: ../statistics.c:126 -+#, fuzzy, c-format -+msgid "%u connections established" - msgstr "%d conexões estabelecidas" - --#: ../statistics.c:125 --#, c-format --msgid "%d segments received" -+#: ../statistics.c:127 -+#, fuzzy, c-format -+msgid "%u segments received" - msgstr "%d segmentos recebidos" - --#: ../statistics.c:126 --#, c-format --msgid "%d segments send out" -+#: ../statistics.c:128 -+#, fuzzy, c-format -+msgid "%u segments send out" - msgstr "%d segmentos enviados" - --#: ../statistics.c:127 --#, c-format --msgid "%d segments retransmited" -+#: ../statistics.c:129 -+#, fuzzy, c-format -+msgid "%u segments retransmited" - msgstr "%d segmentos retransmitidos" - --#: ../statistics.c:128 --#, c-format --msgid "%d bad segments received." -+#: ../statistics.c:130 -+#, fuzzy, c-format -+msgid "%u bad segments received." - msgstr "%d segmentos ruins recebidos." - --#: ../statistics.c:129 --#, c-format --msgid "%d resets sent" -+#: ../statistics.c:131 -+#, fuzzy, c-format -+msgid "%u resets sent" - msgstr "%d resets enviados" - --#: ../statistics.c:134 --#, c-format --msgid "%d packets received" -+#: ../statistics.c:136 -+#, fuzzy, c-format -+msgid "%u packets received" - msgstr "%d pacotes recebidos" - --#: ../statistics.c:135 --#, c-format --msgid "%d packets to unknown port received." -+#: ../statistics.c:137 -+#, fuzzy, c-format -+msgid "%u packets to unknown port received." - msgstr "%d pacotes para portas desconhecidas recebidos." - --#: ../statistics.c:136 --#, c-format --msgid "%d packet receive errors" -+#: ../statistics.c:138 -+#, fuzzy, c-format -+msgid "%u packet receive errors" - msgstr "%d erros de recepção de pacotes" - --#: ../statistics.c:137 --#, c-format --msgid "%d packets sent" -+#: ../statistics.c:139 -+#, fuzzy, c-format -+msgid "%u packets sent" - msgstr "%d pacotes enviados" - --#: ../statistics.c:142 -+#: ../statistics.c:144 -+#, fuzzy, c-format -+msgid "%u SYN cookies sent" -+msgstr "%d pacotes enviados" -+ -+#: ../statistics.c:145 -+#, fuzzy, c-format -+msgid "%u SYN cookies received" -+msgstr "%d pacotes recebidos" -+ -+#: ../statistics.c:146 -+#, fuzzy, c-format -+msgid "%u invalid SYN cookies received" -+msgstr "%d pacotes recebidos" -+ -+#: ../statistics.c:148 -+#, fuzzy, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" -+msgstr "%d resets recebidos para sockets embriônicos SYN_RECV" -+ -+#: ../statistics.c:150 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" -+msgstr "%d pacotes retirados da fila de recepção devido a sobreposição de buffers de sockets" -+ -+#. obsolete: 2.2.0 doesn't do that anymore -+#: ../statistics.c:153 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue" -+msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)" -+ -+#: ../statistics.c:154 -+#, fuzzy, c-format -+msgid "" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" -+msgstr "%d pacotes descartados da fila de fora de ordem devido a sobreposição de buffers de sockets" -+ -+#: ../statistics.c:156 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" -+msgstr "%d pacotes ICMP descartados porque estavam fora da janela" -+ -+#: ../statistics.c:158 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because socket was locked" -+msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado" -+ -+#: ../statistics.c:160 -+#, c-format -+msgid "%u TCP sockets finished time wait in fast timer" -+msgstr "" -+ -+#: ../statistics.c:161 -+#, c-format -+msgid "%u time wait sockets recycled by time stamp" -+msgstr "" -+ -+#: ../statistics.c:162 -+#, c-format -+msgid "%u TCP sockets finished time wait in slow timer" -+msgstr "" -+ -+#: ../statistics.c:163 -+#, c-format -+msgid "%u passive connections rejected because of time stamp" -+msgstr "" -+ -+#: ../statistics.c:165 -+#, c-format -+msgid "%u active connections rejected because of time stamp" -+msgstr "" -+ -+#: ../statistics.c:167 - #, c-format --msgid "%d SYN cookies sent" -+msgid "%u packets rejects in established connections because of timestamp" -+msgstr "" -+ -+#: ../statistics.c:169 -+#, fuzzy, c-format -+msgid "%u delayed acks sent" - msgstr "%d pacotes enviados" - --#: ../statistics.c:143 -+#: ../statistics.c:170 - #, c-format --msgid "%d SYN cookies received" --msgstr "%d pacotes recebidos" -+msgid "%u delayed acks further delayed because of locked socket" -+msgstr "" - --#: ../statistics.c:144 -+#: ../statistics.c:172 - #, c-format --msgid "%d invalid SYN cookies received" --msgstr "%d pacotes recebidos" -+msgid "Quick ack mode was activated %u times" -+msgstr "" - --#: ../statistics.c:146 -+#: ../statistics.c:173 - #, c-format --msgid "%d resets received for embryonic SYN_RECV sockets" --msgstr "%d resets recebidos para sockets embriônicos SYN_RECV" -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "" - --#: ../statistics.c:148 -+#: ../statistics.c:175 - #, c-format --msgid "%d packets pruned from receive queue because of socket buffer overrun" -+msgid "%u SYNs to LISTEN sockets ignored" - msgstr "" --"%d pacotes retirados da fila de recepção devido a sobreposição de buffers de " --"sockets" - --#. obsolete: 2.2.0 doesn't do that anymore --#: ../statistics.c:151 -+#: ../statistics.c:176 -+#, c-format -+msgid "%u packets directly queued to recvmsg prequeue." -+msgstr "" -+ -+#: ../statistics.c:178 - #, c-format --msgid "%d packets pruned from out-of-order queue" -+msgid "%u of bytes directly received from backlog" -+msgstr "" -+ -+#: ../statistics.c:180 -+#, c-format -+msgid "%u of bytes directly received from prequeue" -+msgstr "" -+ -+#: ../statistics.c:182 -+#, fuzzy, c-format -+msgid "%u packets dropped from prequeue" - msgstr "%d pacotes retirados da fila de fora de ordem (out-of-order)" - --#: ../statistics.c:152 -+#: ../statistics.c:183 -+#, fuzzy, c-format -+msgid "%u packet headers predicted" -+msgstr "%d pacotes recebidos" -+ -+#: ../statistics.c:184 - #, c-format --msgid "" --"%d packets dropped from out-of-order queue because of socket buffer overrun" -+msgid "%u packets header predicted and directly queued to user" - msgstr "" --"%d pacotes descartados da fila de fora de ordem devido a sobreposição de " --"buffers de sockets" - --#: ../statistics.c:154 -+#: ../statistics.c:186 - #, c-format --msgid "%d ICMP packets dropped because they were out-of-window" --msgstr "%d pacotes ICMP descartados porque estavam fora da janela" -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "" - --#: ../statistics.c:156 -+#: ../statistics.c:188 -+#, fuzzy, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "%d pacotes para portas desconhecidas recebidos." -+ -+#: ../statistics.c:189 - #, c-format --msgid "%d ICMP packets dropped because socket was locked" --msgstr "%d pacotes ICMP descartadas porque o socket estava bloqueado" -+msgid "%u predicted acknowledgments" -+msgstr "" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" -+ -+#: ../statistics.c:192 -+#, fuzzy, c-format -+msgid "%u bad SACKs received" -+msgstr "%d segmentos ruins recebidos." -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "" -+ -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:197 -+#, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, fuzzy, c-format -+msgid "%u retransmits lost" -+msgstr "%d resets enviados" -+ -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, fuzzy, c-format -+msgid "%u fast retransmits" -+msgstr "%d segmentos retransmitidos" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, fuzzy, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "%d segmentos retransmitidos" -+ -+#: ../statistics.c:210 -+#, fuzzy, c-format -+msgid "%u sack retransmits failed" -+msgstr "%d remontagens de pacotes falharam" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, fuzzy, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "%d pacotes retirados da fila de recepção devido a sobreposição de buffers de sockets" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, fuzzy, c-format -+msgid "%u DSACKs received" -+msgstr "%d pacotes recebidos" -+ -+#: ../statistics.c:216 -+#, fuzzy, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "%d total de pacotes recebidos" -+ -+#: ../statistics.c:217 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "%d resets de conexão recebidas" -+ -+#: ../statistics.c:218 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "%d resets de conexão recebidas" -+ -+#: ../statistics.c:219 -+#, fuzzy, c-format -+msgid "%u connections reset due to early user close" -+msgstr "%d resets de conexão recebidas" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, fuzzy, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "%d resets de conexão recebidas" - - #: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "habilitado" - --#: ../statistics.c:222 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "desabilitado" - --#: ../statistics.c:272 --#, c-format --msgid "unknown title %s\n" --msgstr "título %s desconhecido\n" -- --#: ../statistics.c:298 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "erro lendo /proc/net/snmp" - --#: ../statistics.c:311 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "não foi possível abrir /proc/net/snmp" - -@@ -1819,89 +2074,95 @@ - msgid "Cannot change line discipline to `%s'.\n" - msgstr "Não foi possível mudar a disciplina da linha para `%s'.\n" - --#: ../lib/af.c:145 ../lib/hw.c:148 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "Não Especificado" - --#: ../lib/af.c:147 -+#: ../lib/af.c:155 - msgid "UNIX Domain" - msgstr "UNIX Domain" - --#: ../lib/af.c:150 -+#: ../lib/af.c:158 - msgid "DARPA Internet" - msgstr "DARPA Internet" - --#: ../lib/af.c:153 -+#: ../lib/af.c:161 - msgid "IPv6" - msgstr "IPv6" - --#: ../lib/af.c:156 ../lib/hw.c:169 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "AX.25 AMPR" - --#: ../lib/af.c:159 ../lib/hw.c:175 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "NET/ROM AMPR" - --#: ../lib/af.c:162 -+#: ../lib/af.c:170 - msgid "Novell IPX" - msgstr "Novell IPX" - --#: ../lib/af.c:165 -+#: ../lib/af.c:173 - msgid "Appletalk DDP" - msgstr "Appletalk DDP" - --#: ../lib/af.c:168 ../lib/hw.c:207 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "Econet" - --#: ../lib/af.c:171 ../lib/hw.c:172 -+#: ../lib/af.c:179 -+msgid "CCITT X.25" -+msgstr "" -+ -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "AMPR ROSE" - --#: ../lib/af.c:174 ../lib/hw.c:160 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "Ash" - --#: ../lib/af.c:232 -+#: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "Por favor não especifique mais que uma família de endereços.\n" - --#: ../lib/af.c:293 -+#: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "Excesso no número de famílias de endereços.\n" - --#: ../lib/af.c:304 -+#: ../lib/af.c:315 - #, c-format - msgid "Unknown address family `%s'.\n" - msgstr "Família de endereços `%s' desconhecida.\n" - --#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 --#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259 --#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71 --#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76 --msgid "[NONE SET]" --msgstr "[Nenhum configurado]" -- --#: ../lib/arcnet.c:81 ../lib/arcnet.c:96 -+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 - #, c-format - msgid "in_arcnet(%s): invalid arcnet address!\n" - msgstr "in_arcnet(%s): endereço arcnet inválido!\n" - --#: ../lib/arcnet.c:108 -+#: ../lib/arcnet.c:97 - #, c-format - msgid "in_arcnet(%s): trailing : ignored!\n" - msgstr "in_arcnet(%s): trailing : ignorado!\n" - --#: ../lib/arcnet.c:120 -+#: ../lib/arcnet.c:109 - #, c-format - msgid "in_arcnet(%s): trailing junk!\n" - msgstr "in_arcnet(%s): lixo no trailing!\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - msgstr "Endereço Ash mal formado" - -+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 -+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 -+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 -+msgid "[NONE SET]" -+msgstr "[Nenhum configurado]" -+ - #: ../lib/ax25.c:97 ../lib/netrom.c:100 - msgid "Invalid callsign" - msgstr "Callsign inválido" -@@ -1911,22 +2172,21 @@ - msgstr "Callsign muito longo" - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "O AX.25 não foi configurado neste sistema.\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "Tabela de roteamento AX.25 do kernel\n" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "Destino Iface Uso\n" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "Tabela de roteamento para `ddp' ainda não suportada.\n" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1942,253 +2202,268 @@ - msgid "in_ether(%s): trailing junk!\n" - msgstr "in_ether(%s): lixo no trailing!\n" - --#: ../lib/fddi.c:95 ../lib/fddi.c:110 -+#: ../lib/fddi.c:84 ../lib/fddi.c:99 - #, c-format - msgid "in_fddi(%s): invalid fddi address!\n" - msgstr "in_fddi(%S): endereço fddi inválido!\n" - --#: ../lib/fddi.c:122 -+#: ../lib/fddi.c:111 - #, c-format - msgid "in_fddi(%s): trailing : ignored!\n" - msgstr "in_fddi(%s): trailing : ignorado!\n" - --#: ../lib/fddi.c:134 -+#: ../lib/fddi.c:123 - #, c-format - msgid "in_fddi(%s): trailing junk!\n" - msgstr "in_fddi(%s): lixo no trailing!\n" - --#: ../lib/getroute.c:97 ../lib/setroute.c:76 -+#: ../lib/getroute.c:101 ../lib/setroute.c:80 - #, c-format - msgid "Address family `%s' not supported.\n" - msgstr "Família de endereços `%s' não suportada.\n" - --#: ../lib/getroute.c:103 ../lib/setroute.c:80 -+#: ../lib/getroute.c:107 ../lib/setroute.c:84 - #, c-format - msgid "No routing for address family `%s'.\n" - msgstr "Nenhum roteamento para a família `%s'\n" - --#: ../lib/hippi.c:96 ../lib/hippi.c:111 -+#: ../lib/hippi.c:84 ../lib/hippi.c:99 - #, c-format - msgid "in_hippi(%s): invalid hippi address!\n" - msgstr "in_fddi(%S): endereço fddi inválido!\n" - --#: ../lib/hippi.c:123 -+#: ../lib/hippi.c:111 - #, c-format - msgid "in_hippi(%s): trailing : ignored!\n" - msgstr "in_fddi(%s): trailing : ignorado!\n" - --#: ../lib/hippi.c:134 -+#: ../lib/hippi.c:122 - #, c-format - msgid "in_hippi(%s): trailing junk!\n" - msgstr "in_fddi(%s): lixo no trailing!\n" - --#: ../lib/hw.c:147 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "Loopback Local" - --#: ../lib/hw.c:150 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "SLIP" - --#: ../lib/hw.c:151 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "SLIP VJ" - --#: ../lib/hw.c:152 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "SLIP 6 bits" - --#: ../lib/hw.c:153 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "SLIP VJ 6 bits" - --#: ../lib/hw.c:154 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "SLIP Adaptativo" - --#: ../lib/hw.c:157 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:163 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "FDDI - Fibra Ótica" - --#: ../lib/hw.c:166 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:178 -+#: ../lib/hw.c:191 -+msgid "generic X.25" -+msgstr "" -+ -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "Túnel IPIP" - --#: ../lib/hw.c:181 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" - msgstr "Protocolo Ponto-a-Ponto" - --#: ../lib/hw.c:184 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "(Cisco)-HDLC" - --#: ../lib/hw.c:185 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:188 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:191 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "FRAD - Dispositivo de Acesso a Frame Relay" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "IPv6 sobre IPv4" - --#: ../lib/hw.c:198 -+#: ../lib/hw.c:214 - msgid "IrLAP" - msgstr "IrLAP" - --#: ../lib/hw.c:201 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "16/4 Mbps Token Ring" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:219 - msgid "16/4 Mbps Token Ring (New)" - msgstr "16/4 Mbps Token Ring (Novo)" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" - msgstr "rresolve: família de endereços %d não suportada!\n" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6.c:131 -+#, fuzzy -+msgid "[UNKNOWN]" -+msgstr "DESCONHECIDA" -+ -+#: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "NET/ROM não configurado neste sistema.\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" - msgstr "Tabela de Roteamento IPv6 do Kernel\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" --msgstr "" --"Destino Próximo \"Hop\" " --" Opções Métrica Ref Uso Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" -+msgstr "Destino Próximo \"Hop\" Opções Métrica Ref Uso Iface\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Cache de Vizinhos IPv6 do Kernel\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" --msgstr "" --"Vizinho Endereço HW Iface Opções " --"Estado Ref\n" -+msgstr "Vizinho Endereço HW Iface Opções Estado Ref\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:157 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" - msgstr "" --"Vizinho Endereço HW Iface Opções " --"Estado Ref\n" -+"Vizinho Endereço HW Iface Opções Estado Ref\n" - " Parado(seg) Remover(seg)\n" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "Uso: inet6_route [-vF] del Destino\n" - - #: ../lib/inet6_sr.c:47 -+#, c-format - msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" - msgstr " inet6_route [-vF] add Destino [gw Gw] [metric M] [[dev] If]\n" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr " inet6_route [-FC] flush NÃO suportado\n" - --#: ../lib/inet6_sr.c:182 -+#: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" - msgstr "Limpeza da tabela de roteamento `inet6' não é suportada\n" - - #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format - msgid "INET (IPv4) not configured in this system.\n" - msgstr "NET/ROM não configurado neste sistema.\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" - msgstr "Tabela de Roteamento IP do Kernel\n" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" --msgstr "" --"Destino Roteador MáscaraGen. Opções Métrica Ref Uso " --"Iface\n" -+msgstr "Destino Roteador MáscaraGen. Opções Métrica Ref Uso Iface\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" --msgstr "" --"Destino Roteador MáscaraGen. Opções MSS Janela irtt " --"Iface\n" -+msgstr "Destino Roteador MáscaraGen. Opções MSS Janela irtt Iface\n" - - #: ../lib/inet_gr.c:62 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface MSS Window irtt\n" --msgstr "" --"Destino Roteador MáscaraGen Opções Métrica Ref Uso " --"Iface MSS Janela irtt\n" -+msgstr "Destino Roteador MáscaraGen Opções Métrica Ref Uso Iface MSS Janela irtt\n" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\n" - msgstr "Tabela de Roteamento IP do Kernel\n" - - #: ../lib/inet_gr.c:258 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface\n" --msgstr "" --"Destino Roteador MáscaraGen. Opções Métrica Ref Uso " --"Iface\n" -+msgstr "Destino Roteador MáscaraGen. Opções Métrica Ref Uso Iface\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" --msgstr "" --"Destino Roteador MáscaraGen. Opções MSS Janela irtt " --"Iface\n" -+msgstr "Destino Roteador MáscaraGen. Opções MSS Janela irtt Iface\n" - - #: ../lib/inet_gr.c:266 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt HH Arp\n" --msgstr "" --"Destino Roteador Origem Opções Métrica Ref Uso " --"Iface MSS Janela irtt HH Arp\n" -+msgstr "Destino Roteador Origem Opções Métrica Ref Uso Iface MSS Janela irtt HH Arp\n" - - #: ../lib/inet_gr.c:290 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" --msgstr "" --"Destino Roteador Origem Opções Métrica Ref Uso " --"Iface MSS Janela irtt HH Arp\n" -+msgstr "Destino Roteador Origem Opções Métrica Ref Uso Iface MSS Janela irtt HH Arp\n" - --#: ../lib/inet_sr.c:50 -+#: ../lib/inet_sr.c:51 -+#, c-format - msgid "" - "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " - "[[dev] If]\n" -@@ -2196,31 +2471,36 @@ - "Uso: inet_route [-vF] del {-host|-net} Destino[/prefixo] [gw Gw] [metric M] " - "[[dev] If]\n" - --#: ../lib/inet_sr.c:51 -+#: ../lib/inet_sr.c:52 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" - msgstr "" - " inet_route [-vF] add {-host|-net} Destino[/prefixo] [gw Gw] [metric " - "M]\n" - --#: ../lib/inet_sr.c:52 -+#: ../lib/inet_sr.c:53 -+#, c-format - msgid "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - msgstr "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - --#: ../lib/inet_sr.c:53 -+#: ../lib/inet_sr.c:54 -+#, c-format - msgid " [mod] [dyn] [reinstate] [[dev] If]\n" - msgstr " [mod] [dyn] [reinstate] [[dev] If]\n" - --#: ../lib/inet_sr.c:54 -+#: ../lib/inet_sr.c:55 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" - msgstr "" - " inet_route [-vF] add {-host|-net} Destino[/prefixo] [metric M] " - "reject\n" - --#: ../lib/inet_sr.c:55 -+#: ../lib/inet_sr.c:56 -+#, c-format - msgid " inet_route [-FC] flush NOT supported\n" - msgstr " inet_route [-FC] flush NÃO suportado\n" - -@@ -2230,14 +2510,17 @@ - msgstr "route: %s: não é possível usar uma REDE como roteador!\n" - - #: ../lib/inet_sr.c:174 -+#, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "route: MSS inválido.\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "route: janela inválida.\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "route: rtt inicial inválido.\n" - -@@ -2252,75 +2535,92 @@ - msgstr "route: netmask %s inválida\n" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "route: a netmask não casa com o endereço de rede\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" - msgstr "Não é suportado limpar a tabela de roteamento `inet'\n" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" - msgstr "Não é suportado modificar o cache de roteamento `inet'\n" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "O AX.25 não foi configurado neste sistema.\n" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" - msgstr "Tabela de roteamento IPX do kernel\n" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" - msgstr "Destino Rede Roteadora Nó Roteador\n" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" - msgstr "NET/ROM: isto precisa ser escrito\n" - --#: ../lib/masq_info.c:197 -+#: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "Entradas de IP mascarado\n" - --#: ../lib/masq_info.c:200 -+#: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "prot expira origem destino portas\n" - --#: ../lib/masq_info.c:203 -+#: ../lib/masq_info.c:204 -+#, c-format - msgid "" --"prot expire initseq delta prevd source destination " --" ports\n" -+"prot expire initseq delta prevd source " -+"destination ports\n" - msgstr "" --"prot expira initseq delta prevd origem destino " --" portas\n" -+"prot expira initseq delta prevd origem " -+"destino portas\n" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "NET/ROM não configurado neste sistema.\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" - msgstr "Tabela de roteamento NET/ROM do kernel\n" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "Destino Mnemônico Qualidade Vizinho Iface\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" - msgstr "uso de netrom\n" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" - msgstr "NET/ROM: isto precisa ser escrito\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "Você não pode iniciar o PPP com este programa.\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" - msgstr "Desculpe, use o pppd!\n" - -@@ -2329,51 +2629,314 @@ - msgstr "Endereço do nó deve ter dez dígitos" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "ROSE não configurada neste sistema.\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" - msgstr "Tabela de roteamento ROSE do kernel\n" - --#: ../lib/tr.c:70 ../lib/tr.c:85 -+#: ../lib/tr.c:86 ../lib/tr.c:101 - #, c-format - msgid "in_tr(%s): invalid token ring address!\n" - msgstr "in_tr(%s): endereço token ring inválido!\n" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "in_tr(%s): trailing : ignorado!\n" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "in_tr(%s): lixo no trailing!\n" - --#: ../lib/interface.c:124 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" - msgstr "atenção: nenhum socket inet disponível: %s\n" - --#: ../lib/interface.c:270 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "Atenção: não foi possível abrir %s (%s). Saída limitada.\n" - - #. Give better error message for this case. --#: ../lib/interface.c:504 -+#: ../lib/interface.c:571 - msgid "Device not found" - msgstr "%s: dispositivo não encontrado" - --#: ../lib/interface.c:508 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" -+msgstr "%s: erro obtendo informações da interface: %s\n" -+ -+#: ../lib/interface.c:608 -+msgid " - no statistics available -" -+msgstr " - estatísticas não disponíveis -" -+ -+#: ../lib/interface.c:612 -+#, c-format -+msgid "[NO FLAGS]" -+msgstr "[SEM FLAGS]" -+ -+#: ../lib/interface.c:688 -+#, c-format -+msgid "%-9.9s Link encap:%s " -+msgstr "%-9.9s Encapsulamento do Link: %s " -+ -+#: ../lib/interface.c:693 -+#, c-format -+msgid "HWaddr %s " -+msgstr "Endereço de HW %s " -+ -+#: ../lib/interface.c:696 -+#, c-format -+msgid "Media:%s" -+msgstr "Mídia:%s" -+ -+#: ../lib/interface.c:698 -+#, c-format -+msgid "(auto)" -+msgstr "(auto)" -+ -+#: ../lib/interface.c:705 -+#, c-format -+msgid " %s addr:%s " -+msgstr " %s end.: %s " -+ -+#: ../lib/interface.c:708 -+#, c-format -+msgid " P-t-P:%s " -+msgstr " P-a-P:%s " -+ -+#: ../lib/interface.c:711 -+#, c-format -+msgid " Bcast:%s " -+msgstr " Bcast:%s " -+ -+#: ../lib/interface.c:713 -+#, c-format -+msgid " Mask:%s\n" -+msgstr " Masc:%s\n" -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid " inet6 addr: %s/%d" -+msgstr " endereço inet6: %s/%d" -+ -+#: ../lib/interface.c:732 -+#, c-format -+msgid " Scope:" -+msgstr " Escopo:" -+ -+#: ../lib/interface.c:735 -+#, c-format -+msgid "Global" -+msgstr "Global" -+ -+#: ../lib/interface.c:738 -+#, c-format -+msgid "Link" -+msgstr "Link" -+ -+#: ../lib/interface.c:741 -+#, c-format -+msgid "Site" -+msgstr "Site" -+ -+#: ../lib/interface.c:744 -+#, c-format -+msgid "Compat" -+msgstr "Compat" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid "Host" -+msgstr "Máquina" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid "Unknown" -+msgstr "Desconhecido" -+ -+#: ../lib/interface.c:765 -+#, c-format -+msgid " IPX/Ethernet II addr:%s\n" -+msgstr " Endereço IPX/Ethernet II:%s\n" -+ -+#: ../lib/interface.c:768 -+#, c-format -+msgid " IPX/Ethernet SNAP addr:%s\n" -+msgstr " Endereço IPX/Ethernet SNAP:%s\n" -+ -+#: ../lib/interface.c:771 -+#, c-format -+msgid " IPX/Ethernet 802.2 addr:%s\n" -+msgstr " Endereço IPX/Ethernet 802.2:%s\n" -+ -+#: ../lib/interface.c:774 -+#, c-format -+msgid " IPX/Ethernet 802.3 addr:%s\n" -+msgstr " Endereço IPX/Ethernet 802.3:%s\n" -+ -+#: ../lib/interface.c:784 -+#, c-format -+msgid " EtherTalk Phase 2 addr:%s\n" -+msgstr " Endereço EtherTalk fase 2:%s\n" -+ -+#: ../lib/interface.c:793 -+#, c-format -+msgid " econet addr:%s\n" -+msgstr " Endereço econet:%s\n" -+ -+#: ../lib/interface.c:800 -+#, c-format -+msgid "[NO FLAGS] " -+msgstr "[NENHUMA FLAG] " -+ -+#: ../lib/interface.c:802 -+#, c-format -+msgid "UP " -+msgstr "UP " -+ -+#: ../lib/interface.c:804 -+#, c-format -+msgid "BROADCAST " -+msgstr "BROADCAST" -+ -+#: ../lib/interface.c:806 -+#, c-format -+msgid "DEBUG " -+msgstr "DEBUG " -+ -+#: ../lib/interface.c:808 -+#, c-format -+msgid "LOOPBACK " -+msgstr "LOOPBACK" -+ -+#: ../lib/interface.c:810 -+#, c-format -+msgid "POINTOPOINT " -+msgstr "POINTOPOINT " -+ -+#: ../lib/interface.c:812 -+#, c-format -+msgid "NOTRAILERS " -+msgstr "NOTRAILERS " -+ -+#: ../lib/interface.c:814 -+#, c-format -+msgid "RUNNING " -+msgstr "RUNNING " -+ -+#: ../lib/interface.c:816 -+#, c-format -+msgid "NOARP " -+msgstr "NOARP " -+ -+#: ../lib/interface.c:818 -+#, c-format -+msgid "PROMISC " -+msgstr "PROMISC " -+ -+#: ../lib/interface.c:820 -+#, c-format -+msgid "ALLMULTI " -+msgstr "ALLMULTI " -+ -+#: ../lib/interface.c:822 -+#, c-format -+msgid "SLAVE " -+msgstr "SLAVE " -+ -+#: ../lib/interface.c:824 -+#, c-format -+msgid "MASTER " -+msgstr "MASTER " -+ -+#: ../lib/interface.c:826 -+#, c-format -+msgid "MULTICAST " -+msgstr "MULTICAST " -+ -+#: ../lib/interface.c:829 -+#, c-format -+msgid "DYNAMIC " -+msgstr "DYNAMIC " -+ -+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short -+#: ../lib/interface.c:832 -+#, c-format -+msgid " MTU:%d Metric:%d" -+msgstr " MTU:%d Métrica:%d" -+ -+#: ../lib/interface.c:836 -+#, c-format -+msgid " Outfill:%d Keepalive:%d" -+msgstr " Outfill:%d Keepalive:%d" -+ -+#: ../lib/interface.c:850 -+#, fuzzy, c-format -+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgstr "Pacotes RX:%lu erros:%lu descartados:%lu sobreposições:%lu frame:%lu\n" -+ -+#: ../lib/interface.c:855 -+#, c-format -+msgid " compressed:%lu\n" -+msgstr " compactados:%lu\n" -+ -+#: ../lib/interface.c:895 -+#, fuzzy, c-format -+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgstr "Pacotes TX:%lu erros:%lu descartados:%lu sobreposições:%lu portadora:%lu\n" -+ -+#: ../lib/interface.c:899 -+#, c-format -+msgid " collisions:%lu " -+msgstr " colisões:%lu " -+ -+#: ../lib/interface.c:901 -+#, c-format -+msgid "compressed:%lu " -+msgstr "compactados:%lu " -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "txqueuelen:%d " -+msgstr "txqueuelen:%d " -+ -+#: ../lib/interface.c:905 -+#, c-format -+msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" - msgstr "" --"%s: erro obtendo informações da interface: %s\n" --"\n" - --#: ../lib/sockets.c:59 -+#: ../lib/interface.c:916 -+#, c-format -+msgid "Interrupt:%d " -+msgstr "IRQ:%d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:919 -+#, c-format -+msgid "Base address:0x%x " -+msgstr "Endereço de E/S:0x%x " -+ -+#: ../lib/interface.c:921 -+#, c-format -+msgid "Memory:%lx-%lx " -+msgstr "Memória:%lx-%lx " -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "DMA chan:%x " -+msgstr "Canal DMA:%x " -+ -+#: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "Nenhuma família de endereços que possa ser usada foi encontrada.\n" - -@@ -2397,29 +2960,32 @@ - msgid "ip: argument is wrong: %s\n" - msgstr "ip: argumento errado: %s\n" - --#: ../ipmaddr.c:56 -+#: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr "Uso: ipmaddr [ add | del ] ENDMULTI dev STRING\n" - --#: ../ipmaddr.c:57 -+#: ../ipmaddr.c:62 -+#, c-format - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - msgstr " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - --#: ../ipmaddr.c:58 -+#: ../ipmaddr.c:63 -+#, c-format - msgid " ipmaddr -V | -version\n" - msgstr " ipmaddr -V | -version\n" - --#: ../ipmaddr.c:258 -+#: ../ipmaddr.c:263 - #, c-format - msgid "family %d " - msgstr "família %d " - --#: ../ipmaddr.c:267 -+#: ../ipmaddr.c:272 - #, c-format - msgid " users %d" - msgstr " usuários %d" - --#: ../ipmaddr.c:353 -+#: ../ipmaddr.c:358 - msgid "Cannot create socket" - msgstr "Não foi possível criar o socket" - -@@ -2434,6 +3000,7 @@ - msgstr "slattach: tty_lock: (%s): %s\n" - - #: ../slattach.c:192 -+#, c-format - msgid "slattach: cannot write PID file\n" - msgstr "slattach: não foi possível escrever o arquivo PID\n" - -@@ -2452,39 +3019,69 @@ - msgid "slattach: tty_hangup(RAISE): %s\n" - msgstr "slattach: tty_hangup(RAISE): %s\n" - --#: ../slattach.c:486 -+#: ../slattach.c:468 -+#, fuzzy, c-format -+msgid "slattach: tty name too long\n" -+msgstr "%s: nome muito longo\n" -+ -+#: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "slattach: tty_open: não foi possível obter o estado corrente!\n" - --#: ../slattach.c:493 -+#: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" --msgstr "" --"slattach: tty_open: não foi possível obter a disciplina de linha corrente!\n" -+msgstr "slattach: tty_open: não foi possível obter a disciplina de linha corrente!\n" - --#: ../slattach.c:501 -+#: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "slattach: tty_open: não foi possível configurar o modo RAW!\n" - --#: ../slattach.c:508 -+#: ../slattach.c:520 - #, c-format - msgid "slattach: tty_open: cannot set %s bps!\n" - msgstr "slattach: tty_open: não foi possível configurar %s bps!\n" - --#: ../slattach.c:518 -+#: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "slattach: tty_open: não foi possível configurar modo 8N1!\n" - --#: ../slattach.c:686 -+#: ../slattach.c:672 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "" -+ -+#: ../slattach.c:704 - #, c-format - msgid "%s started" - msgstr "%s inicializado" - --#: ../slattach.c:687 -+#: ../slattach.c:705 - #, c-format - msgid " on %s" - msgstr " em %s" - --#: ../slattach.c:688 -+#: ../slattach.c:706 - #, c-format - msgid " interface %s\n" - msgstr "%s: interface desconhecida.\n" -+ -+#~ msgid "" -+#~ " arp [-v] [] [-i ] -s [netmask ] pub " -+#~ "<-''-\n" -+#~ msgstr " arp [-v] [] [-i ] -s [netmask ] pub <-''-\n" -+ -+#~ msgid "%s: unknown interface: %s\n" -+#~ msgstr "%s: interface desconhecida: %s\n" -+ -+#~ msgid "address mask replies" -+#~ msgstr "resposta a mascara de endereço" -+ -+#~ msgid "unknown title %s\n" -+#~ msgstr "título %s desconhecido\n" -+ -+#~ msgid "Routing table for `ddp' not yet supported.\n" -+#~ msgstr "Tabela de roteamento para `ddp' ainda não suportada.\n" ---- net-tools-1.60.orig/po/Makefile -+++ net-tools-1.60/po/Makefile -@@ -3,13 +3,13 @@ - INSTALL_DATA= ${INSTALL} -m 644 - INSTALLNLSDIR=${BASEDIR}/usr/share/locale - --TUPDATE = tupdate -+TUPDATE = msgmerge - - NLSPACKAGE = net-tools - - -include ../config.make - ifeq ($(I18N),1) --CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo -+CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo ja.mo - else - CATALOGS = - endif -@@ -49,7 +49,7 @@ - lang=`echo $$cat | sed 's/.mo//'`; \ - mv $$lang.po $$lang.old.po; \ - echo "$$lang:"; \ -- if $(TUPDATE) $(NLSPACKAGE).pot $$lang.old.po > $$lang.po; then \ -+ if $(TUPDATE) $$lang.old.po $(NLSPACKAGE).pot > $$lang.po; then \ - rm -f $$lang.old.po; \ - else \ - echo "tupdate for $$cat failed!"; \ ---- net-tools-1.60.orig/po/et_EE.po -+++ net-tools-1.60/po/et_EE.po -@@ -6,7 +6,8 @@ - msgid "" - msgstr "" - "Project-Id-Version: net-tools 1.58\n" --"POT-Creation-Date: 2001-02-15 21:28+0200\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" - "PO-Revision-Date: 2001-02-15 18:00+0300\n" - "Last-Translator: Meelis Roos \n" - "Language-Team: Estonian \n" -@@ -14,53 +15,58 @@ - "Content-Type: text/plain; charset=iso-8859-15\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../arp.c:110 ../arp.c:269 -+#: ../arp.c:112 ../arp.c:279 -+#, c-format - msgid "arp: need host name\n" - msgstr "arp: puudub hosti nimi\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "%s jaoks pole ARP kirjet\n" - --#: ../arp.c:239 -+#: ../arp.c:248 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "arp: ei saa riistvaralist aadressi `%s' jaoks: %s\n" - --#: ../arp.c:243 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "arp: vale protokolli tüüp\n" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" - msgstr "arp: seadmel `%s' on riistvaraline aadress %s `%s'\n" - --#: ../arp.c:282 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" - msgstr "arp: puudub riistvaraline aadress\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "arp: vigane riistvaraline aadress\n" - --#: ../arp.c:387 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "arp: ei saa avada faili %s\n" - --#: ../arp.c:403 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "arp: formaadiviga real %u failis %s\n" - --#: ../arp.c:416 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "arp: ei saa kehtestada ARP kirjet real %u failis %s\n" - --#: ../arp.c:437 -+#: ../arp.c:448 -+#, c-format - msgid "" - "Address HWtype HWaddress Flags Mask " - "Iface\n" -@@ -68,45 +74,52 @@ - "Aadress HWtüüp HWaadress Lipud Mask " - "Liides\n" - --#: ../arp.c:467 -+#: ../arp.c:476 -+#, fuzzy -+msgid "" -+msgstr " liides %s\n" -+ -+#: ../arp.c:478 - msgid "(incomplete)" - msgstr "(mittetäielik)" - --#: ../arp.c:484 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "%s (%s) aadressil " - --#: ../arp.c:490 -+#: ../arp.c:501 -+#, c-format - msgid " " - msgstr "" - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "võrgumask %s " - --#: ../arp.c:513 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "liides %s\n" - --#: ../arp.c:592 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "ARP kirjeid kokku: %s\tignoreerisin: %d\tleidsin: %d\n" - --#: ../arp.c:596 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "%s (%s) -- pole kirjet\n" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" - msgstr "arp: ei leidnud %d kirje hulgast sobivat\n" - --#: ../arp.c:613 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [] [-i ] [-a] [] <-Display ARP " -@@ -116,47 +129,45 @@ - "ARP cache vaatamine:\n" - " arp [-vn] [] [-i ] [-a] []\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, fuzzy, c-format - msgid "" --" arp [-v] [-i ] -d [pub][nopub] <-Delete ARP " -+" arp [-v] [-i ] -d [pub] <-Delete ARP " - "entry\n" - msgstr "" - "ARP kirje kustutamine:\n" - " arp [-v] [-i ] -d [pub] [nopub]\n" - --#: ../arp.c:615 -+#: ../arp.c:628 -+#, fuzzy, c-format - msgid "" --" arp [-vnD] [] [-i ] -f [] <-Add entry from " -+" arp [-vnD] [] [-i ] -f [] <-Add entry from " - "file\n" - msgstr "" - "ARP kirjete lisamine failist:\n" - " arp [-vnD] [] [-i ] -f []\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, fuzzy, c-format - msgid "" --" arp [-v] [] [-i ] -s [temp][nopub] <-Add " -+" arp [-v] [] [-i ] -s [temp] <-Add " - "entry\n" - msgstr "" - "ARP kirje lisamine:\n" - " arp [-v] [] [-i ] -s [temp] [nopub]\n" - --#: ../arp.c:617 --msgid "" --" arp [-v] [] [-i ] -s [netmask ] pub " --"<-''-\n" --msgstr "" --" arp [-v] [] [-i ] -s [netmask ] pub\n" -- --#: ../arp.c:618 -+#: ../arp.c:630 -+#, fuzzy, c-format - msgid "" --" arp [-v] [] [-i ] -Ds [netmask ] pub " -+" arp [-v] [] [-i ] -Ds [netmask ] pub " - "<-''-\n" - "\n" - msgstr "" - " arp [-v] [] [-i ] -Ds [netmask ] pub\n" - "\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" -@@ -164,122 +175,132 @@ - " -a näita kõiki hoste alternatiivsel (BSD) " - "kujul\n" - --#: ../arp.c:621 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr " -s, --set uue ARP kirje seadmine\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr " -d, --delete määratud kirje kustutamine\n" - --#: ../arp.c:623 ../netstat.c:1485 ../route.c:85 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr " -v, --verbose jutukas väljund\n" - --#: ../arp.c:624 -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, c-format - msgid " -n, --numeric don't resolve names\n" - msgstr " -n, --numeric mitte lahendada nimesid\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" - msgstr "" - " -i, --device võrguliidese täpsustamine (näiteks eth0)\n" - --#: ../arp.c:626 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read from given device\n" - msgstr " -D, --use-device lugeda vastavalt liideselt\n" - --#: ../arp.c:627 -+#: ../arp.c:639 -+#, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -A, -p, --protocol protokollipere määramine\n" - --#: ../arp.c:628 -+#: ../arp.c:640 -+#, c-format - msgid "" --" -f, --file read new entries from file or from " --"/etc/ethers\n" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" - "\n" - msgstr "" --" -f, --file lugeda kirjed antud failist või " --"/etc/ethers'st\n" -+" -f, --file lugeda kirjed antud failist või /etc/" -+"ethers'st\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " =Use '-H ' to specify hardware address type. Default: %s\n" - msgstr "" - " =kasutage '-H ' riistvaralise aadressi määramiseks.\n" - " Vaikimisi: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr " Võimalike ARP-i toetavate riistvara tüüpide nimekiri:\n" - --#: ../arp.c:664 ../arp.c:749 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "arp: riistvara tüüpi %s ei toetata\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "arp: aadressiperekonda %s ei toetata\n" - --#: ../arp.c:703 -+#: ../arp.c:716 -+#, c-format - msgid "arp: -N not yet supported.\n" - msgstr "arp: -N toetust pole veel\n" - --#: ../arp.c:713 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "arp: tundmatu aadressiperekond %s\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "arp: tundmatu riistvara tüüp %s\n" - --#: ../arp.c:741 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "arp: tuumas on ainult 'inet' aadressiperekonna toetus\n" - --#: ../arp.c:754 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "arp: riistvara tüübil %s pole ARP toetust\n" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" - msgstr "Sean sõlme nimeks `%s'\n" - --#: ../hostname.c:74 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "%s: ainult root saab sõlme nime muuta\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "%s: nimi on liiga pikk\n" - --#: ../hostname.c:89 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "Sean hosti nimeks `%s'\n" - --#: ../hostname.c:94 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "%s: ainult root saab hosti nime muuta\n" - --#: ../hostname.c:108 -+#: ../hostname.c:109 - #, c-format - msgid "Setting domainname to `%s'\n" - msgstr "Sean domeeni nimeks `%s'\n" - --#: ../hostname.c:113 -+#: ../hostname.c:114 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "%s: ainult root saab domeeni nime muuta\n" -@@ -304,25 +325,28 @@ - msgid "Result: h_addr_list=`%s'\n" - msgstr "Tulemus: h_addr_list=`%s'\n" - --#: ../hostname.c:209 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" - msgstr "%s: ei saa avada faili `%s'\n" - --#: ../hostname.c:223 -+#: ../hostname.c:222 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" - msgstr "" - "Kasutamine:\n" - " hostname [-v] {hosti nimi|-F fail} hosti nime seadmine (ka " - "failist)\n" - --#: ../hostname.c:224 -+#: ../hostname.c:223 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" - msgstr "" - " domainname [-v] {nisdomeen|-F fail} NIS domeeni nime seadmine\n" - --#: ../hostname.c:226 -+#: ../hostname.c:225 -+#, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" -@@ -330,18 +354,21 @@ - " nodename [-v] {nodename|-F fail} DECneti võrgusõlme nime " - "seadmine\n" - --#: ../hostname.c:228 -+#: ../hostname.c:227 -+#, c-format - msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" - msgstr "" - " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] nime näitamine antud formaadis\n" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" - msgstr " hostname [-v] hosti nime näitamine\n" - --#: ../hostname.c:230 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" -@@ -350,7 +377,8 @@ - " hostname -h|--help seesama abiinfo\n" - "\n" - --#: ../hostname.c:231 -+#: ../hostname.c:230 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" -@@ -358,36 +386,44 @@ - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr " -s, --short lühike hosti nimi\n" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr " -a, --alias alias-nimed\n" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address hosti IP aadressid\n" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr "" - " -f, --fqdn, --long pikk hosti nimi (FQDN - täielik süsteeminimi)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" - msgstr " -d, --domain DNS domeeni nimi\n" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr " -y, --yp, --nis NIS/YP domeeni nimi\n" - --#: ../hostname.c:239 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" - msgstr " -n, --node DECneti võrgusõlme nimi\n" - --#: ../hostname.c:241 -+#: ../hostname.c:240 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" -@@ -395,7 +431,8 @@ - " -F, --file lugeda hosti või NIS domeeni nimi failist\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:242 -+#, c-format - msgid "" - " This command can read or set the hostname or the NIS domainname. You can\n" - " also read the DNS domain or the FQDN (fully qualified domain name).\n" -@@ -415,6 +452,7 @@ - msgstr "%s: selle käsuga ei saa muuta DNS domeeni nime\n" - - #: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" -@@ -423,6 +461,7 @@ - "Kui Te EI kasuta bind'i ega NIS'i nimede lahendamiseks, saate DNS domeeni\n" - - #: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "(mis on täieliku nime osa) nime muuta failist /etc/hosts.\n" - -@@ -441,76 +480,97 @@ - msgid "getnodename()=`%s'\n" - msgstr "getnodename()=`%s'\n" - --#: ../ifconfig.c:110 -+#: ../ifconfig.c:107 -+#, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" - msgstr "" --"Liides MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Liides MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Lip\n" - --#: ../ifconfig.c:132 ../ifconfig.c:164 --#, c-format --msgid "%s: unknown interface: %s\n" --msgstr "ifconfig: tundmatu liides %s: %s\n" -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, fuzzy, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: viga liidese info küsimisel: %s\n" - --#: ../ifconfig.c:156 ../ifconfig.c:740 ../ifconfig.c:831 ../ifconfig.c:937 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 -+#, c-format - msgid "No support for INET on this system.\n" - msgstr "Antud süsteem ei toeta INET aadressiperekonda\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:193 -+#, fuzzy, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: viga liidese info küsimisel: %s\n" -+ -+#: ../ifconfig.c:202 -+#, fuzzy, c-format - msgid "" - "Usage:\n" --" ifconfig [-a] [-i] [-v] [-s] [[]
]\n" -+" ifconfig [-a] [-v] [-s] [[]
]\n" - msgstr "" - "Kasutamine:\n" - " ifconfig [-a] [-i] [-v] [-s] [[] ]\n" - --#: ../ifconfig.c:181 -+#: ../ifconfig.c:204 -+#, c-format - msgid " [add
[/]]\n" - msgstr " [add [/]]\n" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 -+#, c-format - msgid " [del
[/]]\n" - msgstr " [del [/]]\n" - --#: ../ifconfig.c:183 -+#: ../ifconfig.c:206 -+#, c-format - msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" - msgstr " [[-]broadcast []] [[-]pointopoint []]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:207 -+#, c-format - msgid " [netmask
] [dstaddr
] [tunnel
]\n" - msgstr " [netmask ] [dstaddr ] [tunnel ]\n" - --#: ../ifconfig.c:187 -+#: ../ifconfig.c:210 -+#, c-format - msgid " [outfill ] [keepalive ]\n" - msgstr " [outfill ] [keepalive ]\n" - --#: ../ifconfig.c:189 -+#: ../ifconfig.c:212 -+#, c-format - msgid " [hw
] [metric ] [mtu ]\n" - msgstr " [hw ] [metric ] [mtu ]\n" - --#: ../ifconfig.c:190 -+#: ../ifconfig.c:213 -+#, c-format - msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" - msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:191 -+#: ../ifconfig.c:214 -+#, c-format - msgid " [multicast] [[-]promisc]\n" - msgstr " [multicast] [[-]promisc]\n" - --#: ../ifconfig.c:192 -+#: ../ifconfig.c:215 -+#, c-format - msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" - msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" - --#: ../ifconfig.c:194 -+#: ../ifconfig.c:217 -+#, c-format - msgid " [txqueuelen ]\n" - msgstr " [txqueuelen ]\n" - --#: ../ifconfig.c:197 -+#: ../ifconfig.c:220 -+#, c-format - msgid " [[-]dynamic]\n" - msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:199 -+#: ../ifconfig.c:222 -+#, c-format - msgid "" - " [up|down] ...\n" - "\n" -@@ -518,73 +578,134 @@ - " [up|down] ...\n" - "\n" - --#: ../ifconfig.c:201 -+#: ../ifconfig.c:224 -+#, c-format - msgid " =Hardware Type.\n" - msgstr " =riistvara tüüp\n" - --#: ../ifconfig.c:202 -+#: ../ifconfig.c:225 -+#, c-format - msgid " List of possible hardware types:\n" - msgstr " Võimalike riistvara tüüpide nimekiri:\n" - - #. 1 = ARPable --#: ../ifconfig.c:204 -+#: ../ifconfig.c:227 - #, c-format - msgid " =Address family. Default: %s\n" - msgstr " =aadressiperekond, vaikimisi %s\n" - --#: ../ifconfig.c:205 -+#: ../ifconfig.c:228 -+#, c-format - msgid " List of possible address families:\n" - msgstr " Võimalike aadressiperekondade nimekiri:\n" - --#: ../ifconfig.c:361 -+#: ../ifconfig.c:303 -+#, c-format -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" -+ -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" -+ -+#: ../ifconfig.c:380 -+#, c-format - msgid "Unknown media type.\n" - msgstr "Tundmatu meedia tüüp\n" - --#: ../ifconfig.c:653 -+#: ../ifconfig.c:417 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" -+ -+#: ../ifconfig.c:429 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:441 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:465 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:523 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:652 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:684 - #, c-format - msgid "hw address type `%s' has no handler to set address. failed.\n" - msgstr "" - "riistvara aadressi tüübil `%s' pole käsitlejat aadressi seadmiseks - ebaõnn\n" - --#: ../ifconfig.c:662 -+#: ../ifconfig.c:693 - #, c-format - msgid "%s: invalid %s address.\n" - msgstr "%s: vigane %s aadress\n" - --#: ../ifconfig.c:706 ../ifconfig.c:796 ../ifconfig.c:882 -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 -+#, c-format - msgid "No support for INET6 on this system.\n" - msgstr "Antud süsteem ei toeta INET6 aadressiperekonda\n" - --#: ../ifconfig.c:749 ../ifconfig.c:840 -+#: ../ifconfig.c:780 ../ifconfig.c:871 - #, c-format - msgid "Interface %s not initialized\n" - msgstr "Liides %s pole initsialiseeritud\n" - --#: ../ifconfig.c:761 ../ifconfig.c:851 -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, c-format - msgid "Bad address.\n" - msgstr "Vigane aadress\n" - --#: ../ifconfig.c:854 -+#: ../ifconfig.c:885 -+#, c-format - msgid "Address deletion not supported on this system.\n" - msgstr "Antud süsteem ei toeta aadresside kustutamist\n" - --#: ../ifconfig.c:947 -+#: ../ifconfig.c:957 -+#, fuzzy, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n" -+ -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "Antud süsteem ei toeta ECONET aadressiperekonda\n" - --#: ../ifconfig.c:955 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n" - --#: ../netstat.c:429 -+#: ../ifconfig.c:1021 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "" -+ -+#: ../netstat.c:434 - #, c-format - msgid "" - "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" - msgstr "" - "(\"-p\" jaoks ei saanud infot lugeda: geteuid()=%d, aga vaja oleks root'u)\n" - --#: ../netstat.c:433 -+#: ../netstat.c:438 -+#, c-format - msgid "" - "(Not all processes could be identified, non-owned process info\n" - " will not be shown, you would have to be root to see it all.)\n" -@@ -592,210 +713,223 @@ - "(Mõnesid protsesse ei saanud identifitseerida, teiste kasutajate\n" - "info lugemiseks peab olema root)\n" - --#: ../netstat.c:440 ../netstat.c:1171 ../netstat.c:1248 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "LISTENING" - --#: ../netstat.c:441 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "CONN SENT" - --#: ../netstat.c:442 ../netstat.c:1250 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "DISC SENT" - --#: ../netstat.c:443 ../netstat.c:510 ../netstat.c:889 ../netstat.c:1251 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "ESTABLISHED" - --#: ../netstat.c:465 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "Aktiivsed NET/ROM soklid\n" - --#: ../netstat.c:466 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" - msgstr "" - "Kasutaja Sihtpunkt Lähtepunkt Liides Olek Vr/Vs SaatJrk " - "VvJrk\n" - --#: ../netstat.c:476 ../netstat.c:1290 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "Probleem andmete lugemisel failist %s\n" - --#: ../netstat.c:511 -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "SYN_SENT" - --#: ../netstat.c:512 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "SYN_RECV" - --#: ../netstat.c:513 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "FIN_WAIT1" - --#: ../netstat.c:514 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "FIN_WAIT2" - --#: ../netstat.c:515 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "TIME_WAIT" - --#: ../netstat.c:516 -+#: ../netstat.c:521 - msgid "CLOSE" - msgstr "CLOSE" - --#: ../netstat.c:517 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "CLOSE_WAIT" - --#: ../netstat.c:518 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "LAST_ACK" - --#: ../netstat.c:519 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "LISTEN" - --#: ../netstat.c:520 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "CLOSING" - --#: ../netstat.c:587 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "Hoiatus - sain imeliku igmp6 rea (nr. %d)\n" - --#: ../netstat.c:592 ../netstat.c:630 ../netstat.c:751 ../netstat.c:883 --#: ../netstat.c:1014 ../netstat.c:1019 -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "netstat: aadressiperekonda %d ei toetata\n" - --#: ../netstat.c:605 ../netstat.c:610 ../netstat.c:618 ../netstat.c:625 -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 - #, c-format - msgid "warning, got bogus igmp line %d.\n" - msgstr "Hoiatus - sain imeliku igmp rea (nr. %d)\n" - --#: ../netstat.c:668 -+#: ../netstat.c:677 -+#, c-format - msgid "Active X.25 sockets\n" - msgstr "Aktiivsed X.25 soklid\n" - - #. IMHO, Vr/Vs is not very usefull --SF --#: ../netstat.c:670 -+#: ../netstat.c:679 -+#, c-format - msgid "" --"Dest Source Device LCI State Vr/Vs Send-Q " --"Recv-Q\n" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" - msgstr "" - "Sihtpunkt Lähtepunkt Liides LCI Olek Vr/Vs SaatJrk VvJrk\n" - --#: ../netstat.c:747 -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "Hoiatus - sain imeliku tcp rea\n" - --#: ../netstat.c:788 ../netstat.c:938 ../netstat.c:1057 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "eikäi ((0.00/%ld/%d)" - --#: ../netstat.c:792 -+#: ../netstat.c:804 - #, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "käib (%2.2f/%ld/%d)" - --#: ../netstat.c:797 -+#: ../netstat.c:809 - #, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "keepalive (%2.2f/%ld/%d)" - --#: ../netstat.c:802 -+#: ../netstat.c:814 - #, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "timewait (%2.2f/%ld/%d)" - --#: ../netstat.c:807 ../netstat.c:947 ../netstat.c:1067 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "eitea-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:879 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "Hoiatus - sain imeliku udp rea\n" - --#: ../netstat.c:897 ../netstat.c:1157 ../netstat.c:1190 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "TUNDMATU" - --#: ../netstat.c:943 ../netstat.c:1062 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "käib-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:1028 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "Hoiatus - sain imeliku raw rea\n" - --#: ../netstat.c:1110 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "Hoiatus - sain imeliku unix rea\n" - --#: ../netstat.c:1137 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1141 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1145 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1149 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1153 -+#: ../netstat.c:1171 - msgid "SEQPACKET" - msgstr "SEQPACKET" - --#: ../netstat.c:1162 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "VABA" - --#: ../netstat.c:1178 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "ÜHENDUMAS" - --#: ../netstat.c:1182 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "ÜHENDATUD" - --#: ../netstat.c:1186 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "LAHTIÜHENDUMAS" - --#: ../netstat.c:1217 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " - msgstr "Aktiivsed UNIX domeeni soklid " - --#: ../netstat.c:1219 ../netstat.c:1729 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "(serverid ja ühendatud)" - --#: ../netstat.c:1222 ../netstat.c:1732 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "(ainult serverid)" - --#: ../netstat.c:1224 ../netstat.c:1734 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "(ilma serveriteta)" - --#: ../netstat.c:1227 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -803,32 +937,36 @@ - "\n" - "Proto Mitu Lipud Tüüp Olek I-kirje " - --#: ../netstat.c:1229 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr "Tee\n" - --#: ../netstat.c:1249 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "SABM SENT" - --#: ../netstat.c:1252 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "RECOVERY" - --#: ../netstat.c:1266 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "Aktiivsed AX.25 soklid\n" - --#: ../netstat.c:1267 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "Sihtpunkt Lähtepunkt Liides Olek Vr/Vs SaatJrk VvJrk\n" - --#: ../netstat.c:1310 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "Probleem andmete lugemisel failist %s\n" - --#: ../netstat.c:1361 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " -@@ -838,47 +976,53 @@ - "Proto VvJrk SaatJrk Kohalik aadress Väline aadress " - "Olek " - --#: ../netstat.c:1363 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr " Kasutaja" - --#: ../netstat.c:1397 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "ESTAB" - --#: ../netstat.c:1405 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "UNK." - --#: ../netstat.c:1443 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" - msgstr "Tuuma liideste tabel\n" - --#: ../netstat.c:1447 -+#: ../netstat.c:1465 -+#, fuzzy, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" - msgstr "" --"Liides MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Liides MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Lip\n" - --#: ../netstat.c:1451 -+#: ../netstat.c:1469 - msgid "missing interface information" - msgstr "Puudulik informatsioon liideste kohta" - --#: ../netstat.c:1474 -+#: ../netstat.c:1492 -+#, c-format - msgid "" --"usage: netstat [-veenNcCF] [] -r netstat " --"{-V|--version|-h|--help}\n" -+"usage: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" -+"help}\n" - msgstr "" - "Kasutamine: netstat [-veenNcCF] [] -r\n" - " netstat {-V|--version|-h|--help}\n" - --#: ../netstat.c:1475 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [ ...]\n" - msgstr " netstat [-vnNcaeol] [ ...]\n" - --#: ../netstat.c:1476 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" -@@ -886,25 +1030,30 @@ - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - --#: ../netstat.c:1478 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr " -r, --route ruutingutabeli näitamine\n" - --#: ../netstat.c:1479 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr " -i, --interfaces liideste tabeli näitamine\n" - --#: ../netstat.c:1480 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr " -g, --groups multiedastuse gruppide näitamine\n" - --#: ../netstat.c:1481 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr "" - " -s, --statistics võrgu statistika näitamine (SNMP stiilis)\n" - --#: ../netstat.c:1483 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" -@@ -912,36 +1061,39 @@ - " -M, --masquerade maskeeritavate ühenduste näitamine\n" - "\n" - --#: ../netstat.c:1486 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" --msgstr " -n, --numeric mitte lahendada numbreid nimedeks\n" -- --#: ../netstat.c:1487 --msgid " --numeric-hosts dont resolve host names\n" -+#: ../netstat.c:1505 -+#, fuzzy, c-format -+msgid " --numeric-hosts don't resolve host names\n" - msgstr " --numeric-hosts mitte lahendada hostinimesid\n" - --#: ../netstat.c:1488 --msgid " --numeric-ports dont resolve port names\n" -+#: ../netstat.c:1506 -+#, fuzzy, c-format -+msgid " --numeric-ports don't resolve port names\n" - msgstr " --numeric-ports mitte lahendada pordinimesid\n" - --#: ../netstat.c:1489 --msgid " --numeric-users dont resolve user names\n" -+#: ../netstat.c:1507 -+#, fuzzy, c-format -+msgid " --numeric-users don't resolve user names\n" - msgstr " --numeric-users mitte lahendada kasutajanimesid\n" - --#: ../netstat.c:1490 -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -N, --symbolic lahendada riistvara aadressid\n" - --#: ../netstat.c:1491 ../route.c:87 -+#: ../netstat.c:1509 ../route.c:88 -+#, c-format - msgid " -e, --extend display other/more information\n" - msgstr " -e, --extend muu info/lisainfo näitamine\n" - --#: ../netstat.c:1492 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr "" - " -p, --programs soklite kohta PID/protsessi nime näitamine\n" - --#: ../netstat.c:1493 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -949,22 +1101,26 @@ - " -c, --continuous pidevalt uuenev nimekiri\n" - "\n" - --#: ../netstat.c:1494 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" - msgstr " -l, --listening kuulavate serversoklite näitamine\n" - --#: ../netstat.c:1495 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr "" - " -a, --all, --listening kõigi soklite näitamine (vaikimisi " - "ühendatud)\n" - --#: ../netstat.c:1496 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr " -o, --timers taimerite näitamine\n" - --#: ../netstat.c:1497 ../route.c:88 -+#: ../netstat.c:1515 ../route.c:89 -+#, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" -@@ -972,7 +1128,8 @@ - " -F, --fib üldiste ruutingutabelite näitamine " - "(vaikimisi)\n" - --#: ../netstat.c:1498 ../route.c:89 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" -@@ -981,108 +1138,121 @@ - "näitamine\n" - "\n" - --#: ../netstat.c:1500 -+#: ../netstat.c:1518 -+#, c-format - msgid "" --" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - msgstr "" --" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - --#: ../netstat.c:1501 ../route.c:91 --#, c-format --msgid " =Use '-A ' or '--' Default: %s\n" -+#: ../netstat.c:1519 -+#, fuzzy, c-format -+msgid " =Use '-6|-4' or '-A ' or '--'; default: %s\n" - msgstr " =kasutage '-A ' või '--' vaikimisi: %s\n" - --#: ../netstat.c:1502 ../route.c:92 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" - msgstr " Võimalike ruutingu toetavate aadressiperekondade nimekiri:\n" - --#: ../netstat.c:1726 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "Aktiivsed internetiühendused " - --#: ../netstat.c:1736 -+#: ../netstat.c:1763 -+#, c-format - msgid "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - msgstr "" - "\n" --"Proto VvJrk SaatJrk Kohalik aadress Väline aadress Olek " --" " -+"Proto VvJrk SaatJrk Kohalik aadress Väline aadress " -+"Olek " - --#: ../netstat.c:1738 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr " Kasutaja I-kirje " - --#: ../netstat.c:1741 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr " Taimer" - --#: ../netstat.c:1771 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" - msgstr "IPv4 grupikuuluvused\n" - --#: ../netstat.c:1772 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "Liides Mitu Grupp\n" - --#: ../rarp.c:43 -+#: ../rarp.c:44 - msgid "This kernel does not support RARP.\n" - msgstr "rarp: tuum ei toeta RARP'i\n" - --#: ../rarp.c:82 -+#: ../rarp.c:83 - #, c-format - msgid "no RARP entry for %s.\n" - msgstr "rarp: %s jaoks pole RARP kirjet\n" - --#: ../rarp.c:95 -+#: ../rarp.c:96 - #, c-format - msgid "%s: bad hardware address\n" - msgstr "rarp: vigane riistvaraline aadress %s\n" - --#: ../rarp.c:127 -+#: ../rarp.c:128 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" - msgstr "rarp: ei saa avada faili %s:%s\n" - --#: ../rarp.c:139 -+#: ../rarp.c:140 - #, c-format - msgid "rarp: format error at %s:%u\n" - msgstr "rarp: vorminguviga failis %s real %u\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:144 ../rarp.c:289 - #, c-format - msgid "rarp: %s: unknown host\n" - msgstr "rarp: tundmatu host %s\n" - --#: ../rarp.c:146 -+#: ../rarp.c:147 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" - msgstr "rarp: ei saa kehtestada kirjet failist %s realt %u\n" - --#: ../rarp.c:175 -+#: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" - msgstr "" - "Kasutamine:\n" - " rarp -a puhvris olevate kirjete vaatamine\n" - --#: ../rarp.c:176 -+#: ../rarp.c:177 -+#, c-format - msgid " rarp -d delete entry from cache.\n" - msgstr " rarp -d kirje kustutamine puhvrist\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 -+#, c-format - msgid " rarp [] -s add entry to cache.\n" - msgstr " rarp [] -s kirje lisamine puhvrisse\n" - --#: ../rarp.c:178 -+#: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" - msgstr "" - " rarp -f kirjete lisamine failist /etc/ethers\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1090,24 +1260,26 @@ - " rarp -V programmi versiooni näitamine\n" - "\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "%s: lubamatu võtmete kombinatsioon\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" - msgstr "rarp: tundmatu riistvara tüüp %s\n" - --#: ../route.c:79 -+#: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [] List kernel routing tables\n" - msgstr "" - "Kasutamine:\n" - " route [-nNvee] [-FC] [] Tuuma ruutingutabeli näitamine\n" - --#: ../route.c:80 -+#: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" -@@ -1115,7 +1287,8 @@ - " route [-v] [-FC] {add|del|flush} ... Tuuma ruutingutabeli muutmine\n" - "\n" - --#: ../route.c:82 -+#: ../route.c:83 -+#, c-format - msgid "" - " route {-h|--help} [] Detailed usage syntax for " - "specified AF.\n" -@@ -1123,7 +1296,8 @@ - " route {-h|--help} [] Detailne süntaks perekonna AF " - "jaoks\n" - --#: ../route.c:83 -+#: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" -@@ -1132,15 +1306,23 @@ - " route {-V|--version} Versiooni ja oskuste näitamine\n" - "\n" - -+#: ../route.c:92 -+#, fuzzy, c-format -+msgid " =Use '-A ' or '--'; default: %s\n" -+msgstr " =kasutage '-A ' või '--' vaikimisi: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "Kasutamine: plipconfig [-a] [-i] [-v] liides\n" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr " [nibble NN] [trigger NN]\n" - - #: ../plipconfig.c:68 -+#, c-format - msgid " plipconfig -V | --version\n" - msgstr " plipconfig -V | --version\n" - -@@ -1149,25 +1331,30 @@ - msgid "%s\tnibble %lu trigger %lu\n" - msgstr "%s\tnibble %lu trigger %lu\n" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:85 -+#, c-format - msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" - msgstr "Kasutamine: iptunnel { add | change | del | show } [ NIMI ]\n" - --#: ../iptunnel.c:85 -+#: ../iptunnel.c:86 -+#, c-format - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" - msgstr "" - " [ mode { ipip | gre | sit } ] [ remote AADR ] [ local AADR ]\n" - --#: ../iptunnel.c:86 -+#: ../iptunnel.c:87 -+#, c-format - msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - msgstr " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - --#: ../iptunnel.c:87 -+#: ../iptunnel.c:88 -+#, c-format - msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" - msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev LIIDES ]\n" - --#: ../iptunnel.c:88 -+#: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" -@@ -1175,83 +1362,99 @@ - " iptunnel -V | --version\n" - "\n" - --#: ../iptunnel.c:89 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "Kus: NIMI := STRING\n" - --#: ../iptunnel.c:90 -+#: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr " AADR := { IP_AADRESS | any }\n" - --#: ../iptunnel.c:91 -+#: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr " TOS := { ARV | inherit }\n" - --#: ../iptunnel.c:92 -+#: ../iptunnel.c:93 -+#, c-format - msgid " TTL := { 1..255 | inherit }\n" - msgstr " TTL := { 1..255 | inherit }\n" - --#: ../iptunnel.c:93 -+#: ../iptunnel.c:94 -+#, c-format - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" - msgstr "" - " KEY := { PUNKTIDEGA_ARVUNELIK | ARV }\n" - " LIIDES := FÜÜSILISE_LIIDESE_NIMI\n" - --#: ../iptunnel.c:331 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "ipip ja sit juures ei ole võtmed lubatud\n" - --#: ../iptunnel.c:351 -+#: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "Leviedastusega tunnel vajab lähteaadressi\n" - --#: ../iptunnel.c:366 -+#: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "ttl != 0 ning noptmudisc ei sobi kokku\n" - --#: ../iptunnel.c:378 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "Ei suuda määrata tunneli moodi (ipip, gre või sit)\n" - --#: ../iptunnel.c:416 -+#: ../iptunnel.c:417 - #, c-format - msgid "%s: %s/ip remote %s local %s " - msgstr "%s: %s/ip teises otsas %s siin %s " - --#: ../iptunnel.c:420 -+#: ../iptunnel.c:421 - msgid "unknown" - msgstr "tundmatu" - --#: ../iptunnel.c:452 -+#: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr " Järjekorravälised paketid visatakse minema\n" - --#: ../iptunnel.c:454 -+#: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr " Vastuvõetavates pakettides on kontrollsumma kohustuslik\n" - --#: ../iptunnel.c:456 -+#: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr " Väljuvad paketid varustatakse järjekorranumbritega\n" - --#: ../iptunnel.c:458 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr " Väljuvad paketid varustatakse kontrollsummaga\n" - --#: ../iptunnel.c:486 -+#: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" - msgstr "/proc/net/dev on vales formaadis. Vale tuuma versioon?\n" - --#: ../iptunnel.c:499 -+#: ../iptunnel.c:500 - #, c-format - msgid "Failed to get type of [%s]\n" - msgstr "Ei suutnud kindlaks teha liidese %s tüüpi\n" - --#: ../iptunnel.c:515 -+#: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "RX: Pakette Baite Vigu KSumVigu JrkVigu Levipakette\n" - --#: ../iptunnel.c:518 -+#: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "TX: Pakette Baite Vigu DeadLoop EiRuudi MäluOtsas\n" - -@@ -1658,13 +1861,13 @@ - msgstr "%u paketti pandi otse recvmsg eeljärjekorda" - - #: ../statistics.c:178 --#, c-format --msgid "%u packets directly received from backlog" -+#, fuzzy, c-format -+msgid "%u of bytes directly received from backlog" - msgstr "%u paketti võeti vastu otse backlog-ist" - - #: ../statistics.c:180 --#, c-format --msgid "%u packets directly received from prequeue" -+#, fuzzy, c-format -+msgid "%u of bytes directly received from prequeue" - msgstr "%u paketti võeti vastu otse eeljärjekorrast" - - #: ../statistics.c:182 -@@ -1673,8 +1876,8 @@ - msgstr "%u paketti kustutati eeljärjekorrast" - - #: ../statistics.c:183 --#, c-format --msgid "%u packets header predicted" -+#, fuzzy, c-format -+msgid "%u packet headers predicted" - msgstr "%u paketti päise õige ennustusega" - - #: ../statistics.c:184 -@@ -1687,19 +1890,210 @@ - msgid "Ran %u times out of system memory during packet sending" - msgstr "Pakettide saatmisel sai %u korda süsteemne mälu otsa" - --#: ../statistics.c:253 -+#: ../statistics.c:188 -+#, fuzzy, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "%u sisenevat paketti tundmatule pordile" -+ -+#: ../statistics.c:189 -+#, c-format -+msgid "%u predicted acknowledgments" -+msgstr "" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" -+ -+#: ../statistics.c:192 -+#, fuzzy, c-format -+msgid "%u bad SACKs received" -+msgstr "%u vigast segmenti võeti vastu" -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "" -+ -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:197 -+#, fuzzy, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "%u ühenduse katkestust saabus" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, fuzzy, c-format -+msgid "%u retransmits lost" -+msgstr "%u katkestust saadeti" -+ -+#: ../statistics.c:202 -+#, fuzzy, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "%u segmenti saadeti uuesti" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, fuzzy, c-format -+msgid "%u fast retransmits" -+msgstr "%u segmenti saadeti uuesti" -+ -+#: ../statistics.c:206 -+#, fuzzy, c-format -+msgid "%u forward retransmits" -+msgstr "%u edastati" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, fuzzy, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "%u segmenti saadeti uuesti" -+ -+#: ../statistics.c:210 -+#, fuzzy, c-format -+msgid "%u sack retransmits failed" -+msgstr "%u pakettide kokkupanekut ebaõnnestus" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, fuzzy, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "" -+"%u paketti kustutati vastuvõtu järjekorrast sokli puhvri ületäitumise tõttu" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, fuzzy, c-format -+msgid "%u DSACKs received" -+msgstr "%u paketti võeti vastu" -+ -+#: ../statistics.c:216 -+#, fuzzy, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "kokku võeti vastu %u paketti" -+ -+#: ../statistics.c:217 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "%u ühenduse katkestust saabus" -+ -+#: ../statistics.c:218 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "%u ühenduse katkestust saabus" -+ -+#: ../statistics.c:219 -+#, fuzzy, c-format -+msgid "%u connections reset due to early user close" -+msgstr "%u ühenduse katkestust saabus" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, fuzzy, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "%u aktiivsest ühendusest keelduti ajatempli tõttu" -+ -+#: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "lubatud" - --#: ../statistics.c:253 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "keelatud" - --#: ../statistics.c:336 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "Viga /proc/net/snmp analüüsimisel" - --#: ../statistics.c:349 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "Ei saa avada faili /proc/net/snmp" - -@@ -1713,7 +2107,7 @@ - msgid "Cannot change line discipline to `%s'.\n" - msgstr "Ei suuda seada `%s' liiniprotokolliks\n" - --#: ../lib/af.c:153 ../lib/hw.c:156 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "UNSPEC" - -@@ -1729,11 +2123,11 @@ - msgid "IPv6" - msgstr "IPv6" - --#: ../lib/af.c:164 ../lib/hw.c:177 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "AMPR AX.25" - --#: ../lib/af.c:167 ../lib/hw.c:183 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "AMPR NET/ROM" - -@@ -1745,7 +2139,7 @@ - msgid "Appletalk DDP" - msgstr "Appletalk DDP" - --#: ../lib/af.c:176 ../lib/hw.c:218 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "Econet" - -@@ -1753,19 +2147,21 @@ - msgid "CCITT X.25" - msgstr "CCITT X.25" - --#: ../lib/af.c:182 ../lib/hw.c:180 -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "AMPR ROSE" - --#: ../lib/af.c:185 ../lib/hw.c:168 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "Ash" - - #: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "Meil on kombeks üks aadressiperekond korraga\n" - - #: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "Liiga palju aadressiperekonna argumente\n" - -@@ -1790,6 +2186,7 @@ - msgstr "in_arcnet(%s): sodi lõpus\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - msgstr "Vigane Ash aadress" - -@@ -1808,22 +2205,21 @@ - msgstr "Liiga pikk kutsung" - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "AX.25 pole antud süsteemis konfigureeritud\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "Tuuma AX.25 ruutingutabel\n" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "Sihtpunkt Liides Kasutus\n" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1879,90 +2275,94 @@ - msgid "in_hippi(%s): trailing junk!\n" - msgstr "in_hippi(%s): sodi lõpus\n" - --#: ../lib/hw.c:155 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "Kohalik loopback" - --#: ../lib/hw.c:158 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "Serial Line IP" - --#: ../lib/hw.c:159 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "VJ Serial Line IP" - --#: ../lib/hw.c:160 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "6-bitine Serial Line IP" - --#: ../lib/hw.c:161 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "VJ 6-bitine Serial Line IP" - --#: ../lib/hw.c:162 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "Adaptiivne Serial Line IP" - --#: ../lib/hw.c:165 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:171 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "Fiber Distributed Data Interface" - --#: ../lib/hw.c:174 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:186 -+#: ../lib/hw.c:191 - msgid "generic X.25" - msgstr "üldine X.25" - --#: ../lib/hw.c:189 -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "IPIP tunnel" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" - msgstr "Kakspunktprotokoll" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "(Cisco-)HDLC" - --#: ../lib/hw.c:196 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:199 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:202 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "Frame Relay Access Device" - --#: ../lib/hw.c:206 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "IPv6-in-IPv4" - --#: ../lib/hw.c:209 -+#: ../lib/hw.c:214 - msgid "IrLAP" - msgstr "IrLAP" - --#: ../lib/hw.c:212 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "16/4 Mbps Token Ring" - --#: ../lib/hw.c:214 -+#: ../lib/hw.c:219 - msgid "16/4 Mbps Token Ring (New)" - msgstr "16/4 Mbps Token Ring (New)" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" -@@ -1972,27 +2372,32 @@ - msgid "[UNKNOWN]" - msgstr "[TUNDMATU]" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "INET6 (IPv6) pole antud süsteemis konfigureeritud\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" - msgstr "Tuuma IPv6 ruutingutabel\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" - msgstr "" --"Sihtpunkt Järgmine samm " --" Lipud Meetr Mitu Kasut Liides\n" -+"Sihtpunkt Järgmine " -+"samm Lipud Meetr Mitu Kasut Liides\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Tuuma IPv6 naabrite puhver\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" -@@ -2000,7 +2405,8 @@ - "Naaber HW Aadress Liides Lipud " - "Mitu Olek\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:157 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" -@@ -2009,31 +2415,38 @@ - "Mitu Olek Stale(sec) Delete(sec)\n" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "Kasutamine: route [-vF] del AADRESS\n" - - #: ../lib/inet6_sr.c:47 -+#, c-format - msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" - msgstr "" - " route [-vF] add AADRESS [gw GW] [metric M] [[dev] LIIDES]\n" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr " route [-FC] flush Seda EI toetata\n" - - #: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" - msgstr "`inet6' ruutingutabeli tühjendamist ei toetata\n" - - #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format - msgid "INET (IPv4) not configured in this system.\n" - msgstr "INET (IPv4) pole antud süsteemis konfigureeritud\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" - msgstr "Tuuma IP ruutingutabel\n" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" -@@ -2042,6 +2455,7 @@ - "Liides\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" -@@ -2050,6 +2464,7 @@ - "Liides\n" - - #: ../lib/inet_gr.c:62 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface MSS Window irtt\n" -@@ -2058,10 +2473,12 @@ - "Liides MSS Aken irtt\n" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\n" - msgstr "Tuuma IP ruutingu puhver\n" - - #: ../lib/inet_gr.c:258 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface\n" -@@ -2070,6 +2487,7 @@ - "Liides\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" -@@ -2078,6 +2496,7 @@ - "Liides\n" - - #: ../lib/inet_gr.c:266 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt HH Arp\n" -@@ -2086,6 +2505,7 @@ - "Liides MSS Aken irtt HH Arp\n" - - #: ../lib/inet_gr.c:290 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" -@@ -2093,7 +2513,8 @@ - "Lähtepunkt Sihtpunkt Ruuter Lipud Meetr Mitu Kasut " - "Liides MSS Aken irtt TOS HHRef HHUptod SpecDst\n" - --#: ../lib/inet_sr.c:50 -+#: ../lib/inet_sr.c:51 -+#, c-format - msgid "" - "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " - "[[dev] If]\n" -@@ -2101,31 +2522,36 @@ - "Kasutamine: route [-vF] del {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric " - "M] [[dev] LIIDES]\n" - --#: ../lib/inet_sr.c:51 -+#: ../lib/inet_sr.c:52 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" - msgstr "" - " route [-vF] add {-host|-net} AADRESS[/PREFIKS] [gw GW] [metric " - "M]\n" - --#: ../lib/inet_sr.c:52 -+#: ../lib/inet_sr.c:53 -+#, c-format - msgid "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - msgstr "" - " [netmask N] [mss MSS] [window W] [irtt I]\n" - --#: ../lib/inet_sr.c:53 -+#: ../lib/inet_sr.c:54 -+#, c-format - msgid " [mod] [dyn] [reinstate] [[dev] If]\n" - msgstr " [mod] [dyn] [reinstate] [[dev] LIIDES]\n" - --#: ../lib/inet_sr.c:54 -+#: ../lib/inet_sr.c:55 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" - msgstr "" - " route [-vF] add {-host|-net} AADRESS[/PREFIKS] [metric M] " - "reject\n" - --#: ../lib/inet_sr.c:55 -+#: ../lib/inet_sr.c:56 -+#, c-format - msgid " inet_route [-FC] flush NOT supported\n" - msgstr " route [-FC] flush Seda EI toetata\n" - -@@ -2135,14 +2561,17 @@ - msgstr "route: %s: võrku ei saa kasutada ruuterina\n" - - #: ../lib/inet_sr.c:174 -+#, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "route: vigane MSS/MTU\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "route: Vigane akna suurus\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "route: vigane algne rtt\n" - -@@ -2157,75 +2586,92 @@ - msgstr "route: vale võrgumask %s\n" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "route: võrgumask ei sobi ruutingu aadressiga\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" - msgstr "`inet' ruutingutabeli tühjendamist ei toetata\n" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" - msgstr "`inet' ruutingu puhvri muutmist ei toetata\n" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "IPX pole antud süsteemis konfigureeritud\n" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" - msgstr "Tuuma IPX ruutingutabel\n" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" - msgstr "Sihtpunkt Ruuteri võrk Ruuter ise\n" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" - msgstr "IPX osa vajab ümbertegemist\n" - - #: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "IP maskeerimise kirjed\n" - - #: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "Proto Aegub Lähtepunkt Sihtpunkt Pordid\n" - - #: ../lib/masq_info.c:204 -+#, c-format - msgid "" --"prot expire initseq delta prevd source destination " --" ports\n" -+"prot expire initseq delta prevd source " -+"destination ports\n" - msgstr "" --"Proto Aegub Initseq Delta Prevd Lähtepunkt Sihtpunkt " --" Pordid\n" -+"Proto Aegub Initseq Delta Prevd Lähtepunkt " -+"Sihtpunkt Pordid\n" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "NET/ROM pole antud süsteemis konfigureeritud\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" - msgstr "Tuuma NET/ROM ruutingutabel\n" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "Sihtpunkt Mnemoonika Kvaliteet Naaber Liides\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" - msgstr "netrom kasutus\n" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" - msgstr "NET/ROM osa vajab ümbertegemist\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "Sellest programmist ei saa PPP-d käivitada\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" - msgstr "Palun kasutage pppd'd\n" - -@@ -2234,287 +2680,314 @@ - msgstr "Sõlme aadress peab olema kümnekohaline" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "ROSE pole antud süsteemis konfigureeritud\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" - msgstr "Tuuma ROSE ruutingutabel\n" - --#: ../lib/tr.c:70 ../lib/tr.c:85 -+#: ../lib/tr.c:86 ../lib/tr.c:101 - #, c-format - msgid "in_tr(%s): invalid token ring address!\n" - msgstr "in_tr(%s): vigane token ring-aadress\n" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "in_tr(%s): ignoreerin lõpetavat koolonit\n" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "in_tr(%s): sodi lõpus\n" - --#: ../lib/interface.c:164 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" - msgstr "Hoiatus: `inet' sokleid ei ole: %s\n" - --#: ../lib/interface.c:316 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "Hoiatus: ei saa avada faili %s (%s). Väljund on piiratud.\n" - - #. Give better error message for this case. --#: ../lib/interface.c:556 -+#: ../lib/interface.c:571 - msgid "Device not found" - msgstr "Liidest ei leitud" - --#: ../lib/interface.c:560 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" - msgstr "%s: viga liidese info küsimisel: %s\n" - --#: ../lib/interface.c:593 -+#: ../lib/interface.c:608 - msgid " - no statistics available -" - msgstr " - statistikat ei ole -" - --#: ../lib/interface.c:597 -+#: ../lib/interface.c:612 -+#, c-format - msgid "[NO FLAGS]" - msgstr "[LIPPE POLE]" - --#: ../lib/interface.c:673 -+#: ../lib/interface.c:688 - #, c-format - msgid "%-9.9s Link encap:%s " - msgstr "%-9.9s kapseldus:%s " - --#: ../lib/interface.c:678 -+#: ../lib/interface.c:693 - #, c-format - msgid "HWaddr %s " - msgstr "HWaddr %s " - --#: ../lib/interface.c:681 -+#: ../lib/interface.c:696 - #, c-format - msgid "Media:%s" - msgstr "meedia:%s" - --#: ../lib/interface.c:683 -+#: ../lib/interface.c:698 -+#, c-format - msgid "(auto)" - msgstr "(auto)" - --#: ../lib/interface.c:690 -+#: ../lib/interface.c:705 - #, c-format - msgid " %s addr:%s " - msgstr " %s aadress:%s " - --#: ../lib/interface.c:693 -+#: ../lib/interface.c:708 - #, c-format - msgid " P-t-P:%s " - msgstr " P-t-P:%s " - --#: ../lib/interface.c:696 -+#: ../lib/interface.c:711 - #, c-format - msgid " Bcast:%s " - msgstr " bcast:%s " - --#: ../lib/interface.c:698 -+#: ../lib/interface.c:713 - #, c-format - msgid " Mask:%s\n" - msgstr " mask:%s\n" - --#: ../lib/interface.c:715 -+#: ../lib/interface.c:730 - #, c-format - msgid " inet6 addr: %s/%d" - msgstr " inet6 aadr: %s/%d" - --#: ../lib/interface.c:717 -+#: ../lib/interface.c:732 -+#, c-format - msgid " Scope:" - msgstr " skoop:" - --#: ../lib/interface.c:720 -+#: ../lib/interface.c:735 -+#, c-format - msgid "Global" - msgstr "globaalne" - --#: ../lib/interface.c:723 -+#: ../lib/interface.c:738 -+#, c-format - msgid "Link" - msgstr "ühendus" - --#: ../lib/interface.c:726 -+#: ../lib/interface.c:741 -+#, c-format - msgid "Site" - msgstr "site" - --#: ../lib/interface.c:729 -+#: ../lib/interface.c:744 -+#, c-format - msgid "Compat" - msgstr "ühilduvus" - --#: ../lib/interface.c:732 -+#: ../lib/interface.c:747 -+#, c-format - msgid "Host" - msgstr "host" - --#: ../lib/interface.c:735 -+#: ../lib/interface.c:750 -+#, c-format - msgid "Unknown" - msgstr "tundmatu" - --#: ../lib/interface.c:750 -+#: ../lib/interface.c:765 - #, c-format - msgid " IPX/Ethernet II addr:%s\n" - msgstr " IPX/Ethernet II aadr:%s\n" - --#: ../lib/interface.c:753 -+#: ../lib/interface.c:768 - #, c-format - msgid " IPX/Ethernet SNAP addr:%s\n" - msgstr " IPX/Ethernet SNAP aadr:%s\n" - --#: ../lib/interface.c:756 -+#: ../lib/interface.c:771 - #, c-format - msgid " IPX/Ethernet 802.2 addr:%s\n" - msgstr " IPX/Ethernet 802.2 aadr:%s\n" - --#: ../lib/interface.c:759 -+#: ../lib/interface.c:774 - #, c-format - msgid " IPX/Ethernet 802.3 addr:%s\n" - msgstr " IPX/Ethernet 802.3 aadr:%s\n" - --#: ../lib/interface.c:769 -+#: ../lib/interface.c:784 - #, c-format - msgid " EtherTalk Phase 2 addr:%s\n" - msgstr " EtherTalk Phase 2 aadr:%s\n" - --#: ../lib/interface.c:778 -+#: ../lib/interface.c:793 - #, c-format - msgid " econet addr:%s\n" - msgstr " econeti aadr:%s\n" - --#: ../lib/interface.c:785 -+#: ../lib/interface.c:800 -+#, c-format - msgid "[NO FLAGS] " - msgstr "[LIPPE POLE]" - --#: ../lib/interface.c:787 -+#: ../lib/interface.c:802 -+#, c-format - msgid "UP " - msgstr "UP " - --#: ../lib/interface.c:789 -+#: ../lib/interface.c:804 -+#, c-format - msgid "BROADCAST " - msgstr "BROADCAST " - --#: ../lib/interface.c:791 -+#: ../lib/interface.c:806 -+#, c-format - msgid "DEBUG " - msgstr "DEBUG " - --#: ../lib/interface.c:793 -+#: ../lib/interface.c:808 -+#, c-format - msgid "LOOPBACK " - msgstr "LOOPBACK " - --#: ../lib/interface.c:795 -+#: ../lib/interface.c:810 -+#, c-format - msgid "POINTOPOINT " - msgstr "POINTOPOINT " - --#: ../lib/interface.c:797 -+#: ../lib/interface.c:812 -+#, c-format - msgid "NOTRAILERS " - msgstr "NOTRAILERS " - --#: ../lib/interface.c:799 -+#: ../lib/interface.c:814 -+#, c-format - msgid "RUNNING " - msgstr "RUNNING " - --#: ../lib/interface.c:801 -+#: ../lib/interface.c:816 -+#, c-format - msgid "NOARP " - msgstr "NOARP " - --#: ../lib/interface.c:803 -+#: ../lib/interface.c:818 -+#, c-format - msgid "PROMISC " - msgstr "PROMISC " - --#: ../lib/interface.c:805 -+#: ../lib/interface.c:820 -+#, c-format - msgid "ALLMULTI " - msgstr "ALLMULTI " - --#: ../lib/interface.c:807 -+#: ../lib/interface.c:822 -+#, c-format - msgid "SLAVE " - msgstr "SLAVE " - --#: ../lib/interface.c:809 -+#: ../lib/interface.c:824 -+#, c-format - msgid "MASTER " - msgstr "MASTER " - --#: ../lib/interface.c:811 -+#: ../lib/interface.c:826 -+#, c-format - msgid "MULTICAST " - msgstr "MULTICAST " - --#: ../lib/interface.c:814 -+#: ../lib/interface.c:829 -+#, c-format - msgid "DYNAMIC " - msgstr "DYNAMIC " - - #. DONT FORGET TO ADD THE FLAGS IN ife_print_short --#: ../lib/interface.c:817 -+#: ../lib/interface.c:832 - #, c-format - msgid " MTU:%d Metric:%d" - msgstr " MTU:%d meetrika:%d" - --#: ../lib/interface.c:821 -+#: ../lib/interface.c:836 - #, c-format - msgid " Outfill:%d Keepalive:%d" - msgstr " ülalhoidepakettide intervall:%d ülalhoidetaimaut:%d" - --#: ../lib/interface.c:835 -+#: ../lib/interface.c:850 - #, c-format - msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" - msgstr "RX pakette:%llu vigu:%lu ära visatud:%lu ületäit:%lu kaadri vigu:%lu\n" - --#: ../lib/interface.c:840 -+#: ../lib/interface.c:855 - #, c-format - msgid " compressed:%lu\n" - msgstr " pakitud:%lu\n" - --#: ../lib/interface.c:852 -+#: ../lib/interface.c:895 - #, c-format - msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" - msgstr "TX pakette:%llu vigu:%lu ära visatud:%lu ületäit:%lu carrier:%lu\n" - --#: ../lib/interface.c:856 -+#: ../lib/interface.c:899 - #, c-format - msgid " collisions:%lu " - msgstr " kollisioone:%lu " - --#: ../lib/interface.c:858 -+#: ../lib/interface.c:901 - #, c-format - msgid "compressed:%lu " - msgstr "pakitud:%lu " - --#: ../lib/interface.c:860 -+#: ../lib/interface.c:903 - #, c-format - msgid "txqueuelen:%d " - msgstr "txqueuelen:%d " - --#: ../lib/interface.c:862 -+#: ../lib/interface.c:905 - #, c-format - msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" - msgstr "RX baite:%llu (%lu.%lu %s) TX baite:%llu (%lu.%lu %s)\n" - --#: ../lib/interface.c:873 -+#: ../lib/interface.c:916 - #, c-format - msgid "Interrupt:%d " - msgstr "katkestus:%d " - - #. Only print devices using it for - #. I/O maps --#: ../lib/interface.c:876 -+#: ../lib/interface.c:919 - #, c-format - msgid "Base address:0x%x " - msgstr "baasaadress:0x%x " - --#: ../lib/interface.c:878 -+#: ../lib/interface.c:921 - #, c-format - msgid "Memory:%lx-%lx " - msgstr "mälu:%lx-%lx " - --#: ../lib/interface.c:881 -+#: ../lib/interface.c:924 - #, c-format - msgid "DMA chan:%x " - msgstr "DMA kanal:%x " - - #: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "Ei leidnud ühtegi kasutatavat aadressiperekonda\n" - -@@ -2538,29 +3011,32 @@ - msgid "ip: argument is wrong: %s\n" - msgstr "iptunnel: vale argument %s\n" - --#: ../ipmaddr.c:58 -+#: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr "Kasutamine: ipmaddr [ add | del ] MULTIAADR dev STRING\n" - --#: ../ipmaddr.c:59 -+#: ../ipmaddr.c:62 -+#, c-format - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - msgstr " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - --#: ../ipmaddr.c:60 -+#: ../ipmaddr.c:63 -+#, c-format - msgid " ipmaddr -V | -version\n" - msgstr " ipmaddr -V | -version\n" - --#: ../ipmaddr.c:260 -+#: ../ipmaddr.c:263 - #, c-format - msgid "family %d " - msgstr "perekond %d " - --#: ../ipmaddr.c:269 -+#: ../ipmaddr.c:272 - #, c-format - msgid " users %d" - msgstr " kasutajaid %d" - --#: ../ipmaddr.c:355 -+#: ../ipmaddr.c:358 - msgid "Cannot create socket" - msgstr "Ei saa avada soklit" - -@@ -2575,6 +3051,7 @@ - msgstr "slattach: tty_lock: (%s): %s\n" - - #: ../slattach.c:192 -+#, c-format - msgid "slattach: cannot write PID file\n" - msgstr "slattach: ei saa PID faili kirjutada\n" - -@@ -2594,18 +3071,22 @@ - msgstr "slattach: tty_hangup(RAISE): %s\n" - - #: ../slattach.c:468 -+#, c-format - msgid "slattach: tty name too long\n" - msgstr "slattach: terminali nimi on liiga pikk\n" - - #: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "slattach: tty_open: ei saa lugeda jooksvat olekut\n" - - #: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" - msgstr "slattach: tty_open: liiniprotokolli küsimine ebaõnnestus\n" - - #: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "slattach: tty_open: ei saa seada RAW moodi\n" - -@@ -2615,6 +3096,7 @@ - msgstr "slattach: tty_open: ei saa seada kiiruseks %s bps\n" - - #: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "slattach: tty_open: ei saa seada 8N1 moodi\n" - -@@ -2637,3 +3119,20 @@ - #, c-format - msgid " interface %s\n" - msgstr " liides %s\n" -+ -+#~ msgid "" -+#~ " arp [-v] [] [-i ] -s [netmask ] pub " -+#~ "<-''-\n" -+#~ msgstr "" -+#~ " arp [-v] [] [-i ] -s [netmask ] " -+#~ "pub\n" -+ -+#~ msgid "%s: unknown interface: %s\n" -+#~ msgstr "ifconfig: tundmatu liides %s: %s\n" -+ -+#~ msgid " -n, --numeric dont resolve names\n" -+#~ msgstr "" -+#~ " -n, --numeric mitte lahendada numbreid nimedeks\n" -+ -+#~ msgid "Routing table for `ddp' not yet supported.\n" -+#~ msgstr "`ddp' jaoks ruutingutabelit veel ei oska\n" ---- net-tools-1.60.orig/po/de.po -+++ net-tools-1.60/po/de.po -@@ -1,106 +1,121 @@ --# $Id: de.po,v 1.10 2000/08/01 03:19:48 ecki Exp $ -+# $Id: de.po,v 1.11 2003/10/25 21:15:09 ecki Exp $ - # German translation for net-tools 1.51 - # Copyright (C) 1999 Ralf Bächle - msgid "" - msgstr "" - "Project-Id-Version: net-tools 1.51\n" --"POT-Creation-Date: 2000-02-14 02:31+0100\n" --"PO-Revision-Date: 1998-03-01 00:02+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" -+"PO-Revision-Date: 2005-06-13 00:02+0100\n" - "Last-Translator: Ralf Bächle \n" - "Language-Team:\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=iso8859-1\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../arp.c:110 ../arp.c:269 -+#: ../arp.c:112 ../arp.c:279 -+#, c-format - msgid "arp: need host name\n" --msgstr "arp: Hostname muß angegeben werden\n" -+msgstr "arp: Hostname muss angegeben werden\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" --msgstr "Kein ARP Eintrag für %s\n" -+msgstr "Kein ARP-Eintrag für %s\n" - --#: ../arp.c:239 -+#: ../arp.c:248 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "rarp: Kann Eintrag aus %s : %u nicht setzen.\n" - --#: ../arp.c:243 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "arp: unpassende Protokolltypen.\n" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" --msgstr "arp: Gerät ,,%s'' hat HW-Adresse %s ,,%s''.\n" -+msgstr "arp: Gerät »%s« hat HW-Adresse %s »%s«.\n" - --#: ../arp.c:282 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" --msgstr "arp: Hardwareadresse muß angegeben werden\n" -+msgstr "arp: Hardwareadresse muss angegeben werden\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "arp: ungültige Hardwareadresse\n" - --#: ../arp.c:387 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "arp: Kann %s nicht öffnen!\n" - --#: ../arp.c:403 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "arp: Formatfehler in Zeile %u von Etherfile %s.\n" - --#: ../arp.c:416 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "arp: Kann Eintrag auf Zeile %u von Etherdatei %s nicht setzen!\n" - --#: ../arp.c:437 --msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" -+#: ../arp.c:448 -+#, fuzzy, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" - msgstr "Adresse\t\t\tHWTyp\tHWAdresse\t Flags Maske\t\t Iface\n" - --#: ../arp.c:467 -+#: ../arp.c:476 -+#, fuzzy -+msgid "" -+msgstr " Schnittstelle: %s\n" -+ -+#: ../arp.c:478 - msgid "(incomplete)" --msgstr "(unvollsändig)" -+msgstr "(unvollständig)" - --#: ../arp.c:484 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "%s (%s) auf " - --#: ../arp.c:490 -+#: ../arp.c:501 -+#, c-format - msgid " " - msgstr " " - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "netzmaske %s " - --#: ../arp.c:513 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "auf %s\n" - --#: ../arp.c:592 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "Einträge: %d Ignoriert: %d Gefunden: %d\n" - --#: ../arp.c:596 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "%s (%s) -- kein Eintrag\n" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" --msgstr "arp: In %d Einträgen wurde kein Zutreffender gefunden.\n" -+msgstr "arp: In %d Einträgen wurde kein zutreffender gefunden.\n" - --#: ../arp.c:613 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [] [-i ] [-a] [] <-Display ARP " -@@ -109,157 +124,165 @@ - "Benutzung:\n" - " arp [-vn] [] [-i ] [-a] []\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, fuzzy, c-format - msgid "" --" arp [-v] [-i ] -d [pub][nopub] <-Delete ARP " -+" arp [-v] [-i ] -d [pub] <-Delete ARP " - "entry\n" - msgstr " arp [-v] [-i ] -d [pub][nopub]\n" - --#: ../arp.c:615 -+#: ../arp.c:628 -+#, fuzzy, c-format - msgid "" --" arp [-vnD] [] [-i ] -f [] <-Add entry from " -+" arp [-vnD] [] [-i ] -f [] <-Add entry from " - "file\n" - msgstr " arp [-vnD] [] [-i ] -f <- Eintrag aus Datei hinzufügen\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, fuzzy, c-format - msgid "" --" arp [-v] [] [-i ] -s [temp][nopub] <-Add " -+" arp [-v] [] [-i ] -s [temp] <-Add " - "entry\n" - msgstr "" - " arp [-v] [] [-i ] -s [temp][nopub]\n" - --#: ../arp.c:617 --msgid "" --" arp [-v] [] [-i ] -s [netmask ] pub " --"<-''-\n" --msgstr "" --" arp [-v] [] [-i ] -s [netmask ] pub\n" -- --#: ../arp.c:618 -+#: ../arp.c:630 -+#, fuzzy, c-format - msgid "" --" arp [-v] [] [-i ] -Ds [netmask ] pub " -+" arp [-v] [] [-i ] -Ds [netmask ] pub " - "<-''-\n" - "\n" - msgstr " arp [-v] [] [-i ] -Ds [netmask ] pub\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" - msgstr " -a Alle Hosts im BSD-Format anzeigen\n" - --#: ../arp.c:621 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr " -s, --set Neuen ARP-Eintrag setzen\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr " -d, --delete Einen bestimmten Eintrag löschen\n" - --#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr " -v, --verbose Ausführliche Ausgaben\n" - --#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, fuzzy, c-format -+msgid " -n, --numeric don't resolve names\n" - msgstr " -n, --numeric Adressen nicht nach Namen auflösen\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" --msgstr " -i, --device Netzwerksgerät (z.B. eth0) angeben\n" -+msgstr " -i, --device Netzwerkgerät (z.B. eth0) angeben\n" - --#: ../arp.c:626 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read from given device\n" - msgstr " -D, --use-device von gegebenem Gerät lesen\n" - --#: ../arp.c:627 -+#: ../arp.c:639 -+#, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -A, -p, --protocol Routentabelle anzeigen\n" - --#: ../arp.c:628 -+#: ../arp.c:640 -+#, c-format - msgid "" --" -f, --file read new entries from file or from " --"/etc/ethers\n" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" - "\n" - msgstr "" - " -f, --file Neue Einträge aus Datei lesen\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " =Use '-H ' to specify hardware address type. Default: %s\n" - msgstr " ='-H ' um Hardwareadresstyp anzugeben. Standard: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr " Liste möglicher Hardwaretypen, die ARP unterstützen:\n" - --#: ../arp.c:664 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "%s: Hardwaretyp nicht unterstützt!\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "%s: Adressfamilie nicht unterstützt!\n" - --#: ../arp.c:703 -+#: ../arp.c:716 -+#, c-format - msgid "arp: -N not yet supported.\n" - msgstr "arp: -N noch nicht unterstützt.\n" - --#: ../arp.c:713 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "arp: %s: unbekannte Adressfamilie.\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "arp: %s: unbekannter Hardwaretyp.\n" - --#: ../arp.c:741 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" --msgstr "arp: %s: Kernel unterstützt nur ,,inet''.\n" -+msgstr "arp: %s: Kernel unterstützt nur »inet«.\n" - --#: ../arp.c:746 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "arp: %s: Hardware unterstützt kein ARP.\n" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" --msgstr "Rechnernamen auf ,,%s'' setzen\n" -+msgstr "Rechnernamen auf »%s« setzen\n" - --#: ../hostname.c:74 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "%s: Nur Root darf den Rechnernamen ändern\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "%s: name zu lang\n" - --#: ../hostname.c:89 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" --msgstr "Setze Hostname auf ,,%s''\n" -+msgstr "Setze Hostname auf »%s«\n" - --#: ../hostname.c:94 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" --msgstr "%s: Nur Root darf then Rechnernamen ändern\n" -+msgstr "%s: Nur Root darf den Rechnernamen ändern\n" - --#: ../hostname.c:108 -+#: ../hostname.c:109 - #, c-format - msgid "Setting domainname to `%s'\n" --msgstr "Setze domainname auf ,,%s''\n" -+msgstr "Setze domainname auf »%s«\n" - --#: ../hostname.c:113 -+#: ../hostname.c:114 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "%s: Nur Root darf den Domainnamen ändern\n" -@@ -267,51 +290,56 @@ - #: ../hostname.c:131 - #, c-format - msgid "Resolving `%s' ...\n" --msgstr "Löse ,,%s'' auf ...\n" -+msgstr "Löse »%s« auf ...\n" - - #: ../hostname.c:137 - #, c-format - msgid "Result: h_name=`%s'\n" --msgstr "Ergebnis: h_name=,,%s''\n" -+msgstr "Ergebnis: h_name=»%s«\n" - - #: ../hostname.c:142 - #, c-format - msgid "Result: h_aliases=`%s'\n" --msgstr "Ergebnis: h_aliases=,,%s''\n" -+msgstr "Ergebnis: h_aliases=»%s«\n" - - #: ../hostname.c:147 - #, c-format - msgid "Result: h_addr_list=`%s'\n" --msgstr "Ergebnis: h_addr_list=,,%s''\n" -+msgstr "Ergebnis: h_addr_list=»%s«\n" - --#: ../hostname.c:209 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" --msgstr "%s: Kann ,,%s'' nicht öffnen\n" -+msgstr "%s: Kann »%s« nicht öffnen\n" - --#: ../hostname.c:223 -+#: ../hostname.c:222 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" - msgstr "" - "Benutzung: hostname [-v] {Hostname|-F Datei} Hostname (aus Datei) setzen\n" - --#: ../hostname.c:224 -+#: ../hostname.c:223 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" - msgstr "" --" domainname [-v] {nisdomain|-F file} NIS Domainname (aus Datei) " -+" domainname [-v] {nisdomain|-F file} NIS-Domainname (aus Datei) " - "setzen.\n" - --#: ../hostname.c:226 -+#: ../hostname.c:225 -+#, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" - msgstr " nodename [-v] {Rechnername|-F Datei}\n" - --#: ../hostname.c:228 -+#: ../hostname.c:227 -+#, c-format - msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" - msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y|-n]\n" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" -@@ -319,7 +347,8 @@ - " hostname [-v] Hostnamen anzeigen\n" - "\n" - --#: ../hostname.c:230 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" -@@ -328,7 +357,8 @@ - "beenden.\n" - "\n" - --#: ../hostname.c:231 -+#: ../hostname.c:230 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" -@@ -336,43 +366,52 @@ - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr " -s, --short Kurzer Hostname\n" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr " -a, --alias Namensalias\n" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address Adressen für den Hostnamen\n" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr " -f, --fqdn, --long Langer Hostname (FQDN)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" --msgstr " -d, --domain DNS Domainname\n" -+msgstr " -d, --domain DNS-Domainname\n" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" --msgstr " -y, --yp, --nis NIS/YP Domainname\n" -+msgstr " -y, --yp, --nis NIS/YP-Domainname\n" - --#: ../hostname.c:239 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" --msgstr " -n, --node DECnet Knotennamen\n" -+msgstr " -n, --node DECnet-Knotennamen\n" - --#: ../hostname.c:241 -+#: ../hostname.c:240 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" - msgstr "" --" -F, --file Hostnamen oder NIS Domainnamen aus Datei lesen\n" -+" -F, --file Hostnamen oder NIS-Domainnamen aus Datei lesen\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:242 -+#, c-format - msgid "" - " This command can read or set the hostname or the NIS domainname. You can\n" - " also read the DNS domain or the FQDN (fully qualified domain name).\n" -@@ -380,395 +419,268 @@ - " FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" - " part of the FQDN) in the /etc/hosts file.\n" - msgstr "" --" Dies Kommando setzt oder gibt den Hostnamen oder NIS Domainnamen aus.\n" --" Es ist ebenfalls möglich die DNS Domain oder den FQDN (langen Hostnamen)\n" -+" Dies Kommando setzt oder gibt den Hostnamen oder NIS-Domainnamen aus.\n" -+" Es ist ebenfalls möglich die DNS-Domain oder den FQDN (langen Hostnamen)\n" - " ausgeben zu lassen. Außer wenn DNS oder NIS als Namensdienst verwendet\n" --" wird, können FQDN (Fully Qualified Domain Name) und DNS Domainname (welcher\n" -+" wird, können FQDN (Fully Qualified Domain Name) und DNS-Domainname (welcher\n" - " Teil des FQDNs ist) in /etc/hosts geändert werden.\n" - - #: ../hostname.c:338 - #, c-format - msgid "%s: You can't change the DNS domain name with this command\n" --msgstr "%s: Mit diesem Program kann der DNS Domainname nicht geändert werden\n" -+msgstr "%s: Mit diesem Programm kann der DNS-Domainname nicht geändert werden\n" - - #: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" - msgstr "" - "\n" --"Wenn Bind oder NIS nicht zur Hostnamensauflösung benutzt werden, kann der " --"DNS\n" -+"Wenn Bind oder NIS nicht zur Hostnamensauflösung benutzt werden, kann der DNS\n" - - #: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" --msgstr "" --"Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts geändert " --"werden.\n" -+msgstr "Domainname (welcher Teil des FQDN ist) in der Datei /etc/hosts geändert werden.\n" - - #: ../hostname.c:357 - #, c-format - msgid "gethostname()=`%s'\n" --msgstr "gethostname()=,,%s''\n" -+msgstr "gethostname()=»%s«\n" - - #: ../hostname.c:374 - #, c-format - msgid "getdomainname()=`%s'\n" --msgstr "getdomainname()=,,%s''\n" -+msgstr "getdomainname()=»%s«\n" - - #: ../hostname.c:389 - #, c-format - msgid "getnodename()=`%s'\n" --msgstr "getnodename()=,,%s''\n" -+msgstr "getnodename()=»%s«\n" - --#: ../ifconfig.c:159 --#, c-format --msgid "%-9.9s Link encap:%s " --msgstr "%-9.9s Protokoll:%s " -+#: ../ifconfig.c:107 -+#, fuzzy, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "SStelle MTU Met RX-OK RX-Feh RX-DRP RX-Ülf TX-OK TX-Feh TX-DRP TX-Üb Flg\n" - --#: ../ifconfig.c:164 --#, c-format --msgid "HWaddr %s " --msgstr "Hardware Adresse %s " -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, fuzzy, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n" - --#: ../ifconfig.c:167 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 - #, c-format --msgid "Media:%s" --msgstr "Medium:%s" -+msgid "No support for INET on this system.\n" -+msgstr "INET ist auf diesem System nicht verfügbar.\n" - --#: ../ifconfig.c:169 --msgid "(auto)" --msgstr "(auto)" -+#: ../ifconfig.c:193 -+#, fuzzy, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n" - --#: ../ifconfig.c:176 --#, c-format --msgid " %s addr:%s " --msgstr " %s Adresse:%s " -+#: ../ifconfig.c:202 -+#, fuzzy, c-format -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] [[]
]\n" -+msgstr "" -+"Syntax:\n" -+" ifconfig [-a] [-i] [-v] [[] ]\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:204 - #, c-format --msgid " P-t-P:%s " --msgstr " P-z-P:%s " -+msgid " [add
[/]]\n" -+msgstr " [add [/]]\n" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 - #, c-format --msgid " Bcast:%s " --msgstr " Bcast:%s " -+msgid " [del
[/]]\n" -+msgstr " [del [/]]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:206 - #, c-format --msgid " Mask:%s\n" --msgstr " Maske:%s\n" -+msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" -+msgstr " [[-]broadcast []] [[-]pointopoint []]\n" - --#: ../ifconfig.c:201 -+#: ../ifconfig.c:207 - #, c-format --msgid " inet6 addr: %s/%d" --msgstr " inet6 Adresse: %s/%d" -- --#: ../ifconfig.c:203 --msgid " Scope:" --msgstr " Gültigkeitsbereich:" -- --#: ../ifconfig.c:206 --msgid "Global" --msgstr "Global" -+msgid " [netmask
] [dstaddr
] [tunnel
]\n" -+msgstr " [netmask ] [dstaddr ] [tunnel ]\n" - --#: ../ifconfig.c:209 --msgid "Link" --msgstr "Verbindung" -+#: ../ifconfig.c:210 -+#, c-format -+msgid " [outfill ] [keepalive ]\n" -+msgstr " [outfill ] [keepalive ]\n" - - #: ../ifconfig.c:212 --msgid "Site" --msgstr "Standort" -- --#: ../ifconfig.c:215 --msgid "Compat" --msgstr "Kompatibilität" -- --#: ../ifconfig.c:218 --msgid "Host" --msgstr "Maschine" -- --#: ../ifconfig.c:221 --msgid "Unknown" --msgstr "Unbekannt" -- --#: ../ifconfig.c:236 - #, c-format --msgid " IPX/Ethernet II addr:%s\n" --msgstr " IPX/Ethernet II Adresse:%s\n" -+msgid " [hw
] [metric ] [mtu ]\n" -+msgstr " [hw ] [metric ] [mtu ]\n" - --#: ../ifconfig.c:239 -+#: ../ifconfig.c:213 - #, c-format --msgid " IPX/Ethernet SNAP addr:%s\n" --msgstr " IPX/Ethernet SNAP Adresse:%s\n" -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:242 -+#: ../ifconfig.c:214 - #, c-format --msgid " IPX/Ethernet 802.2 addr:%s\n" --msgstr " IPX/Ethernet 802.2 Adresse:%s\n" -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" - --#: ../ifconfig.c:245 -+#: ../ifconfig.c:215 - #, c-format --msgid " IPX/Ethernet 802.3 addr:%s\n" --msgstr " IPX/Ethernet 802.3 Adresse:%s\n" -+msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" -+msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" - --#: ../ifconfig.c:255 -+#: ../ifconfig.c:217 - #, c-format --msgid " EtherTalk Phase 2 addr:%s\n" --msgstr " EtherTalk Phase 2 Adresse:%s\n" -+msgid " [txqueuelen ]\n" -+msgstr " [txqueuelen ]\n" - --#: ../ifconfig.c:264 -+#: ../ifconfig.c:220 - #, c-format --msgid " econet addr:%s\n" --msgstr " econet Adresse:%s\n" -- --#: ../ifconfig.c:270 --msgid "[NO FLAGS] " --msgstr "[KEINE FLAGS] " -- --#: ../ifconfig.c:272 --msgid "UP " --msgstr "UP " -- --#: ../ifconfig.c:274 --msgid "BROADCAST " --msgstr "BROADCAST " -- --#: ../ifconfig.c:276 --msgid "DEBUG " --msgstr "DEBUG " -- --#: ../ifconfig.c:278 --msgid "LOOPBACK " --msgstr "LOOPBACK " -- --#: ../ifconfig.c:280 --msgid "POINTOPOINT " --msgstr "PUNKTZUPUNKT " -- --#: ../ifconfig.c:282 --msgid "NOTRAILERS " --msgstr "NOTRAILERS " -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:284 --msgid "RUNNING " --msgstr "RUNNING " -+#: ../ifconfig.c:222 -+#, c-format -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr "" -+" [up|down] ...\n" -+"\n" - --#: ../ifconfig.c:286 --msgid "NOARP " --msgstr "NOARP " -+#: ../ifconfig.c:224 -+#, c-format -+msgid " =Hardware Type.\n" -+msgstr " =Hardwaretyp.\n" - --#: ../ifconfig.c:288 --msgid "PROMISC " --msgstr "PROMISC " -+#: ../ifconfig.c:225 -+#, c-format -+msgid " List of possible hardware types:\n" -+msgstr " Liste möglicher Hardwaretypen:\n" - --#: ../ifconfig.c:290 --msgid "ALLMULTI " --msgstr "ALLMULTI " -+#. 1 = ARPable -+#: ../ifconfig.c:227 -+#, c-format -+msgid " =Address family. Default: %s\n" -+msgstr " =Adressfamilie. Standardwert: %s\n" - --#: ../ifconfig.c:292 --msgid "SLAVE " --msgstr "SLAVE " -+#: ../ifconfig.c:228 -+#, c-format -+msgid " List of possible address families:\n" -+msgstr " List der möglichen Adressfamilien:\n" - --#: ../ifconfig.c:294 --msgid "MASTER " --msgstr "MASTER " -+#: ../ifconfig.c:303 -+#, c-format -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" - --#: ../ifconfig.c:296 --msgid "MULTICAST " --msgstr "MULTICAST " -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" - --#: ../ifconfig.c:299 --msgid "DYNAMIC " --msgstr "DYNAMIC " -+#: ../ifconfig.c:380 -+#, c-format -+msgid "Unknown media type.\n" -+msgstr "Typ des Mediums unbekannt.\n" - --#: ../ifconfig.c:302 -+#: ../ifconfig.c:417 - #, c-format --msgid " MTU:%d Metric:%d" --msgstr " MTU:%d Metric:%d" -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" - --#: ../ifconfig.c:306 -+#: ../ifconfig.c:429 - #, c-format --msgid " Outfill:%d Keepalive:%d" --msgstr " Outfill:%d Keepalive:%d" -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:320 -+#: ../ifconfig.c:441 - #, c-format --msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" - msgstr "" --"Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Rahmen:%lu\n" - --#: ../ifconfig.c:325 -+#: ../ifconfig.c:465 - #, c-format --msgid " compressed:%lu\n" --msgstr " komprimiert:%lu\n" -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" - --#: ../ifconfig.c:329 -+#: ../ifconfig.c:523 - #, c-format --msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgid "Warning: Interface %s still in BROADCAST mode.\n" - msgstr "" --"Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Träger:%lu\n" - --#: ../ifconfig.c:333 -+#: ../ifconfig.c:652 - #, c-format --msgid " collisions:%lu " --msgstr " Kollisionen:%lu " -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" - --#: ../ifconfig.c:335 -+#: ../ifconfig.c:684 - #, c-format --msgid "compressed:%lu " --msgstr "Komprimiert:%lu " -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "" - --#: ../ifconfig.c:337 -+#: ../ifconfig.c:693 - #, c-format --msgid "txqueuelen:%d " --msgstr "Sendewarteschlangenlänge:%d " -+msgid "%s: invalid %s address.\n" -+msgstr "%s: ungültige %s Adresse.\n" - --#: ../ifconfig.c:345 -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 - #, c-format --msgid "Interrupt:%d " --msgstr "Interrupt:%d " -- --#. Only print devices using it for --#. I/O maps --#: ../ifconfig.c:348 --#, c-format --msgid "Base address:0x%x " --msgstr "Basisadresse:0x%x " -- --#: ../ifconfig.c:350 --#, c-format --msgid "Memory:%lx-%lx " --msgstr "Speicher:%lx-%lx " -- --#: ../ifconfig.c:353 --#, c-format --msgid "DMA chan:%x " --msgstr "DMA Kanal:%x " -+msgid "No support for INET6 on this system.\n" -+msgstr "INET6 ist auf diesem System nicht verfügbar.\n" - --#: ../ifconfig.c:384 ../ifconfig.c:405 -+#: ../ifconfig.c:780 ../ifconfig.c:871 - #, c-format --msgid "%s: unknown interface: %s\n" --msgstr "%s: unbekannte Schnittstelle: %s\n" -- --#: ../ifconfig.c:421 --msgid "" --"Usage:\n" --" ifconfig [-a] [-i] [-v] [[]
]\n" --msgstr "" --"Syntax:\n" --" ifconfig [-a] [-i] [-v] [[] ]\n" -- --#: ../ifconfig.c:425 --msgid " [add
[/]]\n" --msgstr " [add [/]]\n" -- --#: ../ifconfig.c:427 --msgid " [del
[/]]\n" --msgstr " [del [/]]\n" -- --#: ../ifconfig.c:432 --msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" --msgstr " [[-]broadcast []] [[-]pointopoint []]\n" -- --#: ../ifconfig.c:433 --msgid " [netmask
] [dstaddr
] [tunnel
]\n" --msgstr " [netmask ] [dstaddr ] [tunnel ]\n" -- --#: ../ifconfig.c:436 --msgid " [outfill ] [keepalive ]\n" --msgstr " [outfill ] [keepalive ]\n" -- --#: ../ifconfig.c:438 --msgid " [hw
] [metric ] [mtu ]\n" --msgstr " [hw ] [metric ] [mtu ]\n" -- --#: ../ifconfig.c:439 --msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" --msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -- --#: ../ifconfig.c:440 --msgid " [multicast] [[-]promisc]\n" --msgstr " [multicast] [[-]promisc]\n" -- --#: ../ifconfig.c:441 --msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" --msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" -- --#: ../ifconfig.c:443 --msgid " [txqueuelen ]\n" --msgstr " [txqueuelen ]\n" -- --#: ../ifconfig.c:446 --msgid " [[-]dynamic]\n" --msgstr " [[-]dynamic]\n" -- --#: ../ifconfig.c:448 --msgid "" --" [up|down] ...\n" --"\n" -+msgid "Interface %s not initialized\n" - msgstr "" --" [up|down] ...\n" --"\n" -- --#: ../ifconfig.c:450 --msgid " =Hardware Type.\n" --msgstr " =Hardwaretyp.\n" -- --#: ../ifconfig.c:451 --msgid " List of possible hardware types:\n" --msgstr " Liste möglicher Hardwaretypen:\n" -- --#. 1 = ARPable --#: ../ifconfig.c:453 --#, c-format --msgid " =Address family. Default: %s\n" --msgstr " =Adressfamilie. Standardwert: %s\n" -- --#: ../ifconfig.c:454 --msgid " List of possible address families:\n" --msgstr " List der möglichen Adressfamilien:\n" -- --#: ../ifconfig.c:593 --msgid "Unknown media type.\n" --msgstr "Typ des Mediums unbekannt.\n" - --#: ../ifconfig.c:881 --#, c-format --msgid "%s: invalid %s address.\n" -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, fuzzy, c-format -+msgid "Bad address.\n" - msgstr "%s: ungültige %s Adresse.\n" - --#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 --msgid "No support for INET6 on this system.\n" --msgstr "INET6 ist auf diesem System nicht verfügbar.\n" -- --#: ../ifconfig.c:983 -+#: ../ifconfig.c:885 -+#, c-format - msgid "Address deletion not supported on this system.\n" --msgstr "Das Löschen von Adressen ist auf diesem System nicht unterstützt.\n" -+msgstr "Das Löschen von Adressen wird auf diesem System nicht unterstützt.\n" - --#: ../ifconfig.c:1066 --msgid "No support for INET on this system.\n" --msgstr "INET ist auf diesem System nicht verfügbar.\n" -+#: ../ifconfig.c:957 -+#, fuzzy, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Kann die Adressen der Familie %d nicht setzen.\n" - --#: ../ifconfig.c:1076 -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "ECONET wird auf diesem System nicht unterstützt.\n" - --#: ../ifconfig.c:1084 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "Kann die Adressen der Familie %d nicht setzen.\n" - --#: ../netstat.c:383 -+#: ../ifconfig.c:1021 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "" -+ -+#: ../netstat.c:434 - #, c-format - msgid "" - "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" --msgstr "" --"(Für \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie " --"sollten Root sein.)\n" -+msgstr "(Für \"-p\": geteuid()=%d konnte keine Information gelesen werden; sie sollten Root sein.)\n" - --#: ../netstat.c:387 -+#: ../netstat.c:438 -+#, c-format - msgid "" - "(Not all processes could be identified, non-owned process info\n" - " will not be shown, you would have to be root to see it all.)\n" -@@ -776,198 +688,220 @@ - "(Es konnten nicht alle Prozesse identifiziert werden; Informationen über\n" - "nicht-eigene Processe werden nicht angezeigt; Root kann sie anzeigen.)\n" - --#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "HÖRT" - --#: ../netstat.c:395 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "VERBINGSAUFBAU GESCHICKT" - --#: ../netstat.c:396 ../netstat.c:1168 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "VERBINDUNGSABBAU GESCHICKT" - --#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "VERBUNDEN" - --#: ../netstat.c:419 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "Aktive NET/ROM Sockets\n" - --#: ../netstat.c:420 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" --msgstr "" --"Benutzer Ziel Quelle Gerät Zustand Vr/Vs Send-Q " --"Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Benutzer Ziel Quelle Gerät Zustand Vr/Vs Send-Q Recv-Q\n" - --#: ../netstat.c:430 ../netstat.c:1208 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "Probleme beim Lesen von %s\n" - --#: ../netstat.c:465 -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "SYN_SENT" - --#: ../netstat.c:466 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "SYN_RECV" - --#: ../netstat.c:467 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "FIN_WAIT1" - --#: ../netstat.c:468 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "FIN_WAIT2" - --#: ../netstat.c:469 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "TIME_WAIT" - --#: ../netstat.c:470 -+#: ../netstat.c:521 - msgid "CLOSE" - msgstr "CLOSE" - --#: ../netstat.c:471 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "CLOSE_WAIT" - --#: ../netstat.c:472 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "LAST_ACK" - --#: ../netstat.c:473 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "LISTEN" - --#: ../netstat.c:474 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "CLOSING" - --#: ../netstat.c:544 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "Warnung, fehlerhafte igmp6 line %d.\n" - --#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803 --#: ../netstat.c:935 ../netstat.c:940 -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "netstat: Nicht unterstützte Adressfamilie %d!\n" - --#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582 -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 - #, c-format - msgid "warning, got bogus igmp line %d.\n" - msgstr "Warnung, fehlerhafte igmp-Zeile %d.\n" - --#: ../netstat.c:666 -+#: ../netstat.c:677 -+#, fuzzy, c-format -+msgid "Active X.25 sockets\n" -+msgstr "Aktive AX.25 Sockets\n" -+ -+#. IMHO, Vr/Vs is not very usefull --SF -+#: ../netstat.c:679 -+#, fuzzy, c-format -+msgid "" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Ziel Quelle Gerät Zustand Vr/Vs Send-Q Empf-Q\n" -+ -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "Warnung, fehlerhafte TCP Zeile.\n" - --#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "aus (0.00/%ld/%d)" - --#: ../netstat.c:708 -+#: ../netstat.c:804 - #, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "ein (%2.2f/%ld/%d)" - --#: ../netstat.c:713 -+#: ../netstat.c:809 - #, fuzzy, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "ein%d (%2.2f/%ld/%d)" - --#: ../netstat.c:718 -+#: ../netstat.c:814 - #, fuzzy, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "ein%d (%2.2f/%ld/%d)" - --#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "unkn-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:799 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "Warnung, fehlerhafe UDP-Zeile.\n" - --#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "UNBEKANNT" - --#: ../netstat.c:860 ../netstat.c:980 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "ein%d (%2.2f/%ld/%d)" - --#: ../netstat.c:949 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "Warnung, fehlerhafte raw-Zeile.\n" - --#: ../netstat.c:1028 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "Warnung, fehlerhafte UNIX-Zeile.\n" - --#: ../netstat.c:1055 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1059 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1063 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1067 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1071 -+#: ../netstat.c:1171 - msgid "SEQPACKET" --msgstr "SEQPACKET" -+msgstr "SEQPAKET" - --#: ../netstat.c:1080 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "FREI" - --#: ../netstat.c:1096 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "VERBINDUNGSAUFBAU" - --#: ../netstat.c:1100 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "VERBUNDEN" - --#: ../netstat.c:1104 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "VERBINDUNGSABBAU" - --#: ../netstat.c:1135 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " --msgstr "Aktive Sockets in der UNIX Domäne " -+msgstr "Aktive Sockets in der UNIX-Domäne " - --#: ../netstat.c:1137 ../netstat.c:1666 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "(Server und stehende Verbindungen)" - --#: ../netstat.c:1140 ../netstat.c:1669 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "(Nur Server)" - --#: ../netstat.c:1142 ../netstat.c:1671 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "(ohne Server)" - --#: ../netstat.c:1145 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -975,90 +909,90 @@ - "\n" - "Proto RefZäh Flaggen Typ Zustand I-Node" - --#: ../netstat.c:1147 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr " Pfad\n" - --#: ../netstat.c:1167 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "SABM GESCHICKT" - --#: ../netstat.c:1170 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "WIEDERHERSTELLUNG" - --#: ../netstat.c:1184 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "Aktive AX.25 Sockets\n" - --#: ../netstat.c:1185 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "Ziel Quelle Gerät Zustand Vr/Vs Send-Q Empf-Q\n" - --#: ../netstat.c:1228 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "Problem beim Lesen von Daten von %s\n" - --#: ../netstat.c:1279 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " - "State" - msgstr "" - "Aktive IPX Sockets\n" --"Proto Recv-Q Send-Q Lokale Adresse Gegenaddress " -+"Proto Recv-Q Send-Q Lokale Adresse Gegenadresse " - "Zustand" - --#: ../netstat.c:1281 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr " Benutzer" - --#: ../netstat.c:1315 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "VERBUNDEN" - --#: ../netstat.c:1323 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "UNB." - --#: ../netstat.c:1367 --msgid " - no statistics available -" --msgstr " - keine Statistiken verfügbar -" -- --#: ../netstat.c:1370 --msgid "[NO FLAGS]" --msgstr "[KEINE FLAGS]" -- --#: ../netstat.c:1400 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" --msgstr "Kernel Schnittstellentabelle\n" -+msgstr "Kernel-Schnittstellentabelle\n" - --#: ../netstat.c:1401 -+#: ../netstat.c:1465 -+#, fuzzy, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " --"Flg\n" --msgstr "" --"SStelle MTU Met RX-OK RX-Feh RX-DRP RX-Ülf TX-OK TX-Feh TX-DRP TX-Üb " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" -+msgstr "SStelle MTU Met RX-OK RX-Feh RX-DRP RX-Ülf TX-OK TX-Feh TX-DRP TX-Üb Flg\n" - --#: ../netstat.c:1404 -+#: ../netstat.c:1469 - msgid "missing interface information" --msgstr "Fehlende Interfaceinformation" -+msgstr "Fehlende Interfaceinformationen" - --#: ../netstat.c:1425 -+#: ../netstat.c:1492 -+#, c-format - msgid "" --"usage: netstat [-veenNcCF] [] -r netstat " --"{-V|--version|-h|--help}\n" -+"usage: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" -+"help}\n" - msgstr "" - "Benutzung: netstat [-veenNcCF] [] -r\n" - " netstat {-V|--version|-h|--help}\n" - --#: ../netstat.c:1426 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [ ...]\n" - msgstr " netstat [-vnNcaeol] [ ...]\n" - --#: ../netstat.c:1427 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" -@@ -1066,27 +1000,32 @@ - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - --#: ../netstat.c:1429 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr " -r, --route Routentabelle anzeigen\n" - --#: ../netstat.c:1430 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr " -i, --interfaces Schnittstellentabelle auflisten\n" - --#: ../netstat.c:1431 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr "" - " -g, --groups Mitgliedschaft in Multicastgruppen " - "anzeigen\n" - --#: ../netstat.c:1432 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr "" - " -s, --statistics Netzwerksstatistiken anzeigen (wie SNMP)\n" - --#: ../netstat.c:1434 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" -@@ -1094,23 +1033,38 @@ - " -M, --masquerade Maskierte Verbindungen auflisten\n" - "\n" - --#: ../netstat.c:1438 ../route.c:87 -+#: ../netstat.c:1505 -+#, fuzzy, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr " -n, --numeric Adressen nicht nach Namen auflösen\n" -+ -+#: ../netstat.c:1506 -+#, fuzzy, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr " -n, --numeric Adressen nicht nach Namen auflösen\n" -+ -+#: ../netstat.c:1507 -+#, fuzzy, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr " -n, --numeric Adressen nicht nach Namen auflösen\n" -+ -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -N, --symbolic Hardwarenamen auflösen\n" - --#: ../netstat.c:1439 ../route.c:88 --#, fuzzy -+#: ../netstat.c:1509 ../route.c:88 -+#, fuzzy, c-format - msgid " -e, --extend display other/more information\n" --msgstr "" --" -e, --extend Weitere / zusätzliche Informationen " --"anzeigen\n" -+msgstr " -e, --extend Weitere / zusätzliche Informationen anzeigen\n" - --#: ../netstat.c:1440 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" --msgstr "" --" -p, --programs PID/Programmnamen für Sockets anzeigen\n" -+msgstr " -p, --programs PID/Programmnamen für Sockets anzeigen\n" - --#: ../netstat.c:1441 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -1118,24 +1072,27 @@ - " -c, --continuous Anzeige laufend aktualisieren\n" - "\n" - --#: ../netstat.c:1442 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" - msgstr "" - " -l, --listening Empfangsbereite Serversockets auflisten\n" - --#: ../netstat.c:1443 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr "" - " -a, --all, --listening Alle Sockets anzeigen (normal: nur " - "verbundene)\n" - --#: ../netstat.c:1444 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr " -o, --timers Timer auflisten\n" - --#: ../netstat.c:1445 ../route.c:89 --#, fuzzy -+#: ../netstat.c:1515 ../route.c:89 -+#, fuzzy, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" -@@ -1143,7 +1100,8 @@ - " -F, --fib Forwarding Infomation Base anzeigen " - "(Standard)\n" - --#: ../netstat.c:1446 ../route.c:90 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" -@@ -1151,110 +1109,118 @@ - " -C, --cache Routencache statt FIB anzeigen\n" - "\n" - --#: ../netstat.c:1448 -+#: ../netstat.c:1518 -+#, c-format - msgid "" --" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - msgstr "" --" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - --#: ../netstat.c:1449 ../route.c:92 --#, c-format --msgid " =Use '-A ' or '--' Default: %s\n" -+#: ../netstat.c:1519 -+#, fuzzy, c-format -+msgid " =Use '-6|-4' or '-A ' or '--'; default: %s\n" - msgstr " =,,-A '' or ,,--'' benutzen. Standard: %s\n" - --#: ../netstat.c:1450 ../route.c:93 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" - msgstr " Liste möglicher Adressfamilien, die Routen unterstützen:\n" - --#: ../netstat.c:1663 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "Aktive Internetverbindungen " - --#: ../netstat.c:1673 -+#: ../netstat.c:1763 -+#, c-format - msgid "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - msgstr "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - --#: ../netstat.c:1675 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr " Benutzer Inode " - --#: ../netstat.c:1678 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr " Timer" - --#: ../netstat.c:1708 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" --msgstr "IPv4 Gruppenmitgliedschaften\n" -+msgstr "IPv4-Gruppenmitgliedschaften\n" - --#: ../netstat.c:1709 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "Schnittstelle RefZäh Grupp\n" - --#: ../rarp.c:43 -+#: ../rarp.c:44 - msgid "This kernel does not support RARP.\n" - msgstr "Dieser Kernel unterstützt kein RARP.\n" - --#: ../rarp.c:82 -+#: ../rarp.c:83 - #, c-format - msgid "no RARP entry for %s.\n" --msgstr "Kein RARP Eintrag für %s.\n" -+msgstr "Kein RARP-Eintrag für %s.\n" - --#: ../rarp.c:95 -+#: ../rarp.c:96 - #, c-format - msgid "%s: bad hardware address\n" - msgstr "%s: fehlerhafte Hardwareadresse\n" - --#: ../rarp.c:127 -+#: ../rarp.c:128 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" - msgstr "rarp: kann Datei %s:%s nicht öffnen.\n" - --#: ../rarp.c:139 -+#: ../rarp.c:140 - #, c-format - msgid "rarp: format error at %s:%u\n" - msgstr "rarp: Formatfehler bei %s:%u\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:144 ../rarp.c:289 - #, c-format - msgid "rarp: %s: unknown host\n" - msgstr "rarp: %s: Unbekannter Host\n" - --#: ../rarp.c:146 -+#: ../rarp.c:147 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" - msgstr "rarp: Kann Eintrag aus %s:%u nicht setzen.\n" - --#: ../rarp.c:175 -+#: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" --msgstr "" --"Benutzung: rarp -a Einträge im Cache listen.\n" -+msgstr "Benutzung: rarp -a Einträge im Cache listen.\n" - --#: ../rarp.c:176 -+#: ../rarp.c:177 -+#, c-format - msgid " rarp -d delete entry from cache.\n" --msgstr "" --" rarp -d Eintrag aus dem Cache löschen.\n" -+msgstr " rarp -d Eintrag aus dem Cache löschen.\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 -+#, c-format - msgid " rarp [] -s add entry to cache.\n" --msgstr "" --" rarp [] -s Eintrag zum Cache zufügen.\n" -+msgstr " rarp [] -s Eintrag zum Cache zufügen.\n" - --#: ../rarp.c:178 -+#: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" --msgstr "" --" rarp -f Einträge aus /etc/ethers " --"zufügen.\n" -+msgstr " rarp -f Einträge aus /etc/ethers zufügen.\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1262,24 +1228,26 @@ - " rarp -V Programmversion anzeigen.\n" - "\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "%s: Unerlaubte Mischung von Optionen.\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" --msgstr "rarp: %s: unknown hardware type.\n" -+msgstr "rarp: %s: unbekannter Hardwaretyp.\n" - --#: ../route.c:79 -+#: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [] List kernel routing tables\n" - msgstr "" - "Benutzung: route [-nNvee] [-FC] [] Kernelroutentabelle " - "anzeigen\n" - --#: ../route.c:80 -+#: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" -@@ -1287,14 +1255,15 @@ - " route [-v] [-FC] {add|del|flush} ... Routentabelle für AF ändern.\n" - "\n" - --#: ../route.c:82 -+#: ../route.c:83 -+#, c-format - msgid "" - " route {-h|--help} [] Detailed usage syntax for " - "specified AF.\n" --msgstr "" --" route {-h|--help} [] Genaue Syntax für AF anzeigen.\n" -+msgstr " route {-h|--help} [] Genaue Syntax für AF anzeigen.\n" - --#: ../route.c:83 -+#: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" -@@ -1304,590 +1273,891 @@ - "Ende.\n" - "\n" - -+#: ../route.c:92 -+#, fuzzy, c-format -+msgid " =Use '-A ' or '--'; default: %s\n" -+msgstr " =,,-A '' or ,,--'' benutzen. Standard: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "Benutzung: plipconfig [-a] [-i] [-v] Interface\n" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr " [nibble NN] [trigger NN]\n" - - #: ../plipconfig.c:68 --#, fuzzy -+#, c-format - msgid " plipconfig -V | --version\n" --msgstr " plipconfig -V\n" -+msgstr " plipconfig -V | --version\n" - - #: ../plipconfig.c:74 - #, c-format - msgid "%s\tnibble %lu trigger %lu\n" - msgstr "%s\tnibble %lu trigger %lu\n" - --#: ../iptunnel.c:79 -+#: ../iptunnel.c:85 -+#, c-format - msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" - msgstr "Benutzung: iptunnel { add | change | del | show } [ NAME ]\n" - --#: ../iptunnel.c:80 -+#: ../iptunnel.c:86 -+#, c-format - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" - msgstr " [ mode { ipip | gre | sit } ] [ remote ADR ] [ local ADR ]\n" - --#: ../iptunnel.c:81 -+#: ../iptunnel.c:87 -+#, c-format - msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - msgstr " [ [i|o]seq ] [ [i|o]key SCHLÜSSEL ] [ [i|o]csum ]\n" - --#: ../iptunnel.c:82 --#, fuzzy -+#: ../iptunnel.c:88 -+#, c-format - msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" --msgstr "" --" [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERÄt ]\n" --"\n" -+msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_GERÄt ]\n" - --#: ../iptunnel.c:83 -+#: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" - msgstr "" -+" iptunnel -V | --version\n" -+"\n" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "Wobei: NAME := ZEICHENKETTE\n" - --#: ../iptunnel.c:85 -+#: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr " ADR := { IP_ADRESSE | any }\n" - --#: ../iptunnel.c:86 -+#: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr " TOS := { NUMBER | inherit }\n" - --#: ../iptunnel.c:87 -+#: ../iptunnel.c:93 -+#, c-format - msgid " TTL := { 1..255 | inherit }\n" - msgstr " TTL := { 1..255 | inherit }\n" - --#: ../iptunnel.c:88 -+#: ../iptunnel.c:94 -+#, c-format - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" - msgstr " KEY := { DOTTED_QUAD | ZAHL }\n" - --#: ../iptunnel.c:326 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "Schlüssel sind mit ipip und sit nicht erlaubt.\n" - --#: ../iptunnel.c:346 -+#: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "Ein Broadcasttunnel ist nur mit einer Quelladresse möglich\n" - --#: ../iptunnel.c:361 -+#: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "ttl != 0 und noptmudisc sind inkompatibel\n" - --#: ../iptunnel.c:373 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "" - "Die Tunnelbetriebsart (ipip, fre oder sit) kann nicht festgestellt werden\n" - --#: ../iptunnel.c:411 -+#: ../iptunnel.c:417 - #, c-format - msgid "%s: %s/ip remote %s local %s " - msgstr "%s: %s/ip Gegenseite %s lokal %s " - --#: ../iptunnel.c:415 -+#: ../iptunnel.c:421 - msgid "unknown" - msgstr "Unbekannt" - --#: ../iptunnel.c:447 -+#: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr " Pakete außer der Reihenfolge fallenlassen.\n" - --#: ../iptunnel.c:449 -+#: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr " Prüfsumme im empfangenen Paket wird benötigt.\n" - --#: ../iptunnel.c:451 -+#: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr " Pakete in Reihenfolge ausgeben.\n" - --#: ../iptunnel.c:453 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr " Prüfsumme für ausgegebene Pakete berechnen.\n" - --#: ../iptunnel.c:481 -+#: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" --msgstr "Falsches Format von /proc/net/dev. Tut mir leid\n" -+msgstr "Falsches Format von /proc/net/dev. Tut mir leid.\n" - --#: ../iptunnel.c:494 -+#: ../iptunnel.c:500 - #, c-format - msgid "Failed to get type of [%s]\n" - msgstr "Kann den Typ von [%s] nicht holen\n" - --#: ../iptunnel.c:510 -+#: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "RX: Pakete Bytes Fehler CsumErrs OutOfSeq Mcasts\n" - --#: ../iptunnel.c:513 -+#: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "TX: Pakete Bytes Fehler DeadLoop NoRoute NoBufs\n" - --#: ../statistics.c:45 -+#: ../statistics.c:47 - msgid "ICMP input histogram:" --msgstr "ICMP Eingabehistogramm:" -+msgstr "ICMP-Eingabehistogramm:" - --#: ../statistics.c:46 -+#: ../statistics.c:48 - msgid "ICMP output histogram:" --msgstr "ICMP Ausgabehistogramm:" -+msgstr "ICMP-Ausgabehistogramm:" - --#: ../statistics.c:63 -+#: ../statistics.c:65 - #, c-format - msgid "Forwarding is %s" - msgstr "Weiterleitung ist %s" - --#: ../statistics.c:64 --#, c-format --msgid "Default TTL is %d" -+#: ../statistics.c:66 -+#, fuzzy, c-format -+msgid "Default TTL is %u" - msgstr "Standard-TTL ist %d" - --#: ../statistics.c:65 --#, c-format --msgid "%d total packets received" --msgstr "%d Pakete insgesamt empfangen" -+#: ../statistics.c:67 -+#, fuzzy, c-format -+msgid "%u total packets received" -+msgstr "%d Pakete insgesamt empfangen" - --#: ../statistics.c:66 --#, c-format --msgid "%d with invalid headers" --msgstr "%d with ungültigen Headern" -+#: ../statistics.c:68 -+#, fuzzy, c-format -+msgid "%u with invalid headers" -+msgstr "%d mit ungültigen Headern" - --#: ../statistics.c:67 --#, c-format --msgid "%d with invalid addresses" -+#: ../statistics.c:69 -+#, fuzzy, c-format -+msgid "%u with invalid addresses" - msgstr "%d mit ungültigen Adressen" - --#: ../statistics.c:68 --#, c-format --msgid "%d forwarded" -+#: ../statistics.c:70 -+#, fuzzy, c-format -+msgid "%u forwarded" - msgstr "%d weitergeleitet" - --#: ../statistics.c:69 --#, c-format --msgid "%d with unknown protocol" -+#: ../statistics.c:71 -+#, fuzzy, c-format -+msgid "%u with unknown protocol" - msgstr "%d mit unbekanntem Protokoll" - --#: ../statistics.c:70 --#, c-format --msgid "%d incoming packets discarded" -+#: ../statistics.c:72 -+#, fuzzy, c-format -+msgid "%u incoming packets discarded" - msgstr "%d eingehende Pakete weggeworfen" - --#: ../statistics.c:71 --#, c-format --msgid "%d incoming packets delivered" -+#: ../statistics.c:73 -+#, fuzzy, c-format -+msgid "%u incoming packets delivered" - msgstr "%d eingehende Pakete zugestellt" - --#: ../statistics.c:72 --#, c-format --msgid "%d requests sent out" -+#: ../statistics.c:74 -+#, fuzzy, c-format -+msgid "%u requests sent out" - msgstr "%d Anfragen ausgesandt" - - #. ? --#: ../statistics.c:73 --#, c-format --msgid "%d outgoing packets dropped" -+#: ../statistics.c:75 -+#, fuzzy, c-format -+msgid "%u outgoing packets dropped" - msgstr "%d ausgehende Pakete weggeworfen" - --#: ../statistics.c:74 --#, c-format --msgid "%d dropped because of missing route" -+#: ../statistics.c:76 -+#, fuzzy, c-format -+msgid "%u dropped because of missing route" - msgstr "%d weggeworfen wegen fehlender Route" - --#: ../statistics.c:75 --#, c-format --msgid "%d fragments dropped after timeout" -+#: ../statistics.c:77 -+#, fuzzy, c-format -+msgid "%u fragments dropped after timeout" - msgstr "%d Fragmente nach Timeout weggeworfen" - --#: ../statistics.c:76 --#, c-format --msgid "%d reassemblies required" -+#: ../statistics.c:78 -+#, fuzzy, c-format -+msgid "%u reassemblies required" - msgstr "%d Wiederzusammenstellungen nötig" - - #. ? --#: ../statistics.c:77 --#, c-format --msgid "%d packets reassembled ok" -+#: ../statistics.c:79 -+#, fuzzy, c-format -+msgid "%u packets reassembled ok" - msgstr "%d Fragmente korrekt empfangen" - --#: ../statistics.c:78 --#, c-format --msgid "%d packet reassembles failed" -+#: ../statistics.c:80 -+#, fuzzy, c-format -+msgid "%u packet reassembles failed" - msgstr "%d fehlgeschlagene Paketdefragmentierungen" - --#: ../statistics.c:79 --#, c-format --msgid "%d fragments received ok" -+#: ../statistics.c:81 -+#, fuzzy, c-format -+msgid "%u fragments received ok" - msgstr "%d Fragmente korrekt empfangen" - --#: ../statistics.c:80 --#, c-format --msgid "%d fragments failed" --msgstr "%d Fragmente Fehlgeschlagen" -+#: ../statistics.c:82 -+#, fuzzy, c-format -+msgid "%u fragments failed" -+msgstr "%d Fragmente fehlgeschlagen" - --#: ../statistics.c:81 --#, c-format --msgid "%d fragments created" -+#: ../statistics.c:83 -+#, fuzzy, c-format -+msgid "%u fragments created" - msgstr "%d Fragmente erzeugt" - --#: ../statistics.c:86 --#, c-format --msgid "%d ICMP messages received" --msgstr "%d ICMP Nachrichten empfangen" -+#: ../statistics.c:88 -+#, fuzzy, c-format -+msgid "%u ICMP messages received" -+msgstr "%d ICMP-Nachrichten empfangen" - --#: ../statistics.c:87 --#, c-format --msgid "%d input ICMP message failed." --msgstr "%d eingegangene ICMP Nachrichten fehlgeschlagen" -+#: ../statistics.c:89 -+#, fuzzy, c-format -+msgid "%u input ICMP message failed." -+msgstr "%d eingegangene ICMP-Nachrichten fehlgeschlagen" - --#: ../statistics.c:88 ../statistics.c:101 --#, c-format --msgid "destination unreachable: %d" -+#: ../statistics.c:90 ../statistics.c:103 -+#, fuzzy, c-format -+msgid "destination unreachable: %u" - msgstr "Ziel unerreichbar: %d" - --#: ../statistics.c:89 --#, c-format --msgid "timeout in transit: %d" -+#: ../statistics.c:91 -+#, fuzzy, c-format -+msgid "timeout in transit: %u" - msgstr "Timeout beim Transit: %d" - --#: ../statistics.c:90 ../statistics.c:103 --#, c-format --msgid "wrong parameters: %d" -+#: ../statistics.c:92 ../statistics.c:105 -+#, fuzzy, c-format -+msgid "wrong parameters: %u" - msgstr "Fehlerhafte Parameter: %d" - - #. ? --#: ../statistics.c:91 --#, c-format --msgid "source quenchs: %d" -+#: ../statistics.c:93 -+#, fuzzy, c-format -+msgid "source quenches: %u" - msgstr "Source Quenchs: %d" - --#: ../statistics.c:92 --#, c-format --msgid "redirects: %d" -+#: ../statistics.c:94 -+#, fuzzy, c-format -+msgid "redirects: %u" - msgstr "Umleitungen: %d" - --#: ../statistics.c:93 --#, c-format --msgid "echo requests: %d" --msgstr "Echo Requests: %d" -+#: ../statistics.c:95 -+#, fuzzy, c-format -+msgid "echo requests: %u" -+msgstr "Echo Anfragen: %d" - --#: ../statistics.c:94 ../statistics.c:107 --#, c-format --msgid "echo replies: %d" -+#: ../statistics.c:96 ../statistics.c:109 -+#, fuzzy, c-format -+msgid "echo replies: %u" - msgstr "Echo Antworten: %d" - --#: ../statistics.c:95 --#, c-format --msgid "timestamp request: %d" -+#: ../statistics.c:97 -+#, fuzzy, c-format -+msgid "timestamp request: %u" - msgstr "Zeitstempelanfragen: %d" - --#: ../statistics.c:96 --#, c-format --msgid "timestamp reply: %d" -+#: ../statistics.c:98 -+#, fuzzy, c-format -+msgid "timestamp reply: %u" - msgstr "Zeitstempelantworten: %d" - --#: ../statistics.c:97 --#, c-format --msgid "address mask request: %d" -+#: ../statistics.c:99 -+#, fuzzy, c-format -+msgid "address mask request: %u" - msgstr "Adressmaskenanfragen: %d" - - #. ? --#: ../statistics.c:98 --msgid "address mask replies" --msgstr "Adressmaskenantworten" -+#: ../statistics.c:100 ../statistics.c:113 -+#, fuzzy, c-format -+msgid "address mask replies: %u" -+msgstr "Adressmaskenantworten: %d" - - #. ? --#: ../statistics.c:99 --#, c-format --msgid "%d ICMP messages sent" -+#: ../statistics.c:101 -+#, fuzzy, c-format -+msgid "%u ICMP messages sent" - msgstr "%d ICMP-Nachrichten geschickt" - --#: ../statistics.c:100 --#, c-format --msgid "%d ICMP messages failed" --msgstr "%d ICMP Nachrichten fehlgeschlagen" -- - #: ../statistics.c:102 --#, c-format --msgid "time exceeded: %d" -+#, fuzzy, c-format -+msgid "%u ICMP messages failed" -+msgstr "%d ICMP-Nachrichten fehlgeschlagen" -+ -+#: ../statistics.c:104 -+#, fuzzy, c-format -+msgid "time exceeded: %u" - msgstr "Zeitüberschreitung: %d" - - #. ? --#: ../statistics.c:104 --#, c-format --msgid "source quench: %d" -+#: ../statistics.c:106 -+#, fuzzy, c-format -+msgid "source quench: %u" - msgstr "Source Quench: %d" - --#: ../statistics.c:105 --#, c-format --msgid "redirect: %d" -+#: ../statistics.c:107 -+#, fuzzy, c-format -+msgid "redirect: %u" - msgstr "Umleitungen: %d" - --#: ../statistics.c:106 --#, c-format --msgid "echo request: %d" -+#: ../statistics.c:108 -+#, fuzzy, c-format -+msgid "echo request: %u" - msgstr "Echo Anfragen: %d" - --#: ../statistics.c:108 --#, c-format --msgid "timestamp requests: %d" -+#: ../statistics.c:110 -+#, fuzzy, c-format -+msgid "timestamp requests: %u" - msgstr "Zeitstempel Anfragen: %d" - --#: ../statistics.c:109 --#, c-format --msgid "timestamp replies: %d" -+#: ../statistics.c:111 -+#, fuzzy, c-format -+msgid "timestamp replies: %u" - msgstr "Zeitstempel Antworten: %d" - --#: ../statistics.c:110 --#, c-format --msgid "address mask requests: %d" -+#: ../statistics.c:112 -+#, fuzzy, c-format -+msgid "address mask requests: %u" - msgstr "Adressmaskenanfragen: %d" - --#: ../statistics.c:111 -+#: ../statistics.c:118 - #, c-format --msgid "address mask replies: %d" --msgstr "Adressmaskenantworten: %d" -+msgid "RTO algorithm is %s" -+msgstr "RTO-Algorithmus ist %s" -+ -+#: ../statistics.c:122 -+#, fuzzy, c-format -+msgid "%u active connections openings" -+msgstr "%d Verbindungen aktiv geöffnet" -+ -+#: ../statistics.c:123 -+#, fuzzy, c-format -+msgid "%u passive connection openings" -+msgstr "%d Verbindungen passiv geöffnet" -+ -+#: ../statistics.c:124 -+#, fuzzy, c-format -+msgid "%u failed connection attempts" -+msgstr "%d fehlerhafte Verbindungsversuche" -+ -+#: ../statistics.c:125 -+#, fuzzy, c-format -+msgid "%u connection resets received" -+msgstr "%d Verbindungsrücksetzungen empfangen" -+ -+#: ../statistics.c:126 -+#, fuzzy, c-format -+msgid "%u connections established" -+msgstr "%d Verbindungen aufgebaut" -+ -+#: ../statistics.c:127 -+#, fuzzy, c-format -+msgid "%u segments received" -+msgstr "%d Segmente empfangen" -+ -+#: ../statistics.c:128 -+#, fuzzy, c-format -+msgid "%u segments send out" -+msgstr "%d Segmente abgeschickt" -+ -+#: ../statistics.c:129 -+#, fuzzy, c-format -+msgid "%u segments retransmited" -+msgstr "%d Segmente erneut geschickt" -+ -+#: ../statistics.c:130 -+#, fuzzy, c-format -+msgid "%u bad segments received." -+msgstr "%d fehlerhafte Segmente empfangen." -+ -+#: ../statistics.c:131 -+#, fuzzy, c-format -+msgid "%u resets sent" -+msgstr "%d Rücksetzungen geschickt" -+ -+#: ../statistics.c:136 -+#, fuzzy, c-format -+msgid "%u packets received" -+msgstr "%d Pakete empfangen" -+ -+#: ../statistics.c:137 -+#, fuzzy, c-format -+msgid "%u packets to unknown port received." -+msgstr "%d Pakete für unbekannte Ports empfangen." -+ -+#: ../statistics.c:138 -+#, fuzzy, c-format -+msgid "%u packet receive errors" -+msgstr "%d Paketempfangsfehler" -+ -+#: ../statistics.c:139 -+#, fuzzy, c-format -+msgid "%u packets sent" -+msgstr "%d Pakete geschickt" -+ -+#: ../statistics.c:144 -+#, fuzzy, c-format -+msgid "%u SYN cookies sent" -+msgstr "%d SYN-Cookies verschickt" -+ -+#: ../statistics.c:145 -+#, fuzzy, c-format -+msgid "%u SYN cookies received" -+msgstr "%d SYN-Cookies empfangen" - --#: ../statistics.c:116 -+#: ../statistics.c:146 -+#, fuzzy, c-format -+msgid "%u invalid SYN cookies received" -+msgstr "%d ungültige SYN-Cookies empfangen" -+ -+#: ../statistics.c:148 -+#, fuzzy, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" -+msgstr "%d Rücksetzungen für embrionische SYN_RECV-Sockets" -+ -+#: ../statistics.c:150 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" -+msgstr "%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange weggeworfen" -+ -+#. obsolete: 2.2.0 doesn't do that anymore -+#: ../statistics.c:153 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue" -+msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen" -+ -+#: ../statistics.c:154 -+#, fuzzy, c-format -+msgid "" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" -+msgstr "%d Pakete aus der ungeordneten Warteschlange wegen Pufferüberlauf weggeworfen" -+ -+#: ../statistics.c:156 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" -+msgstr "%d ICMP-Pakete weggeworfen die außerhalb des Fensters waren" -+ -+#: ../statistics.c:158 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because socket was locked" -+msgstr "%d ICMP-Pakete verworfen weil Socket gesperrt war" -+ -+#: ../statistics.c:160 - #, c-format --msgid "RTO algorithm is %s" --msgstr "RTO Algorithmus is %s" -+msgid "%u TCP sockets finished time wait in fast timer" -+msgstr "" - --#: ../statistics.c:120 -+#: ../statistics.c:161 - #, c-format --msgid "%d active connections openings" --msgstr "%d Verbindungen aktiv geöffnet" -+msgid "%u time wait sockets recycled by time stamp" -+msgstr "" - --#: ../statistics.c:121 -+#: ../statistics.c:162 - #, c-format --msgid "%d passive connection openings" --msgstr "%d Verbindungen passiv geöffnet" -+msgid "%u TCP sockets finished time wait in slow timer" -+msgstr "" - --#: ../statistics.c:122 -+#: ../statistics.c:163 - #, c-format --msgid "%d failed connection attempts" --msgstr "%d fehlerhafte Verbindungsversuche" -+msgid "%u passive connections rejected because of time stamp" -+msgstr "" - --#: ../statistics.c:123 -+#: ../statistics.c:165 - #, c-format --msgid "%d connection resets received" --msgstr "%d Verbindungsrücksetzungen empfangen" -+msgid "%u active connections rejected because of time stamp" -+msgstr "" - --#: ../statistics.c:124 -+#: ../statistics.c:167 - #, c-format --msgid "%d connections established" --msgstr "%d Verbindungen aufgebaut" -+msgid "%u packets rejects in established connections because of timestamp" -+msgstr "" - --#: ../statistics.c:125 -+#: ../statistics.c:169 -+#, fuzzy, c-format -+msgid "%u delayed acks sent" -+msgstr "%d Pakete geschickt" -+ -+#: ../statistics.c:170 - #, c-format --msgid "%d segments received" --msgstr "%d Segmente empfangen" -+msgid "%u delayed acks further delayed because of locked socket" -+msgstr "" - --#: ../statistics.c:126 -+#: ../statistics.c:172 - #, c-format --msgid "%d segments send out" --msgstr "%d Segmente abgeschickt" -+msgid "Quick ack mode was activated %u times" -+msgstr "" - --#: ../statistics.c:127 -+#: ../statistics.c:173 - #, c-format --msgid "%d segments retransmited" --msgstr "%d Segmente erneut geschickt" -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "" - --#: ../statistics.c:128 -+#: ../statistics.c:175 - #, c-format --msgid "%d bad segments received." --msgstr "%d fehlerhafte Segmente empfangen." -+msgid "%u SYNs to LISTEN sockets ignored" -+msgstr "" - --#: ../statistics.c:129 -+#: ../statistics.c:176 - #, c-format --msgid "%d resets sent" --msgstr "%d Rücksetzungen geschickt" -+msgid "%u packets directly queued to recvmsg prequeue." -+msgstr "" - --#: ../statistics.c:134 -+#: ../statistics.c:178 - #, c-format --msgid "%d packets received" -+msgid "%u of bytes directly received from backlog" -+msgstr "" -+ -+#: ../statistics.c:180 -+#, c-format -+msgid "%u of bytes directly received from prequeue" -+msgstr "" -+ -+#: ../statistics.c:182 -+#, fuzzy, c-format -+msgid "%u packets dropped from prequeue" -+msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen" -+ -+#: ../statistics.c:183 -+#, fuzzy, c-format -+msgid "%u packet headers predicted" - msgstr "%d Pakete empfangen" - --#: ../statistics.c:135 -+#: ../statistics.c:184 - #, c-format --msgid "%d packets to unknown port received." -+msgid "%u packets header predicted and directly queued to user" -+msgstr "" -+ -+#: ../statistics.c:186 -+#, c-format -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "" -+ -+#: ../statistics.c:188 -+#, fuzzy, c-format -+msgid "%u acknowledgments not containing data received" - msgstr "%d Pakete für unbekannte Ports empfangen." - --#: ../statistics.c:136 -+#: ../statistics.c:189 - #, c-format --msgid "%d packet receive errors" --msgstr "%d Paketempfangsfehler" -+msgid "%u predicted acknowledgments" -+msgstr "" - --#: ../statistics.c:137 -+#: ../statistics.c:190 - #, c-format --msgid "%d packets sent" --msgstr "%d Pakete geschickt" -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" - --#: ../statistics.c:142 -+#: ../statistics.c:191 - #, c-format --msgid "%d SYN cookies sent" --msgstr "%d SYN-Cookies verschickt" -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" - --#: ../statistics.c:143 -+#: ../statistics.c:192 -+#, fuzzy, c-format -+msgid "%u bad SACKs received" -+msgstr "%d fehlerhafte Segmente empfangen." -+ -+#: ../statistics.c:193 - #, c-format --msgid "%d SYN cookies received" --msgstr "%d SYN-Cookies empfangen" -+msgid "Detected reordering %u times using FACK" -+msgstr "" - --#: ../statistics.c:144 -+#: ../statistics.c:194 - #, c-format --msgid "%d invalid SYN cookies received" --msgstr "%d ungültige SYN-Cookies empfangen" -+msgid "Detected reordering %u times using SACK" -+msgstr "" - --#: ../statistics.c:146 -+#: ../statistics.c:195 - #, c-format --msgid "%d resets received for embryonic SYN_RECV sockets" --msgstr "%d Rücksetzungen fuer embrionische SYN_RECV Sockets" -+msgid "Detected reordering %u times using time stamp" -+msgstr "" - --#: ../statistics.c:148 -+#: ../statistics.c:196 - #, c-format --msgid "%d packets pruned from receive queue because of socket buffer overrun" -+msgid "Detected reordering %u times using reno fast retransmit" - msgstr "" --"%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange " --"weggeworfen" - --#. obsolete: 2.2.0 doesn't do that anymore --#: ../statistics.c:151 -+#: ../statistics.c:197 - #, c-format --msgid "%d packets pruned from out-of-order queue" --msgstr "%d Pakete aus der ungeordneten Warteschlange weggeworfen" -+msgid "%u congestion windows fully recovered" -+msgstr "" - --#: ../statistics.c:152 -+#: ../statistics.c:198 - #, c-format --msgid "" --"%d packets dropped from out-of-order queue because of socket buffer overrun" -+msgid "%u congestion windows partially recovered using Hoe heuristic" - msgstr "" --"%d Pakete aus der ungeordneten Warteschlange wegen Pufferüberlauf weggeworfen" - --#: ../statistics.c:154 -+#: ../statistics.c:199 - #, c-format --msgid "%d ICMP packets dropped because they were out-of-window" --msgstr "%d ICMP Pakete weggeworfen die auserhalb des Fensters waren" -+msgid "%u congestion window recovered using DSACK" -+msgstr "" - --#: ../statistics.c:156 -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, fuzzy, c-format -+msgid "%u retransmits lost" -+msgstr "%d Rücksetzungen geschickt" -+ -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, fuzzy, c-format -+msgid "%u fast retransmits" -+msgstr "%d Segmente erneut geschickt" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, fuzzy, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "%d Segmente erneut geschickt" -+ -+#: ../statistics.c:210 -+#, fuzzy, c-format -+msgid "%u sack retransmits failed" -+msgstr "%d fehlgeschlagene Paketdefragmentierungen" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, fuzzy, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "%d Pakete wegen Socketpufferüberlauf aus der Empfangswarteschlange weggeworfen" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, fuzzy, c-format -+msgid "%u DSACKs received" -+msgstr "%d Pakete empfangen" -+ -+#: ../statistics.c:216 -+#, fuzzy, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "%d Pakete insgesamt empfangen" -+ -+#: ../statistics.c:217 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "%d Verbindungsrücksetzungen empfangen" -+ -+#: ../statistics.c:218 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "%d Verbindungsrücksetzungen empfangen" -+ -+#: ../statistics.c:219 -+#, fuzzy, c-format -+msgid "%u connections reset due to early user close" -+msgstr "%d Verbindungsrücksetzungen empfangen" -+ -+#: ../statistics.c:220 - #, c-format --msgid "%d ICMP packets dropped because socket was locked" --msgstr "%d ICMP Pakete verworfen weil Socket gesperrt war" -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, fuzzy, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "%d Verbindungsrücksetzungen empfangen" - - #: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "aktiviert" - --#: ../statistics.c:222 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "deaktiviert" - --#: ../statistics.c:272 --#, c-format --msgid "unknown title %s\n" --msgstr "Unbekannter Titel %s\n" -- --#: ../statistics.c:298 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "Fehler beim Parsen von /proc/net/snmp" - --#: ../statistics.c:311 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "Kann /proc/net/snmp nicht öffnen" - - #: ../lib/activate.c:69 - #, c-format - msgid "Hardware type `%s' not supported.\n" --msgstr "Hardwaretyp ,,%s'' nicht unterstützt.\n" -+msgstr "Hardwaretyp »%s« nicht unterstützt.\n" - - #: ../lib/activate.c:73 - #, c-format - msgid "Cannot change line discipline to `%s'.\n" --msgstr "Kann line discipline nicht auf ``%s'' setzen.\n" -+msgstr "Kann line discipline nicht auf »%s« setzen.\n" - --#: ../lib/af.c:145 ../lib/hw.c:148 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "UNSPEC" - --#: ../lib/af.c:147 -+#: ../lib/af.c:155 - msgid "UNIX Domain" --msgstr "UNIX Domain" -+msgstr "UNIX-Domain" - --#: ../lib/af.c:150 -+#: ../lib/af.c:158 - msgid "DARPA Internet" --msgstr "DARPA Internet" -+msgstr "DARPA-Internet" - --#: ../lib/af.c:153 -+#: ../lib/af.c:161 - msgid "IPv6" - msgstr "IPv6" - --#: ../lib/af.c:156 ../lib/hw.c:169 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "AMPR AX.25" - --#: ../lib/af.c:159 ../lib/hw.c:175 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "AMPR NET/ROM" - --#: ../lib/af.c:162 -+#: ../lib/af.c:170 - msgid "Novell IPX" - msgstr "" - --#: ../lib/af.c:165 -+#: ../lib/af.c:173 - msgid "Appletalk DDP" - msgstr "Appletalk DDP" - --#: ../lib/af.c:168 ../lib/hw.c:207 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "Econet" - --#: ../lib/af.c:171 ../lib/hw.c:172 -+#: ../lib/af.c:179 -+msgid "CCITT X.25" -+msgstr "" -+ -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "AMPR ROSE" - --#: ../lib/af.c:174 ../lib/hw.c:160 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "Ash" - --#: ../lib/af.c:232 -+#: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "Bitte nur eine Adressfamilie angeben.\n" - --#: ../lib/af.c:293 -+#: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "Zu viele Adressfamilien angegeben.\n" - --#: ../lib/af.c:304 -+#: ../lib/af.c:315 - #, c-format - msgid "Unknown address family `%s'.\n" --msgstr "Unbekannte Adressfamilie `%s'.\n" -- --#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 --#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259 --#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71 --#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76 --msgid "[NONE SET]" --msgstr "[NICHT GESETZT]" -+msgstr "Unbekannte Adressfamilie »%s«.\n" - --#: ../lib/arcnet.c:81 ../lib/arcnet.c:96 -+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 - #, c-format - msgid "in_arcnet(%s): invalid arcnet address!\n" - msgstr "in_arcnet(%s): Ungültige ARCnet-Adresse!\n" - --#: ../lib/arcnet.c:108 -+#: ../lib/arcnet.c:97 - #, c-format - msgid "in_arcnet(%s): trailing : ignored!\n" - msgstr "in_arcnet(%s): angehängt : ignoriert!\n" - --#: ../lib/arcnet.c:120 -+#: ../lib/arcnet.c:109 - #, c-format - msgid "in_arcnet(%s): trailing junk!\n" - msgstr "in_arcnet(%s): Nachfolgender Müll!\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" --msgstr "Fehlerhafte Ash Adresse" -+msgstr "Fehlerhafte Ash-Adresse" -+ -+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 -+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 -+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 -+msgid "[NONE SET]" -+msgstr "[NICHT GESETZT]" - - #: ../lib/ax25.c:97 ../lib/netrom.c:100 - msgid "Invalid callsign" -@@ -1898,22 +2168,21 @@ - msgstr "Rufzeichen zu lang" - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "AX.25 ist auf diesem System nicht konfiguriert.\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "Kernel AX.25 Routentabelle\n" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "Ziel SStelle Benutzer\n" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "DDP-Routentabelle wird noch nicht unterstützt.\n" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1929,153 +2198,168 @@ - msgid "in_ether(%s): trailing junk!\n" - msgstr "in_ether(%s): Nachfolgender Müll!\n" - --#: ../lib/fddi.c:95 ../lib/fddi.c:110 -+#: ../lib/fddi.c:84 ../lib/fddi.c:99 - #, c-format - msgid "in_fddi(%s): invalid fddi address!\n" - msgstr "in_fddi(%s): Ungültige FDDI-Adresse!\n" - --#: ../lib/fddi.c:122 -+#: ../lib/fddi.c:111 - #, c-format - msgid "in_fddi(%s): trailing : ignored!\n" - msgstr "in_fddi(%s): nachfolgend : ignoriert!\n" - --#: ../lib/fddi.c:134 -+#: ../lib/fddi.c:123 - #, c-format - msgid "in_fddi(%s): trailing junk!\n" - msgstr "in_fddi(%s): Nachfolgender Müll!\n" - --#: ../lib/getroute.c:97 ../lib/setroute.c:76 -+#: ../lib/getroute.c:101 ../lib/setroute.c:80 - #, c-format - msgid "Address family `%s' not supported.\n" - msgstr "Adressfamilie `%s' wird nicht unterstützt.\n" - --#: ../lib/getroute.c:103 ../lib/setroute.c:80 -+#: ../lib/getroute.c:107 ../lib/setroute.c:84 - #, c-format - msgid "No routing for address family `%s'.\n" - msgstr "Kein Routen für Adressfamilie `%s'.\n" - --#: ../lib/hippi.c:96 ../lib/hippi.c:111 -+#: ../lib/hippi.c:84 ../lib/hippi.c:99 - #, c-format - msgid "in_hippi(%s): invalid hippi address!\n" - msgstr "in_hippi(%s): Ungültige HIPPI-Adresse!\n" - --#: ../lib/hippi.c:123 -+#: ../lib/hippi.c:111 - #, c-format - msgid "in_hippi(%s): trailing : ignored!\n" - msgstr "in_hippi(%s): nachfolgend : ignoriert!\n" - --#: ../lib/hippi.c:134 -+#: ../lib/hippi.c:122 - #, c-format - msgid "in_hippi(%s): trailing junk!\n" - msgstr "in_hippi(%s): Nachfolgender Müll!\n" - --#: ../lib/hw.c:147 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "Lokale Schleife" - --#: ../lib/hw.c:150 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "Serielle IP" - --#: ../lib/hw.c:151 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "Serielle VJ-IP" - --#: ../lib/hw.c:152 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "6-bit Serielle IP" - --#: ../lib/hw.c:153 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "VJ 6-bit Serielle IP" - --#: ../lib/hw.c:154 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "Adaptive Serielle IP" - --#: ../lib/hw.c:157 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:163 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "Fiber Distributed Data Interface" - --#: ../lib/hw.c:166 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:178 -+#: ../lib/hw.c:191 -+msgid "generic X.25" -+msgstr "" -+ -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "IPIP Tunnel" - --#: ../lib/hw.c:181 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" --msgstr "Punkt-zu-Punkt Verbindung" -+msgstr "Punkt-zu-Punkt-Verbindung" - --#: ../lib/hw.c:184 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "(Cisco)-HDLC" - --#: ../lib/hw.c:185 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:188 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:191 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "Frame Relay Access Device" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "IPv6-nach-IPv4" - --#: ../lib/hw.c:198 --#, fuzzy -+#: ../lib/hw.c:214 - msgid "IrLAP" --msgstr "LAPB" -+msgstr "IrLAP" - --#: ../lib/hw.c:201 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:219 - msgid "16/4 Mbps Token Ring (New)" - msgstr "" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" - msgstr "rresolve: nicht unterstützte Adressfamilie %d !\n" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6.c:131 -+#, fuzzy -+msgid "[UNKNOWN]" -+msgstr "UNBEKANNT" -+ -+#: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "INET6 (IPv6) ist auf diesem System nicht konfiguriert.\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" --msgstr "Kernel IPv6 Routentabelle\n" -+msgstr "Kernel-IPv6-Routentabelle\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" --msgstr "" --"Ziel Nächster Hop " --" Flags Metric Ref Benutzer Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" -+msgstr "Ziel Nächster Hop Flags Metric Ref Benutzer Iface\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Kernel IPv6 Nachbarcache\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" -@@ -2083,39 +2367,45 @@ - "Nachbar HW-Adresse Iface Flags " - "Ref Zustand\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:157 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" --msgstr "" --"Nachbar HW-Adresse Iface Flags " --"Ref Zustand Stale(sec) Löschen(sec)\n" -+msgstr "Nachbar HW-Adresse Iface Flags Ref Zustand Stale(sec) Löschen(sec)\n" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "Benutzung: inet6_route [-vF] del Ziel\n" - - #: ../lib/inet6_sr.c:47 -+#, c-format - msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" - msgstr " inet6_route [-vF] add Ziel [gw Gateway] [metric M] [[dev] If]\n" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr " inet6_route [-FC] flush NICHT unterstützt\n" - --#: ../lib/inet6_sr.c:182 -+#: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" --msgstr ",,Flush'' für IPv6 Routentabelle nicht unterstützt\n" -+msgstr "»Flush« für IPv6-Routentabelle nicht unterstützt\n" - - #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format - msgid "INET (IPv4) not configured in this system.\n" - msgstr "INET (IPv4) ist auf diesem System nicht konfiguriert.\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" --msgstr "Kernel IP Routentabelle\n" -+msgstr "Kernel-IP-Routentabelle\n" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" -@@ -2124,6 +2414,7 @@ - "Iface\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" -@@ -2132,6 +2423,7 @@ - "Iface\n" - - #: ../lib/inet_gr.c:62 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface MSS Window irtt\n" -@@ -2140,10 +2432,12 @@ - "Iface MSS Fenster irtt\n" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\n" --msgstr "Kernel IP Routencache\n" -+msgstr "Kernel-IP-Routencache\n" - - #: ../lib/inet_gr.c:258 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface\n" -@@ -2152,6 +2446,7 @@ - "Iface\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" -@@ -2160,6 +2455,7 @@ - "Iface\n" - - #: ../lib/inet_gr.c:266 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt HH Arp\n" -@@ -2168,6 +2464,7 @@ - "Iface MSS Fenster irtt HH Arp\n" - - #: ../lib/inet_gr.c:290 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" -@@ -2175,37 +2472,39 @@ - "Quelle Ziel Gateway Flags Metrik Ref Ben " - "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" - --#: ../lib/inet_sr.c:50 -+#: ../lib/inet_sr.c:51 -+#, c-format - msgid "" - "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " - "[[dev] If]\n" --msgstr "" --"Benutzung: inet_route [-vF] del {-host|-net} Ziel[/prefix] [gw Gw] [metric " --"M] [[dev] If]\n" -+msgstr "Benutzung: inet_route [-vF] del {-host|-net} Ziel[/Präfix] [gw Gw] [metric M] [[dev] If]\n" - --#: ../lib/inet_sr.c:51 -+#: ../lib/inet_sr.c:52 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" --msgstr "" --" inet_route [-vF] add {-host|-net} Ziel[/Prefix] [gw Gw] [metric M]\n" -+msgstr " inet_route [-vF] add {-host|-net} Ziel[/Präfix] [gw Gw] [metric M]\n" - --#: ../lib/inet_sr.c:52 -+#: ../lib/inet_sr.c:53 -+#, c-format - msgid "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - msgstr "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - --#: ../lib/inet_sr.c:53 -+#: ../lib/inet_sr.c:54 -+#, c-format - msgid " [mod] [dyn] [reinstate] [[dev] If]\n" - msgstr " [mod] [dyn] [reinstate] [[dev] If]\n" - --#: ../lib/inet_sr.c:54 -+#: ../lib/inet_sr.c:55 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" --msgstr "" --" inet_route [-vF] add {-host|-net} Ziel[/Präfix] [metric M] reject\n" -+msgstr " inet_route [-vF] add {-host|-net} Ziel[/Präfix] [metric M] reject\n" - --#: ../lib/inet_sr.c:55 -+#: ../lib/inet_sr.c:56 -+#, c-format - msgid " inet_route [-FC] flush NOT supported\n" - msgstr " inet_route [-FC] flush NICHT unterstützt\n" - -@@ -2215,15 +2514,17 @@ - msgstr "route: %s: Netzadresse als Gateway ungültig!\n" - - #: ../lib/inet_sr.c:174 --#, fuzzy -+#, fuzzy, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "route: Ungültige MSS.\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "route: Ungültige Fenstergröße.\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "route: Ungültige Start-RTT.\n" - -@@ -2238,126 +2539,408 @@ - msgstr "Route: Fehlerhafte Netzmaske %s\n" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "route: Netzmaske passt nicht zur Routenadresse\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" --msgstr ",,Flush'' der Inet-Routentabelle nicht unterstützt\n" -+msgstr "»Flush« der Inet-Routentabelle nicht unterstützt\n" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" --msgstr "Änderung des ,,Inet'' Routencaches nicht unterstützt\n" -+msgstr "Änderung des »Inet« Routencaches nicht unterstützt\n" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "IPX ist auf diesem System nicht konfiguriert.\n" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" --msgstr "Kernel IPX Routentabelle\n" -+msgstr "Kernel-IPX-Routentabelle\n" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" --msgstr "Ziel Router Netz Router Knoten\n" -+msgstr "Ziel Router-Netz Router-Knoten\n" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" --msgstr "IPX: dies muß noch geschrieben werden\n" -+msgstr "IPX: dies muss noch geschrieben werden\n" - --#: ../lib/masq_info.c:197 -+#: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "IP-Maskierungseinträge\n" - --#: ../lib/masq_info.c:200 -+#: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "Prot expire Quelle Ziel Ports\n" - --#: ../lib/masq_info.c:203 -+#: ../lib/masq_info.c:204 -+#, c-format - msgid "" --"prot expire initseq delta prevd source destination " --" ports\n" -+"prot expire initseq delta prevd source " -+"destination ports\n" - msgstr "" --"Prot Ablauf Anf-Seq Delta Prevd Quelle Ziel " --" Ports\n" -+"Prot Ablauf Anf-Seq Delta Prevd Quelle " -+"Ziel Ports\n" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "NET/ROM ist auf diesem System nicht verfügbar.\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" --msgstr "Kernel NET/ROM Routentabelle\n" -+msgstr "Kernel-NET/ROM-Routentabelle\n" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "Ziel Mnemonic Qualität Nachbar Iface\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" --msgstr "NET/ROM Benutzung\n" -+msgstr "NET/ROM-Benutzung\n" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" --msgstr "NET/ROM: Dies muß noch geschrieben werden\n" -+msgstr "NET/ROM: Dies muss noch geschrieben werden\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "Mit diesem Programm kann PPP nicht gestartet werden.\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" --msgstr "Bitte benutzen sie pppd.\n" -+msgstr "Bitte benutzen Sie pppd.\n" - - #: ../lib/rose.c:87 - msgid "Node address must be ten digits" --msgstr "Knotenadresse muß zehn Ziffern haben" -+msgstr "Knotenadresse muss zehn Ziffern haben" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "ROSE ist auf diesem System nicht verfügbar.\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" --msgstr "ROSE Kernel Routentabelle\n" -+msgstr "ROSE-Kernel-Routentabelle\n" - --#: ../lib/tr.c:70 ../lib/tr.c:85 -+#: ../lib/tr.c:86 ../lib/tr.c:101 - #, c-format - msgid "in_tr(%s): invalid token ring address!\n" - msgstr "in_tr(%s): ungültige Tokenringadresse!\n" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "in_tr(%s): nachfolgend : ignoriert!\n" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "in_tr(%s): nachfolgender Müll!\n" - --#: ../lib/interface.c:124 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" --msgstr "Warnung: Keine INET Sockets verfügbar: %s\n" -+msgstr "Warnung: Keine INET-Sockets verfügbar: %s\n" - --#: ../lib/interface.c:270 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "" - - #. Give better error message for this case. --#: ../lib/interface.c:504 -+#: ../lib/interface.c:571 - msgid "Device not found" - msgstr "Gerät nicht gefunden" - --#: ../lib/interface.c:508 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" - msgstr "%s: Fehler beim Auslesen der Schnittstelleninformation: %s\n" - --#: ../lib/sockets.c:59 -+#: ../lib/interface.c:608 -+msgid " - no statistics available -" -+msgstr " - keine Statistiken verfügbar -" -+ -+#: ../lib/interface.c:612 -+#, c-format -+msgid "[NO FLAGS]" -+msgstr "[KEINE FLAGS]" -+ -+#: ../lib/interface.c:688 -+#, c-format -+msgid "%-9.9s Link encap:%s " -+msgstr "%-9.9s Protokoll:%s " -+ -+#: ../lib/interface.c:693 -+#, c-format -+msgid "HWaddr %s " -+msgstr "Hardware Adresse %s " -+ -+#: ../lib/interface.c:696 -+#, c-format -+msgid "Media:%s" -+msgstr "Medium:%s" -+ -+#: ../lib/interface.c:698 -+#, c-format -+msgid "(auto)" -+msgstr "(auto)" -+ -+#: ../lib/interface.c:705 -+#, c-format -+msgid " %s addr:%s " -+msgstr " %s Adresse:%s " -+ -+#: ../lib/interface.c:708 -+#, c-format -+msgid " P-t-P:%s " -+msgstr " P-z-P:%s " -+ -+#: ../lib/interface.c:711 -+#, c-format -+msgid " Bcast:%s " -+msgstr " Bcast:%s " -+ -+#: ../lib/interface.c:713 -+#, c-format -+msgid " Mask:%s\n" -+msgstr " Maske:%s\n" -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid " inet6 addr: %s/%d" -+msgstr " inet6-Adresse: %s/%d" -+ -+#: ../lib/interface.c:732 -+#, c-format -+msgid " Scope:" -+msgstr " Gültigkeitsbereich:" -+ -+#: ../lib/interface.c:735 -+#, c-format -+msgid "Global" -+msgstr "Global" -+ -+#: ../lib/interface.c:738 -+#, c-format -+msgid "Link" -+msgstr "Verbindung" -+ -+#: ../lib/interface.c:741 -+#, c-format -+msgid "Site" -+msgstr "Standort" -+ -+#: ../lib/interface.c:744 -+#, c-format -+msgid "Compat" -+msgstr "Kompatibilität" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid "Host" -+msgstr "Maschine" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid "Unknown" -+msgstr "Unbekannt" -+ -+#: ../lib/interface.c:765 -+#, c-format -+msgid " IPX/Ethernet II addr:%s\n" -+msgstr " IPX/Ethernet II Adresse:%s\n" -+ -+#: ../lib/interface.c:768 -+#, c-format -+msgid " IPX/Ethernet SNAP addr:%s\n" -+msgstr " IPX/Ethernet SNAP Adresse:%s\n" -+ -+#: ../lib/interface.c:771 -+#, c-format -+msgid " IPX/Ethernet 802.2 addr:%s\n" -+msgstr " IPX/Ethernet 802.2 Adresse:%s\n" -+ -+#: ../lib/interface.c:774 -+#, c-format -+msgid " IPX/Ethernet 802.3 addr:%s\n" -+msgstr " IPX/Ethernet 802.3 Adresse:%s\n" -+ -+#: ../lib/interface.c:784 -+#, c-format -+msgid " EtherTalk Phase 2 addr:%s\n" -+msgstr " EtherTalk Phase 2 Adresse:%s\n" -+ -+#: ../lib/interface.c:793 -+#, c-format -+msgid " econet addr:%s\n" -+msgstr " econet Adresse:%s\n" -+ -+#: ../lib/interface.c:800 -+#, c-format -+msgid "[NO FLAGS] " -+msgstr "[KEINE FLAGS] " -+ -+#: ../lib/interface.c:802 -+#, c-format -+msgid "UP " -+msgstr "UP " -+ -+#: ../lib/interface.c:804 -+#, c-format -+msgid "BROADCAST " -+msgstr "BROADCAST " -+ -+#: ../lib/interface.c:806 -+#, c-format -+msgid "DEBUG " -+msgstr "DEBUG " -+ -+#: ../lib/interface.c:808 -+#, c-format -+msgid "LOOPBACK " -+msgstr "LOOPBACK " -+ -+#: ../lib/interface.c:810 -+#, c-format -+msgid "POINTOPOINT " -+msgstr "PUNKTZUPUNKT " -+ -+#: ../lib/interface.c:812 -+#, c-format -+msgid "NOTRAILERS " -+msgstr "NOTRAILERS " -+ -+#: ../lib/interface.c:814 -+#, c-format -+msgid "RUNNING " -+msgstr "RUNNING " -+ -+#: ../lib/interface.c:816 -+#, c-format -+msgid "NOARP " -+msgstr "NOARP " -+ -+#: ../lib/interface.c:818 -+#, c-format -+msgid "PROMISC " -+msgstr "PROMISC " -+ -+#: ../lib/interface.c:820 -+#, c-format -+msgid "ALLMULTI " -+msgstr "ALLMULTI " -+ -+#: ../lib/interface.c:822 -+#, c-format -+msgid "SLAVE " -+msgstr "SLAVE " -+ -+#: ../lib/interface.c:824 -+#, c-format -+msgid "MASTER " -+msgstr "MASTER " -+ -+#: ../lib/interface.c:826 -+#, c-format -+msgid "MULTICAST " -+msgstr "MULTICAST " -+ -+#: ../lib/interface.c:829 -+#, c-format -+msgid "DYNAMIC " -+msgstr "DYNAMIC " -+ -+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short -+#: ../lib/interface.c:832 -+#, c-format -+msgid " MTU:%d Metric:%d" -+msgstr " MTU:%d Metrik:%d" -+ -+#: ../lib/interface.c:836 -+#, c-format -+msgid " Outfill:%d Keepalive:%d" -+msgstr " Outfill:%d Keepalive:%d" -+ -+#: ../lib/interface.c:850 -+#, fuzzy, c-format -+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgstr "Empfangene Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Rahmen:%lu\n" -+ -+#: ../lib/interface.c:855 -+#, c-format -+msgid " compressed:%lu\n" -+msgstr " komprimiert:%lu\n" -+ -+#: ../lib/interface.c:895 -+#, fuzzy, c-format -+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgstr "Verschickte Pakete:%lu Fehler:%lu Weggeworfen:%lu Überlauf:%lu Träger:%lu\n" -+ -+#: ../lib/interface.c:899 -+#, c-format -+msgid " collisions:%lu " -+msgstr " Kollisionen:%lu " -+ -+#: ../lib/interface.c:901 -+#, c-format -+msgid "compressed:%lu " -+msgstr "Komprimiert:%lu " -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "txqueuelen:%d " -+msgstr "Sendewarteschlangenlänge:%d " -+ -+#: ../lib/interface.c:905 -+#, c-format -+msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" -+msgstr "" -+ -+#: ../lib/interface.c:916 -+#, c-format -+msgid "Interrupt:%d " -+msgstr "Interrupt:%d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:919 -+#, c-format -+msgid "Base address:0x%x " -+msgstr "Basisadresse:0x%x " -+ -+#: ../lib/interface.c:921 -+#, c-format -+msgid "Memory:%lx-%lx " -+msgstr "Speicher:%lx-%lx " -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "DMA chan:%x " -+msgstr "DMA Kanal:%x " -+ -+#: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "Keine benutzbaren Adressfamilien gefunden.\n" - -@@ -2369,41 +2952,44 @@ - #: ../lib/util-ank.c:238 - #, c-format - msgid "ip: %s is invalid inet prefix\n" --msgstr "ip: %s ist ein ungültiges INET-Prefix\n" -+msgstr "ip: %s ist ein ungültiges INET-Präfix\n" - - #: ../lib/util-ank.c:248 - #, c-format - msgid "ip: %s is invalid IPv4 address\n" --msgstr "ip: %s ist eine ungültige IPv4 Adresse\n" -+msgstr "ip: %s ist eine ungültige IPv4-Adresse\n" - - #: ../lib/util-ank.c:256 - #, c-format - msgid "ip: argument is wrong: %s\n" - msgstr "ip: Fehlerhaftes Argument: %s\n" - --#: ../ipmaddr.c:56 -+#: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr "Benutzung: ipmaddr [ add | del ] MULTIADR dev NAME\n" - --#: ../ipmaddr.c:57 -+#: ../ipmaddr.c:62 -+#, c-format - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - msgstr " ipmaddr show [ dev NAME ] [ ipv4 | ipv6 | link | all ]\n" - --#: ../ipmaddr.c:58 -+#: ../ipmaddr.c:63 -+#, c-format - msgid " ipmaddr -V | -version\n" - msgstr "" - --#: ../ipmaddr.c:258 -+#: ../ipmaddr.c:263 - #, c-format - msgid "family %d " - msgstr "familie %d " - --#: ../ipmaddr.c:267 -+#: ../ipmaddr.c:272 - #, c-format - msgid " users %d" - msgstr " Benutzer %d" - --#: ../ipmaddr.c:353 -+#: ../ipmaddr.c:358 - msgid "Cannot create socket" - msgstr "Kann Socket nicht öffnen" - -@@ -2418,13 +3004,14 @@ - msgstr "slattach: tty_lock: (%s): %s\n" - - #: ../slattach.c:192 -+#, c-format - msgid "slattach: cannot write PID file\n" - msgstr "slattach: Kann PID-Datei nicht schreiben\n" - - #: ../slattach.c:202 - #, c-format - msgid "slattach: tty_lock: UUCP user %s unknown!\n" --msgstr "slattach: tty_lock: UUCP Benutzer %s unbekannt!\n" -+msgstr "slattach: tty_lock: UUCP-Benutzer %s unbekannt!\n" - - #: ../slattach.c:430 - #, c-format -@@ -2436,39 +3023,71 @@ - msgid "slattach: tty_hangup(RAISE): %s\n" - msgstr "slattach: tty_hangup(RAISE): %s\n" - --#: ../slattach.c:486 -+#: ../slattach.c:468 -+#, fuzzy, c-format -+msgid "slattach: tty name too long\n" -+msgstr "%s: name zu lang\n" -+ -+#: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "slattach: tty_open: kann aktuellen Zustand nicht auslesen!\n" - --#: ../slattach.c:493 -+#: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" - msgstr "" - "slattach: tty_open: Kann augenblicklichen Leitungszustand nicht auslesen!\n" - --#: ../slattach.c:501 -+#: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "slattach: tty_open: Kann RAW-Modus nicht setzen!\n" - --#: ../slattach.c:508 -+#: ../slattach.c:520 - #, c-format - msgid "slattach: tty_open: cannot set %s bps!\n" - msgstr "slattach: tty_open: Kann %s bps nicht setzen!\n" - --#: ../slattach.c:518 -+#: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "slattach: tty_open: Kann 8N1-Modus nicht setzen!\n" - --#: ../slattach.c:686 -+#: ../slattach.c:672 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "" -+ -+#: ../slattach.c:704 - #, c-format - msgid "%s started" - msgstr "%s gestartet" - --#: ../slattach.c:687 -+#: ../slattach.c:705 - #, c-format - msgid " on %s" - msgstr " auf %s" - --#: ../slattach.c:688 -+#: ../slattach.c:706 - #, c-format - msgid " interface %s\n" - msgstr " Schnittstelle: %s\n" -+ -+msgid "" -+" arp [-v] [] [-i ] -s [netmask ] pub " -+"<-''-\n" -+msgstr "" -+" arp [-v] [] [-i ] -s [netmask ] pub\n" -+ -+msgid "%s: unknown interface: %s\n" -+msgstr "%s: unbekannte Schnittstelle: %s\n" -+ -+msgid "address mask replies" -+msgstr "Adressmaskenantworten" -+ -+msgid "unknown title %s\n" -+msgstr "Unbekannter Titel %s\n" -+ -+msgid "Routing table for `ddp' not yet supported.\n" -+msgstr "DDP-Routentabelle wird noch nicht unterstützt.\n" ---- net-tools-1.60.orig/po/fr.po -+++ net-tools-1.60/po/fr.po -@@ -4,7 +4,8 @@ - msgid "" - msgstr "" - "Project-Id-Version: net-tools 1.51\n" --"POT-Creation-Date: 2000-02-14 02:31+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" - "PO-Revision-Date: 1998-03-01 00:02+0100\n" - "Last-Translator: J.M.Vansteene \n" - "Language-Team:\n" -@@ -12,273 +13,277 @@ - "Content-Type: text/plain; charset=iso8859-1\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../arp.c:110 ../arp.c:269 -+#: ../arp.c:112 ../arp.c:279 -+#, c-format - msgid "arp: need host name\n" - msgstr "arp: nécessite un nom d'hôte\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "Pas d'entrée ARP pour %s\n" - --#: ../arp.c:239 -+#: ../arp.c:248 - #, fuzzy, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "rarp: ne peut définir l'entrée depuis %s:%u\n" - --#: ../arp.c:243 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" - msgstr "" - --#: ../arp.c:282 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" - msgstr "arp: nécessite une adresse matériel\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "arp: adresse matériel invalide\n" - --#: ../arp.c:387 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "arp: ne peut ouvrir le fichier ether %s !\n" - --#: ../arp.c:403 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "arp: erreur de format ligne %u du fichier ether %s !\n" - --#: ../arp.c:416 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "arp: ne peut définir l'entrée en ligne %u du fichier ether %s !\n" - --#: ../arp.c:437 --msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" -+#: ../arp.c:448 -+#, fuzzy, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" - msgstr "Adresse\t\t\tTypeMap\tAdresseMat\t Indicateurs\t\t Iface\n" - --#: ../arp.c:467 -+#: ../arp.c:476 -+#, fuzzy -+msgid "" -+msgstr "%s: interface inconnue: %s\n" -+ -+#: ../arp.c:478 - msgid "(incomplete)" - msgstr "" - --#: ../arp.c:484 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "" - --#: ../arp.c:490 -+#: ../arp.c:501 -+#, c-format - msgid " " - msgstr "" - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "" - --#: ../arp.c:513 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "" - --#: ../arp.c:592 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "Entrées: %d\tIgnorées: %d\tTrouvées: %d\n" - --#: ../arp.c:596 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" - msgstr "arp: aucune correspondance trouvée dans %d entrées\n" - --#: ../arp.c:613 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [] [-i ] [-a] [] <-Display ARP " - "cache\n" - msgstr "" - "Syntaxe:\n" --" arp [-vn] [] [-i ] [-a] [] <-Affiche cache " --"ARP\n" -+" arp [-vn] [] [-i ] [-a] [] <-Affiche cache ARP\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, fuzzy, c-format - msgid "" --" arp [-v] [-i ] -d [pub][nopub] <-Delete ARP " -+" arp [-v] [-i ] -d [pub] <-Delete ARP " - "entry\n" --msgstr "" --" arp [-v] [-i ] -d [pub][nopub] <-Supprime entrée " --"ARP\n" -+msgstr " arp [-v] [-i ] -d [pub][nopub] <-Supprime entrée ARP\n" - --#: ../arp.c:615 --#, fuzzy -+#: ../arp.c:628 -+#, fuzzy, c-format - msgid "" --" arp [-vnD] [] [-i ] -f [] <-Add entry from " -+" arp [-vnD] [] [-i ] -f [] <-Add entry from " - "file\n" --msgstr "" --" arp [-vnD] [] [-i ] -f <-Ajout entrée " --"depuis fichier\n" -+msgstr " arp [-vnD] [] [-i ] -f <-Ajout entrée depuis fichier\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, fuzzy, c-format - msgid "" --" arp [-v] [] [-i ] -s [temp][nopub] <-Add " -+" arp [-v] [] [-i ] -s [temp] <-Add " - "entry\n" --msgstr "" --" arp [-v] [] [-i ] -s [temp][nopub] <-Ajout " --"entrée\n" -+msgstr " arp [-v] [] [-i ] -s [temp][nopub] <-Ajout entrée\n" - --#: ../arp.c:617 --msgid "" --" arp [-v] [] [-i ] -s [netmask ] pub " --"<-''-\n" --msgstr "" --" arp [-v] [] [-i ] -s [netmask ] pub " --"<-''-\n" -- --#: ../arp.c:618 -+#: ../arp.c:630 -+#, fuzzy, c-format - msgid "" --" arp [-v] [] [-i ] -Ds [netmask ] pub " -+" arp [-v] [] [-i ] -Ds [netmask ] pub " - "<-''-\n" - "\n" - msgstr "" --" arp [-v] [] [-i ] -Ds [netmask ] pub " --"<-''-\n" -+" arp [-v] [] [-i ] -Ds [netmask ] pub <-''-\n" - "\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" --msgstr "" --" -a affiche (tous) les hôtes en style BSD\n" -+msgstr " -a affiche (tous) les hôtes en style BSD\n" - --#: ../arp.c:621 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr " -s, --set définit une nouvelle entrée ARP\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr " -d, --delete supprime une entrée\n" - --#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr " -v, --verbose mode verbeux\n" - --#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, fuzzy, c-format -+msgid " -n, --numeric don't resolve names\n" - msgstr " -n, --numeric ne résout pas les noms\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" --msgstr "" --" -i, --device spécifie l'interface réseau (p.ex. eth0)\n" -+msgstr " -i, --device spécifie l'interface réseau (p.ex. eth0)\n" - --#: ../arp.c:626 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read from given device\n" --msgstr "" --" -D, --use-device lit l' depuis le périphérique\n" -+msgstr " -D, --use-device lit l' depuis le périphérique\n" - --#: ../arp.c:627 --#, fuzzy -+#: ../arp.c:639 -+#, fuzzy, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -r, --route affiche la table de routage\n" - --#: ../arp.c:628 --#, fuzzy -+#: ../arp.c:640 -+#, fuzzy, c-format - msgid "" --" -f, --file read new entries from file or from " --"/etc/ethers\n" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" - "\n" - msgstr "" - " -f, --file lit les nouvelles entrées dans le fichier\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " =Use '-H ' to specify hardware address type. Default: %s\n" --msgstr "" --" =Utilisez '-H ' pour spécifier le type d'adresse matériel. Défaut: " --"%s\n" -+msgstr " =Utilisez '-H ' pour spécifier le type d'adresse matériel. Défaut: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr " Liste les types de matériels supportant ARP:\n" - --#: ../arp.c:664 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "%s: type de matétiel non supporté !\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "%s: famille d'adresses non supportée !\n" - --#: ../arp.c:703 --#, fuzzy -+#: ../arp.c:716 -+#, fuzzy, c-format - msgid "arp: -N not yet supported.\n" - msgstr "Table de routage pour `ddp' pas encore supporté.\n" - --#: ../arp.c:713 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "arp: %s: famille d'adresses inconnue.\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "arp: %s: type de matériel inconnu.\n" - --#: ../arp.c:741 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "arp: %s: le noyau ne supporte que 'inet'.\n" - --#: ../arp.c:746 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "arp: %s: type de matériel sans support ARP.\n" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" - msgstr "Définit le nom de noeud à `%s'\n" - --#: ../hostname.c:74 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "%s: vous devez être root pour changer le nom de noeud\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "%s: nom trop long\n" - --#: ../hostname.c:89 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "Définit le nom d'hôte à `%s'\n" - --#: ../hostname.c:94 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "%s: vous devez être root pour changer le nom d'hôte\n" - --#: ../hostname.c:108 -+#: ../hostname.c:109 - #, c-format - msgid "Setting domainname to `%s'\n" - msgstr "Définit le nom de domaine à `%s'\n" - --#: ../hostname.c:113 -+#: ../hostname.c:114 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "%s: vous devez être root pour changer le nom de domaine\n" -@@ -303,38 +308,36 @@ - msgid "Result: h_addr_list=`%s'\n" - msgstr "Résultat : h_addr_list=`%s'\n" - --#: ../hostname.c:209 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" - msgstr "%s: ne peut ouvrir `%s'\n" - --#: ../hostname.c:223 -+#: ../hostname.c:222 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" --msgstr "" --"Syntaxe : hostname [-v] {hôte|-F fichier} définit le nom d'hôte (depuis " --"le fichier)\n" -+msgstr "Syntaxe : hostname [-v] {hôte|-F fichier} définit le nom d'hôte (depuis le fichier)\n" - --#: ../hostname.c:224 -+#: ../hostname.c:223 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" --msgstr "" --" domainname [-v] {domaine_nis|-F fichier} définit le domaine NIS " --"(depuis le fichier)\n" -+msgstr " domainname [-v] {domaine_nis|-F fichier} définit le domaine NIS (depuis le fichier)\n" - --#: ../hostname.c:226 --#, fuzzy -+#: ../hostname.c:225 -+#, fuzzy, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" --msgstr "" --" nodename [-v] {nom_noeud|-F fichier} Définit le nom de noeud " --"DECnet (depuis le fichier)\n" -+msgstr " nodename [-v] {nom_noeud|-F fichier} Définit le nom de noeud DECnet (depuis le fichier)\n" - --#: ../hostname.c:228 -+#: ../hostname.c:227 -+#, c-format - msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" - msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] affiche le nom formatté\n" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" -@@ -342,7 +345,8 @@ - " hostname [-v] affiche le nom d'hôte\n" - "\n" - --#: ../hostname.c:230 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" -@@ -350,7 +354,8 @@ - " hostname -V|--version|-h|--help affiche des infos et termine\n" - "\n" - --#: ../hostname.c:231 -+#: ../hostname.c:230 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" -@@ -358,45 +363,52 @@ - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr " -s, --short nom d'hôte court\n" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr " -a, --alias noms d'alias\n" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address adresses de l'hôte\n" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr " -f, --fqdn, --long nom d'hôte long (FQDN)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" - msgstr " -d, --domain nom de domaine DNS\n" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr " -y, --yp, --nis nom de domaine NIS/YP\n" - --#: ../hostname.c:239 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" - msgstr " -n, --node nom de noeud DECnet\n" - --#: ../hostname.c:241 --#, fuzzy -+#: ../hostname.c:240 -+#, fuzzy, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" - msgstr "" --" -F, --file lit le nom d'hôte ou le nom de domaine NIS depuis " --"le fichier\n" -+" -F, --file lit le nom d'hôte ou le nom de domaine NIS depuis le fichier\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:242 -+#, c-format - msgid "" - " This command can read or set the hostname or the NIS domainname. You can\n" - " also read the DNS domain or the FQDN (fully qualified domain name).\n" -@@ -411,15 +423,16 @@ - msgstr "%s: Vous ne pouvez changer le nom de domaine DNS avec cette commande\n" - - #: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" - msgstr "" - "\n" --"Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez " --"changer le\n" -+"Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez changer le\n" - - #: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "" - "nom de domaine DNS (qui fait partie du FQDN) dans le fichier /etc/hosts.\n" -@@ -439,554 +452,453 @@ - msgid "getnodename()=`%s'\n" - msgstr "getnodename()=`%s'\n" - --#: ../ifconfig.c:159 --#, c-format --msgid "%-9.9s Link encap:%s " --msgstr "%-9.9s Lien encap:%s " -+#: ../ifconfig.c:107 -+#, fuzzy, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Indic\n" - --#: ../ifconfig.c:164 --#, c-format --msgid "HWaddr %s " --msgstr "HWaddr %s " -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, fuzzy, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n" - --#: ../ifconfig.c:167 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 - #, c-format --msgid "Media:%s" --msgstr "Media:%s" -+msgid "No support for INET on this system.\n" -+msgstr "Pas de support de INET sur ce système.\n" - --#: ../ifconfig.c:169 --msgid "(auto)" --msgstr "(auto)" -+#: ../ifconfig.c:193 -+#, fuzzy, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n" - --#: ../ifconfig.c:176 --#, c-format --msgid " %s addr:%s " --msgstr " %s adr:%s " -+#: ../ifconfig.c:202 -+#, fuzzy, c-format -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] [[]
]\n" -+msgstr "" -+"Syntaxe:\n" -+" ifconfig [-a] [-i] [-v] [[] ]\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:204 - #, c-format --msgid " P-t-P:%s " --msgstr " P-t-P:%s " -+msgid " [add
[/]]\n" -+msgstr " [add [/]]\n" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 - #, c-format --msgid " Bcast:%s " --msgstr " Bcast:%s " -+msgid " [del
[/]]\n" -+msgstr " [del [/]]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:206 - #, c-format --msgid " Mask:%s\n" --msgstr " Masque:%s\n" -+msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" -+msgstr " [[-]broadcast []] [[-]pointopoint []]\n" - --#: ../ifconfig.c:201 --#, c-format --msgid " inet6 addr: %s/%d" --msgstr " adr inet6: %s/%d" -+#: ../ifconfig.c:207 -+#, fuzzy, c-format -+msgid " [netmask
] [dstaddr
] [tunnel
]\n" -+msgstr " [netmask ] [dstaddr ] [tunnel ]\n" - --#: ../ifconfig.c:203 --msgid " Scope:" --msgstr " Scope:" -+#: ../ifconfig.c:210 -+#, c-format -+msgid " [outfill ] [keepalive ]\n" -+msgstr " [outfill ] [keepalive ]\n" - --#: ../ifconfig.c:206 --msgid "Global" --msgstr "Global" -+#: ../ifconfig.c:212 -+#, c-format -+msgid " [hw
] [metric ] [mtu ]\n" -+msgstr " [hw ] [metric ] [mtu ]\n" - --#: ../ifconfig.c:209 --msgid "Link" --msgstr "Lien" -+#: ../ifconfig.c:213 -+#, c-format -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:212 --msgid "Site" --msgstr "Site" -+#: ../ifconfig.c:214 -+#, c-format -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" - - #: ../ifconfig.c:215 --msgid "Compat" --msgstr "Compat" -+#, c-format -+msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" -+msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" - --#: ../ifconfig.c:218 --msgid "Host" --msgstr "Hôte" -+#: ../ifconfig.c:217 -+#, fuzzy, c-format -+msgid " [txqueuelen ]\n" -+msgstr " [txqueuelen longueur]\n" - --#: ../ifconfig.c:221 --msgid "Unknown" --msgstr "Inconnu" -+#: ../ifconfig.c:220 -+#, c-format -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:236 -+#: ../ifconfig.c:222 - #, c-format --msgid " IPX/Ethernet II addr:%s\n" --msgstr " adr IPX/Ethernet II:%s\n" -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr "" -+" [up|down] ...\n" -+"\n" - --#: ../ifconfig.c:239 -+#: ../ifconfig.c:224 - #, c-format --msgid " IPX/Ethernet SNAP addr:%s\n" --msgstr " adr IPX/Ethernet SNAP:%s\n" -+msgid " =Hardware Type.\n" -+msgstr " =Type de matériel.\n" - --#: ../ifconfig.c:242 -+#: ../ifconfig.c:225 - #, c-format --msgid " IPX/Ethernet 802.2 addr:%s\n" --msgstr " adr IPX/Ethernet 802.2:%s\n" -+msgid " List of possible hardware types:\n" -+msgstr " Liste des types de matériels possibles:\n" - --#: ../ifconfig.c:245 -+#. 1 = ARPable -+#: ../ifconfig.c:227 - #, c-format --msgid " IPX/Ethernet 802.3 addr:%s\n" --msgstr " adr IPX/Ethernet 802.3:%s\n" -+msgid " =Address family. Default: %s\n" -+msgstr " =famille d'Adresses. Défaut: %s\n" - --#: ../ifconfig.c:255 -+#: ../ifconfig.c:228 - #, c-format --msgid " EtherTalk Phase 2 addr:%s\n" --msgstr " adr EtherTalk Phase 2:%s\n" -+msgid " List of possible address families:\n" -+msgstr " Liste des familles d'adresses possibles:\n" - --#: ../ifconfig.c:264 -+#: ../ifconfig.c:303 - #, c-format --msgid " econet addr:%s\n" --msgstr " adr econet:%s\n" -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" - --#: ../ifconfig.c:270 --msgid "[NO FLAGS] " --msgstr "[PAS INDICATEURS] " -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" - --#: ../ifconfig.c:272 --msgid "UP " --msgstr "UP " -+#: ../ifconfig.c:380 -+#, c-format -+msgid "Unknown media type.\n" -+msgstr "Type de média inconnu.\n" - --#: ../ifconfig.c:274 --msgid "BROADCAST " --msgstr "BROADCAST " -+#: ../ifconfig.c:417 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" - --#: ../ifconfig.c:276 --msgid "DEBUG " --msgstr "DEBUG " -+#: ../ifconfig.c:429 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:278 --msgid "LOOPBACK " --msgstr "LOOPBACK " -+#: ../ifconfig.c:441 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" - --#: ../ifconfig.c:280 --msgid "POINTOPOINT " --msgstr "POINTOPOINT " -+#: ../ifconfig.c:465 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" - --#: ../ifconfig.c:282 --msgid "NOTRAILERS " --msgstr "NOTRAILERS " -+#: ../ifconfig.c:523 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:284 --msgid "RUNNING " --msgstr "RUNNING " -+#: ../ifconfig.c:652 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" - --#: ../ifconfig.c:286 --msgid "NOARP " --msgstr "NOARP " -+#: ../ifconfig.c:684 -+#, c-format -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "" - --#: ../ifconfig.c:288 --msgid "PROMISC " --msgstr "PROMISC " -+#: ../ifconfig.c:693 -+#, c-format -+msgid "%s: invalid %s address.\n" -+msgstr "%s: adresse %s invalide.\n" - --#: ../ifconfig.c:290 --msgid "ALLMULTI " --msgstr "ALLMULTI " -- --#: ../ifconfig.c:292 --msgid "SLAVE " --msgstr "SLAVE " -- --#: ../ifconfig.c:294 --msgid "MASTER " --msgstr "MASTER " -- --#: ../ifconfig.c:296 --msgid "MULTICAST " --msgstr "MULTICAST " -- --#: ../ifconfig.c:299 --msgid "DYNAMIC " --msgstr "DYNAMIC " -- --#: ../ifconfig.c:302 --#, c-format --msgid " MTU:%d Metric:%d" --msgstr " MTU:%d Metric:%d" -- --#: ../ifconfig.c:306 --#, c-format --msgid " Outfill:%d Keepalive:%d" --msgstr " Outfill:%d Keepalive:%d" -- --#: ../ifconfig.c:320 --#, c-format --msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" --msgstr "Paquets Reçus:%lu erreurs:%lu jetés:%lu débordements:%lu trames:%lu\n" -- --#: ../ifconfig.c:325 --#, c-format --msgid " compressed:%lu\n" --msgstr " compressés:%lu\n" -- --#: ../ifconfig.c:329 --#, c-format --msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" --msgstr "" --"Paquets transmis:%lu erreurs:%lu jetés:%lu débordements:%lu carrier:%lu\n" -- --#: ../ifconfig.c:333 -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 - #, c-format --msgid " collisions:%lu " --msgstr " collisions:%lu " -- --#: ../ifconfig.c:335 --#, c-format --msgid "compressed:%lu " --msgstr "compressés:%lu " -- --#: ../ifconfig.c:337 --#, c-format --msgid "txqueuelen:%d " --msgstr "lg file transmission:%d " -- --#: ../ifconfig.c:345 --#, c-format --msgid "Interrupt:%d " --msgstr "Interruption:%d " -- --#. Only print devices using it for --#. I/O maps --#: ../ifconfig.c:348 --#, c-format --msgid "Base address:0x%x " --msgstr "Adresse de base:0x%x " -- --#: ../ifconfig.c:350 --#, c-format --msgid "Memory:%lx-%lx " --msgstr "Mémoire:%lx-%lx " -- --#: ../ifconfig.c:353 --#, c-format --msgid "DMA chan:%x " --msgstr "Canal DMA:%x " -+msgid "No support for INET6 on this system.\n" -+msgstr "Pas de support de INET6 sur ce système.\n" - --#: ../ifconfig.c:384 ../ifconfig.c:405 -+#: ../ifconfig.c:780 ../ifconfig.c:871 - #, c-format --msgid "%s: unknown interface: %s\n" --msgstr "%s: interface inconnue: %s\n" -- --#: ../ifconfig.c:421 --msgid "" --"Usage:\n" --" ifconfig [-a] [-i] [-v] [[]
]\n" --msgstr "" --"Syntaxe:\n" --" ifconfig [-a] [-i] [-v] [[] ]\n" -- --#: ../ifconfig.c:425 --msgid " [add
[/]]\n" --msgstr " [add [/]]\n" -- --#: ../ifconfig.c:427 --msgid " [del
[/]]\n" --msgstr " [del [/]]\n" -- --#: ../ifconfig.c:432 --msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" --msgstr " [[-]broadcast []] [[-]pointopoint []]\n" -- --#: ../ifconfig.c:433 --#, fuzzy --msgid " [netmask
] [dstaddr
] [tunnel
]\n" --msgstr " [netmask ] [dstaddr ] [tunnel ]\n" -- --#: ../ifconfig.c:436 --msgid " [outfill ] [keepalive ]\n" --msgstr " [outfill ] [keepalive ]\n" -- --#: ../ifconfig.c:438 --msgid " [hw
] [metric ] [mtu ]\n" --msgstr " [hw ] [metric ] [mtu ]\n" -- --#: ../ifconfig.c:439 --msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" --msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -- --#: ../ifconfig.c:440 --msgid " [multicast] [[-]promisc]\n" --msgstr " [multicast] [[-]promisc]\n" -- --#: ../ifconfig.c:441 --msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" --msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" -- --#: ../ifconfig.c:443 --#, fuzzy --msgid " [txqueuelen ]\n" --msgstr " [txqueuelen longueur]\n" -- --#: ../ifconfig.c:446 --msgid " [[-]dynamic]\n" --msgstr " [[-]dynamic]\n" -- --#: ../ifconfig.c:448 --msgid "" --" [up|down] ...\n" --"\n" -+msgid "Interface %s not initialized\n" - msgstr "" --" [up|down] ...\n" --"\n" -- --#: ../ifconfig.c:450 --msgid " =Hardware Type.\n" --msgstr " =Type de matériel.\n" -- --#: ../ifconfig.c:451 --msgid " List of possible hardware types:\n" --msgstr " Liste des types de matériels possibles:\n" -- --#. 1 = ARPable --#: ../ifconfig.c:453 --#, c-format --msgid " =Address family. Default: %s\n" --msgstr " =famille d'Adresses. Défaut: %s\n" -- --#: ../ifconfig.c:454 --msgid " List of possible address families:\n" --msgstr " Liste des familles d'adresses possibles:\n" -- --#: ../ifconfig.c:593 --msgid "Unknown media type.\n" --msgstr "Type de média inconnu.\n" - --#: ../ifconfig.c:881 --#, c-format --msgid "%s: invalid %s address.\n" -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, fuzzy, c-format -+msgid "Bad address.\n" - msgstr "%s: adresse %s invalide.\n" - --#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 --msgid "No support for INET6 on this system.\n" --msgstr "Pas de support de INET6 sur ce système.\n" -- --#: ../ifconfig.c:983 -+#: ../ifconfig.c:885 -+#, c-format - msgid "Address deletion not supported on this system.\n" - msgstr "Suppression d'adresses pas supporté par ce système.\n" - --#: ../ifconfig.c:1066 --msgid "No support for INET on this system.\n" --msgstr "Pas de support de INET sur ce système.\n" -+#: ../ifconfig.c:957 -+#, fuzzy, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Ne sait pas comment définir les adresses pour la famille %d.\n" - --#: ../ifconfig.c:1076 -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "Pas de support de ECONET sur ce système.\n" - --#: ../ifconfig.c:1084 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "Ne sait pas comment définir les adresses pour la famille %d.\n" - --#: ../netstat.c:383 -+#: ../ifconfig.c:1021 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "" -+ -+#: ../netstat.c:434 - #, c-format - msgid "" - "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" --msgstr "" --"(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez être root.)\n" -+msgstr "(Pas d'infos lues pour \"-p\": geteuid()=%d mais vous devez être root.)\n" - --#: ../netstat.c:387 -+#: ../netstat.c:438 -+#, c-format - msgid "" - "(Not all processes could be identified, non-owned process info\n" - " will not be shown, you would have to be root to see it all.)\n" - msgstr "" - "(Tous les processus ne peuvent être identifiés, les infos sur les processus\n" --"non possédés ne seront pas affichées, vous devez être root pour les voir " --"toutes.)\n" -+"non possédés ne seront pas affichées, vous devez être root pour les voir toutes.)\n" - --#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "LISTENING" - --#: ../netstat.c:395 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "CONN SENT" - --#: ../netstat.c:396 ../netstat.c:1168 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "DISC SENT" - --#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "ESTABLISHED" - --#: ../netstat.c:419 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "sockets NET/ROM actives\n" - --#: ../netstat.c:420 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" - msgstr "" --"Utilisatr Dest Source Periph Etat Vr/Vs Send-Q " --"Recv-Q\n" -+"Utilisatr Dest Source Periph Etat Vr/Vs Send-Q Recv-" -+"Q\n" - --#: ../netstat.c:430 ../netstat.c:1208 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "" - --#: ../netstat.c:465 -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "SYN_SENT" - --#: ../netstat.c:466 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "SYN_RECV" - --#: ../netstat.c:467 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "FIN_WAIT1" - --#: ../netstat.c:468 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "FIN_WAIT2" - --#: ../netstat.c:469 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "TIME_WAIT" - --#: ../netstat.c:470 -+#: ../netstat.c:521 - msgid "CLOSE" - msgstr "CLOSE" - --#: ../netstat.c:471 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "CLOSE_WAIT" - --#: ../netstat.c:472 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "LAST_ACK" - --#: ../netstat.c:473 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "LISTEN" - --#: ../netstat.c:474 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "CLOSING" - --#: ../netstat.c:544 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "attention, ligne igmp6 en erreur %d.\n" - --#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803 --#: ../netstat.c:935 ../netstat.c:940 -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "netstat: famille d'adresses pas supportée %d !\n" - --#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582 -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 - #, c-format - msgid "warning, got bogus igmp line %d.\n" - msgstr "attention, ligne igmp6 en erreur %d.\n" - --#: ../netstat.c:666 -+#: ../netstat.c:677 -+#, fuzzy, c-format -+msgid "Active X.25 sockets\n" -+msgstr "Sockets AX.25 actives\n" -+ -+#. IMHO, Vr/Vs is not very usefull --SF -+#: ../netstat.c:679 -+#, fuzzy, c-format -+msgid "" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Dest Source Periph Etat Vr/Vs Send-Q Recv-Q\n" -+ -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "attention, ligne tcp en erreur.\n" - --#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "off (0.00/%ld/%d)" - --#: ../netstat.c:708 -+#: ../netstat.c:804 - #, fuzzy, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "on%d (%2.2f/%ld/%d)" - --#: ../netstat.c:713 -+#: ../netstat.c:809 - #, fuzzy, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "on%d (%2.2f/%ld/%d)" - --#: ../netstat.c:718 -+#: ../netstat.c:814 - #, fuzzy, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "on%d (%2.2f/%ld/%d)" - --#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "unkn-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:799 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "attention, ligne udp en erreur.\n" - --#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "INCONNU" - --#: ../netstat.c:860 ../netstat.c:980 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "on%d (%2.2f/%ld/%d)" - --#: ../netstat.c:949 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "attention, ligne raw en erreur.\n" - --#: ../netstat.c:1028 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "attention, ligne unix en erreur.\n" - --#: ../netstat.c:1055 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1059 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1063 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1067 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1071 -+#: ../netstat.c:1171 - msgid "SEQPACKET" - msgstr "SEQPACKET" - --#: ../netstat.c:1080 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "LIBRE" - --#: ../netstat.c:1096 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "ENCONNEXION" - --#: ../netstat.c:1100 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "CONNECTE" - --#: ../netstat.c:1104 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "ENDECONNEXION" - --#: ../netstat.c:1135 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " - msgstr "Sockets du domaine UNIX actives" - --#: ../netstat.c:1137 ../netstat.c:1666 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "(serveurs et établies)" - --#: ../netstat.c:1140 ../netstat.c:1669 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "(seulement serveurs)" - --#: ../netstat.c:1142 ../netstat.c:1671 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "(sans serveurs)" - --#: ../netstat.c:1145 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -994,32 +906,36 @@ - "\n" - "Proto RefCpt Indicatrs Type Etat I-Node" - --#: ../netstat.c:1147 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr " Chemin\n" - --#: ../netstat.c:1167 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "SABM SENT" - --#: ../netstat.c:1170 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "RECOVERY" - --#: ../netstat.c:1184 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "Sockets AX.25 actives\n" - --#: ../netstat.c:1185 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "Dest Source Periph Etat Vr/Vs Send-Q Recv-Q\n" - --#: ../netstat.c:1228 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "" - --#: ../netstat.c:1279 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " -@@ -1029,55 +945,53 @@ - "Proto Recv-Q Send-Q Adresse locale Adresse distante " - "Etat" - --#: ../netstat.c:1281 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr "Utilisatr" - --#: ../netstat.c:1315 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "ESTAB" - --#: ../netstat.c:1323 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "UNK." - --#: ../netstat.c:1367 --msgid " - no statistics available -" --msgstr "" -- --#: ../netstat.c:1370 --msgid "[NO FLAGS]" --msgstr "[PAS INDICATEURS]" -- --#: ../netstat.c:1400 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" - msgstr "Table d'interfaces noyau\n" - --#: ../netstat.c:1401 -+#: ../netstat.c:1465 -+#, fuzzy, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" - msgstr "" - "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Indic\n" - --#: ../netstat.c:1404 -+#: ../netstat.c:1469 - msgid "missing interface information" - msgstr "informations d'interface manquantes" - --#: ../netstat.c:1425 -+#: ../netstat.c:1492 -+#, c-format - msgid "" --"usage: netstat [-veenNcCF] [] -r netstat " --"{-V|--version|-h|--help}\n" -+"usage: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" -+"help}\n" - msgstr "" --"syntaxe: netstat [-veenNcCF] [] -r netstat " --"{-V|--version|-h|--help}\n" -+"syntaxe: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" -+"help}\n" - --#: ../netstat.c:1426 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [ ...]\n" - msgstr " netstat [-vnNcaeol] [ ...]\n" - --#: ../netstat.c:1427 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" -@@ -1085,27 +999,30 @@ - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - --#: ../netstat.c:1429 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr " -r, --route affiche la table de routage\n" - --#: ../netstat.c:1430 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr " -i, --interfaces affiche la table d'interfaces\n" - --#: ../netstat.c:1431 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr "" - " -g, --groups affiche les membres d'un groupe multicast\n" - --#: ../netstat.c:1432 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" --msgstr "" --" -s, --statistics affiche les statistiques réseau (comme " --"SNMP)\n" -+msgstr " -s, --statistics affiche les statistiques réseau (comme SNMP)\n" - --#: ../netstat.c:1434 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" -@@ -1113,23 +1030,41 @@ - " -M, --masquerade affiche les connexions masquées\n" - "\n" - --#: ../netstat.c:1438 ../route.c:87 -+#: ../netstat.c:1505 -+#, fuzzy, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr " -n, --numeric ne résout pas les noms\n" -+ -+#: ../netstat.c:1506 -+#, fuzzy, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr " -n, --numeric ne résout pas les noms\n" -+ -+#: ../netstat.c:1507 -+#, fuzzy, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr " -n, --numeric ne résout pas les noms\n" -+ -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -N, --symbolic résoud les noms matériels\n" - --#: ../netstat.c:1439 ../route.c:88 --#, fuzzy -+#: ../netstat.c:1509 ../route.c:88 -+#, fuzzy, c-format - msgid " -e, --extend display other/more information\n" - msgstr "" - " -e, --extend affiche d'autres/plus d'informations\n" - --#: ../netstat.c:1440 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr "" - " -p, --programs affiche le nom du programme/PID des " - "sockets\n" - --#: ../netstat.c:1441 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -1137,32 +1072,31 @@ - " -c, --continuous listing continu\n" - "\n" - --#: ../netstat.c:1442 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" --msgstr "" --" -l, --listening affiche les sockets du serveur à l'écoute\n" -+msgstr " -l, --listening affiche les sockets du serveur à l'écoute\n" - --#: ../netstat.c:1443 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" --msgstr "" --" -a, --all, --listening affiche toutes les prises (défaut: " --"connectés)\n" -+msgstr " -a, --all, --listening affiche toutes les prises (défaut: connectés)\n" - --#: ../netstat.c:1444 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr " -o, --timers affiche les timers\n" - --#: ../netstat.c:1445 ../route.c:89 --#, fuzzy -+#: ../netstat.c:1515 ../route.c:89 -+#, fuzzy, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" --msgstr "" --" -F, --fib affiche la Forwarding Infomation Base " --"(défaut)\n" -+msgstr " -F, --fib affiche la Forwarding Infomation Base (défaut)\n" - --#: ../netstat.c:1446 ../route.c:90 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" -@@ -1170,110 +1104,118 @@ - " -C, --cache affiche le cache de routage au lieu de FIB\n" - "\n" - --#: ../netstat.c:1448 -+#: ../netstat.c:1518 -+#, c-format - msgid "" --" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - msgstr "" --" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - --#: ../netstat.c:1449 ../route.c:92 --#, c-format --msgid " =Use '-A ' or '--' Default: %s\n" -+#: ../netstat.c:1519 -+#, fuzzy, c-format -+msgid " =Use '-6|-4' or '-A ' or '--'; default: %s\n" - msgstr " =Utiliser '-A ' ou '--' Défaut: %s\n" - --#: ../netstat.c:1450 ../route.c:93 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" - msgstr " Liste les familles d'adresses possibles (supportant le routage):\n" - --#: ../netstat.c:1663 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "Connexions Internet actives " - --#: ../netstat.c:1673 -+#: ../netstat.c:1763 -+#, c-format - msgid "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - msgstr "" - "\n" --"Proto Recv-Q Send-Q Adresse locale Adresse distante Etat " --" " -+"Proto Recv-Q Send-Q Adresse locale Adresse distante " -+"Etat " - --#: ../netstat.c:1675 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr " Utilisatr Inode " - --#: ../netstat.c:1678 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr " Timer" - --#: ../netstat.c:1708 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" - msgstr "" - --#: ../netstat.c:1709 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "" - --#: ../rarp.c:43 -+#: ../rarp.c:44 - msgid "This kernel does not support RARP.\n" - msgstr "Ce noyau ne supporte pas RARP.\n" - --#: ../rarp.c:82 -+#: ../rarp.c:83 - #, c-format - msgid "no RARP entry for %s.\n" - msgstr "pas d'entrée RARP pour %s.\n" - --#: ../rarp.c:95 -+#: ../rarp.c:96 - #, c-format - msgid "%s: bad hardware address\n" - msgstr "%s: mauvaise adresse matériel\n" - --#: ../rarp.c:127 -+#: ../rarp.c:128 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" - msgstr "rarp: ne peut ouvrir le fichier %s:%s.\n" - --#: ../rarp.c:139 -+#: ../rarp.c:140 - #, c-format - msgid "rarp: format error at %s:%u\n" - msgstr "rarp: erreur de format à %s:%u\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:144 ../rarp.c:289 - #, c-format - msgid "rarp: %s: unknown host\n" - msgstr "rarp: %s: hôte inconnu\n" - --#: ../rarp.c:146 -+#: ../rarp.c:147 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" - msgstr "rarp: ne peut définir l'entrée depuis %s:%u\n" - --#: ../rarp.c:175 -+#: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" --msgstr "" --"Usage: rarp -a liste les entrées en cache.\n" -+msgstr "Usage: rarp -a liste les entrées en cache.\n" - --#: ../rarp.c:176 -+#: ../rarp.c:177 -+#, c-format - msgid " rarp -d delete entry from cache.\n" --msgstr "" --" rarp -d supprime l'entrée du cache.\n" -+msgstr " rarp -d supprime l'entrée du cache.\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 -+#, c-format - msgid " rarp [] -s add entry to cache.\n" --msgstr "" --" rarp [] -s ajoute l'entrée au cache.\n" -+msgstr " rarp [] -s ajoute l'entrée au cache.\n" - --#: ../rarp.c:178 -+#: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" --msgstr "" --" rarp -f ajoute les entrées depuis " --"/etc/ethers.\n" -+msgstr " rarp -f ajoute les entrées depuis /etc/ethers.\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1281,24 +1223,26 @@ - " rarp -V affiche la version.\n" - "\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "%s: combinaison d'options illégales.\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" - msgstr "rarp: %s: type de matériel inconnu.\n" - --#: ../route.c:79 -+#: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [] List kernel routing tables\n" - msgstr "" - "Syntaxe: route [-nNvee] [-FC] [] Liste les tables de routage " - "noyau\n" - --#: ../route.c:80 -+#: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" -@@ -1307,15 +1251,15 @@ - "pour AF.\n" - "\n" - --#: ../route.c:82 -+#: ../route.c:83 -+#, c-format - msgid "" - " route {-h|--help} [] Detailed usage syntax for " - "specified AF.\n" --msgstr "" --" route {-h|--help} [] Utilisation détaillée pour l'AF " --"spécifié.\n" -+msgstr " route {-h|--help} [] Utilisation détaillée pour l'AF spécifié.\n" - --#: ../route.c:83 -+#: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" -@@ -1325,16 +1269,23 @@ - "termine.\n" - "\n" - -+#: ../route.c:92 -+#, fuzzy, c-format -+msgid " =Use '-A ' or '--'; default: %s\n" -+msgstr " =Utiliser '-A ' ou '--' Défaut: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "Syntaxe: plipconfig [-a] [-i] [-v] interface\n" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr " [nibble NN] [trigger NN]\n" - - #: ../plipconfig.c:68 --#, fuzzy -+#, fuzzy, c-format - msgid " plipconfig -V | --version\n" - msgstr " plipconfig -V\n" - -@@ -1343,474 +1294,763 @@ - msgid "%s\tnibble %lu trigger %lu\n" - msgstr "%s\tnibble %lu trigger %lu\n" - --#: ../iptunnel.c:79 -+#: ../iptunnel.c:85 -+#, c-format - msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" - msgstr "" - --#: ../iptunnel.c:80 -+#: ../iptunnel.c:86 -+#, c-format - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" - msgstr "" - --#: ../iptunnel.c:81 -+#: ../iptunnel.c:87 -+#, c-format - msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - msgstr "" - --#: ../iptunnel.c:82 -+#: ../iptunnel.c:88 -+#, c-format - msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" - msgstr "" - --#: ../iptunnel.c:83 -+#: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" - msgstr "" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "" - --#: ../iptunnel.c:85 -+#: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr "" - --#: ../iptunnel.c:86 -+#: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr "" - --#: ../iptunnel.c:87 -+#: ../iptunnel.c:93 -+#, c-format - msgid " TTL := { 1..255 | inherit }\n" - msgstr "" - --#: ../iptunnel.c:88 -+#: ../iptunnel.c:94 -+#, c-format - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" - msgstr "" - --#: ../iptunnel.c:326 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "" - --#: ../iptunnel.c:346 -+#: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "" - --#: ../iptunnel.c:361 -+#: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "" - --#: ../iptunnel.c:373 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "" - --#: ../iptunnel.c:411 -+#: ../iptunnel.c:417 - #, c-format - msgid "%s: %s/ip remote %s local %s " - msgstr "" - --#: ../iptunnel.c:415 -+#: ../iptunnel.c:421 - #, fuzzy - msgid "unknown" - msgstr "Inconnu" - --#: ../iptunnel.c:447 -+#: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr "" - --#: ../iptunnel.c:449 -+#: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr "" - --#: ../iptunnel.c:451 -+#: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr "" - --#: ../iptunnel.c:453 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr "" - --#: ../iptunnel.c:481 -+#: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" - msgstr "" - --#: ../iptunnel.c:494 -+#: ../iptunnel.c:500 - #, c-format - msgid "Failed to get type of [%s]\n" - msgstr "" - --#: ../iptunnel.c:510 -+#: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "" - --#: ../iptunnel.c:513 -+#: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "" - --#: ../statistics.c:45 -+#: ../statistics.c:47 - msgid "ICMP input histogram:" - msgstr "Histogramme d'entrée ICMP" - --#: ../statistics.c:46 -+#: ../statistics.c:48 - msgid "ICMP output histogram:" - msgstr "Histogramme de sortie ICMP" - --#: ../statistics.c:63 -+#: ../statistics.c:65 - #, c-format - msgid "Forwarding is %s" - msgstr "Réacheminement est %s" - --#: ../statistics.c:64 --#, c-format --msgid "Default TTL is %d" -+#: ../statistics.c:66 -+#, fuzzy, c-format -+msgid "Default TTL is %u" - msgstr "TTL par défaut est %d" - --#: ../statistics.c:65 --#, c-format --msgid "%d total packets received" -+#: ../statistics.c:67 -+#, fuzzy, c-format -+msgid "%u total packets received" - msgstr "%d paquets totaux reçus" - --#: ../statistics.c:66 --#, c-format --msgid "%d with invalid headers" -+#: ../statistics.c:68 -+#, fuzzy, c-format -+msgid "%u with invalid headers" - msgstr "%d avec en-tête invalides" - --#: ../statistics.c:67 --#, c-format --msgid "%d with invalid addresses" -+#: ../statistics.c:69 -+#, fuzzy, c-format -+msgid "%u with invalid addresses" - msgstr "%d avec adresses invalides" - --#: ../statistics.c:68 --#, c-format --msgid "%d forwarded" -+#: ../statistics.c:70 -+#, fuzzy, c-format -+msgid "%u forwarded" - msgstr "%d réacheminées" - --#: ../statistics.c:69 --#, c-format --msgid "%d with unknown protocol" -+#: ../statistics.c:71 -+#, fuzzy, c-format -+msgid "%u with unknown protocol" - msgstr "%d avec protocole inconnu" - --#: ../statistics.c:70 --#, c-format --msgid "%d incoming packets discarded" -+#: ../statistics.c:72 -+#, fuzzy, c-format -+msgid "%u incoming packets discarded" - msgstr "%d paquets entrant jetés" - --#: ../statistics.c:71 --#, c-format --msgid "%d incoming packets delivered" -+#: ../statistics.c:73 -+#, fuzzy, c-format -+msgid "%u incoming packets delivered" - msgstr "%d paquets entrant délivrés" - --#: ../statistics.c:72 --#, c-format --msgid "%d requests sent out" -+#: ../statistics.c:74 -+#, fuzzy, c-format -+msgid "%u requests sent out" - msgstr "%d requêtes envoyées" - - #. ? --#: ../statistics.c:73 --#, c-format --msgid "%d outgoing packets dropped" -+#: ../statistics.c:75 -+#, fuzzy, c-format -+msgid "%u outgoing packets dropped" - msgstr "%d paquets sortant jetés" - --#: ../statistics.c:74 --#, c-format --msgid "%d dropped because of missing route" -+#: ../statistics.c:76 -+#, fuzzy, c-format -+msgid "%u dropped because of missing route" - msgstr "%d jetés pour cause de route manquante" - --#: ../statistics.c:75 --#, c-format --msgid "%d fragments dropped after timeout" -+#: ../statistics.c:77 -+#, fuzzy, c-format -+msgid "%u fragments dropped after timeout" - msgstr "%d fragments jetés après timeout" - --#: ../statistics.c:76 --#, c-format --msgid "%d reassemblies required" -+#: ../statistics.c:78 -+#, fuzzy, c-format -+msgid "%u reassemblies required" - msgstr "%d nécessitant un réassemblage" - - #. ? --#: ../statistics.c:77 --#, c-format --msgid "%d packets reassembled ok" -+#: ../statistics.c:79 -+#, fuzzy, c-format -+msgid "%u packets reassembled ok" - msgstr "%d paquets réassemblés correctement" - --#: ../statistics.c:78 --#, c-format --msgid "%d packet reassembles failed" -+#: ../statistics.c:80 -+#, fuzzy, c-format -+msgid "%u packet reassembles failed" - msgstr "%d paquets mal réassemblés" - --#: ../statistics.c:79 --#, c-format --msgid "%d fragments received ok" -+#: ../statistics.c:81 -+#, fuzzy, c-format -+msgid "%u fragments received ok" - msgstr "%d fragments reçus correctement" - --#: ../statistics.c:80 --#, c-format --msgid "%d fragments failed" -+#: ../statistics.c:82 -+#, fuzzy, c-format -+msgid "%u fragments failed" - msgstr "%d fragments en échec" - --#: ../statistics.c:81 --#, c-format --msgid "%d fragments created" -+#: ../statistics.c:83 -+#, fuzzy, c-format -+msgid "%u fragments created" - msgstr "%d fragments créés" - --#: ../statistics.c:86 --#, c-format --msgid "%d ICMP messages received" -+#: ../statistics.c:88 -+#, fuzzy, c-format -+msgid "%u ICMP messages received" - msgstr "%d messages ICMP reçus" - --#: ../statistics.c:87 --#, c-format --msgid "%d input ICMP message failed." -+#: ../statistics.c:89 -+#, fuzzy, c-format -+msgid "%u input ICMP message failed." - msgstr "%d messages d'entrée ICMP en échec" - --#: ../statistics.c:88 ../statistics.c:101 --#, c-format --msgid "destination unreachable: %d" -+#: ../statistics.c:90 ../statistics.c:103 -+#, fuzzy, c-format -+msgid "destination unreachable: %u" - msgstr "destination injoignable: %d" - --#: ../statistics.c:89 --#, c-format --msgid "timeout in transit: %d" -+#: ../statistics.c:91 -+#, fuzzy, c-format -+msgid "timeout in transit: %u" - msgstr "timeout en transmission: %d" - --#: ../statistics.c:90 ../statistics.c:103 --#, c-format --msgid "wrong parameters: %d" -+#: ../statistics.c:92 ../statistics.c:105 -+#, fuzzy, c-format -+msgid "wrong parameters: %u" - msgstr "mauvais paramètre: %d" - - #. ? --#: ../statistics.c:91 --#, c-format --msgid "source quenchs: %d" -+#: ../statistics.c:93 -+#, fuzzy, c-format -+msgid "source quenches: %u" - msgstr "Source Quenchs: %d" - --#: ../statistics.c:92 --#, c-format --msgid "redirects: %d" -+#: ../statistics.c:94 -+#, fuzzy, c-format -+msgid "redirects: %u" - msgstr "Redirections: %d" - --#: ../statistics.c:93 --#, c-format --msgid "echo requests: %d" -+#: ../statistics.c:95 -+#, fuzzy, c-format -+msgid "echo requests: %u" - msgstr "requêtes echo: %d" - --#: ../statistics.c:94 ../statistics.c:107 --#, c-format --msgid "echo replies: %d" -+#: ../statistics.c:96 ../statistics.c:109 -+#, fuzzy, c-format -+msgid "echo replies: %u" - msgstr "réponses echo: %d" - --#: ../statistics.c:95 --#, c-format --msgid "timestamp request: %d" -+#: ../statistics.c:97 -+#, fuzzy, c-format -+msgid "timestamp request: %u" - msgstr "requêtes datées: %d" - --#: ../statistics.c:96 --#, c-format --msgid "timestamp reply: %d" -+#: ../statistics.c:98 -+#, fuzzy, c-format -+msgid "timestamp reply: %u" - msgstr "réponses datées: %d" - --#: ../statistics.c:97 --#, c-format --msgid "address mask request: %d" -+#: ../statistics.c:99 -+#, fuzzy, c-format -+msgid "address mask request: %u" - msgstr "requêtes de masque d'adresse: %d" - - #. ? --#: ../statistics.c:98 --msgid "address mask replies" --msgstr "réponses de masque d'adresses" -+#: ../statistics.c:100 ../statistics.c:113 -+#, fuzzy, c-format -+msgid "address mask replies: %u" -+msgstr "réponses de masque d'adresse: %d" - - #. ? --#: ../statistics.c:99 --#, c-format --msgid "%d ICMP messages sent" -+#: ../statistics.c:101 -+#, fuzzy, c-format -+msgid "%u ICMP messages sent" - msgstr "%d messages ICMP envoyés" - --#: ../statistics.c:100 --#, c-format --msgid "%d ICMP messages failed" -+#: ../statistics.c:102 -+#, fuzzy, c-format -+msgid "%u ICMP messages failed" - msgstr "%d messages ICMP en échec" - --#: ../statistics.c:102 --#, c-format --msgid "time exceeded: %d" -+#: ../statistics.c:104 -+#, fuzzy, c-format -+msgid "time exceeded: %u" - msgstr "temps dépassé: %d" - - #. ? --#: ../statistics.c:104 --#, c-format --msgid "source quench: %d" -+#: ../statistics.c:106 -+#, fuzzy, c-format -+msgid "source quench: %u" - msgstr "Source Quench: %d" - --#: ../statistics.c:105 --#, c-format --msgid "redirect: %d" -+#: ../statistics.c:107 -+#, fuzzy, c-format -+msgid "redirect: %u" - msgstr "redirection: %d" - --#: ../statistics.c:106 --#, c-format --msgid "echo request: %d" -+#: ../statistics.c:108 -+#, fuzzy, c-format -+msgid "echo request: %u" - msgstr "requête echo: %d" - --#: ../statistics.c:108 --#, c-format --msgid "timestamp requests: %d" -+#: ../statistics.c:110 -+#, fuzzy, c-format -+msgid "timestamp requests: %u" - msgstr "requêtes datées: %d" - --#: ../statistics.c:109 --#, c-format --msgid "timestamp replies: %d" -+#: ../statistics.c:111 -+#, fuzzy, c-format -+msgid "timestamp replies: %u" - msgstr "réponses datées: %d" - --#: ../statistics.c:110 --#, c-format --msgid "address mask requests: %d" -+#: ../statistics.c:112 -+#, fuzzy, c-format -+msgid "address mask requests: %u" - msgstr "requêtes de masque d'adresse: %d" - --#: ../statistics.c:111 --#, c-format --msgid "address mask replies: %d" --msgstr "réponses de masque d'adresse: %d" -- --#: ../statistics.c:116 -+#: ../statistics.c:118 - #, c-format - msgid "RTO algorithm is %s" - msgstr "algorithme RTO est %s" - --#: ../statistics.c:120 --#, c-format --msgid "%d active connections openings" -+#: ../statistics.c:122 -+#, fuzzy, c-format -+msgid "%u active connections openings" - msgstr "%d ouvertures de connexions actives" - --#: ../statistics.c:121 --#, c-format --msgid "%d passive connection openings" -+#: ../statistics.c:123 -+#, fuzzy, c-format -+msgid "%u passive connection openings" - msgstr "%d ouvertures de connexions passives" - --#: ../statistics.c:122 --#, c-format --msgid "%d failed connection attempts" -+#: ../statistics.c:124 -+#, fuzzy, c-format -+msgid "%u failed connection attempts" - msgstr "%d tentatives de connexion échouées" - --#: ../statistics.c:123 --#, c-format --msgid "%d connection resets received" -+#: ../statistics.c:125 -+#, fuzzy, c-format -+msgid "%u connection resets received" - msgstr "%d réinitialisations de connexions reçues" - --#: ../statistics.c:124 --#, c-format --msgid "%d connections established" -+#: ../statistics.c:126 -+#, fuzzy, c-format -+msgid "%u connections established" - msgstr "%d connexions établies" - --#: ../statistics.c:125 --#, c-format --msgid "%d segments received" -+#: ../statistics.c:127 -+#, fuzzy, c-format -+msgid "%u segments received" - msgstr "%d segments reçus" - --#: ../statistics.c:126 --#, c-format --msgid "%d segments send out" -+#: ../statistics.c:128 -+#, fuzzy, c-format -+msgid "%u segments send out" - msgstr "%d segments envoyés" - --#: ../statistics.c:127 --#, c-format --msgid "%d segments retransmited" -+#: ../statistics.c:129 -+#, fuzzy, c-format -+msgid "%u segments retransmited" - msgstr "%d segments retransmis" - --#: ../statistics.c:128 --#, c-format --msgid "%d bad segments received." -+#: ../statistics.c:130 -+#, fuzzy, c-format -+msgid "%u bad segments received." - msgstr "%d mauvais segments reçus." - --#: ../statistics.c:129 --#, c-format --msgid "%d resets sent" -+#: ../statistics.c:131 -+#, fuzzy, c-format -+msgid "%u resets sent" - msgstr "%d réinitialisations envoyées" - --#: ../statistics.c:134 --#, c-format --msgid "%d packets received" -+#: ../statistics.c:136 -+#, fuzzy, c-format -+msgid "%u packets received" - msgstr "%d paquets reçus" - --#: ../statistics.c:135 --#, c-format --msgid "%d packets to unknown port received." -+#: ../statistics.c:137 -+#, fuzzy, c-format -+msgid "%u packets to unknown port received." - msgstr "%d paquets reçus pour un port inconnu" - --#: ../statistics.c:136 --#, c-format --msgid "%d packet receive errors" -+#: ../statistics.c:138 -+#, fuzzy, c-format -+msgid "%u packet receive errors" - msgstr "%d erreurs en réception de paquets" - --#: ../statistics.c:137 -+#: ../statistics.c:139 -+#, fuzzy, c-format -+msgid "%u packets sent" -+msgstr "%d paquets envoyés" -+ -+#: ../statistics.c:144 -+#, fuzzy, c-format -+msgid "%u SYN cookies sent" -+msgstr "%d SYN-Cookies reçus" -+ -+#: ../statistics.c:145 -+#, fuzzy, c-format -+msgid "%u SYN cookies received" -+msgstr "%d SYN-Cookies reçus" -+ -+#: ../statistics.c:146 -+#, fuzzy, c-format -+msgid "%u invalid SYN cookies received" -+msgstr "%d SYN-Cookies reçus incorrects" -+ -+#: ../statistics.c:148 -+#, fuzzy, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" -+msgstr "%d réinitialisations reçues pour sockets SYN_RECV embryonnaires" -+ -+#: ../statistics.c:150 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" -+msgstr "%d paquets supprimés de la file de réception en raison de tampon de sockets plein" -+ -+#. obsolete: 2.2.0 doesn't do that anymore -+#: ../statistics.c:153 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue" -+msgstr "%d paquets supprimés de la file hors service" -+ -+#: ../statistics.c:154 -+#, fuzzy, c-format -+msgid "" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" -+msgstr "%d paquets jetés de la file hors service en raison de tampon de sockets plein" -+ -+#: ../statistics.c:156 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" -+msgstr "%d ICMP paquets jetés car hors de la fenêtre" -+ -+#: ../statistics.c:158 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because socket was locked" -+msgstr "%d paquets ICMP jetés car la socket a été vérouillée" -+ -+#: ../statistics.c:160 - #, c-format --msgid "%d packets sent" -+msgid "%u TCP sockets finished time wait in fast timer" -+msgstr "" -+ -+#: ../statistics.c:161 -+#, c-format -+msgid "%u time wait sockets recycled by time stamp" -+msgstr "" -+ -+#: ../statistics.c:162 -+#, c-format -+msgid "%u TCP sockets finished time wait in slow timer" -+msgstr "" -+ -+#: ../statistics.c:163 -+#, c-format -+msgid "%u passive connections rejected because of time stamp" -+msgstr "" -+ -+#: ../statistics.c:165 -+#, c-format -+msgid "%u active connections rejected because of time stamp" -+msgstr "" -+ -+#: ../statistics.c:167 -+#, c-format -+msgid "%u packets rejects in established connections because of timestamp" -+msgstr "" -+ -+#: ../statistics.c:169 -+#, fuzzy, c-format -+msgid "%u delayed acks sent" - msgstr "%d paquets envoyés" - --#: ../statistics.c:142 -+#: ../statistics.c:170 - #, c-format --msgid "%d SYN cookies sent" -+msgid "%u delayed acks further delayed because of locked socket" - msgstr "" - --#: ../statistics.c:143 -+#: ../statistics.c:172 - #, c-format --msgid "%d SYN cookies received" --msgstr "%d SYN-Cookies reçus" -+msgid "Quick ack mode was activated %u times" -+msgstr "" - --#: ../statistics.c:144 -+#: ../statistics.c:173 - #, c-format --msgid "%d invalid SYN cookies received" --msgstr "%d SYN-Cookies reçus incorrects" -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "" - --#: ../statistics.c:146 -+#: ../statistics.c:175 - #, c-format --msgid "%d resets received for embryonic SYN_RECV sockets" --msgstr "%d réinitialisations reçues pour sockets SYN_RECV embryonnaires" -+msgid "%u SYNs to LISTEN sockets ignored" -+msgstr "" - --#: ../statistics.c:148 -+#: ../statistics.c:176 - #, c-format --msgid "%d packets pruned from receive queue because of socket buffer overrun" -+msgid "%u packets directly queued to recvmsg prequeue." - msgstr "" --"%d paquets supprimés de la file de réception en raison de tampon de sockets " --"plein" - --#. obsolete: 2.2.0 doesn't do that anymore --#: ../statistics.c:151 -+#: ../statistics.c:178 -+#, c-format -+msgid "%u of bytes directly received from backlog" -+msgstr "" -+ -+#: ../statistics.c:180 - #, c-format --msgid "%d packets pruned from out-of-order queue" -+msgid "%u of bytes directly received from prequeue" -+msgstr "" -+ -+#: ../statistics.c:182 -+#, fuzzy, c-format -+msgid "%u packets dropped from prequeue" - msgstr "%d paquets supprimés de la file hors service" - --#: ../statistics.c:152 -+#: ../statistics.c:183 -+#, fuzzy, c-format -+msgid "%u packet headers predicted" -+msgstr "%d paquets reçus" -+ -+#: ../statistics.c:184 - #, c-format --msgid "" --"%d packets dropped from out-of-order queue because of socket buffer overrun" -+msgid "%u packets header predicted and directly queued to user" - msgstr "" --"%d paquets jetés de la file hors service en raison de tampon de sockets plein" - --#: ../statistics.c:154 -+#: ../statistics.c:186 - #, c-format --msgid "%d ICMP packets dropped because they were out-of-window" --msgstr "%d ICMP paquets jetés car hors de la fenêtre" -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "" - --#: ../statistics.c:156 -+#: ../statistics.c:188 -+#, fuzzy, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "%d paquets reçus pour un port inconnu" -+ -+#: ../statistics.c:189 - #, c-format --msgid "%d ICMP packets dropped because socket was locked" --msgstr "%d paquets ICMP jetés car la socket a été vérouillée" -+msgid "%u predicted acknowledgments" -+msgstr "" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" -+ -+#: ../statistics.c:192 -+#, fuzzy, c-format -+msgid "%u bad SACKs received" -+msgstr "%d mauvais segments reçus." -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "" -+ -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:197 -+#, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, fuzzy, c-format -+msgid "%u retransmits lost" -+msgstr "%d réinitialisations envoyées" -+ -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, fuzzy, c-format -+msgid "%u fast retransmits" -+msgstr "%d segments retransmis" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, fuzzy, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "%d segments retransmis" -+ -+#: ../statistics.c:210 -+#, fuzzy, c-format -+msgid "%u sack retransmits failed" -+msgstr "%d paquets mal réassemblés" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, fuzzy, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "%d paquets supprimés de la file de réception en raison de tampon de sockets plein" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, fuzzy, c-format -+msgid "%u DSACKs received" -+msgstr "%d paquets reçus" -+ -+#: ../statistics.c:216 -+#, fuzzy, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "%d paquets totaux reçus" -+ -+#: ../statistics.c:217 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "%d réinitialisations de connexions reçues" -+ -+#: ../statistics.c:218 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "%d réinitialisations de connexions reçues" -+ -+#: ../statistics.c:219 -+#, fuzzy, c-format -+msgid "%u connections reset due to early user close" -+msgstr "%d réinitialisations de connexions reçues" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, fuzzy, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "%d réinitialisations de connexions reçues" - - #: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "activée" - --#: ../statistics.c:222 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "désactivée" - --#: ../statistics.c:272 --#, c-format --msgid "unknown title %s\n" --msgstr "titre inconnu %s\n" -- --#: ../statistics.c:298 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "erreur d'analyse de /proc/net/snmp" - --#: ../statistics.c:311 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "ne peut ouvrir /proc/net/snmp" - -@@ -1824,89 +2064,95 @@ - msgid "Cannot change line discipline to `%s'.\n" - msgstr "Ne peut changer la discipline de ligne à `%s'.\n" - --#: ../lib/af.c:145 ../lib/hw.c:148 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "UNSPEC" - --#: ../lib/af.c:147 -+#: ../lib/af.c:155 - msgid "UNIX Domain" - msgstr "Domaine UNIX" - --#: ../lib/af.c:150 -+#: ../lib/af.c:158 - msgid "DARPA Internet" - msgstr "DARPA Internet" - --#: ../lib/af.c:153 -+#: ../lib/af.c:161 - msgid "IPv6" - msgstr "IPv6" - --#: ../lib/af.c:156 ../lib/hw.c:169 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "AMPR AX.25" - --#: ../lib/af.c:159 ../lib/hw.c:175 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "AMPR NET/ROM" - --#: ../lib/af.c:162 -+#: ../lib/af.c:170 - msgid "Novell IPX" - msgstr "" - --#: ../lib/af.c:165 -+#: ../lib/af.c:173 - msgid "Appletalk DDP" - msgstr "Appletalk DDP" - --#: ../lib/af.c:168 ../lib/hw.c:207 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "Econet" - --#: ../lib/af.c:171 ../lib/hw.c:172 -+#: ../lib/af.c:179 -+msgid "CCITT X.25" -+msgstr "" -+ -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "AMPR ROSE" - --#: ../lib/af.c:174 ../lib/hw.c:160 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "Ash" - --#: ../lib/af.c:232 -+#: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "Ne fournissez pas plus d'une famille d'adresses SVP.\n" - --#: ../lib/af.c:293 -+#: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "Trop d'arguments de familles d'adresses.\n" - --#: ../lib/af.c:304 -+#: ../lib/af.c:315 - #, c-format - msgid "Unknown address family `%s'.\n" - msgstr "Famille d'adresses inconnue `%s'.\n" - --#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 --#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259 --#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71 --#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76 --msgid "[NONE SET]" --msgstr "[INDEFINI]" -- --#: ../lib/arcnet.c:81 ../lib/arcnet.c:96 -+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 - #, c-format - msgid "in_arcnet(%s): invalid arcnet address!\n" - msgstr "in_arcnet(%s): adresse arcnet invalide !\n" - --#: ../lib/arcnet.c:108 -+#: ../lib/arcnet.c:97 - #, c-format - msgid "in_arcnet(%s): trailing : ignored!\n" - msgstr "in_arcnet(%s): restant : ignoré !\n" - --#: ../lib/arcnet.c:120 -+#: ../lib/arcnet.c:109 - #, c-format - msgid "in_arcnet(%s): trailing junk!\n" - msgstr "in_arcnet(%s): le restant à la poubelle !\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - msgstr "Adresse Ash malformée" - -+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 -+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 -+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 -+msgid "[NONE SET]" -+msgstr "[INDEFINI]" -+ - #: ../lib/ax25.c:97 ../lib/netrom.c:100 - msgid "Invalid callsign" - msgstr "Signal d'appel invalide" -@@ -1916,22 +2162,21 @@ - msgstr "Signal d'appel trop long" - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "AX.25 pas configuré sur ce système.\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "Table de routage AX.25 du noyau\n" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "Destination Iface Utilisation\n" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "Table de routage pour `ddp' pas encore supporté.\n" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1947,153 +2192,171 @@ - msgid "in_ether(%s): trailing junk!\n" - msgstr "in_ether(%s): le restant à la poubelle !\n" - --#: ../lib/fddi.c:95 ../lib/fddi.c:110 -+#: ../lib/fddi.c:84 ../lib/fddi.c:99 - #, c-format - msgid "in_fddi(%s): invalid fddi address!\n" - msgstr "in_fddi(%s): adresse fddi invalide!\n" - --#: ../lib/fddi.c:122 -+#: ../lib/fddi.c:111 - #, c-format - msgid "in_fddi(%s): trailing : ignored!\n" - msgstr "in_fddi(%s): restant ignoré !\n" - --#: ../lib/fddi.c:134 -+#: ../lib/fddi.c:123 - #, c-format - msgid "in_fddi(%s): trailing junk!\n" - msgstr "in_fddi(%s): le restant à la poubelle !\n" - --#: ../lib/getroute.c:97 ../lib/setroute.c:76 -+#: ../lib/getroute.c:101 ../lib/setroute.c:80 - #, c-format - msgid "Address family `%s' not supported.\n" - msgstr "Famille d'adresses `%s' non supportée.\n" - --#: ../lib/getroute.c:103 ../lib/setroute.c:80 -+#: ../lib/getroute.c:107 ../lib/setroute.c:84 - #, c-format - msgid "No routing for address family `%s'.\n" - msgstr "Pas de routage pour la famille d'adresses `%s'.\n" - --#: ../lib/hippi.c:96 ../lib/hippi.c:111 -+#: ../lib/hippi.c:84 ../lib/hippi.c:99 - #, c-format - msgid "in_hippi(%s): invalid hippi address!\n" - msgstr "in_hippi(%s): adresse hippi invalide!\n" - --#: ../lib/hippi.c:123 -+#: ../lib/hippi.c:111 - #, c-format - msgid "in_hippi(%s): trailing : ignored!\n" - msgstr "in_hippi(%s): restant ignoré !\n" - --#: ../lib/hippi.c:134 -+#: ../lib/hippi.c:122 - #, c-format - msgid "in_hippi(%s): trailing junk!\n" - msgstr "in_hippi(%s): le restant à la poubelle !\n" - --#: ../lib/hw.c:147 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "Boucle locale" - --#: ../lib/hw.c:150 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "IP ligne série" - --#: ../lib/hw.c:151 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "IP ligne série - VJ " - --#: ../lib/hw.c:152 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "IP ligne série - 6 bits" - --#: ../lib/hw.c:153 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "IP ligne série - 6 bits VJ" - --#: ../lib/hw.c:154 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "IP ligne série adaptative" - --#: ../lib/hw.c:157 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:163 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "Fiber Distributed Data Interface" - --#: ../lib/hw.c:166 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:178 -+#: ../lib/hw.c:191 -+msgid "generic X.25" -+msgstr "" -+ -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "IPIP Tunnel" - --#: ../lib/hw.c:181 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" - msgstr "Protocole Point-à-Point" - --#: ../lib/hw.c:184 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "(Cisco)-HDLC" - --#: ../lib/hw.c:185 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:188 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:191 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "Périphériue d'accès Frame Relay" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "IPv6-dans-IPv4" - --#: ../lib/hw.c:198 -+#: ../lib/hw.c:214 - #, fuzzy - msgid "IrLAP" - msgstr "LAPB" - --#: ../lib/hw.c:201 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:219 - msgid "16/4 Mbps Token Ring (New)" - msgstr "" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" - msgstr "rresolve: famille d'adresses non suportée %d !\n" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6.c:131 -+#, fuzzy -+msgid "[UNKNOWN]" -+msgstr "INCONNU" -+ -+#: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "INET6 (IPv6) pas configuré sur ce système.\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" - msgstr "Table de routage IPv6 du noyau\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" - msgstr "" --"Destination Prochain Hop " --" Indic Metric Ref Utilis. Iface\n" -+"Destination Prochain " -+"Hop Indic Metric Ref Utilis. Iface\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Cache voisin IPv6 du noyau\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" -@@ -2101,39 +2364,45 @@ - "Voisin Adresse MAT Iface Indic " - "Ref Etat\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:157 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" --msgstr "" --"Voisin Adresse MAT Iface Indic " --"Ref Etat Bloqué(sec) Détuit(sec)\n" -+msgstr "Voisin Adresse MAT Iface Indic Ref Etat Bloqué(sec) Détuit(sec)\n" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "Syntaxe: inet6_route [-vF] del Cible\n" - - #: ../lib/inet6_sr.c:47 -+#, c-format - msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" - msgstr " inet6_route [-vF] add Cible [gw Gw] [metric M] [[dev] If]\n" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr " inet6_route [-FC] flush PAS supporté\n" - --#: ../lib/inet6_sr.c:182 -+#: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" - msgstr "Flush de table de routage `inet6' pas supporté\n" - - #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format - msgid "INET (IPv4) not configured in this system.\n" - msgstr "INET (IPv4) pas configuré sur ce système.\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" - msgstr "Table de routage IP du noyau\n" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" -@@ -2142,26 +2411,26 @@ - "Iface\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" --msgstr "" --"Destination Passerelle Genmask Indic MSS Fenêtre irtt " --"Iface\n" -+msgstr "Destination Passerelle Genmask Indic MSS Fenêtre irtt Iface\n" - - #: ../lib/inet_gr.c:62 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface MSS Window irtt\n" --msgstr "" --"Destination Passerelle Genmask Indic Metric Ref Use " --"Iface MSS Fenêtre irtt\n" -+msgstr "Destination Passerelle Genmask Indic Metric Ref Use Iface MSS Fenêtre irtt\n" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\n" - msgstr "cache de routage IP du noyau\n" - - #: ../lib/inet_gr.c:258 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface\n" -@@ -2170,30 +2439,28 @@ - "Iface\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" --msgstr "" --"Source Destination Passerelle Indic MSS Fenêtre irtt " --"Iface\n" -+msgstr "Source Destination Passerelle Indic MSS Fenêtre irtt Iface\n" - - #: ../lib/inet_gr.c:266 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt HH Arp\n" --msgstr "" --"Source Destination Passerelle Indic Metric Ref Use " --"Iface MSS Fenêtre irtt HH Arp\n" -+msgstr "Source Destination Passerelle Indic Metric Ref Use Iface MSS Fenêtre irtt HH Arp\n" - - #: ../lib/inet_gr.c:290 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" --msgstr "" --"Source Destination Passerelle Flags Metric Ref Use " --"Iface MSS Fenêtre irtt TOS HHRef HHUptod SpecDst\n" -+msgstr "Source Destination Passerelle Flags Metric Ref Use Iface MSS Fenêtre irtt TOS HHRef HHUptod SpecDst\n" - --#: ../lib/inet_sr.c:50 -+#: ../lib/inet_sr.c:51 -+#, c-format - msgid "" - "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " - "[[dev] If]\n" -@@ -2201,29 +2468,34 @@ - "Syntaxe: inet_route [-vF] del {-host|-net} Cible[/prefix] [gw Gw] [metric M] " - "[[dev] If]\n" - --#: ../lib/inet_sr.c:51 -+#: ../lib/inet_sr.c:52 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" - msgstr "" - " inet_route [-vF] add {-host|-net} Cible[/prefix] [gw Gw] [metric M]\n" - --#: ../lib/inet_sr.c:52 -+#: ../lib/inet_sr.c:53 -+#, c-format - msgid "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - msgstr "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - --#: ../lib/inet_sr.c:53 -+#: ../lib/inet_sr.c:54 -+#, c-format - msgid " [mod] [dyn] [reinstate] [[dev] If]\n" - msgstr " [mod] [dyn] [reinstate] [[dev] If]\n" - --#: ../lib/inet_sr.c:54 -+#: ../lib/inet_sr.c:55 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" - msgstr "" - " inet_route [-vF] add {-host|-net} Cible[/prefix] [metric M] reject\n" - --#: ../lib/inet_sr.c:55 -+#: ../lib/inet_sr.c:56 -+#, c-format - msgid " inet_route [-FC] flush NOT supported\n" - msgstr " inet_route [-FC] flush PAS supporté\n" - -@@ -2233,15 +2505,17 @@ - msgstr "route: %s: ne peut utiliser un RESEAU comme passerelle!\n" - - #: ../lib/inet_sr.c:174 --#, fuzzy -+#, fuzzy, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "route: MSS invalide.\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "route: fenêtre invalide.\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "route: rtt initial invalide.\n" - -@@ -2256,75 +2530,92 @@ - msgstr "route: netmask bogué %s\n" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "route: netmask ne correspond pas à l'adresse de route\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" - msgstr "Flush de table de routage `inet' pas supporté\n" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" - msgstr "Modification de cache de routage `inet' pas supporté\n" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "IPX pas configuré sur ce système.\n" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" - msgstr "Table de routage IPX du noyau\n" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" - msgstr "Destination Réseau Routeur Noeud Routeur\n" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" - msgstr "IPX: ceci doit être écrit\n" - --#: ../lib/masq_info.c:197 -+#: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "Entrées IP Masquerade\n" - --#: ../lib/masq_info.c:200 -+#: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "prot expire source destination ports\n" - --#: ../lib/masq_info.c:203 -+#: ../lib/masq_info.c:204 -+#, c-format - msgid "" --"prot expire initseq delta prevd source destination " --" ports\n" -+"prot expire initseq delta prevd source " -+"destination ports\n" - msgstr "" --"prot expire initseq delta precd source destination " --" ports\n" -+"prot expire initseq delta precd source " -+"destination ports\n" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "NET/ROM pas configuré sur ce système.\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" - msgstr "Table de routage NET/ROM du noyau\n" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "Destination Mnemoniq Qualité Voisin Iface\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" - msgstr "utilisation netrom\n" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" - msgstr "NET/ROM: ceci doit être écrit\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "Vous ne pouvez démarrer PPP avec ce programme.\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" - msgstr "Désolé, utilisez pppd !\n" - -@@ -2333,49 +2624,314 @@ - msgstr "L'adresse de noeud doit avoir 10 chiffres" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "ROSE pas configuré sur ce système.\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" - msgstr "Table de routage ROSE du noyau\n" - --#: ../lib/tr.c:70 ../lib/tr.c:85 -+#: ../lib/tr.c:86 ../lib/tr.c:101 - #, c-format - msgid "in_tr(%s): invalid token ring address!\n" - msgstr "in_tr(%s): adresse token-ring invalide !\n" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "in_tr(%s): restant : ignoré !\n" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "in_tr(%s): restant à la poubelle !\n" - --#: ../lib/interface.c:124 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" - msgstr "attention: pas de socket inet disponible: %s\n" - --#: ../lib/interface.c:270 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "" - - #. Give better error message for this case. --#: ../lib/interface.c:504 -+#: ../lib/interface.c:571 - msgid "Device not found" - msgstr "Périphérique non trouvé" - --#: ../lib/interface.c:508 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" - msgstr "%s: erreur lors de la recherche d'infos sur l'interface: %s\n" - --#: ../lib/sockets.c:59 -+#: ../lib/interface.c:608 -+msgid " - no statistics available -" -+msgstr "" -+ -+#: ../lib/interface.c:612 -+#, c-format -+msgid "[NO FLAGS]" -+msgstr "[PAS INDICATEURS]" -+ -+#: ../lib/interface.c:688 -+#, c-format -+msgid "%-9.9s Link encap:%s " -+msgstr "%-9.9s Lien encap:%s " -+ -+#: ../lib/interface.c:693 -+#, c-format -+msgid "HWaddr %s " -+msgstr "HWaddr %s " -+ -+#: ../lib/interface.c:696 -+#, c-format -+msgid "Media:%s" -+msgstr "Media:%s" -+ -+#: ../lib/interface.c:698 -+#, c-format -+msgid "(auto)" -+msgstr "(auto)" -+ -+#: ../lib/interface.c:705 -+#, c-format -+msgid " %s addr:%s " -+msgstr " %s adr:%s " -+ -+#: ../lib/interface.c:708 -+#, c-format -+msgid " P-t-P:%s " -+msgstr " P-t-P:%s " -+ -+#: ../lib/interface.c:711 -+#, c-format -+msgid " Bcast:%s " -+msgstr " Bcast:%s " -+ -+#: ../lib/interface.c:713 -+#, c-format -+msgid " Mask:%s\n" -+msgstr " Masque:%s\n" -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid " inet6 addr: %s/%d" -+msgstr " adr inet6: %s/%d" -+ -+#: ../lib/interface.c:732 -+#, c-format -+msgid " Scope:" -+msgstr " Scope:" -+ -+#: ../lib/interface.c:735 -+#, c-format -+msgid "Global" -+msgstr "Global" -+ -+#: ../lib/interface.c:738 -+#, c-format -+msgid "Link" -+msgstr "Lien" -+ -+#: ../lib/interface.c:741 -+#, c-format -+msgid "Site" -+msgstr "Site" -+ -+#: ../lib/interface.c:744 -+#, c-format -+msgid "Compat" -+msgstr "Compat" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid "Host" -+msgstr "Hôte" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid "Unknown" -+msgstr "Inconnu" -+ -+#: ../lib/interface.c:765 -+#, c-format -+msgid " IPX/Ethernet II addr:%s\n" -+msgstr " adr IPX/Ethernet II:%s\n" -+ -+#: ../lib/interface.c:768 -+#, c-format -+msgid " IPX/Ethernet SNAP addr:%s\n" -+msgstr " adr IPX/Ethernet SNAP:%s\n" -+ -+#: ../lib/interface.c:771 -+#, c-format -+msgid " IPX/Ethernet 802.2 addr:%s\n" -+msgstr " adr IPX/Ethernet 802.2:%s\n" -+ -+#: ../lib/interface.c:774 -+#, c-format -+msgid " IPX/Ethernet 802.3 addr:%s\n" -+msgstr " adr IPX/Ethernet 802.3:%s\n" -+ -+#: ../lib/interface.c:784 -+#, c-format -+msgid " EtherTalk Phase 2 addr:%s\n" -+msgstr " adr EtherTalk Phase 2:%s\n" -+ -+#: ../lib/interface.c:793 -+#, c-format -+msgid " econet addr:%s\n" -+msgstr " adr econet:%s\n" -+ -+#: ../lib/interface.c:800 -+#, c-format -+msgid "[NO FLAGS] " -+msgstr "[PAS INDICATEURS] " -+ -+#: ../lib/interface.c:802 -+#, c-format -+msgid "UP " -+msgstr "UP " -+ -+#: ../lib/interface.c:804 -+#, c-format -+msgid "BROADCAST " -+msgstr "BROADCAST " -+ -+#: ../lib/interface.c:806 -+#, c-format -+msgid "DEBUG " -+msgstr "DEBUG " -+ -+#: ../lib/interface.c:808 -+#, c-format -+msgid "LOOPBACK " -+msgstr "LOOPBACK " -+ -+#: ../lib/interface.c:810 -+#, c-format -+msgid "POINTOPOINT " -+msgstr "POINTOPOINT " -+ -+#: ../lib/interface.c:812 -+#, c-format -+msgid "NOTRAILERS " -+msgstr "NOTRAILERS " -+ -+#: ../lib/interface.c:814 -+#, c-format -+msgid "RUNNING " -+msgstr "RUNNING " -+ -+#: ../lib/interface.c:816 -+#, c-format -+msgid "NOARP " -+msgstr "NOARP " -+ -+#: ../lib/interface.c:818 -+#, c-format -+msgid "PROMISC " -+msgstr "PROMISC " -+ -+#: ../lib/interface.c:820 -+#, c-format -+msgid "ALLMULTI " -+msgstr "ALLMULTI " -+ -+#: ../lib/interface.c:822 -+#, c-format -+msgid "SLAVE " -+msgstr "SLAVE " -+ -+#: ../lib/interface.c:824 -+#, c-format -+msgid "MASTER " -+msgstr "MASTER " -+ -+#: ../lib/interface.c:826 -+#, c-format -+msgid "MULTICAST " -+msgstr "MULTICAST " -+ -+#: ../lib/interface.c:829 -+#, c-format -+msgid "DYNAMIC " -+msgstr "DYNAMIC " -+ -+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short -+#: ../lib/interface.c:832 -+#, c-format -+msgid " MTU:%d Metric:%d" -+msgstr " MTU:%d Metric:%d" -+ -+#: ../lib/interface.c:836 -+#, c-format -+msgid " Outfill:%d Keepalive:%d" -+msgstr " Outfill:%d Keepalive:%d" -+ -+#: ../lib/interface.c:850 -+#, fuzzy, c-format -+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgstr "Paquets Reçus:%lu erreurs:%lu jetés:%lu débordements:%lu trames:%lu\n" -+ -+#: ../lib/interface.c:855 -+#, c-format -+msgid " compressed:%lu\n" -+msgstr " compressés:%lu\n" -+ -+#: ../lib/interface.c:895 -+#, fuzzy, c-format -+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgstr "Paquets transmis:%lu erreurs:%lu jetés:%lu débordements:%lu carrier:%lu\n" -+ -+#: ../lib/interface.c:899 -+#, c-format -+msgid " collisions:%lu " -+msgstr " collisions:%lu " -+ -+#: ../lib/interface.c:901 -+#, c-format -+msgid "compressed:%lu " -+msgstr "compressés:%lu " -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "txqueuelen:%d " -+msgstr "lg file transmission:%d " -+ -+#: ../lib/interface.c:905 -+#, c-format -+msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" -+msgstr "" -+ -+#: ../lib/interface.c:916 -+#, c-format -+msgid "Interrupt:%d " -+msgstr "Interruption:%d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:919 -+#, c-format -+msgid "Base address:0x%x " -+msgstr "Adresse de base:0x%x " -+ -+#: ../lib/interface.c:921 -+#, c-format -+msgid "Memory:%lx-%lx " -+msgstr "Mémoire:%lx-%lx " -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "DMA chan:%x " -+msgstr "Canal DMA:%x " -+ -+#: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "Pas de famille d'adresses utilisable trouvée.\n" - -@@ -2399,29 +2955,32 @@ - msgid "ip: argument is wrong: %s\n" - msgstr "ip: argument incorrect: %s\n" - --#: ../ipmaddr.c:56 -+#: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr "Syntaxe: ipmaddr [ add | del ] MULTIADR dev CHAINE\n" - --#: ../ipmaddr.c:57 -+#: ../ipmaddr.c:62 -+#, c-format - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - msgstr " ipmaddr show [ dev CHAINE ] [ ipv4 | ipv6 | link | all ]\n" - --#: ../ipmaddr.c:58 -+#: ../ipmaddr.c:63 -+#, c-format - msgid " ipmaddr -V | -version\n" - msgstr "" - --#: ../ipmaddr.c:258 -+#: ../ipmaddr.c:263 - #, c-format - msgid "family %d " - msgstr "" - --#: ../ipmaddr.c:267 -+#: ../ipmaddr.c:272 - #, c-format - msgid " users %d" - msgstr "" - --#: ../ipmaddr.c:353 -+#: ../ipmaddr.c:358 - msgid "Cannot create socket" - msgstr "Ne peut créer une socket" - -@@ -2436,6 +2995,7 @@ - msgstr "" - - #: ../slattach.c:192 -+#, fuzzy, c-format - msgid "slattach: cannot write PID file\n" - msgstr "slattach: tty_lock: (%s): %s\n" - -@@ -2454,59 +3014,88 @@ - msgid "slattach: tty_hangup(RAISE): %s\n" - msgstr "slattach: tty_hangup(RAISE): %s\n" - --#: ../slattach.c:486 -+#: ../slattach.c:468 -+#, fuzzy, c-format -+msgid "slattach: tty name too long\n" -+msgstr "%s: nom trop long\n" -+ -+#: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "slattach: tty_open: ne peut obtenir l'état courant !\n" - --#: ../slattach.c:493 -+#: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" - msgstr "" - "slattach: tty_open: ne peut obtenir la discipline de ligne actuelle !\n" - --#: ../slattach.c:501 -+#: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "slattach: tty_open: ne peut activer le mode RAW !\n" - --#: ../slattach.c:508 -+#: ../slattach.c:520 - #, c-format - msgid "slattach: tty_open: cannot set %s bps!\n" - msgstr "slattach: tty_open: ne peut passer à %s bps!\n" - --#: ../slattach.c:518 -+#: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "slattach: tty_open: ne peut activer le mode 8N1 !\n" - --#: ../slattach.c:686 -+#: ../slattach.c:672 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "" -+ -+#: ../slattach.c:704 - #, c-format - msgid "%s started" - msgstr "" - --#: ../slattach.c:687 -+#: ../slattach.c:705 - #, c-format - msgid " on %s" - msgstr "" - --#: ../slattach.c:688 -+#: ../slattach.c:706 - #, fuzzy, c-format - msgid " interface %s\n" - msgstr "%s: interface inconnue: %s\n" - - #~ msgid "" --#~ " This comand can get or set the hostname or the NIS domainname. You can\n" --#~ msgstr "" --#~ " Cette commande ne peut obtenir ou définir le nom d'hôte ou le domaine " --#~ "NIS. Vous pouvez\n" -+#~ " arp [-v] [] [-i ] -s [netmask ] pub " -+#~ "<-''-\n" -+#~ msgstr " arp [-v] [] [-i ] -s [netmask ] pub <-''-\n" -+ -+#~ msgid "%s: unknown interface: %s\n" -+#~ msgstr "%s: interface inconnue: %s\n" -+ -+#~ msgid "address mask replies" -+#~ msgstr "réponses de masque d'adresses" -+ -+#~ msgid "unknown title %s\n" -+#~ msgstr "titre inconnu %s\n" -+ -+#~ msgid "Routing table for `ddp' not yet supported.\n" -+#~ msgstr "Table de routage pour `ddp' pas encore supporté.\n" -+ -+#~ msgid "" -+#~ " This comand can get or set the hostname or the NIS domainname. You " -+#~ "can\n" -+#~ msgstr " Cette commande ne peut obtenir ou définir le nom d'hôte ou le domaine NIS. Vous pouvez\n" - - #~ msgid "" - #~ " also get the DNS domain or the FQDN (fully qualified domain name).\n" - #~ msgstr "" --#~ " aussi obtenir le domaine DNS ou le FQDN (fully qualified domain name).\n" -+#~ " aussi obtenir le domaine DNS ou le FQDN (fully qualified domain " -+#~ "name).\n" - - #~ msgid "" - #~ " Unless you are using bind or NIS for host lookups you can change the\n" --#~ msgstr "" --#~ " Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous " --#~ "pouvez changer le\n" -+#~ msgstr " Sauf si vous utilisez bind ou NIS pour les recherches d'hôtes, vous pouvez changer le\n" - - #~ msgid "" - #~ " FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" ---- net-tools-1.60.orig/po/net-tools.pot -+++ net-tools-1.60/po/net-tools.pot -@@ -1,253 +1,275 @@ - # SOME DESCRIPTIVE TITLE. --# Copyright (C) YEAR Free Software Foundation, Inc. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. - # FIRST AUTHOR , YEAR. - # - #, fuzzy - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" --"POT-Creation-Date: 2001-04-15 15:40+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME \n" - "Language-Team: LANGUAGE \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=CHARSET\n" --"Content-Transfer-Encoding: ENCODING\n" -+"Content-Transfer-Encoding: 8bit\n" - --#: ../arp.c:111 ../arp.c:270 -+#: ../arp.c:112 ../arp.c:279 -+#, c-format - msgid "arp: need host name\n" - msgstr "" - --#: ../arp.c:208 ../arp.c:222 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "" - --#: ../arp.c:240 -+#: ../arp.c:248 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "" - --#: ../arp.c:244 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "" - --#: ../arp.c:253 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" - msgstr "" - --#: ../arp.c:283 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" - msgstr "" - --#: ../arp.c:291 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "" - --#: ../arp.c:388 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "" - --#: ../arp.c:404 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "" - --#: ../arp.c:417 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "" - --#: ../arp.c:438 -+#: ../arp.c:448 -+#, c-format - msgid "" - "Address HWtype HWaddress Flags Mask " - "Iface\n" - msgstr "" - --#: ../arp.c:468 -+#: ../arp.c:476 -+msgid "" -+msgstr "" -+ -+#: ../arp.c:478 - msgid "(incomplete)" - msgstr "" - --#: ../arp.c:485 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "" - --#: ../arp.c:491 -+#: ../arp.c:501 -+#, c-format - msgid " " - msgstr "" - --#: ../arp.c:497 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "" - --#: ../arp.c:514 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "" - --#: ../arp.c:593 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "" - --#: ../arp.c:597 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "" - --#: ../arp.c:599 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" - msgstr "" - --#: ../arp.c:614 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [] [-i ] [-a] [] <-Display ARP " - "cache\n" - msgstr "" - --#: ../arp.c:615 -+#: ../arp.c:627 -+#, c-format - msgid "" --" arp [-v] [-i ] -d [pub][nopub] <-Delete ARP " -+" arp [-v] [-i ] -d [pub] <-Delete ARP " - "entry\n" - msgstr "" - --#: ../arp.c:616 -+#: ../arp.c:628 -+#, c-format - msgid "" --" arp [-vnD] [] [-i ] -f [] <-Add entry from " -+" arp [-vnD] [] [-i ] -f [] <-Add entry from " - "file\n" - msgstr "" - --#: ../arp.c:617 -+#: ../arp.c:629 -+#, c-format - msgid "" --" arp [-v] [] [-i ] -s [temp][nopub] <-Add " -+" arp [-v] [] [-i ] -s [temp] <-Add " - "entry\n" - msgstr "" - --#: ../arp.c:618 --msgid "" --" arp [-v] [] [-i ] -s [netmask ] pub " --"<-''-\n" --msgstr "" -- --#: ../arp.c:619 -+#: ../arp.c:630 -+#, c-format - msgid "" --" arp [-v] [] [-i ] -Ds [netmask ] pub " -+" arp [-v] [] [-i ] -Ds [netmask ] pub " - "<-''-\n" - "\n" - msgstr "" - --#: ../arp.c:621 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" - msgstr "" - --#: ../arp.c:622 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr "" - --#: ../arp.c:623 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr "" - --#: ../arp.c:624 ../netstat.c:1490 ../route.c:86 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr "" - --#: ../arp.c:625 ../netstat.c:1491 ../route.c:87 -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, c-format - msgid " -n, --numeric don't resolve names\n" - msgstr "" - --#: ../arp.c:626 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" - msgstr "" - --#: ../arp.c:627 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read from given device\n" - msgstr "" - --#: ../arp.c:628 -+#: ../arp.c:639 -+#, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr "" - --#: ../arp.c:629 -+#: ../arp.c:640 -+#, c-format - msgid "" --" -f, --file read new entries from file or from " --"/etc/ethers\n" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" - "\n" - msgstr "" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " =Use '-H ' to specify hardware address type. Default: %s\n" - msgstr "" - --#: ../arp.c:632 ../rarp.c:183 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr "" - --#: ../arp.c:666 ../arp.c:751 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "" - --#: ../arp.c:670 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "" - --#: ../arp.c:705 -+#: ../arp.c:716 -+#, c-format - msgid "arp: -N not yet supported.\n" - msgstr "" - --#: ../arp.c:715 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "" - --#: ../arp.c:724 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "" - --#: ../arp.c:743 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "" - --#: ../arp.c:756 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "" - --#: ../hostname.c:70 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" - msgstr "" - --#: ../hostname.c:75 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "" - --#: ../hostname.c:78 ../hostname.c:98 ../hostname.c:117 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "" - --#: ../hostname.c:90 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "" - --#: ../hostname.c:95 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "" -@@ -262,103 +284,119 @@ - msgid "%s: you must be root to change the domain name\n" - msgstr "" - --#: ../hostname.c:132 -+#: ../hostname.c:131 - #, c-format - msgid "Resolving `%s' ...\n" - msgstr "" - --#: ../hostname.c:138 -+#: ../hostname.c:137 - #, c-format - msgid "Result: h_name=`%s'\n" - msgstr "" - --#: ../hostname.c:143 -+#: ../hostname.c:142 - #, c-format - msgid "Result: h_aliases=`%s'\n" - msgstr "" - --#: ../hostname.c:148 -+#: ../hostname.c:147 - #, c-format - msgid "Result: h_addr_list=`%s'\n" - msgstr "" - --#: ../hostname.c:210 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" - msgstr "" - --#: ../hostname.c:224 -+#: ../hostname.c:222 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" - msgstr "" - --#: ../hostname.c:225 -+#: ../hostname.c:223 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" - msgstr "" - --#: ../hostname.c:227 -+#: ../hostname.c:225 -+#, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" - msgstr "" - --#: ../hostname.c:229 -+#: ../hostname.c:227 -+#, c-format - msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" - msgstr "" - --#: ../hostname.c:230 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" - msgstr "" - --#: ../hostname.c:231 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" - msgstr "" - --#: ../hostname.c:232 -+#: ../hostname.c:230 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - msgstr "" - --#: ../hostname.c:233 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr "" - --#: ../hostname.c:234 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr "" - --#: ../hostname.c:235 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr "" - --#: ../hostname.c:236 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr "" - --#: ../hostname.c:237 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" - msgstr "" - --#: ../hostname.c:238 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr "" - --#: ../hostname.c:240 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" - msgstr "" - --#: ../hostname.c:242 -+#: ../hostname.c:240 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" - msgstr "" - --#: ../hostname.c:244 -+#: ../hostname.c:242 -+#, c-format - msgid "" - " This command can read or set the hostname or the NIS domainname. You can\n" - " also read the DNS domain or the FQDN (fully qualified domain name).\n" -@@ -367,587 +405,706 @@ - " part of the FQDN) in the /etc/hosts file.\n" - msgstr "" - --#: ../hostname.c:340 -+#: ../hostname.c:338 - #, c-format - msgid "%s: You can't change the DNS domain name with this command\n" - msgstr "" - --#: ../hostname.c:341 -+#: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" - msgstr "" - --#: ../hostname.c:342 -+#: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "" - --#: ../hostname.c:359 -+#: ../hostname.c:357 - #, c-format - msgid "gethostname()=`%s'\n" - msgstr "" - --#: ../hostname.c:376 -+#: ../hostname.c:374 - #, c-format - msgid "getdomainname()=`%s'\n" - msgstr "" - --#: ../hostname.c:391 -+#: ../hostname.c:389 - #, c-format - msgid "getnodename()=`%s'\n" - msgstr "" - --#: ../ifconfig.c:108 -+#: ../ifconfig.c:107 -+#, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" - msgstr "" - --#: ../ifconfig.c:130 ../ifconfig.c:162 -+#: ../ifconfig.c:129 ../ifconfig.c:161 - #, c-format --msgid "%s: unknown interface: %s\n" -+msgid "%s: ERROR while getting interface flags: %s\n" - msgstr "" - --#: ../ifconfig.c:154 ../ifconfig.c:734 ../ifconfig.c:825 ../ifconfig.c:936 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 -+#, c-format - msgid "No support for INET on this system.\n" - msgstr "" - --#: ../ifconfig.c:177 -+#: ../ifconfig.c:193 -+#, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "" -+ -+#: ../ifconfig.c:202 -+#, c-format - msgid "" - "Usage:\n" --" ifconfig [-a] [-i] [-v] [-s] [[]
]\n" -+" ifconfig [-a] [-v] [-s] [[]
]\n" - msgstr "" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:204 -+#, c-format - msgid " [add
[/]]\n" - msgstr "" - --#: ../ifconfig.c:180 -+#: ../ifconfig.c:205 -+#, c-format - msgid " [del
[/]]\n" - msgstr "" - --#: ../ifconfig.c:181 -+#: ../ifconfig.c:206 -+#, c-format - msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" - msgstr "" - --#: ../ifconfig.c:182 -+#: ../ifconfig.c:207 -+#, c-format - msgid " [netmask
] [dstaddr
] [tunnel
]\n" - msgstr "" - --#: ../ifconfig.c:185 -+#: ../ifconfig.c:210 -+#, c-format - msgid " [outfill ] [keepalive ]\n" - msgstr "" - --#: ../ifconfig.c:187 -+#: ../ifconfig.c:212 -+#, c-format - msgid " [hw
] [metric ] [mtu ]\n" - msgstr "" - --#: ../ifconfig.c:188 -+#: ../ifconfig.c:213 -+#, c-format - msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" - msgstr "" - --#: ../ifconfig.c:189 -+#: ../ifconfig.c:214 -+#, c-format - msgid " [multicast] [[-]promisc]\n" - msgstr "" - --#: ../ifconfig.c:190 -+#: ../ifconfig.c:215 -+#, c-format - msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" - msgstr "" - --#: ../ifconfig.c:192 -+#: ../ifconfig.c:217 -+#, c-format - msgid " [txqueuelen ]\n" - msgstr "" - --#: ../ifconfig.c:195 -+#: ../ifconfig.c:220 -+#, c-format - msgid " [[-]dynamic]\n" - msgstr "" - --#: ../ifconfig.c:197 -+#: ../ifconfig.c:222 -+#, c-format - msgid "" - " [up|down] ...\n" - "\n" - msgstr "" - --#: ../ifconfig.c:199 -+#: ../ifconfig.c:224 -+#, c-format - msgid " =Hardware Type.\n" - msgstr "" - --#: ../ifconfig.c:200 -+#: ../ifconfig.c:225 -+#, c-format - msgid " List of possible hardware types:\n" - msgstr "" - - #. 1 = ARPable --#: ../ifconfig.c:202 -+#: ../ifconfig.c:227 - #, c-format - msgid " =Address family. Default: %s\n" - msgstr "" - --#: ../ifconfig.c:203 -+#: ../ifconfig.c:228 -+#, c-format - msgid " List of possible address families:\n" - msgstr "" - --#: ../ifconfig.c:278 -+#: ../ifconfig.c:303 - #, c-format - msgid "ifconfig: option `%s' not recognised.\n" - msgstr "" - --#: ../ifconfig.c:280 ../ifconfig.c:925 -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format - msgid "ifconfig: `--help' gives usage information.\n" - msgstr "" - --#: ../ifconfig.c:355 -+#: ../ifconfig.c:380 -+#, c-format - msgid "Unknown media type.\n" - msgstr "" - --#: ../ifconfig.c:647 -+#: ../ifconfig.c:417 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" -+ -+#: ../ifconfig.c:429 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:441 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:465 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:523 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:652 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" -+ -+#: ../ifconfig.c:684 - #, c-format - msgid "hw address type `%s' has no handler to set address. failed.\n" - msgstr "" - --#: ../ifconfig.c:656 -+#: ../ifconfig.c:693 - #, c-format - msgid "%s: invalid %s address.\n" - msgstr "" - --#: ../ifconfig.c:700 ../ifconfig.c:790 ../ifconfig.c:876 -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 -+#, c-format - msgid "No support for INET6 on this system.\n" - msgstr "" - --#: ../ifconfig.c:743 ../ifconfig.c:834 -+#: ../ifconfig.c:780 ../ifconfig.c:871 - #, c-format - msgid "Interface %s not initialized\n" - msgstr "" - --#: ../ifconfig.c:755 ../ifconfig.c:845 -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, c-format - msgid "Bad address.\n" - msgstr "" - --#: ../ifconfig.c:848 -+#: ../ifconfig.c:885 -+#, c-format - msgid "Address deletion not supported on this system.\n" - msgstr "" - --#: ../ifconfig.c:920 -+#: ../ifconfig.c:957 -+#, c-format - msgid "ifconfig: Cannot set address for this protocol family.\n" - msgstr "" - --#: ../ifconfig.c:946 -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "" - --#: ../ifconfig.c:954 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "" - --#: ../netstat.c:430 -+#: ../ifconfig.c:1021 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "" -+ -+#: ../netstat.c:434 - #, c-format - msgid "" - "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" - msgstr "" - --#: ../netstat.c:434 -+#: ../netstat.c:438 -+#, c-format - msgid "" - "(Not all processes could be identified, non-owned process info\n" - " will not be shown, you would have to be root to see it all.)\n" - msgstr "" - --#: ../netstat.c:441 ../netstat.c:1176 ../netstat.c:1253 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "" - --#: ../netstat.c:442 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "" - --#: ../netstat.c:443 ../netstat.c:1255 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "" - --#: ../netstat.c:444 ../netstat.c:511 ../netstat.c:894 ../netstat.c:1256 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "" - --#: ../netstat.c:466 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "" - --#: ../netstat.c:467 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" - msgstr "" - --#: ../netstat.c:477 ../netstat.c:1295 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "" - --#: ../netstat.c:512 -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "" - --#: ../netstat.c:513 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "" - --#: ../netstat.c:514 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "" - --#: ../netstat.c:515 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "" - --#: ../netstat.c:516 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "" - --#: ../netstat.c:517 -+#: ../netstat.c:521 - msgid "CLOSE" - msgstr "" - --#: ../netstat.c:518 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "" - --#: ../netstat.c:519 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "" - --#: ../netstat.c:520 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "" - --#: ../netstat.c:521 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "" - --#: ../netstat.c:592 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "" - --#: ../netstat.c:597 ../netstat.c:635 ../netstat.c:756 ../netstat.c:888 --#: ../netstat.c:1019 ../netstat.c:1024 -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "" - --#: ../netstat.c:610 ../netstat.c:615 ../netstat.c:623 ../netstat.c:630 -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 - #, c-format - msgid "warning, got bogus igmp line %d.\n" - msgstr "" - --#: ../netstat.c:673 -+#: ../netstat.c:677 -+#, c-format - msgid "Active X.25 sockets\n" - msgstr "" - - #. IMHO, Vr/Vs is not very usefull --SF --#: ../netstat.c:675 -+#: ../netstat.c:679 -+#, c-format - msgid "" --"Dest Source Device LCI State Vr/Vs Send-Q " --"Recv-Q\n" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" - msgstr "" - --#: ../netstat.c:752 -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "" - --#: ../netstat.c:793 ../netstat.c:943 ../netstat.c:1062 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "" - --#: ../netstat.c:797 -+#: ../netstat.c:804 - #, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "" - --#: ../netstat.c:802 -+#: ../netstat.c:809 - #, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "" - --#: ../netstat.c:807 -+#: ../netstat.c:814 - #, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "" - --#: ../netstat.c:812 ../netstat.c:952 ../netstat.c:1072 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "" - --#: ../netstat.c:884 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "" - --#: ../netstat.c:902 ../netstat.c:1162 ../netstat.c:1195 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "" - --#: ../netstat.c:948 ../netstat.c:1067 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "" - --#: ../netstat.c:1033 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "" - --#: ../netstat.c:1115 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "" - --#: ../netstat.c:1142 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "" - --#: ../netstat.c:1146 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "" - --#: ../netstat.c:1150 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "" - --#: ../netstat.c:1154 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "" - --#: ../netstat.c:1158 -+#: ../netstat.c:1171 - msgid "SEQPACKET" - msgstr "" - --#: ../netstat.c:1167 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "" - --#: ../netstat.c:1183 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "" - --#: ../netstat.c:1187 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "" - --#: ../netstat.c:1191 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "" - --#: ../netstat.c:1222 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " - msgstr "" - --#: ../netstat.c:1224 ../netstat.c:1735 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "" - --#: ../netstat.c:1227 ../netstat.c:1738 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "" - --#: ../netstat.c:1229 ../netstat.c:1740 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "" - --#: ../netstat.c:1232 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" - msgstr "" - --#: ../netstat.c:1234 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr "" - --#: ../netstat.c:1254 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "" - --#: ../netstat.c:1257 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "" - --#: ../netstat.c:1271 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "" - --#: ../netstat.c:1272 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "" - --#: ../netstat.c:1315 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "" - --#: ../netstat.c:1366 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " - "State" - msgstr "" - --#: ../netstat.c:1368 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr "" - --#: ../netstat.c:1402 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "" - --#: ../netstat.c:1410 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "" - --#: ../netstat.c:1448 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" - msgstr "" - --#: ../netstat.c:1452 -+#: ../netstat.c:1465 -+#, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" - msgstr "" - --#: ../netstat.c:1456 -+#: ../netstat.c:1469 - msgid "missing interface information" - msgstr "" - --#: ../netstat.c:1479 -+#: ../netstat.c:1492 -+#, c-format - msgid "" --"usage: netstat [-veenNcCF] [] -r netstat " --"{-V|--version|-h|--help}\n" -+"usage: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" -+"help}\n" - msgstr "" - --#: ../netstat.c:1480 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [ ...]\n" - msgstr "" - --#: ../netstat.c:1481 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - msgstr "" - --#: ../netstat.c:1483 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr "" - --#: ../netstat.c:1484 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr "" - --#: ../netstat.c:1485 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr "" - --#: ../netstat.c:1486 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr "" - --#: ../netstat.c:1488 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" - msgstr "" - --#: ../netstat.c:1492 -+#: ../netstat.c:1505 -+#, c-format - msgid " --numeric-hosts don't resolve host names\n" - msgstr "" - --#: ../netstat.c:1493 -+#: ../netstat.c:1506 -+#, c-format - msgid " --numeric-ports don't resolve port names\n" - msgstr "" - --#: ../netstat.c:1494 -+#: ../netstat.c:1507 -+#, c-format - msgid " --numeric-users don't resolve user names\n" - msgstr "" - --#: ../netstat.c:1495 -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr "" - --#: ../netstat.c:1496 ../route.c:88 -+#: ../netstat.c:1509 ../route.c:88 -+#, c-format - msgid " -e, --extend display other/more information\n" - msgstr "" - --#: ../netstat.c:1497 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr "" - --#: ../netstat.c:1498 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" - msgstr "" - --#: ../netstat.c:1499 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" - msgstr "" - --#: ../netstat.c:1500 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr "" - --#: ../netstat.c:1501 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr "" - --#: ../netstat.c:1502 ../route.c:89 -+#: ../netstat.c:1515 ../route.c:89 -+#, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" - msgstr "" - --#: ../netstat.c:1503 ../route.c:90 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" - msgstr "" - --#: ../netstat.c:1505 -+#: ../netstat.c:1518 -+#, c-format - msgid "" --" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - msgstr "" - --#: ../netstat.c:1506 ../route.c:92 -+#: ../netstat.c:1519 - #, c-format --msgid " =Use '-A ' or '--'; default: %s\n" -+msgid " =Use '-6|-4' or '-A ' or '--'; default: %s\n" - msgstr "" - --#: ../netstat.c:1507 ../route.c:93 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" - msgstr "" - --#: ../netstat.c:1732 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "" - --#: ../netstat.c:1742 -+#: ../netstat.c:1763 -+#, c-format - msgid "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - msgstr "" - --#: ../netstat.c:1744 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr "" - --#: ../netstat.c:1747 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr "" - --#: ../netstat.c:1777 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" - msgstr "" - --#: ../netstat.c:1778 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "" - -@@ -986,23 +1143,28 @@ - msgstr "" - - #: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" - msgstr "" - - #: ../rarp.c:177 -+#, c-format - msgid " rarp -d delete entry from cache.\n" - msgstr "" - - #: ../rarp.c:178 -+#, c-format - msgid " rarp [] -s add entry to cache.\n" - msgstr "" - - #: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" - msgstr "" - - #: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1019,38 +1181,50 @@ - msgstr "" - - #: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [] List kernel routing tables\n" - msgstr "" - - #: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" - msgstr "" - - #: ../route.c:83 -+#, c-format - msgid "" - " route {-h|--help} [] Detailed usage syntax for " - "specified AF.\n" - msgstr "" - - #: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" - "\n" - msgstr "" - -+#: ../route.c:92 -+#, c-format -+msgid " =Use '-A ' or '--'; default: %s\n" -+msgstr "" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr "" - - #: ../plipconfig.c:68 -+#, c-format - msgid " plipconfig -V | --version\n" - msgstr "" - -@@ -1060,61 +1234,75 @@ - msgstr "" - - #: ../iptunnel.c:85 -+#, c-format - msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" - msgstr "" - - #: ../iptunnel.c:86 -+#, c-format - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" - msgstr "" - - #: ../iptunnel.c:87 -+#, c-format - msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - msgstr "" - - #: ../iptunnel.c:88 -+#, c-format - msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" - msgstr "" - - #: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" - msgstr "" - - #: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "" - - #: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr "" - - #: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr "" - - #: ../iptunnel.c:93 -+#, c-format - msgid " TTL := { 1..255 | inherit }\n" - msgstr "" - - #: ../iptunnel.c:94 -+#, c-format - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" - msgstr "" - - #: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "" - - #: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "" - - #: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "" - - #: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "" - -@@ -1128,22 +1316,27 @@ - msgstr "" - - #: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr "" - - #: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr "" - - #: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr "" - - #: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr "" - - #: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" - msgstr "" - -@@ -1153,10 +1346,12 @@ - msgstr "" - - #: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "" - - #: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "" - -@@ -1563,12 +1758,12 @@ - - #: ../statistics.c:178 - #, c-format --msgid "%u packets directly received from backlog" -+msgid "%u of bytes directly received from backlog" - msgstr "" - - #: ../statistics.c:180 - #, c-format --msgid "%u packets directly received from prequeue" -+msgid "%u of bytes directly received from prequeue" - msgstr "" - - #: ../statistics.c:182 -@@ -1578,7 +1773,7 @@ - - #: ../statistics.c:183 - #, c-format --msgid "%u packets header predicted" -+msgid "%u packet headers predicted" - msgstr "" - - #: ../statistics.c:184 -@@ -1591,19 +1786,209 @@ - msgid "Ran %u times out of system memory during packet sending" - msgstr "" - --#: ../statistics.c:253 -+#: ../statistics.c:188 -+#, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "" -+ -+#: ../statistics.c:189 -+#, c-format -+msgid "%u predicted acknowledgments" -+msgstr "" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" -+ -+#: ../statistics.c:192 -+#, c-format -+msgid "%u bad SACKs received" -+msgstr "" -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "" -+ -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:197 -+#, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, c-format -+msgid "%u retransmits lost" -+msgstr "" -+ -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, c-format -+msgid "%u fast retransmits" -+msgstr "" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "" -+ -+#: ../statistics.c:210 -+#, c-format -+msgid "%u sack retransmits failed" -+msgstr "" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, c-format -+msgid "%u DSACKs received" -+msgstr "" -+ -+#: ../statistics.c:216 -+#, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "" -+ -+#: ../statistics.c:217 -+#, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "" -+ -+#: ../statistics.c:218 -+#, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "" -+ -+#: ../statistics.c:219 -+#, c-format -+msgid "%u connections reset due to early user close" -+msgstr "" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "" -+ -+#: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "" - --#: ../statistics.c:253 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "" - --#: ../statistics.c:336 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "" - --#: ../statistics.c:349 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "" - -@@ -1617,7 +2002,7 @@ - msgid "Cannot change line discipline to `%s'.\n" - msgstr "" - --#: ../lib/af.c:153 ../lib/hw.c:156 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "" - -@@ -1633,11 +2018,11 @@ - msgid "IPv6" - msgstr "" - --#: ../lib/af.c:164 ../lib/hw.c:177 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "" - --#: ../lib/af.c:167 ../lib/hw.c:183 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "" - -@@ -1649,7 +2034,7 @@ - msgid "Appletalk DDP" - msgstr "" - --#: ../lib/af.c:176 ../lib/hw.c:218 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "" - -@@ -1657,19 +2042,21 @@ - msgid "CCITT X.25" - msgstr "" - --#: ../lib/af.c:182 ../lib/hw.c:180 -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "" - --#: ../lib/af.c:185 ../lib/hw.c:168 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "" - - #: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "" - - #: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "" - -@@ -1694,6 +2081,7 @@ - msgstr "" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - msgstr "" - -@@ -1712,22 +2100,21 @@ - msgstr "" - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1783,90 +2170,94 @@ - msgid "in_hippi(%s): trailing junk!\n" - msgstr "" - --#: ../lib/hw.c:155 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "" - --#: ../lib/hw.c:158 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "" - --#: ../lib/hw.c:159 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "" - --#: ../lib/hw.c:160 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "" - --#: ../lib/hw.c:161 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "" - --#: ../lib/hw.c:162 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "" - --#: ../lib/hw.c:165 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "" - --#: ../lib/hw.c:171 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "" - --#: ../lib/hw.c:174 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "" - --#: ../lib/hw.c:186 -+#: ../lib/hw.c:191 - msgid "generic X.25" - msgstr "" - --#: ../lib/hw.c:189 -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" - msgstr "" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "" - --#: ../lib/hw.c:196 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "" - --#: ../lib/hw.c:199 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "" - --#: ../lib/hw.c:202 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "" - --#: ../lib/hw.c:206 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "" - --#: ../lib/hw.c:209 -+#: ../lib/hw.c:214 - msgid "IrLAP" - msgstr "" - --#: ../lib/hw.c:212 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "" - --#: ../lib/hw.c:214 -+#: ../lib/hw.c:219 - msgid "16/4 Mbps Token Ring (New)" - msgstr "" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" -@@ -1877,131 +2268,157 @@ - msgstr "" - - #: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "" - - #: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" - msgstr "" - - #: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" - msgstr "" - - #: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "" - - #: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" - msgstr "" - - #: ../lib/inet6_gr.c:157 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" - msgstr "" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "" - - #: ../lib/inet6_sr.c:47 -+#, c-format - msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" - msgstr "" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr "" - - #: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" - msgstr "" - - #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format - msgid "INET (IPv4) not configured in this system.\n" - msgstr "" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" - msgstr "" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" - msgstr "" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" - msgstr "" - - #: ../lib/inet_gr.c:62 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface MSS Window irtt\n" - msgstr "" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\n" - msgstr "" - - #: ../lib/inet_gr.c:258 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface\n" - msgstr "" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" - msgstr "" - - #: ../lib/inet_gr.c:266 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt HH Arp\n" - msgstr "" - - #: ../lib/inet_gr.c:290 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" - msgstr "" - --#: ../lib/inet_sr.c:50 -+#: ../lib/inet_sr.c:51 -+#, c-format - msgid "" - "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " - "[[dev] If]\n" - msgstr "" - --#: ../lib/inet_sr.c:51 -+#: ../lib/inet_sr.c:52 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" - msgstr "" - --#: ../lib/inet_sr.c:52 -+#: ../lib/inet_sr.c:53 -+#, c-format - msgid "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - msgstr "" - --#: ../lib/inet_sr.c:53 -+#: ../lib/inet_sr.c:54 -+#, c-format - msgid " [mod] [dyn] [reinstate] [[dev] If]\n" - msgstr "" - --#: ../lib/inet_sr.c:54 -+#: ../lib/inet_sr.c:55 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" - msgstr "" - --#: ../lib/inet_sr.c:55 -+#: ../lib/inet_sr.c:56 -+#, c-format - msgid " inet_route [-FC] flush NOT supported\n" - msgstr "" - -@@ -2011,14 +2428,17 @@ - msgstr "" - - #: ../lib/inet_sr.c:174 -+#, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "" - -@@ -2033,73 +2453,90 @@ - msgstr "" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" - msgstr "" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" - msgstr "" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" - msgstr "" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" - msgstr "" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" - msgstr "" - - #: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "" - - #: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "" - - #: ../lib/masq_info.c:204 -+#, c-format - msgid "" --"prot expire initseq delta prevd source destination " --" ports\n" -+"prot expire initseq delta prevd source " -+"destination ports\n" - msgstr "" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" - msgstr "" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" - msgstr "" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" - msgstr "" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" - msgstr "" - -@@ -2108,287 +2545,314 @@ - msgstr "" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" - msgstr "" - --#: ../lib/tr.c:70 ../lib/tr.c:85 -+#: ../lib/tr.c:86 ../lib/tr.c:101 - #, c-format - msgid "in_tr(%s): invalid token ring address!\n" - msgstr "" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "" - --#: ../lib/interface.c:164 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" - msgstr "" - --#: ../lib/interface.c:316 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "" - - #. Give better error message for this case. --#: ../lib/interface.c:556 -+#: ../lib/interface.c:571 - msgid "Device not found" - msgstr "" - --#: ../lib/interface.c:560 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" - msgstr "" - --#: ../lib/interface.c:593 -+#: ../lib/interface.c:608 - msgid " - no statistics available -" - msgstr "" - --#: ../lib/interface.c:597 -+#: ../lib/interface.c:612 -+#, c-format - msgid "[NO FLAGS]" - msgstr "" - --#: ../lib/interface.c:673 -+#: ../lib/interface.c:688 - #, c-format - msgid "%-9.9s Link encap:%s " - msgstr "" - --#: ../lib/interface.c:678 -+#: ../lib/interface.c:693 - #, c-format - msgid "HWaddr %s " - msgstr "" - --#: ../lib/interface.c:681 -+#: ../lib/interface.c:696 - #, c-format - msgid "Media:%s" - msgstr "" - --#: ../lib/interface.c:683 -+#: ../lib/interface.c:698 -+#, c-format - msgid "(auto)" - msgstr "" - --#: ../lib/interface.c:690 -+#: ../lib/interface.c:705 - #, c-format - msgid " %s addr:%s " - msgstr "" - --#: ../lib/interface.c:693 -+#: ../lib/interface.c:708 - #, c-format - msgid " P-t-P:%s " - msgstr "" - --#: ../lib/interface.c:696 -+#: ../lib/interface.c:711 - #, c-format - msgid " Bcast:%s " - msgstr "" - --#: ../lib/interface.c:698 -+#: ../lib/interface.c:713 - #, c-format - msgid " Mask:%s\n" - msgstr "" - --#: ../lib/interface.c:715 -+#: ../lib/interface.c:730 - #, c-format - msgid " inet6 addr: %s/%d" - msgstr "" - --#: ../lib/interface.c:717 -+#: ../lib/interface.c:732 -+#, c-format - msgid " Scope:" - msgstr "" - --#: ../lib/interface.c:720 -+#: ../lib/interface.c:735 -+#, c-format - msgid "Global" - msgstr "" - --#: ../lib/interface.c:723 -+#: ../lib/interface.c:738 -+#, c-format - msgid "Link" - msgstr "" - --#: ../lib/interface.c:726 -+#: ../lib/interface.c:741 -+#, c-format - msgid "Site" - msgstr "" - --#: ../lib/interface.c:729 -+#: ../lib/interface.c:744 -+#, c-format - msgid "Compat" - msgstr "" - --#: ../lib/interface.c:732 -+#: ../lib/interface.c:747 -+#, c-format - msgid "Host" - msgstr "" - --#: ../lib/interface.c:735 -+#: ../lib/interface.c:750 -+#, c-format - msgid "Unknown" - msgstr "" - --#: ../lib/interface.c:750 -+#: ../lib/interface.c:765 - #, c-format - msgid " IPX/Ethernet II addr:%s\n" - msgstr "" - --#: ../lib/interface.c:753 -+#: ../lib/interface.c:768 - #, c-format - msgid " IPX/Ethernet SNAP addr:%s\n" - msgstr "" - --#: ../lib/interface.c:756 -+#: ../lib/interface.c:771 - #, c-format - msgid " IPX/Ethernet 802.2 addr:%s\n" - msgstr "" - --#: ../lib/interface.c:759 -+#: ../lib/interface.c:774 - #, c-format - msgid " IPX/Ethernet 802.3 addr:%s\n" - msgstr "" - --#: ../lib/interface.c:769 -+#: ../lib/interface.c:784 - #, c-format - msgid " EtherTalk Phase 2 addr:%s\n" - msgstr "" - --#: ../lib/interface.c:778 -+#: ../lib/interface.c:793 - #, c-format - msgid " econet addr:%s\n" - msgstr "" - --#: ../lib/interface.c:785 -+#: ../lib/interface.c:800 -+#, c-format - msgid "[NO FLAGS] " - msgstr "" - --#: ../lib/interface.c:787 -+#: ../lib/interface.c:802 -+#, c-format - msgid "UP " - msgstr "" - --#: ../lib/interface.c:789 -+#: ../lib/interface.c:804 -+#, c-format - msgid "BROADCAST " - msgstr "" - --#: ../lib/interface.c:791 -+#: ../lib/interface.c:806 -+#, c-format - msgid "DEBUG " - msgstr "" - --#: ../lib/interface.c:793 -+#: ../lib/interface.c:808 -+#, c-format - msgid "LOOPBACK " - msgstr "" - --#: ../lib/interface.c:795 -+#: ../lib/interface.c:810 -+#, c-format - msgid "POINTOPOINT " - msgstr "" - --#: ../lib/interface.c:797 -+#: ../lib/interface.c:812 -+#, c-format - msgid "NOTRAILERS " - msgstr "" - --#: ../lib/interface.c:799 -+#: ../lib/interface.c:814 -+#, c-format - msgid "RUNNING " - msgstr "" - --#: ../lib/interface.c:801 -+#: ../lib/interface.c:816 -+#, c-format - msgid "NOARP " - msgstr "" - --#: ../lib/interface.c:803 -+#: ../lib/interface.c:818 -+#, c-format - msgid "PROMISC " - msgstr "" - --#: ../lib/interface.c:805 -+#: ../lib/interface.c:820 -+#, c-format - msgid "ALLMULTI " - msgstr "" - --#: ../lib/interface.c:807 -+#: ../lib/interface.c:822 -+#, c-format - msgid "SLAVE " - msgstr "" - --#: ../lib/interface.c:809 -+#: ../lib/interface.c:824 -+#, c-format - msgid "MASTER " - msgstr "" - --#: ../lib/interface.c:811 -+#: ../lib/interface.c:826 -+#, c-format - msgid "MULTICAST " - msgstr "" - --#: ../lib/interface.c:814 -+#: ../lib/interface.c:829 -+#, c-format - msgid "DYNAMIC " - msgstr "" - - #. DONT FORGET TO ADD THE FLAGS IN ife_print_short --#: ../lib/interface.c:817 -+#: ../lib/interface.c:832 - #, c-format - msgid " MTU:%d Metric:%d" - msgstr "" - --#: ../lib/interface.c:821 -+#: ../lib/interface.c:836 - #, c-format - msgid " Outfill:%d Keepalive:%d" - msgstr "" - --#: ../lib/interface.c:835 -+#: ../lib/interface.c:850 - #, c-format - msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" - msgstr "" - --#: ../lib/interface.c:840 -+#: ../lib/interface.c:855 - #, c-format - msgid " compressed:%lu\n" - msgstr "" - --#: ../lib/interface.c:852 -+#: ../lib/interface.c:895 - #, c-format - msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" - msgstr "" - --#: ../lib/interface.c:856 -+#: ../lib/interface.c:899 - #, c-format - msgid " collisions:%lu " - msgstr "" - --#: ../lib/interface.c:858 -+#: ../lib/interface.c:901 - #, c-format - msgid "compressed:%lu " - msgstr "" - --#: ../lib/interface.c:860 -+#: ../lib/interface.c:903 - #, c-format - msgid "txqueuelen:%d " - msgstr "" - --#: ../lib/interface.c:862 -+#: ../lib/interface.c:905 - #, c-format - msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" - msgstr "" - --#: ../lib/interface.c:873 -+#: ../lib/interface.c:916 - #, c-format - msgid "Interrupt:%d " - msgstr "" - - #. Only print devices using it for - #. I/O maps --#: ../lib/interface.c:876 -+#: ../lib/interface.c:919 - #, c-format - msgid "Base address:0x%x " - msgstr "" - --#: ../lib/interface.c:878 -+#: ../lib/interface.c:921 - #, c-format - msgid "Memory:%lx-%lx " - msgstr "" - --#: ../lib/interface.c:881 -+#: ../lib/interface.c:924 - #, c-format - msgid "DMA chan:%x " - msgstr "" - - #: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "" - -@@ -2413,14 +2877,17 @@ - msgstr "" - - #: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr "" - - #: ../ipmaddr.c:62 -+#, c-format - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - msgstr "" - - #: ../ipmaddr.c:63 -+#, c-format - msgid " ipmaddr -V | -version\n" - msgstr "" - -@@ -2449,6 +2916,7 @@ - msgstr "" - - #: ../slattach.c:192 -+#, c-format - msgid "slattach: cannot write PID file\n" - msgstr "" - -@@ -2468,18 +2936,22 @@ - msgstr "" - - #: ../slattach.c:468 -+#, c-format - msgid "slattach: tty name too long\n" - msgstr "" - - #: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "" - - #: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" - msgstr "" - - #: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "" - -@@ -2489,6 +2961,7 @@ - msgstr "" - - #: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "" - ---- net-tools-1.60.orig/po/cs.po -+++ net-tools-1.60/po/cs.po -@@ -5,7 +5,8 @@ - msgid "" - msgstr "" - "Project-Id-Version: net-tools-1.51\n" --"POT-Creation-Date: 2000-02-14 02:31+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" - "PO-Revision-Date: 1999-08-29 23:20+0200\n" - "Last-Translator: Jiøí Pavlovský \n" - "Language-Team: Czech \n" -@@ -13,96 +14,110 @@ - "Content-Type: text/plain; charset=iso-8859-2\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../arp.c:110 ../arp.c:269 -+#: ../arp.c:112 ../arp.c:279 -+#, c-format - msgid "arp: need host name\n" - msgstr "arp: je tøeba jméno poèítaèe\n" - --#: ../arp.c:207 ../arp.c:221 -+#: ../arp.c:215 ../arp.c:230 - #, c-format - msgid "No ARP entry for %s\n" - msgstr "Pro %s neexistuje ARP polo¾ka\n" - --#: ../arp.c:239 -+#: ../arp.c:248 - #, c-format - msgid "arp: cant get HW-Address for `%s': %s.\n" - msgstr "arp: HW adresu `%s' nelze zjistit: %s\n" - --#: ../arp.c:243 -+#: ../arp.c:252 -+#, c-format - msgid "arp: protocol type mismatch.\n" - msgstr "arp: chybnì zadaný typ protokolu\n" - --#: ../arp.c:252 -+#: ../arp.c:261 - #, c-format - msgid "arp: device `%s' has HW address %s `%s'.\n" - msgstr "arp: zaøízení `%s' má Hw adresu %s `%s'.\n" - --#: ../arp.c:282 -+#: ../arp.c:293 -+#, c-format - msgid "arp: need hardware address\n" - msgstr "arp: je tøeba hardwarová adresa\n" - --#: ../arp.c:290 -+#: ../arp.c:301 -+#, c-format - msgid "arp: invalid hardware address\n" - msgstr "arp: nesprávná hardwarová adresa\n" - --#: ../arp.c:387 -+#: ../arp.c:398 - #, c-format - msgid "arp: cannot open etherfile %s !\n" - msgstr "arp: databázi ethernetových adres %s nelze otevøít!\n" - --#: ../arp.c:403 -+#: ../arp.c:414 - #, c-format - msgid "arp: format error on line %u of etherfile %s !\n" - msgstr "arp: syntaktická chyba na øádku %u databáze ethernetových adres %s!\n" - --#: ../arp.c:416 -+#: ../arp.c:427 - #, c-format - msgid "arp: cannot set entry on line %u of etherfile %s !\n" - msgstr "" - "arp: polo¾ku na øádku %u databáze ethernetových adres %s nelze nastavit!\n" - --#: ../arp.c:437 --msgid "Address\t\t\tHWtype\tHWaddress\t Flags Mask\t\t Iface\n" -+#: ../arp.c:448 -+#, fuzzy, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" - msgstr "Adresa\t\t\t HWtyp\t HWadresa\t Pøíz Maska\t\t Rozhraní\n" - --#: ../arp.c:467 -+#: ../arp.c:476 -+#, fuzzy -+msgid "" -+msgstr " rozhraní %s\n" -+ -+#: ../arp.c:478 - msgid "(incomplete)" - msgstr "(nekompletní)" - --#: ../arp.c:484 -+#: ../arp.c:495 - #, c-format - msgid "%s (%s) at " - msgstr "%s (%s) na " - --#: ../arp.c:490 -+#: ../arp.c:501 -+#, c-format - msgid " " - msgstr "" - --#: ../arp.c:496 -+#: ../arp.c:507 - #, c-format - msgid "netmask %s " - msgstr "sí»ová maska %s " - --#: ../arp.c:513 -+#: ../arp.c:524 - #, c-format - msgid "on %s\n" - msgstr "na %s\n" - --#: ../arp.c:592 -+#: ../arp.c:605 - #, c-format - msgid "Entries: %d\tSkipped: %d\tFound: %d\n" - msgstr "Polo¾ky: %d\tVynecháno: %d\tNalezeno: %d\n" - --#: ../arp.c:596 -+#: ../arp.c:609 - #, c-format - msgid "%s (%s) -- no entry\n" - msgstr "%s (%s) -- ¾ádná polo¾ka\n" - --#: ../arp.c:598 -+#: ../arp.c:611 - #, c-format - msgid "arp: in %d entries no match found.\n" - msgstr "arp: ¾ádná z polo¾ek (%d) nevyhovuje.\n" - --#: ../arp.c:613 -+#: ../arp.c:626 -+#, c-format - msgid "" - "Usage:\n" - " arp [-vn] [] [-i ] [-a] [] <-Display ARP " -@@ -112,49 +127,46 @@ - " arp [-vn] [] [-i [-a] [] <-Zobrazí ARP " - "cache\n" - --#: ../arp.c:614 -+#: ../arp.c:627 -+#, fuzzy, c-format - msgid "" --" arp [-v] [-i ] -d [pub][nopub] <-Delete ARP " -+" arp [-v] [-i ] -d [pub] <-Delete ARP " - "entry\n" - msgstr "" - " arp [-v] [-i ] -d [pub][nopub] <-Sma¾e polo¾ku " - "ARP\n" - --#: ../arp.c:615 --#, fuzzy -+#: ../arp.c:628 -+#, fuzzy, c-format - msgid "" --" arp [-vnD] [] [-i ] -f [] <-Add entry from " -+" arp [-vnD] [] [-i ] -f [] <-Add entry from " - "file\n" - msgstr "" - " arp [-vnD] [] [-i ] -f <-Pøidá polo¾ku " - "ze\n" - " souboru\n" - --#: ../arp.c:616 -+#: ../arp.c:629 -+#, fuzzy, c-format - msgid "" --" arp [-v] [] [-i ] -s [temp][nopub] <-Add " -+" arp [-v] [] [-i ] -s [temp] <-Add " - "entry\n" - msgstr "" - " arp [-v] [ [-i -s [temp][nopub] <-Pøidá " - "polo¾ku\n" - --#: ../arp.c:617 --msgid "" --" arp [-v] [] [-i ] -s [netmask ] pub " --"<-''-\n" --msgstr "" --" arp [-v] [] [-i ] -s [sí»mask <èís>] <-''-\n" -- --#: ../arp.c:618 -+#: ../arp.c:630 -+#, fuzzy, c-format - msgid "" --" arp [-v] [] [-i ] -Ds [netmask ] pub " -+" arp [-v] [] [-i ] -Ds [netmask ] pub " - "<-''-\n" - "\n" - msgstr "" - " arp [-v] [ [-i -Ds [sí»mask <èís>] pub " - "<-''-\n" - --#: ../arp.c:620 -+#: ../arp.c:632 -+#, c-format - msgid "" - " -a display (all) hosts in alternative (BSD) " - "style\n" -@@ -162,126 +174,134 @@ - " -a zobrazí jmna v¹ech poèítaèù alternativním\n" - " (BSD) zpùsobem\n" - --#: ../arp.c:621 -+#: ../arp.c:633 -+#, c-format - msgid " -s, --set set a new ARP entry\n" - msgstr " -s, --set nastaví novou ARP polo¾ku\n" - --#: ../arp.c:622 -+#: ../arp.c:634 -+#, c-format - msgid " -d, --delete delete a specified entry\n" - msgstr " -d, --delete sma¾e zadanou ARP polo¾ku\n" - --#: ../arp.c:623 ../netstat.c:1436 ../route.c:85 -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format - msgid " -v, --verbose be verbose\n" - msgstr "" - " -v, --verbose bude vypisovat podrobné zprávy\n" - " o èinnosti\n" - --#: ../arp.c:624 ../netstat.c:1437 ../route.c:86 --msgid " -n, --numeric dont resolve names\n" -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, fuzzy, c-format -+msgid " -n, --numeric don't resolve names\n" - msgstr "" - " -n, --numeric nebude pøevádìt èíselné adresy\n" - " na kanonická jména\n" - --#: ../arp.c:625 -+#: ../arp.c:637 -+#, c-format - msgid "" - " -i, --device specify network interface (e.g. eth0)\n" - msgstr " -i, --device zadává sí»ové rozhraní (napø. eth0)\n" - --#: ../arp.c:626 -+#: ../arp.c:638 -+#, c-format - msgid " -D, --use-device read from given device\n" - msgstr " -D, --use-device ète ze zadaného zaøízení\n" - --#: ../arp.c:627 --#, fuzzy -+#: ../arp.c:639 -+#, fuzzy, c-format - msgid " -A, -p, --protocol specify protocol family\n" - msgstr " -r, --route vypí¹e smìrovací tabulku\n" - --#: ../arp.c:628 --#, fuzzy -+#: ../arp.c:640 -+#, fuzzy, c-format - msgid "" --" -f, --file read new entries from file or from " --"/etc/ethers\n" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" - "\n" - msgstr "" - " -f, --file ète nové polo¾ky ze souboru\n" - "\n" - --#: ../arp.c:630 ../rarp.c:181 -+#: ../arp.c:642 ../rarp.c:182 - #, c-format - msgid " =Use '-H ' to specify hardware address type. Default: %s\n" - msgstr "" - " =Pou¾ijte '-H pro zadání hardwarového typu adresy.\n" - " Implicitnì: %s\n" - --#: ../arp.c:631 ../rarp.c:182 -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format - msgid " List of possible hardware types (which support ARP):\n" - msgstr " Seznam mo¾ných hardwarových typù (podporujících ARP):\n" - --#: ../arp.c:664 -+#: ../arp.c:677 ../arp.c:762 - #, c-format - msgid "%s: hardware type not supported!\n" - msgstr "hardwarový typ %s není podporován!\n" - --#: ../arp.c:668 -+#: ../arp.c:681 - #, c-format - msgid "%s: address family not supported!\n" - msgstr "tøída adres %s není podporována!\n" - --#: ../arp.c:703 -+#: ../arp.c:716 -+#, c-format - msgid "arp: -N not yet supported.\n" - msgstr "arp: pøepínaè -N není zatím podporován\n" - --#: ../arp.c:713 -+#: ../arp.c:726 - #, c-format - msgid "arp: %s: unknown address family.\n" - msgstr "arp: neznámá tøída adres %s.\n" - --#: ../arp.c:722 -+#: ../arp.c:735 - #, c-format - msgid "arp: %s: unknown hardware type.\n" - msgstr "arp: neznámý hardwarový typ %s.\n" - --#: ../arp.c:741 -+#: ../arp.c:754 - #, c-format - msgid "arp: %s: kernel only supports 'inet'.\n" - msgstr "arp: %s: jádro podporuje pouze 'inet'.\n" - --#: ../arp.c:746 -+#: ../arp.c:767 - #, c-format - msgid "arp: %s: hardware type without ARP support.\n" - msgstr "arp: hardwarový typ %s nepodporuje ARP.\n" - --#: ../hostname.c:69 -+#: ../hostname.c:71 - #, c-format - msgid "Setting nodename to `%s'\n" - msgstr "Nastavuji jméno uzlu na `%s'\n" - --#: ../hostname.c:74 -+#: ../hostname.c:76 - #, c-format - msgid "%s: you must be root to change the node name\n" - msgstr "%s: jméno uzlu mù¾e zmìnit pouze superu¾ivatel\n" - --#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116 -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 - #, c-format - msgid "%s: name too long\n" - msgstr "jméno %s je pøíli¹ dlouhé\n" - --#: ../hostname.c:89 -+#: ../hostname.c:91 - #, c-format - msgid "Setting hostname to `%s'\n" - msgstr "Nastavuji jméno poèítaèe na `%s'\n" - --#: ../hostname.c:94 -+#: ../hostname.c:96 - #, c-format - msgid "%s: you must be root to change the host name\n" - msgstr "%s: jméno poèítaèe mù¾e zmìnit pouze superu¾ivatel\n" - --#: ../hostname.c:108 -+#: ../hostname.c:109 - #, c-format - msgid "Setting domainname to `%s'\n" - msgstr "Nastavuji jméno domény na `%s'\n" - --#: ../hostname.c:113 -+#: ../hostname.c:114 - #, c-format - msgid "%s: you must be root to change the domain name\n" - msgstr "%s: jméno domény mù¾e zmìnit pouze superu¾ivatel\n" -@@ -306,26 +326,29 @@ - msgid "Result: h_addr_list=`%s'\n" - msgstr "Výsledek: h_addr_list=`%s'\n" - --#: ../hostname.c:209 -+#: ../hostname.c:208 - #, c-format - msgid "%s: can't open `%s'\n" - msgstr "%s: `%s' nelze otevøít\n" - --#: ../hostname.c:223 -+#: ../hostname.c:222 -+#, c-format - msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" - msgstr "" - "Pou¾ití:\n" - " hostname [-v] {jméno|-F soubor} nastaví jméno poèítaèe (ze " - "souboru)\n" - --#: ../hostname.c:224 -+#: ../hostname.c:223 -+#, c-format - msgid "" - " domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" - msgstr "" - " domainname [-v] {jméno|-F soubor} nastaví jméno NIS domény (ze\n" - " souboru)\n" - --#: ../hostname.c:226 -+#: ../hostname.c:225 -+#, c-format - msgid "" - " nodename [-v] {nodename|-F file} set DECnet node name (from " - "file)\n" -@@ -333,11 +356,13 @@ - " nodename [-v] {jméno|-F soubor} nastaví jméno DECnet uzlu (ze\n" - " souboru)\n" - --#: ../hostname.c:228 -+#: ../hostname.c:227 -+#, c-format - msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" - msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] vypí¹e formátované jméno\n" - --#: ../hostname.c:229 -+#: ../hostname.c:228 -+#, c-format - msgid "" - " hostname [-v] display hostname\n" - "\n" -@@ -345,7 +370,8 @@ - " hostname [-v] vypí¹e jméno poèítaèe\n" - "\n" - --#: ../hostname.c:230 -+#: ../hostname.c:229 -+#, c-format - msgid "" - " hostname -V|--version|-h|--help print info and exit\n" - "\n" -@@ -353,7 +379,8 @@ - " hostname -V|--version|-h|--help vypí¹e informace a skonèí\n" - "\n" - --#: ../hostname.c:231 -+#: ../hostname.c:230 -+#, c-format - msgid "" - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" -@@ -361,35 +388,43 @@ - " dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" - "\n" - --#: ../hostname.c:232 -+#: ../hostname.c:231 -+#, c-format - msgid " -s, --short short host name\n" - msgstr " -s, --short krátké jméno poèítaèe\n" - --#: ../hostname.c:233 -+#: ../hostname.c:232 -+#, c-format - msgid " -a, --alias alias names\n" - msgstr " -a, --alias pøezdívky\n" - --#: ../hostname.c:234 -+#: ../hostname.c:233 -+#, c-format - msgid " -i, --ip-address addresses for the hostname\n" - msgstr " -i, --ip-address adresy odpovídající jménu poèítaèe\n" - --#: ../hostname.c:235 -+#: ../hostname.c:234 -+#, c-format - msgid " -f, --fqdn, --long long host name (FQDN)\n" - msgstr " -f, --fqdn, --long dlouhé jméno poèítaèe (kanonické)\n" - --#: ../hostname.c:236 -+#: ../hostname.c:235 -+#, c-format - msgid " -d, --domain DNS domain name\n" - msgstr " -d, --domain jméno DNS domény\n" - --#: ../hostname.c:237 -+#: ../hostname.c:236 -+#, c-format - msgid " -y, --yp, --nis NIS/YP domainname\n" - msgstr " -y, --yp, --nis jméno NIS/YP domény\n" - --#: ../hostname.c:239 -+#: ../hostname.c:238 -+#, c-format - msgid " -n, --node DECnet node name\n" - msgstr " -n, --node jméno DECnet uzlu\n" - --#: ../hostname.c:241 -+#: ../hostname.c:240 -+#, c-format - msgid "" - " -F, --file read hostname or NIS domainname from given file\n" - "\n" -@@ -397,7 +432,8 @@ - " -F, --file ète jméno poèítaèe èi nis domény ze souboru\n" - "\n" - --#: ../hostname.c:243 -+#: ../hostname.c:242 -+#, c-format - msgid "" - " This command can read or set the hostname or the NIS domainname. You can\n" - " also read the DNS domain or the FQDN (fully qualified domain name).\n" -@@ -412,6 +448,7 @@ - msgstr "%s: Tímto pøíkazem nelze DNS jméno domény zmìnit\n" - - #: ../hostname.c:339 -+#, c-format - msgid "" - "\n" - "Unless you are using bind or NIS for host lookups you can change the DNS\n" -@@ -421,6 +458,7 @@ - "zmìnit\n" - - #: ../hostname.c:340 -+#, c-format - msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" - msgstr "" - "DNS jméno domény (je souèástí kanonického jména poèítaèe) v souboru\n" -@@ -441,349 +479,223 @@ - msgid "getnodename()=`%s'\n" - msgstr "getnodename()=`%s'\n" - --#: ../ifconfig.c:159 --#, c-format --msgid "%-9.9s Link encap:%s " --msgstr "%-9.9s Zapouzdøení:%s " -+#: ../ifconfig.c:107 -+#, fuzzy, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "" -+"Rozhr MTU Met PØ-OK PØ-CHYB PØ-ZAH PØ-PØT OD-OK OD-CHYB OD-ZAH OD-PØT " -+"PØZ\n" - --#: ../ifconfig.c:164 --#, c-format --msgid "HWaddr %s " --msgstr "HWadr %s " -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, fuzzy, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: chyba pøi získávání informací o rozhraní %s\n" - --#: ../ifconfig.c:167 -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 - #, c-format --msgid "Media:%s" --msgstr "Médium:%s" -+msgid "No support for INET on this system.\n" -+msgstr "Tento systém nepodporuje INET.\n" - --#: ../ifconfig.c:169 --msgid "(auto)" --msgstr "(auto)" -+#: ../ifconfig.c:193 -+#, fuzzy, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: chyba pøi získávání informací o rozhraní %s\n" - --#: ../ifconfig.c:176 --#, c-format --msgid " %s addr:%s " --msgstr " %s adr:%s " -+#: ../ifconfig.c:202 -+#, fuzzy, c-format -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] [[]
]\n" -+msgstr "" -+"Pou¾ití:\n" -+" ifconfig [-a] [-i] [-v] [[] ]\n" - --#: ../ifconfig.c:179 -+#: ../ifconfig.c:204 - #, c-format --msgid " P-t-P:%s " --msgstr " P-t-P:%s " -+msgid " [add
[/]]\n" -+msgstr " [add [/]]\n" - --# V ostatních katalozích se pøekládá Broadcast -> v¹esmìrové vysílání. --# Tudi¾ bcast -> V¹esmìr :) --#: ../ifconfig.c:182 -+#: ../ifconfig.c:205 - #, c-format --msgid " Bcast:%s " --msgstr " V¹esmìr:%s " -+msgid " [del
[/]]\n" -+msgstr " [del [/]]\n" - --#: ../ifconfig.c:184 -+#: ../ifconfig.c:206 - #, c-format --msgid " Mask:%s\n" --msgstr "Maska:%s\n" -+msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" -+msgstr " [[-]broadcast []] [[-]pointopoint []]\n" - --#: ../ifconfig.c:201 -+#: ../ifconfig.c:207 - #, c-format --msgid " inet6 addr: %s/%d" --msgstr " inet6-adr: %s/%d" -+msgid " [netmask
] [dstaddr
] [tunnel
]\n" -+msgstr " [netmask ] [dstaddr ] [tunnel ]\n" - --#: ../ifconfig.c:203 --msgid " Scope:" --msgstr " Rozsah:" -+#: ../ifconfig.c:210 -+#, c-format -+msgid " [outfill ] [keepalive ]\n" -+msgstr " [outfill ] [keepalive ]\n" - --#: ../ifconfig.c:206 --msgid "Global" --msgstr "Globál" -+#: ../ifconfig.c:212 -+#, c-format -+msgid " [hw
] [metric ] [mtu ]\n" -+msgstr " [hw ] [metric ] [mtu ]\n" - --#: ../ifconfig.c:209 --msgid "Link" --msgstr "Linka" -+#: ../ifconfig.c:213 -+#, c-format -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" - --#: ../ifconfig.c:212 --msgid "Site" --msgstr "Stanovi¹tì" -+#: ../ifconfig.c:214 -+#, c-format -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" - - #: ../ifconfig.c:215 --msgid "Compat" --msgstr "Kompatibilita" -+#, c-format -+msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" -+msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" - --#: ../ifconfig.c:218 --msgid "Host" --msgstr "Poèítaè" -+#: ../ifconfig.c:217 -+#, c-format -+msgid " [txqueuelen ]\n" -+msgstr " [txqueuelen délka]\n" - --#: ../ifconfig.c:221 --msgid "Unknown" --msgstr "Neznám." -+#: ../ifconfig.c:220 -+#, c-format -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" - --#: ../ifconfig.c:236 -+#: ../ifconfig.c:222 - #, c-format --msgid " IPX/Ethernet II addr:%s\n" --msgstr " IPX/Ethernet II adr: %s\n" -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr "" -+" [up|down] ...\n" -+"\n" - --#: ../ifconfig.c:239 -+#: ../ifconfig.c:224 - #, c-format --msgid " IPX/Ethernet SNAP addr:%s\n" --msgstr " IPX/Ethernet SNAP adr:%s\n" -+msgid " =Hardware Type.\n" -+msgstr " =Hardwarový Typ.\n" - --#: ../ifconfig.c:242 -+#: ../ifconfig.c:225 - #, c-format --msgid " IPX/Ethernet 802.2 addr:%s\n" --msgstr " IPX/Ethernet 802.2 adr:%s\n" -+msgid " List of possible hardware types:\n" -+msgstr " Seznam mo¾ných hardwarových typù:\n" - --#: ../ifconfig.c:245 -+#. 1 = ARPable -+#: ../ifconfig.c:227 - #, c-format --msgid " IPX/Ethernet 802.3 addr:%s\n" --msgstr " IPX/Ethernet 802.3 adr:%s\n" -+msgid " =Address family. Default: %s\n" -+msgstr " =tøída adres. Implicitní: %s\n" - --#: ../ifconfig.c:255 -+#: ../ifconfig.c:228 - #, c-format --msgid " EtherTalk Phase 2 addr:%s\n" --msgstr " EtherTalk Phase 2 adr:%s\n" -+msgid " List of possible address families:\n" -+msgstr " Seznam mo¾ných tøíd adres:\n" - --#: ../ifconfig.c:264 -+#: ../ifconfig.c:303 - #, c-format --msgid " econet addr:%s\n" --msgstr " econet adr:%s\n" -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "" - --# Hic sunt leones ... --#: ../ifconfig.c:270 --msgid "[NO FLAGS] " --msgstr "[®ÁDNÉ PØÍZNAKY]" -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "" - --#: ../ifconfig.c:272 --msgid "UP " --msgstr "AKTIVOVÁNO " -+#: ../ifconfig.c:380 -+#, c-format -+msgid "Unknown media type.\n" -+msgstr "Neznámý typ média.\n" - --#: ../ifconfig.c:274 --msgid "BROADCAST " --msgstr "V©ESMÌROVÉ_VYSÍLÁNÍ " -+#: ../ifconfig.c:417 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "" - --#: ../ifconfig.c:276 --msgid "DEBUG " --msgstr "DEBUG " -+#: ../ifconfig.c:429 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:278 --msgid "LOOPBACK " --msgstr "SMYÈKA " -+#: ../ifconfig.c:441 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "" - --#: ../ifconfig.c:280 --msgid "POINTOPOINT " --msgstr "POINTOPOINT " -+#: ../ifconfig.c:465 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "" - --# ?? --#: ../ifconfig.c:282 --msgid "NOTRAILERS " --msgstr "NOTRAILERS " -+#: ../ifconfig.c:523 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "" - --#: ../ifconfig.c:284 --msgid "RUNNING " --msgstr "BÌ®Í " -+#: ../ifconfig.c:652 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "" - --#: ../ifconfig.c:286 --msgid "NOARP " --msgstr "NEARP " -+#: ../ifconfig.c:684 -+#, c-format -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "" - --#: ../ifconfig.c:288 --msgid "PROMISC " --msgstr "PROMISK " -+#: ../ifconfig.c:693 -+#, c-format -+msgid "%s: invalid %s address.\n" -+msgstr "%s: adresa %s je nesprávná.\n" - --#: ../ifconfig.c:290 --msgid "ALLMULTI " --msgstr "ALLMULTI " -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 -+#, c-format -+msgid "No support for INET6 on this system.\n" -+msgstr "Tento systém nepodporuje INET6.\n" - --#: ../ifconfig.c:292 --msgid "SLAVE " --msgstr "SLAVE " -+#: ../ifconfig.c:780 ../ifconfig.c:871 -+#, c-format -+msgid "Interface %s not initialized\n" -+msgstr "" - --#: ../ifconfig.c:294 --msgid "MASTER " --msgstr "MASTER " -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, fuzzy, c-format -+msgid "Bad address.\n" -+msgstr "%s: adresa %s je nesprávná.\n" - --#: ../ifconfig.c:296 --msgid "MULTICAST " --msgstr "MULTICAST " -- --#: ../ifconfig.c:299 --msgid "DYNAMIC " --msgstr "DYNAMIC " -- --#: ../ifconfig.c:302 --#, c-format --msgid " MTU:%d Metric:%d" --msgstr " MTU:%d Metrika:%d" -- --#: ../ifconfig.c:306 --#, c-format --msgid " Outfill:%d Keepalive:%d" --msgstr " Outfill:%d Keepalive:%d" -- --#: ../ifconfig.c:320 --#, c-format --msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" --msgstr "pøijmutých paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu rámcù:%lu\n" -- --#: ../ifconfig.c:325 --#, c-format --msgid " compressed:%lu\n" --msgstr " komprimováno:%lu\n" -- --# carrier? --#: ../ifconfig.c:329 --#, c-format --msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" --msgstr "odeslaných paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu pøenos:%lu\n" -- --#: ../ifconfig.c:333 --#, c-format --msgid " collisions:%lu " --msgstr " kolizí:%lu " -- --#: ../ifconfig.c:335 --#, c-format --msgid "compressed:%lu " --msgstr "komprimováno:%lu " -- --#: ../ifconfig.c:337 --#, c-format --msgid "txqueuelen:%d " --msgstr "délka odchozí fronty:%d " -- --#: ../ifconfig.c:345 --#, c-format --msgid "Interrupt:%d " --msgstr "Pøeru¹ení:%d " -- --#. Only print devices using it for --#. I/O maps --#: ../ifconfig.c:348 --#, c-format --msgid "Base address:0x%x " --msgstr "Vstupnì/Výstupní port:0x%x " -- --#: ../ifconfig.c:350 --#, c-format --msgid "Memory:%lx-%lx " --msgstr "Pamì»:%lx-%lx " -- --#: ../ifconfig.c:353 --#, c-format --msgid "DMA chan:%x " --msgstr "Kanál DMA:%x " -- --#: ../ifconfig.c:384 ../ifconfig.c:405 --#, c-format --msgid "%s: unknown interface: %s\n" --msgstr "%s: rozhraní %s není známo\n" -- --#: ../ifconfig.c:421 --msgid "" --"Usage:\n" --" ifconfig [-a] [-i] [-v] [[]
]\n" --msgstr "" --"Pou¾ití:\n" --" ifconfig [-a] [-i] [-v] [[] ]\n" -- --#: ../ifconfig.c:425 --msgid " [add
[/]]\n" --msgstr " [add [/]]\n" -- --#: ../ifconfig.c:427 --msgid " [del
[/]]\n" --msgstr " [del [/]]\n" -- --#: ../ifconfig.c:432 --msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" --msgstr " [[-]broadcast []] [[-]pointopoint []]\n" -- --#: ../ifconfig.c:433 --msgid " [netmask
] [dstaddr
] [tunnel
]\n" --msgstr " [netmask ] [dstaddr ] [tunnel ]\n" -- --#: ../ifconfig.c:436 --msgid " [outfill ] [keepalive ]\n" --msgstr " [outfill ] [keepalive ]\n" -- --#: ../ifconfig.c:438 --msgid " [hw
] [metric ] [mtu ]\n" --msgstr " [hw ] [metric ] [mtu ]\n" -- --#: ../ifconfig.c:439 --msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" --msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -- --#: ../ifconfig.c:440 --msgid " [multicast] [[-]promisc]\n" --msgstr " [multicast] [[-]promisc]\n" -- --#: ../ifconfig.c:441 --msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" --msgstr " [mem_start ] [io_addr ] [irq ] [media ]\n" -- --#: ../ifconfig.c:443 --msgid " [txqueuelen ]\n" --msgstr " [txqueuelen délka]\n" -- --#: ../ifconfig.c:446 --msgid " [[-]dynamic]\n" --msgstr " [[-]dynamic]\n" -- --#: ../ifconfig.c:448 --msgid "" --" [up|down] ...\n" --"\n" --msgstr "" --" [up|down] ...\n" --"\n" -- --#: ../ifconfig.c:450 --msgid " =Hardware Type.\n" --msgstr " =Hardwarový Typ.\n" -- --#: ../ifconfig.c:451 --msgid " List of possible hardware types:\n" --msgstr " Seznam mo¾ných hardwarových typù:\n" -- --#. 1 = ARPable --#: ../ifconfig.c:453 --#, c-format --msgid " =Address family. Default: %s\n" --msgstr " =tøída adres. Implicitní: %s\n" -- --#: ../ifconfig.c:454 --msgid " List of possible address families:\n" --msgstr " Seznam mo¾ných tøíd adres:\n" -- --#: ../ifconfig.c:593 --msgid "Unknown media type.\n" --msgstr "Neznámý typ média.\n" -- --#: ../ifconfig.c:881 -+#: ../ifconfig.c:885 - #, c-format --msgid "%s: invalid %s address.\n" --msgstr "%s: adresa %s je nesprávná.\n" -- --#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011 --msgid "No support for INET6 on this system.\n" --msgstr "Tento systém nepodporuje INET6.\n" -- --#: ../ifconfig.c:983 - msgid "Address deletion not supported on this system.\n" - msgstr "Tento systém nepodporuje mazání adres.\n" - --#: ../ifconfig.c:1066 --msgid "No support for INET on this system.\n" --msgstr "Tento systém nepodporuje INET.\n" -+#: ../ifconfig.c:957 -+#, fuzzy, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "Nevím, jak nastavit adresu tøídy %d.\n" - --#: ../ifconfig.c:1076 -+#: ../ifconfig.c:983 -+#, c-format - msgid "No support for ECONET on this system.\n" - msgstr "Tento systém nepodporuje ECONET.\n" - --#: ../ifconfig.c:1084 -+#: ../ifconfig.c:991 - #, c-format - msgid "Don't know how to set addresses for family %d.\n" - msgstr "Nevím, jak nastavit adresu tøídy %d.\n" - --#: ../netstat.c:383 -+#: ../ifconfig.c:1021 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "" -+ -+#: ../netstat.c:434 - #, c-format - msgid "" - "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" -@@ -792,7 +704,8 @@ - "jste\n" - "byl superu¾ivatelem)\n" - --#: ../netstat.c:387 -+#: ../netstat.c:438 -+#, c-format - msgid "" - "(Not all processes could be identified, non-owned process info\n" - " will not be shown, you would have to be root to see it all.)\n" -@@ -801,199 +714,223 @@ - "pouze o procesech, jich¾ jste vlastníkem. Aby jste mohl vidìt v¹e, musel\n" - "byste být superu¾ivatelem.)\n" - --#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166 -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 - msgid "LISTENING" - msgstr "NASLOUCHÁ" - --#: ../netstat.c:395 -+#: ../netstat.c:446 - msgid "CONN SENT" - msgstr "CONN ODESLÁN" - --#: ../netstat.c:396 ../netstat.c:1168 -+#: ../netstat.c:447 ../netstat.c:1268 - msgid "DISC SENT" - msgstr "DISC ODESLÁN" - --#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169 -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 - msgid "ESTABLISHED" - msgstr "SPOJENO" - --#: ../netstat.c:419 -+#: ../netstat.c:470 -+#, c-format - msgid "Active NET/ROM sockets\n" - msgstr "Aktivní NET/ROM sokety\n" - --#: ../netstat.c:420 -+#: ../netstat.c:471 -+#, c-format - msgid "" --"User Dest Source Device State Vr/Vs Send-Q " --"Recv-Q\n" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" - msgstr "" --"U¾ivatel Cíl Zdroj Zaøízení Stav Vr/Vs Odch-F " --"Pøích-F\n" -+"U¾ivatel Cíl Zdroj Zaøízení Stav Vr/Vs Odch-F Pøích-" -+"F\n" - --#: ../netstat.c:430 ../netstat.c:1208 -+#: ../netstat.c:481 ../netstat.c:1308 - #, c-format - msgid "Problem reading data from %s\n" - msgstr "Chyba pøi ètení dat z %s\n" - - # následující radìji ponechat v originále ?! --#: ../netstat.c:465 -+#: ../netstat.c:516 - msgid "SYN_SENT" - msgstr "SYN_SENT" - --#: ../netstat.c:466 -+#: ../netstat.c:517 - msgid "SYN_RECV" - msgstr "SYN_RECV" - --#: ../netstat.c:467 -+#: ../netstat.c:518 - msgid "FIN_WAIT1" - msgstr "FIN_WAIT1" - --#: ../netstat.c:468 -+#: ../netstat.c:519 - msgid "FIN_WAIT2" - msgstr "FIN_WAIT2" - --#: ../netstat.c:469 -+#: ../netstat.c:520 - msgid "TIME_WAIT" - msgstr "TIME_WAIT" - --#: ../netstat.c:470 -+#: ../netstat.c:521 - msgid "CLOSE" - msgstr "ZAVØEN" - --#: ../netstat.c:471 -+#: ../netstat.c:522 - msgid "CLOSE_WAIT" - msgstr "CLOSE_WAIT" - --#: ../netstat.c:472 -+#: ../netstat.c:523 - msgid "LAST_ACK" - msgstr "POSLEDNÍ ACK" - --#: ../netstat.c:473 -+#: ../netstat.c:524 - msgid "LISTEN" - msgstr "LISTEN" - --#: ../netstat.c:474 -+#: ../netstat.c:525 - msgid "CLOSING" - msgstr "ZAVíRÁ" - --#: ../netstat.c:544 -+#: ../netstat.c:596 - #, c-format - msgid "warning, got bogus igmp6 line %d.\n" - msgstr "varování, nesmyslný igmp6 øádek %d.\n" - --#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803 --#: ../netstat.c:935 ../netstat.c:940 -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 -+#: ../netstat.c:1032 ../netstat.c:1037 - #, c-format - msgid "netstat: unsupported address family %d !\n" - msgstr "netstat: tøída adres %d není podporována !\n" - --#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582 -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 - #, c-format - msgid "warning, got bogus igmp line %d.\n" - msgstr "varování, nesmyslný igmp øádek %d.\n" - --#: ../netstat.c:666 -+#: ../netstat.c:677 -+#, fuzzy, c-format -+msgid "Active X.25 sockets\n" -+msgstr "Aktivní AX.25 sokety\n" -+ -+#. IMHO, Vr/Vs is not very usefull --SF -+#: ../netstat.c:679 -+#, fuzzy, c-format -+msgid "" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "Cíl Zdroj Zaøíz Stav Vr/Vs Odhod-F Pøích-F\n" -+ -+#: ../netstat.c:759 -+#, c-format - msgid "warning, got bogus tcp line.\n" - msgstr "varování, nesmyslný tcp øádek.\n" - --#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975 -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 - #, c-format - msgid "off (0.00/%ld/%d)" - msgstr "vyp (0.00/%ld/%d)" - --#: ../netstat.c:708 -+#: ../netstat.c:804 - #, fuzzy, c-format - msgid "on (%2.2f/%ld/%d)" - msgstr "zap%d (%2.2f/%ld/%d)" - --#: ../netstat.c:713 -+#: ../netstat.c:809 - #, fuzzy, c-format - msgid "keepalive (%2.2f/%ld/%d)" - msgstr "zap%d (%2.2f/%ld/%d)" - --#: ../netstat.c:718 -+#: ../netstat.c:814 - #, fuzzy, c-format - msgid "timewait (%2.2f/%ld/%d)" - msgstr "zap%d (%2.2f/%ld/%d)" - --#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985 -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 - #, c-format - msgid "unkn-%d (%2.2f/%ld/%d)" - msgstr "nezn-%d (%2.2f/%ld/%d)" - --#: ../netstat.c:799 -+#: ../netstat.c:894 -+#, c-format - msgid "warning, got bogus udp line.\n" - msgstr "varování, nesmyslný udp øádek.\n" - --#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108 -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 - msgid "UNKNOWN" - msgstr "NEZNÁM" - --#: ../netstat.c:860 ../netstat.c:980 -+#: ../netstat.c:958 ../netstat.c:1080 - #, c-format - msgid "on%d (%2.2f/%ld/%d)" - msgstr "zap%d (%2.2f/%ld/%d)" - --#: ../netstat.c:949 -+#: ../netstat.c:1046 -+#, c-format - msgid "warning, got bogus raw line.\n" - msgstr "varování, nesmyslný 'raw' øádek.\n" - --#: ../netstat.c:1028 -+#: ../netstat.c:1128 -+#, c-format - msgid "warning, got bogus unix line.\n" - msgstr "varování, netstat 'unix' øádek.\n" - --#: ../netstat.c:1055 -+#: ../netstat.c:1155 - msgid "STREAM" - msgstr "STREAM" - --#: ../netstat.c:1059 -+#: ../netstat.c:1159 - msgid "DGRAM" - msgstr "DGRAM" - --#: ../netstat.c:1063 -+#: ../netstat.c:1163 - msgid "RAW" - msgstr "RAW" - --#: ../netstat.c:1067 -+#: ../netstat.c:1167 - msgid "RDM" - msgstr "RDM" - --#: ../netstat.c:1071 -+#: ../netstat.c:1171 - msgid "SEQPACKET" - msgstr "SEQPACKET" - --#: ../netstat.c:1080 -+#: ../netstat.c:1180 - msgid "FREE" - msgstr "NEALOKOVÁN" - --#: ../netstat.c:1096 -+#: ../netstat.c:1196 - msgid "CONNECTING" - msgstr "SPOJUJE" - --#: ../netstat.c:1100 -+#: ../netstat.c:1200 - msgid "CONNECTED" - msgstr "SPOJEN" - --#: ../netstat.c:1104 -+#: ../netstat.c:1204 - msgid "DISCONNECTING" - msgstr "ODPOJUJE" - --#: ../netstat.c:1135 -+#: ../netstat.c:1235 -+#, c-format - msgid "Active UNIX domain sockets " - msgstr "Aktivní sokety domény UNIX " - --#: ../netstat.c:1137 ../netstat.c:1666 -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format - msgid "(servers and established)" - msgstr "(servery a navázaná spojení)" - --#: ../netstat.c:1140 ../netstat.c:1669 -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format - msgid "(only servers)" - msgstr "(pouze servery)" - --#: ../netstat.c:1142 ../netstat.c:1671 -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format - msgid "(w/o servers)" - msgstr "(w/o servery)" - --#: ../netstat.c:1145 -+#: ../netstat.c:1245 -+#, c-format - msgid "" - "\n" - "Proto RefCnt Flags Type State I-Node" -@@ -1001,90 +938,92 @@ - "\n" - "Proto Èítaè Pøíznaky Typ Stav I-Uzel" - --#: ../netstat.c:1147 -+#: ../netstat.c:1247 -+#, c-format - msgid " Path\n" - msgstr " Cesta\n" - --#: ../netstat.c:1167 -+#: ../netstat.c:1267 - msgid "SABM SENT" - msgstr "SABM ODESLÁN" - --#: ../netstat.c:1170 -+#: ../netstat.c:1270 - msgid "RECOVERY" - msgstr "OBNOVA" - --#: ../netstat.c:1184 -+#: ../netstat.c:1284 -+#, c-format - msgid "Active AX.25 sockets\n" - msgstr "Aktivní AX.25 sokety\n" - --#: ../netstat.c:1185 -+#: ../netstat.c:1285 -+#, c-format - msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" - msgstr "Cíl Zdroj Zaøíz Stav Vr/Vs Odhod-F Pøích-F\n" - --#: ../netstat.c:1228 -+#: ../netstat.c:1328 - #, c-format - msgid "problem reading data from %s\n" - msgstr "chyba pøi ètení dat z %s\n" - --#: ../netstat.c:1279 -+#: ../netstat.c:1379 -+#, c-format - msgid "" - "Active IPX sockets\n" - "Proto Recv-Q Send-Q Local Address Foreign Address " - "State" - msgstr "" - "Aktivní IPX sokety\n" --"Proto Pøích-F Odch-F Lokál adresa Vzdálená adresa " --" Stav" -+"Proto Pøích-F Odch-F Lokál adresa Vzdálená " -+"adresa Stav" - --#: ../netstat.c:1281 -+#: ../netstat.c:1381 -+#, c-format - msgid " User" - msgstr " U¾ivatel" - --#: ../netstat.c:1315 -+#: ../netstat.c:1415 - msgid "ESTAB" - msgstr "SPOJEN" - --#: ../netstat.c:1323 -+#: ../netstat.c:1423 - msgid "UNK." - msgstr "NEZ." - --#: ../netstat.c:1367 --msgid " - no statistics available -" --msgstr " - statistická data nejsou dostupná -" -- --#: ../netstat.c:1370 --msgid "[NO FLAGS]" --msgstr "[®ÁDNÉ PØÍZNAKY]" -- --#: ../netstat.c:1400 -+#: ../netstat.c:1461 -+#, c-format - msgid "Kernel Interface table\n" - msgstr "Tabulka rozhraní v jádru\n" - --#: ../netstat.c:1401 -+#: ../netstat.c:1465 -+#, fuzzy, c-format - msgid "" --"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " - "Flg\n" - msgstr "" - "Rozhr MTU Met PØ-OK PØ-CHYB PØ-ZAH PØ-PØT OD-OK OD-CHYB OD-ZAH OD-PØT " - "PØZ\n" - --#: ../netstat.c:1404 -+#: ../netstat.c:1469 - msgid "missing interface information" - msgstr "chybí informace o rozhraní" - --#: ../netstat.c:1425 -+#: ../netstat.c:1492 -+#, c-format - msgid "" --"usage: netstat [-veenNcCF] [] -r netstat " --"{-V|--version|-h|--help}\n" -+"usage: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" -+"help}\n" - msgstr "" --"Pou¾ití: netstat [--veenNcCF] [] -r netstat " --"{-V|--version|-h|--help}\n" -+"Pou¾ití: netstat [--veenNcCF] [] -r netstat {-V|--version|-h|--" -+"help}\n" - --#: ../netstat.c:1426 -+#: ../netstat.c:1493 -+#, c-format - msgid " netstat [-vnNcaeol] [ ...]\n" - msgstr " netstat [-vnNcaeol] [ ...]\n" - --#: ../netstat.c:1427 -+#: ../netstat.c:1494 -+#, c-format - msgid "" - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" -@@ -1092,27 +1031,32 @@ - " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" - "\n" - --#: ../netstat.c:1429 -+#: ../netstat.c:1496 -+#, c-format - msgid " -r, --route display routing table\n" - msgstr " -r, --route vypí¹e smìrovací tabulku\n" - --#: ../netstat.c:1430 -+#: ../netstat.c:1497 -+#, c-format - msgid " -i, --interfaces display interface table\n" - msgstr " -i, --interfaces vypí¹e tabulku rozhraní\n" - --#: ../netstat.c:1431 -+#: ../netstat.c:1498 -+#, c-format - msgid " -g, --groups display multicast group memberships\n" - msgstr "" - " -g, --groups vypí¹e èlenství v multicast skupinách\n" - --#: ../netstat.c:1432 -+#: ../netstat.c:1499 -+#, c-format - msgid "" - " -s, --statistics display networking statistics (like SNMP)\n" - msgstr "" - " -s, --statistics vypí¹e statistiku sí»ové aktivity (jako " - "SNMP)\n" - --#: ../netstat.c:1434 -+#: ../netstat.c:1501 -+#, c-format - msgid "" - " -M, --masquerade display masqueraded connections\n" - "\n" -@@ -1120,20 +1064,45 @@ - " -M, --masquerade vypí¹e maskovaná spojení\n" - "\n" - --#: ../netstat.c:1438 ../route.c:87 -+#: ../netstat.c:1505 -+#, fuzzy, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr "" -+" -n, --numeric nebude pøevádìt èíselné adresy\n" -+" na kanonická jména\n" -+ -+#: ../netstat.c:1506 -+#, fuzzy, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr "" -+" -n, --numeric nebude pøevádìt èíselné adresy\n" -+" na kanonická jména\n" -+ -+#: ../netstat.c:1507 -+#, fuzzy, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr "" -+" -n, --numeric nebude pøevádìt èíselné adresy\n" -+" na kanonická jména\n" -+ -+#: ../netstat.c:1508 -+#, c-format - msgid " -N, --symbolic resolve hardware names\n" - msgstr " -N, --symbolic pøevede hw jména\n" - --#: ../netstat.c:1439 ../route.c:88 -+#: ../netstat.c:1509 ../route.c:88 -+#, c-format - msgid " -e, --extend display other/more information\n" - msgstr " -e, --extend vypí¹e podrobnìj¹í informace\n" - --#: ../netstat.c:1440 -+#: ../netstat.c:1510 -+#, c-format - msgid " -p, --programs display PID/Program name for sockets\n" - msgstr "" - " -p, --programs vypí¹e PID/jméno programu pro sokety\n" - --#: ../netstat.c:1441 -+#: ../netstat.c:1511 -+#, c-format - msgid "" - " -c, --continuous continuous listing\n" - "\n" -@@ -1141,23 +1110,27 @@ - " -c, --continuous nepøeru¹ovaný výpis\n" - "\n" - --#: ../netstat.c:1442 -+#: ../netstat.c:1512 -+#, c-format - msgid " -l, --listening display listening server sockets\n" - msgstr "" - " -l, --listening vypí¹e sokety, na nich¾ je nasloucháno\n" - --#: ../netstat.c:1443 -+#: ../netstat.c:1513 -+#, c-format - msgid "" - " -a, --all, --listening display all sockets (default: connected)\n" - msgstr "" - " -a, --all, --listening vypí¹e v¹echny sokety (implicitnì: " - "spojené)\n" - --#: ../netstat.c:1444 -+#: ../netstat.c:1514 -+#, c-format - msgid " -o, --timers display timers\n" - msgstr " -o, --timers zobrazí èasovaèe\n" - --#: ../netstat.c:1445 ../route.c:89 -+#: ../netstat.c:1515 ../route.c:89 -+#, c-format - msgid "" - " -F, --fib display Forwarding Information Base " - "(default)\n" -@@ -1165,112 +1138,126 @@ - " -F, --fib zobrazí Forwarding Infomation Base\n" - " (implicitní)\n" - --#: ../netstat.c:1446 ../route.c:90 -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format - msgid "" - " -C, --cache display routing cache instead of FIB\n" - "\n" - msgstr " -C, --cache místo FIB zobrazí smìrovací cache\n" - --#: ../netstat.c:1448 -+#: ../netstat.c:1518 -+#, c-format - msgid "" --" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - msgstr "" --" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx " --"--netrom\n" -+" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" - --#: ../netstat.c:1449 ../route.c:92 --#, c-format --msgid " =Use '-A ' or '--' Default: %s\n" -+#: ../netstat.c:1519 -+#, fuzzy, c-format -+msgid " =Use '-6|-4' or '-A ' or '--'; default: %s\n" - msgstr " =Pou¾ijte '-A ' or '--' Implicitní: %s\n" - --#: ../netstat.c:1450 ../route.c:93 -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format - msgid " List of possible address families (which support routing):\n" - msgstr " Seznam mo¾ných tøíd adres (podporujících smìrování):\n" - --#: ../netstat.c:1663 -+#: ../netstat.c:1753 -+#, c-format - msgid "Active Internet connections " - msgstr "Aktivní Internetová spojení " - --#: ../netstat.c:1673 -+#: ../netstat.c:1763 -+#, c-format - msgid "" - "\n" --"Proto Recv-Q Send-Q Local Address Foreign Address State " --" " -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " - msgstr "" - "\n" - "Proto Pøích-F Odch-F Místní Adresa Vzdálená Adresa Stav " - --#: ../netstat.c:1675 -+#: ../netstat.c:1765 -+#, c-format - msgid " User Inode " - msgstr " U¾ivatel I-uzel " - --#: ../netstat.c:1678 -+#: ../netstat.c:1768 -+#, c-format - msgid " Timer" - msgstr " Èasovaè" - --#: ../netstat.c:1708 -+#: ../netstat.c:1798 -+#, c-format - msgid "IPv4 Group Memberships\n" - msgstr "Èlenství v IPv4 skupinách\n" - --#: ../netstat.c:1709 -+#: ../netstat.c:1799 -+#, c-format - msgid "Interface RefCnt Group\n" - msgstr "Rozhraní Èítaè Skupina\n" - --#: ../rarp.c:43 -+#: ../rarp.c:44 - msgid "This kernel does not support RARP.\n" - msgstr "Toto jádro nepodporuje RARP.\n" - --#: ../rarp.c:82 -+#: ../rarp.c:83 - #, c-format - msgid "no RARP entry for %s.\n" - msgstr "pro %s neexistuje RARP polo¾ka.\n" - --#: ../rarp.c:95 -+#: ../rarp.c:96 - #, c-format - msgid "%s: bad hardware address\n" - msgstr "hardwarová adresa %s je nesprávná\n" - --#: ../rarp.c:127 -+#: ../rarp.c:128 - #, c-format - msgid "rarp: cannot open file %s:%s.\n" - msgstr "rarp: soubor %s:%s nelze otevøít.\n" - --#: ../rarp.c:139 -+#: ../rarp.c:140 - #, c-format - msgid "rarp: format error at %s:%u\n" - msgstr "rarp: syntaktická chyba na øádku %2$u souboru %1$s\n" - --#: ../rarp.c:143 ../rarp.c:287 -+#: ../rarp.c:144 ../rarp.c:289 - #, c-format - msgid "rarp: %s: unknown host\n" - msgstr "rarp: poèítaè %s není znám\n" - --#: ../rarp.c:146 -+#: ../rarp.c:147 - #, c-format - msgid "rarp: cannot set entry from %s:%u\n" - msgstr "rarp: nelze nastavit polo¾ku z øádku %2$u souboru %1$s\n" - --#: ../rarp.c:175 -+#: ../rarp.c:176 -+#, c-format - msgid "Usage: rarp -a list entries in cache.\n" - msgstr "Pou¾ití: rarp -a vypí¹e polo¾ky z cache.\n" - --#: ../rarp.c:176 -+#: ../rarp.c:177 -+#, c-format - msgid " rarp -d delete entry from cache.\n" - msgstr " rarp -d sma¾e polo¾ku z cache.\n" - --#: ../rarp.c:177 -+#: ../rarp.c:178 -+#, c-format - msgid " rarp [] -s add entry to cache.\n" - msgstr "" - " rarp [] -s pøidá polo¾ku do cache.\n" - --#: ../rarp.c:178 -+#: ../rarp.c:179 -+#, c-format - msgid "" - " rarp -f add entries from /etc/ethers.\n" - msgstr "" - " rarp -f pøidá polo¾ky z /etc/ethers.\n" - --#: ../rarp.c:179 -+#: ../rarp.c:180 -+#, c-format - msgid "" - " rarp -V display program version.\n" - "\n" -@@ -1279,24 +1266,26 @@ - "programu.\n" - "\n" - --#: ../rarp.c:236 -+#: ../rarp.c:238 - #, c-format - msgid "%s: illegal option mix.\n" - msgstr "Kombinace pøepínaèù %s je nesprávná.\n" - --#: ../rarp.c:267 -+#: ../rarp.c:269 - #, c-format - msgid "rarp: %s: unknown hardware type.\n" - msgstr "rarp: hardwarový typ %s není znám.\n" - --#: ../route.c:79 -+#: ../route.c:80 -+#, c-format - msgid "" - "Usage: route [-nNvee] [-FC] [] List kernel routing tables\n" - msgstr "" - "Pou¾ití: route [-nNvee] [-FC] [] Zobrazí smìrovací tabulky v " - "jádru\n" - --#: ../route.c:80 -+#: ../route.c:81 -+#, c-format - msgid "" - " route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" - "\n" -@@ -1305,14 +1294,16 @@ - "AF.\n" - "\n" - --#: ../route.c:82 -+#: ../route.c:83 -+#, c-format - msgid "" - " route {-h|--help} [] Detailed usage syntax for " - "specified AF.\n" - msgstr "" - " route {-h|--help [] Nápovìda pro pou¾ití s AF.\n" - --#: ../route.c:83 -+#: ../route.c:84 -+#, c-format - msgid "" - " route {-V|--version} Display version/author and " - "exit.\n" -@@ -1321,15 +1312,23 @@ - " route {-V|--version} Vypí¹e oznaèení verze a autora\n" - " programu.\n" - -+#: ../route.c:92 -+#, fuzzy, c-format -+msgid " =Use '-A ' or '--'; default: %s\n" -+msgstr " =Pou¾ijte '-A ' or '--' Implicitní: %s\n" -+ - #: ../plipconfig.c:66 -+#, c-format - msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" - msgstr "Pou¾ití: plipconfig [-a] [-i] [-v] rozhraní\n" - - #: ../plipconfig.c:67 -+#, c-format - msgid " [nibble NN] [trigger NN]\n" - msgstr " [nibble NN] [trigger NN]\n" - - #: ../plipconfig.c:68 -+#, c-format - msgid " plipconfig -V | --version\n" - msgstr " plipconfig -V | --version\n" - -@@ -1338,25 +1337,30 @@ - msgid "%s\tnibble %lu trigger %lu\n" - msgstr "%s\tnibble %lu trigger %lu\n" - --#: ../iptunnel.c:79 -+#: ../iptunnel.c:85 -+#, c-format - msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" - msgstr "Pou¾ití: iptunnel { add | change | del | show } [ JMÉNO ]\n" - --#: ../iptunnel.c:80 -+#: ../iptunnel.c:86 -+#, c-format - msgid "" - " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" - msgstr "" - " [ mode { ipip | gre | sit } ] [ vzdálená ADR ] [ místní ADR ]\n" - --#: ../iptunnel.c:81 -+#: ../iptunnel.c:87 -+#, c-format - msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" - msgstr " [ [i|o]seq ] [ [i|o]key KLÍÈ ] [ [i|o]csum ]\n" - --#: ../iptunnel.c:82 -+#: ../iptunnel.c:88 -+#, c-format - msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" - msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev ZAØÍZENÍ ]\n" - --#: ../iptunnel.c:83 -+#: ../iptunnel.c:89 -+#, c-format - msgid "" - " iptunnel -V | --version\n" - "\n" -@@ -1364,450 +1368,737 @@ - " iptunnel -V | --version\n" - "\n" - --#: ../iptunnel.c:84 -+#: ../iptunnel.c:90 -+#, c-format - msgid "Where: NAME := STRING\n" - msgstr "Kde: JMÉNO := ØETÌZEC\n" - --#: ../iptunnel.c:85 -+#: ../iptunnel.c:91 -+#, c-format - msgid " ADDR := { IP_ADDRESS | any }\n" - msgstr " ADR := { IP-ADRESA | any }\n" - --#: ../iptunnel.c:86 -+#: ../iptunnel.c:92 -+#, c-format - msgid " TOS := { NUMBER | inherit }\n" - msgstr " TOS := { ÈÍSLO | inherit }\n" - --#: ../iptunnel.c:87 -+#: ../iptunnel.c:93 -+#, c-format - msgid " TTL := { 1..255 | inherit }\n" - msgstr " TTL := { 1..255 | inherit }\n" - --#: ../iptunnel.c:88 -+#: ../iptunnel.c:94 -+#, c-format - msgid " KEY := { DOTTED_QUAD | NUMBER }\n" - msgstr " KLÍÈ := { DOTTED_QUAD | ÈÍSLO }\n" - --#: ../iptunnel.c:326 -+#: ../iptunnel.c:332 -+#, c-format - msgid "Keys are not allowed with ipip and sit.\n" - msgstr "S ipip a sit nejsou klíèe povoleny.\n" - --#: ../iptunnel.c:346 -+#: ../iptunnel.c:352 -+#, c-format - msgid "Broadcast tunnel requires a source address.\n" - msgstr "Tunel se v¹esmìrovým vysíláním vy¾aduje zdrojovou adresu.\n" - --#: ../iptunnel.c:361 -+#: ../iptunnel.c:367 -+#, c-format - msgid "ttl != 0 and noptmudisc are incompatible\n" - msgstr "ttl != 0 a noptmudisc se navzájem vyluèují\n" - --#: ../iptunnel.c:373 -+#: ../iptunnel.c:379 -+#, c-format - msgid "cannot determine tunnel mode (ipip, gre or sit)\n" - msgstr "re¾im tunelu (ipip, gre èi sit) nelze zjistit\n" - --#: ../iptunnel.c:411 -+#: ../iptunnel.c:417 - #, c-format - msgid "%s: %s/ip remote %s local %s " - msgstr "%s: %s/ip vzdálený %s místní %s " - --#: ../iptunnel.c:415 -+#: ../iptunnel.c:421 - msgid "unknown" - msgstr "Neznám." - --#: ../iptunnel.c:447 -+#: ../iptunnel.c:453 -+#, c-format - msgid " Drop packets out of sequence.\n" - msgstr " Zahazuje pakety mimo poøadí.\n" - --#: ../iptunnel.c:449 -+#: ../iptunnel.c:455 -+#, c-format - msgid " Checksum in received packet is required.\n" - msgstr " Pøijímané pakety musí mít kontrolní souèet.\n" - - # ??? --#: ../iptunnel.c:451 -+#: ../iptunnel.c:457 -+#, c-format - msgid " Sequence packets on output.\n" - msgstr " Øadí odchozí pakety.\n" - --#: ../iptunnel.c:453 -+#: ../iptunnel.c:459 -+#, c-format - msgid " Checksum output packets.\n" - msgstr " Odchozí pakety budou mít kontrolní souèet.\n" - --#: ../iptunnel.c:481 -+#: ../iptunnel.c:487 -+#, c-format - msgid "Wrong format of /proc/net/dev. Sorry.\n" - msgstr "Lituji, formát /proc/net/dev je chybný.\n" - --#: ../iptunnel.c:494 -+#: ../iptunnel.c:500 - #, c-format - msgid "Failed to get type of [%s]\n" - msgstr "Typ [%s] se nepodaøilo zjistit.\n" - --#: ../iptunnel.c:510 -+#: ../iptunnel.c:516 -+#, c-format - msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" - msgstr "RX: Pakety Bajty Chyby CsumChyb MimoPoø Mcasts\n" - --#: ../iptunnel.c:513 -+#: ../iptunnel.c:519 -+#, c-format - msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" - msgstr "TX: Pakety Bajty Chyby DeadLoop NoRoute NoBufs\n" - --#: ../statistics.c:45 -+#: ../statistics.c:47 - msgid "ICMP input histogram:" - msgstr "histogram ICMP vstupu:" - --#: ../statistics.c:46 -+#: ../statistics.c:48 - msgid "ICMP output histogram:" - msgstr "histogram ICMP výstupu:" - --#: ../statistics.c:63 -+#: ../statistics.c:65 - #, c-format - msgid "Forwarding is %s" - msgstr "Pøedávání je %s" - --#: ../statistics.c:64 --#, c-format --msgid "Default TTL is %d" -+#: ../statistics.c:66 -+#, fuzzy, c-format -+msgid "Default TTL is %u" - msgstr "Implicitní TTL je %d" - --#: ../statistics.c:65 --#, c-format --msgid "%d total packets received" -+#: ../statistics.c:67 -+#, fuzzy, c-format -+msgid "%u total packets received" - msgstr "celkem pøijmutých paketù: %d" - --#: ../statistics.c:66 --#, c-format --msgid "%d with invalid headers" -+#: ../statistics.c:68 -+#, fuzzy, c-format -+msgid "%u with invalid headers" - msgstr "s nesprávnými hlavièkami: %d" - --#: ../statistics.c:67 --#, c-format --msgid "%d with invalid addresses" -+#: ../statistics.c:69 -+#, fuzzy, c-format -+msgid "%u with invalid addresses" - msgstr "s nesprávnými adresami: %d" - --#: ../statistics.c:68 --#, c-format --msgid "%d forwarded" -+#: ../statistics.c:70 -+#, fuzzy, c-format -+msgid "%u forwarded" - msgstr "pøedáno: %d" - --#: ../statistics.c:69 --#, c-format --msgid "%d with unknown protocol" -+#: ../statistics.c:71 -+#, fuzzy, c-format -+msgid "%u with unknown protocol" - msgstr "s neznámým protokolem: %d" - --#: ../statistics.c:70 --#, c-format --msgid "%d incoming packets discarded" -+#: ../statistics.c:72 -+#, fuzzy, c-format -+msgid "%u incoming packets discarded" - msgstr "poèet zahozených pøíchozích paketù: %d" - --#: ../statistics.c:71 --#, c-format --msgid "%d incoming packets delivered" -+#: ../statistics.c:73 -+#, fuzzy, c-format -+msgid "%u incoming packets delivered" - msgstr "poèet doruèených pøíchozích paketù: %d" - --#: ../statistics.c:72 --#, c-format --msgid "%d requests sent out" -+#: ../statistics.c:74 -+#, fuzzy, c-format -+msgid "%u requests sent out" - msgstr "poèet odeslaných po¾adavkù: %d" - - #. ? --#: ../statistics.c:73 --#, c-format --msgid "%d outgoing packets dropped" -+#: ../statistics.c:75 -+#, fuzzy, c-format -+msgid "%u outgoing packets dropped" - msgstr "poèet zahozených odchozích paketù: %d" - --#: ../statistics.c:74 --#, c-format --msgid "%d dropped because of missing route" -+#: ../statistics.c:76 -+#, fuzzy, c-format -+msgid "%u dropped because of missing route" - msgstr "zahozeno kvùli chybìjící cestì: %d" - --#: ../statistics.c:75 --#, c-format --msgid "%d fragments dropped after timeout" -+#: ../statistics.c:77 -+#, fuzzy, c-format -+msgid "%u fragments dropped after timeout" - msgstr "poèet fragmentù zahozených po vypr¹ení èasu: %d" - --#: ../statistics.c:76 --#, c-format --msgid "%d reassemblies required" -+#: ../statistics.c:78 -+#, fuzzy, c-format -+msgid "%u reassemblies required" - msgstr "poèet nutných znovusestavení: %d" - - #. ? --#: ../statistics.c:77 --#, c-format --msgid "%d packets reassembled ok" -+#: ../statistics.c:79 -+#, fuzzy, c-format -+msgid "%u packets reassembled ok" - msgstr "poèet v poøádku znovu sestavených paketù: %d" - --#: ../statistics.c:78 --#, c-format --msgid "%d packet reassembles failed" -+#: ../statistics.c:80 -+#, fuzzy, c-format -+msgid "%u packet reassembles failed" - msgstr "poèet paketù, je¾ se nepodaøilo znovu sestavit: %d" - --#: ../statistics.c:79 --#, c-format --msgid "%d fragments received ok" -+#: ../statistics.c:81 -+#, fuzzy, c-format -+msgid "%u fragments received ok" - msgstr "poèet v poøádku pøijmutých fragmentù: %d" - --#: ../statistics.c:80 --#, c-format --msgid "%d fragments failed" -+#: ../statistics.c:82 -+#, fuzzy, c-format -+msgid "%u fragments failed" - msgstr "poèet chybných fragmentù: %d" - --#: ../statistics.c:81 --#, c-format --msgid "%d fragments created" -+#: ../statistics.c:83 -+#, fuzzy, c-format -+msgid "%u fragments created" - msgstr "poèet vytvoøených fragmentù: %d" - --#: ../statistics.c:86 --#, c-format --msgid "%d ICMP messages received" -+#: ../statistics.c:88 -+#, fuzzy, c-format -+msgid "%u ICMP messages received" - msgstr "poèet pøijmutých ICMP zpráv: %d" - --#: ../statistics.c:87 --#, c-format --msgid "%d input ICMP message failed." -+#: ../statistics.c:89 -+#, fuzzy, c-format -+msgid "%u input ICMP message failed." - msgstr "poèet chybných pøíchozích ICMP zpráv: %d" - --#: ../statistics.c:88 ../statistics.c:101 --#, c-format --msgid "destination unreachable: %d" -+#: ../statistics.c:90 ../statistics.c:103 -+#, fuzzy, c-format -+msgid "destination unreachable: %u" - msgstr "adresát nedostupný: %d" - --#: ../statistics.c:89 --#, c-format --msgid "timeout in transit: %d" -+#: ../statistics.c:91 -+#, fuzzy, c-format -+msgid "timeout in transit: %u" - msgstr "vypr¹el èas pøi pøenosu: %d" - --#: ../statistics.c:90 ../statistics.c:103 --#, c-format --msgid "wrong parameters: %d" -+#: ../statistics.c:92 ../statistics.c:105 -+#, fuzzy, c-format -+msgid "wrong parameters: %u" - msgstr "chybné parametry: %d" - - #. ? --#: ../statistics.c:91 --#, c-format --msgid "source quenchs: %d" -+#: ../statistics.c:93 -+#, fuzzy, c-format -+msgid "source quenches: %u" - msgstr "øízení toku dat: %d" - --#: ../statistics.c:92 --#, c-format --msgid "redirects: %d" -+#: ../statistics.c:94 -+#, fuzzy, c-format -+msgid "redirects: %u" - msgstr "zmìna cesty: %d" - --#: ../statistics.c:93 --#, c-format --msgid "echo requests: %d" -+#: ../statistics.c:95 -+#, fuzzy, c-format -+msgid "echo requests: %u" - msgstr "¾ádost o echo: %d" - --#: ../statistics.c:94 ../statistics.c:107 --#, c-format --msgid "echo replies: %d" -+#: ../statistics.c:96 ../statistics.c:109 -+#, fuzzy, c-format -+msgid "echo replies: %u" - msgstr "odpovìï na ¾ádost o echo: %d" - --#: ../statistics.c:95 --#, c-format --msgid "timestamp request: %d" -+#: ../statistics.c:97 -+#, fuzzy, c-format -+msgid "timestamp request: %u" - msgstr "¾ádost o èas: %d" - --#: ../statistics.c:96 --#, c-format --msgid "timestamp reply: %d" -+#: ../statistics.c:98 -+#, fuzzy, c-format -+msgid "timestamp reply: %u" - msgstr "odpovìï na ¾ádost o èas: %d" - --#: ../statistics.c:97 --#, c-format --msgid "address mask request: %d" -+#: ../statistics.c:99 -+#, fuzzy, c-format -+msgid "address mask request: %u" - msgstr "¾ádost o masku podsítì: %d" - - #. ? --#: ../statistics.c:98 --msgid "address mask replies" --msgstr "odpovìdi na ¾ádost o masku podsítì" -+#: ../statistics.c:100 ../statistics.c:113 -+#, fuzzy, c-format -+msgid "address mask replies: %u" -+msgstr "odpovìï na ¾ádost o masku podsítì: %d" - - #. ? --#: ../statistics.c:99 --#, c-format --msgid "%d ICMP messages sent" -+#: ../statistics.c:101 -+#, fuzzy, c-format -+msgid "%u ICMP messages sent" - msgstr "poèet odeslaných ICMP zpráv: %d" - --#: ../statistics.c:100 --#, c-format --msgid "%d ICMP messages failed" -+#: ../statistics.c:102 -+#, fuzzy, c-format -+msgid "%u ICMP messages failed" - msgstr "poèet chybných ICMP zpráv: %d" - --#: ../statistics.c:102 --#, c-format --msgid "time exceeded: %d" -+#: ../statistics.c:104 -+#, fuzzy, c-format -+msgid "time exceeded: %u" - msgstr "vypr¹ení ¾ivotnosti: %d" - - #. ? --#: ../statistics.c:104 --#, c-format --msgid "source quench: %d" -+#: ../statistics.c:106 -+#, fuzzy, c-format -+msgid "source quench: %u" - msgstr "øízení toku dat: %d" - --#: ../statistics.c:105 --#, c-format --msgid "redirect: %d" -+#: ../statistics.c:107 -+#, fuzzy, c-format -+msgid "redirect: %u" - msgstr "zmìna cesty: %d" - --#: ../statistics.c:106 --#, c-format --msgid "echo request: %d" -+#: ../statistics.c:108 -+#, fuzzy, c-format -+msgid "echo request: %u" - msgstr "¾ádost o echo: %d" - --#: ../statistics.c:108 --#, c-format --msgid "timestamp requests: %d" -+#: ../statistics.c:110 -+#, fuzzy, c-format -+msgid "timestamp requests: %u" - msgstr "¾ádost o èas: %d" - --#: ../statistics.c:109 --#, c-format --msgid "timestamp replies: %d" -+#: ../statistics.c:111 -+#, fuzzy, c-format -+msgid "timestamp replies: %u" - msgstr "odpovìï na ¾ádost o èas: %d" - --#: ../statistics.c:110 --#, c-format --msgid "address mask requests: %d" -+#: ../statistics.c:112 -+#, fuzzy, c-format -+msgid "address mask requests: %u" - msgstr "¾ádost o masku podsítì: %d" - --#: ../statistics.c:111 --#, c-format --msgid "address mask replies: %d" --msgstr "odpovìï na ¾ádost o masku podsítì: %d" -- --#: ../statistics.c:116 -+#: ../statistics.c:118 - #, c-format - msgid "RTO algorithm is %s" - msgstr "RTO algoritmus je %s" - --#: ../statistics.c:120 --#, c-format --msgid "%d active connections openings" -+#: ../statistics.c:122 -+#, fuzzy, c-format -+msgid "%u active connections openings" - msgstr "poèet aktivnì navázaných spojení: %d" - --#: ../statistics.c:121 --#, c-format --msgid "%d passive connection openings" -+#: ../statistics.c:123 -+#, fuzzy, c-format -+msgid "%u passive connection openings" - msgstr "poèet pasivnì navázaných spojení: %d" - --#: ../statistics.c:122 --#, c-format --msgid "%d failed connection attempts" -+#: ../statistics.c:124 -+#, fuzzy, c-format -+msgid "%u failed connection attempts" - msgstr "poèet neúspì¹ných pokusù o spojení: %d" - --#: ../statistics.c:123 --#, c-format --msgid "%d connection resets received" -+#: ../statistics.c:125 -+#, fuzzy, c-format -+msgid "%u connection resets received" - msgstr "poèet pøijmutých resetù: %d" - --#: ../statistics.c:124 --#, c-format --msgid "%d connections established" -+#: ../statistics.c:126 -+#, fuzzy, c-format -+msgid "%u connections established" - msgstr "poèet navázaných spojení: %d" - --#: ../statistics.c:125 --#, c-format --msgid "%d segments received" -+#: ../statistics.c:127 -+#, fuzzy, c-format -+msgid "%u segments received" - msgstr "poèet pøijmutých segmentù: %d" - --#: ../statistics.c:126 --#, c-format --msgid "%d segments send out" -+#: ../statistics.c:128 -+#, fuzzy, c-format -+msgid "%u segments send out" - msgstr "poèet odeslaných segmentù: %d" - --#: ../statistics.c:127 --#, c-format --msgid "%d segments retransmited" -+#: ../statistics.c:129 -+#, fuzzy, c-format -+msgid "%u segments retransmited" - msgstr "poèet pøenesených segmentù: %d" - --#: ../statistics.c:128 --#, c-format --msgid "%d bad segments received." -+#: ../statistics.c:130 -+#, fuzzy, c-format -+msgid "%u bad segments received." - msgstr "poèet chybných pøíchozích segmentù: %d." - --#: ../statistics.c:129 --#, c-format --msgid "%d resets sent" -+#: ../statistics.c:131 -+#, fuzzy, c-format -+msgid "%u resets sent" - msgstr "poèet odeslaných resetù: %d" - --#: ../statistics.c:134 --#, c-format --msgid "%d packets received" -+#: ../statistics.c:136 -+#, fuzzy, c-format -+msgid "%u packets received" - msgstr "poèet pøijmutých paketù: %d" - --#: ../statistics.c:135 --#, c-format --msgid "%d packets to unknown port received." -+#: ../statistics.c:137 -+#, fuzzy, c-format -+msgid "%u packets to unknown port received." - msgstr "poèet paketù pøijmutých pro neznámý port: %d." - --#: ../statistics.c:136 --#, c-format --msgid "%d packet receive errors" -+#: ../statistics.c:138 -+#, fuzzy, c-format -+msgid "%u packet receive errors" - msgstr "poèet chyb pøi pøíjmu paketù: %d" - --#: ../statistics.c:137 --#, c-format --msgid "%d packets sent" -+#: ../statistics.c:139 -+#, fuzzy, c-format -+msgid "%u packets sent" - msgstr "poèet odeslaných paketù: %d" - --#: ../statistics.c:142 --#, c-format --msgid "%d SYN cookies sent" -+#: ../statistics.c:144 -+#, fuzzy, c-format -+msgid "%u SYN cookies sent" - msgstr "poèet odeslaných SYN cookies: %d" - --#: ../statistics.c:143 --#, c-format --msgid "%d SYN cookies received" -+#: ../statistics.c:145 -+#, fuzzy, c-format -+msgid "%u SYN cookies received" - msgstr "poèet pøijmutých SYN cookies: %d" - --#: ../statistics.c:144 --#, c-format --msgid "%d invalid SYN cookies received" -+#: ../statistics.c:146 -+#, fuzzy, c-format -+msgid "%u invalid SYN cookies received" - msgstr "poèet chybných pøíchozích SYN cookies: %d" - --#: ../statistics.c:146 --#, c-format --msgid "%d resets received for embryonic SYN_RECV sockets" -+#: ../statistics.c:148 -+#, fuzzy, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" - msgstr "poèet resetù pøijmutých pro sokety ve stavu SYN_PØÍCH: %d" - --#: ../statistics.c:148 --#, c-format --msgid "%d packets pruned from receive queue because of socket buffer overrun" -+#: ../statistics.c:150 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" - msgstr "poèet paketù odstranìných z fronty kvùli pøeteèení bufferu soketu: %d" - - #. obsolete: 2.2.0 doesn't do that anymore --#: ../statistics.c:151 --#, c-format --msgid "%d packets pruned from out-of-order queue" -+#: ../statistics.c:153 -+#, fuzzy, c-format -+msgid "%u packets pruned from receive queue" - msgstr "poèet paketù odstranìných z fronty mimo-poøadí: %d" - --#: ../statistics.c:152 --#, c-format -+#: ../statistics.c:154 -+#, fuzzy, c-format - msgid "" --"%d packets dropped from out-of-order queue because of socket buffer overrun" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" - msgstr "" - "poèet paketù zahozených z fronty mimo-poøadí kvùli pøeteèení bufferu soketu: " - "%d" - --#: ../statistics.c:154 --#, c-format --msgid "%d ICMP packets dropped because they were out-of-window" -+#: ../statistics.c:156 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" - msgstr "poèet ICMP paketù zahozených, proto¾e byly mimo-okno: %d" - --#: ../statistics.c:156 --#, c-format --msgid "%d ICMP packets dropped because socket was locked" -+#: ../statistics.c:158 -+#, fuzzy, c-format -+msgid "%u ICMP packets dropped because socket was locked" - msgstr "poèet ICMP paketù zahozených kvùli zamèenému soketu: %d" - -+#: ../statistics.c:160 -+#, c-format -+msgid "%u TCP sockets finished time wait in fast timer" -+msgstr "" -+ -+#: ../statistics.c:161 -+#, c-format -+msgid "%u time wait sockets recycled by time stamp" -+msgstr "" -+ -+#: ../statistics.c:162 -+#, c-format -+msgid "%u TCP sockets finished time wait in slow timer" -+msgstr "" -+ -+#: ../statistics.c:163 -+#, c-format -+msgid "%u passive connections rejected because of time stamp" -+msgstr "" -+ -+#: ../statistics.c:165 -+#, c-format -+msgid "%u active connections rejected because of time stamp" -+msgstr "" -+ -+#: ../statistics.c:167 -+#, c-format -+msgid "%u packets rejects in established connections because of timestamp" -+msgstr "" -+ -+#: ../statistics.c:169 -+#, fuzzy, c-format -+msgid "%u delayed acks sent" -+msgstr "poèet odeslaných paketù: %d" -+ -+#: ../statistics.c:170 -+#, c-format -+msgid "%u delayed acks further delayed because of locked socket" -+msgstr "" -+ -+#: ../statistics.c:172 -+#, c-format -+msgid "Quick ack mode was activated %u times" -+msgstr "" -+ -+#: ../statistics.c:173 -+#, c-format -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "" -+ -+#: ../statistics.c:175 -+#, c-format -+msgid "%u SYNs to LISTEN sockets ignored" -+msgstr "" -+ -+#: ../statistics.c:176 -+#, c-format -+msgid "%u packets directly queued to recvmsg prequeue." -+msgstr "" -+ -+#: ../statistics.c:178 -+#, c-format -+msgid "%u of bytes directly received from backlog" -+msgstr "" -+ -+#: ../statistics.c:180 -+#, c-format -+msgid "%u of bytes directly received from prequeue" -+msgstr "" -+ -+#: ../statistics.c:182 -+#, fuzzy, c-format -+msgid "%u packets dropped from prequeue" -+msgstr "poèet paketù odstranìných z fronty mimo-poøadí: %d" -+ -+#: ../statistics.c:183 -+#, fuzzy, c-format -+msgid "%u packet headers predicted" -+msgstr "poèet pøijmutých paketù: %d" -+ -+#: ../statistics.c:184 -+#, c-format -+msgid "%u packets header predicted and directly queued to user" -+msgstr "" -+ -+#: ../statistics.c:186 -+#, c-format -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "" -+ -+#: ../statistics.c:188 -+#, fuzzy, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "poèet paketù pøijmutých pro neznámý port: %d." -+ -+#: ../statistics.c:189 -+#, c-format -+msgid "%u predicted acknowledgments" -+msgstr "" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "" -+ -+#: ../statistics.c:192 -+#, fuzzy, c-format -+msgid "%u bad SACKs received" -+msgstr "poèet chybných pøíchozích segmentù: %d." -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "" -+ -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:197 -+#, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "" -+ -+#: ../statistics.c:201 -+#, fuzzy, c-format -+msgid "%u retransmits lost" -+msgstr "poèet odeslaných resetù: %d" -+ -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "" -+ -+#: ../statistics.c:205 -+#, fuzzy, c-format -+msgid "%u fast retransmits" -+msgstr "poèet pøenesených segmentù: %d" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "" -+ -+#: ../statistics.c:209 -+#, fuzzy, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "poèet pøenesených segmentù: %d" -+ -+#: ../statistics.c:210 -+#, fuzzy, c-format -+msgid "%u sack retransmits failed" -+msgstr "poèet paketù, je¾ se nepodaøilo znovu sestavit: %d" -+ -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "" -+ -+#: ../statistics.c:212 -+#, fuzzy, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "poèet paketù odstranìných z fronty kvùli pøeteèení bufferu soketu: %d" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "" -+ -+#: ../statistics.c:215 -+#, fuzzy, c-format -+msgid "%u DSACKs received" -+msgstr "poèet pøijmutých paketù: %d" -+ -+#: ../statistics.c:216 -+#, fuzzy, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "celkem pøijmutých paketù: %d" -+ -+#: ../statistics.c:217 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "poèet pøijmutých resetù: %d" -+ -+#: ../statistics.c:218 -+#, fuzzy, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "poèet pøijmutých resetù: %d" -+ -+#: ../statistics.c:219 -+#, fuzzy, c-format -+msgid "%u connections reset due to early user close" -+msgstr "poèet pøijmutých resetù: %d" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "" -+ -+#: ../statistics.c:221 -+#, fuzzy, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "poèet pøijmutých resetù: %d" -+ - #: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "" -+ -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "" -+ -+#: ../statistics.c:292 - msgid "enabled" - msgstr "zapnuto" - --#: ../statistics.c:222 -+#: ../statistics.c:292 - msgid "disabled" - msgstr "vypnuto" - --#: ../statistics.c:272 --#, c-format --msgid "unknown title %s\n" --msgstr "titulek %s je neznámý\n" -- --#: ../statistics.c:298 -+#: ../statistics.c:375 - msgid "error parsing /proc/net/snmp" - msgstr "chyba pøi zpracování /proc/net/snmp" - --#: ../statistics.c:311 -+#: ../statistics.c:388 - msgid "cannot open /proc/net/snmp" - msgstr "/proc/net/snmp nelze otevøít" - -@@ -1821,89 +2112,95 @@ - msgid "Cannot change line discipline to `%s'.\n" - msgstr "Linkovou disciplínu nelze na `%s' zmìnit.\n" - --#: ../lib/af.c:145 ../lib/hw.c:148 -+#: ../lib/af.c:153 ../lib/hw.c:161 - msgid "UNSPEC" - msgstr "NEZNÁM" - --#: ../lib/af.c:147 -+#: ../lib/af.c:155 - msgid "UNIX Domain" - msgstr "Doména UNIX" - --#: ../lib/af.c:150 -+#: ../lib/af.c:158 - msgid "DARPA Internet" - msgstr "DARPA Internet" - --#: ../lib/af.c:153 -+#: ../lib/af.c:161 - msgid "IPv6" - msgstr "IPv6" - --#: ../lib/af.c:156 ../lib/hw.c:169 -+#: ../lib/af.c:164 ../lib/hw.c:182 - msgid "AMPR AX.25" - msgstr "AMPR AX.25" - --#: ../lib/af.c:159 ../lib/hw.c:175 -+#: ../lib/af.c:167 ../lib/hw.c:188 - msgid "AMPR NET/ROM" - msgstr "AMPR NET/ROM" - --#: ../lib/af.c:162 -+#: ../lib/af.c:170 - msgid "Novell IPX" - msgstr "Novell IPX" - --#: ../lib/af.c:165 -+#: ../lib/af.c:173 - msgid "Appletalk DDP" - msgstr "Appletalk DDP" - --#: ../lib/af.c:168 ../lib/hw.c:207 -+#: ../lib/af.c:176 ../lib/hw.c:223 - msgid "Econet" - msgstr "Econet" - --#: ../lib/af.c:171 ../lib/hw.c:172 -+#: ../lib/af.c:179 -+msgid "CCITT X.25" -+msgstr "" -+ -+#: ../lib/af.c:182 ../lib/hw.c:185 - msgid "AMPR ROSE" - msgstr "AMPR ROSE" - --#: ../lib/af.c:174 ../lib/hw.c:160 -+#: ../lib/af.c:185 ../lib/hw.c:173 - msgid "Ash" - msgstr "Ash" - --#: ../lib/af.c:232 -+#: ../lib/af.c:243 -+#, c-format - msgid "Please don't supply more than one address family.\n" - msgstr "Nezadávejte více ne¾ jednu tøídu adres.\n" - --#: ../lib/af.c:293 -+#: ../lib/af.c:304 -+#, c-format - msgid "Too much address family arguments.\n" - msgstr "Bylo zadáno pøíli¹ mnoho tøíd adres.\n" - --#: ../lib/af.c:304 -+#: ../lib/af.c:315 - #, c-format - msgid "Unknown address family `%s'.\n" - msgstr "Tøída adres `%s' není známa.\n" - --#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 --#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259 --#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71 --#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76 --msgid "[NONE SET]" --msgstr "[NENASTAVENO]" -- --#: ../lib/arcnet.c:81 ../lib/arcnet.c:96 -+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 - #, c-format - msgid "in_arcnet(%s): invalid arcnet address!\n" - msgstr "in_arcnet(%s): chybná arcnet adresa!\n" - --#: ../lib/arcnet.c:108 -+#: ../lib/arcnet.c:97 - #, c-format - msgid "in_arcnet(%s): trailing : ignored!\n" - msgstr "in_arcnet(%s): nadbyteèné : ignorováno!\n" - --#: ../lib/arcnet.c:120 -+#: ../lib/arcnet.c:109 - #, c-format - msgid "in_arcnet(%s): trailing junk!\n" - msgstr "in_arcnet(%s): nadbyteèné znaky!\n" - - #: ../lib/ash.c:81 -+#, c-format - msgid "Malformed Ash address" - msgstr "Chybná Ash adresa" - -+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 -+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 -+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 -+msgid "[NONE SET]" -+msgstr "[NENASTAVENO]" -+ - #: ../lib/ax25.c:97 ../lib/netrom.c:100 - msgid "Invalid callsign" - msgstr "Nesprávný volací znak" -@@ -1913,22 +2210,21 @@ - msgstr "Volací znak je pøíli¹ dlouhý." - - #: ../lib/ax25_gr.c:47 -+#, c-format - msgid "AX.25 not configured in this system.\n" - msgstr "AX.25 není na tomto systému nakonfigurováno.\n" - - #: ../lib/ax25_gr.c:50 -+#, c-format - msgid "Kernel AX.25 routing table\n" - msgstr "Smìrovací tabulka v jádru pro AX.25\n" - - #. xxx - #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format - msgid "Destination Iface Use\n" - msgstr "Adresát Rozhraní U¾ití\n" - --#: ../lib/ddp_gr.c:21 --msgid "Routing table for `ddp' not yet supported.\n" --msgstr "Smìrovací tabulka pro `ddp' není zatím podporována.\n" -- - #: ../lib/ether.c:74 ../lib/ether.c:91 - #, c-format - msgid "in_ether(%s): invalid ether address!\n" -@@ -1944,153 +2240,171 @@ - msgid "in_ether(%s): trailing junk!\n" - msgstr "in_ether(%s): nadbyteèné znaky!\n" - --#: ../lib/fddi.c:95 ../lib/fddi.c:110 -+#: ../lib/fddi.c:84 ../lib/fddi.c:99 - #, c-format - msgid "in_fddi(%s): invalid fddi address!\n" - msgstr "in_fddi(%s): chybná fddi adresa!\n" - --#: ../lib/fddi.c:122 -+#: ../lib/fddi.c:111 - #, c-format - msgid "in_fddi(%s): trailing : ignored!\n" - msgstr "in_fddi(%s): nadbyteèné : ignorováno!\n" - --#: ../lib/fddi.c:134 -+#: ../lib/fddi.c:123 - #, c-format - msgid "in_fddi(%s): trailing junk!\n" - msgstr "in_fddi(%s): nadbyteèné znaky!\n" - --#: ../lib/getroute.c:97 ../lib/setroute.c:76 -+#: ../lib/getroute.c:101 ../lib/setroute.c:80 - #, c-format - msgid "Address family `%s' not supported.\n" - msgstr "Tøída adres `%s' není podporována.\n" - --#: ../lib/getroute.c:103 ../lib/setroute.c:80 -+#: ../lib/getroute.c:107 ../lib/setroute.c:84 - #, c-format - msgid "No routing for address family `%s'.\n" - msgstr "Pro tøídu adres `%s' není ¾ádné smìrování.\n" - --#: ../lib/hippi.c:96 ../lib/hippi.c:111 -+#: ../lib/hippi.c:84 ../lib/hippi.c:99 - #, c-format - msgid "in_hippi(%s): invalid hippi address!\n" - msgstr "in_hippi(%s): chybná hippi adresa!\n" - --#: ../lib/hippi.c:123 -+#: ../lib/hippi.c:111 - #, c-format - msgid "in_hippi(%s): trailing : ignored!\n" - msgstr "in_hippi(%s): nadbyteèné : ignorováno!\n" - --#: ../lib/hippi.c:134 -+#: ../lib/hippi.c:122 - #, c-format - msgid "in_hippi(%s): trailing junk!\n" - msgstr "in_hippi(%s): nadbyteèné znaky!\n" - --#: ../lib/hw.c:147 -+#: ../lib/hw.c:160 - msgid "Local Loopback" - msgstr "Místní smyèka" - --#: ../lib/hw.c:150 -+#: ../lib/hw.c:163 - msgid "Serial Line IP" - msgstr "IP po sériové lince" - --#: ../lib/hw.c:151 -+#: ../lib/hw.c:164 - msgid "VJ Serial Line IP" - msgstr "Vj IP po sériové lince" - --#: ../lib/hw.c:152 -+#: ../lib/hw.c:165 - msgid "6-bit Serial Line IP" - msgstr "6bitový IP po sériové lince" - --#: ../lib/hw.c:153 -+#: ../lib/hw.c:166 - msgid "VJ 6-bit Serial Line IP" - msgstr "6bitový VJ IP po sériové lince" - --#: ../lib/hw.c:154 -+#: ../lib/hw.c:167 - msgid "Adaptive Serial Line IP" - msgstr "Adaptivní IP po sériové lince" - --#: ../lib/hw.c:157 -+#: ../lib/hw.c:170 - msgid "Ethernet" - msgstr "Ethernet" - --#: ../lib/hw.c:163 -+#: ../lib/hw.c:176 - msgid "Fiber Distributed Data Interface" - msgstr "Fiber Distributed Data Interface" - --#: ../lib/hw.c:166 -+#: ../lib/hw.c:179 - msgid "HIPPI" - msgstr "HIPPI" - --#: ../lib/hw.c:178 -+#: ../lib/hw.c:191 -+msgid "generic X.25" -+msgstr "" -+ -+#: ../lib/hw.c:194 - msgid "IPIP Tunnel" - msgstr "IPIP Tunnel" - --#: ../lib/hw.c:181 -+#: ../lib/hw.c:197 - msgid "Point-to-Point Protocol" - msgstr "Point-to-Point Protokol" - --#: ../lib/hw.c:184 -+#: ../lib/hw.c:200 - msgid "(Cisco)-HDLC" - msgstr "(Cisco)-HDLC" - --#: ../lib/hw.c:185 -+#: ../lib/hw.c:201 - msgid "LAPB" - msgstr "LAPB" - --#: ../lib/hw.c:188 -+#: ../lib/hw.c:204 - msgid "ARCnet" - msgstr "ARCnet" - --#: ../lib/hw.c:191 -+#: ../lib/hw.c:207 - msgid "Frame Relay DLCI" - msgstr "Frame Relay DLCI" - --#: ../lib/hw.c:192 -+#: ../lib/hw.c:208 - msgid "Frame Relay Access Device" - msgstr "Pøístupové zaøízení Frame Relay" - --#: ../lib/hw.c:195 -+#: ../lib/hw.c:211 - msgid "IPv6-in-IPv4" - msgstr "IPv6-in-IPv4" - --#: ../lib/hw.c:198 -+#: ../lib/hw.c:214 - msgid "IrLAP" - msgstr "IrLAP" - --#: ../lib/hw.c:201 -+#: ../lib/hw.c:217 - msgid "16/4 Mbps Token Ring" - msgstr "Token Ring 16/4 Mb/s" - --#: ../lib/hw.c:203 -+#: ../lib/hw.c:219 - #, fuzzy - msgid "16/4 Mbps Token Ring (New)" - msgstr "Token Ring 16/4 Mb/s" - -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "" -+ - #: ../lib/inet.c:153 ../lib/inet6.c:79 - #, c-format - msgid "rresolve: unsupport address family %d !\n" - msgstr "rresolve: tøída adres %d není podporována!\n" - --#: ../lib/inet6_gr.c:79 -+#: ../lib/inet6.c:131 -+#, fuzzy -+msgid "[UNKNOWN]" -+msgstr "NEZNÁM" -+ -+#: ../lib/inet6_gr.c:71 -+#, c-format - msgid "INET6 (IPv6) not configured in this system.\n" - msgstr "INET6 (IPv6) není na tomto systému nakonfigurováno.\n" - --#: ../lib/inet6_gr.c:82 -+#: ../lib/inet6_gr.c:74 -+#, c-format - msgid "Kernel IPv6 routing table\n" - msgstr "Smìrovací tabulka v jádru pro IPv6\n" - --#: ../lib/inet6_gr.c:84 -+#: ../lib/inet6_gr.c:76 -+#, c-format - msgid "" --"Destination Next Hop " --" Flags Metric Ref Use Iface\n" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" - msgstr "" --"Adresát Dal¹í Smìrovaè " --" Pøízn Metrika Odkaz U¾it Rozhraní\n" -+"Adresát Dal¹í " -+"Smìrovaè Pøízn Metrika Odkaz U¾it Rozhraní\n" - --#: ../lib/inet6_gr.c:158 -+#: ../lib/inet6_gr.c:150 -+#, c-format - msgid "Kernel IPv6 Neighbour Cache\n" - msgstr "Cache sousedù v jádru pro IPv6\n" - --#: ../lib/inet6_gr.c:161 -+#: ../lib/inet6_gr.c:153 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State\n" -@@ -2098,7 +2412,8 @@ - "Soused HW Adresa Rozhraní Pøízn " - "Odkazy Stav\n" - --#: ../lib/inet6_gr.c:165 -+#: ../lib/inet6_gr.c:157 -+#, c-format - msgid "" - "Neighbour HW Address Iface Flags " - "Ref State Stale(sec) Delete(sec)\n" -@@ -2107,30 +2422,37 @@ - "Pøíznaky Odkazy Stav Pro¹lý(sec) Smazat(sec)\n" - - #: ../lib/inet6_sr.c:46 -+#, c-format - msgid "Usage: inet6_route [-vF] del Target\n" - msgstr "Pou¾ití: inet6_route [-vF] del Cíl\n" - - #: ../lib/inet6_sr.c:47 -+#, c-format - msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" - msgstr " inet6_route [-vF] add Cíl [gw Gw] [metrika M] [[dev] If]\n" - - #: ../lib/inet6_sr.c:48 -+#, c-format - msgid " inet6_route [-FC] flush NOT supported\n" - msgstr " inet6_route [-FC] flush NENÍ podporováno\n" - --#: ../lib/inet6_sr.c:182 -+#: ../lib/inet6_sr.c:188 -+#, c-format - msgid "Flushing `inet6' routing table not supported\n" - msgstr "Smìrovací tabulku `inet6' nelze vyprazdòovat\n" - - #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format - msgid "INET (IPv4) not configured in this system.\n" - msgstr "INET (IPv4) není na tomto systému nakonfigurováno.\n" - - #: ../lib/inet_gr.c:53 -+#, c-format - msgid "Kernel IP routing table\n" - msgstr "Smìrovací tabulka v jádru pro IP\n" - - #: ../lib/inet_gr.c:56 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface\n" -@@ -2139,6 +2461,7 @@ - "Rozhraní\n" - - #: ../lib/inet_gr.c:59 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags MSS Window irtt " - "Iface\n" -@@ -2147,6 +2470,7 @@ - "Rozhraní\n" - - #: ../lib/inet_gr.c:62 -+#, c-format - msgid "" - "Destination Gateway Genmask Flags Metric Ref Use " - "Iface MSS Window irtt\n" -@@ -2155,10 +2479,12 @@ - "Rozhraní MSS Okno irtt\n" - - #: ../lib/inet_gr.c:237 -+#, c-format - msgid "Kernel IP routing cache\n" - msgstr "Smìrovací cache v jádru pro IP\n" - - #: ../lib/inet_gr.c:258 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface\n" -@@ -2167,6 +2493,7 @@ - "Rozhraní\n" - - #: ../lib/inet_gr.c:261 -+#, c-format - msgid "" - "Source Destination Gateway Flags MSS Window irtt " - "Iface\n" -@@ -2175,6 +2502,7 @@ - "Rozhraní\n" - - #: ../lib/inet_gr.c:266 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt HH Arp\n" -@@ -2183,6 +2511,7 @@ - "Rozhraní MSS Okno irtt HH Arp\n" - - #: ../lib/inet_gr.c:290 -+#, c-format - msgid "" - "Source Destination Gateway Flags Metric Ref Use " - "Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" -@@ -2190,7 +2519,8 @@ - "Odesílatel Adresát Maska Pøízn Metrik Odkazy U¾t " - "Rozhraní MSS Okno irtt TOS HHOdk HHAktuál Zvlá¹tCíl\n" - --#: ../lib/inet_sr.c:50 -+#: ../lib/inet_sr.c:51 -+#, c-format - msgid "" - "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " - "[[dev] If]\n" -@@ -2198,29 +2528,34 @@ - "Pou¾ití: inet_route [-vF] del {-host|-net} Cíl[/prefix] [gw Gw] [metrika M] " - "[[dev] If]\n" - --#: ../lib/inet_sr.c:51 -+#: ../lib/inet_sr.c:52 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" - msgstr "" - " inet_route [-vF] add {-host|-net} Cíl[/prefix] [gw Gw] [metrika M]\n" - --#: ../lib/inet_sr.c:52 -+#: ../lib/inet_sr.c:53 -+#, c-format - msgid "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - msgstr "" - " [netmask N] [mss Mss] [window W] [irtt I]\n" - --#: ../lib/inet_sr.c:53 -+#: ../lib/inet_sr.c:54 -+#, c-format - msgid " [mod] [dyn] [reinstate] [[dev] If]\n" - msgstr " [mod] [dyn] [reinstate] [[dev] If]\n" - --#: ../lib/inet_sr.c:54 -+#: ../lib/inet_sr.c:55 -+#, c-format - msgid "" - " inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" - msgstr "" - " inet_route [-vF] add {-host|-net} Cíl/[prefix] [metrika M] reject\n" - --#: ../lib/inet_sr.c:55 -+#: ../lib/inet_sr.c:56 -+#, c-format - msgid " inet_route [-FC] flush NOT supported\n" - msgstr " inet_route [-FC] flush NENÍ podporováno\n" - -@@ -2230,15 +2565,17 @@ - msgstr "route: %s: sí» nelze pou¾ít jako bránu!\n" - - #: ../lib/inet_sr.c:174 --#, fuzzy -+#, fuzzy, c-format - msgid "route: Invalid MSS/MTU.\n" - msgstr "route: Nesprávné NSS.\n" - - #: ../lib/inet_sr.c:187 -+#, c-format - msgid "route: Invalid window.\n" - msgstr "route: Nesprávné okno.\n" - - #: ../lib/inet_sr.c:203 -+#, c-format - msgid "route: Invalid initial rtt.\n" - msgstr "route: Nesprávné zahajovací rtt.\n" - -@@ -2253,75 +2590,92 @@ - msgstr "route: sí»ová maska %s je nesprávná\n" - - #: ../lib/inet_sr.c:270 -+#, c-format - msgid "route: netmask doesn't match route address\n" - msgstr "route: sí»ová maska nevyhovuje adrese cesty\n" - - #: ../lib/inet_sr.c:306 -+#, c-format - msgid "Flushing `inet' routing table not supported\n" - msgstr "Smìrovací cache `inet' nelze vyprazdòovat\n" - - #: ../lib/inet_sr.c:310 -+#, c-format - msgid "Modifying `inet' routing cache not supported\n" - msgstr "Smìrovací cache `inet' nelze mìnit\n" - - #: ../lib/ipx_gr.c:52 -+#, c-format - msgid "IPX not configured in this system.\n" - msgstr "IPX není na tomto systému nakonfigurováno.\n" - - #: ../lib/ipx_gr.c:56 -+#, c-format - msgid "Kernel IPX routing table\n" - msgstr "Smìrovací tabulka v jádru pro IPX\n" - - #. xxx - #: ../lib/ipx_gr.c:57 -+#, c-format - msgid "Destination Router Net Router Node\n" - msgstr "Cíl Smìrovaè Sí» Smìrovaè Uzel\n" - - #: ../lib/ipx_sr.c:33 -+#, c-format - msgid "IPX: this needs to be written\n" - msgstr "IPX: toto je tøeba ulo¾it\n" - --#: ../lib/masq_info.c:197 -+#: ../lib/masq_info.c:198 -+#, c-format - msgid "IP masquerading entries\n" - msgstr "IP maskovací polo¾ky\n" - --#: ../lib/masq_info.c:200 -+#: ../lib/masq_info.c:201 -+#, c-format - msgid "prot expire source destination ports\n" - msgstr "prot ¾ivot zdroj cíl porty\n" - --#: ../lib/masq_info.c:203 -+#: ../lib/masq_info.c:204 -+#, c-format - msgid "" --"prot expire initseq delta prevd source destination " --" ports\n" -+"prot expire initseq delta prevd source " -+"destination ports\n" - msgstr "" --"prot ¾ivot zahajsek delta pøedchd zdroj cíl " --" porty\n" -+"prot ¾ivot zahajsek delta pøedchd zdroj " -+"cíl porty\n" - - #: ../lib/netrom_gr.c:48 -+#, c-format - msgid "NET/ROM not configured in this system.\n" - msgstr "NET/ROM není na tomto systému nakonfigurováno.\n" - - #: ../lib/netrom_gr.c:51 -+#, c-format - msgid "Kernel NET/ROM routing table\n" - msgstr "Smìrovací tabulka v jádru pro NET/ROM\n" - - #: ../lib/netrom_gr.c:52 -+#, c-format - msgid "Destination Mnemonic Quality Neighbour Iface\n" - msgstr "Cíl Mnemonika Kvalita Soused Rozhraní\n" - - #: ../lib/netrom_sr.c:34 -+#, c-format - msgid "netrom usage\n" - msgstr "pou¾ití netrom\n" - - #: ../lib/netrom_sr.c:44 -+#, c-format - msgid "NET/ROM: this needs to be written\n" - msgstr "NET/ROM: toto je potøeba ulo¾it\n" - - #: ../lib/ppp.c:44 -+#, c-format - msgid "You cannot start PPP with this program.\n" - msgstr "Tímto programem nelze PPP spustit.\n" - - #: ../lib/ppp_ac.c:38 -+#, c-format - msgid "Sorry, use pppd!\n" - msgstr "Lituji, pou¾ijte pppd!\n" - -@@ -2330,49 +2684,319 @@ - msgstr "Adresa uzlu musí mít 10 èíslic" - - #: ../lib/rose_gr.c:51 -+#, c-format - msgid "ROSE not configured in this system.\n" - msgstr "ROSE není na tomto systému nakonfigurováno.\n" - - #: ../lib/rose_gr.c:54 -+#, c-format - msgid "Kernel ROSE routing table\n" - msgstr "Smìrovací tabulka v jádru pro ROSE\n" - --#: ../lib/tr.c:70 ../lib/tr.c:85 -+#: ../lib/tr.c:86 ../lib/tr.c:101 - #, c-format - msgid "in_tr(%s): invalid token ring address!\n" - msgstr "in_tr(%s): nesprávná token ring adresa!\n" - --#: ../lib/tr.c:97 -+#: ../lib/tr.c:113 - #, c-format - msgid "in_tr(%s): trailing : ignored!\n" - msgstr "in_tr(%s): nadbyteèné: ignorováno!\n" - --#: ../lib/tr.c:109 -+#: ../lib/tr.c:125 - #, c-format - msgid "in_tr(%s): trailing junk!\n" - msgstr "in_tr(%s): nadbyteèné znaky!\n" - --#: ../lib/interface.c:124 -+#: ../lib/interface.c:176 - #, c-format - msgid "warning: no inet socket available: %s\n" - msgstr "varování: není dostupný ¾ádný inet soket: %s\n" - --#: ../lib/interface.c:270 -+#: ../lib/interface.c:325 - #, c-format - msgid "Warning: cannot open %s (%s). Limited output.\n" - msgstr "" - - #. Give better error message for this case. --#: ../lib/interface.c:504 -+#: ../lib/interface.c:571 - msgid "Device not found" - msgstr "Zaøízení nebylo nalezeno" - --#: ../lib/interface.c:508 -+#: ../lib/interface.c:575 - #, c-format - msgid "%s: error fetching interface information: %s\n" - msgstr "%s: chyba pøi získávání informací o rozhraní %s\n" - --#: ../lib/sockets.c:59 -+#: ../lib/interface.c:608 -+msgid " - no statistics available -" -+msgstr " - statistická data nejsou dostupná -" -+ -+#: ../lib/interface.c:612 -+#, c-format -+msgid "[NO FLAGS]" -+msgstr "[®ÁDNÉ PØÍZNAKY]" -+ -+#: ../lib/interface.c:688 -+#, c-format -+msgid "%-9.9s Link encap:%s " -+msgstr "%-9.9s Zapouzdøení:%s " -+ -+#: ../lib/interface.c:693 -+#, c-format -+msgid "HWaddr %s " -+msgstr "HWadr %s " -+ -+#: ../lib/interface.c:696 -+#, c-format -+msgid "Media:%s" -+msgstr "Médium:%s" -+ -+#: ../lib/interface.c:698 -+#, c-format -+msgid "(auto)" -+msgstr "(auto)" -+ -+#: ../lib/interface.c:705 -+#, c-format -+msgid " %s addr:%s " -+msgstr " %s adr:%s " -+ -+#: ../lib/interface.c:708 -+#, c-format -+msgid " P-t-P:%s " -+msgstr " P-t-P:%s " -+ -+# V ostatních katalozích se pøekládá Broadcast -> v¹esmìrové vysílání. -+# Tudi¾ bcast -> V¹esmìr :) -+#: ../lib/interface.c:711 -+#, c-format -+msgid " Bcast:%s " -+msgstr " V¹esmìr:%s " -+ -+#: ../lib/interface.c:713 -+#, c-format -+msgid " Mask:%s\n" -+msgstr "Maska:%s\n" -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid " inet6 addr: %s/%d" -+msgstr " inet6-adr: %s/%d" -+ -+#: ../lib/interface.c:732 -+#, c-format -+msgid " Scope:" -+msgstr " Rozsah:" -+ -+#: ../lib/interface.c:735 -+#, c-format -+msgid "Global" -+msgstr "Globál" -+ -+#: ../lib/interface.c:738 -+#, c-format -+msgid "Link" -+msgstr "Linka" -+ -+#: ../lib/interface.c:741 -+#, c-format -+msgid "Site" -+msgstr "Stanovi¹tì" -+ -+#: ../lib/interface.c:744 -+#, c-format -+msgid "Compat" -+msgstr "Kompatibilita" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid "Host" -+msgstr "Poèítaè" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid "Unknown" -+msgstr "Neznám." -+ -+#: ../lib/interface.c:765 -+#, c-format -+msgid " IPX/Ethernet II addr:%s\n" -+msgstr " IPX/Ethernet II adr: %s\n" -+ -+#: ../lib/interface.c:768 -+#, c-format -+msgid " IPX/Ethernet SNAP addr:%s\n" -+msgstr " IPX/Ethernet SNAP adr:%s\n" -+ -+#: ../lib/interface.c:771 -+#, c-format -+msgid " IPX/Ethernet 802.2 addr:%s\n" -+msgstr " IPX/Ethernet 802.2 adr:%s\n" -+ -+#: ../lib/interface.c:774 -+#, c-format -+msgid " IPX/Ethernet 802.3 addr:%s\n" -+msgstr " IPX/Ethernet 802.3 adr:%s\n" -+ -+#: ../lib/interface.c:784 -+#, c-format -+msgid " EtherTalk Phase 2 addr:%s\n" -+msgstr " EtherTalk Phase 2 adr:%s\n" -+ -+#: ../lib/interface.c:793 -+#, c-format -+msgid " econet addr:%s\n" -+msgstr " econet adr:%s\n" -+ -+# Hic sunt leones ... -+#: ../lib/interface.c:800 -+#, c-format -+msgid "[NO FLAGS] " -+msgstr "[®ÁDNÉ PØÍZNAKY]" -+ -+#: ../lib/interface.c:802 -+#, c-format -+msgid "UP " -+msgstr "AKTIVOVÁNO " -+ -+#: ../lib/interface.c:804 -+#, c-format -+msgid "BROADCAST " -+msgstr "V©ESMÌROVÉ_VYSÍLÁNÍ " -+ -+#: ../lib/interface.c:806 -+#, c-format -+msgid "DEBUG " -+msgstr "DEBUG " -+ -+#: ../lib/interface.c:808 -+#, c-format -+msgid "LOOPBACK " -+msgstr "SMYÈKA " -+ -+#: ../lib/interface.c:810 -+#, c-format -+msgid "POINTOPOINT " -+msgstr "POINTOPOINT " -+ -+# ?? -+#: ../lib/interface.c:812 -+#, c-format -+msgid "NOTRAILERS " -+msgstr "NOTRAILERS " -+ -+#: ../lib/interface.c:814 -+#, c-format -+msgid "RUNNING " -+msgstr "BÌ®Í " -+ -+#: ../lib/interface.c:816 -+#, c-format -+msgid "NOARP " -+msgstr "NEARP " -+ -+#: ../lib/interface.c:818 -+#, c-format -+msgid "PROMISC " -+msgstr "PROMISK " -+ -+#: ../lib/interface.c:820 -+#, c-format -+msgid "ALLMULTI " -+msgstr "ALLMULTI " -+ -+#: ../lib/interface.c:822 -+#, c-format -+msgid "SLAVE " -+msgstr "SLAVE " -+ -+#: ../lib/interface.c:824 -+#, c-format -+msgid "MASTER " -+msgstr "MASTER " -+ -+#: ../lib/interface.c:826 -+#, c-format -+msgid "MULTICAST " -+msgstr "MULTICAST " -+ -+#: ../lib/interface.c:829 -+#, c-format -+msgid "DYNAMIC " -+msgstr "DYNAMIC " -+ -+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short -+#: ../lib/interface.c:832 -+#, c-format -+msgid " MTU:%d Metric:%d" -+msgstr " MTU:%d Metrika:%d" -+ -+#: ../lib/interface.c:836 -+#, c-format -+msgid " Outfill:%d Keepalive:%d" -+msgstr " Outfill:%d Keepalive:%d" -+ -+#: ../lib/interface.c:850 -+#, fuzzy, c-format -+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgstr "pøijmutých paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu rámcù:%lu\n" -+ -+#: ../lib/interface.c:855 -+#, c-format -+msgid " compressed:%lu\n" -+msgstr " komprimováno:%lu\n" -+ -+# carrier? -+#: ../lib/interface.c:895 -+#, fuzzy, c-format -+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgstr "odeslaných paketù:%lu chyb:%lu zahozeno:%lu pøeteèení:%lu pøenos:%lu\n" -+ -+#: ../lib/interface.c:899 -+#, c-format -+msgid " collisions:%lu " -+msgstr " kolizí:%lu " -+ -+#: ../lib/interface.c:901 -+#, c-format -+msgid "compressed:%lu " -+msgstr "komprimováno:%lu " -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "txqueuelen:%d " -+msgstr "délka odchozí fronty:%d " -+ -+#: ../lib/interface.c:905 -+#, c-format -+msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" -+msgstr "" -+ -+#: ../lib/interface.c:916 -+#, c-format -+msgid "Interrupt:%d " -+msgstr "Pøeru¹ení:%d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:919 -+#, c-format -+msgid "Base address:0x%x " -+msgstr "Vstupnì/Výstupní port:0x%x " -+ -+#: ../lib/interface.c:921 -+#, c-format -+msgid "Memory:%lx-%lx " -+msgstr "Pamì»:%lx-%lx " -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "DMA chan:%x " -+msgstr "Kanál DMA:%x " -+ -+#: ../lib/sockets.c:63 -+#, c-format - msgid "No usable address families found.\n" - msgstr "Nebyla nalezena ¾ádná pou¾itelná tøída adres.\n" - -@@ -2396,29 +3020,32 @@ - msgid "ip: argument is wrong: %s\n" - msgstr "ip: argument %s je nesprávný\n" - --#: ../ipmaddr.c:56 -+#: ../ipmaddr.c:61 -+#, c-format - msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" - msgstr " Usage: ipmaddr [ add | del ] MULTIADR dev ØETÌZEC\n" - --#: ../ipmaddr.c:57 -+#: ../ipmaddr.c:62 -+#, c-format - msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" - msgstr " ipmaddr show [ dev ØETÌZEC ] [ ipv4 | ipv6 | link | all ]\n" - --#: ../ipmaddr.c:58 -+#: ../ipmaddr.c:63 -+#, c-format - msgid " ipmaddr -V | -version\n" - msgstr " ipmaddr -V | -version\n" - --#: ../ipmaddr.c:258 -+#: ../ipmaddr.c:263 - #, c-format - msgid "family %d " - msgstr "tøída %d " - --#: ../ipmaddr.c:267 -+#: ../ipmaddr.c:272 - #, c-format - msgid " users %d" - msgstr " u¾ivatelé %d" - --#: ../ipmaddr.c:353 -+#: ../ipmaddr.c:358 - msgid "Cannot create socket" - msgstr "Soket nelze vytvoøit" - -@@ -2433,6 +3060,7 @@ - msgstr "slattach: tty_lock: (%s): %s\n" - - #: ../slattach.c:192 -+#, c-format - msgid "slattach: cannot write PID file\n" - msgstr "slattach: do PID souboru nelze zapisovat\n" - -@@ -2451,44 +3079,77 @@ - msgid "slattach: tty_hangup(RAISE): %s\n" - msgstr "slattach: tty_hangup(RAISE): %s\n" - --#: ../slattach.c:486 -+#: ../slattach.c:468 -+#, fuzzy, c-format -+msgid "slattach: tty name too long\n" -+msgstr "jméno %s je pøíli¹ dlouhé\n" -+ -+#: ../slattach.c:498 -+#, c-format - msgid "slattach: tty_open: cannot get current state!\n" - msgstr "slattach: tty_open: aktuální stav nelze zjistit!\n" - --#: ../slattach.c:493 -+#: ../slattach.c:505 -+#, c-format - msgid "slattach: tty_open: cannot get current line disc!\n" - msgstr "slattach: tty_open: aktuální linkovou disciplínu nelze zjistit!\n" - --#: ../slattach.c:501 -+#: ../slattach.c:513 -+#, c-format - msgid "slattach: tty_open: cannot set RAW mode!\n" - msgstr "slattach: tty_open: re¾im RAW nelze nastavit!\n" - --#: ../slattach.c:508 -+#: ../slattach.c:520 - #, c-format - msgid "slattach: tty_open: cannot set %s bps!\n" - msgstr "slattach: tty_open: %s bps nelze nastavit!\n" - --#: ../slattach.c:518 -+#: ../slattach.c:530 -+#, c-format - msgid "slattach: tty_open: cannot set 8N1 mode!\n" - msgstr "slattach: tty_open: re¾im 8N1 nelze nastavit!\n" - --#: ../slattach.c:686 -+#: ../slattach.c:672 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "" -+ -+#: ../slattach.c:704 - #, c-format - msgid "%s started" - msgstr "protokol %s spu¹tìn" - --#: ../slattach.c:687 -+#: ../slattach.c:705 - #, c-format - msgid " on %s" - msgstr " na %s" - --#: ../slattach.c:688 -+#: ../slattach.c:706 - #, c-format - msgid " interface %s\n" - msgstr " rozhraní %s\n" - - #~ msgid "" --#~ " This comand can read or set the hostname or the NIS domainname. You can\n" -+#~ " arp [-v] [] [-i ] -s [netmask ] pub " -+#~ "<-''-\n" -+#~ msgstr "" -+#~ " arp [-v] [] [-i ] -s [sí»mask <èís>] <-''-\n" -+ -+#~ msgid "%s: unknown interface: %s\n" -+#~ msgstr "%s: rozhraní %s není známo\n" -+ -+#~ msgid "address mask replies" -+#~ msgstr "odpovìdi na ¾ádost o masku podsítì" -+ -+#~ msgid "unknown title %s\n" -+#~ msgstr "titulek %s je neznámý\n" -+ -+#~ msgid "Routing table for `ddp' not yet supported.\n" -+#~ msgstr "Smìrovací tabulka pro `ddp' není zatím podporována.\n" -+ -+#~ msgid "" -+#~ " This comand can read or set the hostname or the NIS domainname. You " -+#~ "can\n" - #~ msgstr "" - #~ " Tento program zji¹»uje a nastavuje jméno poèítaèe èi NIS domény. Mù¾e " - #~ "také\n" -@@ -2500,7 +3161,8 @@ - #~ msgid "" - #~ " Unless you are using bind or NIS for host lookups you can change the\n" - #~ msgstr "" --#~ " Pokud nepou¾íváte bind èi NIS pro vyhledávání jmen poèítaèù, pak mù¾ete\n" -+#~ " Pokud nepou¾íváte bind èi NIS pro vyhledávání jmen poèítaèù, pak " -+#~ "mù¾ete\n" - - #~ msgid "" - #~ " FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" ---- net-tools-1.60.orig/po/ja.po -+++ net-tools-1.60/po/ja.po -@@ -0,0 +1,3133 @@ -+# Net-tool Japanese locale data -+# Kenshi Muto , 2007. -+# Yasuyuki Furukawa , 1999. -+# -+msgid "" -+msgstr "" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2007-06-30 12:28+0900\n" -+"PO-Revision-Date: 2007-07-04 20:47+0900\n" -+"Last-Translator: Kenshi Muto \n" -+"Language-Team: Japanese\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8-bit\n" -+ -+#: ../arp.c:112 ../arp.c:279 -+#, c-format -+msgid "arp: need host name\n" -+msgstr "arp: ホストåãŒå¿…è¦ã§ã™\n" -+ -+#: ../arp.c:215 ../arp.c:230 -+#, c-format -+msgid "No ARP entry for %s\n" -+msgstr "%sã®ARPエントリãŒã‚ã‚Šã¾ã›ã‚“\n" -+ -+#: ../arp.c:248 -+#, c-format -+msgid "arp: cant get HW-Address for `%s': %s.\n" -+msgstr "arp: '%s'ã®ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’å–å¾—ã§ãã¾ã›ã‚“: %s.\n" -+ -+#: ../arp.c:252 -+#, c-format -+msgid "arp: protocol type mismatch.\n" -+msgstr "arp: プロトコルタイプãŒé©åˆã—ã¾ã›ã‚“.\n" -+ -+#: ../arp.c:261 -+#, c-format -+msgid "arp: device `%s' has HW address %s `%s'.\n" -+msgstr "arp: デãƒã‚¤ã‚¹`%s'ã¯ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¢ãƒ‰ãƒ¬ã‚¹%s `%s'ã§ã™.\n" -+ -+#: ../arp.c:293 -+#, c-format -+msgid "arp: need hardware address\n" -+msgstr "arp: ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒå¿…è¦ã§ã™\n" -+ -+#: ../arp.c:301 -+#, c-format -+msgid "arp: invalid hardware address\n" -+msgstr "arp: ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒä¸é©å½“ã§ã™\n" -+ -+#: ../arp.c:398 -+#, c-format -+msgid "arp: cannot open etherfile %s !\n" -+msgstr "arp: etherファイル%sãŒé–‹ã‘ã¾ã›ã‚“!\n" -+ -+#: ../arp.c:414 -+#, c-format -+msgid "arp: format error on line %u of etherfile %s !\n" -+msgstr "arp: %uè¡Œ(ファイル%s)ã«ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚¨ãƒ©ãƒ¼ãŒã‚ã‚Šã¾ã™!\n" -+ -+#: ../arp.c:427 -+#, c-format -+msgid "arp: cannot set entry on line %u of etherfile %s !\n" -+msgstr "arp: etherファイル%uè¡Œ(%s)ã®ã‚¨ãƒ³ãƒˆãƒªã‚’設定ã§ãã¾ã›ã‚“!\n" -+ -+#: ../arp.c:448 -+#, c-format -+msgid "" -+"Address HWtype HWaddress Flags Mask " -+"Iface\n" -+msgstr "アドレス HWタイプ HWアドレス フラグ マスク インタフェース\n" -+ -+#: ../arp.c:476 -+msgid "" -+msgstr "<起点インタフェース>" -+ -+#: ../arp.c:478 -+msgid "(incomplete)" -+msgstr "(ä¸å®Œå…¨)" -+ -+# translatable? -+#: ../arp.c:495 -+#, c-format -+msgid "%s (%s) at " -+msgstr "%s (%s) at " -+ -+#: ../arp.c:501 -+#, c-format -+msgid " " -+msgstr "<ä¸å®Œå…¨> " -+ -+#: ../arp.c:507 -+#, c-format -+msgid "netmask %s " -+msgstr "ãƒãƒƒãƒˆãƒžã‚¹ã‚¯ %s " -+ -+# translatable? -+#: ../arp.c:524 -+#, c-format -+msgid "on %s\n" -+msgstr "on %s\n" -+ -+#: ../arp.c:605 -+#, c-format -+msgid "Entries: %d\tSkipped: %d\tFound: %d\n" -+msgstr "エントリ: %d\tスキップ: %d\t発見: %d\n" -+ -+#: ../arp.c:609 -+#, c-format -+msgid "%s (%s) -- no entry\n" -+msgstr "%s (%s) -- エントリãªã—\n" -+ -+#: ../arp.c:611 -+#, c-format -+msgid "arp: in %d entries no match found.\n" -+msgstr "arp: %dã®ã‚¨ãƒ³ãƒˆãƒªä¸­, 一致ã™ã‚‹ã‚‚ã®ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“.\n" -+ -+#: ../arp.c:626 -+#, c-format -+msgid "" -+"Usage:\n" -+" arp [-vn] [] [-i ] [-a] [] <-Display ARP " -+"cache\n" -+msgstr "" -+"使用法:\n" -+" arp [-vn] [] [-i <インタフェース>]\n" -+" [-a] [<ホストå>] ‥‥ ARPキャッシュã®è¡¨" -+"示\n" -+ -+#: ../arp.c:627 -+#, c-format -+msgid "" -+" arp [-v] [-i ] -d [pub] <-Delete ARP " -+"entry\n" -+msgstr " arp [-v] [-i <インタフェース>] -d <ホストå> [pub] ‥‥ARPエントリを削除\n" -+ -+#: ../arp.c:628 -+#, c-format -+msgid "" -+" arp [-vnD] [] [-i ] -f [] <-Add entry from " -+"file\n" -+msgstr "" -+" arp [-vnD] [] [-i <インタフェース>] \n" -+" -f <ファイルå> ‥‥ファイルã‹ã‚‰ã‚¨ãƒ³ãƒˆãƒªã‚’追加\n" -+ -+#: ../arp.c:629 -+#, c-format -+msgid "" -+" arp [-v] [] [-i ] -s [temp] <-Add " -+"entry\n" -+msgstr "" -+" arp [-v] [] [-i <インタフェース>]\n" -+" -s <ホストå> <ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¢ãƒ‰ãƒ¬ã‚¹> [temp] ‥‥エントリを追加\n" -+ -+# FIXME:What does '' mean? -+#: ../arp.c:630 -+#, c-format -+msgid "" -+" arp [-v] [] [-i ] -Ds [netmask ] pub " -+"<-''-\n" -+"\n" -+msgstr "" -+" arp [-v] [] [-i <インタフェース>] -Ds <ホストå>\n" -+" <インタフェース> [netmask <ãƒãƒƒãƒˆãƒžã‚¹ã‚¯>] pub ‥‥ 〃\n" -+ -+#: ../arp.c:632 -+#, c-format -+msgid "" -+" -a display (all) hosts in alternative (BSD) " -+"style\n" -+msgstr "" -+" -a æ–°ã—ã„(BSD)スタイルã§ã‚¨ãƒ³ãƒˆãƒªã•ã‚ŒãŸå…¨ãƒ›ã‚¹ãƒˆã‚’表示" -+"ã™ã‚‹\n" -+ -+#: ../arp.c:633 -+#, c-format -+msgid " -s, --set set a new ARP entry\n" -+msgstr " -s, --set æ–°è¦ARPエントリを設定ã™ã‚‹\n" -+ -+#: ../arp.c:634 -+#, c-format -+msgid " -d, --delete delete a specified entry\n" -+msgstr " -d, --delete 指定エントリを削除ã™ã‚‹\n" -+ -+#: ../arp.c:635 ../netstat.c:1503 ../route.c:86 -+#, c-format -+msgid " -v, --verbose be verbose\n" -+msgstr " -v, --verbose 詳細表示を行ãªã†\n" -+ -+#: ../arp.c:636 ../netstat.c:1504 ../route.c:87 -+#, c-format -+msgid " -n, --numeric don't resolve names\n" -+msgstr " -n, --numeric åå‰ã®ãƒ¬ã‚¾ãƒ«ãƒ–ã‚’ã—ãªã„\n" -+ -+#: ../arp.c:637 -+#, c-format -+msgid "" -+" -i, --device specify network interface (e.g. eth0)\n" -+msgstr " -i, --device ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹ã®æŒ‡å®š(例 eth0)\n" -+ -+#: ../arp.c:638 -+#, c-format -+msgid " -D, --use-device read from given device\n" -+msgstr "" -+" -D, --use-device 与ãˆã‚‰ã‚ŒãŸãƒ‡ãƒã‚¤ã‚¹ã‹ã‚‰\n" -+" を読ã¿è¾¼ã‚€\n" -+ -+#: ../arp.c:639 -+#, c-format -+msgid " -A, -p, --protocol specify protocol family\n" -+msgstr " -A, -p, --protocol プロトコルファミリを指定ã™ã‚‹\n" -+ -+#: ../arp.c:640 -+#, c-format -+msgid "" -+" -f, --file read new entries from file or from /etc/" -+"ethers\n" -+"\n" -+msgstr " -f, --file /etc/ethersファイルã‹ã‚‰æ–°è¦ã‚¨ãƒ³ãƒˆãƒªã‚’読ã¿è¾¼ã‚€\n\n" -+ -+#: ../arp.c:642 ../rarp.c:182 -+#, c-format -+msgid " =Use '-H ' to specify hardware address type. Default: %s\n" -+msgstr " =ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚¿ã‚¤ãƒ—を指定ã™ã‚‹ã«ã¯'-H 'を使ã£ã¦ä¸‹ã•ã„。標準: %s\n" -+ -+#: ../arp.c:643 ../rarp.c:183 -+#, c-format -+msgid " List of possible hardware types (which support ARP):\n" -+msgstr " (ARPをサãƒãƒ¼ãƒˆã—ãŸ)指定å¯èƒ½ãªãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¿ã‚¤ãƒ—ã®ãƒªã‚¹ãƒˆ:\n" -+ -+#: ../arp.c:677 ../arp.c:762 -+#, c-format -+msgid "%s: hardware type not supported!\n" -+msgstr "%s: ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¿ã‚¤ãƒ—ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“!\n" -+ -+#: ../arp.c:681 -+#, c-format -+msgid "%s: address family not supported!\n" -+msgstr "%s: アドレスファミリãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“!\n" -+ -+#: ../arp.c:716 -+#, c-format -+msgid "arp: -N not yet supported.\n" -+msgstr "arp: -Nã¯ã¾ã ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“.\n" -+ -+#: ../arp.c:726 -+#, c-format -+msgid "arp: %s: unknown address family.\n" -+msgstr "arp: %s: ä¸æ˜Žãªã‚¢ãƒ‰ãƒ¬ã‚¹ãƒ•ã‚¡ãƒŸãƒªã§ã™.\n" -+ -+#: ../arp.c:735 -+#, c-format -+msgid "arp: %s: unknown hardware type.\n" -+msgstr "arp: %s: ä¸æ˜Žãªãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¿ã‚¤ãƒ—ã§ã™.\n" -+ -+#: ../arp.c:754 -+#, c-format -+msgid "arp: %s: kernel only supports 'inet'.\n" -+msgstr "arp: %s: カーãƒãƒ«ã¯'inet'以外ã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“.\n" -+ -+#: ../arp.c:767 -+#, c-format -+msgid "arp: %s: hardware type without ARP support.\n" -+msgstr "arp: %s: ARPサãƒãƒ¼ãƒˆã®ãªã„ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¿ã‚¤ãƒ—ã§ã™.\n" -+ -+#: ../hostname.c:71 -+#, c-format -+msgid "Setting nodename to `%s'\n" -+msgstr "ノードåã‚’`%s'ã¸è¨­å®šã—ã¾ã—ãŸ\n" -+ -+#: ../hostname.c:76 -+#, c-format -+msgid "%s: you must be root to change the node name\n" -+msgstr "%s: ノードåã®å¤‰æ›´ã¯ãƒ«ãƒ¼ãƒˆã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“\n" -+ -+#: ../hostname.c:79 ../hostname.c:99 ../hostname.c:117 -+#, c-format -+msgid "%s: name too long\n" -+msgstr "%s: åå‰ãŒé•·ã™ãŽã¾ã™\n" -+ -+#: ../hostname.c:91 -+#, c-format -+msgid "Setting hostname to `%s'\n" -+msgstr "ホストåã‚’`%s'ã¸è¨­å®šã—ã¾ã—ãŸ\n" -+ -+#: ../hostname.c:96 -+#, c-format -+msgid "%s: you must be root to change the host name\n" -+msgstr "%s: ホストåã®å¤‰æ›´ã¯ãƒ«ãƒ¼ãƒˆã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“\n" -+ -+#: ../hostname.c:109 -+#, c-format -+msgid "Setting domainname to `%s'\n" -+msgstr "ドメインを`%s'ã¸è¨­å®šã—ã¾ã—ãŸ\n" -+ -+#: ../hostname.c:114 -+#, c-format -+msgid "%s: you must be root to change the domain name\n" -+msgstr "%s: ドメインåã®å¤‰æ›´ã¯ãƒ«ãƒ¼ãƒˆã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“\n" -+ -+#: ../hostname.c:131 -+#, c-format -+msgid "Resolving `%s' ...\n" -+msgstr "`%s'をレゾルブ中 ...\n" -+ -+#: ../hostname.c:137 -+#, c-format -+msgid "Result: h_name=`%s'\n" -+msgstr "çµæžœ: h_name=`%s'\n" -+ -+#: ../hostname.c:142 -+#, c-format -+msgid "Result: h_aliases=`%s'\n" -+msgstr "çµæžœ: h_aliases=`%s'\n" -+ -+#: ../hostname.c:147 -+#, c-format -+msgid "Result: h_addr_list=`%s'\n" -+msgstr "çµæžœ: h_addr_list=`%s'\n" -+ -+#: ../hostname.c:208 -+#, c-format -+msgid "%s: can't open `%s'\n" -+msgstr "%s: `%s'ã‚’é–‹ã‘ã¾ã›ã‚“\n" -+ -+#: ../hostname.c:222 -+#, c-format -+msgid "Usage: hostname [-v] {hostname|-F file} set hostname (from file)\n" -+msgstr "使用法: hostname [-v] {ホストå|-F ファイル} (ファイルã«ã‚ˆã‚‹)ホストåã®è¨­å®š\n" -+ -+#: ../hostname.c:223 -+#, c-format -+msgid "" -+" domainname [-v] {nisdomain|-F file} set NIS domainname (from file)\n" -+msgstr " domainname [-v] {NISドメイン|-F ファイル} (ファイルã«ã‚ˆã‚‹)NISドメインåã®è¨­å®š\n" -+ -+#: ../hostname.c:225 -+#, c-format -+msgid "" -+" nodename [-v] {nodename|-F file} set DECnet node name (from " -+"file)\n" -+msgstr "" -+"nodename [-v] {ノードå|-F ファイル} (ファイルã«ã‚ˆã‚‹)DECnetノードåã®è¨­å®š\n" -+ -+#: ../hostname.c:227 -+#, c-format -+msgid " hostname [-v] [-d|-f|-s|-a|-i|-y|-n] display formatted name\n" -+msgstr " hostname [-v] [-d|-f|-s|-a|-i|-y] å½¢å¼ã‚’指定ã—ã¦è¡¨ç¤º\n" -+ -+#: ../hostname.c:228 -+#, c-format -+msgid "" -+" hostname [-v] display hostname\n" -+"\n" -+msgstr "" -+" hostname [-v] ホストåã®å‡ºåŠ›\n" -+"\n" -+ -+#: ../hostname.c:229 -+#, c-format -+msgid "" -+" hostname -V|--version|-h|--help print info and exit\n" -+"\n" -+msgstr "" -+" hostname -V|--version|-h|--help 諸情報を出力ã—ã¦çµ‚了\n" -+"\n" -+"\n" -+ -+#: ../hostname.c:230 -+#, c-format -+msgid "" -+" dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n" -+"\n" -+msgstr " dnsdomainname=ホストå -d, {yp,nis,}domainname=ホストå -y\n\n" -+ -+#: ../hostname.c:231 -+#, c-format -+msgid " -s, --short short host name\n" -+msgstr " -s, --short 短縮ホストå\n" -+ -+#: ../hostname.c:232 -+#, c-format -+msgid " -a, --alias alias names\n" -+msgstr " -a, --alias エイリアスå\n" -+ -+#: ../hostname.c:233 -+#, c-format -+msgid " -i, --ip-address addresses for the hostname\n" -+msgstr " -i, --ip-address ホストåã«å¯¾ã™ã‚‹ã‚¢ãƒ‰ãƒ¬ã‚¹\n" -+ -+#: ../hostname.c:234 -+#, c-format -+msgid " -f, --fqdn, --long long host name (FQDN)\n" -+msgstr " -f, --fqdn, --long ロングホストå(FQDN)\n" -+ -+#: ../hostname.c:235 -+#, c-format -+msgid " -d, --domain DNS domain name\n" -+msgstr " -d, --domain DNSドメインå\n" -+ -+#: ../hostname.c:236 -+#, c-format -+msgid " -y, --yp, --nis NIS/YP domainname\n" -+msgstr " -y, --yp, --nis NIS/YPドメインå\n" -+ -+#: ../hostname.c:238 -+#, c-format -+msgid " -n, --node DECnet node name\n" -+msgstr " -n, --node DECnetノードå\n" -+ -+#: ../hostname.c:240 -+#, c-format -+msgid "" -+" -F, --file read hostname or NIS domainname from given file\n" -+"\n" -+msgstr " -F, --file 指定ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ãƒ›ã‚¹ãƒˆåã‹NISドメインåを読ã¿è¾¼ã‚€\n\n" -+ -+#: ../hostname.c:242 -+#, c-format -+msgid "" -+" This command can read or set the hostname or the NIS domainname. You can\n" -+" also read the DNS domain or the FQDN (fully qualified domain name).\n" -+" Unless you are using bind or NIS for host lookups you can change the\n" -+" FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n" -+" part of the FQDN) in the /etc/hosts file.\n" -+msgstr "" -+" ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã¯ã€ãƒ›ã‚¹ãƒˆåã¾ãŸã¯NISドメインåを読ã¿è¾¼ã¿ã¾ãŸã¯è¨­å®šã§ãã¾ã™ã€‚\n" -+" DNSドメインã¾ãŸã¯FDN(完全修飾ドメインå)を読ã¿è¾¼ã‚€ã“ã¨ã‚‚ã§ãã¾ã™ã€‚\n" -+" ホストåã®å‚ç…§ã«BindãŠã‚ˆã³, NISも使ã‚ãªã„å ´åˆ, /etc/hostsファイルã«ã‚ã‚‹\n" -+" FQDNã‚„, (FQDNã®ä¸€éƒ¨åˆ†ã®)ドメインåを変更ã§ãã¾ã™.\n" -+ -+#: ../hostname.c:338 -+#, c-format -+msgid "%s: You can't change the DNS domain name with this command\n" -+msgstr "%s: ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã¯DNSドメインåã¯å¤‰æ›´ã§ãã¾ã›ã‚“.\n" -+ -+#: ../hostname.c:339 -+#, c-format -+msgid "" -+"\n" -+"Unless you are using bind or NIS for host lookups you can change the DNS\n" -+msgstr "" -+"\n" -+"ホストåã®å‚ç…§ã«BindãŠã‚ˆã³, NISも使ã‚ãªã„å ´åˆã€/etc/hostsファイル\n" -+ -+#: ../hostname.c:340 -+#, c-format -+msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n" -+msgstr "ã«ã‚ã‚‹FQDNã‚„, (FQDNã®ä¸€éƒ¨åˆ†ã®)ドメインåを変更ã§ãã¾ã™.\n" -+ -+#: ../hostname.c:357 -+#, c-format -+msgid "gethostname()=`%s'\n" -+msgstr "gethostname()=`%s'\n" -+ -+#: ../hostname.c:374 -+#, c-format -+msgid "getdomainname()=`%s'\n" -+msgstr "getdomainname()=`%s'\n" -+ -+#: ../hostname.c:389 -+#, c-format -+msgid "getnodename()=`%s'\n" -+msgstr "getnodename()=`%s'\n" -+ -+#: ../ifconfig.c:107 -+#, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR フラグ\n" -+ -+#: ../ifconfig.c:129 ../ifconfig.c:161 -+#, c-format -+msgid "%s: ERROR while getting interface flags: %s\n" -+msgstr "%s: インタフェースフラグã®å–得中ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ:%s\n" -+ -+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:771 ../ifconfig.c:862 -+#: ../ifconfig.c:973 -+#, c-format -+msgid "No support for INET on this system.\n" -+msgstr "INETã¯ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã§ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“.\n" -+ -+#: ../ifconfig.c:193 -+#, c-format -+msgid "%s: ERROR while testing interface flags: %s\n" -+msgstr "%s: インタフェースフラグã®ãƒ†ã‚¹ãƒˆä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %s\n" -+ -+#: ../ifconfig.c:202 -+#, c-format -+msgid "" -+"Usage:\n" -+" ifconfig [-a] [-v] [-s] [[]
]\n" -+msgstr "" -+"使用法:\n" -+" ifconfig [-a] [-v] [-s] <インタフェース> [[] <アドレス>]\n" -+ -+#: ../ifconfig.c:204 -+#, c-format -+msgid " [add
[/]]\n" -+msgstr " [add <アドレス>[/<プレフィックス長>]]\n" -+ -+#: ../ifconfig.c:205 -+#, c-format -+msgid " [del
[/]]\n" -+msgstr " [del <アドレス>[/<プレフィックス長>]]\n" -+ -+#: ../ifconfig.c:206 -+#, c-format -+msgid " [[-]broadcast [
]] [[-]pointopoint [
]]\n" -+msgstr " [[-]broadcast [<アドレス>]] [[-]pointopoint [<アドレス>]]\n" -+ -+#: ../ifconfig.c:207 -+#, c-format -+msgid " [netmask
] [dstaddr
] [tunnel
]\n" -+msgstr " [netmask <アドレス>] [dstaddr <アドレス>] [tunnel <アドレス>]\n" -+ -+#: ../ifconfig.c:210 -+#, c-format -+msgid " [outfill ] [keepalive ]\n" -+msgstr " [outfill <数値>] [keepalive <数値>]\n" -+ -+#: ../ifconfig.c:212 -+#, c-format -+msgid " [hw
] [metric ] [mtu ]\n" -+msgstr " [hw <アドレス>] [metric <数値>] [mtu <数値>]\n" -+ -+#: ../ifconfig.c:213 -+#, c-format -+msgid " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+msgstr " [[-]trailers] [[-]arp] [[-]allmulti]\n" -+ -+#: ../ifconfig.c:214 -+#, c-format -+msgid " [multicast] [[-]promisc]\n" -+msgstr " [multicast] [[-]promisc]\n" -+ -+#: ../ifconfig.c:215 -+#, c-format -+msgid " [mem_start ] [io_addr ] [irq ] [media ]\n" -+msgstr " [mem_start <開始アドレス>] [io_addr ] [irq <番å·>] [media <タイプ>]\n" -+ -+#: ../ifconfig.c:217 -+#, c-format -+msgid " [txqueuelen ]\n" -+msgstr " [txqueuelen ]\n" -+ -+#: ../ifconfig.c:220 -+#, c-format -+msgid " [[-]dynamic]\n" -+msgstr " [[-]dynamic]\n" -+ -+#: ../ifconfig.c:222 -+#, c-format -+msgid "" -+" [up|down] ...\n" -+"\n" -+msgstr " [up|down] ...\n\n" -+ -+#: ../ifconfig.c:224 -+#, c-format -+msgid " =Hardware Type.\n" -+msgstr " =ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¿ã‚¤ãƒ—.\n" -+ -+#: ../ifconfig.c:225 -+#, c-format -+msgid " List of possible hardware types:\n" -+msgstr " 利用å¯èƒ½ãªãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¿ã‚¤ãƒ—ã®ãƒªã‚¹ãƒˆ:\n" -+ -+#. 1 = ARPable -+#: ../ifconfig.c:227 -+#, c-format -+msgid " =Address family. Default: %s\n" -+msgstr " =アドレスファミリ. 標準: %s\n" -+ -+#: ../ifconfig.c:228 -+#, c-format -+msgid " List of possible address families:\n" -+msgstr " 利用å¯èƒ½ãªã‚¢ãƒ‰ãƒ¬ã‚¹ãƒ•ã‚¡ãƒŸãƒªã®ãƒªã‚¹ãƒˆ:\n" -+ -+#: ../ifconfig.c:303 -+#, c-format -+msgid "ifconfig: option `%s' not recognised.\n" -+msgstr "ifconfig: オプション`%s'を解釈ã§ãã¾ã›ã‚“.\n" -+ -+#: ../ifconfig.c:305 ../ifconfig.c:962 -+#, c-format -+msgid "ifconfig: `--help' gives usage information.\n" -+msgstr "ifconfig: `--help'ã§ä½¿ç”¨æ³•ã‚’見られã¾ã™.\n" -+ -+#: ../ifconfig.c:380 -+#, c-format -+msgid "Unknown media type.\n" -+msgstr "ä¸æ˜Žãªãƒ¡ãƒ‡ã‚£ã‚¢ã‚¿ã‚¤ãƒ—ã§ã™.\n" -+ -+#: ../ifconfig.c:417 -+#, c-format -+msgid "" -+"Warning: Interface %s still in promisc mode... maybe other application is " -+"running?\n" -+msgstr "警告: インタフェース%sã¯ã¾ã promiscモードã§ã™...æらãä»–ã®ã‚¢ãƒ—リケーションãŒå®Ÿè¡Œä¸­ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã‹?\n" -+ -+#: ../ifconfig.c:429 -+#, c-format -+msgid "Warning: Interface %s still in MULTICAST mode.\n" -+msgstr "警告: インタフェース%sã¯ã¾ã MULTICASTモードã§ã™.\n" -+ -+#: ../ifconfig.c:441 -+#, c-format -+msgid "Warning: Interface %s still in ALLMULTI mode.\n" -+msgstr "警告: インタフェース%sã¯ã¾ã ALLMULTIモードã§ã™.\n" -+ -+#: ../ifconfig.c:465 -+#, c-format -+msgid "Warning: Interface %s still in DYNAMIC mode.\n" -+msgstr "警告: インタフェース%sã¯ã¾ã DYNAMICモードã§ã™.\n" -+ -+#: ../ifconfig.c:523 -+#, c-format -+msgid "Warning: Interface %s still in BROADCAST mode.\n" -+msgstr "警告: インタフェース%sã¯ã¾ã BROADCASTモードã§ã™.\n" -+ -+#: ../ifconfig.c:652 -+#, c-format -+msgid "Warning: Interface %s still in POINTOPOINT mode.\n" -+msgstr "警告: インタフェース%sã¯ã¾ã POINTOPOINTモードã§ã™.\n" -+ -+#: ../ifconfig.c:684 -+#, c-format -+msgid "hw address type `%s' has no handler to set address. failed.\n" -+msgstr "ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚¿ã‚¤ãƒ—`%s'ã¯ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’設定ã™ã‚‹ãƒãƒ³ãƒ‰ãƒ©ã‚’æŒã£ã¦ã„ã¾ã›ã‚“. 失敗ã—ã¾ã—ãŸ.\n" -+ -+#: ../ifconfig.c:693 -+#, c-format -+msgid "%s: invalid %s address.\n" -+msgstr "%s: ä¸é©åˆ‡ãªã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã™(%s).\n" -+ -+#: ../ifconfig.c:737 ../ifconfig.c:827 ../ifconfig.c:913 -+#, c-format -+msgid "No support for INET6 on this system.\n" -+msgstr "INET6ã¯ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã§ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“.\n" -+ -+#: ../ifconfig.c:780 ../ifconfig.c:871 -+#, c-format -+msgid "Interface %s not initialized\n" -+msgstr "インタフェース%sã¯åˆæœŸåŒ–ã•ã‚Œã¦ã„ã¾ã›ã‚“.\n" -+ -+#: ../ifconfig.c:792 ../ifconfig.c:882 -+#, c-format -+msgid "Bad address.\n" -+msgstr "ä¸é©åˆ‡ãªã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã™.\n" -+ -+#: ../ifconfig.c:885 -+#, c-format -+msgid "Address deletion not supported on this system.\n" -+msgstr "アドレス削除ã¯ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã§ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“.\n" -+ -+#: ../ifconfig.c:957 -+#, c-format -+msgid "ifconfig: Cannot set address for this protocol family.\n" -+msgstr "ifconfig:ã“ã®ãƒ—ロトコルファミリã«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’設定ã§ãã¾ã›ã‚“.\n" -+ -+#: ../ifconfig.c:983 -+#, c-format -+msgid "No support for ECONET on this system.\n" -+msgstr "ECONETã¯ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã§ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“.\n" -+ -+#: ../ifconfig.c:991 -+#, c-format -+msgid "Don't know how to set addresses for family %d.\n" -+msgstr "ファミリ%dã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã®è¨­å®šæ–¹æ³•ãŒä¸æ˜Žã§ã™.\n" -+ -+#: ../ifconfig.c:1021 -+#, c-format -+msgid "WARNING: at least one error occured. (%d)\n" -+msgstr "警告: å°‘ãªãã¨ã‚‚1ã¤ã®ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ. (%d)\n" -+ -+#: ../netstat.c:434 -+#, c-format -+msgid "" -+"(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n" -+msgstr "(\"-p\"ã®æƒ…報を読ã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ: geteuid()=%d ã—ã‹ã—ルートã§ã‚ã‚‹ã¹ãã§ã™.)\n" -+ -+#: ../netstat.c:438 -+#, c-format -+msgid "" -+"(Not all processes could be identified, non-owned process info\n" -+" will not be shown, you would have to be root to see it all.)\n" -+msgstr "" -+"(一部ã®ãƒ—ロセスãŒè­˜åˆ¥ã•ã‚Œã¾ã™ãŒ, 所有ã—ã¦ã„ãªã„プロセスã®æƒ…å ±ã¯\n" -+"表示ã•ã‚Œã¾ã›ã‚“。ãれら全ã¦ã‚’見るã«ã¯ãƒ«ãƒ¼ãƒˆã«ãªã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™.)\n" -+ -+# translatable? -+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266 -+msgid "LISTENING" -+msgstr "LISTENING" -+ -+# translatable? -+#: ../netstat.c:446 -+msgid "CONN SENT" -+msgstr "CONN SENT" -+ -+# translatable? -+#: ../netstat.c:447 ../netstat.c:1268 -+msgid "DISC SENT" -+msgstr "DISC SENT" -+ -+# translatable? -+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269 -+msgid "ESTABLISHED" -+msgstr "ESTABLISHED" -+ -+#: ../netstat.c:470 -+#, c-format -+msgid "Active NET/ROM sockets\n" -+msgstr "稼åƒä¸­ã®NET/ROMソケット\n" -+ -+#: ../netstat.c:471 -+#, c-format -+msgid "" -+"User Dest Source Device State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "ユーザ å—ä¿¡å…ˆ 発信元 デãƒã‚¤ã‚¹ 状態 Vr/Vs é€ä¿¡-Q å—ä¿¡-Q\n" -+ -+#: ../netstat.c:481 ../netstat.c:1308 -+#, c-format -+msgid "Problem reading data from %s\n" -+msgstr "%sã‹ã‚‰ã®ãƒ‡ãƒ¼ã‚¿ã®èª­ã¿è¾¼ã¿ã«å•é¡Œ\n" -+ -+# translatable? -+#: ../netstat.c:516 -+msgid "SYN_SENT" -+msgstr "SYN_SENT" -+ -+# translatable? -+#: ../netstat.c:517 -+msgid "SYN_RECV" -+msgstr "SYN_RECV" -+ -+# translatable? -+#: ../netstat.c:518 -+msgid "FIN_WAIT1" -+msgstr "FIN_WAIT1" -+ -+# translatable? -+#: ../netstat.c:519 -+msgid "FIN_WAIT2" -+msgstr "FIN_WAIT2" -+ -+# translatable? -+#: ../netstat.c:520 -+msgid "TIME_WAIT" -+msgstr "TIME_WAIT" -+ -+# translatable? -+#: ../netstat.c:521 -+msgid "CLOSE" -+msgstr "CLOSE" -+ -+# translatable? -+#: ../netstat.c:522 -+msgid "CLOSE_WAIT" -+msgstr "CLOSE_WAIT" -+ -+# translatable? -+#: ../netstat.c:523 -+msgid "LAST_ACK" -+msgstr "LAST_ACK" -+ -+# translatable? -+#: ../netstat.c:524 -+msgid "LISTEN" -+msgstr "LISTEN" -+ -+# translatable? -+#: ../netstat.c:525 -+msgid "CLOSING" -+msgstr "CLOSING" -+ -+#: ../netstat.c:596 -+#, c-format -+msgid "warning, got bogus igmp6 line %d.\n" -+msgstr "警告, å½ã®igmp6ライン%dã‚’å¾—ã¾ã—ãŸ.\n" -+ -+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898 -+#: ../netstat.c:1032 ../netstat.c:1037 -+#, c-format -+msgid "netstat: unsupported address family %d !\n" -+msgstr "netstat: サãƒãƒ¼ãƒˆã—ã¦ãªã„アドレスファミリ%dã§ã™!\n" -+ -+# c-format -+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634 -+#, c-format -+msgid "warning, got bogus igmp line %d.\n" -+msgstr "警告, å½ã®igmpライン%dã‚’å¾—ã¾ã—ãŸ.\n" -+ -+#: ../netstat.c:677 -+#, c-format -+msgid "Active X.25 sockets\n" -+msgstr "稼åƒä¸­ã®X.25ソケット\n" -+ -+#. IMHO, Vr/Vs is not very usefull --SF -+#: ../netstat.c:679 -+#, c-format -+msgid "" -+"Dest Source Device LCI State Vr/Vs Send-Q Recv-" -+"Q\n" -+msgstr "å—ä¿¡å…ˆ 発信元 デãƒã‚¤ã‚¹ LCI 状態 Vr/Vs é€ä¿¡-Q å—ä¿¡-Q\n" -+ -+#: ../netstat.c:759 -+#, c-format -+msgid "warning, got bogus tcp line.\n" -+msgstr "警告, å½ã®TCPラインを得ã¾ã—ãŸ.\n" -+ -+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075 -+#, c-format -+msgid "off (0.00/%ld/%d)" -+msgstr "オフ (0.00/%ld/%d)" -+ -+#: ../netstat.c:804 -+#, c-format -+msgid "on (%2.2f/%ld/%d)" -+msgstr "オン (%2.2f/%ld/%d)" -+ -+#: ../netstat.c:809 -+#, c-format -+msgid "keepalive (%2.2f/%ld/%d)" -+msgstr "キープアライブ (%2.2f/%ld/%d)" -+ -+#: ../netstat.c:814 -+#, c-format -+msgid "timewait (%2.2f/%ld/%d)" -+msgstr "時間待㡠(%2.2f/%ld/%d)" -+ -+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085 -+#, c-format -+msgid "unkn-%d (%2.2f/%ld/%d)" -+msgstr "ä¸æ˜Ž-%d (%2.2f/%ld/%d)" -+ -+#: ../netstat.c:894 -+#, c-format -+msgid "warning, got bogus udp line.\n" -+msgstr "警告, å½ã®UDPラインを得ã¾ã—ãŸ.\n" -+ -+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208 -+msgid "UNKNOWN" -+msgstr "ä¸æ˜Ž" -+ -+#: ../netstat.c:958 ../netstat.c:1080 -+#, c-format -+msgid "on%d (%2.2f/%ld/%d)" -+msgstr "オン%d (%2.2f/%ld/%d)" -+ -+#: ../netstat.c:1046 -+#, c-format -+msgid "warning, got bogus raw line.\n" -+msgstr "警告, å½ã®Rawラインを得ã¾ã—ãŸ.\n" -+ -+#: ../netstat.c:1128 -+#, c-format -+msgid "warning, got bogus unix line.\n" -+msgstr "警告, å½ã®unixラインを得ã¾ã—ãŸ.\n" -+ -+# translatable? -+#: ../netstat.c:1155 -+msgid "STREAM" -+msgstr "STREAM" -+ -+# translatable? -+#: ../netstat.c:1159 -+msgid "DGRAM" -+msgstr "DGRAM" -+ -+# translatable? -+#: ../netstat.c:1163 -+msgid "RAW" -+msgstr "RAW" -+ -+# translatable? -+#: ../netstat.c:1167 -+msgid "RDM" -+msgstr "RDM" -+ -+# translatable? -+#: ../netstat.c:1171 -+msgid "SEQPACKET" -+msgstr "SEQPACKET" -+ -+# translatable? -+#: ../netstat.c:1180 -+msgid "FREE" -+msgstr "FREE" -+ -+# translatable? -+#: ../netstat.c:1196 -+msgid "CONNECTING" -+msgstr "CONNECTING" -+ -+# translatable? -+#: ../netstat.c:1200 -+msgid "CONNECTED" -+msgstr "CONNECTED" -+ -+# translatable? -+#: ../netstat.c:1204 -+msgid "DISCONNECTING" -+msgstr "DISCONNECTING" -+ -+#: ../netstat.c:1235 -+#, c-format -+msgid "Active UNIX domain sockets " -+msgstr "稼åƒä¸­ã®UNIXドメインソケット " -+ -+#: ../netstat.c:1237 ../netstat.c:1756 -+#, c-format -+msgid "(servers and established)" -+msgstr "(サーãƒã¨ç¢ºç«‹)" -+ -+#: ../netstat.c:1240 ../netstat.c:1759 -+#, c-format -+msgid "(only servers)" -+msgstr "(サーãƒã®ã¿)" -+ -+#: ../netstat.c:1242 ../netstat.c:1761 -+#, c-format -+msgid "(w/o servers)" -+msgstr "(w/oサーãƒ)" -+ -+#: ../netstat.c:1245 -+#, c-format -+msgid "" -+"\n" -+"Proto RefCnt Flags Type State I-Node" -+msgstr "" -+"\n" -+"Proto RefCnt フラグ タイプ 状態 Iノード" -+ -+#: ../netstat.c:1247 -+#, c-format -+msgid " Path\n" -+msgstr " パス\n" -+ -+# translatable? -+#: ../netstat.c:1267 -+msgid "SABM SENT" -+msgstr "SABM SENT" -+ -+# translatable? -+#: ../netstat.c:1270 -+msgid "RECOVERY" -+msgstr "RECOVERY" -+ -+#: ../netstat.c:1284 -+#, c-format -+msgid "Active AX.25 sockets\n" -+msgstr "稼åƒä¸­ã®AX.25ソケット\n" -+ -+#: ../netstat.c:1285 -+#, c-format -+msgid "Dest Source Device State Vr/Vs Send-Q Recv-Q\n" -+msgstr "å—ä¿¡å…ˆ 発信元 デãƒã‚¤ã‚¹ 状態 Vr/Vs é€ä¿¡-Q å—ä¿¡-Q\n" -+ -+#: ../netstat.c:1328 -+#, c-format -+msgid "problem reading data from %s\n" -+msgstr "%sã‹ã‚‰ã®ãƒ‡ãƒ¼ã‚¿èª­ã¿è¾¼ã¿ä¸­ã«å•é¡Œ\n" -+ -+#: ../netstat.c:1379 -+#, c-format -+msgid "" -+"Active IPX sockets\n" -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State" -+msgstr "" -+"稼åƒä¸­ã®IPXソケット\n" -+"Proto å—ä¿¡-Q é€ä¿¡-Q 内部アドレス 外部アドレス 状" -+"æ…‹" -+ -+#: ../netstat.c:1381 -+#, c-format -+msgid " User" -+msgstr " ユーザ" -+ -+# translatable? -+#: ../netstat.c:1415 -+msgid "ESTAB" -+msgstr "ESTAB" -+ -+# translatable? -+#: ../netstat.c:1423 -+msgid "UNK." -+msgstr "UNK." -+ -+#: ../netstat.c:1461 -+#, c-format -+msgid "Kernel Interface table\n" -+msgstr "カーãƒãƒ«ã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹ãƒ†ãƒ¼ãƒ–ル\n" -+ -+#: ../netstat.c:1465 -+#, c-format -+msgid "" -+"Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR " -+"Flg\n" -+msgstr "Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR フラグ\n" -+ -+#: ../netstat.c:1469 -+msgid "missing interface information" -+msgstr "インタフェース情報ãŒè¶³ã‚Šã¾ã›ã‚“" -+ -+#: ../netstat.c:1492 -+#, c-format -+msgid "" -+"usage: netstat [-veenNcCF] [] -r netstat {-V|--version|-h|--" -+"help}\n" -+msgstr "" -+"使用法: netstat [-veenNcCF] [<アドレスファミリ>] -r\n" -+" netstat {-V|--version|-h|--help}\n" -+ -+#: ../netstat.c:1493 -+#, c-format -+msgid " netstat [-vnNcaeol] [ ...]\n" -+msgstr " netstat [-vnNcaeol] [<ソケット> ...]\n" -+ -+#: ../netstat.c:1494 -+#, c-format -+msgid "" -+" netstat { [-veenNac] -i | [-cnNe] -M | -s }\n" -+"\n" -+msgstr " netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n" -+ -+#: ../netstat.c:1496 -+#, c-format -+msgid " -r, --route display routing table\n" -+msgstr " -r, --routing 経路テーブルã®è¡¨ç¤º\n" -+ -+#: ../netstat.c:1497 -+#, c-format -+msgid " -i, --interfaces display interface table\n" -+msgstr " -i, --interfaces インタフェーステーブルã®è¡¨ç¤º\n" -+ -+#: ../netstat.c:1498 -+#, c-format -+msgid " -g, --groups display multicast group memberships\n" -+msgstr " -g, --groups マルãƒã‚­ãƒ£ã‚¹ãƒˆãƒ»ã‚°ãƒ«ãƒ¼ãƒ—メンãƒã‚·ãƒƒãƒ—ã®è¡¨ç¤º\n" -+ -+#: ../netstat.c:1499 -+#, c-format -+msgid "" -+" -s, --statistics display networking statistics (like SNMP)\n" -+msgstr "" -+" -s, --statistics (SNMPã®ã‚ˆã†ã«)ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯çµ±è¨ˆã‚’表示\n" -+ -+#: ../netstat.c:1501 -+#, c-format -+msgid "" -+" -M, --masquerade display masqueraded connections\n" -+"\n" -+msgstr "" -+" -M, --masquerade マスカレード接続ã®è¡¨ç¤º\n" -+"\n" -+ -+#: ../netstat.c:1505 -+#, c-format -+msgid " --numeric-hosts don't resolve host names\n" -+msgstr " --numeric-hosts ホストåをレゾルブã—ãªã„\n" -+ -+#: ../netstat.c:1506 -+#, c-format -+msgid " --numeric-ports don't resolve port names\n" -+msgstr " --numeric-ports ãƒãƒ¼ãƒˆåをレゾルブã—ãªã„\n" -+ -+#: ../netstat.c:1507 -+#, c-format -+msgid " --numeric-users don't resolve user names\n" -+msgstr " --numeric-users ユーザåをレゾルブã—ãªã„\n" -+ -+#: ../netstat.c:1508 -+#, c-format -+msgid " -N, --symbolic resolve hardware names\n" -+msgstr " -N, --symbolic ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢åをレゾルブã™ã‚‹\n" -+ -+#: ../netstat.c:1509 ../route.c:88 -+#, c-format -+msgid " -e, --extend display other/more information\n" -+msgstr " -e, --extend ä»–ã®æƒ…報や多ãã®æƒ…報を表示ã™ã‚‹\n" -+ -+#: ../netstat.c:1510 -+#, c-format -+msgid " -p, --programs display PID/Program name for sockets\n" -+msgstr " -p, --programs ソケットã®PID/プログラムåを表示ã™ã‚‹\n" -+ -+#: ../netstat.c:1511 -+#, c-format -+msgid "" -+" -c, --continuous continuous listing\n" -+"\n" -+msgstr "" -+" -c, --continous 継続的ãªè¡¨ç¤º\n" -+"\n" -+ -+#: ../netstat.c:1512 -+#, c-format -+msgid " -l, --listening display listening server sockets\n" -+msgstr " -l, --listening サーãƒã®listenソケットã®è¡¨ç¤º\n" -+ -+#: ../netstat.c:1513 -+#, c-format -+msgid "" -+" -a, --all, --listening display all sockets (default: connected)\n" -+msgstr " -a, --all, --listening å…¨ã¦ã®æƒ…報を表示 (標準: connected)\n" -+ -+#: ../netstat.c:1514 -+#, c-format -+msgid " -o, --timers display timers\n" -+msgstr " -o, --timers タイマã®è¡¨ç¤º\n" -+ -+#: ../netstat.c:1515 ../route.c:89 -+#, c-format -+msgid "" -+" -F, --fib display Forwarding Information Base " -+"(default)\n" -+msgstr " -F, --fib フォワード情報ベースを表示ã™ã‚‹(標準)\n" -+ -+#: ../netstat.c:1516 ../route.c:90 -+#, c-format -+msgid "" -+" -C, --cache display routing cache instead of FIB\n" -+"\n" -+msgstr " -C, --cache FIBã®ã‹ã‚ã‚Šã«çµŒè·¯ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã‚’表示ã™ã‚‹\n\n" -+ -+#: ../netstat.c:1518 -+#, c-format -+msgid "" -+" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" -+msgstr "" -+" <ソケット>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --" -+"netrom\n" -+ -+#: ../netstat.c:1519 -+#, c-format -+msgid " =Use '-6|-4' or '-A ' or '--'; default: %s\n" -+msgstr " ='-6|-4'ã¾ãŸã¯'-A 'ã¾ãŸã¯'--'を利用; 標準: %s\n" -+ -+#: ../netstat.c:1520 ../route.c:93 -+#, c-format -+msgid " List of possible address families (which support routing):\n" -+msgstr " (ルーティングをサãƒãƒ¼ãƒˆã—ãŸ)利用å¯èƒ½ãªã‚¢ãƒ‰ãƒ¬ã‚¹ãƒ•ã‚¡ãƒŸãƒªã®ãƒªã‚¹ãƒˆ:\n" -+ -+#: ../netstat.c:1753 -+#, c-format -+msgid "Active Internet connections " -+msgstr "稼åƒä¸­ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæŽ¥ç¶š " -+ -+#: ../netstat.c:1763 -+#, c-format -+msgid "" -+"\n" -+"Proto Recv-Q Send-Q Local Address Foreign Address " -+"State " -+msgstr "" -+"\n" -+"Proto å—ä¿¡-Q é€ä¿¡-Q 内部アドレス 外部アドレス 状" -+"æ…‹ " -+ -+#: ../netstat.c:1765 -+#, c-format -+msgid " User Inode " -+msgstr " ユーザ Iノード " -+ -+#: ../netstat.c:1768 -+#, c-format -+msgid " Timer" -+msgstr "タイマ" -+ -+#: ../netstat.c:1798 -+#, c-format -+msgid "IPv4 Group Memberships\n" -+msgstr "IPv4グループメンãƒã‚·ãƒƒãƒ—\n" -+ -+#: ../netstat.c:1799 -+#, c-format -+msgid "Interface RefCnt Group\n" -+msgstr "インタフェース å‚ç…§Cnt グループ\n" -+ -+#: ../rarp.c:44 -+msgid "This kernel does not support RARP.\n" -+msgstr "ã“ã®ã‚«ãƒ¼ãƒãƒ«ã¯RARPをサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“.\n" -+ -+#: ../rarp.c:83 -+#, c-format -+msgid "no RARP entry for %s.\n" -+msgstr "%sã®RARPエントリãŒã‚ã‚Šã¾ã›ã‚“.\n" -+ -+#: ../rarp.c:96 -+#, c-format -+msgid "%s: bad hardware address\n" -+msgstr "%s: ä¸æ­£ãªãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã™\n" -+ -+#: ../rarp.c:128 -+#, c-format -+msgid "rarp: cannot open file %s:%s.\n" -+msgstr "rarp: ファイル%sã‚’é–‹ã‘ã¾ã›ã‚“:%s.\n" -+ -+#: ../rarp.c:140 -+#, c-format -+msgid "rarp: format error at %s:%u\n" -+msgstr "rarp: %s:%uè¡Œã«ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚¨ãƒ©ãƒ¼ãŒã‚ã‚Šã¾ã™\n" -+ -+#: ../rarp.c:144 ../rarp.c:289 -+#, c-format -+msgid "rarp: %s: unknown host\n" -+msgstr "rarp: %s: ä¸æ˜Žãªãƒ›ã‚¹ãƒˆã§ã™\n" -+ -+#: ../rarp.c:147 -+#, c-format -+msgid "rarp: cannot set entry from %s:%u\n" -+msgstr "rarp: %s:%uè¡Œã‹ã‚‰ã‚¨ãƒ³ãƒˆãƒªã‚’設定ã§ãã¾ã›ã‚“\n" -+ -+#: ../rarp.c:176 -+#, c-format -+msgid "Usage: rarp -a list entries in cache.\n" -+msgstr "" -+"使用法: rarp -a キャッシュエントリã®è¡¨ç¤º.\n" -+ -+#: ../rarp.c:177 -+#, c-format -+msgid " rarp -d delete entry from cache.\n" -+msgstr "" -+" rarp -d <ホストå> キャッシュã‹ã‚‰ã‚¨ãƒ³ãƒˆãƒªã‚’削除ã™" -+"ã‚‹.\n" -+ -+#: ../rarp.c:178 -+#, c-format -+msgid " rarp [] -s add entry to cache.\n" -+msgstr "" -+" rarp [] -s <ホストå> <ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¢ãƒ‰ãƒ¬ã‚¹>\n" -+" キャッシュã¸ã‚¨ãƒ³ãƒˆãƒªã‚’追加.\n" -+ -+#: ../rarp.c:179 -+#, c-format -+msgid "" -+" rarp -f add entries from /etc/ethers.\n" -+msgstr "" -+" rarp -f /etc/ethersã‹ã‚‰ã‚¨ãƒ³ãƒˆãƒªè¿½åŠ .\n" -+ -+#: ../rarp.c:180 -+#, c-format -+msgid "" -+" rarp -V display program version.\n" -+"\n" -+msgstr " rarp -V ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã®å‡ºåŠ›.\n" -+ -+#: ../rarp.c:238 -+#, c-format -+msgid "%s: illegal option mix.\n" -+msgstr "%s: オプションã®çµ„åˆã›ãŒé–“é•ã£ã¦ã„ã¾ã™.\n" -+ -+#: ../rarp.c:269 -+#, c-format -+msgid "rarp: %s: unknown hardware type.\n" -+msgstr "rarp: %s: ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¿ã‚¤ãƒ—ãŒä¸æ˜Žã§ã™.\n" -+ -+#: ../route.c:80 -+#, c-format -+msgid "" -+"Usage: route [-nNvee] [-FC] [] List kernel routing tables\n" -+msgstr "使用法:route [-nNvee] [-FC] [アドレスファミリ] カーãƒãƒ«çµŒè·¯ãƒ†ãƒ¼ãƒ–ルã®è¡¨ç¤º.\n" -+ -+#: ../route.c:81 -+#, c-format -+msgid "" -+" route [-v] [-FC] {add|del|flush} ... Modify routing table for AF.\n" -+"\n" -+msgstr "" -+" route [-v] [-FC] {add|del|flush}‥‥\n" -+"\t\t\t\t アドレスファミリã®çµŒè·¯ãƒ†ãƒ¼ãƒ–ルã®è¨­å®š.\n" -+"\n" -+ -+#: ../route.c:83 -+#, c-format -+msgid "" -+" route {-h|--help} [] Detailed usage syntax for " -+"specified AF.\n" -+msgstr "" -+" route {-h|--help} [アドレスファミリ]\n" -+" アドレスファミリ特定ã®æ–‡æ³•ã®èª¬æ˜Ž.\n" -+ -+#: ../route.c:84 -+#, c-format -+msgid "" -+" route {-V|--version} Display version/author and " -+"exit.\n" -+"\n" -+msgstr " route {-V|--version} ãƒãƒ¼ã‚¸ãƒ§ãƒ³/作者情報ã®å‡ºåŠ›ã¨çµ‚了.\n\n" -+ -+#: ../route.c:92 -+#, c-format -+msgid " =Use '-A ' or '--'; default: %s\n" -+msgstr " ='-A 'ã¾ãŸã¯'--'を利用; 標準: %s\n" -+ -+#: ../plipconfig.c:66 -+#, c-format -+msgid "Usage: plipconfig [-a] [-i] [-v] interface\n" -+msgstr "使用法: plipconfig [-a] [-i] [-v] インタフェース\n" -+ -+#: ../plipconfig.c:67 -+#, c-format -+msgid " [nibble NN] [trigger NN]\n" -+msgstr " [nibble 数値] [trigger 数値]\n" -+ -+#: ../plipconfig.c:68 -+#, c-format -+msgid " plipconfig -V | --version\n" -+msgstr " plipconfig -V | --version\n" -+ -+# translatable? -+#: ../plipconfig.c:74 -+#, c-format -+msgid "%s\tnibble %lu trigger %lu\n" -+msgstr "%s\tnibble %lu trigger %lu\n" -+ -+#: ../iptunnel.c:85 -+#, c-format -+msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n" -+msgstr "Usage: iptunnel { add | change | del | show } [ NAME ]\n" -+ -+#: ../iptunnel.c:86 -+#, c-format -+msgid "" -+" [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" -+msgstr " [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" -+ -+#: ../iptunnel.c:87 -+#, c-format -+msgid " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" -+msgstr " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" -+ -+#: ../iptunnel.c:88 -+#, c-format -+msgid " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" -+msgstr " [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n" -+ -+#: ../iptunnel.c:89 -+#, c-format -+msgid "" -+" iptunnel -V | --version\n" -+"\n" -+msgstr " iptunnel -V | --version\n\n" -+ -+#: ../iptunnel.c:90 -+#, c-format -+msgid "Where: NAME := STRING\n" -+msgstr "æ„味: NAME := STRING\n" -+ -+#: ../iptunnel.c:91 -+#, c-format -+msgid " ADDR := { IP_ADDRESS | any }\n" -+msgstr " ADDR := { IP_ADDRESS | any }\n" -+ -+#: ../iptunnel.c:92 -+#, c-format -+msgid " TOS := { NUMBER | inherit }\n" -+msgstr " TOS := { NUMBER | inherit }\n" -+ -+#: ../iptunnel.c:93 -+#, c-format -+msgid " TTL := { 1..255 | inherit }\n" -+msgstr " TTL := { 1..255 | inherit }\n" -+ -+#: ../iptunnel.c:94 -+#, c-format -+msgid " KEY := { DOTTED_QUAD | NUMBER }\n" -+msgstr " KEY := { DOTTED_QUAD | NUMBER }\n" -+ -+#: ../iptunnel.c:332 -+#, c-format -+msgid "Keys are not allowed with ipip and sit.\n" -+msgstr "キーã¯ipipãŠã‚ˆã³sitã§ã¯è¨±å¯ã•ã‚Œã¾ã›ã‚“.\n" -+ -+#: ../iptunnel.c:352 -+#, c-format -+msgid "Broadcast tunnel requires a source address.\n" -+msgstr "ブロードキャストトンãƒãƒ«ã¯ç™ºä¿¡å…ƒã‚¢ãƒ‰ãƒ¬ã‚¹ãŒå¿…è¦ã§ã™.\n" -+ -+#: ../iptunnel.c:367 -+#, c-format -+msgid "ttl != 0 and noptmudisc are incompatible\n" -+msgstr "ttl != 0ãŠã‚ˆã³noptmudiscã¯çŸ›ç›¾ã—ã¾ã™\n" -+ -+#: ../iptunnel.c:379 -+#, c-format -+msgid "cannot determine tunnel mode (ipip, gre or sit)\n" -+msgstr "トンãƒãƒ«ãƒ¢ãƒ¼ãƒ‰ã‚’決定ã§ãã¾ã›ã‚“(ipip, greã¾ãŸã¯sit)\n" -+ -+#: ../iptunnel.c:417 -+#, c-format -+msgid "%s: %s/ip remote %s local %s " -+msgstr "%s: %s/ip リモート%s ローカル%s " -+ -+#: ../iptunnel.c:421 -+msgid "unknown" -+msgstr "ä¸æ˜Ž" -+ -+# FIXME: what does it mean? -+#: ../iptunnel.c:453 -+#, c-format -+msgid " Drop packets out of sequence.\n" -+msgstr " シーケンスã‹ã‚‰å¤–ã‚ŒãŸãƒ‘ケットをドロップ.\n" -+ -+#: ../iptunnel.c:455 -+#, c-format -+msgid " Checksum in received packet is required.\n" -+msgstr " å—信パケットã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã¯å¿…é ˆã§ã™.\n" -+ -+# FIXME: what does it mean? -+#: ../iptunnel.c:457 -+#, c-format -+msgid " Sequence packets on output.\n" -+msgstr " é€ä¿¡ã®ã‚·ãƒ¼ã‚±ãƒ³ã‚¹ãƒ‘ケット.\n" -+ -+# FIXME: what does it mean? -+#: ../iptunnel.c:459 -+#, c-format -+msgid " Checksum output packets.\n" -+msgstr " é€ä¿¡ãƒ‘ケットã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ .\n" -+ -+#: ../iptunnel.c:487 -+#, c-format -+msgid "Wrong format of /proc/net/dev. Sorry.\n" -+msgstr "/proc/net/devãŒä¸æ­£ãªãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã§ã™. ã™ã¿ã¾ã›ã‚“.\n" -+ -+#: ../iptunnel.c:500 -+#, c-format -+msgid "Failed to get type of [%s]\n" -+msgstr "[%s]ã®ã‚¿ã‚¤ãƒ—ã®å–å¾—ã«å¤±æ•—\n" -+ -+#: ../iptunnel.c:516 -+#, c-format -+msgid "RX: Packets Bytes Errors CsumErrs OutOfSeq Mcasts\n" -+msgstr "RX: パケット ãƒã‚¤ãƒˆ エラー CsumErrs outOfSeq マルãƒã‚­ãƒ£ã‚¹ãƒˆ\n" -+ -+#: ../iptunnel.c:519 -+#, c-format -+msgid "TX: Packets Bytes Errors DeadLoop NoRoute NoBufs\n" -+msgstr "TX: パケット ãƒã‚¤ãƒˆ エラー DeadLoop NoRoute ãƒãƒƒãƒ•ã‚¡ãªã—\n" -+ -+#: ../statistics.c:47 -+msgid "ICMP input histogram:" -+msgstr "ICMP入力ヒストグラム:" -+ -+#: ../statistics.c:48 -+msgid "ICMP output histogram:" -+msgstr "ICMP出力ヒストグラム:" -+ -+#: ../statistics.c:65 -+#, c-format -+msgid "Forwarding is %s" -+msgstr "フォワードã¯%sã§ã™" -+ -+#: ../statistics.c:66 -+#, c-format -+msgid "Default TTL is %u" -+msgstr "標準TTLã¯%uã§ã™" -+ -+#: ../statistics.c:67 -+#, c-format -+msgid "%u total packets received" -+msgstr "åˆè¨ˆ%uパケットをå—ä¿¡" -+ -+#: ../statistics.c:68 -+#, c-format -+msgid "%u with invalid headers" -+msgstr "ä¸é©å½“ãªãƒ˜ãƒƒãƒ€ãŒ%u" -+ -+#: ../statistics.c:69 -+#, c-format -+msgid "%u with invalid addresses" -+msgstr "ä¸é©å½“ãªã‚¢ãƒ‰ãƒ¬ã‚¹ãŒ%u" -+ -+#: ../statistics.c:70 -+#, c-format -+msgid "%u forwarded" -+msgstr "%uã®è»¢é€" -+ -+#: ../statistics.c:71 -+#, c-format -+msgid "%u with unknown protocol" -+msgstr "%uã®ä¸æ˜Žãªãƒ—ロトコル" -+ -+#: ../statistics.c:72 -+#, c-format -+msgid "%u incoming packets discarded" -+msgstr "%uã®å—信パケットを破棄" -+ -+#: ../statistics.c:73 -+#, c-format -+msgid "%u incoming packets delivered" -+msgstr "%uã®å—信パケットをé…é€" -+ -+#: ../statistics.c:74 -+#, c-format -+msgid "%u requests sent out" -+msgstr "%uã®è¦æ±‚ã‚’é€ä¿¡" -+ -+#. ? -+#: ../statistics.c:75 -+#, c-format -+msgid "%u outgoing packets dropped" -+msgstr "%uã®é€ä¿¡ãƒ‘ケットをドロップ" -+ -+#: ../statistics.c:76 -+#, c-format -+msgid "%u dropped because of missing route" -+msgstr "ä¸æ˜ŽãªçµŒè·¯ã§%uをドロップ" -+ -+#: ../statistics.c:77 -+#, c-format -+msgid "%u fragments dropped after timeout" -+msgstr "タイムアウト後ã«%uã®ãƒ•ãƒ©ã‚°ãƒ¡ãƒ³ãƒˆã‚’ドロップ" -+ -+#: ../statistics.c:78 -+#, c-format -+msgid "%u reassemblies required" -+msgstr "%uã®å†æ§‹ç¯‰ãŒå¿…è¦" -+ -+#. ? -+#: ../statistics.c:79 -+#, c-format -+msgid "%u packets reassembled ok" -+msgstr "%uパケットã®å†æ§‹ç¯‰ã«æˆåŠŸ" -+ -+#: ../statistics.c:80 -+#, c-format -+msgid "%u packet reassembles failed" -+msgstr "%uパケットã®å†æ§‹ç¯‰ã«å¤±æ•—" -+ -+#: ../statistics.c:81 -+#, c-format -+msgid "%u fragments received ok" -+msgstr "%uフラグメントã®å—ä¿¡ã«æˆåŠŸ" -+ -+#: ../statistics.c:82 -+#, c-format -+msgid "%u fragments failed" -+msgstr "%uフラグメントã§å¤±æ•—" -+ -+#: ../statistics.c:83 -+#, c-format -+msgid "%u fragments created" -+msgstr "%uフラグメントを生æˆ" -+ -+#: ../statistics.c:88 -+#, c-format -+msgid "%u ICMP messages received" -+msgstr "%uã®ICMPメッセージå—ä¿¡" -+ -+#: ../statistics.c:89 -+#, c-format -+msgid "%u input ICMP message failed." -+msgstr "%uã®ICMPメッセージ入力失敗." -+ -+#: ../statistics.c:90 ../statistics.c:103 -+#, c-format -+msgid "destination unreachable: %u" -+msgstr "é€ä¿¡å…ˆåˆ°é”ä¸å¯: %u" -+ -+#: ../statistics.c:91 -+#, c-format -+msgid "timeout in transit: %u" -+msgstr "é€ä¿¡æ™‚間オーãƒ: %u" -+ -+#: ../statistics.c:92 ../statistics.c:105 -+#, c-format -+msgid "wrong parameters: %u" -+msgstr "è¬ã£ãŸãƒ‘ラメータ: %u" -+ -+#. ? -+#: ../statistics.c:93 -+#, c-format -+msgid "source quenches: %u" -+msgstr "発信元消滅: %u" -+ -+#: ../statistics.c:94 -+#, c-format -+msgid "redirects: %u" -+msgstr "リダイレクト: %u" -+ -+#: ../statistics.c:95 -+#, c-format -+msgid "echo requests: %u" -+msgstr "エコーè¦æ±‚: %u" -+ -+#: ../statistics.c:96 ../statistics.c:109 -+#, c-format -+msgid "echo replies: %u" -+msgstr "エコー応答: %u" -+ -+#: ../statistics.c:97 -+#, c-format -+msgid "timestamp request: %u" -+msgstr "タイムスタンプè¦æ±‚: %u" -+ -+#: ../statistics.c:98 -+#, c-format -+msgid "timestamp reply: %u" -+msgstr "タイムスタンプ応答: %u" -+ -+#: ../statistics.c:99 -+#, c-format -+msgid "address mask request: %u" -+msgstr "アドレスマスクè¦æ±‚: %u" -+ -+#. ? -+#: ../statistics.c:100 ../statistics.c:113 -+#, c-format -+msgid "address mask replies: %u" -+msgstr "アドレスマスク応答: %u" -+ -+#. ? -+#: ../statistics.c:101 -+#, c-format -+msgid "%u ICMP messages sent" -+msgstr "%uã®ICMPメッセージé€ä¿¡" -+ -+#: ../statistics.c:102 -+#, c-format -+msgid "%u ICMP messages failed" -+msgstr "%uã®ICMPメッセージ失敗" -+ -+#: ../statistics.c:104 -+#, c-format -+msgid "time exceeded: %u" -+msgstr "時間切れ: %u" -+ -+#. ? -+#: ../statistics.c:106 -+#, c-format -+msgid "source quench: %u" -+msgstr "発信元消滅: %u" -+ -+#: ../statistics.c:107 -+#, c-format -+msgid "redirect: %u" -+msgstr "リダイレクト: %u" -+ -+#: ../statistics.c:108 -+#, c-format -+msgid "echo request: %u" -+msgstr "エコーè¦æ±‚: %u" -+ -+#: ../statistics.c:110 -+#, c-format -+msgid "timestamp requests: %u" -+msgstr "タイムスタンプè¦æ±‚: %u" -+ -+#: ../statistics.c:111 -+#, c-format -+msgid "timestamp replies: %u" -+msgstr "タイムスタンプ応答: %u" -+ -+#: ../statistics.c:112 -+#, c-format -+msgid "address mask requests: %u" -+msgstr "アドレスマスクè¦æ±‚: %u" -+ -+#: ../statistics.c:118 -+#, c-format -+msgid "RTO algorithm is %s" -+msgstr "RTOアルゴリズムã¯%sã§ã™" -+ -+#: ../statistics.c:122 -+#, c-format -+msgid "%u active connections openings" -+msgstr "%uã®èƒ½å‹•æŽ¥ç¶šé–‹å§‹" -+ -+#: ../statistics.c:123 -+#, c-format -+msgid "%u passive connection openings" -+msgstr "%uã®å—動接続開始" -+ -+#: ../statistics.c:124 -+#, c-format -+msgid "%u failed connection attempts" -+msgstr "%uã®æŽ¥ç¶šè©¦è¡Œå¤±æ•—" -+ -+#: ../statistics.c:125 -+#, c-format -+msgid "%u connection resets received" -+msgstr "%uã®æŽ¥ç¶šãƒªã‚»ãƒƒãƒˆå—ä¿¡" -+ -+#: ../statistics.c:126 -+#, c-format -+msgid "%u connections established" -+msgstr "%uã®æŽ¥ç¶šç¢ºç«‹" -+ -+#: ../statistics.c:127 -+#, c-format -+msgid "%u segments received" -+msgstr "%uセグメントã®å—ä¿¡" -+ -+#: ../statistics.c:128 -+#, c-format -+msgid "%u segments send out" -+msgstr "%uセグメントã®é€ä¿¡" -+ -+#: ../statistics.c:129 -+#, c-format -+msgid "%u segments retransmited" -+msgstr "%uセグメントã®å†è»¢é€" -+ -+#: ../statistics.c:130 -+#, c-format -+msgid "%u bad segments received." -+msgstr "%uã®ä¸æ­£ã‚»ã‚°ãƒ¡ãƒ³ãƒˆå—ä¿¡." -+ -+#: ../statistics.c:131 -+#, c-format -+msgid "%u resets sent" -+msgstr "%uã®ãƒªã‚»ãƒƒãƒˆé€ä¿¡" -+ -+#: ../statistics.c:136 -+#, c-format -+msgid "%u packets received" -+msgstr "%uパケットå—ä¿¡" -+ -+#: ../statistics.c:137 -+#, c-format -+msgid "%u packets to unknown port received." -+msgstr "ä¸æ˜Žãªãƒãƒ¼ãƒˆã‹ã‚‰ã®%uパケットã®å—ä¿¡." -+ -+#: ../statistics.c:138 -+#, c-format -+msgid "%u packet receive errors" -+msgstr "%uã®ãƒ‘ケットå—信エラー" -+ -+#: ../statistics.c:139 -+#, c-format -+msgid "%u packets sent" -+msgstr "%uã®ãƒ‘ケットをé€ä¿¡" -+ -+#: ../statistics.c:144 -+#, c-format -+msgid "%u SYN cookies sent" -+msgstr "%uã®SYNクッキーをé€ä¿¡" -+ -+#: ../statistics.c:145 -+#, c-format -+msgid "%u SYN cookies received" -+msgstr "%uã®SYNクッキーをå—ä¿¡" -+ -+#: ../statistics.c:146 -+#, c-format -+msgid "%u invalid SYN cookies received" -+msgstr "%uã®ä¸é©å½“ãªSYNクッキーをå—ä¿¡" -+ -+#: ../statistics.c:148 -+#, c-format -+msgid "%u resets received for embryonic SYN_RECV sockets" -+msgstr "%uã®æœªå®Œæˆã®SYN_RECVソケットã«å¯¾ã™ã‚‹ãƒªã‚»ãƒƒãƒˆã‚’å—ä¿¡" -+ -+#: ../statistics.c:150 -+#, c-format -+msgid "%u packets pruned from receive queue because of socket buffer overrun" -+msgstr "%uã®ãƒ‘ケットをソケットãƒãƒƒãƒ•ã‚¡ã‚ªãƒ¼ãƒãƒ©ãƒ³ã®ãŸã‚å—信キューã‹ã‚‰é™¤å¤–" -+ -+#. obsolete: 2.2.0 doesn't do that anymore -+#: ../statistics.c:153 -+#, c-format -+msgid "%u packets pruned from receive queue" -+msgstr "%uã®ãƒ‘ケットをå—信キューã‹ã‚‰é™¤å¤–" -+ -+#: ../statistics.c:154 -+#, c-format -+msgid "" -+"%u packets dropped from out-of-order queue because of socket buffer overrun" -+msgstr "%uã®ãƒ‘ケットãŒã‚½ã‚±ãƒƒãƒˆãƒãƒƒãƒ•ã‚¡ã‚ªãƒ¼ãƒãƒ¼ãƒ©ãƒ³ã®ãŸã‚out-of-orderキューã‹ã‚‰ãƒ‰ãƒ­ãƒƒãƒ—" -+ -+#: ../statistics.c:156 -+#, c-format -+msgid "%u ICMP packets dropped because they were out-of-window" -+msgstr "%uã®ICMPパケットãŒout-of-windowã®ãŸã‚ドロップ" -+ -+#: ../statistics.c:158 -+#, c-format -+msgid "%u ICMP packets dropped because socket was locked" -+msgstr "%uã®ICMPパケットをソケットã®ãƒ­ãƒƒã‚¯ã«ã‚ˆã£ã¦ãƒ‰ãƒ­ãƒƒãƒ—" -+ -+# FIXME: what does it mean? -+#: ../statistics.c:160 -+#, c-format -+msgid "%u TCP sockets finished time wait in fast timer" -+msgstr "%uã®TCPソケットãŒãƒ•ã‚¡ãƒ¼ã‚¹ãƒˆã‚¿ã‚¤ãƒžã§ã®æ™‚é–“å¾…ã¡ã‚’完了" -+ -+# FIXME -+#: ../statistics.c:161 -+#, c-format -+msgid "%u time wait sockets recycled by time stamp" -+msgstr "%uã®æ™‚é–“å¾…ã¡ã‚½ã‚±ãƒƒãƒˆãŒã‚¿ã‚¤ãƒ ã‚¹ã‚¿ãƒ³ãƒ—ã§å†åˆ©ç”¨" -+ -+# FIXME -+#: ../statistics.c:162 -+#, c-format -+msgid "%u TCP sockets finished time wait in slow timer" -+msgstr "%uã®TCPソケットãŒã‚¹ãƒ­ãƒ¼ã‚¿ã‚¤ãƒžã§ã®æ™‚é–“å¾…ã¡ã‚’完了" -+ -+#: ../statistics.c:163 -+#, c-format -+msgid "%u passive connections rejected because of time stamp" -+msgstr "%uã®å—動的接続ãŒã‚¿ã‚¤ãƒ ã‚¹ã‚¿ãƒ³ãƒ—ã®ãŸã‚ã«æ‹’å¦" -+ -+#: ../statistics.c:165 -+#, c-format -+msgid "%u active connections rejected because of time stamp" -+msgstr "%uã®èƒ½å‹•çš„接続ãŒã‚¿ã‚¤ãƒ ã‚¹ã‚¿ãƒ³ãƒ—ã®ãŸã‚ã«æ‹’å¦" -+ -+#: ../statistics.c:167 -+#, c-format -+msgid "%u packets rejects in established connections because of timestamp" -+msgstr "%uã®ãƒ‘ケットãŒã‚¿ã‚¤ãƒ ã‚¹ã‚¿ãƒ³ãƒ—ã®ãŸã‚ã«æŽ¥ç¶šç¢ºç«‹ã‚’æ‹’å¦" -+ -+#: ../statistics.c:169 -+#, c-format -+msgid "%u delayed acks sent" -+msgstr "%uã®é…延ackã‚’é€ä¿¡" -+ -+# FIXME -+#: ../statistics.c:170 -+#, c-format -+msgid "%u delayed acks further delayed because of locked socket" -+msgstr "%uã®é…延ackãŒãƒ­ãƒƒã‚¯ã•ã‚ŒãŸã‚½ã‚±ãƒƒãƒˆã®ãŸã‚ã«ã•ã‚‰ã«é…延" -+ -+#: ../statistics.c:172 -+#, c-format -+msgid "Quick ack mode was activated %u times" -+msgstr "クイックackモードãŒ%u回稼åƒ" -+ -+# FIXME -+#: ../statistics.c:173 -+#, c-format -+msgid "%u times the listen queue of a socket overflowed" -+msgstr "ソケットã®ãƒªã‚¹ãƒ³ã‚­ãƒ¥ãƒ¼ãŒ%u回オーãƒãƒ•ãƒ­ãƒ¼" -+ -+# FIXME -+#: ../statistics.c:175 -+#, c-format -+msgid "%u SYNs to LISTEN sockets ignored" -+msgstr "%uã®ã‚½ã‚±ãƒƒãƒˆãƒªã‚¹ãƒ³SYNãŒç„¡è¦–" -+ -+#: ../statistics.c:176 -+#, c-format -+msgid "%u packets directly queued to recvmsg prequeue." -+msgstr "%uパケットをrecvmsgプレキューã«ç›´æŽ¥ã‚­ãƒ¥ãƒ¼." -+ -+#: ../statistics.c:178 -+#, c-format -+msgid "%u of bytes directly received from backlog" -+msgstr "%uãƒã‚¤ãƒˆã‚’ãƒãƒƒã‚¯ãƒ­ã‚°ã‹ã‚‰ç›´æŽ¥å—ä¿¡" -+ -+#: ../statistics.c:180 -+#, c-format -+msgid "%u of bytes directly received from prequeue" -+msgstr "%uãƒã‚¤ãƒˆã‚’プレキューã‹ã‚‰ç›´æŽ¥å—ä¿¡" -+ -+#: ../statistics.c:182 -+#, c-format -+msgid "%u packets dropped from prequeue" -+msgstr "%uã®ãƒ‘ケットをプレキューã‹ã‚‰ãƒ‰ãƒ­ãƒƒãƒ—" -+ -+#: ../statistics.c:183 -+#, c-format -+msgid "%u packet headers predicted" -+msgstr "%uã®ãƒ‘ケットヘッダを予測" -+ -+#: ../statistics.c:184 -+#, c-format -+msgid "%u packets header predicted and directly queued to user" -+msgstr "%uã®ãƒ‘ケットヘッダを予測ã—ã¦ãƒ¦ãƒ¼ã‚¶ã«ç›´æŽ¥ã‚­ãƒ¥ãƒ¼" -+ -+#: ../statistics.c:186 -+#, c-format -+msgid "Ran %u times out of system memory during packet sending" -+msgstr "%u回ã®ãƒ‘ケットé€ä¿¡ä¸­ã®ã‚·ã‚¹ãƒ†ãƒ ãƒ¡ãƒ¢ãƒªã‚ãµã‚Œ" -+ -+#: ../statistics.c:188 -+#, c-format -+msgid "%u acknowledgments not containing data received" -+msgstr "データをå«ã¾ãªã„%uã®æ‰¿èªã®å—ä¿¡" -+ -+#: ../statistics.c:189 -+#, c-format -+msgid "%u predicted acknowledgments" -+msgstr "%uã®äºˆæ¸¬æ‰¿èª" -+ -+#: ../statistics.c:190 -+#, c-format -+msgid "%u times recovered from packet loss due to fast retransmit" -+msgstr "高速ãªå†é€ã«ã‚ˆã‚‹ãƒ‘ケットロスã®%u回ã®å›žå¾©" -+ -+#: ../statistics.c:191 -+#, c-format -+msgid "%u times recovered from packet loss due to SACK data" -+msgstr "SACKデータã«ã‚ˆã‚‹ãƒ‘ケットロスã®%u回ã®å›žå¾©" -+ -+#: ../statistics.c:192 -+#, c-format -+msgid "%u bad SACKs received" -+msgstr "%uã®ä¸æ­£ãªSACKã‚’å—ä¿¡" -+ -+#: ../statistics.c:193 -+#, c-format -+msgid "Detected reordering %u times using FACK" -+msgstr "FACKを使ã£ãŸ%u回ã®æ¤œå‡ºã•ã‚ŒãŸä¸¦ã¹æ›¿ãˆ" -+ -+#: ../statistics.c:194 -+#, c-format -+msgid "Detected reordering %u times using SACK" -+msgstr "SACKを使ã£ãŸ%u回ã®æ¤œå‡ºã•ã‚ŒãŸä¸¦ã¹æ›¿ãˆ" -+ -+#: ../statistics.c:195 -+#, c-format -+msgid "Detected reordering %u times using time stamp" -+msgstr "タイムスタンプを使ã£ãŸ%u回ã®æ¤œå‡ºã•ã‚ŒãŸä¸¦ã¹æ›¿ãˆ" -+ -+# FIXME:what does it mean? -+#: ../statistics.c:196 -+#, c-format -+msgid "Detected reordering %u times using reno fast retransmit" -+msgstr "高速å†é€ã‚’使ã£ãŸ%u回ã®æ¤œå‡ºã•ã‚ŒãŸä¸¦ã¹æ›¿ãˆ" -+ -+#: ../statistics.c:197 -+#, c-format -+msgid "%u congestion windows fully recovered" -+msgstr "%uã®è¼»è¼³ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’完全ã«å›žå¾©" -+ -+#: ../statistics.c:198 -+#, c-format -+msgid "%u congestion windows partially recovered using Hoe heuristic" -+msgstr "Hoeヒューリスティックを使ã£ã¦%uã®è¼»è¼³ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’部分的ã«å›žå¾©" -+ -+#: ../statistics.c:199 -+#, c-format -+msgid "%u congestion window recovered using DSACK" -+msgstr "DSACKを使ã£ã¦%uã®è¼»è¼³ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’回復" -+ -+#: ../statistics.c:200 -+#, c-format -+msgid "%u congestion windows recovered after partial ack" -+msgstr "部分ack後ã«%uã®è¼»è¼³ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’回復" -+ -+#: ../statistics.c:201 -+#, c-format -+msgid "%u retransmits lost" -+msgstr "%uã®å†é€ãƒ­ã‚¹ãƒˆ" -+ -+# FIXME -+#: ../statistics.c:202 -+#, c-format -+msgid "%u timeouts after reno fast retransmit" -+msgstr "高速å†é€å¾Œã®%uã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆ" -+ -+#: ../statistics.c:203 -+#, c-format -+msgid "%u timeouts after SACK recovery" -+msgstr "SACK復元後ã®%uã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆ" -+ -+#: ../statistics.c:204 -+#, c-format -+msgid "%u timeouts in loss state" -+msgstr "状態ロスã§ã®%uã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆ" -+ -+#: ../statistics.c:205 -+#, c-format -+msgid "%u fast retransmits" -+msgstr "%uã®é«˜é€Ÿå†é€" -+ -+#: ../statistics.c:206 -+#, c-format -+msgid "%u forward retransmits" -+msgstr "%uã®è»¢é€å†é€" -+ -+#: ../statistics.c:207 -+#, c-format -+msgid "%u retransmits in slow start" -+msgstr "スロースタートã§ã®%uã®å†é€" -+ -+#: ../statistics.c:208 -+#, c-format -+msgid "%u other TCP timeouts" -+msgstr "%uã®ãã®ä»–ã®TCPタイムアウト" -+ -+# FIXME -+#: ../statistics.c:209 -+#, c-format -+msgid "%u reno fast retransmits failed" -+msgstr "%dã®é«˜é€Ÿå†é€å¤±æ•—" -+ -+#: ../statistics.c:210 -+#, c-format -+msgid "%u sack retransmits failed" -+msgstr "%uã®sackå†é€å¤±æ•—" -+ -+# FIXME -+#: ../statistics.c:211 -+#, c-format -+msgid "%u times receiver scheduled too late for direct processing" -+msgstr "直接処ç†ã«ã¯é…ã™ãŽã‚‹ã¨ã‚¹ã‚±ã‚¸ãƒ¥ãƒ¼ãƒ«ã•ã‚ŒãŸ%u回ã®ãƒ¬ã‚·ãƒ¼ãƒ" -+ -+# FIXME -+#: ../statistics.c:212 -+#, c-format -+msgid "%u packets collapsed in receive queue due to low socket buffer" -+msgstr "%uã®ãƒ‘ケットを低ソケットãƒãƒƒãƒ•ã‚¡ã®ãŸã‚ã«å—信キューã‹ã‚‰é™¤å¤–" -+ -+#: ../statistics.c:213 -+#, c-format -+msgid "%u DSACKs sent for old packets" -+msgstr "%uã®DSACKã‚’å¤ã„パケットã¨ã—ã¦é€ä¿¡" -+ -+#: ../statistics.c:214 -+#, c-format -+msgid "%u DSACKs sent for out of order packets" -+msgstr "%uã®DSACKã‚’é †åºå¤–パケットã¨ã—ã¦é€ä¿¡" -+ -+#: ../statistics.c:215 -+#, c-format -+msgid "%u DSACKs received" -+msgstr "%uã®DSACKã‚’å—ä¿¡" -+ -+#: ../statistics.c:216 -+#, c-format -+msgid "%u DSACKs for out of order packets received" -+msgstr "%uã®DSACKã‚’é †åºå¤–パケットã¨ã—ã¦å—ä¿¡" -+ -+#: ../statistics.c:217 -+#, c-format -+msgid "%u connections reset due to unexpected SYN" -+msgstr "予期ã›ã¬SYNã®ãŸã‚ã«%uã®æŽ¥ç¶šã‚’リセット" -+ -+#: ../statistics.c:218 -+#, c-format -+msgid "%u connections reset due to unexpected data" -+msgstr "予期ã›ã¬ãƒ‡ãƒ¼ã‚¿ã®ãŸã‚ã«%uã®æŽ¥ç¶šã‚’リセット" -+ -+#: ../statistics.c:219 -+#, c-format -+msgid "%u connections reset due to early user close" -+msgstr "早期ã®ãƒ¦ãƒ¼ã‚¶ã®ã‚¯ãƒ­ãƒ¼ã‚ºã®ãŸã‚ã«%uã®æŽ¥ç¶šã‚’リセット" -+ -+#: ../statistics.c:220 -+#, c-format -+msgid "%u connections aborted due to memory pressure" -+msgstr "メモリã®åˆ¶ç´„ã®ãŸã‚ã«%uã®æŽ¥ç¶šã‚’中止" -+ -+#: ../statistics.c:221 -+#, c-format -+msgid "%u connections aborted due to timeout" -+msgstr "タイムアウトã®ãŸã‚ã«%uã®æŽ¥ç¶šã‚’中止" -+ -+# FIXME -+#: ../statistics.c:222 -+#, c-format -+msgid "%u connections aborted after user close in linger timeout" -+msgstr "ユーザã®é•·æœŸã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã§ã®ã‚¯ãƒ­ãƒ¼ã‚ºå¾Œã«%uã®æŽ¥ç¶šãŒä¸­æ­¢" -+ -+#: ../statistics.c:223 -+#, c-format -+msgid "%u times unabled to send RST due to no memory" -+msgstr "メモリä¸è¶³ã®ãŸã‚ã«RSTã®é€ä¿¡ãŒ%u回ä¸èƒ½" -+ -+# FIXME -+#: ../statistics.c:224 -+#, c-format -+msgid "TCP ran low on memory %u times" -+msgstr "TCPãŒå°‘ãªã„メモリã§%u回実行" -+ -+#: ../statistics.c:225 -+#, c-format -+msgid "%u TCP data loss events" -+msgstr "%uã®TCPデータãŒã‚¤ãƒ™ãƒ³ãƒˆã‚’ロス" -+ -+#: ../statistics.c:292 -+msgid "enabled" -+msgstr "有効" -+ -+#: ../statistics.c:292 -+msgid "disabled" -+msgstr "無効" -+ -+#: ../statistics.c:375 -+msgid "error parsing /proc/net/snmp" -+msgstr "/proc/net/snmpã®å‡¦ç†ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ" -+ -+#: ../statistics.c:388 -+msgid "cannot open /proc/net/snmp" -+msgstr "/proc/net/snmpã‚’é–‹ã‘ã¾ã›ã‚“" -+ -+#: ../lib/activate.c:69 -+#, c-format -+msgid "Hardware type `%s' not supported.\n" -+msgstr "ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¿ã‚¤ãƒ—`%s'ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“.\n" -+ -+#: ../lib/activate.c:73 -+#, c-format -+msgid "Cannot change line discipline to `%s'.\n" -+msgstr "`%s'ã®line disciplineを変更ã§ãã¾ã›ã‚“.\n" -+ -+#: ../lib/af.c:153 ../lib/hw.c:161 -+msgid "UNSPEC" -+msgstr "ä¸æ˜Žãªãƒãƒƒãƒˆ" -+ -+#: ../lib/af.c:155 -+msgid "UNIX Domain" -+msgstr "UNIXドメイン" -+ -+#: ../lib/af.c:158 -+msgid "DARPA Internet" -+msgstr "DARPAインターãƒãƒƒãƒˆ" -+ -+#: ../lib/af.c:161 -+msgid "IPv6" -+msgstr "IPv6" -+ -+#: ../lib/af.c:164 ../lib/hw.c:182 -+msgid "AMPR AX.25" -+msgstr "AMPR AX.25" -+ -+#: ../lib/af.c:167 ../lib/hw.c:188 -+msgid "AMPR NET/ROM" -+msgstr "AMPR NET/ROM" -+ -+#: ../lib/af.c:170 -+msgid "Novell IPX" -+msgstr "Novell IPX" -+ -+#: ../lib/af.c:173 -+msgid "Appletalk DDP" -+msgstr "アップルトークDDP" -+ -+#: ../lib/af.c:176 ../lib/hw.c:223 -+msgid "Econet" -+msgstr "エコãƒãƒƒãƒˆ" -+ -+#: ../lib/af.c:179 -+msgid "CCITT X.25" -+msgstr "CCITT X.25" -+ -+#: ../lib/af.c:182 ../lib/hw.c:185 -+msgid "AMPR ROSE" -+msgstr "AMPR ROSE" -+ -+#: ../lib/af.c:185 ../lib/hw.c:173 -+msgid "Ash" -+msgstr "Ash" -+ -+#: ../lib/af.c:243 -+#, c-format -+msgid "Please don't supply more than one address family.\n" -+msgstr "複数ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ãƒ•ã‚¡ãƒŸãƒªã‚’ã—ãªã„ã§ä¸‹ã•ã„.\n" -+ -+#: ../lib/af.c:304 -+#, c-format -+msgid "Too much address family arguments.\n" -+msgstr "アドレスファミリã®å¼•æ•°ãŒå¤šã™ãŽã¾ã™.\n" -+ -+#: ../lib/af.c:315 -+#, c-format -+msgid "Unknown address family `%s'.\n" -+msgstr "ä¸æ˜Žãªã‚¢ãƒ‰ãƒ¬ã‚¹ãƒ•ã‚¡ãƒŸãƒªã§ã™ `%s'.\n" -+ -+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85 -+#, c-format -+msgid "in_arcnet(%s): invalid arcnet address!\n" -+msgstr "in_arcnet(%s): ä¸é©å½“ãªARCNETアドレスã§ã™!\n" -+ -+#: ../lib/arcnet.c:97 -+#, c-format -+msgid "in_arcnet(%s): trailing : ignored!\n" -+msgstr "in_arcnet(%s): trailing : 無効!\n" -+ -+# translatable? -+#: ../lib/arcnet.c:109 -+#, c-format -+msgid "in_arcnet(%s): trailing junk!\n" -+msgstr "in_arcnet(%s): trailing junk!\n" -+ -+#: ../lib/ash.c:81 -+#, c-format -+msgid "Malformed Ash address" -+msgstr "異常ãªAshアドレスã§ã™" -+ -+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244 -+#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 -+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76 -+msgid "[NONE SET]" -+msgstr "[設定ãªã—]" -+ -+#: ../lib/ax25.c:97 ../lib/netrom.c:100 -+msgid "Invalid callsign" -+msgstr "ä¸é©å½“ãªã‚³ãƒ¼ãƒ«ã‚µã‚¤ãƒ³ã§ã™" -+ -+#: ../lib/ax25.c:110 ../lib/netrom.c:113 -+msgid "Callsign too long" -+msgstr "コールサインãŒé•·ã™ãŽã¾ã™" -+ -+#: ../lib/ax25_gr.c:47 -+#, c-format -+msgid "AX.25 not configured in this system.\n" -+msgstr "AX.25ã¯ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã§ã¯è¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“.\n" -+ -+#: ../lib/ax25_gr.c:50 -+#, c-format -+msgid "Kernel AX.25 routing table\n" -+msgstr "カーãƒãƒ« AX.25経路テーブル\n" -+ -+#. xxx -+#: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55 -+#, c-format -+msgid "Destination Iface Use\n" -+msgstr "é€ä¿¡å…ˆã‚µã‚¤ãƒˆ Iface 使用数\n" -+ -+#: ../lib/ether.c:74 ../lib/ether.c:91 -+#, c-format -+msgid "in_ether(%s): invalid ether address!\n" -+msgstr "in_ether(%s): ä¸é©å½“ãªã‚¤ãƒ¼ã‚µã‚¢ãƒ‰ãƒ¬ã‚¹!\n" -+ -+#: ../lib/ether.c:105 -+#, c-format -+msgid "in_ether(%s): trailing : ignored!\n" -+msgstr "in_ether(%s): trailing : 無効!\n" -+ -+# translatable? -+#: ../lib/ether.c:117 -+#, c-format -+msgid "in_ether(%s): trailing junk!\n" -+msgstr "in_ether(%s): trailing junk!\n" -+ -+#: ../lib/fddi.c:84 ../lib/fddi.c:99 -+#, c-format -+msgid "in_fddi(%s): invalid fddi address!\n" -+msgstr "in_fddi(%s): ä¸é©å½“ãªfddiアドレス!\n" -+ -+#: ../lib/fddi.c:111 -+#, c-format -+msgid "in_fddi(%s): trailing : ignored!\n" -+msgstr "in_fddi(%s): trailing : 無効!\n" -+ -+# translatable? -+#: ../lib/fddi.c:123 -+#, c-format -+msgid "in_fddi(%s): trailing junk!\n" -+msgstr "in_fddi(%s): trailing junk!\n" -+ -+#: ../lib/getroute.c:101 ../lib/setroute.c:80 -+#, c-format -+msgid "Address family `%s' not supported.\n" -+msgstr "アドレスファミリ`%s'ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“.\n" -+ -+#: ../lib/getroute.c:107 ../lib/setroute.c:84 -+#, c-format -+msgid "No routing for address family `%s'.\n" -+msgstr "アドレスファミリ`%s'ã¸ã®çµŒè·¯ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“.\n" -+ -+#: ../lib/hippi.c:84 ../lib/hippi.c:99 -+#, c-format -+msgid "in_hippi(%s): invalid hippi address!\n" -+msgstr "in_hippi(%s): ä¸é©å½“ãªhippiアドレスã§ã™!\n" -+ -+#: ../lib/hippi.c:111 -+#, c-format -+msgid "in_hippi(%s): trailing : ignored!\n" -+msgstr "in_hippi(%s): trailing : 無効!\n" -+ -+# translatable? -+#: ../lib/hippi.c:122 -+#, c-format -+msgid "in_hippi(%s): trailing junk!\n" -+msgstr "in_hippi(%s): trailing junk!\n" -+ -+#: ../lib/hw.c:160 -+msgid "Local Loopback" -+msgstr "ローカルループãƒãƒƒã‚¯" -+ -+#: ../lib/hw.c:163 -+msgid "Serial Line IP" -+msgstr "シリアルラインIP" -+ -+#: ../lib/hw.c:164 -+msgid "VJ Serial Line IP" -+msgstr "VJシリアルラインIP" -+ -+#: ../lib/hw.c:165 -+msgid "6-bit Serial Line IP" -+msgstr "6ビットシリアルラインIP" -+ -+#: ../lib/hw.c:166 -+msgid "VJ 6-bit Serial Line IP" -+msgstr "VJ 6ビットシリアルラインIP" -+ -+#: ../lib/hw.c:167 -+msgid "Adaptive Serial Line IP" -+msgstr "AdaptiveシリアルラインIP" -+ -+#: ../lib/hw.c:170 -+msgid "Ethernet" -+msgstr "イーサãƒãƒƒãƒˆ" -+ -+# translatable? -+#: ../lib/hw.c:176 -+msgid "Fiber Distributed Data Interface" -+msgstr "Fiber Distributed Data Interface" -+ -+#: ../lib/hw.c:179 -+msgid "HIPPI" -+msgstr "HIPPI" -+ -+#: ../lib/hw.c:191 -+msgid "generic X.25" -+msgstr "ジェãƒãƒªãƒƒã‚¯X.25" -+ -+#: ../lib/hw.c:194 -+msgid "IPIP Tunnel" -+msgstr "IPIPトンãƒãƒ«" -+ -+#: ../lib/hw.c:197 -+msgid "Point-to-Point Protocol" -+msgstr "Point-to-Pointプロトコル" -+ -+#: ../lib/hw.c:200 -+msgid "(Cisco)-HDLC" -+msgstr "(Cisco)-HDLC" -+ -+#: ../lib/hw.c:201 -+msgid "LAPB" -+msgstr "LAPB" -+ -+#: ../lib/hw.c:204 -+msgid "ARCnet" -+msgstr "ARCãƒãƒƒãƒˆ" -+ -+#: ../lib/hw.c:207 -+msgid "Frame Relay DLCI" -+msgstr "フレームリレーDLCI" -+ -+#: ../lib/hw.c:208 -+msgid "Frame Relay Access Device" -+msgstr "フレームリレーアクセスデãƒã‚¤ã‚¹" -+ -+#: ../lib/hw.c:211 -+msgid "IPv6-in-IPv4" -+msgstr "IPv6-in-IPv4" -+ -+#: ../lib/hw.c:214 -+msgid "IrLAP" -+msgstr "IrLAP" -+ -+#: ../lib/hw.c:217 -+msgid "16/4 Mbps Token Ring" -+msgstr "16/4 Mbpsトークンリング" -+ -+#: ../lib/hw.c:219 -+msgid "16/4 Mbps Token Ring (New)" -+msgstr "16/4 Mbpsトークンリング(æ–°)" -+ -+#: ../lib/hw.c:226 -+msgid "Generic EUI-64" -+msgstr "ジェãƒãƒªãƒƒã‚¯EUI-64" -+ -+#: ../lib/inet.c:153 ../lib/inet6.c:79 -+#, c-format -+msgid "rresolve: unsupport address family %d !\n" -+msgstr "rresolve: アドレスファミリ%dをサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“!\n" -+ -+#: ../lib/inet6.c:131 -+msgid "[UNKNOWN]" -+msgstr "[ä¸æ˜Ž]" -+ -+#: ../lib/inet6_gr.c:71 -+#, c-format -+msgid "INET6 (IPv6) not configured in this system.\n" -+msgstr "INET6(IPv6)ã¯ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã§ã¯åˆ©ç”¨ã§ãるよã†è¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“.\n" -+ -+#: ../lib/inet6_gr.c:74 -+#, c-format -+msgid "Kernel IPv6 routing table\n" -+msgstr "カーãƒãƒ«IPv6 経路テーブル\n" -+ -+#: ../lib/inet6_gr.c:76 -+#, c-format -+msgid "" -+"Destination Next " -+"Hop Flags Metric Ref Use Iface\n" -+msgstr "é€ä¿¡å…ˆã‚µã‚¤ãƒˆ 次回ホップ フラグ Metric Ref 使用数 インタフェース\n" -+ -+#: ../lib/inet6_gr.c:150 -+#, c-format -+msgid "Kernel IPv6 Neighbour Cache\n" -+msgstr "カーãƒãƒ«IPv6 近隣ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®ã‚­ãƒ£ãƒƒã‚·ãƒ¥\n" -+ -+#: ../lib/inet6_gr.c:153 -+#, c-format -+msgid "" -+"Neighbour HW Address Iface Flags " -+"Ref State\n" -+msgstr "" -+"近隣サイト ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¢ãƒ‰ãƒ¬ã‚¹ Iface フラグ " -+"Ref 状態\n" -+ -+#: ../lib/inet6_gr.c:157 -+#, c-format -+msgid "" -+"Neighbour HW Address Iface Flags " -+"Ref State Stale(sec) Delete(sec)\n" -+msgstr "" -+"近隣サイト ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¢ãƒ‰ãƒ¬ã‚¹ Iface フラグ " -+"Ref 状態 Stale[秒] Delete[秒]\n" -+ -+#: ../lib/inet6_sr.c:46 -+#, c-format -+msgid "Usage: inet6_route [-vF] del Target\n" -+msgstr "使用法: inet6_route [-vF] del ターゲット\n" -+ -+#: ../lib/inet6_sr.c:47 -+#, c-format -+msgid " inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n" -+msgstr "" -+" inet6_route [-vF] add ターゲット \n" -+" [gw ゲートウェイ] [metric メトリック]\n" -+" [[dev] インタフェース]\n" -+ -+#: ../lib/inet6_sr.c:48 -+#, c-format -+msgid " inet6_route [-FC] flush NOT supported\n" -+msgstr " inet6_route [-FC] flush サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" -+ -+#: ../lib/inet6_sr.c:188 -+#, c-format -+msgid "Flushing `inet6' routing table not supported\n" -+msgstr "`inet6'経路テーブルã®ãƒ•ãƒ©ãƒƒã‚·ãƒ¥ã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" -+ -+#: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220 -+#, c-format -+msgid "INET (IPv4) not configured in this system.\n" -+msgstr "INET(IPv4)ã¯ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã§ã¯åˆ©ç”¨ã§ãるよã†ã«è¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“.\n" -+ -+#: ../lib/inet_gr.c:53 -+#, c-format -+msgid "Kernel IP routing table\n" -+msgstr "カーãƒãƒ«IP経路テーブル\n" -+ -+#: ../lib/inet_gr.c:56 -+#, c-format -+msgid "" -+"Destination Gateway Genmask Flags Metric Ref Use " -+"Iface\n" -+msgstr "å—信先サイト ゲートウェイ ãƒãƒƒãƒˆãƒžã‚¹ã‚¯ フラグ Metric Ref 使用数 インタフェース\n" -+ -+#: ../lib/inet_gr.c:59 -+#, c-format -+msgid "" -+"Destination Gateway Genmask Flags MSS Window irtt " -+"Iface\n" -+msgstr "å—信先サイト ゲートウェイ ãƒãƒƒãƒˆãƒžã‚¹ã‚¯ フラグ MSS Window irtt インタフェース\n" -+ -+#: ../lib/inet_gr.c:62 -+#, c-format -+msgid "" -+"Destination Gateway Genmask Flags Metric Ref Use " -+"Iface MSS Window irtt\n" -+msgstr "" -+"å—信先サイト ゲートウェイ ãƒãƒƒãƒˆãƒžã‚¹ã‚¯ フラグ Metric Ref 使用数 " -+"Iface MSS Window irtt\n" -+ -+#: ../lib/inet_gr.c:237 -+#, c-format -+msgid "Kernel IP routing cache\n" -+msgstr "カーãƒãƒ«IP経路キャッシュ\n" -+ -+#: ../lib/inet_gr.c:258 -+#, c-format -+msgid "" -+"Source Destination Gateway Flags Metric Ref Use " -+"Iface\n" -+msgstr "発信元サイト å—信先サイト ゲートウェイ フラグ Metric Ref 使用数 インタフェース\n" -+ -+#: ../lib/inet_gr.c:261 -+#, c-format -+msgid "" -+"Source Destination Gateway Flags MSS Window irtt " -+"Iface\n" -+msgstr "発信元サイト å—信先サイト ゲートウェイ フラグ MSS Window irtt インタフェース\n" -+ -+#: ../lib/inet_gr.c:266 -+#, c-format -+msgid "" -+"Source Destination Gateway Flags Metric Ref Use " -+"Iface MSS Window irtt HH Arp\n" -+msgstr "" -+"発信元サイト å—信先サイト ゲートウェイ フラグ Metric Ref 使用数 " -+"Iface MSS Window irtt HH Arp\n" -+ -+#: ../lib/inet_gr.c:290 -+#, c-format -+msgid "" -+"Source Destination Gateway Flags Metric Ref Use " -+"Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" -+msgstr "" -+"発信元サイト å—信先サイト ゲートウェイ フラグ Metric Ref 使用数 " -+"Iface MSS Window irtt TOS HHRef HHUptod SpecDst\n" -+ -+#: ../lib/inet_sr.c:51 -+#, c-format -+msgid "" -+"Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] " -+"[[dev] If]\n" -+msgstr "" -+"使用法:inet_route [-vF] del {-host|-net} å—ä¿¡å…ˆ[/プレフィックス]\n" -+" [gw ゲートウェイ] [metric メトリック]\n" -+" [[dev] インタフェース]\n" -+ -+#: ../lib/inet_sr.c:52 -+#, c-format -+msgid "" -+" inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n" -+msgstr "" -+" inet_route [-vF] add {-host|-net} å—ä¿¡å…ˆ[/プレフィックス]\n" -+" [gw ゲートウェイ] [metric メトリック]\n" -+ -+#: ../lib/inet_sr.c:53 -+#, c-format -+msgid "" -+" [netmask N] [mss Mss] [window W] [irtt I]\n" -+msgstr " [netmask ãƒãƒƒãƒˆãƒžã‚¹ã‚¯] [mss Mss] [window W] [irtt I]\n" -+ -+#: ../lib/inet_sr.c:54 -+#, c-format -+msgid " [mod] [dyn] [reinstate] [[dev] If]\n" -+msgstr " [mod] [dyn] [reinstate] [[dev] インタフェース]\n" -+ -+#: ../lib/inet_sr.c:55 -+#, c-format -+msgid "" -+" inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n" -+msgstr "" -+" inet_route [-vF] add {-host|-net} å—ä¿¡å…ˆ[/プレフィックス]\n" -+" [metric メトリック] reject\n" -+ -+#: ../lib/inet_sr.c:56 -+#, c-format -+msgid " inet_route [-FC] flush NOT supported\n" -+msgstr " inet_route [-FC] flush サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" -+ -+#: ../lib/inet_sr.c:158 -+#, c-format -+msgid "route: %s: cannot use a NETWORK as gateway!\n" -+msgstr "route: %s: NETWORKをゲートウェイã¨ã—ã¦ä½¿ãˆã¾ã›ã‚“!\n" -+ -+#: ../lib/inet_sr.c:174 -+#, c-format -+msgid "route: Invalid MSS/MTU.\n" -+msgstr "route: MSS/MTUãŒä¸é©å½“ã§ã™.\n" -+ -+#: ../lib/inet_sr.c:187 -+#, c-format -+msgid "route: Invalid window.\n" -+msgstr "route: windowãŒä¸é©å½“ã§ã™.\n" -+ -+#: ../lib/inet_sr.c:203 -+#, c-format -+msgid "route: Invalid initial rtt.\n" -+msgstr "route: åˆæœŸrttãŒä¸é©å½“ã§ã™.\n" -+ -+#: ../lib/inet_sr.c:261 -+#, c-format -+msgid "route: netmask %.8x doesn't make sense with host route\n" -+msgstr "route: ãƒãƒƒãƒˆãƒžã‚¹ã‚¯%.8xãŒãƒ›ã‚¹ãƒˆçµŒè·¯ã‚’検出ã—ã¾ã›ã‚“\n" -+ -+#: ../lib/inet_sr.c:265 -+#, c-format -+msgid "route: bogus netmask %s\n" -+msgstr "route: å½ã®ãƒãƒƒãƒˆãƒžã‚¹ã‚¯`%s'ã§ã™\n" -+ -+#: ../lib/inet_sr.c:270 -+#, c-format -+msgid "route: netmask doesn't match route address\n" -+msgstr "route: ãƒãƒƒãƒˆãƒžã‚¹ã‚¯ãŒçµŒè·¯ã‚¢ãƒ‰ãƒ¬ã‚¹ã¨ä¸€è‡´ã—ã¾ã›ã‚“\n" -+ -+#: ../lib/inet_sr.c:306 -+#, c-format -+msgid "Flushing `inet' routing table not supported\n" -+msgstr "`inet'経路テーブルã®ãƒ•ãƒ©ãƒƒã‚·ãƒ¥ã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" -+ -+#: ../lib/inet_sr.c:310 -+#, c-format -+msgid "Modifying `inet' routing cache not supported\n" -+msgstr "`inet'経路テーブルã®å¤‰æ›´ã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" -+ -+#: ../lib/ipx_gr.c:52 -+#, c-format -+msgid "IPX not configured in this system.\n" -+msgstr "IPXã¯ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã§ã¯è¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“.\n" -+ -+#: ../lib/ipx_gr.c:56 -+#, c-format -+msgid "Kernel IPX routing table\n" -+msgstr "カーãƒãƒ«IPX経路テーブル\n" -+ -+#. xxx -+#: ../lib/ipx_gr.c:57 -+#, c-format -+msgid "Destination Router Net Router Node\n" -+msgstr "é€ä¿¡å…ˆã‚µã‚¤ãƒˆ ルータ ãƒãƒƒãƒˆ ルータノード\n" -+ -+#: ../lib/ipx_sr.c:33 -+#, c-format -+msgid "IPX: this needs to be written\n" -+msgstr "IPX: ã“ã‚Œã¯æ›¸ãè¾¼ã¿ãŒå¿…è¦ã§ã™\n" -+ -+#: ../lib/masq_info.c:198 -+#, c-format -+msgid "IP masquerading entries\n" -+msgstr "IPマスカレード エントリ\n" -+ -+#: ../lib/masq_info.c:201 -+#, c-format -+msgid "prot expire source destination ports\n" -+msgstr "プロト expire 発信元サイト é€ä¿¡å…ˆã‚µã‚¤ãƒˆ ãƒãƒ¼ãƒˆ\n" -+ -+#: ../lib/masq_info.c:204 -+#, c-format -+msgid "" -+"prot expire initseq delta prevd source " -+"destination ports\n" -+msgstr "" -+"プロト expire åˆæœŸseq delta prevd 発信元サイト å—信先サイ" -+"ト ãƒãƒ¼ãƒˆ\n" -+ -+#: ../lib/netrom_gr.c:48 -+#, c-format -+msgid "NET/ROM not configured in this system.\n" -+msgstr "NET/ROMã¯ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã§ã¯åˆ©ç”¨å¯èƒ½ãªã‚ˆã†ã«è¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“.\n" -+ -+#: ../lib/netrom_gr.c:51 -+#, c-format -+msgid "Kernel NET/ROM routing table\n" -+msgstr "カーãƒãƒ«NET/ROM経路テーブル\n" -+ -+#: ../lib/netrom_gr.c:52 -+#, c-format -+msgid "Destination Mnemonic Quality Neighbour Iface\n" -+msgstr "å—信先サイト ニーモニック å“質 近隣サイト インタフェース\n" -+ -+#: ../lib/netrom_sr.c:34 -+#, c-format -+msgid "netrom usage\n" -+msgstr "netrom使用法\n" -+ -+#: ../lib/netrom_sr.c:44 -+#, c-format -+msgid "NET/ROM: this needs to be written\n" -+msgstr "NET/ROM: ã“ã‚Œã¯æ›¸ãè¾¼ã¿ãŒå¿…è¦ã§ã™\n" -+ -+#: ../lib/ppp.c:44 -+#, c-format -+msgid "You cannot start PPP with this program.\n" -+msgstr "ã“ã®ãƒ—ログラムã§ã¯PPPを開始ã§ãã¾ã›ã‚“. \n" -+ -+#: ../lib/ppp_ac.c:38 -+#, c-format -+msgid "Sorry, use pppd!\n" -+msgstr "申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒ, pppdを使ã£ã¦ä¸‹ã•ã„!\n" -+ -+#: ../lib/rose.c:87 -+msgid "Node address must be ten digits" -+msgstr "ノードアドレスã¯10進数ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" -+ -+#: ../lib/rose_gr.c:51 -+#, c-format -+msgid "ROSE not configured in this system.\n" -+msgstr "ROSEã¯ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã§ã¯åˆ©ç”¨å¯èƒ½ãªã‚ˆã†ã«è¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“\n" -+ -+#: ../lib/rose_gr.c:54 -+#, c-format -+msgid "Kernel ROSE routing table\n" -+msgstr "カーãƒãƒ«ROSE経路テーブル\n" -+ -+#: ../lib/tr.c:86 ../lib/tr.c:101 -+#, c-format -+msgid "in_tr(%s): invalid token ring address!\n" -+msgstr "in_tr(%s): ä¸é©å½“ãªãƒˆãƒ¼ã‚¯ãƒ³ãƒªãƒ³ã‚°ã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã™!\n" -+ -+#: ../lib/tr.c:113 -+#, c-format -+msgid "in_tr(%s): trailing : ignored!\n" -+msgstr "in_tr(%s): trailing : 無効!\n" -+ -+# translatable? -+#: ../lib/tr.c:125 -+#, c-format -+msgid "in_tr(%s): trailing junk!\n" -+msgstr "in_tr(%s): trailing junk!\n" -+ -+#: ../lib/interface.c:176 -+#, c-format -+msgid "warning: no inet socket available: %s\n" -+msgstr "警告: Inetソケットã¯åˆ©ç”¨ã§ãã¾ã›ã‚“: %s\n" -+ -+#: ../lib/interface.c:325 -+#, c-format -+msgid "Warning: cannot open %s (%s). Limited output.\n" -+msgstr "警告: %sã‚’é–‹ã‘ã¾ã›ã‚“(%s). é™å®šã•ã‚ŒãŸå‡ºåŠ›ã§ã™.\n" -+ -+#. Give better error message for this case. -+#: ../lib/interface.c:571 -+msgid "Device not found" -+msgstr "デãƒã‚¤ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" -+ -+#: ../lib/interface.c:575 -+#, c-format -+msgid "%s: error fetching interface information: %s\n" -+msgstr "%s: インタフェース情報をå–得中ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %s\n" -+ -+#: ../lib/interface.c:608 -+msgid " - no statistics available -" -+msgstr " - 統計情報を利用ã§ãã¾ã›ã‚“ -" -+ -+#: ../lib/interface.c:612 -+#, c-format -+msgid "[NO FLAGS]" -+msgstr "[フラグãªã—]" -+ -+#: ../lib/interface.c:688 -+#, c-format -+msgid "%-9.9s Link encap:%s " -+msgstr "%-9.9s リンク方法:%s " -+ -+#: ../lib/interface.c:693 -+#, c-format -+msgid "HWaddr %s " -+msgstr "ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¢ãƒ‰ãƒ¬ã‚¹ %s " -+ -+#: ../lib/interface.c:696 -+#, c-format -+msgid "Media:%s" -+msgstr "メディア:%s" -+ -+#: ../lib/interface.c:698 -+#, c-format -+msgid "(auto)" -+msgstr "(自動)" -+ -+#: ../lib/interface.c:705 -+#, c-format -+msgid " %s addr:%s " -+msgstr " %sアドレス:%s" -+ -+#: ../lib/interface.c:708 -+#, c-format -+msgid " P-t-P:%s " -+msgstr " P-t-P:%s " -+ -+#: ../lib/interface.c:711 -+#, c-format -+msgid " Bcast:%s " -+msgstr " ブロードキャスト:%s " -+ -+#: ../lib/interface.c:713 -+#, c-format -+msgid " Mask:%s\n" -+msgstr " マスク:%s\n" -+ -+#: ../lib/interface.c:730 -+#, c-format -+msgid " inet6 addr: %s/%d" -+msgstr " inet6アドレス: %s/%d" -+ -+#: ../lib/interface.c:732 -+#, c-format -+msgid " Scope:" -+msgstr " 範囲:" -+ -+#: ../lib/interface.c:735 -+#, c-format -+msgid "Global" -+msgstr "グローãƒãƒ«" -+ -+#: ../lib/interface.c:738 -+#, c-format -+msgid "Link" -+msgstr "リンク" -+ -+#: ../lib/interface.c:741 -+#, c-format -+msgid "Site" -+msgstr "サイト" -+ -+# translatable? -+#: ../lib/interface.c:744 -+#, c-format -+msgid "Compat" -+msgstr "Compat" -+ -+#: ../lib/interface.c:747 -+#, c-format -+msgid "Host" -+msgstr "ホスト" -+ -+#: ../lib/interface.c:750 -+#, c-format -+msgid "Unknown" -+msgstr "ä¸æ˜Ž" -+ -+#: ../lib/interface.c:765 -+#, c-format -+msgid " IPX/Ethernet II addr:%s\n" -+msgstr " IPX/イーサãƒãƒƒãƒˆIIアドレス:%s\n" -+ -+#: ../lib/interface.c:768 -+#, c-format -+msgid " IPX/Ethernet SNAP addr:%s\n" -+msgstr " IPX/イーサãƒãƒƒãƒˆSNAPアドレス:%s\n" -+ -+#: ../lib/interface.c:771 -+#, c-format -+msgid " IPX/Ethernet 802.2 addr:%s\n" -+msgstr " IPX/イーサãƒãƒƒãƒˆ802.2アドレス:%s\n" -+ -+#: ../lib/interface.c:774 -+#, c-format -+msgid " IPX/Ethernet 802.3 addr:%s\n" -+msgstr " IPX/イーサãƒãƒƒãƒˆ802.3アドレス:%s\n" -+ -+#: ../lib/interface.c:784 -+#, c-format -+msgid " EtherTalk Phase 2 addr:%s\n" -+msgstr " イーサトーク フェーズ2アドレス:%s\n" -+ -+#: ../lib/interface.c:793 -+#, c-format -+msgid " econet addr:%s\n" -+msgstr " エコãƒãƒƒãƒˆã‚¢ãƒ‰ãƒ¬ã‚¹:%s\n" -+ -+#: ../lib/interface.c:800 -+#, c-format -+msgid "[NO FLAGS] " -+msgstr "[フラグãªã—]" -+ -+# translatable? -+#: ../lib/interface.c:802 -+#, c-format -+msgid "UP " -+msgstr "UP " -+ -+# translatable? -+#: ../lib/interface.c:804 -+#, c-format -+msgid "BROADCAST " -+msgstr "BROADCAST " -+ -+# translatable? -+#: ../lib/interface.c:806 -+#, c-format -+msgid "DEBUG " -+msgstr "DEBUG " -+ -+# translatable? -+#: ../lib/interface.c:808 -+#, c-format -+msgid "LOOPBACK " -+msgstr "LOOPBACK " -+ -+# translatable? -+#: ../lib/interface.c:810 -+#, c-format -+msgid "POINTOPOINT " -+msgstr "POINTOPOINT " -+ -+# translatable? -+#: ../lib/interface.c:812 -+#, c-format -+msgid "NOTRAILERS " -+msgstr "NOTRAILERS " -+ -+# translatable? -+#: ../lib/interface.c:814 -+#, c-format -+msgid "RUNNING " -+msgstr "RUNNING " -+ -+# translatable? -+#: ../lib/interface.c:816 -+#, c-format -+msgid "NOARP " -+msgstr "NOARP " -+ -+# translatable? -+#: ../lib/interface.c:818 -+#, c-format -+msgid "PROMISC " -+msgstr "PROMISC " -+ -+# translatable? -+#: ../lib/interface.c:820 -+#, c-format -+msgid "ALLMULTI " -+msgstr "ALLMULTI " -+ -+# translatable? -+#: ../lib/interface.c:822 -+#, c-format -+msgid "SLAVE " -+msgstr "SLAVE " -+ -+# translatable? -+#: ../lib/interface.c:824 -+#, c-format -+msgid "MASTER " -+msgstr "MASTER " -+ -+# translatable? -+#: ../lib/interface.c:826 -+#, c-format -+msgid "MULTICAST " -+msgstr "MULTICAST " -+ -+# translatable? -+#: ../lib/interface.c:829 -+#, c-format -+msgid "DYNAMIC " -+msgstr "DYNAMIC " -+ -+#. DONT FORGET TO ADD THE FLAGS IN ife_print_short -+#: ../lib/interface.c:832 -+#, c-format -+msgid " MTU:%d Metric:%d" -+msgstr " MTU:%d メトリック:%d" -+ -+# translatable? -+#: ../lib/interface.c:836 -+#, c-format -+msgid " Outfill:%d Keepalive:%d" -+msgstr " Outfill:%d キープアライブ:%d" -+ -+#: ../lib/interface.c:850 -+#, c-format -+msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n" -+msgstr "RXパケット:%llu エラー:%lu æ失:%lu オーãƒãƒ©ãƒ³:%lu フレーム:%lu\n" -+ -+#: ../lib/interface.c:855 -+#, c-format -+msgid " compressed:%lu\n" -+msgstr " 圧縮:%lu\n" -+ -+#: ../lib/interface.c:895 -+#, c-format -+msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n" -+msgstr "TXパケット:%llu エラー:%lu æ失:%lu オーãƒãƒ©ãƒ³:%lu キャリア:%lu\n" -+ -+#: ../lib/interface.c:899 -+#, c-format -+msgid " collisions:%lu " -+msgstr " è¡çª(Collisions):%lu " -+ -+#: ../lib/interface.c:901 -+#, c-format -+msgid "compressed:%lu " -+msgstr "圧縮:%lu " -+ -+#: ../lib/interface.c:903 -+#, c-format -+msgid "txqueuelen:%d " -+msgstr "TXキュー長:%d " -+ -+#: ../lib/interface.c:905 -+#, c-format -+msgid "RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n" -+msgstr "RXãƒã‚¤ãƒˆ:%llu (%lu.%lu %s) TXãƒã‚¤ãƒˆ:%llu (%lu.%lu %s)\n" -+ -+#: ../lib/interface.c:916 -+#, c-format -+msgid "Interrupt:%d " -+msgstr "割り込ã¿:%d " -+ -+#. Only print devices using it for -+#. I/O maps -+#: ../lib/interface.c:919 -+#, c-format -+msgid "Base address:0x%x " -+msgstr "ベースアドレス:0x%x " -+ -+#: ../lib/interface.c:921 -+#, c-format -+msgid "Memory:%lx-%lx " -+msgstr "メモリ:%lx-%lx " -+ -+#: ../lib/interface.c:924 -+#, c-format -+msgid "DMA chan:%x " -+msgstr "DMAãƒã‚§ã‚¤ãƒ³:%x " -+ -+#: ../lib/sockets.c:63 -+#, c-format -+msgid "No usable address families found.\n" -+msgstr "利用å¯èƒ½ãªã‚¢ãƒ‰ãƒ¬ã‚¹ãƒ•ã‚¡ãƒŸãƒªãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“.\n" -+ -+#: ../lib/util-ank.c:229 -+#, c-format -+msgid "ip: %s is invalid inet address\n" -+msgstr "ip: %sã¯ä¸é©åˆ‡ãªInetアドレスã§ã™.\n" -+ -+#: ../lib/util-ank.c:238 -+#, c-format -+msgid "ip: %s is invalid inet prefix\n" -+msgstr "ip: %sã¯ä¸é©åˆ‡ãªInetプレフィックスã§ã™\n" -+ -+#: ../lib/util-ank.c:248 -+#, c-format -+msgid "ip: %s is invalid IPv4 address\n" -+msgstr "ip: %sã¯ä¸é©åˆ‡ãªIPv4アドレスã§ã™.\n" -+ -+#: ../lib/util-ank.c:256 -+#, c-format -+msgid "ip: argument is wrong: %s\n" -+msgstr "ip: 引数ãŒé–“é•ã£ã¦ã„ã¾ã™: %s\n" -+ -+#: ../ipmaddr.c:61 -+#, c-format -+msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n" -+msgstr "使用法: ipmaddr [ add | del ] マルãƒã‚­ãƒ£ã‚¹ãƒˆã‚¢ãƒ‰ãƒ¬ã‚¹ dev 文字列\n" -+ -+#: ../ipmaddr.c:62 -+#, c-format -+msgid " ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n" -+msgstr " ipmaddr show [ dev 文字列 ] [ ipv4 | ipv6 | link | all ]\n" -+ -+#: ../ipmaddr.c:63 -+#, c-format -+msgid " ipmaddr -V | -version\n" -+msgstr " ipmaddr -V | -version\n" -+ -+#: ../ipmaddr.c:263 -+#, c-format -+msgid "family %d " -+msgstr "ファミリ %d " -+ -+#: ../ipmaddr.c:272 -+#, c-format -+msgid " users %d" -+msgstr " ユーザ %d" -+ -+#: ../ipmaddr.c:358 -+msgid "Cannot create socket" -+msgstr "ソケットを作æˆã§ãã¾ã›ã‚“" -+ -+#: ../slattach.c:180 -+#, c-format -+msgid "slattach: /dev/%s already locked!\n" -+msgstr "slattach: /dev/%s ã¯ã™ã§ã«ãƒ­ãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™!\n" -+ -+#: ../slattach.c:186 -+#, c-format -+msgid "slattach: tty_lock: (%s): %s\n" -+msgstr "slattach: tty_lock: (%s): %s\n" -+ -+#: ../slattach.c:192 -+#, c-format -+msgid "slattach: cannot write PID file\n" -+msgstr "slattach: PIDファイルを書ãè¾¼ã‚ã¾ã›ã‚“\n" -+ -+#: ../slattach.c:202 -+#, c-format -+msgid "slattach: tty_lock: UUCP user %s unknown!\n" -+msgstr "slattach: tty_lock: UUCPユーザ%sã¯ä¸æ˜Žã§ã™!\n" -+ -+#: ../slattach.c:430 -+#, c-format -+msgid "slattach: tty_hangup(DROP): %s\n" -+msgstr "slattach: tty_hangup(DROP): %s\n" -+ -+#: ../slattach.c:437 -+#, c-format -+msgid "slattach: tty_hangup(RAISE): %s\n" -+msgstr "slattach: tty_hangup(RAISE): %s\n" -+ -+#: ../slattach.c:468 -+#, c-format -+msgid "slattach: tty name too long\n" -+msgstr "slattach: ttyåãŒé•·ã™ãŽã¾ã™\n" -+ -+#: ../slattach.c:498 -+#, c-format -+msgid "slattach: tty_open: cannot get current state!\n" -+msgstr "slattach: tty_open: ç¾åœ¨ã®çŠ¶æ…‹ã‚’得られã¾ã›ã‚“!\n" -+ -+#: ../slattach.c:505 -+#, c-format -+msgid "slattach: tty_open: cannot get current line disc!\n" -+msgstr "slattach: tty_open: ç¾åœ¨ã®ãƒ©ã‚¤ãƒ³ãƒ»ãƒ‡ã‚£ã‚¹ã‚¯ã‚’得られã¾ã›ã‚“!\n" -+ -+#: ../slattach.c:513 -+#, c-format -+msgid "slattach: tty_open: cannot set RAW mode!\n" -+msgstr "slattach: tty_open: RAWモードを設定ã§ãã¾ã›ã‚“!\n" -+ -+#: ../slattach.c:520 -+#, c-format -+msgid "slattach: tty_open: cannot set %s bps!\n" -+msgstr "slattach: tty_open: %s bpsを設定ã§ãã¾ã›ã‚“!\n" -+ -+#: ../slattach.c:530 -+#, c-format -+msgid "slattach: tty_open: cannot set 8N1 mode!\n" -+msgstr "slattach: tty_open: 8N1モードã¸è¨­å®šã§ãã¾ã›ã‚“!\n" -+ -+#: ../slattach.c:672 -+#, c-format -+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+msgstr "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n" -+ -+#: ../slattach.c:704 -+#, c-format -+msgid "%s started" -+msgstr "%sを開始ã—ã¾ã—ãŸ" -+ -+#: ../slattach.c:705 -+#, c-format -+msgid " on %s" -+msgstr "(%s上)" -+ -+#: ../slattach.c:706 -+#, c-format -+msgid " interface %s\n" -+msgstr " インタフェース %s\n" ---- net-tools-1.60.orig/ipmaddr.c -+++ net-tools-1.60/ipmaddr.c -@@ -291,13 +291,15 @@ - static int multiaddr_list(int argc, char **argv) - { - struct ma_info *list = NULL; -+ size_t l; - - while (argc > 0) { - if (strcmp(*argv, "dev") == 0) { - NEXT_ARG(); -- if (filter_dev[0]) -+ l = strlen(*argv); -+ if (l <= 0 || l >= sizeof(filter_dev)) - usage(); -- strcpy(filter_dev, *argv); -+ strncpy(filter_dev, *argv, sizeof (filter_dev)); - } else if (strcmp(*argv, "all") == 0) { - filter_family = AF_UNSPEC; - } else if (strcmp(*argv, "ipv4") == 0) { -@@ -307,9 +309,10 @@ - } else if (strcmp(*argv, "link") == 0) { - filter_family = AF_PACKET; - } else { -- if (filter_dev[0]) -+ l = strlen(*argv); -+ if (l <= 0 || l >= sizeof(filter_dev)) - usage(); -- strcpy(filter_dev, *argv); -+ strncpy(filter_dev, *argv, sizeof (filter_dev)); - } - argv++; argc--; - } ---- net-tools-1.60.orig/Makefile -+++ net-tools-1.60/Makefile -@@ -76,7 +76,7 @@ - NET_LIB_PATH = lib - NET_LIB_NAME = net-tools - --PROGS := ifconfig hostname arp netstat route rarp slattach plipconfig nameif -+PROGS := ifconfig arp netstat route rarp slattach plipconfig nameif # hostname - - -include config.make - ifeq ($(HAVE_IP_TOOLS),1) -@@ -88,7 +88,7 @@ - - # Compiler and Linker Options - # You may need to uncomment and edit these if you are using libc5 and IPv6. --COPTS = -D_GNU_SOURCE -O2 -Wall -g # -I/usr/inet6/include -+COPTS = -D_GNU_SOURCE -O2 -Wall # -g -I/usr/inet6/include - ifeq ($(origin LOPTS), undefined) - LOPTS = - endif -@@ -116,6 +116,18 @@ - CFLAGS = $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH) - LDFLAGS = $(LOPTS) -L$(NET_LIB_PATH) - -+INSTALL = install -+INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 -+ -+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) -+CFLAGS += -g -+endif -+ -+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -+INSTALL_PROGRAM += -s -+endif -+ -+ - SUBDIRS = man/ $(NET_LIB_PATH)/ - - ifeq ($(origin CC), undefined) -@@ -223,29 +235,29 @@ - installbin: - install -m 0755 -d ${BASEDIR}/sbin - install -m 0755 -d ${BASEDIR}/bin -- install -m 0755 arp ${BASEDIR}/sbin -- install -m 0755 hostname ${BASEDIR}/bin -- install -m 0755 ifconfig ${BASEDIR}/sbin -- install -m 0755 nameif ${BASEDIR}/sbin -- install -m 0755 netstat ${BASEDIR}/bin -- install -m 0755 plipconfig $(BASEDIR)/sbin -- install -m 0755 rarp ${BASEDIR}/sbin -- install -m 0755 route ${BASEDIR}/sbin -- install -m 0755 slattach $(BASEDIR)/sbin -+ $(INSTALL_PROGRAM) arp ${BASEDIR}/sbin -+# $(INSTALL_PROGRAM) hostname ${BASEDIR}/bin -+ $(INSTALL_PROGRAM) ifconfig ${BASEDIR}/sbin -+ $(INSTALL_PROGRAM) nameif ${BASEDIR}/sbin -+ $(INSTALL_PROGRAM) netstat ${BASEDIR}/bin -+ $(INSTALL_PROGRAM) plipconfig $(BASEDIR)/sbin -+ $(INSTALL_PROGRAM) rarp ${BASEDIR}/sbin -+ $(INSTALL_PROGRAM) route ${BASEDIR}/sbin -+ $(INSTALL_PROGRAM) slattach $(BASEDIR)/sbin - ifeq ($(HAVE_IP_TOOLS),1) -- install -m 0755 ipmaddr $(BASEDIR)/sbin -- install -m 0755 iptunnel $(BASEDIR)/sbin -+ $(INSTALL_PROGRAM) ipmaddr $(BASEDIR)/sbin -+ $(INSTALL_PROGRAM) iptunnel $(BASEDIR)/sbin - endif - ifeq ($(HAVE_MII),1) -- install -m 0755 mii-tool $(BASEDIR)/sbin --endif -- ln -fs hostname $(BASEDIR)/bin/dnsdomainname -- ln -fs hostname $(BASEDIR)/bin/ypdomainname -- ln -fs hostname $(BASEDIR)/bin/nisdomainname -- ln -fs hostname $(BASEDIR)/bin/domainname --ifeq ($(HAVE_AFDECnet),1) -- ln -fs hostname $(BASEDIR)/bin/nodename -+ $(INSTALL_PROGRAM) mii-tool $(BASEDIR)/sbin - endif -+# ln -fs hostname $(BASEDIR)/bin/dnsdomainname -+# ln -fs hostname $(BASEDIR)/bin/ypdomainname -+# ln -fs hostname $(BASEDIR)/bin/nisdomainname -+# ln -fs hostname $(BASEDIR)/bin/domainname -+#ifeq ($(HAVE_AFDECnet),1) -+# ln -fs hostname $(BASEDIR)/bin/nodename -+#endif - - savebin: - @for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \ ---- net-tools-1.60.orig/README -+++ net-tools-1.60/README -@@ -10,7 +10,7 @@ - subsystem of the Linux kernel. This includes arp, hostname, ifconfig, - netstat, rarp and route. Additionally, this package contains - utilities relating to particular network hardware types (plipconfig, --slattach) and advanced aspects of IP configuration (iptunnel, -+slattach, mii-tool) and advanced aspects of IP configuration (iptunnel, - ipmaddr). - - Please include the output of "program --version" when reporting bugs. -@@ -24,10 +24,14 @@ - - INSTALLING Installation instructions. - -- COPYING Your free copy of the GNU Public License. -- - TODO Some things that need to be done. - -+The Homepage (including CVS repository, release downloads and a form to -+request enhancements) is hosted by BerliOS Developer. Please consider to -+join the project if you want to contribute: -+ -+ http://net-tools.berlios.de/ -+ - - Notes - ----- ---- net-tools-1.60.orig/arp.c -+++ net-tools-1.60/arp.c -@@ -8,7 +8,7 @@ - * NET-3 Networking Distribution for the LINUX operating - * system. - * -- * Version: $Id: arp.c,v 1.20 2001/04/08 17:05:05 pb Exp $ -+ * Version: $Id: arp.c,v 1.25 2005/12/04 02:57:15 ecki Exp $ - * - * Maintainer: Bernd 'eckes' Eckenfels, - * -@@ -100,9 +100,10 @@ - { - char host[128]; - struct arpreq req; -- struct sockaddr sa; -+ struct sockaddr_storage ss; -+ struct sockaddr *sa; - int flags = 0; -- int err; -+ int deleted = 0; - - memset((char *) &req, 0, sizeof(req)); - -@@ -112,12 +113,13 @@ - return (-1); - } - safe_strncpy(host, *args, (sizeof host)); -- if (ap->input(0, host, &sa) < 0) { -+ sa = (struct sockaddr *)&ss; -+ if (ap->input(0, host, sa) < 0) { - ap->herror(host); - return (-1); - } - /* If a host has more than one address, use the correct one! */ -- memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr)); -+ memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr)); - - if (hw_set) - req.arp_ha.sa_family = hw->type; -@@ -148,7 +150,7 @@ - continue; - } - if (!strcmp(*args, "dontpub")) { --#ifdef HAVE_ATF_DONTPUB -+#ifdef ATF_DONTPUB - req.arp_flags |= ATF_DONTPUB; - #else - ENOSUPP("arp", "ATF_DONTPUB"); -@@ -157,7 +159,7 @@ - continue; - } - if (!strcmp(*args, "auto")) { --#ifdef HAVE_ATF_MAGIC -+#ifdef ATF_MAGIC - req.arp_flags |= ATF_MAGIC; - #else - ENOSUPP("arp", "ATF_MAGIC"); -@@ -177,11 +179,11 @@ - usage(); - if (strcmp(*args, "255.255.255.255") != 0) { - strcpy(host, *args); -- if (ap->input(0, host, &sa) < 0) { -+ if (ap->input(0, host, sa) < 0) { - ap->herror(host); - return (-1); - } -- memcpy((char *) &req.arp_netmask, (char *) &sa, -+ memcpy((char *) &req.arp_netmask, (char *) sa, - sizeof(struct sockaddr)); - req.arp_flags |= ATF_NETMASK; - } -@@ -190,35 +192,41 @@ - } - usage(); - } -+ -+ // if neighter priv nor pub is given, work on both - if (flags == 0) - flags = 3; - - strcpy(req.arp_dev, device); - -- err = -1; -+ /* unfortuatelly the kernel interface does not allow us to -+ delete private entries anlone, so we need this hack -+ to avoid "not found" errors if we try both. */ -+ deleted = 0; - - /* Call the kernel. */ - if (flags & 2) { - if (opt_v) -- fprintf(stderr, "arp: SIOCDARP(nopub)\n"); -- if ((err = ioctl(sockfd, SIOCDARP, &req) < 0)) { -- if (errno == ENXIO) { -+ fprintf(stderr, "arp: SIOCDARP(dontpub)\n"); -+ if (ioctl(sockfd, SIOCDARP, &req) < 0) { -+ if ((errno == ENXIO) || (errno == ENOENT)) { - if (flags & 1) -- goto nopub; -+ goto dontpub; - printf(_("No ARP entry for %s\n"), host); - return (-1); - } -- perror("SIOCDARP(priv)"); -+ perror("SIOCDARP(dontpub)"); - return (-1); -- } -+ } else -+ deleted = 1; - } -- if ((flags & 1) && (err)) { -- nopub: -+ if (!deleted && (flags & 1)) { -+ dontpub: - req.arp_flags |= ATF_PUBL; - if (opt_v) - fprintf(stderr, "arp: SIOCDARP(pub)\n"); - if (ioctl(sockfd, SIOCDARP, &req) < 0) { -- if (errno == ENXIO) { -+ if ((errno == ENXIO) || (errno == ENOENT)) { - printf(_("No ARP entry for %s\n"), host); - return (-1); - } -@@ -260,7 +268,8 @@ - { - char host[128]; - struct arpreq req; -- struct sockaddr sa; -+ struct sockaddr_storage ss; -+ struct sockaddr *sa; - int flags; - - memset((char *) &req, 0, sizeof(req)); -@@ -271,12 +280,13 @@ - return (-1); - } - safe_strncpy(host, *args++, (sizeof host)); -- if (ap->input(0, host, &sa) < 0) { -+ sa = (struct sockaddr *)&ss; -+ if (ap->input(0, host, sa) < 0) { - ap->herror(host); - return (-1); - } - /* If a host has more than one address, use the correct one! */ -- memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr)); -+ memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr)); - - /* Fetch the hardware address. */ - if (*args == NULL) { -@@ -317,7 +327,7 @@ - continue; - } - if (!strcmp(*args, "dontpub")) { --#ifdef HAVE_ATF_DONTPUB -+#ifdef ATF_DONTPUB - flags |= ATF_DONTPUB; - #else - ENOSUPP("arp", "ATF_DONTPUB"); -@@ -326,7 +336,7 @@ - continue; - } - if (!strcmp(*args, "auto")) { --#ifdef HAVE_ATF_MAGIC -+#ifdef ATF_MAGIC - flags |= ATF_MAGIC; - #else - ENOSUPP("arp", "ATF_MAGIC"); -@@ -346,11 +356,11 @@ - usage(); - if (strcmp(*args, "255.255.255.255") != 0) { - strcpy(host, *args); -- if (ap->input(0, host, &sa) < 0) { -+ if (ap->input(0, host, sa) < 0) { - ap->herror(host); - return (-1); - } -- memcpy((char *) &req.arp_netmask, (char *) &sa, -+ memcpy((char *) &req.arp_netmask, (char *) sa, - sizeof(struct sockaddr)); - flags |= ATF_NETMASK; - } -@@ -445,11 +455,11 @@ - strcat(flags, "M"); - if (arp_flags & ATF_PUBL) - strcat(flags, "P"); --#ifdef HAVE_ATF_MAGIC -+#ifdef ATF_MAGIC - if (arp_flags & ATF_MAGIC) - strcat(flags, "A"); - #endif --#ifdef HAVE_ATF_DONTPUB -+#ifdef ATF_DONTPUB - if (arp_flags & ATF_DONTPUB) - strcat(flags, "!"); - #endif -@@ -463,7 +473,7 @@ - - if (!(arp_flags & ATF_COM)) { - if (arp_flags & ATF_PUBL) -- printf("%-8.8s%-20.20s", "*", "*"); -+ printf("%-8.8s%-20.20s", "*", _("")); - else - printf("%-8.8s%-20.20s", "", _("(incomplete)")); - } else { -@@ -486,7 +496,7 @@ - - if (!(arp_flags & ATF_COM)) { - if (arp_flags & ATF_PUBL) -- printf("* "); -+ printf(" "); - else - printf(_(" ")); - } else { -@@ -499,12 +509,12 @@ - if (arp_flags & ATF_PERM) - printf("PERM "); - if (arp_flags & ATF_PUBL) -- printf("PUP "); --#ifdef HAVE_ATF_MAGIC -+ printf("PUB "); -+#ifdef ATF_MAGIC - if (arp_flags & ATF_MAGIC) - printf("AUTO "); - #endif --#ifdef HAVE_ATF_DONTPUB -+#ifdef ATF_DONTPUB - if (arp_flags & ATF_DONTPUB) - printf("DONTPUB "); - #endif -@@ -519,7 +529,8 @@ - static int arp_show(char *name) - { - char host[100]; -- struct sockaddr sa; -+ struct sockaddr_storage ss; -+ struct sockaddr *sa; - char ip[100]; - char hwa[100]; - char mask[100]; -@@ -532,14 +543,15 @@ - - host[0] = '\0'; - -+ sa = (struct sockaddr *)&ss; - if (name != NULL) { - /* Resolve the host name. */ - safe_strncpy(host, name, (sizeof host)); -- if (ap->input(0, host, &sa) < 0) { -+ if (ap->input(0, host, sa) < 0) { - ap->herror(host); - return (-1); - } -- safe_strncpy(host, ap->sprint(&sa, 1), sizeof(host)); -+ safe_strncpy(host, ap->sprint(sa, 1), sizeof(host)); - } - /* Open the PROCps kernel table. */ - if ((fp = fopen(_PATH_PROCNET_ARP, "r")) == NULL) { -@@ -575,10 +587,10 @@ - if (opt_n) - hostname = "?"; - else { -- if (ap->input(0, ip, &sa) < 0) -+ if (ap->input(0, ip, sa) < 0) - hostname = ip; - else -- hostname = ap->sprint(&sa, opt_n | 0x8000); -+ hostname = ap->sprint(sa, opt_n | 0x8000); - if (strcmp(hostname, ip) == 0) - hostname = "?"; - } -@@ -612,11 +624,10 @@ - static void usage(void) - { - fprintf(stderr, _("Usage:\n arp [-vn] [] [-i ] [-a] [] <-Display ARP cache\n")); -- fprintf(stderr, _(" arp [-v] [-i ] -d [pub][nopub] <-Delete ARP entry\n")); -- fprintf(stderr, _(" arp [-vnD] [] [-i ] -f [] <-Add entry from file\n")); -- fprintf(stderr, _(" arp [-v] [] [-i ] -s [temp][nopub] <-Add entry\n")); -- fprintf(stderr, _(" arp [-v] [] [-i ] -s [netmask ] pub <-''-\n")); -- fprintf(stderr, _(" arp [-v] [] [-i ] -Ds [netmask ] pub <-''-\n\n")); -+ fprintf(stderr, _(" arp [-v] [-i ] -d [pub] <-Delete ARP entry\n")); -+ fprintf(stderr, _(" arp [-vnD] [] [-i ] -f [] <-Add entry from file\n")); -+ fprintf(stderr, _(" arp [-v] [] [-i ] -s [temp] <-Add entry\n")); -+ fprintf(stderr, _(" arp [-v] [] [-i ] -Ds [netmask ] pub <-''-\n\n")); - - fprintf(stderr, _(" -a display (all) hosts in alternative (BSD) style\n")); - fprintf(stderr, _(" -s, --set set a new ARP entry\n")); ---- net-tools-1.60.orig/config.in -+++ net-tools-1.60/config.in -@@ -49,16 +49,16 @@ - * - bool 'UNIX protocol family' HAVE_AFUNIX y - bool 'INET (TCP/IP) protocol family' HAVE_AFINET y --bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n -+bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y - bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y - bool 'Appletalk DDP protocol family' HAVE_AFATALK y - bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y - bool 'NET/ROM (packet radio) protocol family' HAVE_AFNETROM y --bool 'Rose (packet radio) protocol family' HAVE_AFROSE n -+bool 'Rose (packet radio) protocol family' HAVE_AFROSE y - bool 'X.25 (CCITT) protocol family' HAVE_AFX25 y --bool 'Econet protocol family' HAVE_AFECONET n -+bool 'Econet protocol family' HAVE_AFECONET y - bool 'DECnet protocol family' HAVE_AFDECnet n --bool 'Ash protocol family' HAVE_AFASH n -+bool 'Ash protocol family' HAVE_AFASH y - * - * - * Device Hardware types. -@@ -71,21 +71,23 @@ - bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP y - bool 'Token ring (generic) support' HAVE_HWTR y - bool 'AX25 (packet radio) support' HAVE_HWAX25 y --bool 'Rose (packet radio) support' HAVE_HWROSE n -+bool 'Rose (packet radio) support' HAVE_HWROSE y - bool 'NET/ROM (packet radio) support' HAVE_HWNETROM y - bool 'X.25 (generic) support' HAVE_HWX25 y - bool 'DLCI/FRAD (frame relay) support' HAVE_HWFR y --bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT n --bool 'FDDI (generic) support' HAVE_HWFDDI n --bool 'HIPPI (generic) support' HAVE_HWHIPPI n --bool 'Ash hardware support' HAVE_HWASH n --bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB n -+bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT y -+bool 'FDDI (generic) support' HAVE_HWFDDI y -+bool 'HIPPI (generic) support' HAVE_HWHIPPI y -+bool 'Ash hardware support' HAVE_HWASH y -+bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB y - bool 'IrDA support' HAVE_HWIRDA y --bool 'Econet hardware support' HAVE_HWEC n -+bool 'Econet hardware support' HAVE_HWEC y -+bool 'Generic EUI-64 hardware support' HAVE_HWEUI64 y -+ - * - * - * Other Features. - * --bool 'IP Masquerading support' HAVE_FW_MASQUERADE n --bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS n --bool 'Build mii-tool' HAVE_MII n -+bool 'IP Masquerading support' HAVE_FW_MASQUERADE y -+bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y -+bool 'Build mii-tool' HAVE_MII y ---- net-tools-1.60.orig/hostname.c -+++ net-tools-1.60/hostname.c -@@ -9,20 +9,19 @@ - * dnsdmoainname - * nisdomainname {name|-F file} - * -- * Version: hostname 1.96 (1996-02-18) -+ * Version: hostname 1.101 (2003-10-11) - * - * Author: Peter Tobias - * - * Changes: -- * {1.90} Peter Tobias : Added -a and -i options. -- * {1.91} Bernd Eckenfels : -v,-V rewritten, long_opts -- * (major rewrite), usage. -- *960120 {1.95} Bernd Eckenfels : -y/nisdomainname - support for get/ -- * setdomainname added -- *960218 {1.96} Bernd Eckenfels : netinet/in.h added -- *980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n -- *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings -+ * {1.90} Peter Tobias : Added -a and -i options. -+ * {1.91} Bernd Eckenfels : -v,-V rewritten, long_opts (major rewrite), usage. -+ *19960120 {1.95} Bernd Eckenfels : -y/nisdomainname - support for get/setdomainname added -+ *19960218 {1.96} Bernd Eckenfels : netinet/in.h added -+ *19980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n -+ *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings - *20010404 {1.100} Arnaldo Carvalho de Melo: use setlocale -+ *20031011 {1.101} Maik Broemme: gcc 3.x fixes (default: break) - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General -@@ -31,7 +30,9 @@ - * your option) any later version. - */ - #include -+#include - #include -+#include - #include - #include - #include -@@ -78,6 +79,7 @@ - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ break; - } - exit(1); - } -@@ -97,7 +99,6 @@ - case EINVAL: - fprintf(stderr, _("%s: name too long\n"), program_name); - break; -- default: - } - exit(1); - }; -@@ -116,7 +117,6 @@ - case EINVAL: - fprintf(stderr, _("%s: name too long\n"), program_name); - break; -- default: - } - exit(1); - }; -@@ -173,7 +173,6 @@ - *p = '\0'; - printf("%s\n", hp->h_name); - break; -- default: - } - } - -@@ -326,11 +325,12 @@ - break; - case 'V': - version(); -+ break; // not reached - case '?': - case 'h': - default: - usage(); -- -+ break; // not reached - }; - - ---- net-tools-1.60.orig/ifconfig.c -+++ net-tools-1.60/ifconfig.c -@@ -3,7 +3,7 @@ - * that either displays or sets the characteristics of - * one or more of the system's networking interfaces. - * -- * Version: $Id: ifconfig.c,v 1.50 2001/04/13 18:25:18 pb Exp $ -+ * Version: $Id: ifconfig.c,v 1.57 2002/12/10 00:56:41 ecki Exp $ - * - * Author: Fred N. van Kempen, - * and others. Copyright 1993 MicroWalt Corporation -@@ -88,7 +88,6 @@ - char *Release = RELEASE, *Version = "ifconfig 1.42 (2001-04-13)"; - - int opt_a = 0; /* show all interfaces */ --int opt_i = 0; /* show the statistics */ - int opt_v = 0; /* debugging output flag */ - - int addr_family = 0; /* currently selected AF */ -@@ -105,7 +104,7 @@ - int res; - - if (ife_short) -- printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); -+ printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); - - if (!ifname) { - res = for_all_interfaces(do_if_print, &opt_a); -@@ -127,7 +126,7 @@ - - safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) { -- fprintf(stderr, _("%s: unknown interface: %s\n"), -+ fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), - ifname, strerror(errno)); - return (-1); - } -@@ -159,7 +158,7 @@ - - safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { -- fprintf(stderr, _("%s: unknown interface: %s\n"), -+ fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"), - ifname, strerror(errno)); - return -1; - } -@@ -172,9 +171,35 @@ - return (0); - } - -+/** test is a specified flag is set */ -+static int test_flag(char *ifname, short flags) -+{ -+ struct ifreq ifr; -+ int fd; -+ -+ if (strchr(ifname, ':')) { -+ /* This is a v4 alias interface. Downing it via a socket for -+ another AF may have bad consequences. */ -+ fd = get_socket_for_af(AF_INET); -+ if (fd < 0) { -+ fprintf(stderr, _("No support for INET on this system.\n")); -+ return -1; -+ } -+ } else -+ fd = skfd; -+ -+ safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ); -+ if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { -+ fprintf(stderr, _("%s: ERROR while testing interface flags: %s\n"), -+ ifname, strerror(errno)); -+ return -1; -+ } -+ return (ifr.ifr_flags & flags); -+} -+ - static void usage(void) - { -- fprintf(stderr, _("Usage:\n ifconfig [-a] [-i] [-v] [-s] [[]
]\n")); -+ fprintf(stderr, _("Usage:\n ifconfig [-a] [-v] [-s] [[]
]\n")); - #if HAVE_AFINET - fprintf(stderr, _(" [add
[/]]\n")); - fprintf(stderr, _(" [del
[/]]\n")); -@@ -208,7 +233,7 @@ - static void version(void) - { - fprintf(stderr, "%s\n%s\n", Release, Version); -- exit(0); -+ exit(E_USAGE); - } - - static int set_netmask(int skfd, struct ifreq *ifr, struct sockaddr *sa) -@@ -222,18 +247,19 @@ - strerror(errno)); - err = 1; - } -- return 0; -+ return err; - } - - int main(int argc, char **argv) - { - struct sockaddr sa; -+ struct sockaddr samask; - struct sockaddr_in sin; - char host[128]; - struct aftype *ap; - struct hwtype *hw; - struct ifreq ifr; -- int goterr = 0, didnetmask = 0; -+ int goterr = 0, didnetmask = 0, neednetmask=0; - char **spp; - int fd; - #if HAVE_AFINET6 -@@ -388,6 +414,8 @@ - } - if (!strcmp(*spp, "-promisc")) { - goterr |= clr_flag(ifr.ifr_name, IFF_PROMISC); -+ if (test_flag(ifr.ifr_name, IFF_PROMISC) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in promisc mode... maybe other application is running?\n"), ifr.ifr_name); - spp++; - continue; - } -@@ -398,6 +426,8 @@ - } - if (!strcmp(*spp, "-multicast")) { - goterr |= clr_flag(ifr.ifr_name, IFF_MULTICAST); -+ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in MULTICAST mode.\n"), ifr.ifr_name); - spp++; - continue; - } -@@ -408,6 +438,8 @@ - } - if (!strcmp(*spp, "-allmulti")) { - goterr |= clr_flag(ifr.ifr_name, IFF_ALLMULTI); -+ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in ALLMULTI mode.\n"), ifr.ifr_name); - spp++; - continue; - } -@@ -430,6 +462,8 @@ - if (!strcmp(*spp, "-dynamic")) { - goterr |= clr_flag(ifr.ifr_name, IFF_DYNAMIC); - spp++; -+ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in DYNAMIC mode.\n"), ifr.ifr_name); - continue; - } - #endif -@@ -486,6 +520,8 @@ - - if (!strcmp(*spp, "-broadcast")) { - goterr |= clr_flag(ifr.ifr_name, IFF_BROADCAST); -+ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in BROADCAST mode.\n"), ifr.ifr_name); - spp++; - continue; - } -@@ -493,7 +529,10 @@ - if (*++spp != NULL) { - safe_strncpy(host, *spp, (sizeof host)); - if (ap->input(0, host, &sa) < 0) { -- ap->herror(host); -+ if (ap->herror) -+ ap->herror(host); -+ else -+ fprintf(stderr, _("ifconfig: Error resolving '%s' for broadcast\n"), host); - goterr = 1; - spp++; - continue; -@@ -515,7 +554,10 @@ - usage(); - safe_strncpy(host, *spp, (sizeof host)); - if (ap->input(0, host, &sa) < 0) { -- ap->herror(host); -+ if (ap->herror) -+ ap->herror(host); -+ else -+ fprintf(stderr, _("ifconfig: Error resolving '%s' for dstaddr\n"), host); - goterr = 1; - spp++; - continue; -@@ -535,13 +577,16 @@ - usage(); - safe_strncpy(host, *spp, (sizeof host)); - if (ap->input(0, host, &sa) < 0) { -- ap->herror(host); -+ if (ap->herror) -+ ap->herror(host); -+ else -+ fprintf(stderr, _("ifconfig: Error resolving '%s' for netmask\n"), host); - goterr = 1; - spp++; - continue; - } - didnetmask++; -- goterr = set_netmask(ap->fd, &ifr, &sa); -+ goterr |= set_netmask(ap->fd, &ifr, &sa); - spp++; - continue; - } -@@ -613,6 +658,8 @@ - if (!strcmp(*spp, "-pointopoint")) { - goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT); - spp++; -+ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0) -+ fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name); - continue; - } - if (!strcmp(*spp, "pointopoint")) { -@@ -620,7 +667,10 @@ - spp++; - safe_strncpy(host, *spp, (sizeof host)); - if (ap->input(0, host, &sa)) { -- ap->herror(host); -+ if (ap->herror) -+ ap->herror(host); -+ else -+ fprintf(stderr, _("ifconfig: Error resolving '%s' for pointopoint\n"), host); - goterr = 1; - spp++; - continue; -@@ -661,8 +711,12 @@ - memcpy((char *) &ifr.ifr_hwaddr, (char *) &sa, - sizeof(struct sockaddr)); - if (ioctl(skfd, SIOCSIFHWADDR, &ifr) < 0) { -- fprintf(stderr, "SIOCSIFHWADDR: %s\n", -- strerror(errno)); -+ if (errno == EBUSY) -+ fprintf(stderr, "SIOCSIFHWADDR: %s - you may need to down the interface\n", -+ strerror(errno)); -+ else -+ fprintf(stderr, "SIOCSIFHWADDR: %s\n", -+ strerror(errno)); - goterr = 1; - } - spp++; -@@ -681,12 +735,15 @@ - usage(); - *cp = 0; - } else { -- prefix_len = 0; -+ prefix_len = 128; - } - safe_strncpy(host, *spp, (sizeof host)); - if (inet6_aftype.input(1, host, - (struct sockaddr *) &sa6) < 0) { -- inet6_aftype.herror(host); -+ if (inet6_aftype.herror) -+ inet6_aftype.herror(host); -+ else -+ fprintf(stderr, _("ifconfig: Error resolving '%s' for add\n"), host); - goterr = 1; - spp++; - continue; -@@ -771,7 +828,7 @@ - usage(); - *cp = 0; - } else { -- prefix_len = 0; -+ prefix_len = 128; - } - safe_strncpy(host, *spp, (sizeof host)); - if (inet6_aftype.input(1, host, -@@ -800,6 +857,8 @@ - } - ifr6.ifr6_ifindex = ifr.ifr_ifindex; - ifr6.ifr6_prefixlen = prefix_len; -+ if (opt_v) -+ fprintf(stderr, "now deleting: ioctl(SIOCDIFADDR,{ifindex=%d,prefixlen=%ld})\n",ifr.ifr_ifindex,prefix_len); - if (ioctl(fd, SIOCDIFADDR, &ifr6) < 0) { - fprintf(stderr, "SIOCDIFADDR: %s\n", - strerror(errno)); -@@ -859,7 +918,7 @@ - usage(); - *cp = 0; - } else { -- prefix_len = 0; -+ prefix_len = 128; - } - safe_strncpy(host, *spp, (sizeof host)); - if (inet6_aftype.input(1, host, (struct sockaddr *) &sa6) < 0) { -@@ -903,7 +962,7 @@ - /* FIXME: sa is too small for INET6 addresses, inet6 should use that too, - broadcast is unexpected */ - if (ap->getmask) { -- switch (ap->getmask(host, &sa, NULL)) { -+ switch (ap->getmask(host, &samask, NULL)) { - case -1: - usage(); - break; -@@ -911,8 +970,8 @@ - if (didnetmask) - usage(); - -- goterr = set_netmask(skfd, &ifr, &sa); -- didnetmask++; -+ // remeber to set the netmask from samask later -+ neednetmask = 1; - break; - } - } -@@ -921,9 +980,11 @@ - exit(1); - } - if (ap->input(0, host, &sa) < 0) { -- ap->herror(host); -- fprintf(stderr, _("ifconfig: `--help' gives usage information.\n")); -- exit(1); -+ if (ap->herror) -+ ap->herror(host); -+ else -+ fprintf(stderr,_("ifconfig: error resolving '%s' to set address for af=%s\n"), host, ap->name); fprintf(stderr, -+ _("ifconfig: `--help' gives usage information.\n")); exit(1); - } - memcpy((char *) &ifr.ifr_addr, (char *) &sa, sizeof(struct sockaddr)); - { -@@ -980,6 +1041,14 @@ - spp++; - } - -+ if (neednetmask) { -+ goterr |= set_netmask(skfd, &ifr, &samask); -+ didnetmask++; -+ } -+ -+ if (opt_v && goterr) -+ fprintf(stderr, _("WARNING: at least one error occured. (%d)\n"), goterr); -+ - return (goterr); - } - ---- net-tools-1.60.orig/netstat.c -+++ net-tools-1.60/netstat.c -@@ -6,7 +6,7 @@ - * NET-3 Networking Distribution for the LINUX operating - * system. - * -- * Version: $Id: netstat.c,v 1.43 2001/04/15 14:41:17 pb Exp $ -+ * Version: $Id: netstat.c,v 1.55 2007/12/01 19:00:40 ecki Exp $ - * - * Authors: Fred Baumgarten, - * Fred N. van Kempen, -@@ -94,6 +94,7 @@ - #include "sockets.h" - #include "interface.h" - #include "util.h" -+#include "proc.h" - - #define PROGNAME_WIDTH 20 - -@@ -153,7 +154,7 @@ - FILE *procinfo; - - #define INFO_GUTS1(file,name,proc) \ -- procinfo = fopen((file), "r"); \ -+ procinfo = proc_fopen((file)); \ - if (procinfo == NULL) { \ - if (errno != ENOENT) { \ - perror((file)); \ -@@ -174,7 +175,7 @@ - #if HAVE_AFINET6 - #define INFO_GUTS2(file,proc) \ - lnr = 0; \ -- procinfo = fopen((file), "r"); \ -+ procinfo = proc_fopen((file)); \ - if (procinfo != NULL) { \ - do { \ - if (fgets(buffer, sizeof(buffer), procinfo)) \ -@@ -216,7 +217,7 @@ - - static struct prg_node { - struct prg_node *next; -- int inode; -+ unsigned long inode; - char name[PROGNAME_WIDTH]; - } *prg_hash[PRG_HASH_SIZE]; - -@@ -249,7 +250,7 @@ - /* NOT working as of glibc-2.0.7: */ - #undef DIRENT_HAVE_D_TYPE_WORKS - --static void prg_cache_add(int inode, char *name) -+static void prg_cache_add(unsigned long inode, char *name) - { - unsigned hi = PRG_HASHIT(inode); - struct prg_node **pnp,*pn; -@@ -272,7 +273,7 @@ - strcpy(pn->name,name); - } - --static const char *prg_cache_get(int inode) -+static const char *prg_cache_get(unsigned long inode) - { - unsigned hi=PRG_HASHIT(inode); - struct prg_node *pn; -@@ -295,16 +296,18 @@ - prg_cache_loaded=0; - } - --static void extract_type_1_socket_inode(const char lname[], long * inode_p) { -+static int extract_type_1_socket_inode(const char lname[], unsigned long * inode_p) { - - /* If lname is of the form "socket:[12345]", extract the "12345" - as *inode_p. Otherwise, return -1 as *inode_p. - */ - -- if (strlen(lname) < PRG_SOCKET_PFXl+3) *inode_p = -1; -- else if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) *inode_p = -1; -- else if (lname[strlen(lname)-1] != ']') *inode_p = -1; -- else { -+ if (strlen(lname) < PRG_SOCKET_PFXl+3) return(-1); -+ -+ if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) return(-1); -+ if (lname[strlen(lname)-1] != ']') return(-1); -+ -+ { - char inode_str[strlen(lname + 1)]; /* e.g. "12345" */ - const int inode_str_len = strlen(lname) - PRG_SOCKET_PFXl - 1; - char *serr; -@@ -313,37 +316,41 @@ - inode_str[inode_str_len] = '\0'; - *inode_p = strtol(inode_str,&serr,0); - if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) -- *inode_p = -1; -+ return(-1); - } -+ return(0); - } - - - --static void extract_type_2_socket_inode(const char lname[], long * inode_p) { -+static int extract_type_2_socket_inode(const char lname[], unsigned long * inode_p) { - - /* If lname is of the form "[0000]:12345", extract the "12345" - as *inode_p. Otherwise, return -1 as *inode_p. - */ - -- if (strlen(lname) < PRG_SOCKET_PFX2l+1) *inode_p = -1; -- else if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) *inode_p = -1; -- else { -+ if (strlen(lname) < PRG_SOCKET_PFX2l+1) return(-1); -+ if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) return(-1); -+ -+ { - char *serr; - - *inode_p=strtol(lname + PRG_SOCKET_PFX2l,&serr,0); - if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) -- *inode_p = -1; -+ return(-1); - } -+ return(0); - } - - - -+ - static void prg_cache_load(void) - { - char line[LINE_MAX],eacces=0; - int procfdlen,fd,cmdllen,lnamelen; - char lname[30],cmdlbuf[512],finbuf[PROGNAME_WIDTH]; -- long inode; -+ unsigned long inode; - const char *cs,*cmdlp; - DIR *dirproc=NULL,*dirfd=NULL; - struct dirent *direproc,*direfd; -@@ -386,11 +393,9 @@ - lnamelen=readlink(line,lname,sizeof(lname)-1); - lname[lnamelen] = '\0'; /*make it a null-terminated string*/ - -- extract_type_1_socket_inode(lname, &inode); -- -- if (inode < 0) extract_type_2_socket_inode(lname, &inode); -- -- if (inode < 0) continue; -+ if (extract_type_1_socket_inode(lname, &inode) < 0) -+ if (extract_type_2_socket_inode(lname, &inode) < 0) -+ continue; - - if (!cmdlp) { - if (procfdlen - PATH_FD_SUFFl + PATH_CMDLINEl >= -@@ -450,7 +455,7 @@ - char buffer[256], dev[16]; - int st, vs, vr, sendq, recvq, ret; - -- f = fopen(_PATH_PROCNET_NR, "r"); -+ f = proc_fopen(_PATH_PROCNET_NR); - if (f == NULL) { - if (errno != ENOENT) { - perror(_PATH_PROCNET_NR); -@@ -527,15 +532,15 @@ - - if (flag_exp > 1) { - if (!(flag_not & FLAG_NUM_USER) && ((pw = getpwuid(uid)) != NULL)) -- printf("%-10s ", pw->pw_name); -+ printf(" %-10s ", pw->pw_name); - else -- printf("%-10d ", uid); -- printf("%-10ld ",inode); -+ printf(" %-10d ", uid); -+ printf("%-10lu ",inode); - } - if (flag_prg) -- printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode)); -+ printf(" %-16s",prg_cache_get(inode)); - if (flag_opt) -- printf("%s", timers); -+ printf(" %s", timers); - putchar('\n'); - } - -@@ -646,7 +651,7 @@ - #if HAVE_AFX25 - static int x25_info(void) - { -- FILE *f=fopen(_PATH_PROCNET_X25, "r"); -+ FILE *f=proc_fopen(_PATH_PROCNET_X25); - char buffer[256],dev[16]; - int st,vs,vr,sendq,recvq,lci; - static char *x25_state[5]= -@@ -657,7 +662,7 @@ - "ESTABLISHED", - "RECOVERY" - }; -- if(!(f=fopen(_PATH_PROCNET_X25, "r"))) -+ if(!(f=proc_fopen(_PATH_PROCNET_X25))) - { - if (errno != ENOENT) { - perror(_PATH_PROCNET_X25); -@@ -705,6 +710,7 @@ - unsigned long rxq, txq, time_len, retr, inode; - int num, local_port, rem_port, d, state, uid, timer_run, timeout; - char rem_addr[128], local_addr[128], timers[64], buffer[1024], more[512]; -+ char *protname; - struct aftype *ap; - #if HAVE_AFINET6 - struct sockaddr_in6 localaddr, remaddr; -@@ -719,12 +725,13 @@ - return; - - num = sscanf(line, -- "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n", -+ "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n", - &d, local_addr, &local_port, rem_addr, &rem_port, &state, - &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more); - - if (strlen(local_addr) > 8) { - #if HAVE_AFINET6 -+ protname = "tcp6"; - /* Demangle what the kernel gives us */ - sscanf(local_addr, "%08X%08X%08X%08X", - &in6.s6_addr32[0], &in6.s6_addr32[1], -@@ -740,6 +747,7 @@ - remaddr.sin6_family = AF_INET6; - #endif - } else { -+ protname = "tcp"; - sscanf(local_addr, "%X", - &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr); - sscanf(rem_addr, "%X", -@@ -813,8 +821,8 @@ - timer_run, (double) time_len / HZ, retr, timeout); - break; - } -- printf("tcp %6ld %6ld %-23s %-23s %-12s", -- rxq, txq, local_addr, rem_addr, _(tcp_state[state])); -+ printf("%-4s %6ld %6ld %-*s %-*s %-11s", -+ protname, rxq, txq, netmax(23,strlen(local_addr)), local_addr, netmax(23,strlen(rem_addr)), rem_addr, _(tcp_state[state])); - - finish_this_one(uid,inode,timers); - } -@@ -831,6 +839,7 @@ - char buffer[8192], local_addr[64], rem_addr[64]; - char *udp_state, timers[64], more[512]; - int num, local_port, rem_port, d, state, timer_run, uid, timeout; -+ char *protname; - #if HAVE_AFINET6 - struct sockaddr_in6 localaddr, remaddr; - char addr6[INET6_ADDRSTRLEN]; -@@ -847,13 +856,14 @@ - - more[0] = '\0'; - num = sscanf(line, -- "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n", -+ "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n", - &d, local_addr, &local_port, - rem_addr, &rem_port, &state, - &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more); - - if (strlen(local_addr) > 8) { - #if HAVE_AFINET6 -+ protname="udp6"; - sscanf(local_addr, "%08X%08X%08X%08X", - &in6.s6_addr32[0], &in6.s6_addr32[1], - &in6.s6_addr32[2], &in6.s6_addr32[3]); -@@ -868,6 +878,7 @@ - remaddr.sin6_family = AF_INET6; - #endif - } else { -+ protname="udp"; - sscanf(local_addr, "%X", - &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr); - sscanf(rem_addr, "%X", -@@ -953,8 +964,8 @@ - retr, timeout); - break; - } -- printf("udp %6ld %6ld %-23s %-23s %-12s", -- rxq, txq, local_addr, rem_addr, udp_state); -+ printf("%-4s %6ld %6ld %-23s %-23s %-11s", -+ protname, rxq, txq, local_addr, rem_addr, udp_state); - - finish_this_one(uid,inode,timers); - } -@@ -971,6 +982,7 @@ - char buffer[8192], local_addr[64], rem_addr[64]; - char timers[64], more[512]; - int num, local_port, rem_port, d, state, timer_run, uid, timeout; -+ char *protname; - #if HAVE_AFINET6 - struct sockaddr_in6 localaddr, remaddr; - char addr6[INET6_ADDRSTRLEN]; -@@ -987,12 +999,13 @@ - - more[0] = '\0'; - num = sscanf(line, -- "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n", -+ "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n", - &d, local_addr, &local_port, rem_addr, &rem_port, &state, - &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more); - - if (strlen(local_addr) > 8) { - #if HAVE_AFINET6 -+ protname = "raw6"; - sscanf(local_addr, "%08X%08X%08X%08X", - &in6.s6_addr32[0], &in6.s6_addr32[1], - &in6.s6_addr32[2], &in6.s6_addr32[3]); -@@ -1007,6 +1020,7 @@ - remaddr.sin6_family = AF_INET6; - #endif - } else { -+ protname = "raw"; - sscanf(local_addr, "%X", - &((struct sockaddr_in *) &localaddr)->sin_addr.s_addr); - sscanf(rem_addr, "%X", -@@ -1074,8 +1088,8 @@ - retr, timeout); - break; - } -- printf("raw %6ld %6ld %-23s %-23s %-12d", -- rxq, txq, local_addr, rem_addr, state); -+ printf("%-4s %6ld %6ld %-23s %-23s %-11d", -+ protname, rxq, txq, local_addr, rem_addr, state); - - finish_this_one(uid,inode,timers); - } -@@ -1099,9 +1113,9 @@ - static int has = 0; - char path[MAXPATHLEN], ss_flags[32]; - char *ss_proto, *ss_state, *ss_type; -- int num, state, type, inode; -+ int num, state, type; - void *d; -- unsigned long refcnt, proto, flags; -+ unsigned long refcnt, proto, flags, inode; - - if (nr == 0) { - if (strstr(line, "Inode")) -@@ -1109,14 +1123,14 @@ - return; - } - path[0] = '\0'; -- num = sscanf(line, "%p: %lX %lX %lX %X %X %d %s", -+ num = sscanf(line, "%p: %lX %lX %lX %X %X %lu %s", - &d, &refcnt, &proto, &flags, &type, &state, &inode, path); - if (num < 6) { - fprintf(stderr, _("warning, got bogus unix line.\n")); - return; - } - if (!(has & HAS_INODE)) -- snprintf(path,sizeof(path),"%d",inode); -+ snprintf(path,sizeof(path),"%lu",inode); - - if (!flag_all) { - if ((state == SS_UNCONNECTED) && (flags & SO_ACCEPTCON)) { -@@ -1208,9 +1222,9 @@ - printf("%-5s %-6ld %-11s %-10s %-13s ", - ss_proto, refcnt, ss_flags, ss_type, ss_state); - if (has & HAS_INODE) -- printf("%-6d ",inode); -+ printf("%-8lu ",inode); - else -- printf("- "); -+ printf("- "); - if (flag_prg) - printf("%-" PROGNAME_WIDTHs "s",(has & HAS_INODE?prg_cache_get(inode):"-")); - puts(path); -@@ -1229,7 +1243,7 @@ - printf(_("(w/o servers)")); - } - -- printf(_("\nProto RefCnt Flags Type State I-Node")); -+ printf(_("\nProto RefCnt Flags Type State I-Node ")); - print_progname_banner(); - printf(_(" Path\n")); /* xxx */ - -@@ -1256,7 +1270,7 @@ - N_("ESTABLISHED"), - N_("RECOVERY") - }; -- if (!(f = fopen(_PATH_PROCNET_AX25, "r"))) { -+ if (!(f = proc_fopen(_PATH_PROCNET_AX25))) { - if (errno != ENOENT) { - perror(_PATH_PROCNET_AX25); - return (-1); -@@ -1350,18 +1364,37 @@ - char sad[50], dad[50]; - struct sockaddr sa; - unsigned sport = 0, dport = 0; -- -- if (!(f = fopen(_PATH_PROCNET_IPX, "r"))) { -- if (errno != ENOENT) { -- perror(_PATH_PROCNET_IPX); -- return (-1); -- } -- if (flag_arg || flag_ver) -- ESYSNOT("netstat", "AF IPX"); -- if (flag_arg) -- return (1); -- else -- return (0); -+ struct stat s; -+ -+ f = proc_fopen(_PATH_PROCNET_IPX_SOCKET1); -+ if (!f) { -+ if (errno != ENOENT) { -+ perror(_PATH_PROCNET_IPX_SOCKET1); -+ return (-1); -+ } -+ f = proc_fopen(_PATH_PROCNET_IPX_SOCKET2); -+ -+ /* We need to check for directory */ -+ if (f) { -+ fstat(fileno(f), &s); -+ if (!S_ISREG(s.st_mode)) { -+ fclose(f); -+ f=NULL; -+ } -+ } -+ -+ if (!f) { -+ if (errno != ENOENT) { -+ perror(_PATH_PROCNET_IPX_SOCKET2); -+ return (-1); -+ } -+ if (flag_arg || flag_ver) -+ ESYSNOT("netstat", "AF IPX"); -+ if (flag_arg) -+ return (1); -+ else -+ return (0); -+ } - } - printf(_("Active IPX sockets\nProto Recv-Q Send-Q Local Address Foreign Address State")); /* xxx */ - if (flag_exp > 1) -@@ -1381,7 +1414,7 @@ - sscanf(st, "%X", &sport); /* net byt order */ - sport = ntohs(sport); - } else { -- EINTERN("netstat.c", _PATH_PROCNET_IPX " sport format error"); -+ EINTERN("netstat.c", "ipx socket format error in source port"); - return (-1); - } - nc = 0; -@@ -1391,7 +1424,7 @@ - sscanf(st, "%X", &dport); /* net byt order */ - dport = ntohs(dport); - } else { -- EINTERN("netstat.c", _PATH_PROCNET_IPX " dport format error"); -+ EINTERN("netstat.c", "ipx soket format error in destination port"); - return (-1); - } - } else -@@ -1449,7 +1482,7 @@ - } - if (flag_exp < 2) { - ife_short = 1; -- printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); -+ printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); - } - - if (for_all_interfaces(do_if_print, &flag_all) < 0) { -@@ -1457,7 +1490,7 @@ - exit(1); - } - if (flag_cnt) -- free_interface_list(); -+ if_cache_free(); - else { - close(skfd); - skfd = -1; -@@ -1503,7 +1536,7 @@ - fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); - - fprintf(stderr, _(" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n")); -- fprintf(stderr, _(" =Use '-A ' or '--'; default: %s\n"), DFLT_AF); -+ fprintf(stderr, _(" =Use '-6|-4' or '-A ' or '--'; default: %s\n"), DFLT_AF); - fprintf(stderr, _(" List of possible address families (which support routing):\n")); - print_aflist(1); /* 1 = routeable */ - exit(E_USAGE); -@@ -1514,7 +1547,7 @@ - (int argc, char *argv[]) { - int i; - int lop; -- struct option longopts[] = -+ static struct option longopts[] = - { - AFTRANS_OPTS, - {"version", 0, 0, 'V'}, -@@ -1556,7 +1589,7 @@ - getroute_init(); /* Set up AF routing support */ - - afname[0] = '\0'; -- while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl", longopts, &lop)) != EOF) -+ while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl64", longopts, &lop)) != EOF) - switch (i) { - case -1: - break; -@@ -1624,6 +1657,14 @@ - case 'o': - flag_opt++; - break; -+ case '6': -+ if (aftrans_opt("inet6")) -+ exit(1); -+ break; -+ case '4': -+ if (aftrans_opt("inet")) -+ exit(1); -+ break; - case 'V': - version(); - /*NOTREACHED */ -@@ -1741,10 +1782,11 @@ - } - printf(_("\nProto Recv-Q Send-Q Local Address Foreign Address State ")); /* xxx */ - if (flag_exp > 1) -- printf(_(" User Inode ")); -- print_progname_banner(); -+ printf(_(" User Inode ")); -+ if (flag_prg) -+ printf(_(" PID/Program name")); - if (flag_opt) -- printf(_(" Timer")); /* xxx */ -+ printf(_(" Timer")); - printf("\n"); - #else - if (flag_arg) { -@@ -1845,6 +1887,7 @@ - } - #endif - } -+ - if (!flag_cnt || i) - break; - sleep(1); ---- net-tools-1.60.orig/route.c -+++ net-tools-1.60/route.c -@@ -2,7 +2,7 @@ - * route This file contains an implementation of the command - * that manages the IP routing table in the kernel. - * -- * Version: $Id: route.c,v 1.9 2001/04/15 14:41:17 pb Exp $ -+ * Version: $Id: route.c,v 1.10 2002/07/30 05:24:20 ecki Exp $ - * - * Maintainer: Bernd 'eckes' Eckenfels, - * -@@ -142,7 +142,7 @@ - } - - /* Fetch the command-line arguments. */ -- while ((i = getopt_long(argc, argv, "A:eCFhnNVv?", longopts, &lop)) != EOF) -+ while ((i = getopt_long(argc, argv, "A:eCFhnN64Vv?", longopts, &lop)) != EOF) - switch (i) { - case -1: - break; -@@ -176,6 +176,14 @@ - if ((i = aftrans_opt(optarg))) - exit(i); - break; -+ case '6': -+ if ((i = aftrans_opt("inet6"))) -+ exit(i); -+ break; -+ case '4': -+ if ((i = aftrans_opt("inet"))) -+ exit(i); -+ break; - case 'V': - version(); - case 'h': ---- net-tools-1.60.orig/statistics.c -+++ net-tools-1.60/statistics.c -@@ -1,6 +1,6 @@ - /* - * Copyright 1997,1999,2000 Andi Kleen. Subject to the GPL. -- * $Id: statistics.c,v 1.14 2001/02/02 18:01:23 pb Exp $ -+ * $Id: statistics.c,v 1.20 2007/12/01 18:44:56 ecki Exp $ - * 19980630 - i18n - Arnaldo Carvalho de Melo - * 19981113 - i18n fixes - Arnaldo Carvalho de Melo - * 19990101 - added net/netstat, -t, -u, -w supprt - Bernd Eckenfels -@@ -11,6 +11,7 @@ - #include - #include "config.h" - #include "intl.h" -+#include "proc.h" - - /* #define WARN 1 */ - -@@ -172,19 +173,59 @@ - { "DelayedACKLost", N_("Quick ack mode was activated %u times"), opt_number }, - { "ListenOverflows", N_("%u times the listen queue of a socket overflowed"), - opt_number }, -- { "ListenDrops", N_("%u SYNs to LISTEN sockets ignored"), opt_number }, -+ { "ListenDrops", N_("%u SYNs to LISTEN sockets dropped"), opt_number }, - { "TCPPrequeued", N_("%u packets directly queued to recvmsg prequeue."), - opt_number }, -- { "TCPDirectCopyFromBacklog", N_("%u packets directly received" -- " from backlog"), opt_number }, -- { "TCPDirectCopyFromPrequeue", N_("%u packets directly received" -- " from prequeue"), opt_number }, -+ { "TCPDirectCopyFromBacklog", N_("%u bytes directly in process context from backlog"), opt_number }, -+ { "TCPDirectCopyFromPrequeue", N_("%u bytes directly received in process context from prequeue"), -+ opt_number }, - { "TCPPrequeueDropped", N_("%u packets dropped from prequeue"), opt_number }, -- { "TCPHPHits", N_("%u packets header predicted"), number }, -+ { "TCPHPHits", N_("%u packet headers predicted"), number }, - { "TCPHPHitsToUser", N_("%u packets header predicted and " - "directly queued to user"), opt_number }, - { "SockMallocOOM", N_("Ran %u times out of system memory during " - "packet sending"), opt_number }, -+ { "TCPPureAcks", N_("%u acknowledgments not containing data payload received"), opt_number }, -+ { "TCPHPAcks", N_("%u predicted acknowledgments"), opt_number }, -+ { "TCPRenoRecovery", N_("%u times recovered from packet loss due to fast retransmit"), opt_number }, -+ { "TCPSackRecovery", N_("%u times recovered from packet loss by selective acknowledgements"), opt_number }, -+ { "TCPSACKReneging", N_("%u bad SACK blocks received"), opt_number }, -+ { "TCPFACKReorder", N_("Detected reordering %u times using FACK"), opt_number }, -+ { "TCPSACKReorder", N_("Detected reordering %u times using SACK"), opt_number }, -+ { "TCPTSReorder", N_("Detected reordering %u times using time stamp"), opt_number }, -+ { "TCPRenoReorder", N_("Detected reordering %u times using reno fast retransmit"), opt_number }, -+ { "TCPFullUndo", N_("%u congestion windows fully recovered without slow start"), opt_number }, -+ { "TCPPartialUndo", N_("%u congestion windows partially recovered using Hoe heuristic"), opt_number }, -+ { "TCPDSackUndo", N_("%u congestion window recovered without slow start using DSACK"), opt_number }, -+ { "TCPLossUndo", N_("%u congestion windows recovered without slow start after partial ack"), opt_number }, -+ { "TCPLostRetransmits", N_("%u retransmits lost"), opt_number }, -+ { "TCPRenoFailures", N_("%u timeouts after reno fast retransmit"), opt_number }, -+ { "TCPSackFailures", N_("%u timeouts after SACK recovery"), opt_number }, -+ { "TCPLossFailures", N_("%u timeouts in loss state"), opt_number }, -+ { "TCPFastRetrans", N_("%u fast retransmits"), opt_number }, -+ { "TCPForwardRetrans", N_("%u forward retransmits"), opt_number }, -+ { "TCPSlowStartRetrans", N_("%u retransmits in slow start"), opt_number }, -+ { "TCPTimeouts", N_("%u other TCP timeouts"), opt_number }, -+ { "TCPRenoRecoveryFailed", N_("%u reno fast retransmits failed"), opt_number }, -+ { "TCPSackRecoveryFail", N_("%u SACK retransmits failed"), opt_number }, -+ { "TCPSchedulerFailed", N_("%u times receiver scheduled too late for direct processing"), opt_number }, -+ { "TCPRcvCollapsed", N_("%u packets collapsed in receive queue due to low socket buffer"), opt_number }, -+ { "TCPDSACKOldSent", N_("%u DSACKs sent for old packets"), opt_number }, -+ { "TCPDSACKOfoSent", N_("%u DSACKs sent for out of order packets"), opt_number }, -+ { "TCPDSACKRecv", N_("%u DSACKs received"), opt_number }, -+ { "TCPDSACKOfoRecv", N_("%u DSACKs for out of order packets received"), opt_number }, -+ { "TCPAbortOnSyn", N_("%u connections reset due to unexpected SYN"), opt_number }, -+ { "TCPAbortOnData", N_("%u connections reset due to unexpected data"), opt_number }, -+ { "TCPAbortOnClose", N_("%u connections reset due to early user close"), opt_number }, -+ { "TCPAbortOnMemory", N_("%u connections aborted due to memory pressure"), opt_number }, -+ { "TCPAbortOnTimeout", N_("%u connections aborted due to timeout"), opt_number }, -+ { "TCPAbortOnLinger", N_("%u connections aborted after user close in linger timeout"), opt_number }, -+ { "TCPAbortFailed", N_("%u times unabled to send RST due to no memory"), opt_number }, -+ { "TCPMemoryPressures", N_("TCP ran low on memory %u times"), opt_number }, -+ { "TCPLoss", N_("%u TCP data loss events"), opt_number }, -+ { "TCPDSACKUndo", N_("%u congestion windows recovered without slow start by DSACK"), -+ opt_number }, -+ { "TCPRenoRecoveryFail", N_("%u classic Reno fast retransmits failed"), opt_number }, - }; - - struct tabtab { -@@ -222,7 +263,8 @@ - ent = bsearch(&key, tab->tab, tab->size / sizeof(struct entry), - sizeof(struct entry), cmpentries); - if (!ent) { /* try our best */ -- printf("%*s%s: %d\n", states[state].indent, "", title, val); -+ if (val) -+ printf("%*s%s: %d\n", states[state].indent, "", title, val); - return; - } - type = ent->type; -@@ -289,14 +331,17 @@ - return &dummytab; - } - --void process_fd(FILE *f) -+int process_fd(FILE *f) - { -- char buf1[1024], buf2[1024]; -+ char buf1[2048], buf2[2048]; - char *sp, *np, *p; - while (fgets(buf1, sizeof buf1, f)) { - int endflag; - struct tabtab *tab; - -+ if (buf1[0] == '\n') // skip empty first line in 2.6 kernels -+ continue; -+ - if (!fgets(buf2, sizeof buf2, f)) - break; - sp = strchr(buf1, ':'); -@@ -330,11 +375,10 @@ - sp = p + 1; - } - } -- return; -+ return 0; - - formaterr: -- perror(_("error parsing /proc/net/snmp")); -- return; -+ return -1; - } - - -@@ -344,22 +388,25 @@ - - f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp; - -- f = fopen("/proc/net/snmp", "r"); -+ f = proc_fopen("/proc/net/snmp"); - if (!f) { - perror(_("cannot open /proc/net/snmp")); - return; - } -- process_fd(f); -+ -+ if (process_fd(f) < 0) -+ fprintf(stderr, _("Problem while parsing /proc/net/snmp\n")); - - if (ferror(f)) - perror("/proc/net/snmp"); - - fclose(f); - -- f = fopen("/proc/net/netstat", "r"); -+ f = proc_fopen("/proc/net/netstat"); - - if (f) { -- process_fd(f); -+ if (process_fd(f) <0) -+ fprintf(stderr, _("Problem while parsing /proc/net/netstat\n")); - - if (ferror(f)) - perror("/proc/net/netstat"); ---- net-tools-1.60.orig/nameif.c -+++ net-tools-1.60/nameif.c -@@ -3,7 +3,7 @@ - * Writen 2000 by Andi Kleen. - * Subject to the Gnu Public License, version 2. - * TODO: make it support token ring etc. -- * $Id: nameif.c,v 1.1 2000/10/18 17:26:29 ak Exp $ -+ * $Id: nameif.c,v 1.4 2003/09/11 03:46:49 ak Exp $ - */ - #ifndef _GNU_SOURCE - #define _GNU_SOURCE -@@ -117,7 +117,8 @@ - } - - struct change { -- struct change *next,**pprev; -+ struct change *next; -+ int found; - char ifname[IFNAMSIZ+1]; - unsigned char mac[6]; - }; -@@ -139,10 +140,7 @@ - ch->ifname, pos); - if (parsemac(p,ch->mac) < 0) - complain(_("cannot parse MAC `%s' at %s"), p, pos); -- if (clist) -- clist->pprev = &ch->next; - ch->next = clist; -- ch->pprev = &clist; - clist = ch; - return 0; - } -@@ -177,7 +175,7 @@ - if (*p == '\0') - continue; - n = strcspn(p, " \t"); -- if (n > IFNAMSIZ) -+ if (n > IFNAMSIZ-1) - complain(_("interface name too long at line %d"), line); - memcpy(ch->ifname, p, n); - ch->ifname[n] = 0; -@@ -200,7 +198,7 @@ - - void usage(void) - { -- fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); -+ fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); - exit(1); - } - -@@ -277,21 +275,21 @@ - ch = lookupmac(mac); - if (!ch) - continue; -- -- *ch->pprev = ch->next; -+ -+ ch->found = 1; - if (strcmp(p, ch->ifname)) { - if (setname(p, ch->ifname) < 0) - complain(_("cannot change name of %s to %s: %s"), - p, ch->ifname, strerror(errno)); - } -- free(ch); - } - fclose(ifh); - - while (clist) { - struct change *ch = clist; - clist = clist->next; -- warning(_("interface '%s' not found"), ch->ifname); -+ if (!ch->found) -+ warning(_("interface '%s' not found"), ch->ifname); - free(ch); - } - ---- net-tools-1.60.orig/mii-tool.c -+++ net-tools-1.60/mii-tool.c -@@ -29,8 +29,7 @@ - http://www.national.com/pf/DP/DP83840.html - */ - --static char version[] = --"mii-tool.c 1.9 2000/04/28 00:56:08 (David Hinds)\n"; -+static char Version[] = "$Id: mii-tool.c,v 1.9 2006/09/27 20:59:18 ecki Exp $\n(Author: David Hinds based on Donald Becker's mii-diag)"; - - #include - #include -@@ -46,16 +45,19 @@ - #include - #include - #include -+#include -+ - #ifndef __GLIBC__ - #include - #include - #endif - #include "mii.h" -+#include "version.h" - - #define MAX_ETH 8 /* Maximum # of interfaces */ - - /* Table of known MII's */ --static struct { -+static const struct { - u_short id1, id2; - char *name; - } mii_id[] = { -@@ -74,6 +76,9 @@ - { 0x0181, 0x4410, "Quality QS6612" }, - { 0x0282, 0x1c50, "SMSC 83C180" }, - { 0x0300, 0xe540, "TDK 78Q2120" }, -+ { 0x0141, 0x0c20, "Yukon 88E1011" }, -+ { 0x0141, 0x0cc0, "Yukon-EC 88E1111" }, -+ { 0x0141, 0x0c90, "Yukon-2 88E1112" }, - }; - #define NMII (sizeof(mii_id)/sizeof(mii_id[0])) - -@@ -137,40 +142,48 @@ - - const struct { - char *name; -- u_short value; -+ u_short value[2]; - } media[] = { - /* The order through 100baseT4 matches bits in the BMSR */ -- { "10baseT-HD", MII_AN_10BASET_HD }, -- { "10baseT-FD", MII_AN_10BASET_FD }, -- { "100baseTx-HD", MII_AN_100BASETX_HD }, -- { "100baseTx-FD", MII_AN_100BASETX_FD }, -- { "100baseT4", MII_AN_100BASET4 }, -- { "100baseTx", MII_AN_100BASETX_FD | MII_AN_100BASETX_HD }, -- { "10baseT", MII_AN_10BASET_FD | MII_AN_10BASET_HD }, -+ { "10baseT-HD", {MII_AN_10BASET_HD} }, -+ { "10baseT-FD", {MII_AN_10BASET_FD} }, -+ { "100baseTx-HD", {MII_AN_100BASETX_HD} }, -+ { "100baseTx-FD", {MII_AN_100BASETX_FD} }, -+ { "100baseT4", {MII_AN_100BASET4} }, -+ { "100baseTx", {MII_AN_100BASETX_FD | MII_AN_100BASETX_HD} }, -+ { "10baseT", {MII_AN_10BASET_FD | MII_AN_10BASET_HD} }, -+ -+ { "1000baseT-HD", {0, MII_BMCR2_1000HALF} }, -+ { "1000baseT-FD", {0, MII_BMCR2_1000FULL} }, -+ { "1000baseT", {0, MII_BMCR2_1000HALF|MII_BMCR2_1000FULL} }, - }; - #define NMEDIA (sizeof(media)/sizeof(media[0])) - - /* Parse an argument list of media types */ --static int parse_media(char *arg) -+static int parse_media(char *arg, unsigned *bmcr2) - { - int mask, i; - char *s; - mask = strtoul(arg, &s, 16); - if ((*arg != '\0') && (*s == '\0')) { - if ((mask & MII_AN_ABILITY_MASK) && -- !(mask & ~MII_AN_ABILITY_MASK)) -- return mask; -+ !(mask & ~MII_AN_ABILITY_MASK)) { -+ *bmcr2 = 0; -+ return mask; -+ } - goto failed; -- } else { -- mask = 0; -- s = strtok(arg, ", "); -- do { -+ } -+ mask = 0; -+ *bmcr2 = 0; -+ s = strtok(arg, ", "); -+ do { - for (i = 0; i < NMEDIA; i++) -- if (strcasecmp(media[i].name, s) == 0) break; -+ if (s && strcasecmp(media[i].name, s) == 0) break; - if (i == NMEDIA) goto failed; -- mask |= media[i].value; -- } while ((s = strtok(NULL, ", ")) != NULL); -- } -+ mask |= media[i].value[0]; -+ *bmcr2 |= media[i].value[1]; -+ } while ((s = strtok(NULL, ", ")) != NULL); -+ - return mask; - failed: - fprintf(stderr, "Invalid media specification '%s'.\n", arg); -@@ -179,11 +192,24 @@ - - /*--------------------------------------------------------------------*/ - --static char *media_list(int mask, int best) -+static const char *media_list(unsigned mask, unsigned mask2, int best) - { - static char buf[100]; - int i; - *buf = '\0'; -+ -+ if (mask & MII_BMCR_SPEED1000) { -+ if (mask2 & MII_BMCR2_1000HALF) { -+ strcat(buf, " "); -+ strcat(buf, "1000baseT-HD"); -+ if (best) goto out; -+ } -+ if (mask2 & MII_BMCR2_1000FULL) { -+ strcat(buf, " "); -+ strcat(buf, "1000baseT-FD"); -+ if (best) goto out; -+ } -+ } - mask >>= 5; - for (i = 4; i >= 0; i--) { - if (mask & (1< 1) ? 32 : 8); i++) -+ for (i = 0; i < ((verbose > 1) ? 32 : MII_BASIC_MAX); i++) - mii_val[i] = mdio_read(sock, i); - -- if (mii_val[MII_BMCR] == 0xffff) { -+ if (mii_val[MII_BMCR] == 0xffff || mii_val[MII_BMSR] == 0x0000) { - fprintf(stderr, " No MII transceiver present!.\n"); - return -1; - } -@@ -217,6 +244,7 @@ - /* Descriptive rename. */ - bmcr = mii_val[MII_BMCR]; bmsr = mii_val[MII_BMSR]; - advert = mii_val[MII_ANAR]; lkpar = mii_val[MII_ANLPAR]; -+ bmcr2 = mii_val[MII_CTRL1000]; lpa2 = mii_val[MII_STAT1000]; - - sprintf(buf, "%s: ", ifr.ifr_name); - if (bmcr & MII_BMCR_AN_ENA) { -@@ -224,7 +252,7 @@ - if (advert & lkpar) { - strcat(buf, (lkpar & MII_AN_ACK) ? - "negotiated" : "no autonegotiation,"); -- strcat(buf, media_list(advert & lkpar, 1)); -+ strcat(buf, media_list(advert & lkpar, bmcr2 & lpa2>>2, 1)); - strcat(buf, ", "); - } else { - strcat(buf, "autonegotiation failed, "); -@@ -234,8 +262,10 @@ - } - } else { - sprintf(buf+strlen(buf), "%s Mbit, %s duplex, ", -- (bmcr & MII_BMCR_100MBIT) ? "100" : "10", -- (bmcr & MII_BMCR_DUPLEX) ? "full" : "half"); -+ ((bmcr2 & (MII_BMCR2_1000HALF | MII_BMCR2_1000FULL)) & lpa2 >> 2) -+ ? "1000" -+ : (bmcr & MII_BMCR_100MBIT) ? "100" : "10", -+ (bmcr & MII_BMCR_DUPLEX) ? "full" : "half"); - } - strcat(buf, (bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link"); - -@@ -296,12 +326,13 @@ - if (bmsr & MII_BMSR_REMOTE_FAULT) - printf("remote fault, "); - printf((bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link"); -- printf("\n capabilities:%s", media_list(bmsr >> 6, 0)); -- printf("\n advertising: %s", media_list(advert, 0)); -+ printf("\n capabilities:%s", media_list(bmsr >> 6, bmcr2, 0)); -+ printf("\n advertising: %s", media_list(advert, lpa2 >> 2, 0)); - if (lkpar & MII_AN_ABILITY_MASK) -- printf("\n link partner:%s", media_list(lkpar, 0)); -+ printf("\n link partner:%s", media_list(lkpar, bmcr2, 0)); - printf("\n"); - } -+ fflush(stdout); - return 0; - } - -@@ -329,7 +360,7 @@ - printf("resetting the transceiver...\n"); - mdio_write(skfd, MII_BMCR, MII_BMCR_RESET); - } -- if (nway_advertise) { -+ if (nway_advertise > 0) { - mdio_write(skfd, MII_ANAR, nway_advertise | 1); - opt_restart = 1; - } -@@ -379,27 +410,38 @@ - /*--------------------------------------------------------------------*/ - - const char *usage = --"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...] -- -V, --version display version information -- -v, --verbose more verbose output -- -R, --reset reset MII to poweron state -- -r, --restart restart autonegotiation -- -w, --watch monitor for link status changes -- -l, --log with -w, write events to syslog -- -A, --advertise=media,... advertise only specified media -- -F, --force=media force specified media technology --media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD, -- (to advertise both HD and FD) 100baseTx, 10baseT\n"; -+"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n" -+" -V, --version display version information\n" -+" -v, --verbose more verbose output\n" -+" -R, --reset reset MII to poweron state\n" -+" -r, --restart restart autonegotiation\n" -+" -w, --watch monitor for link status changes\n" -+" -l, --log with -w, write events to syslog\n" -+" -A, --advertise=media,... advertise only specified media\n" -+" -F, --force=media force specified media technology\n" -+"media: 1000baseTx-HD, 1000baseTx-FD,\n" -+" 100baseT4, 100baseTx-FD, 100baseTx-HD,\n" -+" 10baseT-FD, 10baseT-HD,\n" -+" (to advertise both HD and FD) 1000baseTx, 100baseTx, 10baseT\n"; -+ -+ -+static void version(void) -+{ -+ fprintf(stderr, "%s\n%s\n", Version, RELEASE); -+ exit(5); /* E_VERSION */ -+} -+ - - int main(int argc, char **argv) - { - int i, c, ret, errflag = 0; - char s[6]; -+ unsigned ctrl1000 = 0; - - while ((c = getopt_long(argc, argv, "A:F:p:lrRvVw?", longopts, 0)) != EOF) - switch (c) { -- case 'A': nway_advertise = parse_media(optarg); break; -- case 'F': fixed_speed = parse_media(optarg); break; -+ case 'A': nway_advertise = parse_media(optarg, &ctrl1000); break; -+ case 'F': fixed_speed = parse_media(optarg, &ctrl1000); break; - case 'p': override_phy = atoi(optarg); break; - case 'r': opt_restart++; break; - case 'R': opt_reset++; break; -@@ -411,6 +453,10 @@ - } - /* Check for a few inappropriate option combinations */ - if (opt_watch) verbose = 0; -+ -+ if ((nway_advertise < 0) || (fixed_speed < 0)) -+ return 2; -+ - if (errflag || (fixed_speed & (fixed_speed-1)) || - (fixed_speed && (opt_restart || nway_advertise))) { - fprintf(stderr, usage, argv[0]); -@@ -418,7 +464,7 @@ - } - - if (opt_version) -- printf(version); -+ version(); - - /* Open a basic socket. */ - if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) { -@@ -426,6 +472,9 @@ - exit(-1); - } - -+ if (verbose > 1) -+ printf("Using SIOCGMIIPHY=0x%x\n", SIOCGMIIPHY); -+ - /* No remaining args means show all interfaces. */ - if (optind == argc) { - ret = 1; ---- net-tools-1.60.orig/debian/changelog -+++ net-tools-1.60/debian/changelog -@@ -0,0 +1,277 @@ -+net-tools (1.60-19) unstable; urgency=low -+ -+ * fixed netstat(8) (interfaceS) reported by Liu Xing. (Closes Bug #435690) -+ * fixed interface name truncation (Closes Bug #405521) -+ Thank you Csaba Szep. -+ * fixed pt error string (Closes: Bug#403033) -+ * fixed route samples (Closes: Bug#400844, #368697) Thanks Danny Rathjens. -+ * fixed ifconfig(8) see also section (Closes: Bug#365916) Dan Jacobs. -+ -+ -- Bernd Eckenfels Sun, 02 Dec 2007 06:27:41 +0100 -+ -+net-tools (1.60-18) unstable; urgency=low -+ -+ * Thanks for the l10n NMU to Kenshi Muto -+ * fixed hostname compile problems -+ * better error handling and speedup for proc file reading -+ * improved mii-tool (more media types) -+ * fixed string length contraint in ipmaddr -+ * fixed ipx /proc/net (alternate naming) -+ * smaller fixed to netstat(8) (de) 2002-02-20 - still incomplete -+ * expanded arp(8) (en) 2007-12-01 -+ * added -4 and -6 to netstat(8) 02 October 2003 -+ * formatting fixed rarp(8)+slattach(8) [en] -+ * formatting fixed arp(8), rarp(8), ifconfig(8), hostname(1) [fr] -+ * fixed slattach -L to not require HW handshake anymore -+ * netstat -n: show v4inv6 mapped addressses as v4 -+ -+ -- Bernd Eckenfels Sun, 02 Dec 2007 03:28:17 +0100 -+ -+net-tools (1.60-17.2) unstable; urgency=low -+ -+ * l10n NMU -+ * Set conflict against ja-trans which has obsolete Japanese -+ translations only for net-tools. (closes: #447327) -+ -+ -- Kenshi Muto Sat, 20 Oct 2007 18:00:34 +0900 -+ -+net-tools (1.60-17.1) unstable; urgency=low -+ -+ * l10n NMU -+ * Updated net-tools.pot. -+ * Updated Japanese translation (closes: Bug#432338) -+ * Updated German translation (closes: #313808) -+ -+ -- Kenshi Muto Thu, 11 Oct 2007 19:44:26 +0900 -+ -+net-tools (1.60-17) unstable; urgency=medium -+ -+ * arp.c: bus error on sparc64 with latest gcc fixed. (Closes: Bug#340384) -+ -+ -- Bernd Eckenfels Sun, 04 Dec 2005 05:47:05 +0100 -+ -+net-tools (1.60-16) unstable; urgency=low -+ -+ * spelling fix to slattach(8) (Closes: Bug#326124 (patch by A.Costa) -+ * inet.c: portability fix for 64bit. -+ * comment cleanups to aliagn with 1.65 cvs -+ * net-support.h, inet_sr.c, nstrcmp.c, arp.c, ether.h -+ -+ -- Bernd Eckenfels Mon, 24 Oct 2005 22:05:38 +0200 -+ -+net-tools (1.60-15) unstable; urgency=low -+ -+ * minor formating fix to ifconfig(8) -+ -+ -- Bernd Eckenfels Thu, 30 Jun 2005 21:49:52 +0200 -+ -+net-tools (1.60-14) unstable; urgency=low -+ -+ * added iptables(8) in ifconfig(8) (thanks Toralf Förster) -+ * more usage updates in ifconfig.8 (used upstream HEAD=1.11) -+ -+ -- Bernd Eckenfels Thu, 30 Jun 2005 20:51:18 +0200 -+ -+net-tools (1.60-13) unstable; urgency=low Thu, 30 Jun 2005 20:49:57 +0200 -+ -+ * X25 code compiles with 2.4 and 2.6 kernel headers (Closes: Bug#271678) -+ * IMPORTANT: make ifconfig show alias interfaces in 2.6 again. -+ * resort media type array to match kernel (Closes: Bug#199920) -+ -+ -- Bernd Eckenfels Tue, 17 May 2005 01:28:51 +0200 -+ -+net-tools (1.60-12) unstable; urgency=low -+ -+ * make TR hw address type work for new kernel (Closes: Bug #79462, #203400) -+ * update-po uses msgmerge, new net-tools.pot (Closes: Bug: 271426) -+ * de-support dontpub option in arp -? und arp.8 (Closes: Bug #203396) -+ -+ -- Bernd Eckenfels Mon, 16 May 2005 06:33:48 +0200 -+ -+net-tools (1.60-11) unstable; urgency=low -+ -+ * spelling fixes (Closes: Bug #305640, #305638, 305637) -+ * nameif.c avoid overflow by malicious kernel -+ * avoid overflow of the TX-OK Column (Closes: Bug #308922) -+ -+ -- Bernd Eckenfels Sat, 14 May 2005 01:48:45 +0200 -+ -+net-tools (1.60-10) unstable; urgency=low -+ -+ * typo fix in po/de.po for german arp command output (Closes: Bug #176151) -+ * added diagnostics messages to mii-tool.8 (Closes: Bug #239229) -+ * new version of nstrcmp (Closes: Bug #226503) -+ * enable EUI64 support -+ * stadanrds version 3.6.1 (no changes) -+ -+ -- Bernd Eckenfels Fri, 23 Apr 2004 00:57:20 +0200 -+ -+net-tools (1.60-9) unstable; urgency=medium -+ -+ * debian/changelog: fixed in last entry fixed bug from 197925 to 197924 -+ * include linux/sockios.h for SIOCGMIIPHY definition (new style) -+ which will fix MII reporting on 2.4 kernels. (Closes: Bug #133648) -+ NOTE: this will now require root to work, it will also not work on -+ older kernels. -+ * Rene Engelhard's patch to make AF X25 compile with 2.6 headers (Closes: Bug #223091) -+ -+ -- Bernd Eckenfels Mon, 29 Dec 2003 13:42:20 +0100 -+ -+net-tools (1.60-8) unstable; urgency=medium -+ -+ * lib/interface.c: backed off change which skipped reading ioctl -+ interfacelist, if _proc interfacelist was ok, which does not work, -+ because alias interfaces are only in ioctl list available. It is -+ also falling back to the original lib/nstrcml.c because the -+ comparision if : is present does not work. -+ (Closes: bug #197924, #197582, #197269) -+ * bumped standards version (no changes) -+ -+ -- Bernd Eckenfels Sat, 28 Jun 2003 02:56:38 +0200 -+ -+net-tools (1.60-7) unstable; urgency=low -+ -+ * interfaces.c: cvs version fixes Connectiva Bug #5711 (Closes: #149576) -+ from Eduardo Pereira Habkost -+ * netstat.c: cvs version adds support for tcp6,udp6,icmp6 protocols -+ * netstat.c: cvs version adds support for -4 or -6 cmd line shortcut -+ * netstat.c: cvs version adds fix for inode -+ signedness (Closes: #134600, #78932) -+ * ifconfig: removed -i from usage (Closes: #181528) -+ * make gcc 3.3 happy: added ull unsigned long long prefix to constant -+ * lib/ddp_gr.c+pathnames.h: first support for appletalk routing from cvs -+ * lib/eui64.c+hw.c+Makefile: forst support for new hw type from cvs -+ * lib/interface.c: cvs fix for column run-into (Closes: #161080) -+ * lib/irda.c,lib/ipx.c: cvs update -+ * lib/nstrcmp.c: new, faster version, fixes b-lookups for ifconfig -+ * hostanme.c: gcc 3.3 fix from cvs (not compiled in net-tools.deb) -+ * lib/interface: fixed memory globbering -+ (Closes: #135744, #149579, #185187) -+ -+ -- Bernd Eckenfels Thu, 12 Jun 2003 05:44:38 +0200 -+ -+net-tools (1.60-6) unstable; urgency=low -+ -+ * took route.c from upstream cvs: allow -6 and -4 option -+ * took statistics.c from upstream cvs: more complete netstat -S -+ * took README from upstream cvs: fix COPYING file title and removed -+ the line (Closes: #102139) -+ * took arp.c from upstream: fixed name "PUB", better not found handling, -+ implicite proxy arp mac changed from '*' to '', -+ usage line made shorter -+ * added mii-tool in control file (Closes: #172473) -+ * fixed description of binary multiple in man page (Closes: #182487) -+ * fixed interpunctation in netstat(8) (Closes: #191660) -+ * fixed compile warning in inet_sr.c by removing empty default: label in -+ switch -+ -+ -- Bernd Eckenfels Wed, 28 May 2003 22:35:12 +0200 -+ -+net-tools (1.60-5) unstable; urgency=low -+ -+ * thanks Andrew for the 4.1 NMU -+ * NMU: Apply nameif patch from Matt Domsch. (Closes: #178209) -+ * Fix FTB bug (string concatenation in gcc 3.3) (Closes: #194995) -+ * Fix segfault in mii-tool by using cvs version (Closes: #139027) -+ * fixed plural of authors to make lintian happy (I JOIN YOU :) -+ -+ -- Bernd Eckenfels Wed, 28 May 2003 22:04:14 +0200 -+ -+net-tools (1.60-4.1) unstable; urgency=low -+ -+ * NMU -+ * Apply nameif patch from Matt Domsch. (Closes: #178209) -+ -+ -- Andrew Suffield Wed, 9 Apr 2003 21:44:09 +0100 -+ -+net-tools (1.60-4) unstable; urgency=medium -+ -+ * fixed (upstream) spurious newline in ifconfig -+ Thanks Jonathen, Closes: Bug #109379 -+ * fixed SI-Units printout in ifconfig (Closes: Bug #110629, #97029, #100167) -+ * this is done by including lib/interfaces.c from upstream cvs -+ * also added ifconfig man page from upstream cvs -+ * fixed (upstream) man page about netstat's --interface opt. (Closes: Bug#120475) -+ -+ -- Bernd Eckenfels Sat, 24 Nov 2001 06:26:37 +0100 -+ -+net-tools (1.60-3) unstable; urgency=medium -+ -+ * fixed upstream error where counters in ifconfig/netstat -i are 0 -+ -+ -- Bernd Eckenfels Sat, 10 Nov 2001 18:12:13 +0100 -+ -+net-tools (1.60-2) unstable; urgency=low -+ -+ * Fixed the following bug: (Closes: #117837) -+ * inserted ifconfig.c from upstream cvs to do this -+ * bumped debian Standard 3.1.1 -> 3.5.6 and removed -g from linking -+ -+ -- Bernd Eckenfels Thu, 1 Nov 2001 02:51:33 +0100 -+ -+net-tools (1.60-1) unstable; urgency=low -+ -+ * New upstream -+ * Phil fixed the following Bugs upstream: (Closes: #91919, #93048, #90282) -+ -+ -- Bernd Eckenfels Mon, 16 Apr 2001 02:28:12 +0200 -+ -+net-tools (1.59-1) unstable; urgency=low -+ -+ * added Build Dependencies (closes bug: #89083) -+ * new upstream version -+ * removed dh_suidregister and a few comments from rules file -+ -+ -- Bernd Eckenfels Sun, 18 Mar 2001 03:00:33 +0100 -+ -+net-tools (1.58-2) unstable; urgency=low -+ -+ * backported ifconfig change from 1.59 to avoid closing socket too early -+ on some systems (depending on the protocols installed). -+ Closes Bug: #85688, #85743 -+ -+ -- Bernd Eckenfels Tue, 13 Feb 2001 01:39:59 +0100 -+ -+net-tools (1.58-1) unstable; urgency=low -+ -+ * new upstream version -+ * removed local man pages for now (Closes: bug #83894) -+ * install nameif in /sbin -+ -+ -- Bernd Eckenfels Sat, 10 Feb 2001 21:50:30 +0100 -+ -+net-tools (1.57-2) unstable; urgency=high -+ -+ * rebuild, this is believed to closes: #75825 -+ -+ -- Bernd Eckenfels Sat, 30 Dec 2000 22:43:01 +0100 -+ -+net-tools (1.57-1) unstable; urgency=low -+ -+ * new debian maintainer (thanks Anthony for the Work!) -+ * new upstream version -+ -+ -- Bernd Eckenfels Mon, 14 Aug 2000 02:40:13 +0200 -+ -+net-tools (1.54-3) unstable; urgency=low -+ -+ * Argggh. Don't use that horrible dh_installmanpages hack. (Closes: -+ Bug#68925, Bug#68879) -+ -+ -- Anthony Towns Sun, 13 Aug 2000 00:12:05 +1000 -+ -+net-tools (1.54-2) unstable; urgency=low -+ -+ * Reapply slattach patch from netbase 3.16-3. -+ -+ -- Anthony Towns Thu, 10 Aug 2000 11:32:58 +1000 -+ -+net-tools (1.54-1) unstable; urgency=low -+ -+ * Split from netbase. -+ -+ -- Anthony Towns Mon, 17 Jul 2000 07:34:12 +1000 -+ -+Local variables: -+mode: debian-changelog -+End: ---- net-tools-1.60.orig/debian/copyright -+++ net-tools-1.60/debian/copyright -@@ -0,0 +1,18 @@ -+This debian package is maintained by Bernd Eckenfels since -+Mon, 14 Aug 2000 02:42:13 +0200. Debian Informations will be uploaded -+upstream, too. -+ -+This package was debianized by Anthony Towns on -+Mon, 17 Jul 2000 07:34:12 +1000. It was originally part of the netbase -+package. -+ -+It was downloaded from http://www.tazenda.demon.co.uk/phil/net-tools/ -+ -+Upstream Authors: Phil Blundell , -+ Bernd Eckenfels -+ -+Copyright: -+ -+Distributed under the terms of the GNU General Public License version 2, -+as published by the Free Software Foundation. On Debian systems you can -+find a copy of this license in /usr/share/common-licenses/GPL. ---- net-tools-1.60.orig/debian/dirs -+++ net-tools-1.60/debian/dirs -@@ -0,0 +1 @@ -+usr/sbin ---- net-tools-1.60.orig/debian/config.make -+++ net-tools-1.60/debian/config.make -@@ -0,0 +1,36 @@ -+I18N=1 -+HAVE_AFUNIX=1 -+HAVE_AFINET=1 -+HAVE_AFINET6=1 -+HAVE_AFIPX=1 -+HAVE_AFATALK=1 -+HAVE_AFAX25=1 -+HAVE_AFNETROM=1 -+HAVE_AFROSE=1 -+HAVE_AFX25=1 -+HAVE_AFECONET=1 -+HAVE_AFDECnet=1 -+HAVE_AFASH=1 -+HAVE_HWETHER=1 -+HAVE_HWARC=1 -+HAVE_HWSLIP=1 -+HAVE_HWPPP=1 -+HAVE_HWTUNNEL=1 -+HAVE_HWSTRIP=1 -+HAVE_HWTR=1 -+HAVE_HWAX25=1 -+HAVE_HWROSE=1 -+HAVE_HWNETROM=1 -+HAVE_HWX25=1 -+HAVE_HWFR=1 -+HAVE_HWSIT=1 -+HAVE_HWFDDI=1 -+HAVE_HWHIPPI=1 -+HAVE_HWASH=1 -+HAVE_HWHDLCLAPB=1 -+HAVE_HWIRDA=1 -+HAVE_HWEC=1 -+HAVE_EUI64=1 -+HAVE_FW_MASQUERADE=1 -+HAVE_IP_TOOLS=1 -+HAVE_MII=1 ---- net-tools-1.60.orig/debian/control -+++ net-tools-1.60/debian/control -@@ -0,0 +1,21 @@ -+Source: net-tools -+Section: net -+Priority: important -+Build-Depends: debhelper, gettext -+Maintainer: Bernd Eckenfels -+Standards-Version: 3.6.1 -+ -+Package: net-tools -+Architecture: any -+Depends: ${shlibs:Depends} -+Replaces: netbase (<< 4.00), ja-trans (<= 0.8-2) -+Conflicts: ja-trans (<= 0.8-2) -+Description: The NET-3 networking toolkit -+ This package includes the important tools for controlling the network -+ subsystem of the Linux kernel. This includes arp, ifconfig, netstat, -+ rarp, nameif and route. Additionally, this package contains utilities -+ relating to particular network hardware types (plipconfig, slattach, -+ mii-tool) and advanced aspects of IP configuration (iptunnel, ipmaddr). -+ . -+ In the upstream package 'hostname' and friends are included. Those are -+ not installed by this package, since there is a special "hostname*.deb". ---- net-tools-1.60.orig/debian/rules -+++ net-tools-1.60/debian/rules -@@ -0,0 +1,74 @@ -+#!/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 -+ -+# This is the debhelper compatability version to use. -+export DH_COMPAT=1 -+ -+configure: configure-stamp -+configure-stamp: -+ dh_testdir -+ touch configure-stamp -+ -+build: configure-stamp build-stamp -+build-stamp: -+ dh_testdir -+ cp debian/config.h config.h -+ cp debian/config.make config.make -+ $(MAKE) -+ touch build-stamp -+ -+clean: -+ dh_testdir -+ dh_testroot -+ rm -f build-stamp configure-stamp -+ -$(MAKE) clobber -+ dh_clean -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ $(MAKE) update BASEDIR=`pwd`/debian/tmp -+ mv debian/tmp/sbin/arp debian/tmp/usr/sbin/arp -+ # we don't want man pages for domainname and friends... (yet) -+ rm -rf debian/tmp/usr/share/man/*/man1/ debian/tmp/usr/share/man/man1/ -+ # we don't install local manpages until policy is clear -+ rm -rf debian/tmp/usr/share/man/*_*/ -+ -+ -+# 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_testversion -+ dh_testdir -+ dh_testroot -+# dh_installdebconf -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+ dh_installcron -+# dh_installmanpages -+ dh_installinfo -+# dh_undocumented -+ dh_installchangelogs -+ dh_link -+ dh_strip -+ dh_compress -+ dh_fixperms -+# dh_makeshlibs -+ dh_installdeb -+ dh_shlibdeps -+ dh_gencontrol -- -isp -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install ---- net-tools-1.60.orig/debian/config.h -+++ net-tools-1.60/debian/config.h -@@ -0,0 +1,75 @@ -+/* -+* config.h Automatically generated configuration includefile -+* -+* NET-TOOLS A collection of programs that form the base set of the -+* NET-3 Networking Distribution for the LINUX operating -+* system. -+* -+* DO NOT EDIT DIRECTLY -+* -+*/ -+ -+/* -+ * -+ * Internationalization -+ * -+ * The net-tools package has currently been translated to French, -+ * German and Brazilian Portugese. Other translations are, of -+ * course, welcome. Answer `n' here if you have no support for -+ * internationalization on your system. -+ * -+ */ -+#define I18N 1 -+ -+/* -+ * -+ * Protocol Families. -+ * -+ */ -+#define HAVE_AFUNIX 1 -+#define HAVE_AFINET 1 -+#define HAVE_AFINET6 1 -+#define HAVE_AFIPX 1 -+#define HAVE_AFATALK 1 -+#define HAVE_AFAX25 1 -+#define HAVE_AFNETROM 1 -+#define HAVE_AFROSE 1 -+#define HAVE_AFX25 1 -+#define HAVE_AFECONET 1 -+#define HAVE_AFDECnet 1 -+#define HAVE_AFASH 1 -+ -+/* -+ * -+ * Device Hardware types. -+ * -+ */ -+#define HAVE_HWETHER 1 -+#define HAVE_HWARC 1 -+#define HAVE_HWSLIP 1 -+#define HAVE_HWPPP 1 -+#define HAVE_HWTUNNEL 1 -+#define HAVE_HWSTRIP 1 -+#define HAVE_HWTR 1 -+#define HAVE_HWAX25 1 -+#define HAVE_HWROSE 1 -+#define HAVE_HWNETROM 1 -+#define HAVE_HWX25 1 -+#define HAVE_HWFR 1 -+#define HAVE_HWSIT 1 -+#define HAVE_HWFDDI 1 -+#define HAVE_HWHIPPI 1 -+#define HAVE_HWASH 1 -+#define HAVE_HWHDLCLAPB 1 -+#define HAVE_HWIRDA 1 -+#define HAVE_HWEC 1 -+#define HAVE_HWEUI64 1 -+ -+/* -+ * -+ * Other Features. -+ * -+ */ -+#define HAVE_FW_MASQUERADE 1 -+#define HAVE_IP_TOOLS 1 -+#define HAVE_MII 1 ---- net-tools-1.60.orig/debian/docs -+++ net-tools-1.60/debian/docs -@@ -0,0 +1,3 @@ -+README -+README.ipv6 -+TODO diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 42419914..1fa74c83 100755 --- a/source/a/util-linux/util-linux.SlackBuild +++ b/source/a/util-linux/util-linux.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,9 @@ # Slackware build script for util-linux VERSION=${VERSION:-$(echo util-linux*.tar.?z* | cut -d - -f 3 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-5} -ADJTIMEXVERS=1.23 +ADJTIMEXVERS=1.29 SETSERIALVERS=2.17 ZIPTOOLVERS=1.4.0 @@ -70,8 +70,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Disabled login and init stuff from being built, as this is provided by -# shadow and sysvinit +# Disabled login stuff from being built, as this is provided by shadow # # /sbin/elvtune is not built, as configure says it only works with 2.2 and # 2.4 kernels @@ -85,7 +84,19 @@ find . \ # Changing the fdisk -l output (this was done prior to util-linux-ng) broke # our installation scripts, so we have changed the name of partition type # 83 back to "Linux swap": -zcat $CWD/util-linux.fdisk-no-solaris.diff.gz | patch -p1 || exit 1 +zcat $CWD/util-linux.fdisk-no-solaris.diff.gz | patch -p1 --verbose || exit 1 + +# Fix loop encryption: +zcat $CWD/0001-mount-old-fix-encryption-usage.patch.gz | patch -p1 --verbose || exit 1 + +# Fix fdisk granularity on 512 byte sector size devices: +zcat $CWD/0002-fdisk-don-t-ignore-1MiB-granularity-on-512-byte-sect.patch.gz | patch -p1 --verbose || exit 1 + +# 20120814 bkw: fix "column --separator " segfault +zcat $CWD/column-fix_long_opts.diff.gz | patch -p1 --verbose || exit 1 + +# Regenerate, since patch 0001 hits mount/Makefile.am: +./autogen.sh CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -99,9 +110,9 @@ CFLAGS="$SLKCFLAGS" \ --disable-static \ --enable-arch \ --enable-agetty \ - --disable-init \ --enable-kill \ --disable-last \ + --enable-line \ --enable-mesg \ --enable-partx \ --enable-raw \ @@ -114,8 +125,10 @@ CFLAGS="$SLKCFLAGS" \ --enable-use-tty-group \ --enable-libblkid \ --enable-libmount \ + --enable-libmount-mount \ --enable-libuuid \ --disable-uuidd \ + --enable-ddate \ --build=$ARCH-slackware-linux \ || exit 1 @@ -180,11 +193,10 @@ cat strings.1 | gzip -9c > $PKG/usr/man/man1/strings.1.gz # Add just the hostname utilities from net-tools, so that anyone # installing just the A series will not have a hostname (null): cd $TMP || exit 1 -rm -rf net-tools-1.60 -tar xvf $CWD/net-tools-1.60.tar.xz -cd net-tools-1.60 -zcat $CWD/net-tools_1.60-19.diff.gz | patch -p1 || exit -zcat $CWD/net-tools.diff.gz | patch -p1 || exit +rm -rf net-tools-1.60.20120726git +tar xvf $CWD/net-tools-1.60.20120726git.tar.xz +cd net-tools-1.60.20120726git +zcat $CWD/net-tools.config.h.gz > config.h make make hostname strip hostname @@ -209,7 +221,7 @@ rm -rf adjtimex-$ADJTIMEXVERS tar xvf $CWD/adjtimex_${ADJTIMEXVERS}.orig.tar.gz || exit 1 cd adjtimex-$ADJTIMEXVERS || exit 1 chown -R root:root . -zcat $CWD/adjtimex_1.23-1.diff.gz | patch -p1 || exit 1 +zcat $CWD/adjtimex_1.29-2.2.diff.gz | patch -p1 || exit 1 CFLAGS=-O2 ./configure --prefix=/usr || exit 1 make || exit 1 strip adjtimex diff --git a/source/a/xfsprogs/xfsprogs.SlackBuild b/source/a/xfsprogs/xfsprogs.SlackBuild index 27af8245..672290d3 100755 --- a/source/a/xfsprogs/xfsprogs.SlackBuild +++ b/source/a/xfsprogs/xfsprogs.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/source/a/xz/slack-desc b/source/a/xz/slack-desc index af549b35..05379225 100644 --- a/source/a/xz/slack-desc +++ b/source/a/xz/slack-desc @@ -8,7 +8,7 @@ |-----handy-ruler------------------------------------------------------| xz: xz (compression utility based on the LZMA algorithm) xz: -xz: LZMA is a general purporse compression algorithm designed by Igor +xz: LZMA is a general purpose compression algorithm designed by Igor xz: Pavlov as part of 7-Zip. It provides high compression ratio while xz: keeping the decompression speed fast. XZ Utils are an attempt to make xz: LZMA compression easy to use on free (as in freedom) operating diff --git a/source/a/xz/xz.SlackBuild b/source/a/xz/xz.SlackBuild index dd996f48..7c60ce6c 100755 --- a/source/a/xz/xz.SlackBuild +++ b/source/a/xz/xz.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Permission to use, copy, modify, and distribute this software for @@ -154,3 +154,10 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz +# Move temporary stuff to /tmp, so that it won't get forgotten +# in the shuffle: + +cp -a $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz /tmp +rm -rf /tmp/xz-tmp* +mv /xz-tmp* /tmp + diff --git a/source/ap/alsa-utils/alsa-utils.SlackBuild b/source/ap/alsa-utils/alsa-utils.SlackBuild index 77664487..3e642d08 100755 --- a/source/ap/alsa-utils/alsa-utils.SlackBuild +++ b/source/ap/alsa-utils/alsa-utils.SlackBuild @@ -63,7 +63,7 @@ cd $TMP rm -rf alsa-utils-$VERSION tar xvf $CWD/alsa-utils-$VERSION.tar.?z* || exit 1 cd alsa-utils-$VERSION || exit 1 -zcat $CWD/alsa-utils.alsaconf.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit +#zcat $CWD/alsa-utils.alsaconf.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit chown -R root:root . find . \ @@ -78,6 +78,7 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --sysconfdir=/etc \ + --disable-alsaconf \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 diff --git a/source/ap/cdrdao/cdrdao-1.2.3-stat.patch b/source/ap/cdrdao/cdrdao-1.2.3-stat.patch new file mode 100644 index 00000000..5a68e713 --- /dev/null +++ b/source/ap/cdrdao/cdrdao-1.2.3-stat.patch @@ -0,0 +1,13 @@ +diff -up cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat cdrdao-1.2.3/dao/ScsiIf-linux.cc +--- cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat 2010-01-20 20:11:36.000000000 +0100 ++++ cdrdao-1.2.3/dao/ScsiIf-linux.cc 2010-01-20 20:14:07.000000000 +0100 +@@ -19,6 +19,9 @@ + + #include + ++#include ++#include ++ + #include + #include + #include diff --git a/source/ap/cdrdao/cdrdao.SlackBuild b/source/ap/cdrdao/cdrdao.SlackBuild index 95216d51..fe3c5b7d 100755 --- a/source/ap/cdrdao/cdrdao.SlackBuild +++ b/source/ap/cdrdao/cdrdao.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=1.2.3 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -61,6 +61,9 @@ cd $TMP rm -rf cdrdao-$VERSION tar xvf $CWD/cdrdao-$VERSION.tar.?z* || exit 1 cd cdrdao-$VERSION + +zcat $CWD/cdrdao-1.2.3-stat.patch.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/ap/diffutils/diffutils.SlackBuild b/source/ap/diffutils/diffutils.SlackBuild index f338b71d..2287abb2 100755 --- a/source/ap/diffutils/diffutils.SlackBuild +++ b/source/ap/diffutils/diffutils.SlackBuild @@ -22,7 +22,7 @@ PKGNAM=diffutils -VERSION=3.0 +VERSION=${VERSION:-$(echo diffutils-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/ap/dmapi/slack-desc b/source/ap/dmapi/slack-desc index c5acf491..9cbfcfa9 100644 --- a/source/ap/dmapi/slack-desc +++ b/source/ap/dmapi/slack-desc @@ -10,7 +10,7 @@ dmapi: dmapi (Data Management API library) dmapi: dmapi: A library required to use the Data Management API (DMAPI). dmapi: This interface is defined in the X/Open document 'Systems Management: -dmapi: Data Storage Managment (XDSM) API' dated February 1997. +dmapi: Data Storage Management (XDSM) API' dated February 1997. dmapi: dmapi: The DMAPI library is used by the xfsdump utility. dmapi: diff --git a/source/ap/ghostscript/ghostscript.SlackBuild b/source/ap/ghostscript/ghostscript.SlackBuild index ff9fac9e..4afef964 100755 --- a/source/ap/ghostscript/ghostscript.SlackBuild +++ b/source/ap/ghostscript/ghostscript.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=ghostscript VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -60,10 +60,7 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 cd ${PKGNAM}-$VERSION -# Bugfix: -zcat $CWD/ghostscript.rev11948.diff.gz | patch -p1 --verbose || exit 1 - -## Regenerate ./configure: +## Regenerate ./configure (if patched): #sh autogen.sh # Make sure ownerships and permissions are sane: @@ -104,6 +101,8 @@ CFLAGS="$SLKCFLAGS" \ --with-ijs \ --disable-compile-inits \ --enable-dynamic \ + --enable-cups \ + --with-install-cups \ --enable-cairo=no \ --program-prefix= \ --program-suffix= \ @@ -124,6 +123,13 @@ if [ -r $PKG/usr/share/ghostscript/${VERSION}/Resource/Init/cidfmap ]; then zcat $CWD/cidfmap.gz > $PKG/usr/share/ghostscript/${VERSION}/Resource/Init/cidfmap.new fi +# Many programs expect to find this filter with the old name: +( cd $PKG/usr/lib${LIBDIRSUFFIX}/cups/filter + if [ ! -e pstoraster ]; then + ln -sf gstoraster pstoraster + fi +) + # Strip binaries: ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -164,6 +170,17 @@ mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION ln -sf /usr/share/ghostscript/$VERSION/doc doc ) +# Version 9.02 fails to install History9.htm, but also the full unabridged +# history of Ghostscript is not required here. See the source for that. +( cd doc + cp -a \ + History*.htm \ + $PKG/usr/share/ghostscript/$VERSION/doc + rm -f $PKG/usr/share/ghostscript/$VERSION/doc/History{1,2,3,4,5,6,7,8}.htm + chown root:root $PKG/usr/share/ghostscript/$VERSION/doc/History*htm + chmod 644 $PKG/usr/share/ghostscript/$VERSION/doc/History*htm +) + cd $TMP cp -a ${PKGNAM}-${VERSION}/examples/cjk $PKG/usr/share/ghostscript/${VERSION}/examples/ diff --git a/source/ap/ghostscript/ghostscript.rev11948.diff b/source/ap/ghostscript/ghostscript.rev11948.diff deleted file mode 100644 index cc45c154..00000000 --- a/source/ap/ghostscript/ghostscript.rev11948.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- ./base/gximag3x.c.orig 2010-08-10 11:20:19.000000000 -0500 -+++ ./base/gximag3x.c 2010-12-28 13:24:54.000000000 -0600 -@@ -241,7 +241,9 @@ - const gs_image3x_mask_t *pixm = - (i == 0 ? &pim->Opacity : &pim->Shape); - -- *(gs_data_image_t *)&mask[i].image = pixm->MaskDict; -+ /* Use memcpy because direct assignment breaks ANSI aliasing */ -+ /* rules and causes SEGV with gcc 4.5.1 */ -+ memcpy(&mask[i].image, &pixm->MaskDict, sizeof(pixm->MaskDict)); - mask[i].image.type = type1; - mask[i].image.BitsPerComponent = pixm->MaskDict.BitsPerComponent; - } diff --git a/source/ap/htop/htop.SlackBuild b/source/ap/htop/htop.SlackBuild new file mode 100755 index 00000000..b27481e9 --- /dev/null +++ b/source/ap/htop/htop.SlackBuild @@ -0,0 +1,122 @@ +#!/bin/sh + +# Copyright 2011 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=htop +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --build=$ARCH-slackware-linux + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# Install documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* NEWS README* TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/ap/htop/slack-desc b/source/ap/htop/slack-desc new file mode 100644 index 00000000..039b7195 --- /dev/null +++ b/source/ap/htop/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +htop: htop (ncurses-based interactive process viewer) +htop: +htop: htop is a free (GPL) ncurses-based process viewer that is similar to +htop: the well-known "top" program, but allows to scroll the list vertically +htop: and horizontally to see all processes and their full command lines. +htop: Tasks related to processes (killing, renicing) can be done without +htop: entering their PIDs. +htop: +htop: htop is developed by Hisham Muhammad. +htop: Homepage: http://htop.sf.net +htop: diff --git a/source/ap/linuxdoc-tools/ChangeLog.txt b/source/ap/linuxdoc-tools/ChangeLog.txt index 16d8783f..0c971b35 100644 --- a/source/ap/linuxdoc-tools/ChangeLog.txt +++ b/source/ap/linuxdoc-tools/ChangeLog.txt @@ -1,3 +1,28 @@ +Fri Jun 29 17:34:25 BST 2012 + Stuart Winter + linuxdoc-tools 0.9.67, build 2. + * Made a compatibility symlink between + /usr/share/xml/docbook/stylesheet/docbook-xsl -> /usr/share/xml/docbook/xsl-stylesheets- + Thanks to Patrick Verner for the suggestion. + +Mon May 28 21:40:41 BST 2012 + Stuart Winter + linuxdoc-tools 0.9.67, build 1 + * Removed the files that were overlapping with the 'Python' (and any other) package. + * Upgraded to linuxdoc-tools 0.9.67 + * Upgraded to gnome-doc-utils 0.20.10 + * Upgraded to xmlto-0.0.25 + * Upgraded to gtk-doc-1.18 + * Upgraded to AsciiDoc-8.6.7 + * Upgraded to DocBook XSL Stylesheets 1.76.1 + * Fix OpenJade FTBFS with Perl 5.16 installed: Copy the perl4 corelib 'getopts.pl' + into OpenJade's build directory as a build-time work-around. + +Sun May 15 03:42:16 UTC 2011 + Patrick Volkerding + linuxdoc-tools 0.9.66, build 9 + Rebuild for perl-5.14.0. + Mon Mar 21 17:39:48 UTC 2011 Patrick Volkerding linuxdoc-tools 0.9.66, build 8 diff --git a/source/ap/linuxdoc-tools/arm/build b/source/ap/linuxdoc-tools/arm/build index eb4f18c8..f5a418d9 100755 --- a/source/ap/linuxdoc-tools/arm/build +++ b/source/ap/linuxdoc-tools/arm/build @@ -9,9 +9,9 @@ source /usr/share/slackdev/buildkit.sh # Package metadata: export PKGNAM=linuxdoc-tools -export VERSION=${VERSION:-0.9.66} +export VERSION=${VERSION:-0.9.67} export PKGARCH=${PKGARCH:-arm} -export BUILD=${BUILD:-4} +export BUILD=${BUILD:-2} export PKGSERIES=${PKGSERIES:-ap} export SLACKPACKAGE=$PKGNAM-$VERSION-$PKGARCH-$BUILD.tgz export PKGEXT=${PKGEXT:-tgz} diff --git a/source/ap/linuxdoc-tools/linuxdoc-tools.build b/source/ap/linuxdoc-tools/linuxdoc-tools.build index fe3506cc..27f3a53c 100755 --- a/source/ap/linuxdoc-tools/linuxdoc-tools.build +++ b/source/ap/linuxdoc-tools/linuxdoc-tools.build @@ -20,21 +20,21 @@ LINUXDOCTOOLSVER=$PKGVERSION SGMLDTD3VER=3.1 SGMLDTD4VER=4.5 XMLDTDVER=4.5 -XSLSTYLESHEETSVER=1.75.2 +XSLSTYLESHEETSVER=1.76.1 DSSSLSTYLESHEETSVER=1.79 SGMLCOMMONVER=0.6.3 OPENJADEVER=1.3.3-pre1 OPENSPVER=1.5.2 -GNOMEDOCUTILSVER=0.20.4 -GTKDOCVER=1.15 +GNOMEDOCUTILSVER=0.20.10 +GTKDOCVER=1.18 SGMLSPLVER=1.03ii -XMLTOVER=0.0.23 -ASCIIDOCVER=8.6.2 +XMLTOVER=0.0.25 +ASCIIDOCVER=8.6.7 DOCBOOKUTILSVER=0.6.14 # Determine the general CFLAGS for the known architectures: case $ARCH in - arm) export SLKCFLAGS="-O2 -march=armv4t" + arm) export SLKCFLAGS="-O2 -march=armv5te" export LIBDIRSUFFIX="" export HOSTTARGET="-gnueabi" ;; @@ -71,7 +71,7 @@ find . \ -exec chmod 644 {} \; # Revert a change that breaks processing the git documentation: -xz -dc $CWD/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff.xz | patch --verbose -p1 || exit 1 +# xz -dc $CWD/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff.xz | patch --verbose -p1 || exit 1 # Configure: ./configure \ @@ -356,6 +356,15 @@ find . \ # Apply patches: sed -i "s/iostream.h/iostream/g" style/MultiLineInlineNote.cxx +# GCC 4.6 patch: +xz -dc $CWD/sources/openjade-1.3.2-gcc46.patch.xz | patch --verbose -p1 || exit 1 + +# Install the old Perl 4 'getopts' function. This has been deprecated in Perl 5.16 +# and since it seems that OpenJade isn't being actively released by upstream, we'll +# work around by supplying it to OpenJade directly. It's only a build-time fix anyway +# so it's ok to have a dirty work-around: +xz -dc $CWD/sources/openjade-1.3-getopts.pl.xz > getopts.pl + # Configure without optimisation. # OpenSP & OpenJade are sensitive to optimisations and can result # in segfaults with anything other than O2 - particularly on the ARM @@ -374,8 +383,8 @@ sed -i "s/iostream.h/iostream/g" style/MultiLineInlineNote.cxx --datadir=/usr/share/sgml/openjade-$OPENJADEVER \ || exit 1 -# Build: -make || exit 1 +# Build (setting the perl library to be the PWD so it finds the old 'getopts.pl'): +make PERL5LIB=$PWD || exit 1 # Install: mkdir -p /etc/sgml @@ -689,6 +698,7 @@ find . \ # Apply patches: for i in \ + docbook-xsl-mandir.patch \ docbook-xsl-list-item-body.patch \ docbook-xsl-marginleft.patch \ docbook-xsl-newmethods.patch \ @@ -704,6 +714,12 @@ cp -fav \ htmlhelp images javahelp lib manpages params profiling \ slides template tools website wordml xhtml \ /usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER +# Some Linux distributions have this here, so we install a compatibility symlink: +# (this convoluted way of doing it is for makepkg's benefit) +mkdir -vpm755 /usr/share/xml/docbook/stylesheet +( cd /usr/share/xml/docbook/stylesheet + rm -fv docbook-xsl + ln -vfs ../xsl-stylesheets-$XSLSTYLESHEETSVER docbook-xsl ) # Create config files: if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi @@ -742,9 +758,9 @@ cp -fav doc/* README* RELEASE-NOTES* NEWS* \ # Extract source: cd $TMP mkdir xmlto && cd xmlto -#tar xvf $CWD/sources/xmlto-$XMLTOVER.tar.*z* -rpm2cpio $CWD/sources/xmlto-${XMLTOVER}*.src.rpm | cpio -div || exit 1 -tar xvvf xmlto-$XMLTOVER.tar.*z* +tar xvf $CWD/sources/xmlto-$XMLTOVER.tar.*z* +#rpm2cpio $CWD/sources/xmlto-${XMLTOVER}*.src.rpm | cpio -div || exit 1 +#tar xvvf xmlto-$XMLTOVER.tar.*z* cd xmlto-$XMLTOVER || exit 1 chown -R root:root . find . \ @@ -753,9 +769,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Apply patches: -patch --verbose -p1 < ../xmlto-0.0.23-Lchapterpassivetex.patch || exit 1 - # Configure: ./configure \ --prefix=/usr \ @@ -942,13 +955,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Apply patch to fix problem with vim: -xz -dc $CWD/sources/gtk-doc.patch.xz | patch --verbose -p1 || exit 1 - # Configure: ./configure \ --prefix=/usr \ - --enable-public-id \ --disable-scrollkeeper \ || exit 1 diff --git a/source/ap/linuxdoc-tools/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff b/source/ap/linuxdoc-tools/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff deleted file mode 100644 index 2bdc7de4..00000000 --- a/source/ap/linuxdoc-tools/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff +++ /dev/null @@ -1,80 +0,0 @@ ---- a/asciidoc.py 2010-10-17 14:01:35.000000000 +0800 -+++ b/asciidoc.py 2010-10-17 14:11:07.000000000 +0800 -@@ -4260,10 +4260,12 @@ - self.include1 = {} # Holds include1::[] files for {include1:}. - self.dumping = False # True if asciidoc -c option specified. - -- def load_file(self,fname,dir=None): -+ def load_file(self, fname, dir=None, include=[]): - """ - Loads sections dictionary with sections from file fname. - Existing sections are overlaid. -+ The 'include' list contains the section names to be loaded, -+ if 'inlude' is not specified all sections are loaded. - Return False if no file was found in any of the locations. - """ - if dir: -@@ -4317,9 +4319,14 @@ - else: - sections[section] = contents - rdr.close() -+ if include: -+ for s in set(sections) - set(include): -+ del sections[s] - attrs = {} - self.load_sections(sections,attrs) -- self.loaded.append(os.path.realpath(fname)) -+ if not include: -+ # If all sections are loaded mark this file as loaded. -+ self.loaded.append(os.path.realpath(fname)) - document.update_attributes(attrs) # So they are available immediately. - return True - -@@ -5314,13 +5321,17 @@ - if o == '-c': config.dumping = True - if o == '-s': config.header_footer = False - if o == '-v': config.verbose = True -- # Check the infile exists. -- if infile != '' and not os.path.isfile(infile): -- raise EAsciiDoc,'input file %s missing' % infile -- document.infile = infile - # Load asciidoc.conf files. - if not config.load_from_dirs('asciidoc.conf'): - raise EAsciiDoc,'configuration file asciidoc.conf missing' -+ # Check the infile exists. -+ if infile != '': -+ if not os.path.isfile(infile): -+ raise EAsciiDoc,'input file %s missing' % infile -+ indir = os.path.dirname(infile) -+ config.load_file('asciidoc.conf', indir, -+ ['attributes','titles','specialchars']) -+ document.infile = infile - AttributeList.initialize() - # Open input file and parse document header. - reader.tabsize = config.tabsize -@@ -5343,10 +5354,9 @@ - document.load_lang() - # Load local conf files (conf files in the input file directory). - if infile != '': -- d =os.path.dirname(infile) -- config.load_from_dirs('asciidoc.conf', [d]) -- config.load_backend([d]) -- config.load_filters([d]) -+ config.load_file('asciidoc.conf', indir) -+ config.load_backend([indir]) -+ config.load_filters([indir]) - # Load document specific configuration files. - f = os.path.splitext(infile)[0] - config.load_file(f + '.conf') ---- a/doc/asciidoc.txt 2010-10-17 14:11:34.000000000 +0800 -+++ b/doc/asciidoc.txt 2010-10-17 14:13:21.000000000 +0800 -@@ -3632,6 +3632,8 @@ - the following order: - - - `asciidoc.conf` from locations 1, 2, 3. -+- 'attributes', 'titles' and 'specialcharacters' sections from the -+ `asciidoc.conf` in location 4. - - The document header is parsed at this point. - - `.conf` and `-.conf` from locations 1, - 2,3. - diff --git a/source/ap/linuxdoc-tools/sources/gtk-doc.patch b/source/ap/linuxdoc-tools/sources/gtk-doc.patch deleted file mode 100644 index bf32d557..00000000 --- a/source/ap/linuxdoc-tools/sources/gtk-doc.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0 Mon Sep 17 00:00:00 2001 -From: Stefan Kost -Date: Thu, 19 Aug 2010 14:45:54 +0000 -Subject: fixxref: tweak the vim invocation - -Use specific output-filename to ensure we get what we'll late use. Use "-u NONE" -instead of -u /dev/null. -Fixes #627223 ---- -diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in -index 33a31b8..9f53852 100755 ---- a/gtkdoc-fixxref.in -+++ b/gtkdoc-fixxref.in -@@ -464,7 +464,7 @@ sub HighlightSourceVim { - close (NEWFILE); - - # format source -- system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|wa!|qa!' | @HIGHLIGHT@ -n -e -u /dev/null -T xterm >/dev/null"; -+ system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|w! $temp_source_file.html|qa!' | @HIGHLIGHT@ -n -e -u NONE -T xterm >/dev/null"; - - my $highlighted_source; - { --- -cgit v0.8.3.1 - diff --git a/source/ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl b/source/ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl new file mode 100644 index 00000000..5b18fe00 --- /dev/null +++ b/source/ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl @@ -0,0 +1,65 @@ +;# getopts.pl - a better getopt.pl +# +# This library is no longer being maintained, and is included for backward +# compatibility with Perl 4 programs which may require it. +# +# In particular, this should not be used as an example of modern Perl +# programming techniques. +# +# Suggested alternatives: Getopt::Long or Getopt::Std +# +;# Usage: +;# do Getopts('a:bc'); # -a takes arg. -b & -c not. Sets opt_* as a +;# # side effect. + +sub Getopts { + local($argumentative) = @_; + local(@args,$_,$first,$rest); + local($errs) = 0; + + @args = split( / */, $argumentative ); + while(@ARGV && ($_ = $ARGV[0]) =~ /^-(.)(.*)/) { + ($first,$rest) = ($1,$2); + $pos = index($argumentative,$first); + if($pos >= 0) { + if($args[$pos+1] eq ':') { + shift(@ARGV); + if($rest eq '') { + ++$errs unless(@ARGV); + $rest = shift(@ARGV); + } + eval " + push(\@opt_$first, \$rest); + if (!defined \$opt_$first or \$opt_$first eq '') { + \$opt_$first = \$rest; + } + else { + \$opt_$first .= ' ' . \$rest; + } + "; + } + else { + eval "\$opt_$first = 1"; + if($rest eq '') { + shift(@ARGV); + } + else { + $ARGV[0] = "-$rest"; + } + } + } + else { + print STDERR "Unknown option: $first\n"; + ++$errs; + if($rest ne '') { + $ARGV[0] = "-$rest"; + } + else { + shift(@ARGV); + } + } + } + $errs == 0; +} + +1; diff --git a/source/ap/linuxdoc-tools/sources/openjade-1.3.2-gcc46.patch b/source/ap/linuxdoc-tools/sources/openjade-1.3.2-gcc46.patch new file mode 100644 index 00000000..962ac19f --- /dev/null +++ b/source/ap/linuxdoc-tools/sources/openjade-1.3.2-gcc46.patch @@ -0,0 +1,82 @@ +If a class or struct has no user-defined default constructor, C++ doesn't +allow you to default construct a const instance of it. + +https://bugs.gentoo.org/358021 +http://clang.llvm.org/compatibility.html#default_init_const +http://gcc.gnu.org/PR44499 + + +--- a/jade/TeXFOTBuilder.cxx ++++ b/jade/TeXFOTBuilder.cxx +@@ -88,6 +88,8 @@ public: + value.convertString(nic_.placement); + } + ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); } ++ public: ++ PageFloatFlowObj() {} + private: + PageFloatNIC nic_; + StringC name_; +@@ -101,6 +103,8 @@ public: + fotb.endPageFootnote(); + } + ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); } ++ public: ++ PageFootnoteFlowObj() {} + private: + }; + ////////////////////////////////////////////////////////////////////// +--- a/jade/TransformFOTBuilder.cxx ++++ b/jade/TransformFOTBuilder.cxx +@@ -41,6 +41,7 @@ public: + }; + class EntityRefFlowObj : public TransformExtensionFlowObj { + public: ++ EntityRefFlowObj() {} + void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { + fotb.entityRef(name_); + } +@@ -56,6 +57,7 @@ public: + }; + class ProcessingInstructionFlowObj : public TransformExtensionFlowObj { + public: ++ ProcessingInstructionFlowObj() {} + void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { + fotb.processingInstruction(data_); + } +@@ -98,6 +100,8 @@ public: + } + } + ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); } ++ public: ++ EmptyElementFlowObj() {} + private: + ElementNIC nic_; + }; +@@ -133,6 +137,8 @@ public: + } + } + ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); } ++ public: ++ ElementFlowObj() {} + private: + ElementNIC nic_; + }; +@@ -150,6 +156,8 @@ public: + value.convertString(systemId_); + } + ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); } ++ public: ++ EntityFlowObj() {} + private: + StringC systemId_; + }; +@@ -174,6 +182,8 @@ public: + } + } + ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); } ++ public: ++ DocumentTypeFlowObj() {} + private: + DocumentTypeNIC nic_; + }; diff --git a/source/ap/linuxdoc-tools/sources/source.download b/source/ap/linuxdoc-tools/sources/source.download index 40e05d21..c9608b2b 100755 --- a/source/ap/linuxdoc-tools/sources/source.download +++ b/source/ap/linuxdoc-tools/sources/source.download @@ -7,24 +7,27 @@ # linuxdoc-tools: # This provides things such as sgml2txt. -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/linuxdoc-tools-0.9.66-6.fc14.src.rpm +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/l/linuxdoc-tools-0.9.67-1.fc18.src.rpm # OpenSP: # http://openjade.sourceforge.net/download.html # wget -c http://kent.dl.sourceforge.net/sourceforge/openjade/OpenSP-1.5.2.tar.gz # -wget -c http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/opensp-1.5.2-12.fc12.src.rpm - +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/o/opensp-1.5.2-14.fc17.src.rpm # OpenJade: # http://openjade.sourceforge.net/ +# We're using a gcc 4.6 patch from Fedora's SRPM: +# ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/o/openjade-1.3.2-39.fc17.src.rpm +# And we're using the old Perl 4 core libraries (as a dirty but effective build time work-around) taken from: +# http://packages.debian.org/sid/libperl4-corelibs-perl +# http://ftp.de.debian.org/debian/pool/main/libp/libperl4-corelibs-perl/libperl4-corelibs-perl_0.003.orig.tar.gz wget -c http://downloads.sourceforge.net/openjade/openjade-1.3.3-pre1.tar.gz - # sgmltools-common. # It's broken and needs patching so we'll use Fedora's. #wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-0.6.3.tgz -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/sgml-common-0.6.3-33.fc14.src.rpm +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/s/sgml-common-0.6.3-36.fc17.src.rpm # DocBook docs: @@ -34,8 +37,7 @@ wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/ #wget -c http://www.docbook.org/sgml/4.5/docbook-4.5.zip # We use Debian's source because it's more convenient since they package all versions in one archive: wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook/docbook_4.5.orig.tar.gz - - +# # http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-dsssl.html # Check versions: # http://sourceforge.net/projects/docbook/files/ @@ -43,13 +45,13 @@ wget -c ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/docbook-dsssl-1.79.tar wget -c http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-doc-1.79.tar.bz2 # Why don't they put the patches into the distributed source...??? #wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/docbook-utils-0.6.14-24.fc14.src.rpm - +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook-utils-0.6.14-30.fc17.src.rpm +# # wget -c http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip # https://sourceforge.net/project/showfiles.php?group_id=21935&package_id=16608 -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/docbook-style-xsl-1.75.2-6.fc14.src.rpm - +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook-style-xsl-1.76.1-5.fc17.src.rpm +# # We use the Fedora "docbook-style-xsl" SRPM for this rather than the original source which is why # these "docbook-xsl*" files aren't in our sources directory. #wget -c "http://downloads.sourceforge.net/project/docbook/docbook-xsl/1.75.2/docbook-xsl-1.75.2.tar.bz2?use_mirror=freefr" @@ -61,13 +63,13 @@ wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/ # I guess this mirror is out of date now. It's easier to just look at Fedora's development # directory anyway :-) # wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.0.tar.bz2 -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/gnome-doc-utils-0.20.1-1.fc14.src.rpm +wget ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/g/gnome-doc-utils-0.20.10-2.fc18.src.rpm # gtk-doc: # When upgrading this, it's worth checking the Fedora SRPM. For version 1.13 # we're carrying a fix for gtk-doc-fixref. Make sure newer versions don't need # any patches! -wget -c http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.15/gtk-doc-1.15.tar.bz2 +wget -c http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.18/gtk-doc-1.18.tar.bz2 # http://git.gnome.org/browse/gtk-doc/commit/?id=2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0 # sgmlspl @@ -76,14 +78,12 @@ wget -c http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.15/gtk-doc-1.15.tar.bz2 wget -c http://ftp.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii.orig.tar.gz wget -c http://ftp.de.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii-32.diff.gz - # xmlto # https://fedorahosted.org/releases/x/m/xmlto # wget -c --no-check-certificate https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.23.tar.bz2 -# Fedora 14 includes a patch, so we'll take it: -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/xmlto-0.0.23-3.fc13.src.rpm - +# Fedora includes a patch, so we'll take it: +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/x/xmlto-0.0.25-2.fc17.src.rpm # AsciiDoc # http://www.methods.co.nz/asciidoc/ -wget -c "http://sourceforge.net/projects/asciidoc/files/asciidoc/8.6.2/asciidoc-8.6.2.tar.gz/download" +wget -c "http://sourceforge.net/projects/asciidoc/files/asciidoc/8.6.7/asciidoc-8.6.7.tar.gz/download" diff --git a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools index e6f23002..3ed08998 100755 --- a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools +++ b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools @@ -31,8 +31,8 @@ if [ -z "$ARCH" ]; then esac fi -export PKGVERSION=0.9.66 # use the version of linuxdoc-tools as the package version. -BUILD=${BUILD:-8} +export PKGVERSION=0.9.67 # use the version of linuxdoc-tools as the package version. +BUILD=${BUILD:-2} PKGEXT=${PKGEXT:-txz} export CWD=$PWD diff --git a/source/ap/lm_sensors/lm_sensors.SlackBuild b/source/ap/lm_sensors/lm_sensors.SlackBuild index 83785a56..cb1b26cc 100755 --- a/source/ap/lm_sensors/lm_sensors.SlackBuild +++ b/source/ap/lm_sensors/lm_sensors.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ PKGNAM=lm_sensors -VERSION=${VERSION:-3.1.2} +VERSION=${VERSION:-3.3.2} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/ap/lsscsi/lsscsi.SlackBuild b/source/ap/lsscsi/lsscsi.SlackBuild index e0ed72fe..3c034b82 100755 --- a/source/ap/lsscsi/lsscsi.SlackBuild +++ b/source/ap/lsscsi/lsscsi.SlackBuild @@ -110,9 +110,17 @@ fi # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README \ + AUTHORS COPYING CREDITS INSTALL NEWS README \ $PKG/usr/doc/${PKGNAM}-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install #zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/ap/lxc/lxc.SlackBuild b/source/ap/lxc/lxc.SlackBuild index 15df88c6..7b82f89e 100755 --- a/source/ap/lxc/lxc.SlackBuild +++ b/source/ap/lxc/lxc.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=lxc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d -)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/man-pages/man-pages.SlackBuild b/source/ap/man-pages/man-pages.SlackBuild index 8930798b..85cfc0d2 100755 --- a/source/ap/man-pages/man-pages.SlackBuild +++ b/source/ap/man-pages/man-pages.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -33,7 +33,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf man-pages-$VERSION -tar xf $CWD/man-pages-$VERSION.tar.bz2 +tar xf $CWD/man-pages-$VERSION.tar.xz tar xf $CWD/man-pages-posix-2003-a.tar.bz2 chown -R root:root man-pages-$VERSION man-pages-posix-2003-a chmod -R a-s,u+rw,go+r-w man-pages-$VERSION man-pages-posix-2003-a diff --git a/source/ap/mc/mc.SlackBuild b/source/ap/mc/mc.SlackBuild index 87e929ac..21d997db 100755 --- a/source/ap/mc/mc.SlackBuild +++ b/source/ap/mc/mc.SlackBuild @@ -22,7 +22,7 @@ VERSION=${VERSION:-$(echo mc-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -56,6 +56,7 @@ cd $TMP rm -rf mc-$VERSION tar xvf $CWD/mc-$VERSION.tar.xz || exit 1 cd mc-$VERSION || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -63,8 +64,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix tmp path for saving files: +zcat $CWD/mc.save.file.diff.gz | patch -p1 --verbose || exit 1 + # Use geeqie instead of gqview as an external image viewer: -zcat $CWD/mc.ext.in.geeqie.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/mc.image.sh.geeqie.diff.gz | patch -p1 --verbose || exit 1 if [ ! -x ./configure ]; then ./autogen.sh @@ -106,8 +110,20 @@ cp -a $CWD/profile.d/mc.* $PKG/etc/profile.d chown root:root $PKG/etc/profile.d/* chmod 755 $PKG/etc/profile.d/* -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/mc-$VERSION cp -a \ diff --git a/source/ap/mc/mc.ext.in.geeqie.diff b/source/ap/mc/mc.ext.in.geeqie.diff deleted file mode 100644 index 8cdfecca..00000000 --- a/source/ap/mc/mc.ext.in.geeqie.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./misc/mc.ext.in.orig 2010-11-08 05:46:13.000000000 -0600 -+++ ./misc/mc.ext.in 2010-11-11 14:34:30.000000000 -0600 -@@ -391,7 +391,7 @@ - Include=image - - include/image -- Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi -+ Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (geeqie %f &); fi - View=%view{ascii} identify %f - #View=%view{ascii} asciiview %f - diff --git a/source/ap/mc/mc.image.sh.geeqie.diff b/source/ap/mc/mc.image.sh.geeqie.diff new file mode 100644 index 00000000..413807e9 --- /dev/null +++ b/source/ap/mc/mc.image.sh.geeqie.diff @@ -0,0 +1,11 @@ +--- ./misc/ext.d/image.sh.orig 2012-07-18 04:30:23.000000000 -0500 ++++ ./misc/ext.d/image.sh 2012-09-08 14:39:11.998159169 -0500 +@@ -36,7 +36,7 @@ + if [ "$DISPLAY" = "" ]; then + zgv "${MC_EXT_FILENAME}" + else +- (gqview "${MC_EXT_FILENAME}" &) ++ (geeqie "${MC_EXT_FILENAME}" &) + fi + ;; + esac diff --git a/source/ap/mc/mc.save.file.diff b/source/ap/mc/mc.save.file.diff new file mode 100644 index 00000000..f54748c1 --- /dev/null +++ b/source/ap/mc/mc.save.file.diff @@ -0,0 +1,37 @@ +diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c +index 2261aaa..536ac7e 100644 +--- a/src/editor/editcmd.c ++++ b/src/editor/editcmd.c +@@ -222,7 +222,8 @@ edit_save_file (WEdit * edit, const vfs_path_t * filename_vpath) + if (savedir == NULL) + savedir = g_strdup ("."); + +- saveprefix = mc_build_filename (savedir, "cooledit", NULL); ++ /* Token-related function never return leading slash, so we need add it manually */ ++ saveprefix = mc_build_filename ("/", savedir, "cooledit", NULL); + g_free (savedir); + fd = mc_mkstemps (&savename_vpath, saveprefix, NULL); + g_free (saveprefix); +@@ -365,13 +366,21 @@ edit_save_file (WEdit * edit, const vfs_path_t * filename_vpath) + + if (this_save_mode == EDIT_DO_BACKUP) + { ++ char *tmp_store_filename; ++ vfs_path_element_t *last_vpath_element; + vfs_path_t *tmp_vpath; + gboolean ok; + + #ifdef HAVE_ASSERT_H + assert (option_backup_ext != NULL); + #endif +- tmp_vpath = vfs_path_append_new (real_filename_vpath, option_backup_ext, (char *) NULL); ++ /* add backup extention to the path */ ++ tmp_vpath = vfs_path_clone (real_filename_vpath); ++ last_vpath_element = (vfs_path_element_t *) vfs_path_get_by_index (tmp_vpath, -1); ++ tmp_store_filename = last_vpath_element->path; ++ last_vpath_element->path = g_strdup_printf ("%s%s", tmp_store_filename, option_backup_ext); ++ g_free (tmp_store_filename); ++ + ok = (mc_rename (real_filename_vpath, tmp_vpath) != -1); + vfs_path_free (tmp_vpath); + if (!ok) diff --git a/source/ap/moc/moc.SlackBuild b/source/ap/moc/moc.SlackBuild index 48ae54b9..35f6fc5f 100755 --- a/source/ap/moc/moc.SlackBuild +++ b/source/ap/moc/moc.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=moc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d -)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/mysql/README.mysql-embedded b/source/ap/mysql/README.mysql-embedded new file mode 100644 index 00000000..21b519e9 --- /dev/null +++ b/source/ap/mysql/README.mysql-embedded @@ -0,0 +1,7 @@ +The mysql-embedded.SlackBuild produces a package containing +a static libmysqld.a library (and some support files) that +is required in order to build applications that embed a +mysql server (such as amarok). If you need to build such +applications, first you'll need to use this SlackBuild to +prepare a mysql package that contains embedded support and +install it on your system. diff --git a/source/ap/mysql/doinst.sh b/source/ap/mysql/doinst.sh index 22f77474..a5d835fa 100644 --- a/source/ap/mysql/doinst.sh +++ b/source/ap/mysql/doinst.sh @@ -19,4 +19,5 @@ if [ -e etc/rc.d/rc.mysqld ]; then fi config etc/rc.d/rc.mysqld.new +config etc/mysqlaccess.conf.new diff --git a/source/ap/mysql/mirror-url b/source/ap/mysql/mirror-url new file mode 100644 index 00000000..33ff56b0 --- /dev/null +++ b/source/ap/mysql/mirror-url @@ -0,0 +1 @@ +http://cdn.mysql.com/Downloads/MySQL-5.5/mysql-5.5.25a.tar.gz diff --git a/source/ap/mysql/mysql-embedded.SlackBuild b/source/ap/mysql/mysql-embedded.SlackBuild new file mode 100755 index 00000000..f5f178a9 --- /dev/null +++ b/source/ap/mysql/mysql-embedded.SlackBuild @@ -0,0 +1,221 @@ +#!/bin/sh + +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Build and install MySQL on Slackware +# by: David Cantrell +# Currently maintained by: Patrick Volkerding + + +VERSION=${VERSION:-$(echo mysql-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-mysql + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf mysql-$VERSION +tar xvf $CWD/mysql-$VERSION.tar.?z* || exit 1 +cd mysql-$VERSION + +if ls $CWD/*.diff.gz 1> /dev/null 2> /dev/null ; then + for patch in $CWD/*.diff.gz ; do + zcat $patch | patch -p1 --verbose || exit 1 + done +fi + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +mkdir build +cd build +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -felide-constructors -fno-exceptions -fno-rtti" \ +CXX=gcc \ +cmake \ + -DBUILD_CONFIG=mysql_release \ + -DFEATURE_SET="community" \ + -DINSTALL_LAYOUT="RPM" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DINSTALL_LIBDIR="lib${LIBDIRSUFFIX}" \ + -DINSTALL_SBINDIR=libexec \ + -DINSTALL_INCLUDEDIR=include/mysql \ + -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DINSTALL_SQLBENCHDIR= \ + -DINSTALL_MYSQLTESTDIR=mysql-test \ + -DINSTALL_INFODIR=info \ + -DINSTALL_MANDIR=man \ + -DINSTALL_PLUGINDIR="lib${LIBDIRSUFFIX}/mysql/plugin" \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_SUPPORTFILESDIR=share/mysql \ + -DINSTALL_MYSQLDATADIR="/var/lib/mysql" \ + -DMYSQL_DATADIR="/var/lib/mysql" \ + -DMYSQL_UNIX_ADDR="/var/run/mysql/mysql.sock" \ + -DWITH_EXTRA_CHARSETS=complex \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DENABLED_LOCAL_INFILE=ON \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_READLINE=ON \ + -DWITH_SSL=system \ + -DWITH_ZLIB=system \ + .. + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG + +# Install sample configuration files: +mkdir -p $PKG/etc/mysql +cp support-files/my-*.cnf $PKG/etc/mysql + +# Move mysqlaccess.conf to a more proper place +mv $PKG/usr/bin/mysqlaccess.conf $PKG/etc/mysqlaccess.conf.new +chmod 644 $PKG/etc/mysqlaccess.conf.new + +# Leave build directory: +cd .. + +# install additional headers needed for building external engine plugins: +mkdir -p $PKG/usr/include/mysql/private/atomic + +install -m 644 regex/my_regex.h $PKG/usr/include/mysql/private/ + +for i in sql include; do + for j in $i/*.h; do + install -m 644 $j $PKG/usr/include/mysql/private/ + done +done + +for i in include/atomic/*.h; do + install -m 644 $i $PKG/usr/include/mysql/private/atomic/ +done + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Install docs +mkdir -p $PKG/usr/doc/mysql-$VERSION/Docs +cp -a \ + BUILD* COPYING* EXCEPTIONS* INSTALL-SOURCE README* VERSION \ + $PKG/usr/doc/mysql-$VERSION +( cd Docs + # Seems most of the Docs/* are gone, but we'll leave the cp stuff + # in case it returns. + cp -a INFO_SRC INSTALL-BINARY *.html *.txt Flags \ + $PKG/usr/doc/mysql-$VERSION/Docs ) +## Too large to justify since the .html version is right there: +#rm $PKG/usr/doc/mysql-$VERSION/Docs/manual.txt +find $PKG/usr/doc/mysql-$VERSION -type f -exec chmod 0644 {} \; + +# This is the directory where databases are stored: +mkdir -p $PKG/var/lib/mysql +chown mysql.mysql $PKG/var/lib/mysql +chmod 0750 $PKG/var/lib/mysql + +# This is where the socket is stored: +mkdir -p $PKG/var/run/mysql +chown mysql.mysql $PKG/var/run/mysql +chmod 0755 $PKG/var/run/mysql + +# Do not package the test suite: +rm -rf $PKG/usr/mysql-test + +# More unpackaged things: +rm -f $PKG/usr/info/dir +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqlclient.a +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqlclient_r.* +( cd $PKG/usr/lib${LIBDIRSUFFIX} ; ln -sf libmysqlclient.so libmysqlclient_r.so ) + +# Add init script: +mkdir -p $PKG/etc/rc.d +# This is intentionally chmod 644. +zcat $CWD/rc.mysqld.gz > $PKG/etc/rc.d/rc.mysqld.new + +# Install script: +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# Compress info files, if any: +if [ -d $PKG/usr/info ]; then + ( cd $PKG/usr/info + rm -f dir + gzip -9 * + ) +fi + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +# Build package: +cd $PKG +/sbin/makepkg -l y -c n $TMP/mysql-$VERSION-$ARCH-${BUILD}_withembedded.txz diff --git a/source/ap/mysql/mysql-embedded.build b/source/ap/mysql/mysql-embedded.build deleted file mode 100755 index 004bb30d..00000000 --- a/source/ap/mysql/mysql-embedded.build +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -# Build and install MySQL on Slackware -# by: David Cantrell -# Currently maintained by: Patrick Volkerding - -VERSION=${VERSION:-$(echo mysql-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-mysql - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf mysql-$VERSION -tar xvf $CWD/mysql-$VERSION.tar.?z* || exit 1 -cd mysql-$VERSION - -if ls $CWD/*.diff.gz 1> /dev/null 2> /dev/null ; then - for patch in $CWD/*.diff.gz ; do - zcat $patch | patch -p1 --verbose || exit 1 - done -fi - -CFLAGS="$SLKCFLAGS -fPIC" CXXFLAGS="$SLKCFLAGS -fPIC" \ - ./configure --prefix=/usr --libdir=/usr/lib${LIBDIRSUFFIX} \ - --datadir=/usr/share --sysconfdir=/etc/mysql \ - --libexecdir=/usr/sbin --localstatedir=/var/lib/mysql \ - --without-docs --without-man --without-server \ - --with-embedded-server \ - --without-readline --disable-shared --with-charset=utf8 \ - --without-debug --with-pthread --without-ssl --without-query-cache \ - --without-geometry --with-pic - -make -j6 || make || exit 1 - -cp libmysqld/libmysqld.a /usr/lib${LIBDIRSUFFIX}/mysql/ - diff --git a/source/ap/mysql/mysql.SlackBuild b/source/ap/mysql/mysql.SlackBuild index ce149a15..6690c0f5 100755 --- a/source/ap/mysql/mysql.SlackBuild +++ b/source/ap/mysql/mysql.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -77,82 +77,104 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +mkdir build +cd build CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -felide-constructors -fno-exceptions -fno-rtti" \ CXX=gcc \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --with-mysqld-user=mysql \ - --with-unix-socket-path=/var/run/mysql/mysql.sock \ - --localstatedir=/var/lib/mysql \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --enable-assembler \ - --without-debug \ - --enable-thread-safe-client \ - --with-extra-charsets=complex \ - --with-ssl=/usr \ - --enable-largefile \ - --with-innodb \ - --with-readline \ - --build=$ARCH-slackware-linux -# -# --without-readline +cmake \ + -DBUILD_CONFIG=mysql_release \ + -DFEATURE_SET="community" \ + -DINSTALL_LAYOUT="RPM" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DINSTALL_LIBDIR="lib${LIBDIRSUFFIX}" \ + -DINSTALL_SBINDIR=libexec \ + -DINSTALL_INCLUDEDIR=include/mysql \ + -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DINSTALL_SQLBENCHDIR= \ + -DINSTALL_MYSQLTESTDIR=mysql-test \ + -DINSTALL_INFODIR=info \ + -DINSTALL_MANDIR=man \ + -DINSTALL_PLUGINDIR="lib${LIBDIRSUFFIX}/mysql/plugin" \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_SUPPORTFILESDIR=share/mysql \ + -DINSTALL_MYSQLDATADIR="/var/lib/mysql" \ + -DMYSQL_DATADIR="/var/lib/mysql" \ + -DMYSQL_UNIX_ADDR="/var/run/mysql/mysql.sock" \ + -DWITH_EXTRA_CHARSETS=complex \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DENABLED_LOCAL_INFILE=ON \ + -DWITH_EMBEDDED_SERVER=OFF \ + -DWITH_READLINE=ON \ + -DWITH_SSL=system \ + -DWITH_ZLIB=system \ + .. make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG -# install additional headers needed for building external engine plugins -for i in sql include regex; do +# Install sample configuration files: +mkdir -p $PKG/etc/mysql +cp support-files/my-*.cnf $PKG/etc/mysql + +# Move mysqlaccess.conf to a more proper place +mv $PKG/usr/bin/mysqlaccess.conf $PKG/etc/mysqlaccess.conf.new +chmod 644 $PKG/etc/mysqlaccess.conf.new + +# Leave build directory: +cd .. + +# install additional headers needed for building external engine plugins: +mkdir -p $PKG/usr/include/mysql/private/atomic + +install -m 644 regex/my_regex.h $PKG/usr/include/mysql/private/ + +for i in sql include; do for j in $i/*.h; do - install -m 644 $j $PKG/usr/include/mysql/ + install -m 644 $j $PKG/usr/include/mysql/private/ done done -mkdir -p $PKG/usr/include/mysql/atomic for i in include/atomic/*.h; do - install -m 644 $i $PKG/usr/include/mysql/atomic/ + install -m 644 $i $PKG/usr/include/mysql/private/atomic/ done -# The ./configure option to omit this has gone away, so we'll omit it -# the old-fashioned way. It's all in the source tarball if you need it. -rm -rf $PKG/usr/sql-bench - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -# Install support files -mkdir -p $PKG/etc -cp support-files/my-{huge,large,medium,small}.cnf $PKG/etc - # Install docs mkdir -p $PKG/usr/doc/mysql-$VERSION/Docs cp -a \ - COPYING* EXCEPTIONS* INSTALL-SOURCE README* \ + BUILD* COPYING* EXCEPTIONS* INSTALL-SOURCE README* VERSION \ $PKG/usr/doc/mysql-$VERSION ( cd Docs # Seems most of the Docs/* are gone, but we'll leave the cp stuff # in case it returns. - cp -a INSTALL-BINARY *.html *.txt Flags \ + cp -a INFO_SRC INSTALL-BINARY *.html *.txt Flags \ $PKG/usr/doc/mysql-$VERSION/Docs ) ## Too large to justify since the .html version is right there: #rm $PKG/usr/doc/mysql-$VERSION/Docs/manual.txt find $PKG/usr/doc/mysql-$VERSION -type f -exec chmod 0644 {} \; -# This is the directory where databases are stored +# This is the directory where databases are stored: mkdir -p $PKG/var/lib/mysql chown mysql.mysql $PKG/var/lib/mysql chmod 0750 $PKG/var/lib/mysql -# This is where the socket is stored +# This is where the socket is stored: mkdir -p $PKG/var/run/mysql chown mysql.mysql $PKG/var/run/mysql chmod 0755 $PKG/var/run/mysql -# Do not include the test suite: +# Do not package the test suite: rm -rf $PKG/usr/mysql-test +# More unpackaged things: +rm -f $PKG/usr/info/dir +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqlclient.a +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqlclient_r.* +( cd $PKG/usr/lib${LIBDIRSUFFIX} ; ln -sf libmysqlclient.so libmysqlclient_r.so ) + # Add init script: mkdir -p $PKG/etc/rc.d # This is intentionally chmod 644. @@ -163,29 +185,6 @@ mkdir -p $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc -# Add some handy library symlinks: -if [ -r $PKG/usr/lib${LIBDIRSUFFIX}/mysql/libmysqlclient.so.16 ]; then - ( cd $PKG/usr/lib${LIBDIRSUFFIX} - rm -f libmysqlclient.so libmysqlclient.so.16 - ln -sf mysql/libmysqlclient.so . - ln -sf mysql/libmysqlclient.so.16 . - ) -else - exit 1 -fi -if [ -r $PKG/usr/lib${LIBDIRSUFFIX}/mysql/libmysqlclient_r.so.16 ]; then - ( cd $PKG/usr/lib${LIBDIRSUFFIX} - rm -f libmysqlclient_r.so libmysqlclient_r.so.16 - ln -sf mysql/libmysqlclient_r.so . - ln -sf mysql/libmysqlclient_r.so.16 . - ) -else - exit 1 -fi - -# Packaging standards: -rm -f $PKG/usr/info/dir - # Compress and link manpages, if any: if [ -d $PKG/usr/man ]; then ( cd $PKG/usr/man @@ -220,4 +219,3 @@ fi # Build package: cd $PKG /sbin/makepkg -l y -c n $TMP/mysql-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/ap/nano/doinst.sh b/source/ap/nano/doinst.sh new file mode 100644 index 00000000..3cd3405f --- /dev/null +++ b/source/ap/nano/doinst.sh @@ -0,0 +1,13 @@ +#!/bin/sh +config() { + NEW="$1" + OLD="`dirname $NEW`/`basename $NEW .new`" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} +config etc/nanorc.new diff --git a/source/ap/nano/nano.SlackBuild b/source/ap/nano/nano.SlackBuild index c6e3c3ad..0f9e114c 100755 --- a/source/ap/nano/nano.SlackBuild +++ b/source/ap/nano/nano.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=nano VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -39,12 +39,24 @@ fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" + ARCHQUADLET="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + ARCHQUADLET="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + ARCHQUADLET="" +elif [ "$ARCH" = "arm" ]; then + SLKCFLAGS="-O2 -march=armv5te" + LIBDIRSUFFIX="" + ARCHQUADLET="-gnueabi" else SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + ARCHQUADLET="" fi CWD=$(pwd) @@ -80,7 +92,8 @@ CFLAGS="$SLKCFLAGS" \ --enable-nanorc \ --enable-all \ --enable-utf8 \ - --build=$ARCH-slackware-linux + --disable-wrapping-as-root \ + --build=$ARCH-slackware-linux$ARCHQUADLET || exit 1 # Build and install: make $NUMJOBS || make || exit 1 @@ -113,6 +126,13 @@ if [ -d $PKG/usr/info ]; then ) fi +# Install a default /etc/nanorc file. This is the standard sample +# file from the doc directory that loads the colour configurations +# from /usr/share/nano. +mkdir -vpm755 $PKG/etc +sed 's?^# include?include?g' doc/nanorc.sample > $PKG/etc/nanorc.new +chmod 644 $PKG/etc/nanorc.new + # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ @@ -128,8 +148,10 @@ if [ -r ChangeLog ]; then touch -r ChangeLog $DOCSDIR/ChangeLog fi +# Place the package description and installation script: mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz diff --git a/source/ap/ntfsprogs/ntfsprogs.SlackBuild b/source/ap/ntfsprogs/ntfsprogs.SlackBuild deleted file mode 100755 index 5c83bd21..00000000 --- a/source/ap/ntfsprogs/ntfsprogs.SlackBuild +++ /dev/null @@ -1,134 +0,0 @@ -#!/bin/sh - -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PKGNAM=ntfsprogs -VERSION=${VERSION:-2.0.0} -BUILD=${BUILD:-2} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -NUMJOBS=${NUMJOBS:-" -j7 "} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-${PKGNAM} - -rm -rf $PKG -mkdir -p $TMP $PKG - -cd $TMP -rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 -cd ${PKGNAM}-$VERSION || exit 1 - -# Make sure ownerships and permissions are sane: -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Configure: -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --bindir=/bin \ - --sysconfdir=/etc \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-gnome-vfs \ - --disable-ntfsmount \ - --disable-static \ - --build=$ARCH-slackware-linux - -# Build and install: -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -mkdir -p $PKG/lib${LIBDIRSUFFIX} -mv $PKG/usr/lib${LIBDIRSUFFIX}/libntfs.so.* $PKG/lib${LIBDIRSUFFIX} -( cd $PKG/usr/lib${LIBDIRSUFFIX} ; ln -sf ../../lib${LIBDIRSUFFIX}/libntfs* . ) - -# Strip binaries: -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Compress and link manpages, if any: -if [ -d $PKG/usr/man ]; then - ( cd $PKG/usr/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.* - ) - done - ) -fi - -# Compress info files, if any: -if [ -d $PKG/usr/info ]; then - ( cd $PKG/usr/info - rm -f dir - gzip -9 * - ) -fi - -# Add a documentation directory: -mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION -cp -a \ - AUTHORS COPYING* CREDITS INSTALL NEWS README TODO* doc \ - $PKG/usr/doc/${PKGNAM}-$VERSION -rm -f $PKG/usr/doc/${PKGNAM}-$VERSION/doc/Makefile* - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/ap/ntfsprogs/slack-desc b/source/ap/ntfsprogs/slack-desc deleted file mode 100644 index 4ed38c92..00000000 --- a/source/ap/ntfsprogs/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -ntfsprogs: ntfsprogs (utilities for working with NTFS volumes) -ntfsprogs: -ntfsprogs: The ntfsprogs includes utilities for doing all required tasks to NTFS -ntfsprogs: partitions. In general, just run a utility without any command line -ntfsprogs: options to display the version number and usage syntax. The following -ntfsprogs: utilities are implemented (so far): ntfsfix, mkntfs, ntfslabel, -ntfsprogs: ntfsundelete, ntfsresize, ntfsclone, ntfscluster, ntfsinfo, ntfsls, -ntfsprogs: ntfscat, ntfscp, and ntfsmount. -ntfsprogs: -ntfsprogs: The Linux-NTFS home page is: http://www.linux-ntfs.org/ -ntfsprogs: diff --git a/source/ap/powertop/powertop.SlackBuild b/source/ap/powertop/powertop.SlackBuild index 7767580b..f4f4beae 100755 --- a/source/ap/powertop/powertop.SlackBuild +++ b/source/ap/powertop/powertop.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified by Willy Sudiarto Raharjo +# Changelog +# May, 11 : Bumped to 2.0, Fix compilation process, Added patch to fix complaints about a file +# May, 18 : Rebuilt, removed non-existence directory for man pages PKGNAM=powertop VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -35,6 +39,8 @@ if [ -z "$ARCH" ]; then esac fi +NUMJOBS=${NUMJOBS:-" -j7 "} + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} @@ -68,21 +74,45 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +LDFLAGS=" -lresolv -lz " \ +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + # Build and install: -make || exit 1 +make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# Move man pages: -mv $PKG/usr/share/man $PKG/usr - # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - COPYING* README* \ + COPYING* README* TODO \ $PKG/usr/doc/${PKGNAM}-$VERSION # If there's a ChangeLog, installing at least part of the recent history diff --git a/source/ap/rpm/rpm.SlackBuild b/source/ap/rpm/rpm.SlackBuild index 2f930c37..2891472b 100755 --- a/source/ap/rpm/rpm.SlackBuild +++ b/source/ap/rpm/rpm.SlackBuild @@ -55,10 +55,7 @@ elif [ "$ARCH" = "armel" ]; then LIBDIRSUFFIX="" fi -NSS_INC="/usr/include/seamonkey/nss" -NSPR_INC="/usr/include/seamonkey/nspr" -DB_INC="/usr/include/db44" -NSS_LIBS="/usr/lib${LIBDIRSUFFIX}/seamonkey" +DB_INC="/usr/include/db48" CWD=$(pwd) TMP=${TMP:-/tmp} @@ -78,11 +75,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# We have to tell it where to find Seamonkey's NSS. +# We have to tell it where to find NSS and NSPR # Also, --enable-sqlite3 needs "-ldl" in LDFLAGS # And --enable-broken-chown fits, as ours follows symlinks. -CFLAGS="$SLKCFLAGS -I$NSS_INC -I$NSPR_INC -I$DB_INC" \ -LDFLAGS="-L${NSS_LIBS} -ldl" \ +CFLAGS="$SLKCFLAGS -I${DB_INC} $(pkg-config --cflags nspr nss)" \ +LDFLAGS="-ldl" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/source/ap/screen/screen.SlackBuild b/source/ap/screen/screen.SlackBuild index 3464bc4a..29ad8c69 100755 --- a/source/ap/screen/screen.SlackBuild +++ b/source/ap/screen/screen.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=${VERSION:-4.0.3} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -51,10 +51,13 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf screen-$VERSION -tar xjvf $CWD/screen-$VERSION.tar.bz2 +tar xvf $CWD/screen-$VERSION.tar.?z* || exit 1 cd screen-$VERSION || exit 1 +# Increase the size of the termname buffer from 20 to 63: +zcat $CWD/screen.d_termname.envterm.buffersizeincrease.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -72,7 +75,7 @@ CFLAGS="$SLKCFLAGS" \ --enable-locale \ --enable-colors256 \ --enable-rxvt_osc \ - $ARCH-slackware-linux + --build=$ARCH-slackware-linux # Substitutions: perl -pi -e 's|.*#undef HAVE_BRAILLE.*|#define HAVE_BRAILLE 1|' config.h diff --git a/source/ap/screen/screen.d_termname.envterm.buffersizeincrease.diff b/source/ap/screen/screen.d_termname.envterm.buffersizeincrease.diff new file mode 100644 index 00000000..26765d6c --- /dev/null +++ b/source/ap/screen/screen.d_termname.envterm.buffersizeincrease.diff @@ -0,0 +1,22 @@ +--- ./display.h.orig 2003-07-01 09:01:42.000000000 -0500 ++++ ./display.h 2011-07-18 16:01:03.691998366 -0500 +@@ -85,7 +85,7 @@ + struct win *d_other; /* pointer to other window */ + int d_nonblock; /* -1 don't block if obufmax reached */ + /* >0: block after nonblock secs */ +- char d_termname[20 + 1]; /* $TERM */ ++ char d_termname[63 + 1]; /* $TERM */ + char *d_tentry; /* buffer for tgetstr */ + char d_tcinited; /* termcap inited flag */ + int d_width, d_height; /* width/height of the screen */ +--- ./screen.h.orig 2003-08-22 07:28:43.000000000 -0500 ++++ ./screen.h 2011-07-18 16:01:09.388004936 -0500 +@@ -202,7 +202,7 @@ + char preselect[20]; + int esc; /* his new escape character unless -1 */ + int meta_esc; /* his new meta esc character unless -1 */ +- char envterm[20 + 1]; /* terminal type */ ++ char envterm[63 + 1]; /* terminal type */ + int encoding; /* encoding of display */ + } + attach; diff --git a/source/ap/soma/slack-desc b/source/ap/soma/slack-desc new file mode 100644 index 00000000..bc1725a6 --- /dev/null +++ b/source/ap/soma/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +soma: Soma - a command line/dialog internet radio player +soma: +soma: Soma is a frontend for mplayer to play radio playlists pls,m3u and +soma: ram. More will be added as it progresses. +soma: +soma: Homepage: http://www.dawoodfall.net/slackbuilds/noversion/soma +soma: +soma: +soma: +soma: +soma: diff --git a/source/ap/soma/soma.SlackBuild b/source/ap/soma/soma.SlackBuild new file mode 100755 index 00000000..c7cc38ae --- /dev/null +++ b/source/ap/soma/soma.SlackBuild @@ -0,0 +1,67 @@ +#!/bin/sh + +# Slackware build script for soma +# Copyright 2010-2011 David Woodfall +# Copyright 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=soma +VERSION=${VERSION:-2.8.5} +ARCH=noarch +BUILD=${BUILD:-1} +TAG=${TAG:-} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.gz +cd $PKGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +mkdir -p $PKG/usr/bin $PKG/etc/soma $PKG/install $PKG/usr/doc/$PKGNAM-$VERSION + +install -m 755 soma $PKG/usr/bin/soma +install --m 644 options.conf $PKG/etc/soma +install --m 644 stations.conf $PKG/etc/soma +install --m 644 dialogrc $PKG/etc/soma + +cp -a \ + README \ + $PKG/usr/doc/$PKGNAM-$VERSION + +#cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} + diff --git a/source/ap/soma/soma.info b/source/ap/soma/soma.info new file mode 100644 index 00000000..0255d3d6 --- /dev/null +++ b/source/ap/soma/soma.info @@ -0,0 +1,10 @@ +PRGNAM="soma" +VERSION="2.8.5" +HOMEPAGE="http://www.dawoodfall.net/files/slackbuilds/noversion/soma/" +DOWNLOAD="http://www.dawoodfall.net/files/slackbuilds/noversion/soma/soma-2.8.5.tar.gz" +MD5SUM="193112a1dc8de8781b83d3a1bceedee6" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="David Woodfall" +EMAIL="dave@dawoodfall.net" +APPROVED="" diff --git a/source/ap/soma/soma.png b/source/ap/soma/soma.png new file mode 100644 index 00000000..1e545a93 Binary files /dev/null and b/source/ap/soma/soma.png differ diff --git a/source/ap/soma/stations.conf b/source/ap/soma/stations.conf new file mode 100644 index 00000000..4a2c4308 --- /dev/null +++ b/source/ap/soma/stations.conf @@ -0,0 +1,38 @@ +Groove Salad,http://somafm.com/groovesalad130.pls +Lush,http://somafm.com/lush.pls +Suburbs of Goa,http://somafm.com/suburbsofgoa.pls +Drone Zone,http://somafm.com/dronezone.pls +Indie Pop Rocks,http://somafm.com/indiepop.pls +Digitalis,http://somafm.com/digitalis.pls +PopTron,http://somafm.com/poptron.pls +Covers,http://somafm.com/covers.pls +Secret Agent,http://somafm.com/secretagent.pls +Boot Liquor,http://somafm.com/bootliquor.pls +Illinois Street Lounge,http://somafm.com/illstreet.pls +Cliqhop IDM,http://somafm.com/cliqhop.pls +Sonic Universe,http://somafm.com/sonicuniverse.pls +Beat Blender,http://somafm.com/beatblender.pls +Tag's Trip,http://somafm.com/tags.pls +Space Station Soma,http://somafm.com/spacestation.pls +Mission Control,http://somafm.com/missioncontrol.pls +Doomed,http://somafm.com/doomed.pls +BBC Radio 1,http://www.bbc.co.uk/radio/listen/live/r1.asx +BBC Radio 2,http://www.bbc.co.uk/radio/listen/live/r2.asx +BBC Radio 3,http://www.bbc.co.uk/radio/listen/live/r3.asx +BBC Radio 4,http://www.bbc.co.uk/radio/listen/live/r4.asx +BBC Radio 7,http://www.bbc.co.uk/radio/listen/live/r7.asx +BBC World Service,http://www.bbc.co.uk/worldservice/meta/tx/nb/live/eneuk.asx +BBC WS News,http://www.bbc.co.uk/worldservice/meta/tx/nb/live/ennws.asx +Classic FM,http://mediaweb.musicradio.com/V1/Playlist.asx?StreamID=2 +InterGalacticFM1,http://radio.intergalacticfm.com/1.m3u +InterGalacticFM2,http://radio.intergalacticfm.com/2.m3u +InterGalacticFM3,http://radio.intergalacticfm.com/3.m3u +InterGalacticFM4,http://radio.intergalacticfm.com/4.m3u +DarkWave Gothic,http://yp.shoutcast.com/sbin/tunein-station.pls?id=392221 +Meridian FM,http://www.meridianfm.com/listen2meridianfm.m3uj +kpfa,http://www.kpfa.org/streams/kpfa_64k.m3u +wcbn,http://floyd.wcbn.org/wcbn-hi.m3u +Pyrolitical,http://broadcast.pyrolitical.com:8000/Pyrolitical_Radio.m3u +Dissident,http://radio.indybay.org:8000/dissidentisland.m3u +GFMONLINE,http://www.gfmradio.com/GFMONLINE.wvx +Celtic Music Radio,http://www.celticmusicradio.net/celtic_live.m3u diff --git a/source/ap/sqlite/sqlite.SlackBuild b/source/ap/sqlite/sqlite.SlackBuild index 61f259b0..bbb03bd3 100755 --- a/source/ap/sqlite/sqlite.SlackBuild +++ b/source/ap/sqlite/sqlite.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for sqlite # Copyright 2006 Martin Lefebvre -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ PKGNAM=sqlite VERSION=${VERSION:-$(echo $PKGNAM-src-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -OLD_STYLE=$(echo $VERSION | tr 0 . | cut -f 1-3 -d .) +OLD_STYLE=$(printf %d $(echo $VERSION | cut -b 1)).$(printf %d $(echo $VERSION | cut -b 2,3)).$(printf %d $(echo $VERSION | cut -b 4,5)) BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -59,7 +59,7 @@ else fi # Enable some features: -SLKCFLAGS="$SLKCFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_STAT2=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_SECURE_DELETE=1" +SLKCFLAGS="$SLKCFLAGS -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_STAT2=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_SECURE_DELETE=1" rm -rf $PKG mkdir -p $TMP $PKG diff --git a/source/ap/sudo/sudo.SlackBuild b/source/ap/sudo/sudo.SlackBuild index c3b85360..8081e917 100755 --- a/source/ap/sudo/sudo.SlackBuild +++ b/source/ap/sudo/sudo.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ PKGNAM=sudo -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -56,7 +56,7 @@ fi cd $TMP rm -rf sudo-$VERSION -tar xvf $CWD/sudo-$VERSION.tar.gz || exit 1 +tar xvf $CWD/sudo-$VERSION.tar.?z* || exit 1 cd sudo-$VERSION chown -R root:root . @@ -99,8 +99,8 @@ mv $PKG/etc/sudoers $PKG/etc/sudoers.new rm -r $PKG/usr/doc/sudo-$VERSION mkdir -p $PKG/usr/doc/sudo-$VERSION cp -a \ - BUGS HISTORY INSTALL LICENSE PORTING README* \ - RUNSON TODO TROUBLESHOOTING UPGRADE WHATSNEW \ + INSTALL NEWS README* \ + doc/{CONTRIBUTORS,HISTORY,LICENSE,TROUBLESHOOTING,UPGRADE} \ $PKG/usr/doc/sudo-$VERSION chmod 644 $PKG/usr/doc/sudo-$VERSION/* diff --git a/source/ap/vbetool/slack-desc b/source/ap/vbetool/slack-desc index c4396691..b10d5fa4 100644 --- a/source/ap/vbetool/slack-desc +++ b/source/ap/vbetool/slack-desc @@ -11,7 +11,7 @@ vbetool: vbetool: vbetool is a small application that executes code from the BIOS of vbetool: your video card. vbetool: -vbetool: This is mostly useful for reinitialising the hardware, for instance +vbetool: This is mostly useful for reinitializing the hardware, for instance vbetool: after ACPI suspend/resuming. vbetool: vbetool: Homepage: http://www.codon.org.uk/~mjg59/vbetool/ diff --git a/source/ap/vim/patches/7.3.155 b/source/ap/vim/patches/7.3.155 new file mode 100644 index 00000000..806efca2 --- /dev/null +++ b/source/ap/vim/patches/7.3.155 @@ -0,0 +1,286 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.155 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.155 +Problem: Crash when using map(), filter() and remove() on v:. (ZyX) + Also for extend(). (Yukihiro Nakadaira) +Solution: Mark v: as locked. Also correct locking error messages. +Files: src/eval.c + + +*** ../vim-7.3.154/src/eval.c 2011-04-01 16:07:41.000000000 +0200 +--- src/eval.c 2011-04-11 13:28:34.000000000 +0200 +*************** +*** 853,858 **** +--- 853,859 ---- + + init_var_dict(&globvardict, &globvars_var); + init_var_dict(&vimvardict, &vimvars_var); ++ vimvardict.dv_lock = VAR_FIXED; + hash_init(&compat_hashtab); + hash_init(&func_hashtab); + +*************** +*** 8545,8551 **** + if (argvars[0].v_type == VAR_LIST) + { + if ((l = argvars[0].vval.v_list) != NULL +! && !tv_check_lock(l->lv_lock, (char_u *)"add()") + && list_append_tv(l, &argvars[1]) == OK) + copy_tv(&argvars[0], rettv); + } +--- 8546,8552 ---- + if (argvars[0].v_type == VAR_LIST) + { + if ((l = argvars[0].vval.v_list) != NULL +! && !tv_check_lock(l->lv_lock, (char_u *)_("add() argument")) + && list_append_tv(l, &argvars[1]) == OK) + copy_tv(&argvars[0], rettv); + } +*************** +*** 9946,9951 **** +--- 9947,9954 ---- + typval_T *argvars; + typval_T *rettv; + { ++ char *arg_errmsg = N_("extend() argument"); ++ + if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST) + { + list_T *l1, *l2; +*************** +*** 9955,9961 **** + + l1 = argvars[0].vval.v_list; + l2 = argvars[1].vval.v_list; +! if (l1 != NULL && !tv_check_lock(l1->lv_lock, (char_u *)"extend()") + && l2 != NULL) + { + if (argvars[2].v_type != VAR_UNKNOWN) +--- 9958,9964 ---- + + l1 = argvars[0].vval.v_list; + l2 = argvars[1].vval.v_list; +! if (l1 != NULL && !tv_check_lock(l1->lv_lock, (char_u *)_(arg_errmsg)) + && l2 != NULL) + { + if (argvars[2].v_type != VAR_UNKNOWN) +*************** +*** 9994,10000 **** + + d1 = argvars[0].vval.v_dict; + d2 = argvars[1].vval.v_dict; +! if (d1 != NULL && !tv_check_lock(d1->dv_lock, (char_u *)"extend()") + && d2 != NULL) + { + /* Check the third argument. */ +--- 9997,10003 ---- + + d1 = argvars[0].vval.v_dict; + d2 = argvars[1].vval.v_dict; +! if (d1 != NULL && !tv_check_lock(d1->dv_lock, (char_u *)_(arg_errmsg)) + && d2 != NULL) + { + /* Check the third argument. */ +*************** +*** 10236,10255 **** + typval_T save_key; + int rem; + int todo; +! char_u *ermsg = map ? (char_u *)"map()" : (char_u *)"filter()"; + int save_did_emsg; + int idx = 0; + + if (argvars[0].v_type == VAR_LIST) + { + if ((l = argvars[0].vval.v_list) == NULL +! || (map && tv_check_lock(l->lv_lock, ermsg))) + return; + } + else if (argvars[0].v_type == VAR_DICT) + { + if ((d = argvars[0].vval.v_dict) == NULL +! || (map && tv_check_lock(d->dv_lock, ermsg))) + return; + } + else +--- 10239,10260 ---- + typval_T save_key; + int rem; + int todo; +! char_u *ermsg = (char_u *)(map ? "map()" : "filter()"); +! char *arg_errmsg = (map ? N_("map() argument") +! : N_("filter() argument")); + int save_did_emsg; + int idx = 0; + + if (argvars[0].v_type == VAR_LIST) + { + if ((l = argvars[0].vval.v_list) == NULL +! || tv_check_lock(l->lv_lock, (char_u *)_(arg_errmsg))) + return; + } + else if (argvars[0].v_type == VAR_DICT) + { + if ((d = argvars[0].vval.v_dict) == NULL +! || tv_check_lock(d->dv_lock, (char_u *)_(arg_errmsg))) + return; + } + else +*************** +*** 10286,10292 **** + { + --todo; + di = HI2DI(hi); +! if (tv_check_lock(di->di_tv.v_lock, ermsg)) + break; + vimvars[VV_KEY].vv_str = vim_strsave(di->di_key); + if (filter_map_one(&di->di_tv, expr, map, &rem) == FAIL +--- 10291,10298 ---- + { + --todo; + di = HI2DI(hi); +! if (tv_check_lock(di->di_tv.v_lock, +! (char_u *)_(arg_errmsg))) + break; + vimvars[VV_KEY].vv_str = vim_strsave(di->di_key); + if (filter_map_one(&di->di_tv, expr, map, &rem) == FAIL +*************** +*** 10305,10311 **** + + for (li = l->lv_first; li != NULL; li = nli) + { +! if (tv_check_lock(li->li_tv.v_lock, ermsg)) + break; + nli = li->li_next; + vimvars[VV_KEY].vv_nr = idx; +--- 10311,10317 ---- + + for (li = l->lv_first; li != NULL; li = nli) + { +! if (tv_check_lock(li->li_tv.v_lock, (char_u *)_(arg_errmsg))) + break; + nli = li->li_next; + vimvars[VV_KEY].vv_nr = idx; +*************** +*** 12910,12916 **** + if (argvars[0].v_type != VAR_LIST) + EMSG2(_(e_listarg), "insert()"); + else if ((l = argvars[0].vval.v_list) != NULL +! && !tv_check_lock(l->lv_lock, (char_u *)"insert()")) + { + if (argvars[2].v_type != VAR_UNKNOWN) + before = get_tv_number_chk(&argvars[2], &error); +--- 12916,12922 ---- + if (argvars[0].v_type != VAR_LIST) + EMSG2(_(e_listarg), "insert()"); + else if ((l = argvars[0].vval.v_list) != NULL +! && !tv_check_lock(l->lv_lock, (char_u *)_("insert() argument"))) + { + if (argvars[2].v_type != VAR_UNKNOWN) + before = get_tv_number_chk(&argvars[2], &error); +*************** +*** 14775,14787 **** + char_u *key; + dict_T *d; + dictitem_T *di; + + if (argvars[0].v_type == VAR_DICT) + { + if (argvars[2].v_type != VAR_UNKNOWN) + EMSG2(_(e_toomanyarg), "remove()"); + else if ((d = argvars[0].vval.v_dict) != NULL +! && !tv_check_lock(d->dv_lock, (char_u *)"remove() argument")) + { + key = get_tv_string_chk(&argvars[1]); + if (key != NULL) +--- 14781,14794 ---- + char_u *key; + dict_T *d; + dictitem_T *di; ++ char *arg_errmsg = N_("remove() argument"); + + if (argvars[0].v_type == VAR_DICT) + { + if (argvars[2].v_type != VAR_UNKNOWN) + EMSG2(_(e_toomanyarg), "remove()"); + else if ((d = argvars[0].vval.v_dict) != NULL +! && !tv_check_lock(d->dv_lock, (char_u *)_(arg_errmsg))) + { + key = get_tv_string_chk(&argvars[1]); + if (key != NULL) +*************** +*** 14801,14807 **** + else if (argvars[0].v_type != VAR_LIST) + EMSG2(_(e_listdictarg), "remove()"); + else if ((l = argvars[0].vval.v_list) != NULL +! && !tv_check_lock(l->lv_lock, (char_u *)"remove() argument")) + { + int error = FALSE; + +--- 14808,14814 ---- + else if (argvars[0].v_type != VAR_LIST) + EMSG2(_(e_listdictarg), "remove()"); + else if ((l = argvars[0].vval.v_list) != NULL +! && !tv_check_lock(l->lv_lock, (char_u *)_(arg_errmsg))) + { + int error = FALSE; + +*************** +*** 15135,15141 **** + if (argvars[0].v_type != VAR_LIST) + EMSG2(_(e_listarg), "reverse()"); + else if ((l = argvars[0].vval.v_list) != NULL +! && !tv_check_lock(l->lv_lock, (char_u *)"reverse()")) + { + li = l->lv_last; + l->lv_first = l->lv_last = NULL; +--- 15142,15148 ---- + if (argvars[0].v_type != VAR_LIST) + EMSG2(_(e_listarg), "reverse()"); + else if ((l = argvars[0].vval.v_list) != NULL +! && !tv_check_lock(l->lv_lock, (char_u *)_("reverse() argument"))) + { + li = l->lv_last; + l->lv_first = l->lv_last = NULL; +*************** +*** 16432,16438 **** + else + { + l = argvars[0].vval.v_list; +! if (l == NULL || tv_check_lock(l->lv_lock, (char_u *)"sort()")) + return; + rettv->vval.v_list = l; + rettv->v_type = VAR_LIST; +--- 16439,16446 ---- + else + { + l = argvars[0].vval.v_list; +! if (l == NULL || tv_check_lock(l->lv_lock, +! (char_u *)_("sort() argument"))) + return; + rettv->vval.v_list = l; + rettv->v_type = VAR_LIST; +*** ../vim-7.3.154/src/version.c 2011-04-02 15:12:45.000000000 +0200 +--- src/version.c 2011-04-11 13:13:38.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 155, + /**/ + +-- +I used to be indecisive, now I'm not sure. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.156 b/source/ap/vim/patches/7.3.156 new file mode 100644 index 00000000..ec873242 --- /dev/null +++ b/source/ap/vim/patches/7.3.156 @@ -0,0 +1,89 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.156 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.156 +Problem: Tty names possibly left unterminated. +Solution: Use vim_strncpy() instead of strncpy(). +Files: src/pty.c + + +*** ../vim-7.3.155/src/pty.c 2010-08-15 21:57:28.000000000 +0200 +--- src/pty.c 2011-04-11 14:02:49.000000000 +0200 +*************** +*** 209,216 **** + #ifdef _SEQUENT_ + fvhangup(s); + #endif +! strncpy(PtyName, m, sizeof(PtyName)); +! strncpy(TtyName, s, sizeof(TtyName)); + initmaster(f); + *ttyn = TtyName; + return f; +--- 209,216 ---- + #ifdef _SEQUENT_ + fvhangup(s); + #endif +! vim_strncpy((char_u *)PtyName, (char_u *)m, sizeof(PtyName) - 1); +! vim_strncpy((char_u *)TtyName, (char_u *)s, sizeof(TtyName) - 1); + initmaster(f); + *ttyn = TtyName; + return f; +*************** +*** 301,307 **** + return -1; + } + signal(SIGCHLD, sigcld); +! strncpy(TtyName, m, sizeof(TtyName)); + initmaster(f); + *ttyn = TtyName; + return f; +--- 301,307 ---- + return -1; + } + signal(SIGCHLD, sigcld); +! vim_strncpy((char_u *)TtyName, (char_u *)m, sizeof(TtyName) - 1); + initmaster(f); + *ttyn = TtyName; + return f; +*************** +*** 326,332 **** + /* a dumb looking loop replaced by mycrofts code: */ + if ((f = open("/dev/ptc", O_RDWR | O_NOCTTY | O_EXTRA)) < 0) + return -1; +! strncpy(TtyName, ttyname(f), sizeof(TtyName)); + if (geteuid() != ROOT_UID && mch_access(TtyName, R_OK | W_OK)) + { + close(f); +--- 326,332 ---- + /* a dumb looking loop replaced by mycrofts code: */ + if ((f = open("/dev/ptc", O_RDWR | O_NOCTTY | O_EXTRA)) < 0) + return -1; +! vim_strncpy((char_u *)TtyName, (char_u *)ttyname(f), sizeof(TtyName) - 1); + if (geteuid() != ROOT_UID && mch_access(TtyName, R_OK | W_OK)) + { + close(f); +*** ../vim-7.3.155/src/version.c 2011-04-11 13:46:07.000000000 +0200 +--- src/version.c 2011-04-11 14:23:38.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 156, + /**/ + +-- +I think that you'll agree that engineers are very effective in their social +interactions. It's the "normal" people who are nuts. + (Scott Adams - The Dilbert principle) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.157 b/source/ap/vim/patches/7.3.157 new file mode 100644 index 00000000..403c9486 --- /dev/null +++ b/source/ap/vim/patches/7.3.157 @@ -0,0 +1,52 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.157 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.157 +Problem: Superfluous assignment. +Solution: Remove assignment. +Files: src/misc1.c + + +*** ../vim-7.3.156/src/misc1.c 2011-03-22 13:07:19.000000000 +0100 +--- src/misc1.c 2011-04-11 14:11:17.000000000 +0200 +*************** +*** 6773,6780 **** + { + curwin->w_cursor.lnum = our_paren_pos.lnum; + curwin->w_cursor.col = col; +! if ((trypos = find_match_paren(ind_maxparen, +! ind_maxcomment)) != NULL) + amount += ind_unclosed2; + else + amount += ind_unclosed; +--- 6775,6781 ---- + { + curwin->w_cursor.lnum = our_paren_pos.lnum; + curwin->w_cursor.col = col; +! if (find_match_paren(ind_maxparen, ind_maxcomment) != NULL) + amount += ind_unclosed2; + else + amount += ind_unclosed; +*** ../vim-7.3.156/src/version.c 2011-04-11 14:24:33.000000000 +0200 +--- src/version.c 2011-04-11 14:25:36.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 157, + /**/ + +-- +A radioactive cat has eighteen half-lives. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.158 b/source/ap/vim/patches/7.3.158 new file mode 100644 index 00000000..8fba3508 --- /dev/null +++ b/source/ap/vim/patches/7.3.158 @@ -0,0 +1,48 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.158 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.158 +Problem: Might use uninitialized memory in C indenting. +Solution: Init arrays to empty. +Files: src/misc1.c + + +*** ../vim-7.3.157/src/misc1.c 2011-04-11 14:26:15.000000000 +0200 +--- src/misc1.c 2011-04-11 14:11:17.000000000 +0200 +*************** +*** 6433,6438 **** +--- 6433,6440 ---- + /* find how indented the line beginning the comment is */ + getvcol(curwin, trypos, &col, NULL, NULL); + amount = col; ++ *lead_start = NUL; ++ *lead_middle = NUL; + + p = curbuf->b_p_com; + while (*p != NUL) +*** ../vim-7.3.157/src/version.c 2011-04-11 14:26:15.000000000 +0200 +--- src/version.c 2011-04-11 14:27:05.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 158, + /**/ + +-- +It's totally unfair to suggest - as many have - that engineers are socially +inept. Engineers simply have different objectives when it comes to social +interaction. + (Scott Adams - The Dilbert principle) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.159 b/source/ap/vim/patches/7.3.159 new file mode 100644 index 00000000..7029ac86 --- /dev/null +++ b/source/ap/vim/patches/7.3.159 @@ -0,0 +1,54 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.159 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.159 +Problem: Using uninitialized pointer when out of memory. +Solution: Check for NULL return value. +Files: src/mbyte.c + + +*** ../vim-7.3.158/src/mbyte.c 2010-10-27 13:37:39.000000000 +0200 +--- src/mbyte.c 2011-04-11 14:17:39.000000000 +0200 +*************** +*** 4129,4135 **** + done = to - (char *)result; + } + +! if (resultlenp != NULL) + *resultlenp = (int)(to - (char *)result); + return result; + } +--- 4129,4135 ---- + done = to - (char *)result; + } + +! if (resultlenp != NULL && result != NULL) + *resultlenp = (int)(to - (char *)result); + return result; + } +*** ../vim-7.3.158/src/version.c 2011-04-11 14:27:34.000000000 +0200 +--- src/version.c 2011-04-11 14:28:08.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 159, + /**/ + +-- +I learned the customs and mannerisms of engineers by observing them, much the +way Jane Goodall learned about the great apes, but without the hassle of +grooming. + (Scott Adams - The Dilbert principle) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.160 b/source/ap/vim/patches/7.3.160 new file mode 100644 index 00000000..bf3a069f --- /dev/null +++ b/source/ap/vim/patches/7.3.160 @@ -0,0 +1,482 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.160 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.160 +Problem: Unsafe string copying. +Solution: Use vim_strncpy() instead of strcpy(). Use vim_strcat() instead + of strcat(). +Files: src/buffer.c, src/ex_docmd.c, src/hardcopy.c, src/menu.c, + src/misc1.c, src/misc2.c, src/proto/misc2.pro, src/netbeans.c, + src/os_unix.c, src/spell.c, src/syntax.c, src/tag.c + +*** ../vim-7.3.159/src/buffer.c 2011-02-15 14:24:42.000000000 +0100 +--- src/buffer.c 2011-04-11 16:08:38.000000000 +0200 +*************** +*** 3176,3182 **** + /* format: "fname + (path) (1 of 2) - VIM" */ + + if (curbuf->b_fname == NULL) +! STRCPY(buf, _("[No Name]")); + else + { + p = transstr(gettail(curbuf->b_fname)); +--- 3176,3182 ---- + /* format: "fname + (path) (1 of 2) - VIM" */ + + if (curbuf->b_fname == NULL) +! vim_strncpy(buf, (char_u *)_("[No Name]"), IOSIZE - 100); + else + { + p = transstr(gettail(curbuf->b_fname)); +*************** +*** 3232,3238 **** + if (serverName != NULL) + { + STRCAT(buf, " - "); +! STRCAT(buf, serverName); + } + else + #endif +--- 3232,3238 ---- + if (serverName != NULL) + { + STRCAT(buf, " - "); +! vim_strcat(buf, serverName, IOSIZE); + } + else + #endif +*** ../vim-7.3.159/src/ex_docmd.c 2011-03-03 15:54:45.000000000 +0100 +--- src/ex_docmd.c 2011-04-11 15:43:48.000000000 +0200 +*************** +*** 5096,5102 **** + char_u buff[IOSIZE]; + + if (n == 1) +! STRCPY(buff, _("1 more file to edit. Quit anyway?")); + else + vim_snprintf((char *)buff, IOSIZE, + _("%d more files to edit. Quit anyway?"), n); +--- 5096,5104 ---- + char_u buff[IOSIZE]; + + if (n == 1) +! vim_strncpy(buff, +! (char_u *)_("1 more file to edit. Quit anyway?"), +! IOSIZE - 1); + else + vim_snprintf((char *)buff, IOSIZE, + _("%d more files to edit. Quit anyway?"), n); +*** ../vim-7.3.159/src/hardcopy.c 2010-08-15 21:57:25.000000000 +0200 +--- src/hardcopy.c 2011-04-11 15:30:09.000000000 +0200 +*************** +*** 1761,1772 **** + { + char_u buffer[MAXPATHL + 1]; + +! STRCPY(resource->name, name); + /* Look for named resource file in runtimepath */ + STRCPY(buffer, "print"); + add_pathsep(buffer); +! STRCAT(buffer, name); +! STRCAT(buffer, ".ps"); + resource->filename[0] = NUL; + return (do_in_runtimepath(buffer, FALSE, prt_resource_name, + resource->filename) +--- 1761,1772 ---- + { + char_u buffer[MAXPATHL + 1]; + +! vim_strncpy(resource->name, (char_u *)name, 63); + /* Look for named resource file in runtimepath */ + STRCPY(buffer, "print"); + add_pathsep(buffer); +! vim_strcat(buffer, (char_u *)name, MAXPATHL); +! vim_strcat(buffer, (char_u *)".ps", MAXPATHL); + resource->filename[0] = NUL; + return (do_in_runtimepath(buffer, FALSE, prt_resource_name, + resource->filename) +*** ../vim-7.3.159/src/menu.c 2011-01-04 17:49:25.000000000 +0100 +--- src/menu.c 2011-04-11 15:17:21.000000000 +0200 +*************** +*** 1394,1400 **** + int idx; + { + static vimmenu_T *menu = NULL; +! static char_u tbuffer[256]; /*hack*/ + char_u *str; + #ifdef FEAT_MULTI_LANG + static int should_advance = FALSE; +--- 1394,1401 ---- + int idx; + { + static vimmenu_T *menu = NULL; +! #define TBUFFER_LEN 256 +! static char_u tbuffer[TBUFFER_LEN]; /*hack*/ + char_u *str; + #ifdef FEAT_MULTI_LANG + static int should_advance = FALSE; +*************** +*** 1428,1438 **** + { + #ifdef FEAT_MULTI_LANG + if (should_advance) +! STRCPY(tbuffer, menu->en_dname); + else + { + #endif +! STRCPY(tbuffer, menu->dname); + #ifdef FEAT_MULTI_LANG + if (menu->en_dname == NULL) + should_advance = TRUE; +--- 1429,1439 ---- + { + #ifdef FEAT_MULTI_LANG + if (should_advance) +! vim_strncpy(tbuffer, menu->en_dname, TBUFFER_LEN - 2); + else + { + #endif +! vim_strncpy(tbuffer, menu->dname, TBUFFER_LEN - 2); + #ifdef FEAT_MULTI_LANG + if (menu->en_dname == NULL) + should_advance = TRUE; +*** ../vim-7.3.159/src/misc1.c 2011-04-11 14:27:34.000000000 +0200 +--- src/misc1.c 2011-04-11 16:03:22.000000000 +0200 +*************** +*** 3332,3350 **** + if (pn == 1) + { + if (n > 0) +! STRCPY(msg_buf, _("1 more line")); + else +! STRCPY(msg_buf, _("1 line less")); + } + else + { + if (n > 0) +! sprintf((char *)msg_buf, _("%ld more lines"), pn); + else +! sprintf((char *)msg_buf, _("%ld fewer lines"), pn); + } + if (got_int) +! STRCAT(msg_buf, _(" (Interrupted)")); + if (msg(msg_buf)) + { + set_keep_msg(msg_buf, 0); +--- 3332,3354 ---- + if (pn == 1) + { + if (n > 0) +! vim_strncpy(msg_buf, (char_u *)_("1 more line"), +! MSG_BUF_LEN - 1); + else +! vim_strncpy(msg_buf, (char_u *)_("1 line less"), +! MSG_BUF_LEN - 1); + } + else + { + if (n > 0) +! vim_snprintf((char *)msg_buf, MSG_BUF_LEN, +! _("%ld more lines"), pn); + else +! vim_snprintf((char *)msg_buf, MSG_BUF_LEN, +! _("%ld fewer lines"), pn); + } + if (got_int) +! vim_strcat(msg_buf, (char_u *)_(" (Interrupted)"), MSG_BUF_LEN); + if (msg(msg_buf)) + { + set_keep_msg(msg_buf, 0); +*** ../vim-7.3.159/src/misc2.c 2010-12-08 13:11:15.000000000 +0100 +--- src/misc2.c 2011-04-11 15:30:20.000000000 +0200 +*************** +*** 1647,1652 **** +--- 1647,1674 ---- + } + + /* ++ * Like strcat(), but make sure the result fits in "tosize" bytes and is ++ * always NUL terminated. ++ */ ++ void ++ vim_strcat(to, from, tosize) ++ char_u *to; ++ char_u *from; ++ size_t tosize; ++ { ++ size_t tolen = STRLEN(to); ++ size_t fromlen = STRLEN(from); ++ ++ if (tolen + fromlen + 1 > tosize) ++ { ++ mch_memmove(to + tolen, from, tosize - tolen - 1); ++ to[tosize - 1] = NUL; ++ } ++ else ++ STRCPY(to + tolen, from); ++ } ++ ++ /* + * Isolate one part of a string option where parts are separated with + * "sep_chars". + * The part is copied into "buf[maxlen]". +*** ../vim-7.3.159/src/proto/misc2.pro 2010-08-15 21:57:28.000000000 +0200 +--- src/proto/misc2.pro 2011-04-11 15:29:55.000000000 +0200 +*************** +*** 40,45 **** +--- 40,46 ---- + void copy_chars __ARGS((char_u *ptr, size_t count, int c)); + void del_trailing_spaces __ARGS((char_u *ptr)); + void vim_strncpy __ARGS((char_u *to, char_u *from, size_t len)); ++ void vim_strcat __ARGS((char_u *to, char_u *from, size_t tosize)); + int copy_option_part __ARGS((char_u **option, char_u *buf, int maxlen, char *sep_chars)); + void vim_free __ARGS((void *x)); + int vim_stricmp __ARGS((char *s1, char *s2)); +*** ../vim-7.3.159/src/netbeans.c 2011-04-01 15:33:54.000000000 +0200 +--- src/netbeans.c 2011-04-11 16:02:51.000000000 +0200 +*************** +*** 3914,3927 **** + } + else + { +! char_u ebuf[BUFSIZ]; + +! STRCPY(ebuf, (char_u *)_("E505: ")); +! STRCAT(ebuf, IObuff); +! STRCAT(ebuf, (char_u *)_("is read-only (add ! to override)")); +! STRCPY(IObuff, ebuf); +! nbdebug((" %s\n", ebuf )); +! emsg(IObuff); + } + } + +--- 3914,3925 ---- + } + else + { +! char_u msgbuf[IOSIZE]; + +! vim_snprintf((char *)msgbuf, IOSIZE, +! _("E505: %s is read-only (add ! to override)"), IObuff); +! nbdebug((" %s\n", msgbuf)); +! emsg(msgbuf); + } + } + +*** ../vim-7.3.159/src/os_unix.c 2011-02-15 17:39:14.000000000 +0100 +--- src/os_unix.c 2011-04-11 16:39:11.000000000 +0200 +*************** +*** 5725,5730 **** +--- 5725,5731 ---- + if (shell_style == STYLE_PRINT && !did_find_nul) + { + /* If there is a NUL, set did_find_nul, else set check_spaces */ ++ buffer[len] = NUL; + if (len && (int)STRLEN(buffer) < (int)len - 1) + did_find_nul = TRUE; + else +*************** +*** 6594,6600 **** + xterm_hints.x = 2; + return TRUE; + } +! if (mouse_code == NULL) + { + xterm_trace = 0; + return FALSE; +--- 6595,6601 ---- + xterm_hints.x = 2; + return TRUE; + } +! if (mouse_code == NULL || STRLEN(mouse_code) > 45) + { + xterm_trace = 0; + return FALSE; +*** ../vim-7.3.159/src/spell.c 2011-02-01 13:59:44.000000000 +0100 +--- src/spell.c 2011-04-11 15:50:40.000000000 +0200 +*************** +*** 6957,6963 **** + if (ae->ae_add == NULL) + *newword = NUL; + else +! STRCPY(newword, ae->ae_add); + p = word; + if (ae->ae_chop != NULL) + { +--- 6957,6963 ---- + if (ae->ae_add == NULL) + *newword = NUL; + else +! vim_strncpy(newword, ae->ae_add, MAXWLEN - 1); + p = word; + if (ae->ae_chop != NULL) + { +*************** +*** 6978,6984 **** + else + { + /* suffix: chop/add at the end of the word */ +! STRCPY(newword, word); + if (ae->ae_chop != NULL) + { + /* Remove chop string. */ +--- 6978,6984 ---- + else + { + /* suffix: chop/add at the end of the word */ +! vim_strncpy(newword, word, MAXWLEN - 1); + if (ae->ae_chop != NULL) + { + /* Remove chop string. */ +*************** +*** 8654,8660 **** + * Write the .sug file. + * Make the file name by changing ".spl" to ".sug". + */ +! STRCPY(fname, wfname); + len = (int)STRLEN(fname); + fname[len - 2] = 'u'; + fname[len - 1] = 'g'; +--- 8654,8660 ---- + * Write the .sug file. + * Make the file name by changing ".spl" to ".sug". + */ +! vim_strncpy(fname, wfname, MAXPATHL - 1); + len = (int)STRLEN(fname); + fname[len - 2] = 'u'; + fname[len - 1] = 'g'; +*************** +*** 10261,10267 **** + + /* The suggested word may replace only part of the bad word, add + * the not replaced part. */ +! STRCPY(wcopy, stp->st_word); + if (sug.su_badlen > stp->st_orglen) + vim_strncpy(wcopy + stp->st_wordlen, + sug.su_badptr + stp->st_orglen, +--- 10261,10267 ---- + + /* The suggested word may replace only part of the bad word, add + * the not replaced part. */ +! vim_strncpy(wcopy, stp->st_word, MAXWLEN); + if (sug.su_badlen > stp->st_orglen) + vim_strncpy(wcopy + stp->st_wordlen, + sug.su_badptr + stp->st_orglen, +*************** +*** 13162,13168 **** + pbad = badsound2; + } + +! if (lendiff > 0) + { + /* Add part of the bad word to the good word, so that we soundfold + * what replaces the bad word. */ +--- 13162,13168 ---- + pbad = badsound2; + } + +! if (lendiff > 0 && stp->st_wordlen + lendiff < MAXWLEN) + { + /* Add part of the bad word to the good word, so that we soundfold + * what replaces the bad word. */ +*************** +*** 13875,13881 **** + for (i = gap->ga_len - 1; i >= 0; --i) + { + /* Need to append what follows to check for "the the". */ +! STRCPY(longword, stp[i].st_word); + len = stp[i].st_wordlen; + vim_strncpy(longword + len, su->su_badptr + stp[i].st_orglen, + MAXWLEN - len); +--- 13875,13881 ---- + for (i = gap->ga_len - 1; i >= 0; --i) + { + /* Need to append what follows to check for "the the". */ +! vim_strncpy(longword, stp[i].st_word, MAXWLEN); + len = stp[i].st_wordlen; + vim_strncpy(longword + len, su->su_badptr + stp[i].st_orglen, + MAXWLEN - len); +*************** +*** 14221,14227 **** + *t = NUL; + } + else +! STRCPY(word, s); + + smp = (salitem_T *)slang->sl_sal.ga_data; + +--- 14221,14227 ---- + *t = NUL; + } + else +! vim_strncpy(word, s, MAXWLEN - 1); + + smp = (salitem_T *)slang->sl_sal.ga_data; + +*** ../vim-7.3.159/src/syntax.c 2011-04-02 15:12:45.000000000 +0200 +--- src/syntax.c 2011-04-11 15:44:30.000000000 +0200 +*************** +*** 8576,8583 **** + if (iarg & hl_attr_table[i]) + { + if (buf[0] != NUL) +! STRCAT(buf, ","); +! STRCAT(buf, hl_name_table[i]); + iarg &= ~hl_attr_table[i]; /* don't want "inverse" */ + } + } +--- 8576,8583 ---- + if (iarg & hl_attr_table[i]) + { + if (buf[0] != NUL) +! vim_strcat(buf, (char_u *)",", 100); +! vim_strcat(buf, (char_u *)hl_name_table[i], 100); + iarg &= ~hl_attr_table[i]; /* don't want "inverse" */ + } + } +*** ../vim-7.3.159/src/tag.c 2011-02-25 15:13:43.000000000 +0100 +--- src/tag.c 2011-04-11 15:34:59.000000000 +0200 +*************** +*** 806,812 **** + p = tag_full_fname(&tagp); + if (p == NULL) + continue; +! STRCPY(fname, p); + vim_free(p); + + /* +--- 806,812 ---- + p = tag_full_fname(&tagp); + if (p == NULL) + continue; +! vim_strncpy(fname, p, MAXPATHL); + vim_free(p); + + /* +*** ../vim-7.3.159/src/version.c 2011-04-11 14:29:13.000000000 +0200 +--- src/version.c 2011-04-11 16:50:53.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 160, + /**/ + +-- +If someone questions your market projections, simply point out that your +target market is "People who are nuts" and "People who will buy any damn +thing". Nobody is going to tell you there aren't enough of those people +to go around. + (Scott Adams - The Dilbert principle) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.161 b/source/ap/vim/patches/7.3.161 new file mode 100644 index 00000000..61223ec2 --- /dev/null +++ b/source/ap/vim/patches/7.3.161 @@ -0,0 +1,1645 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.161 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.161 +Problem: Items on the stack may be too big. +Solution: Make items static or allocate them. +Files: src/eval.c, src/ex_cmds.c, src/ex_cmds2.c, src/ex_docmd.c, + src/fileio.c, src/hardcopy.c, src/quickfix.c, src/main.c, + src/netbeans.c, src/spell.c, src/tag.c, src/vim.h, src/xxd/xxd.c + + +*** ../vim-7.3.160/src/eval.c 2011-04-11 13:46:07.000000000 +0200 +--- src/eval.c 2011-04-11 21:05:50.000000000 +0200 +*************** +*** 11100,11117 **** + typval_T *argvars UNUSED; + typval_T *rettv; + { +! char_u cwd[MAXPATHL]; + + rettv->v_type = VAR_STRING; +! if (mch_dirname(cwd, MAXPATHL) == FAIL) +! rettv->vval.v_string = NULL; +! else + { +! rettv->vval.v_string = vim_strsave(cwd); + #ifdef BACKSLASH_IN_FILENAME +! if (rettv->vval.v_string != NULL) +! slash_adjust(rettv->vval.v_string); + #endif + } + } + +--- 11100,11121 ---- + typval_T *argvars UNUSED; + typval_T *rettv; + { +! char_u *cwd; + + rettv->v_type = VAR_STRING; +! rettv->vval.v_string = NULL; +! cwd = alloc(MAXPATHL); +! if (cwd != NULL) + { +! if (mch_dirname(cwd, MAXPATHL) != FAIL) +! { +! rettv->vval.v_string = vim_strsave(cwd); + #ifdef BACKSLASH_IN_FILENAME +! if (rettv->vval.v_string != NULL) +! slash_adjust(rettv->vval.v_string); + #endif ++ } ++ vim_free(cwd); + } + } + +*************** +*** 14938,14943 **** +--- 14942,14950 ---- + typval_T *rettv; + { + char_u *p; ++ #ifdef HAVE_READLINK ++ char_u *buf = NULL; ++ #endif + + p = get_tv_string(&argvars[0]); + #ifdef FEAT_SHORTCUT +*************** +*** 14953,14959 **** + #else + # ifdef HAVE_READLINK + { +- char_u buf[MAXPATHL + 1]; + char_u *cpy; + int len; + char_u *remain = NULL; +--- 14960,14965 ---- +*************** +*** 14981,14986 **** +--- 14987,14996 ---- + q[-1] = NUL; + } + ++ buf = alloc(MAXPATHL + 1); ++ if (buf == NULL) ++ goto fail; ++ + for (;;) + { + for (;;) +*************** +*** 15124,15129 **** +--- 15134,15140 ---- + + #ifdef HAVE_READLINK + fail: ++ vim_free(buf); + #endif + rettv->v_type = VAR_STRING; + } +*************** +*** 17604,17621 **** + typval_T *argvars UNUSED; + typval_T *rettv; + { +! char_u fname[MAXPATHL + 1]; + tagname_T tn; + int first; + + if (rettv_list_alloc(rettv) == FAIL) + return; + + for (first = TRUE; ; first = FALSE) + if (get_tagfname(&tn, first, fname) == FAIL + || list_append_string(rettv->vval.v_list, fname, -1) == FAIL) + break; + tagname_free(&tn); + } + + /* +--- 17615,17636 ---- + typval_T *argvars UNUSED; + typval_T *rettv; + { +! char_u *fname; + tagname_T tn; + int first; + + if (rettv_list_alloc(rettv) == FAIL) + return; ++ fname = alloc(MAXPATHL); ++ if (fname == NULL) ++ return; + + for (first = TRUE; ; first = FALSE) + if (get_tagfname(&tn, first, fname) == FAIL + || list_append_string(rettv->vval.v_list, fname, -1) == FAIL) + break; + tagname_free(&tn); ++ vim_free(fname); + } + + /* +*** ../vim-7.3.160/src/ex_cmds.c 2011-02-01 13:48:47.000000000 +0100 +--- src/ex_cmds.c 2011-04-11 20:51:34.000000000 +0200 +*************** +*** 2777,2783 **** + #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) + if (p_confirm || cmdmod.confirm) + { +! char_u buff[IOSIZE]; + + dialog_msg(buff, _("Overwrite existing file \"%s\"?"), fname); + if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 2) != VIM_YES) +--- 2777,2783 ---- + #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) + if (p_confirm || cmdmod.confirm) + { +! char_u buff[DIALOG_MSG_SIZE]; + + dialog_msg(buff, _("Overwrite existing file \"%s\"?"), fname); + if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 2) != VIM_YES) +*************** +*** 2795,2801 **** + /* For ":w! filename" check that no swap file exists for "filename". */ + if (other && !emsg_silent) + { +! char_u dir[MAXPATHL]; + char_u *p; + int r; + char_u *swapname; +--- 2795,2801 ---- + /* For ":w! filename" check that no swap file exists for "filename". */ + if (other && !emsg_silent) + { +! char_u *dir; + char_u *p; + int r; + char_u *swapname; +*************** +*** 2806,2825 **** + * Use 'shortname' of the current buffer, since there is no buffer + * for the written file. */ + if (*p_dir == NUL) + STRCPY(dir, "."); + else + { + p = p_dir; + copy_option_part(&p, dir, MAXPATHL, ","); + } + swapname = makeswapname(fname, ffname, curbuf, dir); + r = vim_fexists(swapname); + if (r) + { + #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) + if (p_confirm || cmdmod.confirm) + { +! char_u buff[IOSIZE]; + + dialog_msg(buff, + _("Swap file \"%s\" exists, overwrite anyway?"), +--- 2806,2834 ---- + * Use 'shortname' of the current buffer, since there is no buffer + * for the written file. */ + if (*p_dir == NUL) ++ { ++ dir = alloc(5); ++ if (dir == NULL) ++ return FAIL; + STRCPY(dir, "."); ++ } + else + { ++ dir = alloc(MAXPATHL); ++ if (dir == NULL) ++ return FAIL; + p = p_dir; + copy_option_part(&p, dir, MAXPATHL, ","); + } + swapname = makeswapname(fname, ffname, curbuf, dir); ++ vim_free(dir); + r = vim_fexists(swapname); + if (r) + { + #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) + if (p_confirm || cmdmod.confirm) + { +! char_u buff[DIALOG_MSG_SIZE]; + + dialog_msg(buff, + _("Swap file \"%s\" exists, overwrite anyway?"), +*************** +*** 2969,2975 **** + #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) + if ((p_confirm || cmdmod.confirm) && buf->b_fname != NULL) + { +! char_u buff[IOSIZE]; + + if (buf->b_p_ro) + dialog_msg(buff, _("'readonly' option is set for \"%s\".\nDo you wish to write anyway?"), +--- 2978,2984 ---- + #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) + if ((p_confirm || cmdmod.confirm) && buf->b_fname != NULL) + { +! char_u buff[DIALOG_MSG_SIZE]; + + if (buf->b_p_ro) + dialog_msg(buff, _("'readonly' option is set for \"%s\".\nDo you wish to write anyway?"), +*** ../vim-7.3.160/src/ex_cmds2.c 2011-02-25 14:46:06.000000000 +0100 +--- src/ex_cmds2.c 2011-04-11 20:51:40.000000000 +0200 +*************** +*** 1492,1498 **** + buf_T *buf; + int checkall; /* may abandon all changed buffers */ + { +! char_u buff[IOSIZE]; + int ret; + buf_T *buf2; + +--- 1492,1498 ---- + buf_T *buf; + int checkall; /* may abandon all changed buffers */ + { +! char_u buff[DIALOG_MSG_SIZE]; + int ret; + buf_T *buf2; + +*** ../vim-7.3.160/src/ex_docmd.c 2011-04-11 16:56:29.000000000 +0200 +--- src/ex_docmd.c 2011-04-11 21:20:35.000000000 +0200 +*************** +*** 5093,5106 **** + #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) + if ((p_confirm || cmdmod.confirm) && curbuf->b_fname != NULL) + { +! char_u buff[IOSIZE]; + + if (n == 1) + vim_strncpy(buff, + (char_u *)_("1 more file to edit. Quit anyway?"), +! IOSIZE - 1); + else +! vim_snprintf((char *)buff, IOSIZE, + _("%d more files to edit. Quit anyway?"), n); + if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 1) == VIM_YES) + return OK; +--- 5093,5106 ---- + #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) + if ((p_confirm || cmdmod.confirm) && curbuf->b_fname != NULL) + { +! char_u buff[DIALOG_MSG_SIZE]; + + if (n == 1) + vim_strncpy(buff, + (char_u *)_("1 more file to edit. Quit anyway?"), +! DIALOG_MSG_SIZE - 1); + else +! vim_snprintf((char *)buff, DIALOG_MSG_SIZE, + _("%d more files to edit. Quit anyway?"), n); + if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 1) == VIM_YES) + return OK; +*************** +*** 8926,8960 **** + failed = TRUE; + if (eap->cmdidx == CMD_mksession) + { +! char_u dirnow[MAXPATHL]; /* current directory */ + +! /* +! * Change to session file's dir. +! */ +! if (mch_dirname(dirnow, MAXPATHL) == FAIL +! || mch_chdir((char *)dirnow) != 0) +! *dirnow = NUL; +! if (*dirnow != NUL && (ssop_flags & SSOP_SESDIR)) +! { +! if (vim_chdirfile(fname) == OK) +! shorten_fnames(TRUE); +! } +! else if (*dirnow != NUL +! && (ssop_flags & SSOP_CURDIR) && globaldir != NULL) + { +! if (mch_chdir((char *)globaldir) == 0) +! shorten_fnames(TRUE); +! } + +! failed |= (makeopens(fd, dirnow) == FAIL); + +! /* restore original dir */ +! if (*dirnow != NUL && ((ssop_flags & SSOP_SESDIR) + || ((ssop_flags & SSOP_CURDIR) && globaldir != NULL))) +! { +! if (mch_chdir((char *)dirnow) != 0) +! EMSG(_(e_prev_dir)); +! shorten_fnames(TRUE); + } + } + else +--- 8926,8967 ---- + failed = TRUE; + if (eap->cmdidx == CMD_mksession) + { +! char_u *dirnow; /* current directory */ + +! dirnow = alloc(MAXPATHL); +! if (dirnow == NULL) +! failed = TRUE; +! else + { +! /* +! * Change to session file's dir. +! */ +! if (mch_dirname(dirnow, MAXPATHL) == FAIL +! || mch_chdir((char *)dirnow) != 0) +! *dirnow = NUL; +! if (*dirnow != NUL && (ssop_flags & SSOP_SESDIR)) +! { +! if (vim_chdirfile(fname) == OK) +! shorten_fnames(TRUE); +! } +! else if (*dirnow != NUL +! && (ssop_flags & SSOP_CURDIR) && globaldir != NULL) +! { +! if (mch_chdir((char *)globaldir) == 0) +! shorten_fnames(TRUE); +! } + +! failed |= (makeopens(fd, dirnow) == FAIL); + +! /* restore original dir */ +! if (*dirnow != NUL && ((ssop_flags & SSOP_SESDIR) + || ((ssop_flags & SSOP_CURDIR) && globaldir != NULL))) +! { +! if (mch_chdir((char *)dirnow) != 0) +! EMSG(_(e_prev_dir)); +! shorten_fnames(TRUE); +! } +! vim_free(dirnow); + } + } + else +*************** +*** 8985,8994 **** + else if (eap->cmdidx == CMD_mksession) + { + /* successful session write - set this_session var */ +! char_u tbuf[MAXPATHL]; + +! if (vim_FullName(fname, tbuf, MAXPATHL, FALSE) == OK) +! set_vim_var_string(VV_THIS_SESSION, tbuf, -1); + } + #endif + #ifdef MKSESSION_NL +--- 8992,9006 ---- + else if (eap->cmdidx == CMD_mksession) + { + /* successful session write - set this_session var */ +! char_u *tbuf; + +! tbuf = alloc(MAXPATHL); +! if (tbuf != NULL) +! { +! if (vim_FullName(fname, tbuf, MAXPATHL, FALSE) == OK) +! set_vim_var_string(VV_THIS_SESSION, tbuf, -1); +! vim_free(tbuf); +! } + } + #endif + #ifdef MKSESSION_NL +*************** +*** 10677,10683 **** + unsigned *flagp; + { + int i; +! char_u buf[MAXPATHL]; + char_u *s; + + if (gap->ga_len == 0) +--- 10689,10695 ---- + unsigned *flagp; + { + int i; +! char_u *buf = NULL; + char_u *s; + + if (gap->ga_len == 0) +*************** +*** 10692,10702 **** + { + if (fullname) + { +! (void)vim_FullName(s, buf, MAXPATHL, FALSE); +! s = buf; + } + if (fputs(" ", fd) < 0 || ses_put_fname(fd, s, flagp) == FAIL) + return FAIL; + } + } + return put_eol(fd); +--- 10704,10722 ---- + { + if (fullname) + { +! buf = alloc(MAXPATHL); +! if (buf != NULL) +! { +! (void)vim_FullName(s, buf, MAXPATHL, FALSE); +! s = buf; +! } + } + if (fputs(" ", fd) < 0 || ses_put_fname(fd, s, flagp) == FAIL) ++ { ++ vim_free(buf); + return FAIL; ++ } ++ vim_free(buf); + } + } + return put_eol(fd); +*************** +*** 10925,10931 **** + + #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) || defined(PROTO) + /* +! * Make a dialog message in "buff[IOSIZE]". + * "format" must contain "%s". + */ + void +--- 10945,10951 ---- + + #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) || defined(PROTO) + /* +! * Make a dialog message in "buff[DIALOG_MSG_SIZE]". + * "format" must contain "%s". + */ + void +*************** +*** 10936,10942 **** + { + if (fname == NULL) + fname = (char_u *)_("Untitled"); +! vim_snprintf((char *)buff, IOSIZE, format, fname); + } + #endif + +--- 10956,10962 ---- + { + if (fname == NULL) + fname = (char_u *)_("Untitled"); +! vim_snprintf((char *)buff, DIALOG_MSG_SIZE, format, fname); + } + #endif + +*** ../vim-7.3.160/src/fileio.c 2011-02-25 16:52:13.000000000 +0100 +--- src/fileio.c 2011-04-11 18:35:10.000000000 +0200 +*************** +*** 6023,6037 **** + shorten_fname1(full_path) + char_u *full_path; + { +! char_u dirname[MAXPATHL]; + char_u *p = full_path; + + if (mch_dirname(dirname, MAXPATHL) == OK) + { + p = shorten_fname(full_path, dirname); + if (p == NULL || *p == NUL) + p = full_path; + } + return p; + } + #endif +--- 6023,6041 ---- + shorten_fname1(full_path) + char_u *full_path; + { +! char_u *dirname; + char_u *p = full_path; + ++ dirname = alloc(MAXPATHL); ++ if (dirname == NULL) ++ return full_path; + if (mch_dirname(dirname, MAXPATHL) == OK) + { + p = shorten_fname(full_path, dirname); + if (p == NULL || *p == NUL) + p = full_path; + } ++ vim_free(dirname); + return p; + } + #endif +*** ../vim-7.3.160/src/hardcopy.c 2011-04-11 16:56:29.000000000 +0200 +--- src/hardcopy.c 2011-04-11 18:23:38.000000000 +0200 +*************** +*** 1759,1765 **** + char *name; + struct prt_ps_resource_S *resource; + { +! char_u buffer[MAXPATHL + 1]; + + vim_strncpy(resource->name, (char_u *)name, 63); + /* Look for named resource file in runtimepath */ +--- 1759,1770 ---- + char *name; + struct prt_ps_resource_S *resource; + { +! char_u *buffer; +! int retval; +! +! buffer = alloc(MAXPATHL + 1); +! if (buffer == NULL) +! return FALSE; + + vim_strncpy(resource->name, (char_u *)name, 63); + /* Look for named resource file in runtimepath */ +*************** +*** 1768,1776 **** + vim_strcat(buffer, (char_u *)name, MAXPATHL); + vim_strcat(buffer, (char_u *)".ps", MAXPATHL); + resource->filename[0] = NUL; +! return (do_in_runtimepath(buffer, FALSE, prt_resource_name, + resource->filename) + && resource->filename[0] != NUL); + } + + /* PS CR and LF characters have platform independent values */ +--- 1773,1783 ---- + vim_strcat(buffer, (char_u *)name, MAXPATHL); + vim_strcat(buffer, (char_u *)".ps", MAXPATHL); + resource->filename[0] = NUL; +! retval = (do_in_runtimepath(buffer, FALSE, prt_resource_name, + resource->filename) + && resource->filename[0] != NUL); ++ vim_free(buffer); ++ return retval; + } + + /* PS CR and LF characters have platform independent values */ +*************** +*** 2848,2862 **** + double right; + double top; + double bottom; +! struct prt_ps_resource_S res_prolog; +! struct prt_ps_resource_S res_encoding; + char buffer[256]; + char_u *p_encoding; + char_u *p; + #ifdef FEAT_MBYTE +! struct prt_ps_resource_S res_cidfont; +! struct prt_ps_resource_S res_cmap; + #endif + + /* + * PS DSC Header comments - no PS code! +--- 2855,2887 ---- + double right; + double top; + double bottom; +! struct prt_ps_resource_S *res_prolog; +! struct prt_ps_resource_S *res_encoding; + char buffer[256]; + char_u *p_encoding; + char_u *p; + #ifdef FEAT_MBYTE +! struct prt_ps_resource_S *res_cidfont; +! struct prt_ps_resource_S *res_cmap; + #endif ++ int retval = FALSE; ++ ++ res_prolog = (struct prt_ps_resource_S *) ++ alloc(sizeof(struct prt_ps_resource_S)); ++ res_encoding = (struct prt_ps_resource_S *) ++ alloc(sizeof(struct prt_ps_resource_S)); ++ #ifdef FEAT_MBYTE ++ res_cidfont = (struct prt_ps_resource_S *) ++ alloc(sizeof(struct prt_ps_resource_S)); ++ res_cmap = (struct prt_ps_resource_S *) ++ alloc(sizeof(struct prt_ps_resource_S)); ++ #endif ++ if (res_prolog == NULL || res_encoding == NULL ++ #ifdef FEAT_MBYTE ++ || res_cidfont == NULL || res_cmap == NULL ++ #endif ++ ) ++ goto theend; + + /* + * PS DSC Header comments - no PS code! +*************** +*** 2932,2958 **** + #endif + + /* Search for external resources VIM supplies */ +! if (!prt_find_resource("prolog", &res_prolog)) + { + EMSG(_("E456: Can't find PostScript resource file \"prolog.ps\"")); + return FALSE; + } +! if (!prt_open_resource(&res_prolog)) + return FALSE; +! if (!prt_check_resource(&res_prolog, PRT_PROLOG_VERSION)) + return FALSE; + #ifdef FEAT_MBYTE + if (prt_out_mbyte) + { + /* Look for required version of multi-byte printing procset */ +! if (!prt_find_resource("cidfont", &res_cidfont)) + { + EMSG(_("E456: Can't find PostScript resource file \"cidfont.ps\"")); + return FALSE; + } +! if (!prt_open_resource(&res_cidfont)) + return FALSE; +! if (!prt_check_resource(&res_cidfont, PRT_CID_PROLOG_VERSION)) + return FALSE; + } + #endif +--- 2957,2983 ---- + #endif + + /* Search for external resources VIM supplies */ +! if (!prt_find_resource("prolog", res_prolog)) + { + EMSG(_("E456: Can't find PostScript resource file \"prolog.ps\"")); + return FALSE; + } +! if (!prt_open_resource(res_prolog)) + return FALSE; +! if (!prt_check_resource(res_prolog, PRT_PROLOG_VERSION)) + return FALSE; + #ifdef FEAT_MBYTE + if (prt_out_mbyte) + { + /* Look for required version of multi-byte printing procset */ +! if (!prt_find_resource("cidfont", res_cidfont)) + { + EMSG(_("E456: Can't find PostScript resource file \"cidfont.ps\"")); + return FALSE; + } +! if (!prt_open_resource(res_cidfont)) + return FALSE; +! if (!prt_check_resource(res_cidfont, PRT_CID_PROLOG_VERSION)) + return FALSE; + } + #endif +*************** +*** 2968,2974 **** + #endif + p_encoding = enc_skip(p_penc); + if (*p_encoding == NUL +! || !prt_find_resource((char *)p_encoding, &res_encoding)) + { + /* 'printencoding' not set or not supported - find alternate */ + #ifdef FEAT_MBYTE +--- 2993,2999 ---- + #endif + p_encoding = enc_skip(p_penc); + if (*p_encoding == NUL +! || !prt_find_resource((char *)p_encoding, res_encoding)) + { + /* 'printencoding' not set or not supported - find alternate */ + #ifdef FEAT_MBYTE +*************** +*** 2977,2989 **** + p_encoding = enc_skip(p_enc); + props = enc_canon_props(p_encoding); + if (!(props & ENC_8BIT) +! || !prt_find_resource((char *)p_encoding, &res_encoding)) + /* 8-bit 'encoding' is not supported */ + #endif + { + /* Use latin1 as default printing encoding */ + p_encoding = (char_u *)"latin1"; +! if (!prt_find_resource((char *)p_encoding, &res_encoding)) + { + EMSG2(_("E456: Can't find PostScript resource file \"%s.ps\""), + p_encoding); +--- 3002,3014 ---- + p_encoding = enc_skip(p_enc); + props = enc_canon_props(p_encoding); + if (!(props & ENC_8BIT) +! || !prt_find_resource((char *)p_encoding, res_encoding)) + /* 8-bit 'encoding' is not supported */ + #endif + { + /* Use latin1 as default printing encoding */ + p_encoding = (char_u *)"latin1"; +! if (!prt_find_resource((char *)p_encoding, res_encoding)) + { + EMSG2(_("E456: Can't find PostScript resource file \"%s.ps\""), + p_encoding); +*************** +*** 2991,2997 **** + } + } + } +! if (!prt_open_resource(&res_encoding)) + return FALSE; + /* For the moment there are no checks on encoding resource files to + * perform */ +--- 3016,3022 ---- + } + } + } +! if (!prt_open_resource(res_encoding)) + return FALSE; + /* For the moment there are no checks on encoding resource files to + * perform */ +*************** +*** 3005,3017 **** + if (prt_use_courier) + { + /* Include ASCII range encoding vector */ +! if (!prt_find_resource(prt_ascii_encoding, &res_encoding)) + { + EMSG2(_("E456: Can't find PostScript resource file \"%s.ps\""), + prt_ascii_encoding); + return FALSE; + } +! if (!prt_open_resource(&res_encoding)) + return FALSE; + /* For the moment there are no checks on encoding resource files to + * perform */ +--- 3030,3042 ---- + if (prt_use_courier) + { + /* Include ASCII range encoding vector */ +! if (!prt_find_resource(prt_ascii_encoding, res_encoding)) + { + EMSG2(_("E456: Can't find PostScript resource file \"%s.ps\""), + prt_ascii_encoding); + return FALSE; + } +! if (!prt_open_resource(res_encoding)) + return FALSE; + /* For the moment there are no checks on encoding resource files to + * perform */ +*************** +*** 3034,3077 **** + if (prt_out_mbyte && prt_custom_cmap) + { + /* Find user supplied CMap */ +! if (!prt_find_resource(prt_cmap, &res_cmap)) + { + EMSG2(_("E456: Can't find PostScript resource file \"%s.ps\""), + prt_cmap); + return FALSE; + } +! if (!prt_open_resource(&res_cmap)) + return FALSE; + } + #endif + + /* List resources supplied */ +! STRCPY(buffer, res_prolog.title); + STRCAT(buffer, " "); +! STRCAT(buffer, res_prolog.version); + prt_dsc_resources("DocumentSuppliedResources", "procset", buffer); + #ifdef FEAT_MBYTE + if (prt_out_mbyte) + { +! STRCPY(buffer, res_cidfont.title); + STRCAT(buffer, " "); +! STRCAT(buffer, res_cidfont.version); + prt_dsc_resources(NULL, "procset", buffer); + + if (prt_custom_cmap) + { +! STRCPY(buffer, res_cmap.title); + STRCAT(buffer, " "); +! STRCAT(buffer, res_cmap.version); + prt_dsc_resources(NULL, "cmap", buffer); + } + } + if (!prt_out_mbyte || prt_use_courier) + #endif + { +! STRCPY(buffer, res_encoding.title); + STRCAT(buffer, " "); +! STRCAT(buffer, res_encoding.version); + prt_dsc_resources(NULL, "encoding", buffer); + } + prt_dsc_requirements(prt_duplex, prt_tumble, prt_collate, +--- 3059,3102 ---- + if (prt_out_mbyte && prt_custom_cmap) + { + /* Find user supplied CMap */ +! if (!prt_find_resource(prt_cmap, res_cmap)) + { + EMSG2(_("E456: Can't find PostScript resource file \"%s.ps\""), + prt_cmap); + return FALSE; + } +! if (!prt_open_resource(res_cmap)) + return FALSE; + } + #endif + + /* List resources supplied */ +! STRCPY(buffer, res_prolog->title); + STRCAT(buffer, " "); +! STRCAT(buffer, res_prolog->version); + prt_dsc_resources("DocumentSuppliedResources", "procset", buffer); + #ifdef FEAT_MBYTE + if (prt_out_mbyte) + { +! STRCPY(buffer, res_cidfont->title); + STRCAT(buffer, " "); +! STRCAT(buffer, res_cidfont->version); + prt_dsc_resources(NULL, "procset", buffer); + + if (prt_custom_cmap) + { +! STRCPY(buffer, res_cmap->title); + STRCAT(buffer, " "); +! STRCAT(buffer, res_cmap->version); + prt_dsc_resources(NULL, "cmap", buffer); + } + } + if (!prt_out_mbyte || prt_use_courier) + #endif + { +! STRCPY(buffer, res_encoding->title); + STRCAT(buffer, " "); +! STRCAT(buffer, res_encoding->version); + prt_dsc_resources(NULL, "encoding", buffer); + } + prt_dsc_requirements(prt_duplex, prt_tumble, prt_collate, +*************** +*** 3114,3128 **** + prt_dsc_noarg("BeginProlog"); + + /* Add required procsets - NOTE: order is important! */ +! if (!prt_add_resource(&res_prolog)) + return FALSE; + #ifdef FEAT_MBYTE + if (prt_out_mbyte) + { + /* Add CID font procset, and any user supplied CMap */ +! if (!prt_add_resource(&res_cidfont)) + return FALSE; +! if (prt_custom_cmap && !prt_add_resource(&res_cmap)) + return FALSE; + } + #endif +--- 3139,3153 ---- + prt_dsc_noarg("BeginProlog"); + + /* Add required procsets - NOTE: order is important! */ +! if (!prt_add_resource(res_prolog)) + return FALSE; + #ifdef FEAT_MBYTE + if (prt_out_mbyte) + { + /* Add CID font procset, and any user supplied CMap */ +! if (!prt_add_resource(res_cidfont)) + return FALSE; +! if (prt_custom_cmap && !prt_add_resource(res_cmap)) + return FALSE; + } + #endif +*************** +*** 3132,3138 **** + #endif + /* There will be only one Roman font encoding to be included in the PS + * file. */ +! if (!prt_add_resource(&res_encoding)) + return FALSE; + + prt_dsc_noarg("EndProlog"); +--- 3157,3163 ---- + #endif + /* There will be only one Roman font encoding to be included in the PS + * file. */ +! if (!prt_add_resource(res_encoding)) + return FALSE; + + prt_dsc_noarg("EndProlog"); +*************** +*** 3248,3254 **** + prt_dsc_noarg("EndSetup"); + + /* Fail if any problems writing out to the PS file */ +! return !prt_file_error; + } + + void +--- 3273,3289 ---- + prt_dsc_noarg("EndSetup"); + + /* Fail if any problems writing out to the PS file */ +! retval = !prt_file_error; +! +! theend: +! vim_free(res_prolog); +! vim_free(res_encoding); +! #ifdef FEAT_MBYTE +! vim_free(res_cidfont); +! vim_free(res_cmap); +! #endif +! +! return retval; + } + + void +*** ../vim-7.3.160/src/quickfix.c 2010-12-02 15:33:10.000000000 +0100 +--- src/quickfix.c 2011-04-11 17:54:07.000000000 +0200 +*************** +*** 3049,3056 **** + int flags = 0; + colnr_T col; + long tomatch; +! char_u dirname_start[MAXPATHL]; +! char_u dirname_now[MAXPATHL]; + char_u *target_dir = NULL; + #ifdef FEAT_AUTOCMD + char_u *au_name = NULL; +--- 3049,3056 ---- + int flags = 0; + colnr_T col; + long tomatch; +! char_u *dirname_start = NULL; +! char_u *dirname_now = NULL; + char_u *target_dir = NULL; + #ifdef FEAT_AUTOCMD + char_u *au_name = NULL; +*************** +*** 3128,3133 **** +--- 3128,3138 ---- + goto theend; + } + ++ dirname_start = alloc(MAXPATHL); ++ dirname_now = alloc(MAXPATHL); ++ if (dirname_start == NULL || dirname_now == NULL) ++ goto theend; ++ + /* Remember the current directory, because a BufRead autocommand that does + * ":lcd %:p:h" changes the meaning of short path names. */ + mch_dirname(dirname_start, MAXPATHL); +*************** +*** 3364,3369 **** +--- 3369,3376 ---- + } + + theend: ++ vim_free(dirname_now); ++ vim_free(dirname_start); + vim_free(target_dir); + vim_free(regmatch.regprog); + } +*** ../vim-7.3.160/src/main.c 2011-03-22 18:10:34.000000000 +0100 +--- src/main.c 2011-04-11 18:06:06.000000000 +0200 +*************** +*** 3814,3820 **** + int i; + char_u *inicmd = NULL; + char_u *p; +! char_u cwd[MAXPATHL]; + + if (filec > 0 && filev[0][0] == '+') + { +--- 3814,3820 ---- + int i; + char_u *inicmd = NULL; + char_u *p; +! char_u *cwd; + + if (filec > 0 && filev[0][0] == '+') + { +*************** +*** 3827,3841 **** + mainerr_arg_missing((char_u *)filev[-1]); + + /* Temporarily cd to the current directory to handle relative file names. */ + if (mch_dirname(cwd, MAXPATHL) != OK) + return NULL; +! if ((p = vim_strsave_escaped_ext(cwd, + #ifdef BACKSLASH_IN_FILENAME + "", /* rem_backslash() will tell what chars to escape */ + #else + PATH_ESC_CHARS, + #endif +! '\\', TRUE)) == NULL) + return NULL; + ga_init2(&ga, 1, 100); + ga_concat(&ga, (char_u *)":cd "); +--- 3827,3849 ---- + mainerr_arg_missing((char_u *)filev[-1]); + + /* Temporarily cd to the current directory to handle relative file names. */ ++ cwd = alloc(MAXPATHL); ++ if (cwd == NULL) ++ return NULL; + if (mch_dirname(cwd, MAXPATHL) != OK) ++ { ++ vim_free(cwd); + return NULL; +! } +! p = vim_strsave_escaped_ext(cwd, + #ifdef BACKSLASH_IN_FILENAME + "", /* rem_backslash() will tell what chars to escape */ + #else + PATH_ESC_CHARS, + #endif +! '\\', TRUE); +! vim_free(cwd); +! if (p == NULL) + return NULL; + ga_init2(&ga, 1, 100); + ga_concat(&ga, (char_u *)":cd "); +*** ../vim-7.3.160/src/netbeans.c 2011-04-11 16:56:29.000000000 +0200 +--- src/netbeans.c 2011-04-11 18:27:08.000000000 +0200 +*************** +*** 2891,2897 **** + char_u *text; + linenr_T lnum; + int col; +! char buf[MAXPATHL * 2 + 25]; + char_u *p; + + /* Don't do anything when 'ballooneval' is off, messages scrolled the +--- 2891,2897 ---- + char_u *text; + linenr_T lnum; + int col; +! char *buf; + char_u *p; + + /* Don't do anything when 'ballooneval' is off, messages scrolled the +*************** +*** 2905,2919 **** + * length. */ + if (text != NULL && text[0] != NUL && STRLEN(text) < MAXPATHL) + { +! p = nb_quote(text); +! if (p != NULL) + { +! vim_snprintf(buf, sizeof(buf), +! "0:balloonText=%d \"%s\"\n", r_cmdno, p); +! vim_free(p); + } +- nbdebug(("EVT: %s", buf)); +- nb_send(buf, "netbeans_beval_cb"); + } + vim_free(text); + } +--- 2905,2924 ---- + * length. */ + if (text != NULL && text[0] != NUL && STRLEN(text) < MAXPATHL) + { +! buf = (char *)alloc(MAXPATHL * 2 + 25); +! if (buf != NULL) + { +! p = nb_quote(text); +! if (p != NULL) +! { +! vim_snprintf(buf, MAXPATHL * 2 + 25, +! "0:balloonText=%d \"%s\"\n", r_cmdno, p); +! vim_free(p); +! } +! nbdebug(("EVT: %s", buf)); +! nb_send(buf, "netbeans_beval_cb"); +! vim_free(buf); + } + } + vim_free(text); + } +*** ../vim-7.3.160/src/spell.c 2011-04-11 16:56:29.000000000 +0200 +--- src/spell.c 2011-04-11 18:00:49.000000000 +0200 +*************** +*** 8590,8596 **** + spellinfo_T *spin; + char_u *wfname; + { +! char_u fname[MAXPATHL]; + int len; + slang_T *slang; + int free_slang = FALSE; +--- 8590,8596 ---- + spellinfo_T *spin; + char_u *wfname; + { +! char_u *fname = NULL; + int len; + slang_T *slang; + int free_slang = FALSE; +*************** +*** 8654,8659 **** +--- 8654,8662 ---- + * Write the .sug file. + * Make the file name by changing ".spl" to ".sug". + */ ++ fname = alloc(MAXPATHL); ++ if (fname == NULL) ++ goto theend; + vim_strncpy(fname, wfname, MAXPATHL - 1); + len = (int)STRLEN(fname); + fname[len - 2] = 'u'; +*************** +*** 8661,8666 **** +--- 8664,8670 ---- + sug_write(spin, fname); + + theend: ++ vim_free(fname); + if (free_slang) + slang_free(slang); + free_blocks(spin->si_blocks); +*************** +*** 9106,9113 **** + int overwrite; /* overwrite existing output file */ + int added_word; /* invoked through "zg" */ + { +! char_u fname[MAXPATHL]; +! char_u wfname[MAXPATHL]; + char_u **innames; + int incount; + afffile_T *(afile[8]); +--- 9110,9117 ---- + int overwrite; /* overwrite existing output file */ + int added_word; /* invoked through "zg" */ + { +! char_u *fname = NULL; +! char_u *wfname; + char_u **innames; + int incount; + afffile_T *(afile[8]); +*************** +*** 9135,9140 **** +--- 9139,9148 ---- + innames = &fnames[1]; + incount = fcount - 1; + ++ wfname = alloc(MAXPATHL); ++ if (wfname == NULL) ++ return; ++ + if (fcount >= 1) + { + len = (int)STRLEN(fnames[0]); +*************** +*** 9144,9167 **** + * "path/en.latin1.add.spl". */ + innames = &fnames[0]; + incount = 1; +! vim_snprintf((char *)wfname, sizeof(wfname), "%s.spl", fnames[0]); + } + else if (fcount == 1) + { + /* For ":mkspell path/vim" output file is "path/vim.latin1.spl". */ + innames = &fnames[0]; + incount = 1; +! vim_snprintf((char *)wfname, sizeof(wfname), SPL_FNAME_TMPL, + fnames[0], spin.si_ascii ? (char_u *)"ascii" : spell_enc()); + } + else if (len > 4 && STRCMP(fnames[0] + len - 4, ".spl") == 0) + { + /* Name ends in ".spl", use as the file name. */ +! vim_strncpy(wfname, fnames[0], sizeof(wfname) - 1); + } + else + /* Name should be language, make the file name from it. */ +! vim_snprintf((char *)wfname, sizeof(wfname), SPL_FNAME_TMPL, + fnames[0], spin.si_ascii ? (char_u *)"ascii" : spell_enc()); + + /* Check for .ascii.spl. */ +--- 9152,9175 ---- + * "path/en.latin1.add.spl". */ + innames = &fnames[0]; + incount = 1; +! vim_snprintf((char *)wfname, MAXPATHL, "%s.spl", fnames[0]); + } + else if (fcount == 1) + { + /* For ":mkspell path/vim" output file is "path/vim.latin1.spl". */ + innames = &fnames[0]; + incount = 1; +! vim_snprintf((char *)wfname, MAXPATHL, SPL_FNAME_TMPL, + fnames[0], spin.si_ascii ? (char_u *)"ascii" : spell_enc()); + } + else if (len > 4 && STRCMP(fnames[0] + len - 4, ".spl") == 0) + { + /* Name ends in ".spl", use as the file name. */ +! vim_strncpy(wfname, fnames[0], MAXPATHL - 1); + } + else + /* Name should be language, make the file name from it. */ +! vim_snprintf((char *)wfname, MAXPATHL, SPL_FNAME_TMPL, + fnames[0], spin.si_ascii ? (char_u *)"ascii" : spell_enc()); + + /* Check for .ascii.spl. */ +*************** +*** 9186,9199 **** + if (!overwrite && mch_stat((char *)wfname, &st) >= 0) + { + EMSG(_(e_exists)); +! return; + } + if (mch_isdir(wfname)) + { + EMSG2(_(e_isadir2), wfname); +! return; + } + + /* + * Init the aff and dic pointers. + * Get the region names if there are more than 2 arguments. +--- 9194,9211 ---- + if (!overwrite && mch_stat((char *)wfname, &st) >= 0) + { + EMSG(_(e_exists)); +! goto theend; + } + if (mch_isdir(wfname)) + { + EMSG2(_(e_isadir2), wfname); +! goto theend; + } + ++ fname = alloc(MAXPATHL); ++ if (fname == NULL) ++ goto theend; ++ + /* + * Init the aff and dic pointers. + * Get the region names if there are more than 2 arguments. +*************** +*** 9209,9215 **** + || innames[i][len - 3] != '_') + { + EMSG2(_("E755: Invalid region in %s"), innames[i]); +! return; + } + spin.si_region_name[i * 2] = TOLOWER_ASC(innames[i][len - 2]); + spin.si_region_name[i * 2 + 1] = +--- 9221,9227 ---- + || innames[i][len - 3] != '_') + { + EMSG2(_("E755: Invalid region in %s"), innames[i]); +! goto theend; + } + spin.si_region_name[i * 2] = TOLOWER_ASC(innames[i][len - 2]); + spin.si_region_name[i * 2 + 1] = +*************** +*** 9226,9232 **** + || spin.si_prefroot == NULL) + { + free_blocks(spin.si_blocks); +! return; + } + + /* When not producing a .add.spl file clear the character table when +--- 9238,9244 ---- + || spin.si_prefroot == NULL) + { + free_blocks(spin.si_blocks); +! goto theend; + } + + /* When not producing a .add.spl file clear the character table when +*************** +*** 9247,9253 **** + spin.si_conv.vc_type = CONV_NONE; + spin.si_region = 1 << i; + +! vim_snprintf((char *)fname, sizeof(fname), "%s.aff", innames[i]); + if (mch_stat((char *)fname, &st) >= 0) + { + /* Read the .aff file. Will init "spin->si_conv" based on the +--- 9259,9265 ---- + spin.si_conv.vc_type = CONV_NONE; + spin.si_region = 1 << i; + +! vim_snprintf((char *)fname, MAXPATHL, "%s.aff", innames[i]); + if (mch_stat((char *)fname, &st) >= 0) + { + /* Read the .aff file. Will init "spin->si_conv" based on the +*************** +*** 9258,9264 **** + else + { + /* Read the .dic file and store the words in the trees. */ +! vim_snprintf((char *)fname, sizeof(fname), "%s.dic", + innames[i]); + if (spell_read_dic(&spin, fname, afile[i]) == FAIL) + error = TRUE; +--- 9270,9276 ---- + else + { + /* Read the .dic file and store the words in the trees. */ +! vim_snprintf((char *)fname, MAXPATHL, "%s.dic", + innames[i]); + if (spell_read_dic(&spin, fname, afile[i]) == FAIL) + error = TRUE; +*************** +*** 9340,9345 **** +--- 9352,9361 ---- + spell_make_sugfile(&spin, wfname); + + } ++ ++ theend: ++ vim_free(fname); ++ vim_free(wfname); + } + + /* +*************** +*** 9392,9398 **** + buf_T *buf = NULL; + int new_spf = FALSE; + char_u *fname; +! char_u fnamebuf[MAXPATHL]; + char_u line[MAXWLEN * 2]; + long fpos, fpos_next = 0; + int i; +--- 9408,9414 ---- + buf_T *buf = NULL; + int new_spf = FALSE; + char_u *fname; +! char_u *fnamebuf = NULL; + char_u line[MAXWLEN * 2]; + long fpos, fpos_next = 0; + int i; +*************** +*** 9422,9427 **** +--- 9438,9446 ---- + EMSG2(_(e_notset), "spellfile"); + return; + } ++ fnamebuf = alloc(MAXPATHL); ++ if (fnamebuf == NULL) ++ return; + + for (spf = curwin->w_s->b_p_spf, i = 1; *spf != NUL; ++i) + { +*************** +*** 9431,9436 **** +--- 9450,9456 ---- + if (*spf == NUL) + { + EMSGN(_("E765: 'spellfile' does not have %ld entries"), idx); ++ vim_free(fnamebuf); + return; + } + } +*************** +*** 9442,9447 **** +--- 9462,9468 ---- + if (buf != NULL && bufIsChanged(buf)) + { + EMSG(_(e_bufloaded)); ++ vim_free(fnamebuf); + return; + } + +*************** +*** 9536,9541 **** +--- 9557,9563 ---- + + redraw_all_later(SOME_VALID); + } ++ vim_free(fnamebuf); + } + + /* +*************** +*** 9544,9550 **** + static void + init_spellfile() + { +! char_u buf[MAXPATHL]; + int l; + char_u *fname; + char_u *rtp; +--- 9566,9572 ---- + static void + init_spellfile() + { +! char_u *buf; + int l; + char_u *fname; + char_u *rtp; +*************** +*** 9554,9559 **** +--- 9576,9585 ---- + + if (*curwin->w_s->b_p_spl != NUL && curwin->w_s->b_langp.ga_len > 0) + { ++ buf = alloc(MAXPATHL); ++ if (buf == NULL) ++ return; ++ + /* Find the end of the language name. Exclude the region. If there + * is a path separator remember the start of the tail. */ + for (lend = curwin->w_s->b_p_spl; *lend != NUL +*************** +*** 9597,9603 **** + "/%.*s", (int)(lend - lstart), lstart); + } + l = (int)STRLEN(buf); +! fname = LANGP_ENTRY(curwin->w_s->b_langp, 0)->lp_slang->sl_fname; + vim_snprintf((char *)buf + l, MAXPATHL - l, ".%s.add", + fname != NULL + && strstr((char *)gettail(fname), ".ascii.") != NULL +--- 9623,9630 ---- + "/%.*s", (int)(lend - lstart), lstart); + } + l = (int)STRLEN(buf); +! fname = LANGP_ENTRY(curwin->w_s->b_langp, 0) +! ->lp_slang->sl_fname; + vim_snprintf((char *)buf + l, MAXPATHL - l, ".%s.add", + fname != NULL + && strstr((char *)gettail(fname), ".ascii.") != NULL +*************** +*** 9607,9612 **** +--- 9634,9641 ---- + } + aspath = FALSE; + } ++ ++ vim_free(buf); + } + } + +*** ../vim-7.3.160/src/tag.c 2011-04-11 16:56:29.000000000 +0200 +--- src/tag.c 2011-04-11 20:54:36.000000000 +0200 +*************** +*** 775,791 **** + { + list_T *list; + char_u tag_name[128 + 1]; +! char_u fname[MAXPATHL + 1]; +! char_u cmd[CMDBUFFSIZE + 1]; + + /* + * Add the matching tags to the location list for the current + * window. + */ + + list = list_alloc(); +! if (list == NULL) + goto end_do_tag; + + for (i = 0; i < num_matches; ++i) + { +--- 775,799 ---- + { + list_T *list; + char_u tag_name[128 + 1]; +! char_u *fname; +! char_u *cmd; + + /* + * Add the matching tags to the location list for the current + * window. + */ + ++ fname = alloc(MAXPATHL + 1); ++ cmd = alloc(CMDBUFFSIZE + 1); + list = list_alloc(); +! if (list == NULL || fname == NULL || cmd == NULL) +! { +! vim_free(cmd); +! vim_free(fname); +! if (list != NULL) +! list_free(list, TRUE); + goto end_do_tag; ++ } + + for (i = 0; i < num_matches; ++i) + { +*************** +*** 911,916 **** +--- 919,926 ---- + set_errorlist(curwin, list, ' ', IObuff); + + list_free(list, TRUE); ++ vim_free(fname); ++ vim_free(cmd); + + cur_match = 0; /* Jump to the first tag */ + } +*************** +*** 3777,3784 **** + char_u *start; /* start of the value */ + char_u *end; /* after the value; can be NULL */ + { +! char_u buf[MAXPATHL]; + int len = 0; + + /* check that the field name doesn't exist yet */ + if (dict_find(dict, (char_u *)field_name, -1) != NULL) +--- 3787,3795 ---- + char_u *start; /* start of the value */ + char_u *end; /* after the value; can be NULL */ + { +! char_u *buf; + int len = 0; ++ int retval; + + /* check that the field name doesn't exist yet */ + if (dict_find(dict, (char_u *)field_name, -1) != NULL) +*************** +*** 3791,3796 **** +--- 3802,3810 ---- + } + return FAIL; + } ++ buf = alloc(MAXPATHL); ++ if (buf == NULL) ++ return FAIL; + if (start != NULL) + { + if (end == NULL) +*************** +*** 3800,3811 **** + --end; + } + len = (int)(end - start); +! if (len > (int)sizeof(buf) - 1) +! len = sizeof(buf) - 1; + vim_strncpy(buf, start, len); + } + buf[len] = NUL; +! return dict_add_nr_str(dict, field_name, 0L, buf); + } + + /* +--- 3814,3827 ---- + --end; + } + len = (int)(end - start); +! if (len > MAXPATHL - 1) +! len = MAXPATHL - 1; + vim_strncpy(buf, start, len); + } + buf[len] = NUL; +! retval = dict_add_nr_str(dict, field_name, 0L, buf); +! vim_free(buf); +! return retval; + } + + /* +*** ../vim-7.3.160/src/vim.h 2010-12-30 12:30:26.000000000 +0100 +--- src/vim.h 2011-04-11 20:50:54.000000000 +0200 +*************** +*** 1435,1440 **** +--- 1435,1442 ---- + + #define IOSIZE (1024+1) /* file i/o and sprintf buffer size */ + ++ #define DIALOG_MSG_SIZE 1000 /* buffer size for dialog_msg() */ ++ + #ifdef FEAT_MBYTE + # define MSG_BUF_LEN 480 /* length of buffer for small messages */ + # define MSG_BUF_CLEN (MSG_BUF_LEN / 6) /* cell length (worst case: utf-8 +*** ../vim-7.3.160/src/xxd/xxd.c 2011-04-02 14:44:50.000000000 +0200 +--- src/xxd/xxd.c 2011-04-11 16:40:48.000000000 +0200 +*************** +*** 476,482 **** + int octspergrp = -1; /* number of octets grouped in output */ + int grplen; /* total chars per octet group */ + long length = -1, n = 0, seekoff = 0; +! char l[LLEN+1]; + char *pp; + + #ifdef AMIGA +--- 476,482 ---- + int octspergrp = -1; /* number of octets grouped in output */ + int grplen; /* total chars per octet group */ + long length = -1, n = 0, seekoff = 0; +! static char l[LLEN+1]; /* static because it may be too big for stack */ + char *pp; + + #ifdef AMIGA +*** ../vim-7.3.160/src/version.c 2011-04-11 16:56:29.000000000 +0200 +--- src/version.c 2011-04-11 21:15:33.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 161, + /**/ + +-- +The process for understanding customers primarily involves sitting around with +other marketing people and talking about what you would to if you were dumb +enough to be a customer. + (Scott Adams - The Dilbert principle) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.162 b/source/ap/vim/patches/7.3.162 new file mode 100644 index 00000000..3f0173af --- /dev/null +++ b/source/ap/vim/patches/7.3.162 @@ -0,0 +1,83 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.162 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.162 +Problem: No error message when assigning to a list with an index out of + range. (Yukihiro Nakadaira) +Solution: Add the error message. +Files: src/eval.c + + +*** ../vim-7.3.161/src/eval.c 2011-04-11 21:35:03.000000000 +0200 +--- src/eval.c 2011-04-21 13:40:38.000000000 +0200 +*************** +*** 2794,2799 **** +--- 2794,2801 ---- + { + if (lp->ll_range && !lp->ll_empty2) + clear_tv(&var2); ++ if (!quiet) ++ EMSGN(_(e_listidx), lp->ll_n1); + return NULL; + } + +*************** +*** 2811,2817 **** +--- 2813,2823 ---- + { + ni = list_find(lp->ll_list, lp->ll_n2); + if (ni == NULL) ++ { ++ if (!quiet) ++ EMSGN(_(e_listidx), lp->ll_n2); + return NULL; ++ } + lp->ll_n2 = list_idx_of_item(lp->ll_list, ni); + } + +*************** +*** 2819,2825 **** +--- 2825,2835 ---- + if (lp->ll_n1 < 0) + lp->ll_n1 = list_idx_of_item(lp->ll_list, lp->ll_li); + if (lp->ll_n2 < lp->ll_n1) ++ { ++ if (!quiet) ++ EMSGN(_(e_listidx), lp->ll_n2); + return NULL; ++ } + } + + lp->ll_tv = &lp->ll_li->li_tv; +*** ../vim-7.3.161/src/version.c 2011-04-11 21:35:03.000000000 +0200 +--- src/version.c 2011-04-21 13:44:46.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 162, + /**/ + +-- +Far back in the mists of ancient time, in the great and glorious days of the +former Galactic Empire, life was wild, rich and largely tax free. +Mighty starships plied their way between exotic suns, seeking adventure and +reward among the furthest reaches of Galactic space. In those days, spirits +were brave, the stakes were high, men were real men, women were real women +and small furry creatures from Alpha Centauri were real small furry creatures +from Alpha Centauri. And all dared to brave unknown terrors, to do mighty +deeds, to boldly split infinitives that no man had split before -- and thus +was the Empire forged. + -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.163 b/source/ap/vim/patches/7.3.163 new file mode 100644 index 00000000..b5f1cb4a --- /dev/null +++ b/source/ap/vim/patches/7.3.163 @@ -0,0 +1,59 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.163 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.163 +Problem: For the default of 'shellpipe' "mksh" and "pdksh" are not + recognized. +Solution: Recognize these shell names. +Files: src/option.c + + +*** ../vim-7.3.162/src/option.c 2011-03-22 14:35:01.000000000 +0100 +--- src/option.c 2011-04-15 20:49:54.000000000 +0200 +*************** +*** 3846,3851 **** +--- 3846,3853 ---- + # ifndef OS2 /* Always use bourne shell style redirection if we reach this */ + if ( fnamecmp(p, "sh") == 0 + || fnamecmp(p, "ksh") == 0 ++ || fnamecmp(p, "mksh") == 0 ++ || fnamecmp(p, "pdksh") == 0 + || fnamecmp(p, "zsh") == 0 + || fnamecmp(p, "zsh-beta") == 0 + || fnamecmp(p, "bash") == 0 +*************** +*** 3853,3858 **** +--- 3855,3862 ---- + || fnamecmp(p, "cmd") == 0 + || fnamecmp(p, "sh.exe") == 0 + || fnamecmp(p, "ksh.exe") == 0 ++ || fnamecmp(p, "mksh.exe") == 0 ++ || fnamecmp(p, "pdksh.exe") == 0 + || fnamecmp(p, "zsh.exe") == 0 + || fnamecmp(p, "zsh-beta.exe") == 0 + || fnamecmp(p, "bash.exe") == 0 +*** ../vim-7.3.162/src/version.c 2011-04-21 14:27:21.000000000 +0200 +--- src/version.c 2011-04-28 12:56:03.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 163, + /**/ + +-- +If you put 7 of the most talented OSS developers in a room for a week +and asked them to fix a bug in a spreadsheet program, in 1 week +you'd have 2 new mail readers and a text-based web browser. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.164 b/source/ap/vim/patches/7.3.164 new file mode 100644 index 00000000..9049f1b5 --- /dev/null +++ b/source/ap/vim/patches/7.3.164 @@ -0,0 +1,181 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.164 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.164 +Problem: C-indenting: a preprocessor statement confuses detection of a + function delcaration. +Solution: Ignore preprocessor lines. (Lech Lorens) Also recognize the style + to put a comma before the argument name. +Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok + + +*** ../vim-7.3.163/src/misc1.c 2011-04-11 16:56:29.000000000 +0200 +--- src/misc1.c 2011-04-28 12:49:55.000000000 +0200 +*************** +*** 5396,5403 **** + cin_ispreproc(s) + char_u *s; + { +! s = skipwhite(s); +! if (*s == '#') + return TRUE; + return FALSE; + } +--- 5396,5402 ---- + cin_ispreproc(s) + char_u *s; + { +! if (*skipwhite(s) == '#') + return TRUE; + return FALSE; + } +*************** +*** 5513,5518 **** +--- 5512,5521 ---- + else + s = *sp; + ++ /* Ignore line starting with #. */ ++ if (cin_ispreproc(s)) ++ return FALSE; ++ + while (*s && *s != '(' && *s != ';' && *s != '\'' && *s != '"') + { + if (cin_iscomment(s)) /* ignore comments */ +*************** +*** 5538,5550 **** + retval = TRUE; + goto done; + } +! if (*s == ',' && cin_nocode(s + 1)) + { +! /* ',' at the end: continue looking in the next line */ + if (lnum >= curbuf->b_ml.ml_line_count) + break; +! +! s = ml_get(++lnum); + } + else if (cin_iscomment(s)) /* ignore comments */ + s = cin_skipcomment(s); +--- 5541,5569 ---- + retval = TRUE; + goto done; + } +! if ((*s == ',' && cin_nocode(s + 1)) || s[1] == NUL || cin_nocode(s)) + { +! int comma = (*s == ','); +! +! /* ',' at the end: continue looking in the next line. +! * At the end: check for ',' in the next line, for this style: +! * func(arg1 +! * , arg2) */ +! for (;;) +! { +! if (lnum >= curbuf->b_ml.ml_line_count) +! break; +! s = ml_get(++lnum); +! if (!cin_ispreproc(s)) +! break; +! } + if (lnum >= curbuf->b_ml.ml_line_count) + break; +! /* Require a comma at end of the line or a comma or ')' at the +! * start of next line. */ +! s = skipwhite(s); +! if (!comma && *s != ',' && *s != ')') +! break; + } + else if (cin_iscomment(s)) /* ignore comments */ + s = cin_skipcomment(s); +*** ../vim-7.3.163/src/testdir/test3.in 2010-08-15 21:57:29.000000000 +0200 +--- src/testdir/test3.in 2011-04-28 12:15:12.000000000 +0200 +*************** +*** 1315,1320 **** +--- 1315,1349 ---- + } + + STARTTEST ++ :set cino=(0,ts ++ 2kdd=][ ++ ENDTEST ++ ++ void func(int a ++ #if defined(FOO) ++ , int b ++ , int c ++ #endif ++ ) ++ { ++ } ++ ++ STARTTEST ++ :set cino=(0 ++ 2kdd=][ ++ ENDTEST ++ ++ void ++ func(int a ++ #if defined(FOO) ++ , int b ++ , int c ++ #endif ++ ) ++ { ++ } ++ ++ STARTTEST + :g/^STARTTEST/.,/^ENDTEST/d + :1;/start of AUTO/,$wq! test.out + ENDTEST +*** ../vim-7.3.163/src/testdir/test3.ok 2010-08-15 21:57:29.000000000 +0200 +--- src/testdir/test3.ok 2011-04-28 12:54:04.000000000 +0200 +*************** +*** 1183,1185 **** +--- 1183,1206 ---- + foo; + } + ++ ++ void func(int a ++ #if defined(FOO) ++ , int b ++ , int c ++ #endif ++ ) ++ { ++ } ++ ++ ++ void ++ func(int a ++ #if defined(FOO) ++ , int b ++ , int c ++ #endif ++ ) ++ { ++ } ++ +*** ../vim-7.3.163/src/version.c 2011-04-28 12:56:57.000000000 +0200 +--- src/version.c 2011-04-28 12:59:55.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 164, + /**/ + +-- +Due knot trussed yore spell chequer two fined awl miss steaks. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.165 b/source/ap/vim/patches/7.3.165 new file mode 100644 index 00000000..2725259e --- /dev/null +++ b/source/ap/vim/patches/7.3.165 @@ -0,0 +1,47 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.165 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.165 +Problem: ":find" completion does not escape spaces in a directory name. + (Isz) +Solution: Add backslashes for EXPAND_FILES_IN_PATH. (Carlo Teubner) +Files: src/ex_getln.c + + +*** ../vim-7.3.164/src/ex_getln.c 2010-12-02 16:01:23.000000000 +0100 +--- src/ex_getln.c 2011-04-28 12:52:12.000000000 +0200 +*************** +*** 3702,3707 **** +--- 3702,3708 ---- + if (options & WILD_ESCAPE) + { + if (xp->xp_context == EXPAND_FILES ++ || xp->xp_context == EXPAND_FILES_IN_PATH + || xp->xp_context == EXPAND_SHELLCMD + || xp->xp_context == EXPAND_BUFFERS + || xp->xp_context == EXPAND_DIRECTORIES) +*** ../vim-7.3.164/src/version.c 2011-04-28 13:01:59.000000000 +0200 +--- src/version.c 2011-04-28 17:17:53.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 165, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +38. You wake up at 3 a.m. to go to the bathroom and stop and check your e-mail + on the way back to bed. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.166 b/source/ap/vim/patches/7.3.166 new file mode 100644 index 00000000..93c6ed35 --- /dev/null +++ b/source/ap/vim/patches/7.3.166 @@ -0,0 +1,70 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.166 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.166 +Problem: Buffer on the stack may be too big +Solution: Allocate the space. +Files: src/option.c + + +*** ../vim-7.3.165/src/option.c 2011-04-28 12:56:57.000000000 +0200 +--- src/option.c 2011-04-15 20:49:54.000000000 +0200 +*************** +*** 9185,9191 **** + int expand; + { + char_u *s; +! char_u buf[MAXPATHL]; + + if (fprintf(fd, "%s %s=", cmd, name) < 0) + return FAIL; +--- 9185,9191 ---- + int expand; + { + char_u *s; +! char_u *buf; + + if (fprintf(fd, "%s %s=", cmd, name) < 0) + return FAIL; +*************** +*** 9203,9211 **** +--- 9203,9218 ---- + } + else if (expand) + { ++ buf = alloc(MAXPATHL); ++ if (buf == NULL) ++ return FAIL; + home_replace(NULL, *valuep, buf, MAXPATHL, FALSE); + if (put_escstr(fd, buf, 2) == FAIL) ++ { ++ vim_free(buf); + return FAIL; ++ } ++ vim_free(buf); + } + else if (put_escstr(fd, *valuep, 2) == FAIL) + return FAIL; +*** ../vim-7.3.165/src/version.c 2011-04-28 17:21:49.000000000 +0200 +--- src/version.c 2011-04-28 17:23:24.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 166, + /**/ + +-- +He who laughs last, thinks slowest. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.167 b/source/ap/vim/patches/7.3.167 new file mode 100644 index 00000000..4a6de89f --- /dev/null +++ b/source/ap/vim/patches/7.3.167 @@ -0,0 +1,96 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.167 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.167 +Problem: When using the internal grep QuickFixCmdPost is not triggered. + (Yukihiro Nakadaira) +Solution: Change the place where autocommands are triggered. +Files: src/quickfix.c + + +*** ../vim-7.3.166/src/quickfix.c 2011-04-11 21:35:03.000000000 +0200 +--- src/quickfix.c 2011-04-28 13:28:03.000000000 +0200 +*************** +*** 2742,2747 **** +--- 2742,2754 ---- + #ifdef FEAT_AUTOCMD + char_u *au_name = NULL; + ++ /* Redirect ":grep" to ":vimgrep" if 'grepprg' is "internal". */ ++ if (grep_internal(eap->cmdidx)) ++ { ++ ex_vimgrep(eap); ++ return; ++ } ++ + switch (eap->cmdidx) + { + case CMD_make: au_name = (char_u *)"make"; break; +*************** +*** 2763,2775 **** + } + #endif + +- /* Redirect ":grep" to ":vimgrep" if 'grepprg' is "internal". */ +- if (grep_internal(eap->cmdidx)) +- { +- ex_vimgrep(eap); +- return; +- } +- + if (eap->cmdidx == CMD_lmake || eap->cmdidx == CMD_lgrep + || eap->cmdidx == CMD_lgrepadd) + wp = curwin; +--- 2770,2775 ---- +*************** +*** 3057,3066 **** + + switch (eap->cmdidx) + { +! case CMD_vimgrep: au_name = (char_u *)"vimgrep"; break; +! case CMD_lvimgrep: au_name = (char_u *)"lvimgrep"; break; +! case CMD_vimgrepadd: au_name = (char_u *)"vimgrepadd"; break; + case CMD_lvimgrepadd: au_name = (char_u *)"lvimgrepadd"; break; + default: break; + } + if (au_name != NULL) +--- 3057,3070 ---- + + switch (eap->cmdidx) + { +! case CMD_vimgrep: au_name = (char_u *)"vimgrep"; break; +! case CMD_lvimgrep: au_name = (char_u *)"lvimgrep"; break; +! case CMD_vimgrepadd: au_name = (char_u *)"vimgrepadd"; break; + case CMD_lvimgrepadd: au_name = (char_u *)"lvimgrepadd"; break; ++ case CMD_grep: au_name = (char_u *)"grep"; break; ++ case CMD_lgrep: au_name = (char_u *)"lgrep"; break; ++ case CMD_grepadd: au_name = (char_u *)"grepadd"; break; ++ case CMD_lgrepadd: au_name = (char_u *)"lgrepadd"; break; + default: break; + } + if (au_name != NULL) +*** ../vim-7.3.166/src/version.c 2011-04-28 17:24:54.000000000 +0200 +--- src/version.c 2011-04-28 17:26:17.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 167, + /**/ + +-- +Micro$oft: where do you want to go today? + Linux: where do you want to go tomorrow? + FreeBSD: are you guys coming, or what? + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.168 b/source/ap/vim/patches/7.3.168 new file mode 100644 index 00000000..3d6fe947 --- /dev/null +++ b/source/ap/vim/patches/7.3.168 @@ -0,0 +1,82 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.168 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.168 +Problem: When the second argument of input() contains a CR the text up to + that is used without asking the user. (Yasuhiro Matsumoto) +Solution: Change CR, NL and ESC in the text to a space. +Files: src/getchar.c + + +*** ../vim-7.3.167/src/getchar.c 2011-03-22 13:07:19.000000000 +0100 +--- src/getchar.c 2011-04-28 14:50:26.000000000 +0200 +*************** +*** 635,645 **** +--- 635,648 ---- + /* + * Stuff "s" into the stuff buffer, leaving special key codes unmodified and + * escaping other K_SPECIAL and CSI bytes. ++ * Change CR, LF and ESC into a space. + */ + void + stuffReadbuffSpec(s) + char_u *s; + { ++ int c; ++ + while (*s != NUL) + { + if (*s == K_SPECIAL && s[1] != NUL && s[2] != NUL) +*************** +*** 649,659 **** + s += 3; + } + else + #ifdef FEAT_MBYTE +! stuffcharReadbuff(mb_ptr2char_adv(&s)); + #else +! stuffcharReadbuff(*s++); + #endif + } + } + #endif +--- 652,667 ---- + s += 3; + } + else ++ { + #ifdef FEAT_MBYTE +! c = mb_ptr2char_adv(&s); + #else +! c = *s++; + #endif ++ if (c == CAR || c == NL || c == ESC) ++ c = ' '; ++ stuffcharReadbuff(c); ++ } + } + } + #endif +*** ../vim-7.3.167/src/version.c 2011-04-28 17:27:05.000000000 +0200 +--- src/version.c 2011-04-28 17:28:36.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 168, + /**/ + +-- +Everyone has a photographic memory. Some don't have film. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.169 b/source/ap/vim/patches/7.3.169 new file mode 100644 index 00000000..056ca99f --- /dev/null +++ b/source/ap/vim/patches/7.3.169 @@ -0,0 +1,130 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.169 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.169 +Problem: Freeing memory already freed, warning from static code analyzer. +Solution: Initialize pointers to NULL, correct use of "mustfree". (partly by + Dominique Pelle) +Files: src/mis1.c + + +*** ../vim-7.3.168/src/misc1.c 2011-04-28 13:01:59.000000000 +0200 +--- src/misc1.c 2011-04-28 17:42:00.000000000 +0200 +*************** +*** 3505,3511 **** + if (enc_utf8 && var != NULL) + { + int len; +! char_u *pp; + + /* Convert from active codepage to UTF-8. Other conversions are + * not done, because they would fail for non-ASCII characters. */ +--- 3505,3511 ---- + if (enc_utf8 && var != NULL) + { + int len; +! char_u *pp = NULL; + + /* Convert from active codepage to UTF-8. Other conversions are + * not done, because they would fail for non-ASCII characters. */ +*************** +*** 3872,3882 **** + * Vim's version of getenv(). + * Special handling of $HOME, $VIM and $VIMRUNTIME. + * Also does ACP to 'enc' conversion for Win32. + */ + char_u * + vim_getenv(name, mustfree) + char_u *name; +! int *mustfree; /* set to TRUE when returned is allocated */ + { + char_u *p; + char_u *pend; +--- 3872,3884 ---- + * Vim's version of getenv(). + * Special handling of $HOME, $VIM and $VIMRUNTIME. + * Also does ACP to 'enc' conversion for Win32. ++ * "mustfree" is set to TRUE when returned is allocated, it must be ++ * initialized to FALSE by the caller. + */ + char_u * + vim_getenv(name, mustfree) + char_u *name; +! int *mustfree; + { + char_u *p; + char_u *pend; +*************** +*** 3898,3904 **** + if (enc_utf8) + { + int len; +! char_u *pp; + + /* Convert from active codepage to UTF-8. Other conversions are + * not done, because they would fail for non-ASCII characters. */ +--- 3900,3906 ---- + if (enc_utf8) + { + int len; +! char_u *pp = NULL; + + /* Convert from active codepage to UTF-8. Other conversions are + * not done, because they would fail for non-ASCII characters. */ +*************** +*** 3942,3948 **** + if (enc_utf8) + { + int len; +! char_u *pp; + + /* Convert from active codepage to UTF-8. Other conversions + * are not done, because they would fail for non-ASCII +--- 3944,3950 ---- + if (enc_utf8) + { + int len; +! char_u *pp = NULL; + + /* Convert from active codepage to UTF-8. Other conversions + * are not done, because they would fail for non-ASCII +*************** +*** 3950,3956 **** + acp_to_enc(p, (int)STRLEN(p), &pp, &len); + if (pp != NULL) + { +! if (mustfree) + vim_free(p); + p = pp; + *mustfree = TRUE; +--- 3952,3958 ---- + acp_to_enc(p, (int)STRLEN(p), &pp, &len); + if (pp != NULL) + { +! if (*mustfree) + vim_free(p); + p = pp; + *mustfree = TRUE; +*** ../vim-7.3.168/src/version.c 2011-04-28 17:30:05.000000000 +0200 +--- src/version.c 2011-04-28 17:48:04.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 169, + /**/ + +-- +A day without sunshine is like, well, night. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.170 b/source/ap/vim/patches/7.3.170 new file mode 100644 index 00000000..933173ea --- /dev/null +++ b/source/ap/vim/patches/7.3.170 @@ -0,0 +1,70 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.170 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.170 +Problem: VMS Makefile for testing was not updated for test77. +Solution: Add test77 to the Makefile. +Files: src/testdir/Make_vms.mms + + +*** ../vim-7.3.169/src/testdir/Make_vms.mms 2010-11-10 16:54:16.000000000 +0100 +--- src/testdir/Make_vms.mms 2011-03-03 17:04:56.000000000 +0100 +*************** +*** 4,10 **** + # Authors: Zoltan Arpadffy, + # Sandor Kopanyi, + # +! # Last change: 2010 Nov 10 + # + # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64. + # Edit the lines in the Configuration section below to select. +--- 4,10 ---- + # Authors: Zoltan Arpadffy, + # Sandor Kopanyi, + # +! # Last change: 2011 Mar 03 + # + # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64. + # Edit the lines in the Configuration section below to select. +*************** +*** 74,80 **** + test56.out test57.out test60.out \ + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out \ +! test71.out test72.out test74.out test75.out test76.out + + # Known problems: + # Test 30: a problem around mac format - unknown reason +--- 74,81 ---- + test56.out test57.out test60.out \ + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out \ +! test71.out test72.out test74.out test75.out test76.out \ +! test77.out + + # Known problems: + # Test 30: a problem around mac format - unknown reason +*** ../vim-7.3.169/src/version.c 2011-04-28 17:48:39.000000000 +0200 +--- src/version.c 2011-04-28 19:04:33.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 170, + /**/ + +-- +The users that I support would double-click on a landmine to find out +what happens. -- A system administrator + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.171 b/source/ap/vim/patches/7.3.171 new file mode 100644 index 00000000..f965e0a2 --- /dev/null +++ b/source/ap/vim/patches/7.3.171 @@ -0,0 +1,142 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.171 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.171 +Problem: When the clipboard isn't supported: ":yank*" gives a confusing + error message. +Solution: Specifically mention that the register name is invalid. + (Jean-Rene David) +Files: runtime/doc/change.txt, src/ex_docmd.c, src/globals.h + + +*** ../vim-7.3.170/runtime/doc/change.txt 2010-08-15 21:57:18.000000000 +0200 +--- runtime/doc/change.txt 2011-05-05 13:48:00.000000000 +0200 +*************** +*** 916,923 **** + {Visual}["x]Y Yank the highlighted lines [into register x] (for + {Visual} see |Visual-mode|). {not in Vi} + +! *:y* *:yank* +! :[range]y[ank] [x] Yank [range] lines [into register x]. + + :[range]y[ank] [x] {count} + Yank {count} lines, starting with last line number +--- 917,926 ---- + {Visual}["x]Y Yank the highlighted lines [into register x] (for + {Visual} see |Visual-mode|). {not in Vi} + +! *:y* *:yank* *E850* +! :[range]y[ank] [x] Yank [range] lines [into register x]. Yanking to the +! "* or "+ registers is possible only in GUI versions or +! when the |+xterm_clipboard| feature is included. + + :[range]y[ank] [x] {count} + Yank {count} lines, starting with last line number +*** ../vim-7.3.170/src/ex_docmd.c 2011-04-11 21:35:03.000000000 +0200 +--- src/ex_docmd.c 2011-05-05 13:48:57.000000000 +0200 +*************** +*** 2424,2448 **** + if ( (ea.argt & REGSTR) + && *ea.arg != NUL + #ifdef FEAT_USR_CMDS +- && valid_yank_reg(*ea.arg, (ea.cmdidx != CMD_put +- && USER_CMDIDX(ea.cmdidx))) + /* Do not allow register = for user commands */ + && (!USER_CMDIDX(ea.cmdidx) || *ea.arg != '=') +- #else +- && valid_yank_reg(*ea.arg, ea.cmdidx != CMD_put) + #endif + && !((ea.argt & COUNT) && VIM_ISDIGIT(*ea.arg))) + { +! ea.regname = *ea.arg++; +! #ifdef FEAT_EVAL +! /* for '=' register: accept the rest of the line as an expression */ +! if (ea.arg[-1] == '=' && ea.arg[0] != NUL) + { +! set_expr_line(vim_strsave(ea.arg)); +! ea.arg += STRLEN(ea.arg); + } + #endif +! ea.arg = skipwhite(ea.arg); + } + + /* +--- 2424,2462 ---- + if ( (ea.argt & REGSTR) + && *ea.arg != NUL + #ifdef FEAT_USR_CMDS + /* Do not allow register = for user commands */ + && (!USER_CMDIDX(ea.cmdidx) || *ea.arg != '=') + #endif + && !((ea.argt & COUNT) && VIM_ISDIGIT(*ea.arg))) + { +! #ifndef FEAT_CLIPBOARD +! /* check these explicitly for a more specific error message */ +! if (*ea.arg == '*' || *ea.arg == '+') + { +! errormsg = (char_u *)_(e_invalidreg); +! goto doend; + } + #endif +! if ( +! #ifdef FEAT_USR_CMDS +! valid_yank_reg(*ea.arg, (ea.cmdidx != CMD_put +! && USER_CMDIDX(ea.cmdidx))) +! #else +! valid_yank_reg(*ea.arg, ea.cmdidx != CMD_put) +! #endif +! ) +! { +! ea.regname = *ea.arg++; +! #ifdef FEAT_EVAL +! /* for '=' register: accept the rest of the line as an expression */ +! if (ea.arg[-1] == '=' && ea.arg[0] != NUL) +! { +! set_expr_line(vim_strsave(ea.arg)); +! ea.arg += STRLEN(ea.arg); +! } +! #endif +! ea.arg = skipwhite(ea.arg); +! } + } + + /* +*** ../vim-7.3.170/src/globals.h 2011-02-15 17:39:14.000000000 +0100 +--- src/globals.h 2011-05-05 13:47:44.000000000 +0200 +*************** +*** 1561,1566 **** +--- 1561,1569 ---- + (defined(FEAT_INS_EXPAND) && defined(FEAT_COMPL_FUNC)) + EXTERN char_u e_notset[] INIT(= N_("E764: Option '%s' is not set")); + #endif ++ #ifndef FEAT_CLIPBOARD ++ EXTERN char_u e_invalidreg[] INIT(= N_("E850: Invalid register name")); ++ #endif + + #ifdef MACOS_X_UNIX + EXTERN short disallow_gui INIT(= FALSE); +*** ../vim-7.3.170/src/version.c 2011-04-28 19:05:01.000000000 +0200 +--- src/version.c 2011-05-05 14:24:39.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 171, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +53. To find out what time it is, you send yourself an e-mail and check the + "Date:" field. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.172 b/source/ap/vim/patches/7.3.172 new file mode 100644 index 00000000..66a78521 --- /dev/null +++ b/source/ap/vim/patches/7.3.172 @@ -0,0 +1,268 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.172 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.172 +Problem: MS-Windows: rename() might delete the file if the name differs but + it's actually the same file. +Solution: Use the file handle to check if it's the same file. (Yukihiro + Nakadaira) +Files: src/if_cscope.c, src/fileio.c, src/os_win32.c, + src/proto/os_win32.pro, src/vim.h + + +*** ../vim-7.3.171/src/if_cscope.c 2011-03-03 15:01:25.000000000 +0100 +--- src/if_cscope.c 2011-05-05 16:16:38.000000000 +0200 +*************** +*** 1412,1428 **** + { + short i, j; + #ifndef UNIX +- HANDLE hFile; + BY_HANDLE_FILE_INFORMATION bhfi; + +- vim_memset(&bhfi, 0, sizeof(bhfi)); + /* On windows 9x GetFileInformationByHandle doesn't work, so skip it */ + if (!mch_windows95()) + { +! hFile = CreateFile(fname, FILE_READ_ATTRIBUTES, 0, NULL, OPEN_EXISTING, +! FILE_ATTRIBUTE_NORMAL, NULL); +! if (hFile == INVALID_HANDLE_VALUE) + { + if (p_csverbose) + { + char *cant_msg = _("E625: cannot open cscope database: %s"); +--- 1412,1426 ---- + { + short i, j; + #ifndef UNIX + BY_HANDLE_FILE_INFORMATION bhfi; + + /* On windows 9x GetFileInformationByHandle doesn't work, so skip it */ + if (!mch_windows95()) + { +! switch (win32_fileinfo(fname, &bhfi)) + { ++ case FILEINFO_ENC_FAIL: /* enc_to_utf16() failed */ ++ case FILEINFO_READ_FAIL: /* CreateFile() failed */ + if (p_csverbose) + { + char *cant_msg = _("E625: cannot open cscope database: %s"); +*************** +*** 1438,1452 **** + (void)EMSG2(cant_msg, fname); + } + return -1; +! } +! if (!GetFileInformationByHandle(hFile, &bhfi)) +! { +! CloseHandle(hFile); + if (p_csverbose) + (void)EMSG(_("E626: cannot get cscope database information")); + return -1; + } +- CloseHandle(hFile); + } + #endif + +--- 1436,1447 ---- + (void)EMSG2(cant_msg, fname); + } + return -1; +! +! case FILEINFO_INFO_FAIL: /* GetFileInformationByHandle() failed */ + if (p_csverbose) + (void)EMSG(_("E626: cannot get cscope database information")); + return -1; + } + } + #endif + +*** ../vim-7.3.171/src/fileio.c 2011-04-11 21:35:03.000000000 +0200 +--- src/fileio.c 2011-05-05 16:22:22.000000000 +0200 +*************** +*** 6555,6560 **** +--- 6555,6575 ---- + use_tmp_file = TRUE; + } + #endif ++ #ifdef WIN3264 ++ { ++ BY_HANDLE_FILE_INFORMATION info1, info2; ++ ++ /* It's possible for the source and destination to be the same file. ++ * In that case go through a temp file name. This makes rename("foo", ++ * "./foo") a no-op (in a complicated way). */ ++ if (win32_fileinfo(from, &info1) == FILEINFO_OK ++ && win32_fileinfo(to, &info2) == FILEINFO_OK ++ && info1.dwVolumeSerialNumber == info2.dwVolumeSerialNumber ++ && info1.nFileIndexHigh == info2.nFileIndexHigh ++ && info1.nFileIndexLow == info2.nFileIndexLow) ++ use_tmp_file = TRUE; ++ } ++ #endif + + #if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME) + if (use_tmp_file) +*** ../vim-7.3.171/src/os_win32.c 2011-02-01 13:48:47.000000000 +0100 +--- src/os_win32.c 2011-05-05 16:24:17.000000000 +0200 +*************** +*** 2645,2669 **** + int + mch_is_linked(char_u *fname) + { + HANDLE hFile; +! int res = 0; +! BY_HANDLE_FILE_INFORMATION inf; + #ifdef FEAT_MBYTE + WCHAR *wn = NULL; + + if (enc_codepage >= 0 && (int)GetACP() != enc_codepage) + wn = enc_to_utf16(fname, NULL); + if (wn != NULL) + { + hFile = CreateFileW(wn, /* file name */ + GENERIC_READ, /* access mode */ +! 0, /* share mode */ + NULL, /* security descriptor */ + OPEN_EXISTING, /* creation disposition */ +! 0, /* file attributes */ + NULL); /* handle to template file */ + if (hFile == INVALID_HANDLE_VALUE +! && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + /* Retry with non-wide function (for Windows 98). */ + vim_free(wn); +--- 2645,2688 ---- + int + mch_is_linked(char_u *fname) + { ++ BY_HANDLE_FILE_INFORMATION info; ++ ++ return win32_fileinfo(fname, &info) == FILEINFO_OK ++ && info.nNumberOfLinks > 1; ++ } ++ ++ /* ++ * Get the by-handle-file-information for "fname". ++ * Returns FILEINFO_OK when OK. ++ * returns FILEINFO_ENC_FAIL when enc_to_utf16() failed. ++ * Returns FILEINFO_READ_FAIL when CreateFile() failed. ++ * Returns FILEINFO_INFO_FAIL when GetFileInformationByHandle() failed. ++ */ ++ int ++ win32_fileinfo(char_u *fname, BY_HANDLE_FILE_INFORMATION *info) ++ { + HANDLE hFile; +! int res = FILEINFO_READ_FAIL; + #ifdef FEAT_MBYTE + WCHAR *wn = NULL; + + if (enc_codepage >= 0 && (int)GetACP() != enc_codepage) ++ { + wn = enc_to_utf16(fname, NULL); ++ if (wn == NULL) ++ res = FILEINFO_ENC_FAIL; ++ } + if (wn != NULL) + { + hFile = CreateFileW(wn, /* file name */ + GENERIC_READ, /* access mode */ +! FILE_SHARE_READ | FILE_SHARE_WRITE, /* share mode */ + NULL, /* security descriptor */ + OPEN_EXISTING, /* creation disposition */ +! FILE_FLAG_BACKUP_SEMANTICS, /* file attributes */ + NULL); /* handle to template file */ + if (hFile == INVALID_HANDLE_VALUE +! && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + /* Retry with non-wide function (for Windows 98). */ + vim_free(wn); +*************** +*** 2674,2690 **** + #endif + hFile = CreateFile(fname, /* file name */ + GENERIC_READ, /* access mode */ +! 0, /* share mode */ + NULL, /* security descriptor */ + OPEN_EXISTING, /* creation disposition */ +! 0, /* file attributes */ + NULL); /* handle to template file */ + + if (hFile != INVALID_HANDLE_VALUE) + { +! if (GetFileInformationByHandle(hFile, &inf) != 0 +! && inf.nNumberOfLinks > 1) +! res = 1; + CloseHandle(hFile); + } + +--- 2693,2710 ---- + #endif + hFile = CreateFile(fname, /* file name */ + GENERIC_READ, /* access mode */ +! FILE_SHARE_READ | FILE_SHARE_WRITE, /* share mode */ + NULL, /* security descriptor */ + OPEN_EXISTING, /* creation disposition */ +! FILE_FLAG_BACKUP_SEMANTICS, /* file attributes */ + NULL); /* handle to template file */ + + if (hFile != INVALID_HANDLE_VALUE) + { +! if (GetFileInformationByHandle(hFile, info) != 0) +! res = FILEINFO_OK; +! else +! res = FILEINFO_INFO_FAIL; + CloseHandle(hFile); + } + +*** ../vim-7.3.171/src/proto/os_win32.pro 2010-10-23 14:02:48.000000000 +0200 +--- src/proto/os_win32.pro 2011-05-05 16:17:42.000000000 +0200 +*************** +*** 21,26 **** +--- 21,27 ---- + void mch_hide __ARGS((char_u *name)); + int mch_isdir __ARGS((char_u *name)); + int mch_is_linked __ARGS((char_u *fname)); ++ int win32_fileinfo __ARGS((char_u *name, BY_HANDLE_FILE_INFORMATION *lpFileInfo)); + int mch_writable __ARGS((char_u *name)); + int mch_can_exe __ARGS((char_u *name)); + int mch_nodetype __ARGS((char_u *name)); +*** ../vim-7.3.171/src/vim.h 2011-04-11 21:35:03.000000000 +0200 +--- src/vim.h 2011-05-05 16:16:57.000000000 +0200 +*************** +*** 2217,2220 **** +--- 2217,2226 ---- + #define KEYLEN_PART_MAP -2 /* keylen value for incomplete mapping */ + #define KEYLEN_REMOVED 9999 /* keylen value for removed sequence */ + ++ /* Return values from win32_fileinfo(). */ ++ #define FILEINFO_OK 0 ++ #define FILEINFO_ENC_FAIL 1 /* enc_to_utf16() failed */ ++ #define FILEINFO_READ_FAIL 2 /* CreateFile() failed */ ++ #define FILEINFO_INFO_FAIL 3 /* GetFileInformationByHandle() failed */ ++ + #endif /* VIM__H */ +*** ../vim-7.3.171/src/version.c 2011-05-05 14:26:37.000000000 +0200 +--- src/version.c 2011-05-05 16:39:35.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 172, + /**/ + +-- +Q: What is a patch 22? +A: A patch you need to include to make it possible to include patches. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.173 b/source/ap/vim/patches/7.3.173 new file mode 100644 index 00000000..ac8cffb9 --- /dev/null +++ b/source/ap/vim/patches/7.3.173 @@ -0,0 +1,79 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.173 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.173 +Problem: After using setqflist() to make the quickfix list empty ":cwindow" + may open the window anyway. Also after ":vimgrep". +Solution: Correctly check whether the list is empty. (Ingo Karkat) +Files: src/quickfix.c + + +*** ../vim-7.3.172/src/quickfix.c 2011-04-28 17:27:05.000000000 +0200 +--- src/quickfix.c 2011-05-05 16:55:47.000000000 +0200 +*************** +*** 1164,1170 **** + + /* When no valid entries are present in the list, qf_ptr points to + * the first item in the list */ +! if (to_qfl->qf_nonevalid == TRUE) + to_qfl->qf_ptr = to_qfl->qf_start; + } + +--- 1164,1170 ---- + + /* When no valid entries are present in the list, qf_ptr points to + * the first item in the list */ +! if (to_qfl->qf_nonevalid) + to_qfl->qf_ptr = to_qfl->qf_start; + } + +*************** +*** 2243,2248 **** +--- 2243,2249 ---- + * it if we have errors; otherwise, leave it closed. + */ + if (qi->qf_lists[qi->qf_curlist].qf_nonevalid ++ || qi->qf_lists[qi->qf_curlist].qf_count == 0 + || qi->qf_curlist >= qi->qf_listcount) + { + if (win != NULL) +*************** +*** 3711,3717 **** + } + + if (qi->qf_lists[qi->qf_curlist].qf_index == 0) +! /* empty list or no valid entry */ + qi->qf_lists[qi->qf_curlist].qf_nonevalid = TRUE; + else + qi->qf_lists[qi->qf_curlist].qf_nonevalid = FALSE; +--- 3712,3718 ---- + } + + if (qi->qf_lists[qi->qf_curlist].qf_index == 0) +! /* no valid entry */ + qi->qf_lists[qi->qf_curlist].qf_nonevalid = TRUE; + else + qi->qf_lists[qi->qf_curlist].qf_nonevalid = FALSE; +*** ../vim-7.3.172/src/version.c 2011-05-05 16:41:19.000000000 +0200 +--- src/version.c 2011-05-05 17:11:57.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 173, + /**/ + +-- +"I can't complain, but sometimes I still do." (Joe Walsh) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.174 b/source/ap/vim/patches/7.3.174 new file mode 100644 index 00000000..33d60035 --- /dev/null +++ b/source/ap/vim/patches/7.3.174 @@ -0,0 +1,109 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.174 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.174 +Problem: When Exuberant ctags binary is exctags it's not found. +Solution: Add configure check for exctags. (Hong Xu) +Files: src/configure.in, src/auto/configure + + +*** ../vim-7.3.173/src/configure.in 2011-02-09 17:42:53.000000000 +0100 +--- src/configure.in 2011-05-05 17:18:21.000000000 +0200 +*************** +*** 2619,2625 **** + dnl On HP-UX 10.10 termcap or termlib should be used instead of + dnl curses, because curses is much slower. + dnl Newer versions of ncurses are preferred over anything, except +! dnl when tinfo has been split off, it conains all we need. + dnl Older versions of ncurses have bugs, get a new one! + dnl Digital Unix (OSF1) should use curses (Ronald Schild). + dnl On SCO Openserver should prefer termlib (Roger Cornelius). +--- 2619,2625 ---- + dnl On HP-UX 10.10 termcap or termlib should be used instead of + dnl curses, because curses is much slower. + dnl Newer versions of ncurses are preferred over anything, except +! dnl when tinfo has been split off, it contains all we need. + dnl Older versions of ncurses have bugs, get a new one! + dnl Digital Unix (OSF1) should use curses (Ronald Schild). + dnl On SCO Openserver should prefer termlib (Roger Cornelius). +*************** +*** 3370,3376 **** + AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,) + + dnl Check how we can run ctags. Default to "ctags" when nothing works. +! dnl --version for Exuberant ctags (preferred) + dnl Add --fields=+S to get function signatures for omni completion. + dnl -t for typedefs (many ctags have this) + dnl -s for static functions (Elvis ctags only?) +--- 3370,3376 ---- + AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,) + + dnl Check how we can run ctags. Default to "ctags" when nothing works. +! dnl Use --version to detect Exuberant ctags (preferred) + dnl Add --fields=+S to get function signatures for omni completion. + dnl -t for typedefs (many ctags have this) + dnl -s for static functions (Elvis ctags only?) +*************** +*** 3378,3384 **** + dnl -i+m to test for older Exuberant ctags + AC_MSG_CHECKING(how to create tags) + test -f tags && mv tags tags.save +! if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then + TAGPRG="ctags -I INIT+ --fields=+S" + else + TAGPRG="ctags" +--- 3378,3386 ---- + dnl -i+m to test for older Exuberant ctags + AC_MSG_CHECKING(how to create tags) + test -f tags && mv tags tags.save +! if (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then +! TAGPRG="exctags -I INIT+ --fields=+S" +! elif (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then + TAGPRG="ctags -I INIT+ --fields=+S" + else + TAGPRG="ctags" +*** ../vim-7.3.173/src/auto/configure 2011-02-09 17:42:53.000000000 +0100 +--- src/auto/configure 2011-05-05 17:19:26.000000000 +0200 +*************** +*** 12031,12037 **** + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create tags" >&5 + $as_echo_n "checking how to create tags... " >&6; } + test -f tags && mv tags tags.save +! if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then + TAGPRG="ctags -I INIT+ --fields=+S" + else + TAGPRG="ctags" +--- 12031,12039 ---- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create tags" >&5 + $as_echo_n "checking how to create tags... " >&6; } + test -f tags && mv tags tags.save +! if (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then +! TAGPRG="exctags -I INIT+ --fields=+S" +! elif (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then + TAGPRG="ctags -I INIT+ --fields=+S" + else + TAGPRG="ctags" +*** ../vim-7.3.173/src/version.c 2011-05-05 17:14:07.000000000 +0200 +--- src/version.c 2011-05-05 17:19:37.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 174, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +54. You start tilting your head sideways to smile. :-) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.175 b/source/ap/vim/patches/7.3.175 new file mode 100644 index 00000000..57fbc4a7 --- /dev/null +++ b/source/ap/vim/patches/7.3.175 @@ -0,0 +1,50 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.175 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.175 +Problem: When 'colorcolumn' is set locally to a window, ":new" opens a + window with the same highlighting but 'colorcolumn' is empty. + (Tyru) +Solution: Call check_colorcolumn() after clearing and copying options. + (Christian Brabandt) +Files: src/buffer.c + + +*** ../vim-7.3.174/src/buffer.c 2011-04-11 16:56:29.000000000 +0200 +--- src/buffer.c 2011-05-05 17:28:24.000000000 +0200 +*************** +*** 2527,2532 **** +--- 2527,2535 ---- + if (p_fdls >= 0) + curwin->w_p_fdl = p_fdls; + #endif ++ #ifdef FEAT_SYN_HL ++ check_colorcolumn(curwin); ++ #endif + } + + /* +*** ../vim-7.3.174/src/version.c 2011-05-05 17:23:58.000000000 +0200 +--- src/version.c 2011-05-05 17:30:32.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 175, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +55. You ask your doctor to implant a gig in your brain. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.176 b/source/ap/vim/patches/7.3.176 new file mode 100644 index 00000000..fcf4880d --- /dev/null +++ b/source/ap/vim/patches/7.3.176 @@ -0,0 +1,165 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.176 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.176 +Problem: Ruby linking doesn't work properly on Mac OS X. +Solution: Fix the configure check for Ruby. (Bjorn Winckler) +Files: src/configure.in, src/auto/configure + + +*** ../vim-7.3.175/src/configure.in 2011-05-05 17:23:58.000000000 +0200 +--- src/configure.in 2011-05-05 18:03:38.000000000 +0200 +*************** +*** 1387,1396 **** + AC_MSG_RESULT($enable_rubyinterp) + if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then + AC_MSG_CHECKING(--with-ruby-command argument) + AC_ARG_WITH(ruby-command, [ --with-ruby-command=RUBY name of the Ruby command (default: ruby)], +! RUBY_CMD="$withval"; AC_MSG_RESULT($RUBY_CMD), + RUBY_CMD="ruby"; AC_MSG_RESULT(defaulting to $RUBY_CMD)) +- AC_SUBST(vi_cv_path_ruby) + AC_PATH_PROG(vi_cv_path_ruby, $RUBY_CMD) + if test "X$vi_cv_path_ruby" != "X"; then + AC_MSG_CHECKING(Ruby version) +--- 1387,1396 ---- + AC_MSG_RESULT($enable_rubyinterp) + if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then + AC_MSG_CHECKING(--with-ruby-command argument) ++ AC_SUBST(vi_cv_path_ruby) + AC_ARG_WITH(ruby-command, [ --with-ruby-command=RUBY name of the Ruby command (default: ruby)], +! RUBY_CMD="$withval"; vi_cv_path_ruby="$withval"; AC_MSG_RESULT($RUBY_CMD), + RUBY_CMD="ruby"; AC_MSG_RESULT(defaulting to $RUBY_CMD)) + AC_PATH_PROG(vi_cv_path_ruby, $RUBY_CMD) + if test "X$vi_cv_path_ruby" != "X"; then + AC_MSG_CHECKING(Ruby version) +*************** +*** 1412,1429 **** + RUBY_LIBS="$rubylibs" + fi + librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'` +! if test -f "$rubyhdrdir/$librubyarg"; then +! librubyarg="$rubyhdrdir/$librubyarg" +! else +! rubylibdir=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["libdir"]])'` +! if test -f "$rubylibdir/$librubyarg"; then +! librubyarg="$rubylibdir/$librubyarg" +! elif test "$librubyarg" = "libruby.a"; then +! dnl required on Mac OS 10.3 where libruby.a doesn't exist +! librubyarg="-lruby" +! else +! librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"` +! fi + fi + + if test "X$librubyarg" != "X"; then +--- 1412,1426 ---- + RUBY_LIBS="$rubylibs" + fi + librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'` +! librubya=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBY_A"]])'` +! rubylibdir=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["libdir"]])'` +! if test -f "$rubylibdir/$librubya"; then +! librubyarg="$librubyarg" +! RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" +! elif test "$librubyarg" = "libruby.a"; then +! dnl required on Mac OS 10.3 where libruby.a doesn't exist +! librubyarg="-lruby" +! RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" + fi + + if test "X$librubyarg" != "X"; then +*** ../vim-7.3.175/src/auto/configure 2011-05-05 17:23:58.000000000 +0200 +--- src/auto/configure 2011-05-05 18:06:47.000000000 +0200 +*************** +*** 6218,6233 **** + { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ruby-command argument" >&5 + $as_echo_n "checking --with-ruby-command argument... " >&6; } + + # Check whether --with-ruby-command was given. + if test "${with_ruby_command+set}" = set; then : +! withval=$with_ruby_command; RUBY_CMD="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_CMD" >&5 + $as_echo "$RUBY_CMD" >&6; } + else + RUBY_CMD="ruby"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to $RUBY_CMD" >&5 + $as_echo "defaulting to $RUBY_CMD" >&6; } + fi + +- + # Extract the first word of "$RUBY_CMD", so it can be a program name with args. + set dummy $RUBY_CMD; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +--- 6218,6233 ---- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ruby-command argument" >&5 + $as_echo_n "checking --with-ruby-command argument... " >&6; } + ++ + # Check whether --with-ruby-command was given. + if test "${with_ruby_command+set}" = set; then : +! withval=$with_ruby_command; RUBY_CMD="$withval"; vi_cv_path_ruby="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_CMD" >&5 + $as_echo "$RUBY_CMD" >&6; } + else + RUBY_CMD="ruby"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to $RUBY_CMD" >&5 + $as_echo "defaulting to $RUBY_CMD" >&6; } + fi + + # Extract the first word of "$RUBY_CMD", so it can be a program name with args. + set dummy $RUBY_CMD; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +*************** +*** 6292,6308 **** + RUBY_LIBS="$rubylibs" + fi + librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["LIBRUBYARG"])'` +! if test -f "$rubyhdrdir/$librubyarg"; then +! librubyarg="$rubyhdrdir/$librubyarg" +! else +! rubylibdir=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["libdir"])'` +! if test -f "$rubylibdir/$librubyarg"; then +! librubyarg="$rubylibdir/$librubyarg" +! elif test "$librubyarg" = "libruby.a"; then +! librubyarg="-lruby" +! else +! librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"` +! fi + fi + + if test "X$librubyarg" != "X"; then +--- 6292,6305 ---- + RUBY_LIBS="$rubylibs" + fi + librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["LIBRUBYARG"])'` +! librubya=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["LIBRUBY_A"])'` +! rubylibdir=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["libdir"])'` +! if test -f "$rubylibdir/$librubya"; then +! librubyarg="$librubyarg" +! RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" +! elif test "$librubyarg" = "libruby.a"; then +! librubyarg="-lruby" +! RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" + fi + + if test "X$librubyarg" != "X"; then +*** ../vim-7.3.175/src/version.c 2011-05-05 17:32:40.000000000 +0200 +--- src/version.c 2011-05-05 18:08:52.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 176, + /**/ + +-- +"I simultaneously try to keep my head in the clouds and my feet on the +ground. Sometimes it's a stretch, though." -- Larry Wall + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.177 b/source/ap/vim/patches/7.3.177 new file mode 100644 index 00000000..895b3b13 --- /dev/null +++ b/source/ap/vim/patches/7.3.177 @@ -0,0 +1,97 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.177 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.177 +Problem: MS-Windows: mkdir() doesn't work properly when 'encoding' is + "utf-8". +Solution: Convert to utf-16. (Yukihiro Nakadaira) +Files: src/os_win32.c, src/os_win32.h, src/proto/os_win32.pro + + +*** ../vim-7.3.176/src/os_win32.c 2011-05-05 16:41:19.000000000 +0200 +--- src/os_win32.c 2011-05-05 18:24:36.000000000 +0200 +*************** +*** 2640,2645 **** +--- 2640,2669 ---- + } + + /* ++ * Create directory "name". ++ * Return 0 on success, -1 on error. ++ */ ++ int ++ mch_mkdir(char_u *name) ++ { ++ #ifdef FEAT_MBYTE ++ if (enc_codepage >= 0 && (int)GetACP() != enc_codepage) ++ { ++ WCHAR *p; ++ int retval; ++ ++ p = enc_to_utf16(name, NULL); ++ if (p == NULL) ++ return -1; ++ retval = _wmkdir(p); ++ vim_free(p); ++ return retval; ++ } ++ #endif ++ return _mkdir(name); ++ } ++ ++ /* + * Return TRUE if file "fname" has more than one link. + */ + int +*** ../vim-7.3.176/src/os_win32.h 2010-08-15 21:57:30.000000000 +0200 +--- src/os_win32.h 2011-05-05 18:25:44.000000000 +0200 +*************** +*** 191,195 **** + #ifdef __BORLANDC__ + # define vim_mkdir(x, y) mkdir(x) + #else +! # define vim_mkdir(x, y) _mkdir(x) + #endif +--- 191,195 ---- + #ifdef __BORLANDC__ + # define vim_mkdir(x, y) mkdir(x) + #else +! # define vim_mkdir(x, y) mch_mkdir(x) + #endif +*** ../vim-7.3.176/src/proto/os_win32.pro 2011-05-05 16:41:19.000000000 +0200 +--- src/proto/os_win32.pro 2011-05-05 18:26:20.000000000 +0200 +*************** +*** 20,25 **** +--- 20,26 ---- + int mch_setperm __ARGS((char_u *name, long perm)); + void mch_hide __ARGS((char_u *name)); + int mch_isdir __ARGS((char_u *name)); ++ int mch_mkdir __ARGS((char_u *name)); + int mch_is_linked __ARGS((char_u *fname)); + int win32_fileinfo __ARGS((char_u *name, BY_HANDLE_FILE_INFORMATION *lpFileInfo)); + int mch_writable __ARGS((char_u *name)); +*** ../vim-7.3.176/src/version.c 2011-05-05 18:10:11.000000000 +0200 +--- src/version.c 2011-05-05 18:27:56.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 177, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +56. You leave the modem speaker on after connecting because you think it + sounds like the ocean wind...the perfect soundtrack for "surfing the net". + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.178 b/source/ap/vim/patches/7.3.178 new file mode 100644 index 00000000..9b6ca7c3 --- /dev/null +++ b/source/ap/vim/patches/7.3.178 @@ -0,0 +1,163 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.178 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.178 +Problem: C-indent doesn't handle code right after { correctly. +Solution: Fix detecting unterminated line. (Lech Lorens) +Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok + + +*** ../vim-7.3.177/src/misc1.c 2011-04-28 17:48:39.000000000 +0200 +--- src/misc1.c 2011-05-10 11:35:09.000000000 +0200 +*************** +*** 4983,4989 **** + } + + /* +! * Return TRUE if there there is no code at *s. White space and comments are + * not considered code. + */ + static int +--- 4983,4989 ---- + } + + /* +! * Return TRUE if there is no code at *s. White space and comments are + * not considered code. + */ + static int +*************** +*** 5458,5465 **** + } + + /* +! * Recognize a line that starts with '{' or '}', or ends with ';', '{' or '}'. + * Don't consider "} else" a terminated line. + * Return the character terminating the line (ending char's have precedence if + * both apply in order to determine initializations). + */ +--- 5458,5468 ---- + } + + /* +! * Recognize a line that starts with '{' or '}', or ends with ';', ',', '{' or +! * '}'. + * Don't consider "} else" a terminated line. ++ * Don't consider a line where there are unmatched opening braces before '}', ++ * ';' or ',' a terminated line. + * Return the character terminating the line (ending char's have precedence if + * both apply in order to determine initializations). + */ +*************** +*** 5470,5475 **** +--- 5473,5479 ---- + int incl_comma; /* recognize a trailing comma */ + { + char_u found_start = 0; ++ unsigned n_open = 0; + + s = cin_skipcomment(s); + +*************** +*** 5480,5489 **** + { + /* skip over comments, "" strings and 'c'haracters */ + s = skip_string(cin_skipcomment(s)); +! if ((*s == ';' || (incl_open && *s == '{') || *s == '}' +! || (incl_comma && *s == ',')) + && cin_nocode(s + 1)) + return *s; + + if (*s) + s++; +--- 5484,5502 ---- + { + /* skip over comments, "" strings and 'c'haracters */ + s = skip_string(cin_skipcomment(s)); +! if (*s == '}' && n_open > 0) +! --n_open; +! if (n_open == 0 +! && (*s == ';' || *s == '}' || (incl_comma && *s == ',')) + && cin_nocode(s + 1)) + return *s; ++ else if (*s == '{') ++ { ++ if (incl_open && cin_nocode(s + 1)) ++ return *s; ++ else ++ ++n_open; ++ } + + if (*s) + s++; +*** ../vim-7.3.177/src/testdir/test3.in 2011-04-28 13:01:59.000000000 +0200 +--- src/testdir/test3.in 2011-05-10 11:34:13.000000000 +0200 +*************** +*** 1344,1349 **** +--- 1344,1365 ---- + } + + STARTTEST ++ :set cino& ++ 2kdd=][ ++ ENDTEST ++ ++ void func(void) ++ { ++ if(x==y) ++ if(y==z) ++ foo=1; ++ else { bar=1; ++ baz=2; ++ } ++ printf("Foo!\n"); ++ } ++ ++ STARTTEST + :g/^STARTTEST/.,/^ENDTEST/d + :1;/start of AUTO/,$wq! test.out + ENDTEST +*** ../vim-7.3.177/src/testdir/test3.ok 2011-04-28 13:01:59.000000000 +0200 +--- src/testdir/test3.ok 2011-05-10 11:34:13.000000000 +0200 +*************** +*** 1204,1206 **** +--- 1204,1218 ---- + { + } + ++ ++ void func(void) ++ { ++ if(x==y) ++ if(y==z) ++ foo=1; ++ else { bar=1; ++ baz=2; ++ } ++ printf("Foo!\n"); ++ } ++ +*** ../vim-7.3.177/src/version.c 2011-05-05 18:31:54.000000000 +0200 +--- src/version.c 2011-05-10 11:37:43.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 178, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +69. Yahoo welcomes you with your own start page + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.179 b/source/ap/vim/patches/7.3.179 new file mode 100644 index 00000000..f175b264 --- /dev/null +++ b/source/ap/vim/patches/7.3.179 @@ -0,0 +1,95 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.179 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.179 +Problem: C-indent doesn't handle colon in string correctly. +Solution: Skip the string. (Lech Lorens) +Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok + + +*** ../vim-7.3.178/src/misc1.c 2011-05-10 11:39:13.000000000 +0200 +--- src/misc1.c 2011-05-10 11:50:14.000000000 +0200 +*************** +*** 5801,5807 **** + continue; + } + +! if (s[0] == ':') + { + if (s[1] == ':') + { +--- 5801,5809 ---- + continue; + } + +! if (s[0] == '"') +! s = skip_string(s) + 1; +! else if (s[0] == ':') + { + if (s[1] == ':') + { +*** ../vim-7.3.178/src/testdir/test3.in 2011-05-10 11:39:13.000000000 +0200 +--- src/testdir/test3.in 2011-05-10 11:53:02.000000000 +0200 +*************** +*** 1360,1365 **** +--- 1360,1378 ---- + } + + STARTTEST ++ :set cino& ++ 2kdd=][ ++ ENDTEST ++ ++ void func(void) ++ { ++ cout << "a" ++ << "b" ++ << ") :" ++ << "c"; ++ } ++ ++ STARTTEST + :g/^STARTTEST/.,/^ENDTEST/d + :1;/start of AUTO/,$wq! test.out + ENDTEST +*** ../vim-7.3.178/src/testdir/test3.ok 2011-05-10 11:39:13.000000000 +0200 +--- src/testdir/test3.ok 2011-05-10 11:50:14.000000000 +0200 +*************** +*** 1216,1218 **** +--- 1216,1227 ---- + printf("Foo!\n"); + } + ++ ++ void func(void) ++ { ++ cout << "a" ++ << "b" ++ << ") :" ++ << "c"; ++ } ++ +*** ../vim-7.3.178/src/version.c 2011-05-10 11:39:13.000000000 +0200 +--- src/version.c 2011-05-10 11:53:36.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 179, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +71. You wonder how people walk + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.180 b/source/ap/vim/patches/7.3.180 new file mode 100644 index 00000000..5997bfbe --- /dev/null +++ b/source/ap/vim/patches/7.3.180 @@ -0,0 +1,295 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.180 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.180 +Problem: When both a middle part of 'comments' matches and an end part, the + middle part was used errornously. +Solution: After finding the middle part match continue looking for a better + end part match. (partly by Lech Lorens) +Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok + + +*** ../vim-7.3.179/src/misc1.c 2011-05-10 11:56:26.000000000 +0200 +--- src/misc1.c 2011-05-10 13:24:38.000000000 +0200 +*************** +*** 1561,1566 **** +--- 1561,1569 ---- + char_u part_buf[COM_MAX_LEN]; /* buffer for one option part */ + char_u *string; /* pointer to comment string */ + char_u *list; ++ int middle_match_len = 0; ++ char_u *prev_list; ++ char_u *saved_flags; + + i = 0; + while (vim_iswhite(line[i])) /* leading white space is ignored */ +*************** +*** 1569,1575 **** + /* + * Repeat to match several nested comment strings. + */ +! while (line[i]) + { + /* + * scan through the 'comments' option for a match +--- 1572,1578 ---- + /* + * Repeat to match several nested comment strings. + */ +! while (line[i] != NUL) + { + /* + * scan through the 'comments' option for a match +*************** +*** 1577,1658 **** + found_one = FALSE; + for (list = curbuf->b_p_com; *list; ) + { +! /* +! * Get one option part into part_buf[]. Advance list to next one. +! * put string at start of string. +! */ +! if (!got_com && flags != NULL) /* remember where flags started */ +! *flags = list; + (void)copy_option_part(&list, part_buf, COM_MAX_LEN, ","); + string = vim_strchr(part_buf, ':'); + if (string == NULL) /* missing ':', ignore this part */ + continue; + *string++ = NUL; /* isolate flags from string */ + +! /* +! * When already found a nested comment, only accept further +! * nested comments. +! */ + if (got_com && vim_strchr(part_buf, COM_NEST) == NULL) + continue; + +! /* When 'O' flag used don't use for "O" command */ + if (backward && vim_strchr(part_buf, COM_NOBACK) != NULL) + continue; + +! /* +! * Line contents and string must match. + * When string starts with white space, must have some white space + * (but the amount does not need to match, there might be a mix of +! * TABs and spaces). +! */ + if (vim_iswhite(string[0])) + { + if (i == 0 || !vim_iswhite(line[i - 1])) +! continue; + while (vim_iswhite(string[0])) + ++string; + } + for (j = 0; string[j] != NUL && string[j] == line[i + j]; ++j) + ; + if (string[j] != NUL) +! continue; + +! /* +! * When 'b' flag used, there must be white space or an +! * end-of-line after the string in the line. +! */ + if (vim_strchr(part_buf, COM_BLANK) != NULL + && !vim_iswhite(line[i + j]) && line[i + j] != NUL) + continue; + +! /* +! * We have found a match, stop searching. +! */ +! i += j; +! got_com = TRUE; + found_one = TRUE; + break; + } + +! /* +! * No match found, stop scanning. +! */ + if (!found_one) + break; + +! /* +! * Include any trailing white space. +! */ + while (vim_iswhite(line[i])) + ++i; + +! /* +! * If this comment doesn't nest, stop here. +! */ + if (vim_strchr(part_buf, COM_NEST) == NULL) + break; + } + return (got_com ? i : 0); + } + #endif +--- 1580,1683 ---- + found_one = FALSE; + for (list = curbuf->b_p_com; *list; ) + { +! /* Get one option part into part_buf[]. Advance "list" to next +! * one. Put "string" at start of string. */ +! if (!got_com && flags != NULL) +! *flags = list; /* remember where flags started */ +! prev_list = list; + (void)copy_option_part(&list, part_buf, COM_MAX_LEN, ","); + string = vim_strchr(part_buf, ':'); + if (string == NULL) /* missing ':', ignore this part */ + continue; + *string++ = NUL; /* isolate flags from string */ + +! /* If we found a middle match previously, use that match when this +! * is not a middle or end. */ +! if (middle_match_len != 0 +! && vim_strchr(part_buf, COM_MIDDLE) == NULL +! && vim_strchr(part_buf, COM_END) == NULL) +! break; +! +! /* When we already found a nested comment, only accept further +! * nested comments. */ + if (got_com && vim_strchr(part_buf, COM_NEST) == NULL) + continue; + +! /* When 'O' flag present and using "O" command skip this one. */ + if (backward && vim_strchr(part_buf, COM_NOBACK) != NULL) + continue; + +! /* Line contents and string must match. + * When string starts with white space, must have some white space + * (but the amount does not need to match, there might be a mix of +! * TABs and spaces). */ + if (vim_iswhite(string[0])) + { + if (i == 0 || !vim_iswhite(line[i - 1])) +! continue; /* missing shite space */ + while (vim_iswhite(string[0])) + ++string; + } + for (j = 0; string[j] != NUL && string[j] == line[i + j]; ++j) + ; + if (string[j] != NUL) +! continue; /* string doesn't match */ + +! /* When 'b' flag used, there must be white space or an +! * end-of-line after the string in the line. */ + if (vim_strchr(part_buf, COM_BLANK) != NULL + && !vim_iswhite(line[i + j]) && line[i + j] != NUL) + continue; + +! /* We have found a match, stop searching unless this is a middle +! * comment. The middle comment can be a substring of the end +! * comment in which case it's better to return the length of the +! * end comment and its flags. Thus we keep searching with middle +! * and end matches and use an end match if it matches better. */ +! if (vim_strchr(part_buf, COM_MIDDLE) != NULL) +! { +! if (middle_match_len == 0) +! { +! middle_match_len = j; +! saved_flags = prev_list; +! } +! continue; +! } +! if (middle_match_len != 0 && j > middle_match_len) +! /* Use this match instead of the middle match, since it's a +! * longer thus better match. */ +! middle_match_len = 0; +! +! if (middle_match_len == 0) +! i += j; + found_one = TRUE; + break; + } + +! if (middle_match_len != 0) +! { +! /* Use the previously found middle match after failing to find a +! * match with an end. */ +! if (!got_com && flags != NULL) +! *flags = saved_flags; +! i += middle_match_len; +! found_one = TRUE; +! } +! +! /* No match found, stop scanning. */ + if (!found_one) + break; + +! /* Include any trailing white space. */ + while (vim_iswhite(line[i])) + ++i; + +! /* If this comment doesn't nest, stop here. */ +! got_com = TRUE; + if (vim_strchr(part_buf, COM_NEST) == NULL) + break; + } ++ + return (got_com ? i : 0); + } + #endif +*** ../vim-7.3.179/src/testdir/test3.in 2011-05-10 11:56:26.000000000 +0200 +--- src/testdir/test3.in 2011-05-10 12:05:50.000000000 +0200 +*************** +*** 1373,1378 **** +--- 1373,1390 ---- + } + + STARTTEST ++ :set com=s1:/*,m:*,ex:*/ ++ ]]3jofoo(); ++ ENDTEST ++ ++ void func(void) ++ { ++ /* ++ * This is a comment. ++ */ ++ } ++ ++ STARTTEST + :g/^STARTTEST/.,/^ENDTEST/d + :1;/start of AUTO/,$wq! test.out + ENDTEST +*** ../vim-7.3.179/src/testdir/test3.ok 2011-05-10 11:56:26.000000000 +0200 +--- src/testdir/test3.ok 2011-05-10 12:05:50.000000000 +0200 +*************** +*** 1225,1227 **** +--- 1225,1236 ---- + << "c"; + } + ++ ++ void func(void) ++ { ++ /* ++ * This is a comment. ++ */ ++ foo(); ++ } ++ +*** ../vim-7.3.179/src/version.c 2011-05-10 11:56:26.000000000 +0200 +--- src/version.c 2011-05-10 13:37:28.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 180, + /**/ + +-- +"Thou shalt not follow the Null Pointer, for at its end Chaos and +Madness lie." + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.181 b/source/ap/vim/patches/7.3.181 new file mode 100644 index 00000000..3151d445 --- /dev/null +++ b/source/ap/vim/patches/7.3.181 @@ -0,0 +1,171 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.181 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.181 +Problem: When repeating the insert of CTRL-V or a digraph the display may + not be updated correctly. +Solution: Only call edit_unputchar() after edit_putchar(). (Lech Lorens) +Files: src/edit.c + + +*** ../vim-7.3.180/src/edit.c 2010-11-10 17:11:29.000000000 +0100 +--- src/edit.c 2011-05-10 14:16:41.000000000 +0200 +*************** +*** 1553,1564 **** +--- 1553,1568 ---- + ins_ctrl_v() + { + int c; ++ int did_putchar = FALSE; + + /* may need to redraw when no more chars available now */ + ins_redraw(FALSE); + + if (redrawing() && !char_avail()) ++ { + edit_putchar('^', TRUE); ++ did_putchar = TRUE; ++ } + AppendToRedobuff((char_u *)CTRL_V_STR); /* CTRL-V */ + + #ifdef FEAT_CMDL_INFO +*************** +*** 1566,1573 **** + #endif + + c = get_literal(); +! edit_unputchar(); /* when line fits in 'columns' the '^' is at the start +! of the next line and will not be redrawn */ + #ifdef FEAT_CMDL_INFO + clear_showcmd(); + #endif +--- 1570,1579 ---- + #endif + + c = get_literal(); +! if (did_putchar) +! /* when the line fits in 'columns' the '^' is at the start of the next +! * line and will not removed by the redraw */ +! edit_unputchar(); + #ifdef FEAT_CMDL_INFO + clear_showcmd(); + #endif +*************** +*** 9637,9642 **** +--- 9643,9649 ---- + { + int c; + int cc; ++ int did_putchar = FALSE; + + pc_status = PC_STATUS_UNSET; + if (redrawing() && !char_avail()) +*************** +*** 9645,9650 **** +--- 9652,9658 ---- + ins_redraw(FALSE); + + edit_putchar('?', TRUE); ++ did_putchar = TRUE; + #ifdef FEAT_CMDL_INFO + add_to_showcmd_c(Ctrl_K); + #endif +*************** +*** 9661,9668 **** + c = plain_vgetc(); + --no_mapping; + --allow_keys; +! edit_unputchar(); /* when line fits in 'columns' the '?' is at the start +! of the next line and will not be redrawn */ + + if (IS_SPECIAL(c) || mod_mask) /* special key */ + { +--- 9669,9678 ---- + c = plain_vgetc(); + --no_mapping; + --allow_keys; +! if (did_putchar) +! /* when the line fits in 'columns' the '?' is at the start of the next +! * line and will not be removed by the redraw */ +! edit_unputchar(); + + if (IS_SPECIAL(c) || mod_mask) /* special key */ + { +*************** +*** 9674,9679 **** +--- 9684,9690 ---- + } + if (c != ESC) + { ++ did_putchar = FALSE; + if (redrawing() && !char_avail()) + { + /* may need to redraw when no more chars available now */ +*************** +*** 9681,9691 **** + + if (char2cells(c) == 1) + { +- /* first remove the '?', otherwise it's restored when typing +- * an ESC next */ +- edit_unputchar(); + ins_redraw(FALSE); + edit_putchar(c, TRUE); + } + #ifdef FEAT_CMDL_INFO + add_to_showcmd_c(c); +--- 9692,9700 ---- + + if (char2cells(c) == 1) + { + ins_redraw(FALSE); + edit_putchar(c, TRUE); ++ did_putchar = TRUE; + } + #ifdef FEAT_CMDL_INFO + add_to_showcmd_c(c); +*************** +*** 9696,9703 **** + cc = plain_vgetc(); + --no_mapping; + --allow_keys; +! edit_unputchar(); /* when line fits in 'columns' the '?' is at the +! start of the next line and will not be redrawn */ + if (cc != ESC) + { + AppendToRedobuff((char_u *)CTRL_V_STR); +--- 9705,9714 ---- + cc = plain_vgetc(); + --no_mapping; + --allow_keys; +! if (did_putchar) +! /* when the line fits in 'columns' the '?' is at the start of the +! * next line and will not be removed by a redraw */ +! edit_unputchar(); + if (cc != ESC) + { + AppendToRedobuff((char_u *)CTRL_V_STR); +*** ../vim-7.3.180/src/version.c 2011-05-10 13:38:23.000000000 +0200 +--- src/version.c 2011-05-10 14:20:40.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 181, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +74. Your most erotic dreams are about cybersex + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.182 b/source/ap/vim/patches/7.3.182 new file mode 100644 index 00000000..509b68b5 --- /dev/null +++ b/source/ap/vim/patches/7.3.182 @@ -0,0 +1,53 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.182 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.182 (after 7.3.180) +Problem: Compiler warning for uninitialized variable. +Solution: Add dummy initializer. +Files: src/misc1.c + + +*** ../vim-7.3.181/src/misc1.c 2011-05-10 13:38:23.000000000 +0200 +--- src/misc1.c 2011-05-10 14:37:39.000000000 +0200 +*************** +*** 1563,1569 **** + char_u *list; + int middle_match_len = 0; + char_u *prev_list; +! char_u *saved_flags; + + i = 0; + while (vim_iswhite(line[i])) /* leading white space is ignored */ +--- 1563,1569 ---- + char_u *list; + int middle_match_len = 0; + char_u *prev_list; +! char_u *saved_flags = NULL; + + i = 0; + while (vim_iswhite(line[i])) /* leading white space is ignored */ +*** ../vim-7.3.181/src/version.c 2011-05-10 14:22:10.000000000 +0200 +--- src/version.c 2011-05-10 14:38:39.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 182, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +75. You start wondering whether you could actually upgrade your brain + with a Pentium Pro microprocessor 80. The upgrade works just fine. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.183 b/source/ap/vim/patches/7.3.183 new file mode 100644 index 00000000..23178c0b --- /dev/null +++ b/source/ap/vim/patches/7.3.183 @@ -0,0 +1,87 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.183 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.183 (after 7.3.174) +Problem: When Exuberant ctags binary is exuberant-ctags it's not found. +Solution: Add configure check for exuberant-ctags. +Files: src/configure.in, src/auto/configure + + +*** ../vim-7.3.182/src/configure.in 2011-05-05 18:10:11.000000000 +0200 +--- src/configure.in 2011-05-10 15:39:38.000000000 +0200 +*************** +*** 3375,3384 **** + dnl -i+m to test for older Exuberant ctags + AC_MSG_CHECKING(how to create tags) + test -f tags && mv tags tags.save +! if (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then +! TAGPRG="exctags -I INIT+ --fields=+S" +! elif (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then + TAGPRG="ctags -I INIT+ --fields=+S" + else + TAGPRG="ctags" + (eval etags /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags" +--- 3375,3386 ---- + dnl -i+m to test for older Exuberant ctags + AC_MSG_CHECKING(how to create tags) + test -f tags && mv tags tags.save +! if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then + TAGPRG="ctags -I INIT+ --fields=+S" ++ elif (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then ++ TAGPRG="exctags -I INIT+ --fields=+S" ++ elif (eval exuberant-ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then ++ TAGPRG="exuberant-ctags -I INIT+ --fields=+S" + else + TAGPRG="ctags" + (eval etags /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags" +*** ../vim-7.3.182/src/auto/configure 2011-05-05 18:10:11.000000000 +0200 +--- src/auto/configure 2011-05-10 15:39:41.000000000 +0200 +*************** +*** 12028,12037 **** + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create tags" >&5 + $as_echo_n "checking how to create tags... " >&6; } + test -f tags && mv tags tags.save +! if (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then +! TAGPRG="exctags -I INIT+ --fields=+S" +! elif (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then + TAGPRG="ctags -I INIT+ --fields=+S" + else + TAGPRG="ctags" + (eval etags /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags" +--- 12028,12039 ---- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create tags" >&5 + $as_echo_n "checking how to create tags... " >&6; } + test -f tags && mv tags tags.save +! if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then + TAGPRG="ctags -I INIT+ --fields=+S" ++ elif (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then ++ TAGPRG="exctags -I INIT+ --fields=+S" ++ elif (eval exuberant-ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then ++ TAGPRG="exuberant-ctags -I INIT+ --fields=+S" + else + TAGPRG="ctags" + (eval etags /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags" +*** ../vim-7.3.182/src/version.c 2011-05-10 14:44:07.000000000 +0200 +--- src/version.c 2011-05-10 15:40:48.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 183, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +78. You find yourself dialing IP numbers on the phone. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.184 b/source/ap/vim/patches/7.3.184 new file mode 100644 index 00000000..3b0cfc69 --- /dev/null +++ b/source/ap/vim/patches/7.3.184 @@ -0,0 +1,86 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.184 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.184 +Problem: Static code analysis errors in riscOS. +Solution: Make buffer size bigger. (Dominique Pelle) +Files: src/gui_riscos.c + + +*** ../vim-7.3.183/src/gui_riscos.c 2010-08-15 21:57:28.000000000 +0200 +--- src/gui_riscos.c 2011-05-10 15:49:56.000000000 +0200 +*************** +*** 1756,1762 **** + + if (button & 0x444) + { +! int front_block[10]; + /* Dragging with Select - bring window to front first */ + front_block[0] = gui.window_handle; + swi(Wimp_GetWindowState, 0, front_block); +--- 1756,1762 ---- + + if (button & 0x444) + { +! int front_block[64]; + /* Dragging with Select - bring window to front first */ + front_block[0] = gui.window_handle; + swi(Wimp_GetWindowState, 0, front_block); +*************** +*** 1874,1880 **** + + if (ro_dragging == DRAG_RESIZE_WINDOW) + { +! /* Resizeing the main window. */ + block[2] = y; + block[3] = x; + ro_open_main(block); +--- 1874,1880 ---- + + if (ro_dragging == DRAG_RESIZE_WINDOW) + { +! /* Resizing the main window. */ + block[2] = y; + block[3] = x; + ro_open_main(block); +*************** +*** 2651,2657 **** + long_u length; + + block[0] = 48; /* Size of block. */ +! block[3] = 0; /* Orinial message. */ + block[4] = 0x10; /* Data request. */ + block[5] = gui.window_handle; + block[6] = RO_LOAD_CLIPBOARD; /* Internal handle. */ +--- 2651,2657 ---- + long_u length; + + block[0] = 48; /* Size of block. */ +! block[3] = 0; /* Original message. */ + block[4] = 0x10; /* Data request. */ + block[5] = gui.window_handle; + block[6] = RO_LOAD_CLIPBOARD; /* Internal handle. */ +*** ../vim-7.3.183/src/version.c 2011-05-10 15:41:59.000000000 +0200 +--- src/version.c 2011-05-10 15:51:29.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 184, + /**/ + +-- +If bankers can count, how come they have eight windows and +only four tellers? + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.185 b/source/ap/vim/patches/7.3.185 new file mode 100644 index 00000000..7b3ed189 --- /dev/null +++ b/source/ap/vim/patches/7.3.185 @@ -0,0 +1,77 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.185 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.185 +Problem: ":windo g/pattern/q" closes windows and reports "N more lines". + (Tim Chase) +Solution: Remember what buffer ":global" started in. (Jean-Rene David) +Files: src/ex_cmds.c + + +*** ../vim-7.3.184/src/ex_cmds.c 2011-04-11 21:35:03.000000000 +0200 +--- src/ex_cmds.c 2011-05-10 15:58:48.000000000 +0200 +*************** +*** 5365,5372 **** + global_exe(cmd) + char_u *cmd; + { +! linenr_T old_lcount; /* b_ml.ml_line_count before the command */ +! linenr_T lnum; /* line number according to old situation */ + + /* + * Set current position only once for a global command. +--- 5365,5373 ---- + global_exe(cmd) + char_u *cmd; + { +! linenr_T old_lcount; /* b_ml.ml_line_count before the command */ +! buf_T *old_buf = curbuf; /* remember what buffer we started in */ +! linenr_T lnum; /* line number according to old situation */ + + /* + * Set current position only once for a global command. +*************** +*** 5410,5417 **** + msg_didout = FALSE; + + /* If substitutes done, report number of substitutes, otherwise report +! * number of extra or deleted lines. */ +! if (!do_sub_msg(FALSE)) + msgmore(curbuf->b_ml.ml_line_count - old_lcount); + } + +--- 5411,5420 ---- + msg_didout = FALSE; + + /* If substitutes done, report number of substitutes, otherwise report +! * number of extra or deleted lines. +! * Don't report extra or deleted lines in the edge case where the buffer +! * we are in after execution is different from the buffer we started in. */ +! if (!do_sub_msg(FALSE) && curbuf == old_buf) + msgmore(curbuf->b_ml.ml_line_count - old_lcount); + } + +*** ../vim-7.3.184/src/version.c 2011-05-10 15:52:10.000000000 +0200 +--- src/version.c 2011-05-10 15:57:40.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 185, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +79. All of your most erotic dreams have a scrollbar at the right side. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.186 b/source/ap/vim/patches/7.3.186 new file mode 100644 index 00000000..d834c370 --- /dev/null +++ b/source/ap/vim/patches/7.3.186 @@ -0,0 +1,59 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.186 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.186 +Problem: When 'clipboard' contains "unnamed" or "unnamedplus" the value of + v:register is wrong for operators without a specific register. +Solution: Adjust the register according to 'clipboard'. (Ingo Karkat) +Files: src/normal.c + + +*** ../vim-7.3.185/src/normal.c 2010-12-17 18:52:56.000000000 +0100 +--- src/normal.c 2011-05-10 16:07:49.000000000 +0200 +*************** +*** 1202,1208 **** + { + clearop(oap); + #ifdef FEAT_EVAL +! set_reg_var('"'); + #endif + } + +--- 1202,1214 ---- + { + clearop(oap); + #ifdef FEAT_EVAL +! { +! int regname = 0; +! /* Adjust the register according to 'clipboard', so that when +! * "unnamed" is present it becomes '*' or '+' instead of '"'. */ +! adjust_clip_reg(®name); +! set_reg_var(regname); +! } + #endif + } + +*** ../vim-7.3.185/src/version.c 2011-05-10 16:00:43.000000000 +0200 +--- src/version.c 2011-05-10 16:10:10.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 186, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +80. At parties, you introduce your spouse as your "service provider." + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.187 b/source/ap/vim/patches/7.3.187 new file mode 100644 index 00000000..7bf82ce4 --- /dev/null +++ b/source/ap/vim/patches/7.3.187 @@ -0,0 +1,6621 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.187 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.187 +Problem: The RISC OS port has obvious errors and is not being maintained. +Solution: Remove the RISC OS files and code. +Files: src/ascii.h, src/eval.c, src/ex_cmds.c, src/ex_cmds2.c, + src/ex_docmd.c, src/fileio.c, src/globals.h, src/gui.c, src/gui.h, + src/main.c, src/memfile.c, src/memline.c, src/misc1.c, + src/proto.h, src/quickfix.c, src/search.c, src/structs.h, + src/term.c, src/termlib.c, src/version.c, src/vim.h, + src/gui_riscos.h, src/os_riscos.h, src/gui_riscos.c, + src/os_riscos.c, runtime/doc/os_risc.txt + + +*** ../vim-7.3.186/src/ascii.h 2010-08-15 21:57:25.000000000 +0200 +--- src/ascii.h 2011-05-10 16:22:08.000000000 +0200 +*************** +*** 183,193 **** + # define PATHSEP psepc + # define PATHSEPSTR pseps + #else +! # ifdef RISCOS +! # define PATHSEP '.' +! # define PATHSEPSTR "." +! # else +! # define PATHSEP '/' +! # define PATHSEPSTR "/" +! # endif + #endif +--- 183,188 ---- + # define PATHSEP psepc + # define PATHSEPSTR pseps + #else +! # define PATHSEP '/' +! # define PATHSEPSTR "/" + #endif +*** ../vim-7.3.186/src/eval.c 2011-04-21 14:27:21.000000000 +0200 +--- src/eval.c 2011-05-10 16:22:21.000000000 +0200 +*************** +*** 11818,11826 **** + #ifdef __QNX__ + "qnx", + #endif +- #ifdef RISCOS +- "riscos", +- #endif + #ifdef UNIX + "unix", + #endif +--- 11818,11823 ---- +*** ../vim-7.3.186/src/ex_cmds.c 2011-05-10 16:00:43.000000000 +0200 +--- src/ex_cmds.c 2011-05-10 16:23:22.000000000 +0200 +*************** +*** 899,907 **** + * Handle the ":!cmd" command. Also for ":r !cmd" and ":w !cmd" + * Bangs in the argument are replaced with the previously entered command. + * Remember the argument. +- * +- * RISCOS: Bangs only replaced when followed by a space, since many +- * pathnames contain one. + */ + void + do_bang(addr_count, eap, forceit, do_in, do_out) +--- 899,904 ---- +*************** +*** 980,990 **** + trailarg = NULL; + while (*p) + { +! if (*p == '!' +! #ifdef RISCOS +! && (p[1] == ' ' || p[1] == NUL) +! #endif +! ) + { + if (p > newcmd && p[-1] == '\\') + STRMOVE(p - 1, p); +--- 977,983 ---- + trailarg = NULL; + while (*p) + { +! if (*p == '!') + { + if (p > newcmd && p[-1] == '\\') + STRMOVE(p - 1, p); +*************** +*** 1578,1591 **** + if (p != NULL) + *p = NUL; + } +- # ifdef RISCOS +- STRCAT(buf, " { < "); /* Use RISC OS notation for input. */ +- STRCAT(buf, itmp); +- STRCAT(buf, " } "); +- # else + STRCAT(buf, " <"); /* " < " causes problems on Amiga */ + STRCAT(buf, itmp); +- # endif + if (*p_shq == NUL) + { + p = vim_strchr(cmd, '|'); +--- 1571,1578 ---- +*************** +*** 1634,1649 **** + else + vim_snprintf((char *)end, (size_t)(buflen - (end - buf)), + #ifdef FEAT_QUICKFIX +- # ifndef RISCOS +- opt != p_sp ? " %s%s" : +- # endif + " %s %s", + #else +- # ifndef RISCOS + " %s%s", /* " > %s" causes problems on Amiga */ +- # else +- " %s %s", /* But is needed for 'shellpipe' and RISC OS */ +- # endif + #endif + (char *)opt, (char *)fname); + } +--- 1621,1629 ---- +*************** +*** 1844,1854 **** + #ifdef VMS + (char_u *)"-tmp", + #else +- # ifdef RISCOS +- (char_u *)"/tmp", +- # else + (char_u *)".tmp", +- # endif + #endif + FALSE); + if (tempname == NULL) /* out of memory */ +--- 1824,1830 ---- +*** ../vim-7.3.186/src/ex_cmds2.c 2011-04-11 21:35:03.000000000 +0200 +--- src/ex_cmds2.c 2011-05-10 16:23:47.000000000 +0200 +*************** +*** 500,517 **** + /* Expand the file name in the same way as do_source(). This means + * doing it twice, so that $DIR/file gets expanded when $DIR is + * "~/dir". */ +- #ifdef RISCOS +- q = mch_munge_fname(p); +- #else + q = expand_env_save(p); +- #endif + if (q == NULL) + return FAIL; +- #ifdef RISCOS +- p = mch_munge_fname(q); +- #else + p = expand_env_save(q); +- #endif + vim_free(q); + if (p == NULL) + return FAIL; +--- 500,509 ---- +*************** +*** 2940,2950 **** + proftime_T wait_start; + #endif + +- #ifdef RISCOS +- p = mch_munge_fname(fname); +- #else + p = expand_env_save(fname); +- #endif + if (p == NULL) + return retval; + fname_exp = fix_fname(p); +--- 2932,2938 ---- +*** ../vim-7.3.186/src/ex_docmd.c 2011-05-05 14:26:37.000000000 +0200 +--- src/ex_docmd.c 2011-05-10 16:24:18.000000000 +0200 +*************** +*** 9702,9715 **** + valid = 0; /* Must have ":p:h" to be valid */ + } + else +- #ifdef RISCOS +- /* Always use the full path for RISC OS if possible. */ +- result = curbuf->b_ffname; +- if (result == NULL) +- result = curbuf->b_fname; +- #else + result = curbuf->b_fname; +- #endif + break; + + case SPEC_HASH: /* '#' or "#99": alternate file */ +--- 9702,9708 ---- +*************** +*** 9854,9864 **** + if (src[*usedlen] == '<') /* remove the file name extension */ + { + ++*usedlen; +- #ifdef RISCOS +- if ((s = vim_strrchr(result, '/')) != NULL && s >= gettail(result)) +- #else + if ((s = vim_strrchr(result, '.')) != NULL && s >= gettail(result)) +- #endif + resultlen = (int)(s - result); + } + #ifdef FEAT_MODIFY_FNAME +--- 9847,9853 ---- +*************** +*** 10875,10882 **** + else if (vim_ispathsep(*p)) + { + *s++ = '='; +! #if defined(BACKSLASH_IN_FILENAME) || defined(AMIGA) || defined(RISCOS) \ +! || defined(VMS) + if (*p == ':') + *s++ = '-'; + else +--- 10864,10870 ---- + else if (vim_ispathsep(*p)) + { + *s++ = '='; +! #if defined(BACKSLASH_IN_FILENAME) || defined(AMIGA) || defined(VMS) + if (*p == ':') + *s++ = '-'; + else +*** ../vim-7.3.186/src/fileio.c 2011-05-05 16:41:19.000000000 +0200 +--- src/fileio.c 2011-05-10 16:26:06.000000000 +0200 +*************** +*** 504,521 **** + + if (newfile && !read_stdin && !read_buffer) + { +! /* Remember time of file. +! * For RISCOS, also remember the filetype. +! */ + if (mch_stat((char *)fname, &st) >= 0) + { + buf_store_time(curbuf, &st, fname); + curbuf->b_mtime_read = curbuf->b_mtime; +- +- #if defined(RISCOS) && defined(FEAT_OSFILETYPE) +- /* Read the filetype into the buffer local filetype option. */ +- mch_read_filetype(fname); +- #endif + #ifdef UNIX + /* + * Use the protection bits of the original file for the swap file. +--- 504,514 ---- + + if (newfile && !read_stdin && !read_buffer) + { +! /* Remember time of file. */ + if (mch_stat((char *)fname, &st) >= 0) + { + buf_store_time(curbuf, &st, fname); + curbuf->b_mtime_read = curbuf->b_mtime; + #ifdef UNIX + /* + * Use the protection bits of the original file for the swap file. +*************** +*** 557,563 **** + + /* + * for UNIX: check readonly with perm and mch_access() +- * for RISCOS: same as Unix, otherwise file gets re-datestamped! + * for MSDOS and Amiga: check readonly by trying to open the file for writing + */ + file_readonly = FALSE; +--- 550,555 ---- +*************** +*** 3804,3816 **** + + /* make sure we have a valid backup extension to use */ + if (*p_bex == NUL) +- { +- #ifdef RISCOS +- backup_ext = (char_u *)"/bak"; +- #else + backup_ext = (char_u *)".bak"; +- #endif +- } + else + backup_ext = p_bex; + +--- 3796,3802 ---- +*************** +*** 4724,4734 **** + #endif + if (perm >= 0) /* set perm. of new file same as old file */ + (void)mch_setperm(wfname, perm); +- #ifdef RISCOS +- if (!append && !filtering) +- /* Set the filetype after writing the file. */ +- mch_set_filetype(wfname, buf->b_p_oft); +- #endif + #ifdef HAVE_ACL + /* Probably need to set the ACL before changing the user (can't set the + * ACL on a file the user doesn't own). */ +--- 4710,4715 ---- +*************** +*** 6262,6280 **** + */ + for (ptr = retval + fnamelen; ptr > retval; mb_ptr_back(retval, ptr)) + { +- #ifndef RISCOS + if (*ext == '.' +! # ifdef USE_LONG_FNAME + && (!USE_LONG_FNAME || shortname) +! # else +! # ifndef SHORT_FNAME + && shortname +- # endif + # endif + ) + if (*ptr == '.') /* replace '.' by '_' */ + *ptr = '_'; +- #endif + if (vim_ispathsep(*ptr)) + { + ++ptr; +--- 6243,6259 ---- + */ + for (ptr = retval + fnamelen; ptr > retval; mb_ptr_back(retval, ptr)) + { + if (*ext == '.' +! #ifdef USE_LONG_FNAME + && (!USE_LONG_FNAME || shortname) +! #else +! # ifndef SHORT_FNAME + && shortname + # endif ++ #endif + ) + if (*ptr == '.') /* replace '.' by '_' */ + *ptr = '_'; + if (vim_ispathsep(*ptr)) + { + ++ptr; +*************** +*** 6309,6331 **** + if (fname == NULL || *fname == NUL + || vim_ispathsep(fname[STRLEN(fname) - 1])) + { +- #ifdef RISCOS +- if (*ext == '/') +- #else + if (*ext == '.') +- #endif + *s++ = '_'; + } + /* + * If the extension starts with '.', truncate the base name at 8 + * characters + */ +- #ifdef RISCOS +- /* We normally use '/', but swap files are '_' */ +- else if (*ext == '/' || *ext == '_') +- #else + else if (*ext == '.') +- #endif + { + if ((size_t)(s - ptr) > (size_t)8) + { +--- 6288,6301 ---- +*************** +*** 6337,6349 **** + * If the extension doesn't start with '.', and the file name + * doesn't have an extension yet, append a '.' + */ +- #ifdef RISCOS +- else if ((e = vim_strchr(ptr, '/')) == NULL) +- *s++ = '/'; +- #else + else if ((e = vim_strchr(ptr, '.')) == NULL) + *s++ = '.'; +- #endif + /* + * If the extension doesn't start with '.', and there already is an + * extension, it may need to be truncated +--- 6307,6314 ---- +*************** +*** 6371,6393 **** + /* + * Prepend the dot. + */ +! if (prepend_dot && !shortname && *(e = gettail(retval)) != +! #ifdef RISCOS +! '/' +! #else +! '.' +! #endif + #ifdef USE_LONG_FNAME + && USE_LONG_FNAME + #endif + ) + { + STRMOVE(e + 1, e); +- #ifdef RISCOS +- *e = '/'; +- #else + *e = '.'; +- #endif + } + #endif + +--- 6336,6349 ---- + /* + * Prepend the dot. + */ +! if (prepend_dot && !shortname && *(e = gettail(retval)) != '.' + #ifdef USE_LONG_FNAME + && USE_LONG_FNAME + #endif + ) + { + STRMOVE(e + 1, e); + *e = '.'; + } + #endif + +*************** +*** 10205,10223 **** + ++p; + break; + case '.': +- #ifdef RISCOS +- if (allow_dirs != NULL) +- *allow_dirs = TRUE; +- /* FALLTHROUGH */ +- #endif + case '~': + reg_pat[i++] = '\\'; + reg_pat[i++] = *p; + break; + case '?': +- #ifdef RISCOS +- case '#': +- #endif + reg_pat[i++] = '.'; + break; + case '\\': +--- 10161,10171 ---- +*** ../vim-7.3.186/src/globals.h 2011-05-05 14:26:37.000000000 +0200 +--- src/globals.h 2011-05-10 16:26:13.000000000 +0200 +*************** +*** 1513,1519 **** + EXTERN char_u e_sandbox[] INIT(= N_("E48: Not allowed in sandbox")); + #endif + EXTERN char_u e_secure[] INIT(= N_("E523: Not allowed here")); +! #if defined(AMIGA) || defined(MACOS) || defined(MSWIN) || defined(RISCOS) \ + || defined(UNIX) || defined(VMS) || defined(OS2) + EXTERN char_u e_screenmode[] INIT(= N_("E359: Screen mode setting not supported")); + #endif +--- 1513,1519 ---- + EXTERN char_u e_sandbox[] INIT(= N_("E48: Not allowed in sandbox")); + #endif + EXTERN char_u e_secure[] INIT(= N_("E523: Not allowed here")); +! #if defined(AMIGA) || defined(MACOS) || defined(MSWIN) \ + || defined(UNIX) || defined(VMS) || defined(OS2) + EXTERN char_u e_screenmode[] INIT(= N_("E359: Screen mode setting not supported")); + #endif +*** ../vim-7.3.186/src/gui.c 2011-01-17 20:08:03.000000000 +0100 +--- src/gui.c 2011-05-10 16:26:53.000000000 +0200 +*************** +*** 2156,2162 **** + + if (highlight_mask & (HL_INVERSE | HL_STANDOUT)) + { +! #if defined(AMIGA) || defined(RISCOS) + gui_mch_set_colors(bg_color, fg_color); + #else + gui_mch_set_fg_color(bg_color); +--- 2156,2162 ---- + + if (highlight_mask & (HL_INVERSE | HL_STANDOUT)) + { +! #if defined(AMIGA) + gui_mch_set_colors(bg_color, fg_color); + #else + gui_mch_set_fg_color(bg_color); +*************** +*** 2165,2171 **** + } + else + { +! #if defined(AMIGA) || defined(RISCOS) + gui_mch_set_colors(fg_color, bg_color); + #else + gui_mch_set_fg_color(fg_color); +--- 2165,2171 ---- + } + else + { +! #if defined(AMIGA) + gui_mch_set_colors(fg_color, bg_color); + #else + gui_mch_set_fg_color(fg_color); +*************** +*** 2193,2199 **** + if (back != 0 && ((draw_flags & DRAW_BOLD) || (highlight_mask & HL_ITALIC))) + return FAIL; + +! #if defined(RISCOS) || defined(FEAT_GUI_GTK) + /* If there's no italic font, then fake it. + * For GTK2, we don't need a different font for italic style. */ + if (hl_mask_todo & HL_ITALIC) +--- 2193,2199 ---- + if (back != 0 && ((draw_flags & DRAW_BOLD) || (highlight_mask & HL_ITALIC))) + return FAIL; + +! #if defined(FEAT_GUI_GTK) + /* If there's no italic font, then fake it. + * For GTK2, we don't need a different font for italic style. */ + if (hl_mask_todo & HL_ITALIC) +*************** +*** 2985,3010 **** + did_clip = TRUE; + } + /* Allow the left button to start the selection */ +- else if (button == +- # ifdef RISCOS +- /* Only start a drag on a drag event. Otherwise +- * we don't get a release event. */ +- MOUSE_DRAG +- # else +- MOUSE_LEFT +- # endif +- ) +- { +- clip_start_selection(X_2_COL(x), Y_2_ROW(y), repeated_click); +- did_clip = TRUE; +- } +- # ifdef RISCOS + else if (button == MOUSE_LEFT) + { +! clip_clear_selection(); + did_clip = TRUE; + } +- # endif + + /* Always allow pasting */ + if (button != MOUSE_MIDDLE) +--- 2985,2995 ---- + did_clip = TRUE; + } + /* Allow the left button to start the selection */ + else if (button == MOUSE_LEFT) + { +! clip_start_selection(X_2_COL(x), Y_2_ROW(y), repeated_click); + did_clip = TRUE; + } + + /* Always allow pasting */ + if (button != MOUSE_MIDDLE) +*** ../vim-7.3.186/src/gui.h 2010-08-15 21:57:25.000000000 +0200 +--- src/gui.h 2011-05-10 16:27:19.000000000 +0200 +*************** +*** 52,61 **** + # include */ + #endif + +- #ifdef RISCOS +- # include "gui_riscos.h" +- #endif +- + #ifdef FEAT_GUI_PHOTON + # include + # include +--- 52,57 ---- +*************** +*** 151,157 **** + #define DRAW_BOLD 0x02 /* draw bold text */ + #define DRAW_UNDERL 0x04 /* draw underline text */ + #define DRAW_UNDERC 0x08 /* draw undercurl text */ +! #if defined(RISCOS) || defined(FEAT_GUI_GTK) + # define DRAW_ITALIC 0x10 /* draw italic text */ + #endif + #define DRAW_CURSOR 0x20 /* drawing block cursor (win32) */ +--- 147,153 ---- + #define DRAW_BOLD 0x02 /* draw bold text */ + #define DRAW_UNDERL 0x04 /* draw underline text */ + #define DRAW_UNDERC 0x08 /* draw undercurl text */ +! #if defined(FEAT_GUI_GTK) + # define DRAW_ITALIC 0x10 /* draw italic text */ + #endif + #define DRAW_CURSOR 0x20 /* drawing block cursor (win32) */ +*************** +*** 219,227 **** + #ifdef FEAT_GUI_MAC + ControlHandle id; /* A handle to the scrollbar */ + #endif +- #ifdef RISCOS +- int id; /* Window handle of scrollbar window */ +- #endif + #ifdef FEAT_GUI_PHOTON + PtWidget_t *id; + #endif +--- 215,220 ---- +*************** +*** 450,463 **** + int visibility; /* Is window partially/fully obscured? */ + #endif + +- #ifdef RISCOS +- int window_handle; +- char_u *window_title; +- int window_title_size; +- int fg_colour; /* in 0xBBGGRR format */ +- int bg_colour; +- #endif +- + #ifdef FEAT_GUI_PHOTON + PtWidget_t *vimWindow; /* PtWindow */ + PtWidget_t *vimTextArea; /* PtRaw */ +--- 443,448 ---- +*** ../vim-7.3.186/src/main.c 2011-04-11 21:35:03.000000000 +0200 +--- src/main.c 2011-05-10 16:27:33.000000000 +0200 +*************** +*** 3276,3286 **** + main_msg(_("+reverse\t\tDon't use reverse video (also: +rv)")); + main_msg(_("-xrm \tSet the specified resource")); + #endif /* FEAT_GUI_X11 */ +- #if defined(FEAT_GUI) && defined(RISCOS) +- mch_msg(_("\nArguments recognised by gvim (RISC OS version):\n")); +- main_msg(_("--columns \tInitial width of window in columns")); +- main_msg(_("--rows \tInitial height of window in rows")); +- #endif + #ifdef FEAT_GUI_GTK + mch_msg(_("\nArguments recognised by gvim (GTK+ version):\n")); + main_msg(_("-font \t\tUse for normal text (also: -fn)")); +--- 3276,3281 ---- +*** ../vim-7.3.186/src/memfile.c 2011-03-22 18:10:34.000000000 +0100 +--- src/memfile.c 2011-05-10 16:27:38.000000000 +0200 +*************** +*** 1307,1313 **** + * fname cannot be NameBuff, because it must have been allocated. + */ + mf_set_ffname(mfp); +! #if defined(MSDOS) || defined(MSWIN) || defined(RISCOS) + /* + * A ":!cd e:xxx" may change the directory without us knowning, use the + * full pathname always. Careful: This frees fname! +--- 1307,1313 ---- + * fname cannot be NameBuff, because it must have been allocated. + */ + mf_set_ffname(mfp); +! #if defined(MSDOS) || defined(MSWIN) + /* + * A ":!cd e:xxx" may change the directory without us knowning, use the + * full pathname always. Careful: This frees fname! +*** ../vim-7.3.186/src/memline.c 2011-02-15 11:56:56.000000000 +0100 +--- src/memline.c 2011-05-10 16:28:40.000000000 +0200 +*************** +*** 748,754 **** + continue; + if (mf_open_file(mfp, fname) == OK) /* consumes fname! */ + { +! #if defined(MSDOS) || defined(MSWIN) || defined(RISCOS) + /* + * set full pathname for swap file now, because a ":!cd dir" may + * change directory without us knowing it. +--- 748,754 ---- + continue; + if (mf_open_file(mfp, fname) == OK) /* consumes fname! */ + { +! #if defined(MSDOS) || defined(MSWIN) + /* + * set full pathname for swap file now, because a ":!cd dir" may + * change directory without us knowing it. +*************** +*** 933,939 **** + b0p->b0_fname[0] = NUL; + else + { +! #if defined(MSDOS) || defined(MSWIN) || defined(AMIGA) || defined(RISCOS) + /* Systems that cannot translate "~user" back into a path: copy the + * file name unmodified. Do use slashes instead of backslashes for + * portability. */ +--- 933,939 ---- + b0p->b0_fname[0] = NUL; + else + { +! #if defined(MSDOS) || defined(MSWIN) || defined(AMIGA) + /* Systems that cannot translate "~user" back into a path: copy the + * file name unmodified. Do use slashes instead of backslashes for + * portability. */ +*************** +*** 1103,1109 **** + fname = (char_u *)""; + len = (int)STRLEN(fname); + if (len >= 4 && +! #if defined(VMS) || defined(RISCOS) + STRNICMP(fname + len - 4, "_s" , 2) + #else + STRNICMP(fname + len - 4, ".s" , 2) +--- 1103,1109 ---- + fname = (char_u *)""; + len = (int)STRLEN(fname); + if (len >= 4 && +! #if defined(VMS) + STRNICMP(fname + len - 4, "_s" , 2) + #else + STRNICMP(fname + len - 4, ".s" , 2) +*************** +*** 1773,1783 **** + #ifdef VMS + names[0] = vim_strsave((char_u *)"*_sw%"); + #else +- # ifdef RISCOS +- names[0] = vim_strsave((char_u *)"*_sw#"); +- # else + names[0] = vim_strsave((char_u *)"*.sw?"); +- # endif + #endif + #if defined(UNIX) || defined(WIN3264) + /* For Unix names starting with a dot are special. MS-Windows +--- 1773,1779 ---- +*************** +*** 1804,1814 **** + #ifdef VMS + names[0] = concat_fnames(dir_name, (char_u *)"*_sw%", TRUE); + #else +- # ifdef RISCOS +- names[0] = concat_fnames(dir_name, (char_u *)"*_sw#", TRUE); +- # else + names[0] = concat_fnames(dir_name, (char_u *)"*.sw?", TRUE); +- # endif + #endif + #if defined(UNIX) || defined(WIN3264) + /* For Unix names starting with a dot are special. MS-Windows +--- 1800,1806 ---- +*************** +*** 1877,1883 **** + char_u *swapname; + + swapname = modname(fname_res, +! #if defined(VMS) || defined(RISCOS) + (char_u *)"_swp", FALSE + #else + (char_u *)".swp", TRUE +--- 1869,1875 ---- + char_u *swapname; + + swapname = modname(fname_res, +! #if defined(VMS) + (char_u *)"_swp", FALSE + #else + (char_u *)".swp", TRUE +*************** +*** 2176,2186 **** + #ifdef VMS + names[num_names] = concat_fnames(path, (char_u *)"_sw%", FALSE); + #else +- # ifdef RISCOS +- names[num_names] = concat_fnames(path, (char_u *)"_sw#", FALSE); +- # else + names[num_names] = concat_fnames(path, (char_u *)".sw?", FALSE); +- # endif + #endif + if (names[num_names] == NULL) + goto end; +--- 2168,2174 ---- +*************** +*** 2207,2217 **** + #ifdef VMS + names[num_names] = modname(path, (char_u *)"_sw%", FALSE); + #else +- # ifdef RISCOS +- names[num_names] = modname(path, (char_u *)"_sw#", FALSE); +- # else + names[num_names] = modname(path, (char_u *)".sw?", FALSE); +- # endif + #endif + if (names[num_names] == NULL) + goto end; +--- 2195,2201 ---- +*************** +*** 3205,3211 **** + mf_free(mfp, hp); /* free the data block */ + buf->b_ml.ml_locked = NULL; + +! for (stack_idx = buf->b_ml.ml_stack_top - 1; stack_idx >= 0; --stack_idx) + { + buf->b_ml.ml_stack_top = 0; /* stack is invalid when failing */ + ip = &(buf->b_ml.ml_stack[stack_idx]); +--- 3189,3196 ---- + mf_free(mfp, hp); /* free the data block */ + buf->b_ml.ml_locked = NULL; + +! for (stack_idx = buf->b_ml.ml_stack_top - 1; stack_idx >= 0; +! --stack_idx) + { + buf->b_ml.ml_stack_top = 0; /* stack is invalid when failing */ + ip = &(buf->b_ml.ml_stack[stack_idx]); +*************** +*** 3956,3969 **** + #else + (buf->b_p_sn || buf->b_shortname), + #endif +- #ifdef RISCOS +- /* Avoid problems if fname has special chars, eg */ +- ffname, +- #else + fname_res, +- #endif + (char_u *) +! #if defined(VMS) || defined(RISCOS) + "_swp", + #else + ".swp", +--- 3941,3949 ---- + #else + (buf->b_p_sn || buf->b_shortname), + #endif + fname_res, + (char_u *) +! #if defined(VMS) + "_swp", + #else + ".swp", +*************** +*** 4427,4440 **** + } + close(fd); + } +- #ifdef RISCOS +- else +- /* Can't open swap file, though it does exist. +- * Assume that the user is editing two files with +- * the same name in different directories. No error. +- */ +- differ = TRUE; +- #endif + + /* give the ATTENTION message when there is an old swap file + * for the current file, and the buffer was not recovered. */ +--- 4407,4412 ---- +*** ../vim-7.3.186/src/misc1.c 2011-05-10 14:44:07.000000000 +0200 +--- src/misc1.c 2011-05-10 16:29:29.000000000 +0200 +*************** +*** 4589,4613 **** + vim_ispathsep(c) + int c; + { +! #ifdef RISCOS +! return (c == '.' || c == ':'); +! #else +! # ifdef UNIX + return (c == '/'); /* UNIX has ':' inside file names */ +! # else +! # ifdef BACKSLASH_IN_FILENAME + return (c == ':' || c == '/' || c == '\\'); +! # else +! # ifdef VMS + /* server"user passwd"::device:[full.path.name]fname.extension;version" */ + return (c == ':' || c == '[' || c == ']' || c == '/' + || c == '<' || c == '>' || c == '"' ); +! # else /* Amiga */ + return (c == ':' || c == '/'); +! # endif /* VMS */ +! # endif + # endif +! #endif /* RISC OS */ + } + + #if defined(FEAT_SEARCHPATH) || defined(PROTO) +--- 4589,4609 ---- + vim_ispathsep(c) + int c; + { +! #ifdef UNIX + return (c == '/'); /* UNIX has ':' inside file names */ +! #else +! # ifdef BACKSLASH_IN_FILENAME + return (c == ':' || c == '/' || c == '\\'); +! # else +! # ifdef VMS + /* server"user passwd"::device:[full.path.name]fname.extension;version" */ + return (c == ':' || c == '[' || c == ']' || c == '/' + || c == '<' || c == '>' || c == '"' ); +! # else + return (c == ':' || c == '/'); +! # endif /* VMS */ + # endif +! #endif + } + + #if defined(FEAT_SEARCHPATH) || defined(PROTO) +*** ../vim-7.3.186/src/proto.h 2010-08-15 21:57:29.000000000 +0200 +--- src/proto.h 2011-05-10 16:29:45.000000000 +0200 +*************** +*** 62,70 **** + # ifdef __BEOS__ + # include "os_beos.pro" + # endif +- # ifdef RISCOS +- # include "os_riscos.pro" +- # endif + # ifdef __QNX__ + # include "os_qnx.pro" + # endif +--- 62,67 ---- +*************** +*** 245,253 **** + # ifdef FEAT_GUI_X11 + # include "gui_x11.pro" + # endif +- # ifdef RISCOS +- # include "gui_riscos.pro" +- # endif + # ifdef FEAT_GUI_PHOTON + # include "gui_photon.pro" + # endif +--- 242,247 ---- +*** ../vim-7.3.186/src/quickfix.c 2011-05-05 17:14:07.000000000 +0200 +--- src/quickfix.c 2011-05-10 16:30:18.000000000 +0200 +*************** +*** 1182,1202 **** + if (fname == NULL || *fname == NUL) /* no file name */ + return 0; + { +- #ifdef RISCOS +- /* Name is reported as `main.c', but file is `c.main' */ +- return ro_buflist_add(fname); +- #else + char_u *ptr; + int fnum; + +! # ifdef VMS + vms_remove_version(fname); +! # endif +! # ifdef BACKSLASH_IN_FILENAME + if (directory != NULL) + slash_adjust(directory); + slash_adjust(fname); +! # endif + if (directory != NULL && !vim_isAbsName(fname) + && (ptr = concat_fnames(directory, fname, TRUE)) != NULL) + { +--- 1182,1198 ---- + if (fname == NULL || *fname == NUL) /* no file name */ + return 0; + { + char_u *ptr; + int fnum; + +! #ifdef VMS + vms_remove_version(fname); +! #endif +! #ifdef BACKSLASH_IN_FILENAME + if (directory != NULL) + slash_adjust(directory); + slash_adjust(fname); +! #endif + if (directory != NULL && !vim_isAbsName(fname) + && (ptr = concat_fnames(directory, fname, TRUE)) != NULL) + { +*************** +*** 1221,1227 **** + return fnum; + } + return buflist_add(fname, 0); +- #endif + } + } + +--- 1217,1222 ---- +*** ../vim-7.3.186/src/search.c 2011-02-25 18:38:29.000000000 +0100 +--- src/search.c 2011-05-10 16:30:38.000000000 +0200 +*************** +*** 4581,4589 **** + char_u *already = NULL; + char_u *startp = NULL; + char_u *inc_opt = NULL; +- #ifdef RISCOS +- int previous_munging = __riscosify_control; +- #endif + #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) + win_T *curwin_save = NULL; + #endif +--- 4581,4586 ---- +*************** +*** 4596,4606 **** + if (file_line == NULL) + return; + +- #ifdef RISCOS +- /* UnixLib knows best how to munge c file names - turn munging back on. */ +- int __riscosify_control = 0; +- #endif +- + if (type != CHECK_PATH && type != FIND_DEFINE + #ifdef FEAT_INS_EXPAND + /* when CONT_SOL is set compare "ptr" with the beginning of the line +--- 4593,4598 ---- +*************** +*** 5228,5238 **** + vim_free(regmatch.regprog); + vim_free(incl_regmatch.regprog); + vim_free(def_regmatch.regprog); +- +- #ifdef RISCOS +- /* Restore previous file munging state. */ +- __riscosify_control = previous_munging; +- #endif + } + + static void +--- 5220,5225 ---- +*** ../vim-7.3.186/src/structs.h 2011-03-22 18:10:34.000000000 +0100 +--- src/structs.h 2011-05-10 16:30:49.000000000 +0200 +*************** +*** 2366,2376 **** + MenuHandle menu_handle; + MenuHandle submenu_handle; + #endif +- #ifdef RISCOS +- int *id; /* Not used, but gui.c needs it */ +- int greyed_out; /* Flag */ +- int hidden; +- #endif + #ifdef FEAT_GUI_PHOTON + PtWidget_t *id; + PtWidget_t *submenu_id; +--- 2366,2371 ---- +*** ../vim-7.3.186/src/term.c 2010-12-30 14:47:32.000000000 +0100 +--- src/term.c 2011-05-10 16:31:41.000000000 +0200 +*************** +*** 52,58 **** + + /* + * Here are the builtin termcap entries. They are not stored as complete +! * Tcarr structures, as such a structure is too big. + * + * The entries are compact, therefore they normally are included even when + * HAVE_TGETENT is defined. When HAVE_TGETENT is defined, the builtin entries +--- 52,58 ---- + + /* + * Here are the builtin termcap entries. They are not stored as complete +! * structures with all entries, as such a structure is too big. + * + * The entries are compact, therefore they normally are included even when + * HAVE_TGETENT is defined. When HAVE_TGETENT is defined, the builtin entries +*************** +*** 199,269 **** + #endif + + #ifndef NO_BUILTIN_TCAPS +- # if defined(RISCOS) || defined(ALL_BUILTIN_TCAPS) +- /* +- * Default for the Acorn. +- */ +- {(int)KS_NAME, "riscos"}, +- {(int)KS_CL, "\014"}, /* Cls and Home Cursor */ +- {(int)KS_CM, "\001%d\001%d\002"}, /* Position cursor */ +- +- {(int)KS_CCO, "16"}, /* Allow 16 colors */ +- +- {(int)KS_CAF, "\001%d\021"}, /* Set foreground colour */ +- {(int)KS_CAB, "\001%d\022"}, /* Set background colour */ +- +- +- {(int)KS_ME, "\004"}, /* Normal mode */ +- {(int)KS_MR, "\005"}, /* Reverse */ +- +- {(int)KS_VI, "\016"}, /* Cursor invisible */ +- {(int)KS_VE, "\017"}, /* Cursor visible */ +- {(int)KS_VS, "\020"}, /* Cursor very visible */ +- +- {(int)KS_CS, "\001%d\001%d\003"}, /* Set scroll region */ +- {(int)KS_SR, "\023"}, /* Scroll text down */ +- {K_UP, "\217"}, +- {K_DOWN, "\216"}, +- {K_LEFT, "\214"}, +- {K_RIGHT, "\215"}, +- {K_S_UP, "\237"}, +- {K_S_DOWN, "\236"}, +- {K_S_LEFT, "\234"}, +- {K_S_RIGHT, "\235"}, +- +- {K_F1, "\201"}, +- {K_F2, "\202"}, +- {K_F3, "\203"}, +- {K_F4, "\204"}, +- {K_F5, "\205"}, +- {K_F6, "\206"}, +- {K_F7, "\207"}, +- {K_F8, "\210"}, +- {K_F9, "\211"}, +- {K_F10, "\312"}, +- {K_F11, "\313"}, +- {K_F12, "\314"}, +- {K_S_F1, "\221"}, +- {K_S_F2, "\222"}, +- {K_S_F3, "\223"}, +- {K_S_F4, "\224"}, +- {K_S_F5, "\225"}, +- {K_S_F6, "\226"}, +- {K_S_F7, "\227"}, +- {K_S_F8, "\230"}, +- {K_S_F9, "\231"}, +- {K_S_F10, "\332"}, +- {K_S_F11, "\333"}, +- {K_S_F12, "\334"}, +- {K_BS, "\010"}, +- {K_INS, "\315"}, +- {K_DEL, "\177"}, +- {K_HOME, "\036"}, +- {K_END, "\213"}, +- {K_PAGEUP, "\237"}, +- {K_PAGEDOWN, "\236"}, +- # endif /* Acorn terminal */ +- + + # if defined(AMIGA) || defined(ALL_BUILTIN_TCAPS) + /* +--- 199,204 ---- +*************** +*** 1399,1408 **** + /* + * DEFAULT_TERM is used, when no terminal is specified with -T option or $TERM. + */ +- #ifdef RISCOS +- # define DEFAULT_TERM (char_u *)"riscos" +- #endif +- + #ifdef AMIGA + # define DEFAULT_TERM (char_u *)"amiga" + #endif +--- 1334,1339 ---- +*** ../vim-7.3.186/src/termlib.c 2010-08-15 21:57:30.000000000 +0200 +--- src/termlib.c 2011-05-10 16:31:58.000000000 +0200 +*************** +*** 13,19 **** + #include "vim.h" + #include "termlib.pro" + +! #if !defined(AMIGA) && !defined(VMS) && !defined(MACOS) && !defined(RISCOS) + # include + #endif + +--- 13,19 ---- + #include "vim.h" + #include "termlib.pro" + +! #if !defined(AMIGA) && !defined(VMS) && !defined(MACOS) + # include + #endif + +*** ../vim-7.3.186/src/version.c 2011-05-10 16:12:40.000000000 +0200 +--- src/version.c 2011-05-10 16:37:20.000000000 +0200 +*************** +*** 1205,1213 **** + # endif + #endif + +- #ifdef RISCOS +- MSG_PUTS(_("\nRISC OS version")); +- #endif + #ifdef VMS + MSG_PUTS(_("\nOpenVMS version")); + # ifdef HAVE_PATHDEF +--- 1207,1212 ---- +*** ../vim-7.3.186/src/vim.h 2011-05-05 16:41:19.000000000 +0200 +--- src/vim.h 2011-05-10 16:32:40.000000000 +0200 +*************** +*** 184,192 **** + # define SIZEOF_INT 2 + # endif + #endif +- #ifdef RISCOS +- # define SIZEOF_INT 4 +- #endif + + + #include "feature.h" /* #defines for optionals and features */ +--- 184,189 ---- +*************** +*** 340,349 **** + # include "os_mac.h" + #endif + +- #ifdef RISCOS +- # include "os_riscos.h" +- #endif +- + #ifdef __QNX__ + # include "os_qnx.h" + #endif +--- 337,342 ---- +*** ../vim-7.3.186/src/gui_riscos.h 2010-08-15 21:57:28.000000000 +0200 +--- src/gui_riscos.h 1970-01-01 01:00:00.000000000 +0100 +*************** +*** 1,32 **** +- /* vi:set ts=8 sts=4 sw=4: +- * +- * VIM - Vi IMproved by Bram Moolenaar +- * +- * Do ":help uganda" in Vim to read copying and usage conditions. +- * Do ":help credits" in Vim to see a list of people who contributed. +- */ +- +- #define FEAT_BROWSE +- +- #define TASK 0x4b534154 +- +- /* Nested wimp flags: */ +- #define CHILD_FIX_TO_WORKAREA 0 +- #define CHILD_FIX_TO_LEFT 1 +- #define CHILD_FIX_TO_BOTTOM 1 +- #define CHILD_FIX_TO_RIGHT 2 +- #define CHILD_FIX_TO_TOP 2 +- +- #define CHILD_SELF_SCROLL 0 +- #define CHILD_PARENT_SCROLL 1 +- +- #define CHILD_LEFT 16 +- #define CHILD_BOTTOM 18 +- #define CHILD_RIGHT 20 +- #define CHILD_TOP 22 +- #define CHILD_SCROLL_X 24 +- #define CHILD_SCROLL_Y 26 +- +- int wimp_poll(int mask, int *block); +- int wimp_poll_idle(int mask, int *block, int end_time); +- void ro_open_main(int *block); +--- 0 ---- +*** ../vim-7.3.186/src/os_riscos.h 2010-08-15 21:57:30.000000000 +0200 +--- src/os_riscos.h 1970-01-01 01:00:00.000000000 +0100 +*************** +*** 1,166 **** +- /* vi:set ts=8 sts=4 sw=4: +- * +- * VIM - Vi IMproved by Bram Moolenaar +- * +- * Do ":help uganda" in Vim to read copying and usage conditions. +- * Do ":help credits" in Vim to see a list of people who contributed. +- */ +- +- #include +- #include +- #include +- #include +- #include +- #include +- #include +- #include +- +- #define CASE_INSENSITIVE_FILENAME +- #define FEAT_MODIFY_FNAME +- #define FEAT_OSFILETYPE +- #define DFLT_OFT "Text" +- #define USE_TERM_CONSOLE +- #define HAVE_AVAIL_MEM +- +- /* Longer filenames now accessible to all */ +- #ifndef BASENAMELEN +- # define BASENAMELEN 64 /* Same length as unzip */ +- #endif +- +- #ifndef TEMNAME +- # define TEMPNAME ".v?XXXXXX" +- # define TEMPNAMELEN 25 +- #endif +- +- #ifndef DFLT_HELPFILE +- # define DFLT_HELPFILE "Vim:doc.help" +- #endif +- +- #ifndef DFLT_BDIR +- # define DFLT_BDIR ".,." /* default for 'backupdir' */ +- #endif +- +- /* Paths to try putting swap file in. */ +- #ifndef DFLT_DIR +- # define DFLT_DIR ".,." /* default for 'directory' */ +- #endif +- +- #ifndef DFLT_VDIR +- # define DFLT_VDIR "Choices:Vim.view" /* default for 'viewdir' */ +- #endif +- +- #ifndef TERMCAPFILE +- # define TERMCAPFILE "Vim:TermCap" +- #endif +- #define HAVE_TGETENT +- +- #ifndef SYNTAX_FNAME +- # define SYNTAX_FNAME "Vim:Syntax.%s" +- #endif +- +- #ifndef EVIM_FILE +- # define EVIM_FILE "Vim:Evim" +- #endif +- +- #define FEAT_VIMINFO +- +- #ifndef VIMINFO_FILE +- # define VIMINFO_FILE ".Vim.VimInfo" +- #endif +- #ifndef VIMINFO_FILE2 +- # define VIMINFO_FILE2 "Choices:Vim.VimInfo" +- #endif +- +- #ifndef VIMRC_FILE +- # define VIMRC_FILE "/vimrc" +- #endif +- #ifndef EXRC_FILE +- # define EXRC_FILE "/exrc" +- #endif +- #ifndef GVIMRC_FILE +- # define GVIMRC_FILE "/gvimrc" +- #endif +- #ifndef USR_VIMRC_FILE +- # define USR_VIMRC_FILE "Vim:Evim" +- #endif +- #ifndef SESSION_FILE +- # define SESSION_FILE "/Session.vim" +- #endif +- #ifndef USR_VIMRC_FILE +- # define USR_VIMRC_FILE "Choices:Vim.VimRC" +- #endif +- #ifndef USR_GVIMRC_FILE +- # define USR_GVIMRC_FILE "Choices:Vim.GVimRC" +- #endif +- #ifndef USR_EXRC_FILE +- # define USR_EXRC_FILE "Choices:Vim.ExRC" +- #endif +- #ifndef SYS_VIMRC_FILE +- # define SYS_VIMRC_FILE "Vim:VimRC" +- #endif +- #ifndef SYS_GVIMRC_FILE +- # define SYS_GVIMRC_FILE "Vim:GVimRC" +- #endif +- #ifndef SYS_MENU_FILE +- # define SYS_MENU_FILE "Vim:Menu" +- #endif +- #ifndef SYS_OPTWIN_FILE +- # define SYS_OPTWIN_FILE "Vim:Optwin" +- #endif +- #ifndef FILETYPE_FILE +- # define FILETYPE_FILE "Vim:Filetype" +- #endif +- #ifndef FTPLUGIN_FILE +- # define FTPLUGIN_FILE "Vim:Ftplugin/vim" +- #endif +- #ifndef INDENT_FILE +- # define INDENT_FILE "Vim:Indent/vim" +- #endif +- #ifndef FTOFF_FILE +- # define FTOFF_FILE "Vim:Ftoff" +- #endif +- #ifndef FTPLUGOF_FILE +- # define FTPLUGOF_FILE "Vim:Ftplugof" +- #endif +- #ifndef INDOFF_FILE +- # define INDOFF_FILE "Vim:Indoff" +- #endif +- +- #define DFLT_ERRORFILE "errors/vim" +- #define DFLT_RUNTIMEPATH "Choices:Vim,Vim:,Choices:Vim.after" +- +- /* +- * RISC PCs have plenty of memory, use large buffers +- */ +- #define CMDBUFFSIZE 1024 /* size of the command processing buffer */ +- #define MAXPATHL 256 /* paths are always quite short though */ +- +- #ifndef DFLT_MAXMEM +- # define DFLT_MAXMEM (5*1024) /* use up to 5 Mbyte for a buffer */ +- #endif +- +- #ifndef DFLT_MAXMEMTOT +- # define DFLT_MAXMEMTOT (10*1024) /* use up to 10 Mbyte for Vim */ +- #endif +- +- #ifdef HAVE_SIGSET +- # define signal sigset +- #endif +- +- #define n_flag (1<<31) +- #define z_flag (1<<30) +- #define c_flag (1<<29) +- #define v_flag (1<<28) +- +- /* These take r0-r7 as inputs, returns r0-r7 in global variables. */ +- void swi(int swinum, ...); /* Handles errors itself */ +- int xswi(int swinum, ...); /* Returns errors using v flag */ +- extern int r0, r1, r2, r3, r4, r5, r6, r7; /* For return values */ +- +- #include +- #include +- +- #define mch_memmove(to, from, len) memmove((char *)(to), (char *)(from), len) +- #define mch_rename(src, dst) rename(src, dst) +- #define mch_getenv(x) (char_u *)getenv((char *)x) +- #define mch_setenv(name, val, x) setenv(name, val, x) +--- 0 ---- +*** ../vim-7.3.186/src/gui_riscos.c 2011-05-10 15:52:10.000000000 +0200 +--- src/gui_riscos.c 1970-01-01 01:00:00.000000000 +0100 +*************** +*** 1,3558 **** +- /* vi:set ts=8 sts=4 sw=4: +- * +- * VIM - Vi IMproved by Bram Moolenaar +- * +- * Do ":help uganda" in Vim to read copying and usage conditions. +- * Do ":help credits" in Vim to see a list of people who contributed. +- * See README.txt for an overview of the Vim source code. +- */ +- +- #include "vim.h" +- #include +- +- /* +- * gui_riscos.c +- * +- * Thomas Leonard +- * Updated by Andy Wingate +- */ +- +- extern int time_of_last_poll; +- +- int task_handle = 0; /* Zero means we are not yet a Wimp task */ +- int child_handle = 0; /* Task handle of our child process (zero if none). */ +- int *wimp_menu = (int *) -1; /* Pointer to a Wimp menu structure (or -1) */ +- int save_window = -1; /* Save As window handle */ +- +- int *redraw_block = NULL; /* NULL means not in a redraw loop. */ +- int ro_return_early = FALSE; /* Break out of gui_mch_wait_for_chars() */ +- +- int leaf_ref = 0; /* Wimp message number - send via Wimp$Scrap */ +- char_u *leaf_name = NULL; /* Leaf name from DataSave */ +- +- int default_columns = 120; /* These values are used if the --rows and --columns */ +- int default_rows = 32; /* options aren't used on startup. */ +- +- #define DRAG_FALSE 0 +- #define DRAG_SELECTION 1 +- #define DRAG_RESIZE_WINDOW 2 +- int ro_dragging = DRAG_FALSE; +- int drag_button; +- int drag_modifiers; +- int drag_x_offset; +- int drag_y_offset; +- +- int nested_wimp = FALSE; /* Bool - can we use the new wimp? */ +- +- int changed_mode = FALSE; +- int x_eigen_factor; +- int y_eigen_factor; +- +- /* If ro_current_font is non-zero then use the outline font with that handle, +- * otherwise, if zap_redraw is TRUE then use ZapRedraw, otherwise use the +- * system font. +- * +- * If zap_redraw is TRUE then zap_file[] contains valid Zap font file +- * pointers (or NULLs). +- */ +- int ro_current_font = 0; /* 0 is system font, or ZapRedraw */ +- int font_x_offset = 0; /* Where to position each char in its box */ +- int font_y_offset = 0; +- +- int zap_redraw = FALSE; +- int double_height = FALSE; /* Plot each line twice? */ +- +- #define grgb(r,g,b) ((b<<16) + (g<<8) + (r)) +- #define UNUSED_COLOUR (gui.back_pixel) +- +- #define RO_LOAD_CLIPBOARD -2 /* Internal handle for DataSave message. */ +- +- /* Changes by John Kortink, 22-23 July 1998 +- * +- * Stuff to make redraw a lot faster. Almost all of it is right here below, +- * elsewhere changes are marked with 'JK230798'. Apart from a small change in +- * 'gui.c' all changes are limited to this file, 'gui_riscos.c'. The change in +- * 'gui.c' is to make Vim stop being 'smart' not redrawing characters that are +- * 'already there' (i.e. from the previous line, by coincidence). This caused a +- * lot more calls to the redraw code, which we want to avoid because a few nice +- * big strings at a time is a lot faster than a truckload of small ones. ('Dear +- * Bram ...'). +- */ +- +- /* The ZapRedraw structure */ +- +- static struct +- { +- int r_flags; +- int r_minx; +- int r_miny; +- int r_maxx; +- int r_maxy; +- int r_screen; +- int r_bpl; +- int r_bpp; +- int r_charw; +- int r_charh; +- char *r_caddr; +- int r_cbpl; +- int r_cbpc; +- int r_linesp; +- int r_data; +- int r_scrollx; +- int r_scrolly; +- int *r_palette; +- int r_for; +- int r_bac; +- char *r_workarea; +- int r_magx; +- int r_magy; +- int r_xsize; +- int r_ysize; +- int r_mode; +- } +- zap_redraw_block; +- +- /* Other globals */ +- +- static int zap_redraw_initialised = FALSE; +- static int zap_redraw_update_colours; +- static int zap_redraw_colours[2]; +- static int zap_redraw_palette[16]; +- +- /* Holds the current Zap font file(s). +- * The font is recreated from this block on a mode change. +- * When using zap, element ZAP_NORMAL is always valid, but +- * the others can be NULL. +- */ +- +- #define ZAP_NORMAL 0 +- #define ZAP_BOLD 1 +- #define ZAP_ITALIC 2 +- #define ZAP_BITALIC 3 +- #define ZAP_STYLES 4 +- +- /* Zap font file format data */ +- static char *zap_file[ZAP_STYLES] = {NULL, NULL, NULL, NULL}; +- +- /* r_caddr format for current mode */ +- static char *zap_caddr[ZAP_STYLES] = {NULL, NULL, NULL, NULL}; +- +- static void ro_remove_menu(int *menu); +- +- /* +- * Initialise all the ZapRedraw stuff. +- * Call this when changing font and after each mode change. +- * zap_redraw_bitmap must contain a valid Zap font file (possibly +- * created from the system font). +- * +- * Return FAIL to revert to system font (if we can't use ZapRedraw). +- */ +- int +- ro_zap_redraw_initialise() +- { +- int bytes_per_bitmap_char; +- int first, last; +- int i; +- +- /* Can't have initialisers for struct members :-(, ok, this way then ... */ +- if (!zap_redraw_initialised) +- { +- zap_redraw_block.r_workarea = NULL; +- zap_redraw_initialised = TRUE; +- } +- +- /* We redraw in DSA mode */ +- zap_redraw_block.r_flags = 0x0; +- +- /* Let ZapRedraw get the screen address for us */ +- zap_redraw_block.r_screen = 0; +- +- /* Read the font width and height from the font file header. +- * Assume that all styles are the same size. +- * ZAP_NORMAL is always present. +- */ +- zap_redraw_block.r_charw = ((int *) zap_file[ZAP_NORMAL])[2]; +- zap_redraw_block.r_charh = ((int *) zap_file[ZAP_NORMAL])[3]; +- +- /* We have no linespacing */ +- zap_redraw_block.r_linesp = 0; +- +- /* Fix foreground = colour 1 */ +- zap_redraw_block.r_for = 1; +- +- /* Fix background = colour 0 */ +- zap_redraw_block.r_bac = 0; +- +- /* Colour mask buffer */ +- zap_redraw_block.r_palette = zap_redraw_palette; +- +- /* Allocate local workspace (for the few calls following here) */ +- if (zap_redraw_block.r_workarea != NULL) +- free(zap_redraw_block.r_workarea); +- zap_redraw_block.r_workarea = (char*) malloc(128); +- if (!zap_redraw_block.r_workarea) +- return FAIL; /* Out of memory */ +- +- /* Fill in VDU variables */ +- if (xswi(ZapRedraw_ReadVduVars, 0, &zap_redraw_block) & v_flag) +- return FAIL; /* Can't find ZapRedraw module - use VDU instead */ +- +- /* Determine cbpl and cbpc */ +- swi(ZapRedraw_CachedCharSize, zap_redraw_block.r_bpp, 0, +- zap_redraw_block.r_charw, zap_redraw_block.r_charh); +- zap_redraw_block.r_cbpl = r2; +- zap_redraw_block.r_cbpc = r3; +- +- /* Allocate general workspace (for the calls outside) */ +- if (zap_redraw_block.r_workarea != NULL) +- free(zap_redraw_block.r_workarea); +- zap_redraw_block.r_workarea = (char*) malloc(128 + zap_redraw_block.r_cbpl); +- if (!zap_redraw_block.r_workarea) +- return FAIL; /* Out of memory */ +- +- /* Now convert the 1 bpp character data ready for the current mode */ +- +- bytes_per_bitmap_char = (zap_redraw_block.r_charw * zap_redraw_block.r_charh + 7) / 8; +- +- /* Convert the fonts from 1bpp to a format suitable for the +- * current mode. +- */ +- for (i = 0; i < ZAP_STYLES; i++) +- { +- first = ((int *) zap_file[i])[4]; +- last = ((int *) zap_file[i])[5]; +- +- if (last > 255) +- last = 255; /* Don't convert cursors (overwrites memory!) */ +- +- /* Allocate the font cache */ +- vim_free(zap_caddr[i]); +- if (zap_file[i]) +- zap_caddr[i] = (char*) malloc(zap_redraw_block.r_cbpc * 256); +- else +- zap_caddr[i] = NULL; /* No file for this style */ +- +- if (zap_caddr[i]) +- { +- zap_redraw_block.r_caddr = zap_caddr[i]; +- +- swi(ZapRedraw_ConvertBitmap, 0, &zap_redraw_block, +- first, last, /* Range of characters to convert */ +- zap_file[i] + 0x20 /* Addr of first char provided by font */ +- - first * bytes_per_bitmap_char); +- } +- } +- +- if (!zap_caddr[ZAP_NORMAL]) +- { +- zap_redraw = FALSE; /* Out of memory */ +- return FAIL; +- } +- +- /* Next time we need them, we have to update the colour masks */ +- zap_redraw_update_colours = TRUE; +- +- return OK; +- } +- +- /* +- * Redraw a string at OS coordinates (top-left, x inclusive, y exclusive). +- * Graphics clip window is window[0..3] as in R1+28..40 of Wimp_RedrawWindow. +- * Returns (possibly modified) flags. +- */ +- int +- ro_zap_redraw_draw_string(x, y, string, length, flags, clip) +- int x; +- int y; +- char *string; +- int length; +- int flags; /* DRAW_TRANSP, DRAW_BOLD, DRAW_UNDERL, DRAW_ITALIC */ +- int *clip; +- { +- char redraw_data[1024]; +- int clip_minx; +- int clip_miny; +- int clip_maxx; +- int clip_maxy; +- int os_xshift = zap_redraw_block.r_magx; +- int os_yshift = zap_redraw_block.r_magy; +- +- if (flags & DRAW_TRANSP) +- return flags; /* We don't do transparent plotting yet. */ +- +- if (flags & DRAW_BOLD) +- { +- if (flags & DRAW_ITALIC && zap_caddr[ZAP_BITALIC]) +- zap_redraw_block.r_caddr = zap_caddr[ZAP_BITALIC]; +- else +- zap_redraw_block.r_caddr = zap_caddr[ZAP_BOLD]; +- } +- else +- { +- if (flags & DRAW_ITALIC) +- zap_redraw_block.r_caddr = zap_caddr[ZAP_ITALIC]; +- else +- zap_redraw_block.r_caddr = zap_caddr[ZAP_NORMAL]; +- } +- if (!zap_redraw_block.r_caddr) +- { +- zap_redraw_block.r_caddr = zap_caddr[ZAP_NORMAL]; +- flags |= DRAW_UNDERL; /* Style missing - we can always underline */ +- } +- +- /* Set the vertical scaling flag */ +- if (double_height) +- zap_redraw_block.r_flags = 1 << 1; +- else +- zap_redraw_block.r_flags = 0; +- +- /* Update the colour masks (if needed) */ +- if (zap_redraw_update_colours) +- { +- swi(ZapRedraw_CreatePalette, 2, +- &zap_redraw_block, +- zap_redraw_colours, +- zap_redraw_block.r_palette, 2); +- zap_redraw_update_colours = FALSE; +- } +- +- /* Target rectangle in ZapRedraw rectangle coordinates (pixels, Y-min/max reversed !!!) */ +- zap_redraw_block.r_minx = x >> os_xshift; /* inclusive */ +- zap_redraw_block.r_miny = zap_redraw_block.r_ysize - (y >> os_yshift); /* inclusive */ +- zap_redraw_block.r_maxx = (x + length * gui.char_width) >> os_xshift; /* exclusive */ +- zap_redraw_block.r_maxy = zap_redraw_block.r_ysize - ((y - gui.char_height) >> os_yshift); +- /* exclusive */ +- +- /* Clip rectangle in ZapRedraw rectangle coordinates (pixels, Y-min/max reversed !!!) */ +- clip_minx = clip[0] >> os_xshift; /* inclusive */ +- clip_miny = zap_redraw_block.r_ysize - (clip[3] >> os_yshift); /* inclusive */ +- clip_maxx = clip[2] >> os_xshift; /* exclusive */ +- clip_maxy = zap_redraw_block.r_ysize - (clip[1] >> os_yshift); /* exclusive */ +- +- /* Clip target rectangle against the current graphics window */ +- if (zap_redraw_block.r_minx < clip_minx) +- { +- zap_redraw_block.r_scrollx = clip_minx - zap_redraw_block.r_minx; +- zap_redraw_block.r_minx = clip_minx; +- } +- else +- zap_redraw_block.r_scrollx = 0; +- if (zap_redraw_block.r_miny < clip_miny) +- { +- zap_redraw_block.r_scrolly = clip_miny - zap_redraw_block.r_miny; +- zap_redraw_block.r_miny = clip_miny; +- } +- else +- zap_redraw_block.r_scrolly = 0; +- if (zap_redraw_block.r_maxx > clip_maxx) +- zap_redraw_block.r_maxx = clip_maxx; +- if (zap_redraw_block.r_maxy > clip_maxy) +- zap_redraw_block.r_maxy = clip_maxy; +- +- /* Fill in the character data structure */ +- if (length > (sizeof(redraw_data) - 2 * 4 - 2)) +- length = sizeof(redraw_data) - 2 * 4 - 2; +- ((int*) redraw_data)[0] = 2 * 4; +- ((int*) redraw_data)[1] = 0; +- strncpy(redraw_data + 2 * 4, string, length); +- redraw_data[2 * 4 + length + 0] = '\0'; +- redraw_data[2 * 4 + length + 1] = '\x2'; +- zap_redraw_block.r_data = (int) redraw_data; +- +- /* Perform the draw */ +- swi(ZapRedraw_RedrawArea, 0, &zap_redraw_block); +- +- return flags; +- } +- +- /* +- * Okay that was it from me, back to Thomas ... +- */ +- +- /* +- * Parse the GUI related command-line arguments. Any arguments used are +- * deleted from argv, and *argc is decremented accordingly. This is called +- * when vim is started, whether or not the GUI has been started. +- */ +- void +- gui_mch_prepare(int *argc, char **argv) +- { +- int arg = 1; +- +- while (arg < *argc - 1) +- { +- if (strcmp(argv[arg], "--rows") == 0 || strcmp(argv[arg], "--columns") == 0) +- { +- int value; +- +- value = atoi(argv[arg + 1]); +- +- if (argv[arg][2] == 'r') +- default_rows = value; +- else +- default_columns = value; +- +- /* Delete argument from argv[]. (hope this is read/write!) */ +- +- *argc -= 2; +- if (*argc > arg) +- mch_memmove(&argv[arg], &argv[arg + 2], (*argc - arg) +- * sizeof(char *)); +- } +- else +- arg++; +- } +- } +- +- /* Fatal error on initialisation - report it and die. */ +- void +- ro_die(error) +- char_u *error; /* RISC OS error block */ +- { +- swi(Wimp_ReportError, error, 5, "GVim"); +- exit(EXIT_FAILURE); +- } +- +- /* Find the sizes of the window tools: +- * +- * Create a test window. +- * Find inner and outer sizes. +- * Find the difference. +- * Delete window. +- * +- * While we're here, find the eigen values too. +- */ +- void +- ro_measure_tools() +- { +- int block[10]; +- int vdu[] = { 4, 5, -1}; +- int test_window[] = +- { +- -100, -100, /* Visible area : min X,Y */ +- -50, -50, /* max X,Y */ +- 0, 0, /* Scroll offsets */ +- -1, /* Window in front */ +- 0xd0800150, /* Window flags */ +- 0xff070207, /* Colours */ +- 0x000c0103, /* More colours */ +- 0, -0x4000, /* Workarea extent */ +- 0x4000, 0, /* max X,Y */ +- 0x00000000, /* No title */ +- 0 << 12, /* No workarea button type */ +- 1, /* Wimp sprite area */ +- 0x00010001, /* Minimum width, height */ +- 0, 0, 0, /* Title data (none) */ +- 0 /* No icons */ +- }; +- int inner_max_x, inner_min_y; +- +- swi(Wimp_CreateWindow, 0, test_window); +- +- block[0] = r0; +- /* Open the window (and read state). +- * GetWindowOutline needs it too if the wimp isn't nested. +- */ +- swi(Wimp_OpenWindow, 0, block); +- inner_max_x = block[3]; +- inner_min_y = block[2]; +- +- swi(Wimp_GetWindowOutline, 0, block); +- +- gui.scrollbar_width = block[3] - inner_max_x; +- gui.scrollbar_height = inner_min_y - block[2]; +- +- swi(Wimp_DeleteWindow, 0, block); +- +- /* Read the size of one pixel. */ +- swi(OS_ReadVduVariables, vdu, vdu); +- x_eigen_factor = vdu[0]; +- y_eigen_factor = vdu[1]; +- } +- +- /* Load a template from the current templates file. +- * Create the window and return its handle. +- */ +- int +- ro_load_template(str_name, title, title_size) +- char_u *str_name; /* Identifier of window in file (max 12 chars) */ +- char_u **title; /* If not NULL then return pointer to title here */ +- int *title_size; /* If not NULL then return the title length here */ +- { +- int *window; +- char *data; +- int name[4]; +- +- strcpy( (char *) name, str_name); +- +- /* Find how big we must make the buffers */ +- +- if (xswi(Wimp_LoadTemplate, 0, 0, 0, 0, -1, name, 0) & v_flag) +- ro_die( (char *) r0); +- +- window = malloc(r1); /* Don't print text messages from alloc() */ +- data = malloc(r2); +- if (window == NULL || data == NULL) +- ro_die("\0\0\0\0Out of memory - Can't load templates"); +- +- /* Load the template into the buffers */ +- +- swi(Wimp_LoadTemplate, 0, +- window, /* Temp block */ +- data, /* Icon data */ +- data + r2 + 1, /* End of icon data */ +- -1, /* No fonts */ +- name, 0); /* First match */ +- if (r6 == 0) +- ro_die("\0\0\0\0Can't find window in Templates file"); +- +- /* Create the window */ +- +- if (xswi(Wimp_CreateWindow, 0, window) & v_flag) +- ro_die( (char *) r0); +- +- if (title) +- *title = (char_u *) window[18]; +- if (title_size) +- *title_size = window[20]; +- +- free(window); /* Free temp block */ +- return r0; /* Return the window handle */ +- } +- +- /* +- * Check if the GUI can be started. Called before gvimrc is sourced. +- * Return OK or FAIL. +- */ +- int +- gui_mch_init_check() +- { +- return OK; /* TODO: GUI can always be started? */ +- } +- +- /* +- * Initialise the RISC OS GUI. +- * Create all the windows. +- * Returns OK for success, FAIL when the GUI can't be started. +- */ +- int +- gui_mch_init() +- { +- int messages[] = { +- 1, 2, 3, 4, /* DataSave, DataSaveAck, DataLoad, DataLoadAck */ +- 8, /* PreQuit */ +- 0xf, /* ClaimEntity (for clipboard) */ +- 0x10, /* DataRequest (for clipboard) */ +- 0x400c1, /* Mode change */ +- 0x400c3, /* TaskCloseDown */ +- 0x400c9, /* MenusDeleted */ +- 0x808c1, /* TW_Output */ +- 0x808c2, /* TW_Ego */ +- 0x808c3, /* TW_Morio */ +- 0x808c4, /* TW_Morite */ +- 0}; /* End-of-list. */ +- +- +- /* There may have been some errors reported in the +- * command window before we get here. Wait if so. +- */ +- swi(Wimp_ReadSysInfo, 3); +- if (r0 == 0) +- swi(Wimp_CommandWindow, 0); /* Window opened - close with prompt */ +- +- if (xswi(Wimp_Initialise, 310, 0x4b534154, "GVim", messages) & v_flag) +- return FAIL; +- nested_wimp = r0 >= 397; +- task_handle = r1; +- +- /* Load the templates. */ +- +- if (xswi(Wimp_OpenTemplate, 0, "Vim:Templates") & v_flag) +- ro_die( (char *) r0); +- +- gui.window_handle = ro_load_template("editor", +- &gui.window_title, +- &gui.window_title_size); +- +- save_window = ro_load_template("save", NULL, NULL); +- +- swi(Wimp_CloseTemplate); +- +- /* Set default foreground and background colours. */ +- +- gui.norm_pixel = gui.def_norm_pixel; +- gui.back_pixel = gui.def_back_pixel; +- +- /* Get the colours from the "Normal" and "Menu" group (set in syntax.c or +- * in a vimrc file) */ +- +- set_normal_colors(); +- +- /* +- * Check that none of the colors are the same as the background color +- */ +- +- gui_check_colors(); +- +- /* Get the colours for the highlight groups (gui_check_colors() might have +- * changed them) */ +- +- highlight_gui_started(); /* re-init colours and fonts */ +- +- /* Set geometry based on values read on initialisation. */ +- +- gui.num_cols = Columns = default_columns; +- gui.num_rows = Rows = default_rows; +- +- /* Get some information about our environment. */ +- +- ro_measure_tools(); +- +- return OK; +- } +- +- /* +- * Called when the foreground or background colour has been changed. +- */ +- void +- gui_mch_new_colors() +- { +- } +- +- /* +- * Open the GUI window which was created by a call to gui_mch_init(). +- */ +- int +- gui_mch_open(void) +- { +- int block[10]; +- +- block[0] = gui.window_handle; +- swi(Wimp_GetWindowState, 0, block); +- block[7] = -1; /* Open at the top of the stack */ +- swi(Wimp_OpenWindow, 0, block); +- +- /* Give the new window the input focus */ +- swi(Wimp_SetCaretPosition, gui.window_handle, -1, 0, 0, -1, -1); +- +- if (gui_win_x != -1 && gui_win_y != -1) +- gui_mch_set_winpos(gui_win_x, gui_win_y); +- +- return OK; +- } +- +- void +- gui_mch_exit(int rc) +- { +- int block[64]; +- +- /* Close window. Stops us from getting troublesome events +- * if we take a while to die. +- */ +- block[0] = gui.window_handle; +- swi(Wimp_CloseWindow, 0, block); +- +- if (child_handle) +- { +- /* We still have a sub-task running - kill it */ +- block[0] = 20; +- block[3] = 0; +- block[4] = 0; /* Quit */ +- if ((xswi(Wimp_SendMessage, 17, block, child_handle) & v_flag) == 0) +- { +- /* Idle until child dies. */ +- while (child_handle) +- { +- process_event(wimp_poll(1, block), block); +- } +- } +- } +- +- exit(rc); +- } +- +- /* +- * Get the position of the top left corner of the window. +- */ +- int +- gui_mch_get_winpos(int *x, int *y) +- { +- /* TODO */ +- return FAIL; +- } +- +- /* +- * Set the position of the top left corner of the window to the given +- * coordinates. +- */ +- void +- gui_mch_set_winpos(int x, int y) +- { +- /* TODO */ +- } +- +- void +- gui_mch_set_shellsize(width, height, min_width, min_height, base_width, base_height, direction) +- int width; /* In OS units */ +- int height; +- int min_width; /* Smallest permissible window size (ignored) */ +- int min_height; +- int base_width; /* Space for scroll bars, etc */ +- int base_height; +- int direction; +- { +- int s_width, s_height; +- int block[] = { +- gui.window_handle, +- 0, +- -height + 1, +- width, +- 1}; +- +- gui_mch_get_screen_dimensions(&s_width, &s_height); +- s_width -= base_width; +- s_height -= base_height; /* Underestimate - ignores titlebar */ +- +- swi(Wimp_GetWindowState, 0, block); +- block[3] = block[1] + width; +- block[2] = block[4] - height; +- if (block[3] > s_width) +- { +- block[3] = s_width; +- block[1] = block[3] - width; +- } +- if (block[2] < gui.scrollbar_height) +- { +- block[2] = gui.scrollbar_height; +- block[4] = block[2] + height; +- } +- swi(Wimp_OpenWindow, 0, block); +- swi(Wimp_ForceRedraw, gui.window_handle, 0, -height, width, 0); +- } +- +- void +- gui_mch_get_screen_dimensions(int *screen_w, int *screen_h) +- { +- int block[] = {4, 5, 11, 12, -1}; +- +- swi(OS_ReadVduVariables, block, block); +- *screen_w = (block[2] + 1) << block[0]; +- *screen_h = (block[3] + 1) << block[1]; +- } +- +- /* Take a font name with options and return a font handle, or +- * zero for failure. +- * Replace extension with 'Bold' or 'Italic' depending on modifiers. +- */ +- int +- ro_get_font(fullname, weight) +- char_u *fullname; +- int weight; /* Initial weights: +- * BIT MEANING +- * 0 bold +- * 1 italic +- */ +- { +- char_u *arg; +- char_u font[41]; +- int width = -1; +- int height = -1; +- int name_len; +- int i; +- char_u c; +- +- for (i = 0; i < 39;) +- { +- c = fullname[i]; +- if (c == ':' || c == NUL || c == '.') +- break; +- font[i++] = c; +- } +- +- /* find the first modifier, NULL if none */ +- arg = strchr(fullname + i, ':'); +- +- while (arg) +- { +- switch (*++arg) +- { +- case 'h': +- height = strtol(arg + 1, (char **) &arg, 10); +- break; +- case 'w': +- width = strtol(arg + 1, (char **) &arg, 10); +- break; +- case 'b': +- weight |= 1; +- break; +- case 'i': +- weight |= 2; +- break; +- default: +- return 0; +- } +- arg = strchr(arg, ':'); +- } +- +- if ((weight & 1) && i < 35) +- { +- /* Bold goes instead of given suffix */ +- strncpy(font + i, ".Bold", 5); +- i += 5; +- } +- else +- { +- /* Copy rest of name unless we are using Bold */ +- while (i < 39) +- { +- c = fullname[i]; +- if (c == ':' || c == NUL) +- break; +- font[i++] = c; +- } +- } +- if ((weight & 2) && i < 32) +- { +- strncpy(font + i, ".Oblique", 8); +- i += 8; +- } +- +- font[i] = 0; +- +- if (height < 1 && width < 1) +- height = width = 10; /* Default to 10pt */ +- else if (height < 1) +- height = width; +- else if (width < 1) +- width = height; +- +- if (xswi(Font_FindFont, 0, font, width << 4, height << 4, 0, 0) & v_flag) +- return NOFONT; /* Can't find font */ +- +- return r0; +- } +- +- /* Load a file into allocated memory and check it is valid. +- * Return a pointer to the allocated block on success. +- */ +- char * +- zap_load_file(name, style) +- char_u *name; /* Name of directory containing styles */ +- char_u *style; /* Name of style within directory */ +- { +- char_u fname[256]; +- char_u *file; +- +- if (strlen(name) + strlen(style) > 254) +- return NULL; /* Names too long */ +- +- sprintf(fname, "%s.%s", name, style); +- +- /* Load the named font in 1bpp format. */ +- if (xswi(OS_File, 13, fname, 0, 0, "VimFonts:") & v_flag || r0 != 1) +- return NULL; /* Error reading file info, or not a file */ +- +- /* Allocate enough memory to load the whole file */ +- file = (char *) alloc(r4); +- if (!file) +- return NULL; /* Out of memory */ +- +- if (xswi(OS_File, 12, fname, file, 0, "VimFonts:") & v_flag) +- return NULL; /* Unable to load file */ +- +- if (strncmp(file, "ZapFont\015", 8) == 0) +- return file; /* Loaded OK! */ +- +- vim_free(file); +- return NULL; /* Not a valid font file */ +- } +- +- /* Load and convert the named font. +- * If name is NULL or a null string then convert the system font. +- * Return OK on success; FAIL and we revert to using the VDU drivers. +- * +- * 'name' is the name of a directory. +- * Tries to load 'name.0', 'name.B', 'name.I' and 'name.IB'. +- */ +- int +- zap_load_font(name) +- char_u *name; +- { +- int i; +- +- /* Free the existing font files, if any */ +- for (i = 0; i < ZAP_STYLES; i++) +- { +- vim_free(zap_file[i]); +- zap_file[i] = NULL; +- } +- +- if (name && *name == '!') +- { +- name++; +- double_height = TRUE; +- } +- else +- double_height = FALSE; +- +- if (name && *name) +- { +- zap_file[ZAP_NORMAL] = zap_load_file(name, "0"); +- if (!zap_file[ZAP_NORMAL]) +- return FAIL; /* Can't load the 'normal' style - error */ +- +- zap_file[ZAP_BOLD] = zap_load_file(name, "B"); +- zap_file[ZAP_ITALIC] = zap_load_file(name, "I"); +- zap_file[ZAP_BITALIC] = zap_load_file(name, "IB"); +- } +- else +- { +- int *header; +- char workarea[16]; +- char *old_wa; +- +- /* Allocate memory for system font (8 x 8 x 256 bits, plus header) */ +- header = (int *) alloc(0x20 + 8 * 256); +- if (header == NULL) +- return FAIL; +- zap_file[ZAP_NORMAL] = (char *) header; +- +- /* Store details about the system font */ +- header[2] = 8; /* Width */ +- header[3] = 8; /* Height */ +- header[4] = 0; /* First char */ +- header[5] = 255; /* Last char */ +- header[6] = header[7] = 0; /* Reserved */ +- +- /* Get system font bitmap */ +- old_wa = zap_redraw_block.r_workarea; +- zap_redraw_block.r_workarea = workarea; +- swi(ZapRedraw_ReadSystemChars, zap_file[ZAP_NORMAL] + 0x20, &zap_redraw_block); +- zap_redraw_block.r_workarea = old_wa; +- } +- +- return ro_zap_redraw_initialise(); +- } +- +- /* +- * Initialise vim to use the font with the given name. +- * Return FAIL if the font could not be loaded, OK otherwise. +- */ +- int +- gui_mch_init_font(char_u *font_name, int fontset) +- { +- int new_handle = 0; /* Use the system font by default */ +- +- if (font_name[0] == '!') +- { +- /* Select a ZapRedraw font */ +- if (zap_load_font(font_name + 1)) +- zap_redraw = TRUE; +- else +- { +- EMSG2(_("E610: Can't load Zap font '%s'"), font_name); +- font_name = "System"; /* Error - use system font */ +- zap_redraw = FALSE; +- } +- } +- else +- { +- zap_redraw = FALSE; +- +- if (font_name) +- { +- /* Extract any extra details about the font */ +- new_handle = ro_get_font(font_name, 0); +- if (!new_handle) +- return FAIL; +- } +- else +- font_name = "System"; +- } +- +- /* Free the previous font, if any */ +- gui_mch_free_font(gui.norm_font); +- gui.norm_font = new_handle; +- gui.char_ascent = 0; +- +- if (new_handle) +- { +- /* Read details about the chosen font */ +- swi(Font_ReadInfo, new_handle); +- +- gui.char_width = r3 - r1; +- gui.char_height = r4 - r2; +- +- font_x_offset = -r1; /* Where to position each char in its box */ +- font_y_offset = -r4; +- +- /* Try to load other fonts for bold, italic, and bold-italic */ +- gui_mch_free_font(gui.bold_font); +- gui.bold_font = ro_get_font(font_name, 1); +- gui_mch_free_font(gui.ital_font); +- gui.ital_font = ro_get_font(font_name, 2); +- gui_mch_free_font(gui.boldital_font); +- gui.boldital_font = ro_get_font(font_name, 3); +- } +- else +- { +- /* Use the system font or ZapRedraw. */ +- if (zap_redraw) +- { +- gui.char_width = zap_redraw_block.r_charw << zap_redraw_block.r_magx; +- gui.char_height = zap_redraw_block.r_charh << zap_redraw_block.r_magy; +- if (double_height) +- gui.char_height <<= 1; +- } +- else +- { +- gui.char_width = 16; +- gui.char_height = 32; +- } +- +- gui_mch_free_font(gui.bold_font); +- gui.bold_font = 0; +- gui_mch_free_font(gui.ital_font); +- gui.ital_font = 0; +- gui_mch_free_font(gui.boldital_font); +- gui.boldital_font = 0; +- } +- hl_set_font_name(font_name); +- +- must_redraw = CLEAR; +- return OK; +- } +- +- /* +- * Adjust gui.char_height (after 'linespace' was changed). +- */ +- int +- gui_mch_adjust_charheight() +- { +- return FAIL; +- } +- +- /* +- * Get a font structure for highlighting. +- */ +- GuiFont +- gui_mch_get_font(name, giveErrorIfMissing) +- char_u *name; +- int giveErrorIfMissing; +- { +- int handle; +- +- if (!name) +- return NOFONT; /* System font if no name */ +- +- handle = ro_get_font(name, 0); +- if (!handle) +- { +- if (giveErrorIfMissing) +- EMSG2(_("E611: Can't use font %s"), name); +- return NOFONT; +- } +- +- return handle; +- } +- +- #if defined(FEAT_EVAL) || defined(PROTO) +- /* +- * Return the name of font "font" in allocated memory. +- * Don't know how to get the actual name, thus use the provided name. +- */ +- char_u * +- gui_mch_get_fontname(font, name) +- GuiFont font; +- char_u *name; +- { +- if (name == NULL) +- return NULL; +- return vim_strsave(name); +- } +- #endif +- +- /* +- * Set the current text font. +- */ +- void +- gui_mch_set_font(GuiFont font) +- { +- ro_current_font = font; +- +- if (font) +- { +- /* Not the system font or ZapRedraw font - select it */ +- swi(Font_SetFont, font); +- } +- } +- +- /* +- * If a font is not going to be used, free its structure. +- */ +- void +- gui_mch_free_font(GuiFont font) +- { +- if (font) +- swi(Font_LoseFont, font); +- } +- +- /* +- * Return the Pixel value (colour) for the given colour name. +- * Return INVALCOLOR for error. +- * NB: I've changed Green for now, since it looked really sick +- */ +- guicolor_T +- gui_mch_get_color(char_u *name) +- { +- int i; +- struct colour +- { +- char_u *name; +- guicolor_T value; +- } colours[] = +- { +- { "Red", grgb(255, 0, 0) }, +- { "LightRed", grgb(255, 0, 0) }, +- { "DarkRed", grgb(139, 0, 0) }, +- +- { "Green", grgb(50, 200, 50) }, +- { "LightGreen", grgb(144, 238, 144) }, +- { "DarkGreen", grgb(0, 100, 0) }, +- { "SeaGreen", grgb(46, 139, 87) }, +- +- { "Blue", grgb(0, 0, 255) }, +- { "LightBlue", grgb(173, 216, 230) }, +- { "DarkBlue", grgb(0, 0, 139) }, +- { "SlateBlue", grgb(160, 90, 205) }, +- +- { "Cyan", grgb(0, 255, 255) }, +- { "LightCyan", grgb(224, 255, 255) }, +- { "DarkCyan", grgb(0, 139, 139) }, +- +- { "Magenta", grgb(255, 0, 255) }, +- { "LightMagenta", grgb(255, 224, 255) }, +- { "DarkMagenta", grgb(139, 0, 139) }, +- +- { "Yellow", grgb(255, 255, 0) }, +- { "LightYellow", grgb(255, 255, 224) }, +- { "DarkYellow", grgb(139, 139, 0) }, +- { "Brown", grgb(165, 42, 42) }, +- +- { "Gray", grgb(190, 190, 190) }, +- { "Grey", grgb(190, 190, 190) }, +- { "LightGray", grgb(211, 211, 211) }, +- { "LightGrey", grgb(211, 211, 211) }, +- { "DarkGray", grgb(169, 169, 169) }, +- { "DarkGrey", grgb(169, 169, 169) }, +- { "Gray10", grgb(26, 26, 26) }, +- { "Grey10", grgb(26, 26, 26) }, +- { "Gray20", grgb(51, 51, 51) }, +- { "Grey20", grgb(51, 51, 51) }, +- { "Gray30", grgb(77, 77, 77) }, +- { "Grey30", grgb(77, 77, 77) }, +- { "Gray40", grgb(102, 102, 102) }, +- { "Grey40", grgb(102, 102, 102) }, +- { "Gray50", grgb(127, 127, 127) }, +- { "Grey50", grgb(127, 127, 127) }, +- { "Gray60", grgb(153, 153, 153) }, +- { "Grey60", grgb(153, 153, 153) }, +- { "Gray70", grgb(179, 179, 179) }, +- { "Grey70", grgb(179, 179, 179) }, +- { "Gray80", grgb(204, 204, 204) }, +- { "Grey80", grgb(204, 204, 204) }, +- { "Gray90", grgb(229, 229, 229) }, +- { "Grey90", grgb(229, 229, 229) }, +- +- { "Black", grgb(0, 0, 0) }, +- { "White", grgb(255, 255, 255) }, +- +- { "Orange", grgb(255, 165, 0) }, +- { "Purple", grgb(160, 32, 240) }, +- { "Violet", grgb(238, 130, 238) }, +- {NULL, 0} +- }; +- +- if (name[0] == '#') +- { +- char *end; +- int c; +- +- c = strtol(name + 1, &end, 16); +- return (guicolor_T) ((c >> 16) & 0xff) | (c & 0xff00) | ((c & 0xff) << 16); +- } +- +- for (i = 0; colours[i].name != NULL; i++) +- { +- if (STRICMP(name, colours[i].name) == 0) +- return colours[i].value; +- } +- if (strnicmp(name, "grey", 4) == 0 || strnicmp(name, "gray", 4) == 0) +- { +- int level = (255 * atoi(name + 4)) / 100; +- return (guicolor_T) grgb(level, level, level); +- } +- return INVALCOLOR; +- } +- +- /* +- * Set the current text colours. +- * If we are using fonts then set the antialiasing colours too. +- */ +- void +- gui_mch_set_colors(guicolor_T fg, guicolor_T bg) +- { +- zap_redraw_colours[0] = bg << 8; /* JK230798, register new background colour */ +- zap_redraw_colours[1] = fg << 8; /* JK230798, register new foreground colour */ +- zap_redraw_update_colours = TRUE; /* JK230798, need update of colour masks */ +- +- swi(ColourTrans_ReturnGCOL, fg << 8); +- gui.fg_colour = r0; +- swi(ColourTrans_ReturnGCOL, bg << 8); +- gui.bg_colour = r0; +- +- if (ro_current_font) +- swi(ColourTrans_SetFontColours, 0, bg << 8, fg << 8, 14); +- } +- +- void +- ro_draw_string(x, y, s, len, flags, clip) +- int x; /* Top-left coord to plot at (x incl, y excl) */ +- int y; /* (screen coords) */ +- char_u *s; /* String to plot */ +- int len; /* Length of string */ +- int flags; /* DRAW_TRANSP, DRAW_BOLD, DRAW_UNDERL */ +- int* clip; /* JK230798, added clip window */ +- { +- if (ro_current_font) +- { +- int fx; +- int flen = len; /* Preserve for underline */ +- +- /* Use the Font manager to paint the string. +- * Must do one char at a time to get monospacing. +- */ +- +- if (flags & DRAW_ITALIC && !gui.ital_font) +- flags |= DRAW_UNDERL; /* No italic - underline instead */ +- +- if ((flags & DRAW_TRANSP) == 0) +- { +- swi(ColourTrans_SetColour, gui.bg_colour, 0, 0, 0, 0); +- swi(OS_Plot, 4, x, y - gui.char_height); +- swi(OS_Plot, 96 + 5, x + len * gui.char_width - 1, y - 1); +- } +- +- fx = x + font_x_offset; +- while (flen--) +- { +- swi(Font_Paint, 0, s++, 0x90, fx, y + font_y_offset, 0, 0, 1); +- fx += gui.char_width; +- } +- } +- else +- { +- if (zap_redraw) +- { +- /* Using fast Zap redraw. */ +- flags = ro_zap_redraw_draw_string(x, y, s, len, flags, clip); +- } +- else +- { +- /* Using the system font */ +- if (flags & DRAW_ITALIC) +- flags |= DRAW_UNDERL; +- +- if ((flags & DRAW_TRANSP) == 0) +- { +- swi(ColourTrans_SetColour, gui.bg_colour, 0, 0, 0, 0); +- swi(OS_Plot, 4, x, y - gui.char_height); +- swi(OS_Plot, 96 + 5, x + len * gui.char_width - 1, y - 1); +- } +- swi(OS_Plot, 4, /* Move the drawing cursor */ +- x, +- y - 1); +- swi(ColourTrans_SetColour, gui.fg_colour, 0, 0, 0, 0); +- swi(OS_WriteN, s, len); +- +- if (flags & DRAW_BOLD) +- { +- swi(OS_Plot, 4, x + (1 << x_eigen_factor), y - 1); +- swi(OS_WriteN, s, len); +- } +- } +- } +- +- if (flags & DRAW_UNDERL) +- { +- if (ro_current_font || zap_redraw) +- swi(ColourTrans_SetColour, gui.fg_colour, 0, 0, 0, 0); +- /* Underlined is the same with all plotting methods */ +- swi(OS_Plot, 4, x, y - gui.char_height); +- swi(OS_Plot, 1, gui.char_width * len, 0); +- } +- } +- +- void +- gui_mch_draw_string(int row, int col, char_u *s, int len, int flags) +- { +- int x, y; /* Workarea x,y */ +- x = col * gui.char_width; +- y = -row * gui.char_height; +- +- if (redraw_block) +- { +- ro_draw_string(x + redraw_block[1], y + redraw_block[4], +- s, len, flags, &redraw_block[7]); /* JK230798, added clip window */ +- } +- else +- { +- int block[44]; +- block[0] = gui.window_handle; +- block[1] = x; +- block[2] = y - gui.char_height; +- block[3] = (col + len) * gui.char_width; +- block[4] = y; +- swi(Wimp_UpdateWindow, 0, block); +- while (r0) +- { +- ro_draw_string(x + block[1], y + block[4], +- s, len, flags, &block[7]); /* JK230798, added clip window */ +- swi(Wimp_GetRectangle, 0, block); +- } +- } +- } +- +- /* +- * Return OK if the key with the termcap name "name" is supported. +- */ +- int +- gui_mch_haskey(char_u *name) +- { +- return FAIL; +- } +- +- void +- gui_mch_beep(void) +- { +- swi(OS_WriteI + 7); +- } +- +- /* +- * Visual bell. +- */ +- void +- gui_mch_flash(int msec) +- { +- /* TODO */ +- } +- +- +- /* +- * Plot a solid rectangle using the given plot action and colour. +- * Coordinates are inclusive and window-relative. +- */ +- void +- plot_rectangle(plot, colour, minx, miny, maxx, maxy) +- int plot; /* OS_Plot action */ +- int colour; +- int minx; +- int miny; +- int maxx; +- int maxy; +- { +- if (redraw_block) +- { +- swi(ColourTrans_SetColour, colour, 0, 0, 0, 0); +- swi(OS_Plot, 4, minx + redraw_block[1], miny + redraw_block[4]); +- swi(OS_Plot, plot, maxx + redraw_block[1], maxy + redraw_block[4]); +- } +- else +- { +- int block[44]; +- block[0] = gui.window_handle; +- block[1] = minx; +- block[2] = miny; +- block[3] = maxx + 1; +- block[4] = maxy + 1; +- swi(Wimp_UpdateWindow, 0, block); +- while (r0) +- { +- swi(ColourTrans_SetColour, colour, 0, 0, 0, 0); +- swi(OS_Plot, 4, minx + block[1], miny + block[4]); +- swi(OS_Plot, plot, maxx + block[1], maxy + block[4]); +- swi(Wimp_GetRectangle, 0, block); +- } +- } +- } +- +- /* +- * Invert a rectangle from row r, column c, for nr rows and nc columns. +- */ +- void +- gui_mch_invert_rectangle(int r, int c, int nr, int nc) +- { +- plot_rectangle(96 + 6, 0, FILL_X(c), -FILL_Y(r + nr), FILL_X(c + nc), -FILL_Y(r)); +- } +- +- /* +- * Iconify the GUI window. +- */ +- void +- gui_mch_iconify(void) +- { +- } +- +- #if defined(FEAT_EVAL) || defined(PROTO) +- /* +- * Bring the Vim window to the foreground. +- */ +- void +- gui_mch_set_foreground() +- { +- /* TODO */ +- } +- #endif +- +- /* Draw a hollow rectangle relative to the current +- * graphics cursor position, with the given width +- * and height. Start position is top-left. +- */ +- void +- draw_hollow(w, h) +- int w; +- int h; +- { +- swi(OS_Plot, 1, w - 1, 0); +- swi(OS_Plot, 1, 0, 1 - h); +- swi(OS_Plot, 1, 1 - w, 0); +- swi(OS_Plot, 1, 0, h - 1); +- } +- +- /* +- * Draw a cursor without focus. +- */ +- void +- gui_mch_draw_hollow_cursor(guicolor_T colour) +- { +- int x = FILL_X(gui.cursor_col); /* Window relative, top-left */ +- int y = -FILL_Y(gui.cursor_row); +- if (redraw_block == NULL) +- { +- int block[11]; +- +- block[0] = gui.window_handle; +- block[1] = x; +- block[2] = y - gui.char_height; +- block[3] = x + gui.char_width; +- block[4] = y; +- swi(Wimp_UpdateWindow, 0, block); +- while (r0) +- { +- swi(ColourTrans_SetGCOL, colour << 8, 0, 0, 0, 0); +- +- swi(OS_Plot, 4, x + block[1], y + block[4] - 1); +- draw_hollow(gui.char_width, gui.char_height); +- +- swi(Wimp_GetRectangle, 0, block); +- } +- } +- else +- { +- swi(ColourTrans_SetGCOL, colour << 8, 0, 0, 0, 0); +- +- swi(OS_Plot, 4, x + redraw_block[1], y + redraw_block[4] - 1); +- draw_hollow(gui.char_width, gui.char_height); +- } +- } +- +- /* +- * Draw part of a cursor, "w" pixels wide, and "h" pixels high, using +- * color "color". +- */ +- void +- gui_mch_draw_part_cursor(w, h, colour) +- int w; +- int h; +- guicolor_T colour; +- { +- int x = FILL_X(gui.cursor_col); +- int y = -FILL_Y(gui.cursor_row); +- swi(ColourTrans_ReturnGCOL, colour << 8); +- plot_rectangle(96 + 5, r0, x, y - h, x + w - 1, y - 1); +- } +- +- /* +- * Catch up with any queued events. This may put keyboard input into the +- * input buffer, call resize call-backs, trigger timers etc. +- * If there is nothing in the event queue(& no timers pending), then we return +- * immediately (well, after a Wimp_Poll). +- */ +- void +- gui_mch_update(void) +- { +- int block[64]; +- int reason; +- +- swi(OS_ReadMonotonicTime); +- if ((r0 - time_of_last_poll) < 50) +- return; /* Don't return too often */ +- +- reason = wimp_poll(0, block); +- if (reason) +- process_event(reason, block); +- ro_return_early = FALSE; /* We're returning anyway. */ +- } +- +- void +- redraw_window(block) +- int *block; +- { +- int x, y; /* Vim workarea coords */ +- int width, height; +- int blank_col; +- +- swi(ColourTrans_ReturnGCOL, UNUSED_COLOUR << 8, 0, 0, 1<<7, 0); +- blank_col = r0; +- +- swi(Wimp_RedrawWindow, 0, block); +- redraw_block = block; +- while (r0) +- { +- x = block[7] - block[1]; +- y = block[4] - block[10]; +- width = block[9] - block[7]; +- height = block[10] - block[8]; +- +- if (height + y > Rows * gui.char_height) +- { +- /* Blank everything off the bottom. */ +- plot_rectangle(96 + 5, blank_col, +- 0, block[8] - block[4], +- block[9] - block[1], -FILL_Y(Rows) - 1); +- height = Rows * gui.char_height; +- } +- if (width + x> Columns * gui.char_width) +- { +- /* Blank everything off to the right. */ +- plot_rectangle(96 + 5, blank_col, +- FILL_X(Columns), block[8] - block[4], +- block[9] - block[1], 0); +- width = Columns * gui.char_width; +- } +- gui_redraw(x , y, width, height); +- swi(Wimp_GetRectangle, 0, block); +- } +- redraw_block = NULL; +- } +- +- /* Check if we have modified data. +- * If we do then ack the message to stop the shutdown. +- * Otherwise, ignore the message. +- */ +- void +- ro_prequit(block) +- int *block; +- { +- if (!ro_ok_to_quit()) +- { +- /* Not OK to quit - stop shutdown */ +- block[3] = block[2]; +- swi(Wimp_SendMessage, 19, block, block[1]); +- } +- /* Do nothing. We may get a Message_Quit later. */ +- } +- +- /* If there is unsaved data then ask the user if they mind losing it. +- * Return TRUE if we can quit without saving, FALSE to halt the +- * shutdown. +- */ +- int +- ro_ok_to_quit() +- { +- int old_confirm = cmdmod.confirm; +- +- cmdmod.confirm = FALSE; /* Use our own, single tasking, box */ +- +- if (check_changed_any(FALSE)) +- { +- swi(Wimp_ReportError, +- "\0\0\0\0Vim contains unsaved data - quit anyway?", +- 0x17, +- "Vim"); +- cmdmod.confirm = old_confirm; +- if (r1 != 1) +- return FALSE; +- } +- cmdmod.confirm = old_confirm; +- return TRUE; +- } +- +- /* Quit without checking for unsaved data. */ +- void +- ro_quit() +- { +- exiting = TRUE; +- getout(0); +- +- exiting = FALSE; /* probably can't get here */ +- setcursor(); /* position cursor */ +- out_flush(); +- } +- +- /* Insent the given vim special code into the input buffer */ +- void +- ro_press(a, b, modifier) +- char a; +- char b; +- int modifier; /* % 0000 0000 */ +- { +- char_u buf[6]; +- int vim_mod; +- int key; +- +- +- /* Convert RISC OS modifier to Vim modifier. */ +- vim_mod = ((modifier & 0x10) ? MOD_MASK_SHIFT : 0) +- | ((modifier & 0x20) ? MOD_MASK_CTRL : 0); +- key = simplify_key(TERMCAP2KEY(a, b), &vim_mod); +- +- buf[3] = CSI; +- buf[4] = KEY2TERMCAP0(key); +- buf[5] = KEY2TERMCAP1(key); +- if (vim_mod) +- { +- buf[0] = CSI; +- buf[1] = KS_MODIFIER; +- buf[2] = vim_mod; +- add_to_input_buf(buf, 6); +- } +- else +- add_to_input_buf(buf + 3, 3); +- } +- +- /* Take a wimp key code and insert the vim equivalent +- * into vim's input buffer. +- * CTRL-C also sets got_int. +- */ +- void +- ro_insert_key(code) +- char_u *code; /* Wimp_ProcessKey code (4 bytes) */ +- { +- char a = code[0]; +- char b = code[1]; +- int base, modifier; +- +- if (a == 3 && ctrl_c_interrupts) +- got_int = TRUE; +- +- /* Is it a normal key? */ +- if (a > 31 && a < 127) +- { +- add_to_input_buf(code, 1); +- return; +- } +- +- /* We should pass any unrecognised keys on, but +- * for now just pass on F12 combinations. +- */ +- switch (b) +- { +- case 0: +- /* Home and Delete are the only special cases */ +- switch (a) +- { +- case 0x1e: +- ro_press('k','h', 0); /* Home */ +- return; +- case 0x7f: +- ro_press('k','D', 0); /* Delete */ +- return; +- case CSI: +- { +- /* Turn CSI into K_CSI. Untested! */ +- char_u string[3] = {CSI, KS_EXTRA, KE_CSI}; +- +- add_to_input_buf(string, 3); +- return; +- } +- default: +- add_to_input_buf(code, 1); +- return; +- } +- case 1: +- if ((a & 0xcf) == 0xcc) +- { +- /* F12 pressed - pass it on (quick hack) */ +- swi(Wimp_ProcessKey, a | 0x100); +- return; +- } +- base = a & 0xcf; +- modifier = a & 0x30; +- switch (base) +- { +- case 0x8a: /* Tab */ +- add_to_input_buf("\011", 1); +- return; +- case 0x8b: /* Copy (End) */ +- return ro_press('@', '7', modifier); +- case 0x8c: /* Left */ +- return ro_press('k', 'l', modifier); +- case 0x8d: /* Right */ +- return ro_press('k', 'r', modifier); +- case 0x8e: /* Down */ +- if (modifier & 0x10) +- return ro_press('k', 'N', modifier ^ 0x10); +- else +- return ro_press('k', 'd', modifier); +- case 0x8f: /* Up */ +- if (modifier & 0x10) +- return ro_press('k', 'P', modifier ^ 0x10); +- else +- return ro_press('k', 'u', modifier); +- case 0xca: /* F10 */ +- return ro_press('k', ';', modifier); +- case 0xcb: /* F11 */ +- return ro_press('F', '1', modifier); +- case 0xcd: /* Insert */ +- return ro_press('k', 'I', modifier); +- default: +- if (base > 0x80 && base < 0x18a) +- { +- /* One of the other function keys */ +- return ro_press('k', '0' + (base & 15), modifier); +- } +- } +- } +- } +- +- /* Process a mouse event. */ +- void +- ro_mouse(block) +- int *block; +- { +- int x, y, button, vim_button; +- int modifiers = 0; +- int min_x, min_y; /* Visible area of editor window */ +- int max_x, max_y; +- +- if (block[3] != gui.window_handle || ro_dragging) +- return; /* Not our window or ignoring clicks*/ +- +- x = block[0]; /* Click position - screen coords */ +- y = block[1]; +- button = block[2]; +- +- block[0] = gui.window_handle; +- swi(Wimp_GetWindowState, 0, block); +- min_x = block[1]; +- min_y = block[2]; +- max_x = block[3]; +- max_y = block[4]; +- +- if (block[3] - x < gui.scrollbar_width) +- { +- /* Click in that blank area under the scrollbars */ +- +- if (button & 0x444) +- { +- int front_block[64]; +- /* Dragging with Select - bring window to front first */ +- front_block[0] = gui.window_handle; +- swi(Wimp_GetWindowState, 0, front_block); +- front_block[7] = -1; +- ro_open_main(front_block); +- } +- +- block[0] = gui.window_handle; +- block[1] = 7; /* Drag point */ +- block[2] = block[4] = 0; /* Coords of point. */ +- block[3] = block[5] = 0; +- drag_x_offset = max_x - x; +- drag_y_offset = min_y - y; +- +- /* Parent box. */ +- block[6] = min_x + +- gui.scrollbar_width * 2 + +- MIN_COLUMNS * gui.char_width; +- block[7] = 0; +- gui_mch_get_screen_dimensions(&block[8], &block[9]); +- block[9] = max_y - +- 4 * gui.char_height - +- gui.scrollbar_height; +- +- swi(Wimp_DragBox, 0, block); +- ro_dragging = DRAG_RESIZE_WINDOW; +- drag_button = vim_button; +- drag_modifiers = modifiers; +- return; +- } +- +- if (button & 0x111) +- vim_button = MOUSE_RIGHT; +- else if (button & 0x222) +- vim_button = MOUSE_MIDDLE; +- else +- vim_button = MOUSE_LEFT; +- +- swi(OS_Byte, 121, 0x80); +- if (r1 == 0xff) +- modifiers |= MOUSE_SHIFT; +- swi(OS_Byte, 121, 0x81); +- if (r1 == 0xff) +- modifiers |= MOUSE_CTRL; +- swi(OS_Byte, 121, 0x82); +- if (r1 == 0xff) +- modifiers |= MOUSE_ALT; +- +- if (button == 2) +- { +- /* Menu click: +- * If shift was pressed then do the paste action. +- * If not, then open the pop-up menu. +- */ +- modifiers ^= MOUSE_SHIFT; +- if (modifiers && MOUSE_SHIFT) +- { +- vimmenu_T main; +- /* Shift was NOT pressed - show menu */ +- main.dname = (char_u *) "Vim"; +- main.children = root_menu; +- gui_mch_show_popupmenu(&main); +- return; +- } +- } +- +- /* Gain the input focus */ +- swi(Wimp_SetCaretPosition, gui.window_handle, -1, 0, 0, -1, -1); +- +- if (button & 0xf0) +- { +- /* Drag operation: +- * +- * Tell the Wimp to start a drag. +- * Monitor null events. +- */ +- block[1] = 7; /* Drag a point. */ +- block[2] = block[4] = x; /* Coords of point. */ +- block[3] = block[5] = y; +- block[6] = 0; /* Coords of bounding box. */ +- block[7] = 0; +- gui_mch_get_screen_dimensions(&block[8], &block[9]); +- +- drag_x_offset = drag_y_offset = 0; +- +- swi(Wimp_DragBox, 0, block); +- ro_dragging = DRAG_SELECTION; +- drag_button = vim_button; +- drag_modifiers = modifiers; +- +- vim_button |= MOUSE_DRAG; +- } +- +- gui_send_mouse_event( +- vim_button, +- x - min_x, +- max_y - y, +- button & 0xf ? TRUE : FALSE, /* dclick */ +- modifiers); +- } +- +- void +- ro_continue_drag(block) +- int *block; /* Just used as scrap. */ +- { +- int x, y; +- +- /* Get screen coords of pointer. */ +- swi(Wimp_GetPointerInfo, 0, block); +- x = block[0] + drag_x_offset; +- y = block[1] + drag_y_offset; +- +- block[0] = gui.window_handle; +- swi(Wimp_GetWindowState, 0, block); +- +- if (ro_dragging == DRAG_RESIZE_WINDOW) +- { +- /* Resizing the main window. */ +- block[2] = y; +- block[3] = x; +- ro_open_main(block); +- } +- else +- { +- /* Selecting some text. */ +- gui_send_mouse_event( +- drag_button | MOUSE_DRAG, /* Always report the same button */ +- x - block[1], +- block[4] - y, +- FALSE, /* Not a double click. */ +- drag_modifiers); +- } +- } +- +- /* User has released all mouse buttons, marking the end of a drag. */ +- void +- ro_drag_finished(block) +- int *block; +- { +- int x; +- int y; +- int width, height; +- +- /* I don't trust the box returned by Wimp_Poll; look at the pointer +- * ourselves. +- */ +- swi(Wimp_GetPointerInfo, 0, block); +- x = block[0] + drag_x_offset; +- y = block[1] + drag_y_offset; +- +- if (ro_dragging == DRAG_RESIZE_WINDOW) +- { +- block[0] = gui.window_handle; +- swi(Wimp_GetWindowState, 0, block); +- block[2] = y; +- block[3] = x; +- ro_open_main(block); +- +- width = (block[3] - block[1]); +- height = (block[4] - block[2]); +- +- swi(Wimp_ForceRedraw, gui.window_handle, 0, -height, width, 0); +- gui_resize_shell(width, height); +- } +- else +- { +- block[0] = gui.window_handle; +- swi(Wimp_GetWindowState, 0, block); +- gui_send_mouse_event( +- MOUSE_RELEASE, +- x - block[1], +- block[4] - y, +- FALSE, /* not a double click */ +- drag_modifiers); +- } +- ro_dragging = DRAG_FALSE; +- } +- +- /* Load the file/pathname given in block into a [new] buffer. +- * +- * Modifier Action +- * +- * None :confirm e +- * Ctrl :sp +- * Shift +- * +- * Insert into typebuf, at the start. +- * If loading from !Scrap then use saved leafname instead, and +- * delete the scrap file. Also, ignore shift key. +- * +- * NB: Doesn't send DataLoadAck (other app might delete temp file?). +- */ +- void +- ro_dataload(block) +- int *block; +- { +- char_u new_path[MAXPATHL]; +- char_u *path = ((char_u *) block) + 44; +- int scrap = FALSE; +- +- if (block[3] == leaf_ref && leaf_name) +- scrap = TRUE; +- +- switch (get_real_state() & 0xff) +- { +- case INSERT: +- case CMDLINE: +- case CMDLINE+LANGMAP: +- /* For insert mode we can only insert the pathname (currently) +- * Make sure Shift is pressed. +- */ +- swi(OS_Byte, 121, 0x80); /* Is Shift pressed? */ +- if (r1 == 0xff) +- { +- ins_typebuf(" ", REMAP_NONE, 0, TRUE, FALSE); +- ins_typebuf(path, REMAP_NONE, 0, TRUE, FALSE); +- ro_return_early = TRUE; /* Return even though nothing was typed. */ +- } +- else +- swi(Wimp_ReportError, +- "\0\0\0\0Sorry, you can only load text in normal mode", 5, "Vim"); +- break; +- +- case NORMAL: +- ro_return_early = TRUE; /* Return even though nothing was typed. */ +- +- if (scrap) /* Remove . Later. */ +- ins_typebuf(":!~remove \r", REMAP_NONE, 0, TRUE, FALSE); +- +- /* Insert {:sp ,:confirm e }[+f\ ] */ +- ins_typebuf("\r", REMAP_NONE, 0, TRUE, FALSE); +- ins_typebuf(path, REMAP_NONE, 0, TRUE, FALSE); +- ins_typebuf(" ", REMAP_NONE, 0, TRUE, FALSE); +- +- if (scrap) +- { +- /* Loading via !Scrap - change pathname to stored leafname */ +- ins_typebuf(leaf_name, REMAP_NONE, 0, TRUE, FALSE); +- ins_typebuf(" +f\\ ", REMAP_NONE, 0, TRUE, FALSE); +- leaf_ref = 0; +- vim_free(leaf_name); +- leaf_name = NULL; +- } +- +- swi(OS_Byte, 121, 0x81); /* Is Ctrl pressed? */ +- if (r1 == 0xff) +- /* Yes, split window */ +- ins_typebuf(":sp", REMAP_NONE, 0, TRUE, FALSE); +- else +- ins_typebuf(":confirm e", REMAP_NONE, 0, TRUE, FALSE); +- break; +- +- default: +- swi(Wimp_ReportError, "\0\0\0\0You can only load text in normal mode.", 5, "Vim"); +- } +- /* Send DataSaveAck so other program doesn't think we died +- * and delete . +- */ +- block[3] = block[2]; +- block[4] = 4; +- swi(Wimp_SendMessage, 17, block, block[1]); +- } +- +- void +- ro_datasave(block) +- int *block; +- { +- char_u *path = ((char_u *) block) + 44; +- +- /* Preserve the name given so we can use it, not */ +- if (leaf_name) +- vim_free(leaf_name); +- leaf_name = vim_strsave(path); +- +- block[9] = -1; /* File is unsafe. */ +- strcpy(path, ""); +- block[0] = 60; +- block[3] = block[2]; +- block[4] = 2; +- swi(Wimp_SendMessage, 17, block, block[1]); +- +- leaf_ref = block[2]; +- } +- +- void +- ro_message(block) +- int *block; +- { +- char_u *buffer; +- long_u len; +- +- if (block[1] == task_handle) +- return; /* Don't talk to ourself! */ +- switch (block[4]) +- { +- case 0: /* Quit. */ +- if (block[4] == 0) +- ro_quit(); +- break; +- case 1: /* DataSave */ +- ro_datasave(block); +- break; +- case 2: /* DataSaveAck. */ +- if (clip_convert_selection(&buffer, &len, &clip_star) == -1) +- return; +- +- /* Save the clipboard contents to a file. */ +- swi(OS_File, 10, ((char_u *) block) + 44, 0xfff, 0, buffer, buffer + len); +- +- /* Ack with DataLoad message. */ +- block[3] = block[2]; +- block[4] = 3; +- block[9] = len; +- swi(Wimp_SendMessage, 17, block, block[1]); +- +- vim_free(buffer); +- break; +- case 3: /* DataLoad */ +- ro_dataload(block); +- break; +- case 8: /* PreQuit */ +- ro_prequit(block); +- break; +- case 0xf: /* Lose clipboard. */ +- if (block[5] & 4) +- { +- clip_free_selection(&clip_star); +- clip_star.owned = FALSE; +- } +- break; +- case 0x10: /* DataRequest (clip_star) */ +- if (clip_star.owned) +- { +- int rows; +- +- /* Tell other program that we have the clipboard. */ +- block[0] = 52; +- block[3] = block[2]; /* Copy myref to yourref. */ +- block[4] = 1; /* DataSave message. */ +- /* Create an estimate for the size (larger or same as true +- * value) */ +- rows = clip_star.end.lnum - clip_star.start.lnum; +- if (rows < 0) +- rows = -rows; +- block[9] = (rows + 1) * Columns + 1; /* Add one for possible +- final newline. */ +- block[10] = 0xfff; /* Clipboard is text. */ +- strcpy( ((char_u *) block) + 44, "VimClip"); +- swi(Wimp_SendMessage, 17, block, block[1]); +- } +- break; +- case 0x400c1: /* Mode change */ +- changed_mode = TRUE; /* Flag - update on next OpenWindow */ +- if (zap_redraw) +- { +- /* JK230798, re-initialise ZapRedraw stuff */ +- if (ro_zap_redraw_initialise() == FAIL) +- zap_redraw = FALSE; +- } +- break; +- case 0x400c3: /* TaskCloseDown */ +- if (block[1] == child_handle) +- child_handle = 0; +- break; +- } +- } +- +- /* +- * Converts a scrollbar's window handle into a scrollbar pointer. +- * NULL on failure. +- */ +- scrollbar_T * +- ro_find_sbar(id) +- int id; +- { +- win_T *wp; +- +- if (gui.bottom_sbar.id == id) +- return &gui.bottom_sbar; +- FOR_ALL_WINDOWS(wp) +- { +- if (wp->w_scrollbars[SBAR_LEFT].id == id) +- return &wp->w_scrollbars[SBAR_LEFT]; +- if (wp->w_scrollbars[SBAR_RIGHT].id == id) +- return &wp->w_scrollbars[SBAR_RIGHT]; +- } +- return NULL; +- } +- +- void +- scroll_to(line, sb) +- int sb; /* Scrollbar number */ +- int line; +- { +- char_u code[8]; +- +- /* Don't put events in the input queue now. */ +- if (hold_gui_events) +- return; +- +- /* Send a scroll event: +- * +- * A scrollbar event is CSI (NOT K_SPECIAL), KS_VER_SCROLLBAR, +- * KE_FILLER followed by: +- * one byte representing the scrollbar number, and then four bytes +- * representing a long_u which is the new value of the scrollbar. +- */ +- code[0] = CSI; +- code[1] = KS_VER_SCROLLBAR; +- code[2] = KE_FILLER; +- code[3] = sb; +- code[4] = line >> 24; +- code[5] = line >> 16; +- code[6] = line >> 8; +- code[7] = line; +- add_to_input_buf(code, 8); +- } +- +- void +- h_scroll_to(col) +- int col; +- { +- char_u code[8]; +- +- /* Don't put events in the input queue now. */ +- if (hold_gui_events) +- return; +- +- /* Send a scroll event: +- * +- * A scrollbar event is CSI (NOT K_SPECIAL) +- * +- * A horizontal scrollbar event is K_SPECIAL, KS_HOR_SCROLLBAR, +- * KE_FILLER followed by four bytes representing a long_u which is the +- * new value of the scrollbar. +- */ +- code[0] = CSI; +- code[1] = KS_HOR_SCROLLBAR; +- code[2] = KE_FILLER; +- code[4] = col >> 24; +- code[5] = col >> 16; +- code[6] = col >> 8; +- code[7] = col; +- add_to_input_buf(code, 8); +- } +- +- void +- ro_scroll(block) +- int *block; +- { +- scrollbar_T *sb; +- int offset; +- win_T *wp; +- +- /* Block is ready for Wimp_OpenWindow, and also contains: +- * +- * +32 = scroll X direction (-2 .. +2) +- * +36 = scroll Y direction (-2 .. +2) +- */ +- +- sb = ro_find_sbar(block[0]); +- if (!sb) +- return; /* Window not found (error). */ +- +- wp = sb-> wp; +- +- if (wp == NULL) +- { +- /* Horizontal bar. */ +- offset = block[8]; +- if (offset == -2) +- offset = (block[1] - block[3]) / gui.char_width; +- else if (offset == 2) +- offset = (block[3] - block[1]) / gui.char_width; +- +- block[5] += offset * gui.char_width; +- +- gui_drag_scrollbar(sb, block[5] / gui.char_width, FALSE); +- +- swi(Wimp_OpenWindow, 0, block); +- } +- else +- { +- offset = -block[9]; +- if (offset == -2) +- offset = -(wp -> w_height - 1); +- else if (offset == 2) +- offset = wp -> w_height - 1; +- +- /* Possibly we should reposition the scrollbar? +- * Vim seems to update the bar anyway... +- */ +- gui_drag_scrollbar(sb, offset - (block[6] / gui.char_height), FALSE); +- } +- } +- +- /* Move a window by a given offset. Used to simulate the function of the +- * nested wimp. +- */ +- void +- ro_move_child(window, x, y, pos_wanted, pos_got) +- int window; +- int x,y; /* offset to move by */ +- int pos_wanted, pos_got; +- { +- int block[10]; +- +- block[0] = window; +- swi(Wimp_GetWindowState, 0, block); +- block[1] += x; +- block[2] += y; +- block[3] += x; +- block[4] += y; +- if (pos_wanted == -1) +- block[7] = -1; +- else if (pos_wanted == -2) +- block[7] = pos_got; +- swi(Wimp_OpenWindow, 0, block); +- } +- +- /* Open the main window. Also updates scrollbars if we are not +- * using the nested Wimp. +- * If we have just changed mode then re-read all values. +- */ +- void +- ro_open_main(block) +- int *block; +- { +- int toggle_size; +- +- /* Find out if the user clicked on the toggle size icon. */ +- block[20] = block[0]; +- swi(Wimp_GetWindowState, 0, block + 20); +- toggle_size = block[28] & (1 << 19); +- +- if (nested_wimp) +- { +- swi(Wimp_OpenWindow, 0, block); +- } +- else +- { +- int old[10]; +- int x_offset, y_offset; /* Move children same as parent. */ +- int pos_wanted, pos_got; +- int left_bar = gui.which_scrollbars[SBAR_LEFT]; +- int right_bar = gui.which_scrollbars[SBAR_RIGHT]; +- win_T *wp; +- +- /* Three cases to think about: +- * 1) Move to top. Open each window at the top. +- * 2) Same stack position. Open each with same position. +- * 3) Open at bottom. Open children with parent's new position. +- */ +- +- old[0] = block[0]; +- swi(Wimp_GetWindowState, 0, old); +- pos_wanted = block[7]; +- swi(Wimp_OpenWindow, 0, block); +- /* Block updated by OpenWindow? I don't think so! */ +- swi(Wimp_GetWindowState, 0, block); +- pos_got = block[7]; +- +- x_offset = block[1] - old[1]; +- y_offset = block[4] - old[4]; +- if (x_offset || y_offset || pos_wanted == -1 || pos_wanted == -2) +- { +- /* If parent has moved, re-open all the child windows. */ +- FOR_ALL_WINDOWS(wp) +- { +- /* Reopen scrollbars for this window. */ +- if (left_bar) +- ro_move_child(wp -> w_scrollbars[SBAR_LEFT].id, +- x_offset, y_offset, +- pos_wanted, pos_got); +- if (right_bar) +- ro_move_child(wp -> w_scrollbars[SBAR_RIGHT].id, +- x_offset, y_offset, +- pos_wanted, pos_got); +- } +- } +- } +- if (changed_mode || toggle_size) +- { +- int width, height; +- +- if (changed_mode) +- ro_measure_tools(); +- block[0] = gui.window_handle; +- swi(Wimp_GetWindowState, 0, block); +- +- width = block[3] - block[1]; +- height = block[4] - block[2]; +- swi(Wimp_ForceRedraw, gui.window_handle, 0, -height, width, 0); +- gui_resize_shell(width, height); +- changed_mode = FALSE; +- } +- } +- +- void +- ro_open_window(block) +- int *block; +- { +- int pos; +- scrollbar_T *sb; +- +- if (block[0] == gui.window_handle) +- ro_open_main(block); +- else +- { +- swi(Wimp_OpenWindow, 0, block); +- if (block[0] != gui.window_handle) +- { +- sb = ro_find_sbar(block[0]); +- if (sb) +- { +- if (sb-> wp != NULL) +- gui_drag_scrollbar(sb, -block[6] / gui.char_height, FALSE); +- else +- gui_drag_scrollbar(sb, block[5] / gui.char_width, FALSE); +- } +- } +- } +- } +- +- void +- ro_menu_selection(block) +- int *block; +- { +- int *item = wimp_menu + 7; +- vimmenu_T *menu; +- /* wimp_menu points to a wimp menu structure */ +- +- for (;;) +- { +- while (block[0]--) +- item += 6; +- if (block[1] == -1) +- break; +- item = ((int *) item[1]) + 7; +- block++; +- } +- /* item points to the wimp menu item structure chosen */ +- menu = (vimmenu_T *) item[5]; +- +- swi(Wimp_GetPointerInfo, 0, block); +- if (block[2] == 1) +- /* Adjust used - keep menu open */ +- swi(Wimp_CreateMenu, 0, wimp_menu); +- +- if (menu-> cb) +- menu-> cb(menu); +- } +- +- void +- ro_open_parent() +- { +- int head; +- char_u *i = curbuf-> b_ffname; +- char_u buffer[256]; +- +- head = 0; +- for (; *i; i++) +- { +- if (*i == '.') +- head = i - curbuf-> b_ffname; +- } +- +- /* Append head chars to buffer */ +- if (head < 240 && curbuf-> b_ffname && head) +- { +- strcpy(buffer, "%filer_opendir "); +- strncpy(buffer + 15, curbuf-> b_ffname, head); +- buffer[15 + head] = '\0'; +- swi(OS_CLI, buffer); +- } +- } +- +- void +- process_event(event, block) +- int event; +- int *block; +- { +- switch (event) +- { +- case 0: /* Nothing - update drag state. */ +- if (ro_dragging) +- ro_continue_drag(block); +- break; +- case 1: /* Redraw window. */ +- redraw_window(block); +- break; +- case 2: /* Open window. */ +- ro_open_window(block); +- break; +- case 3: /* Close window. */ +- swi(Wimp_GetPointerInfo, 0, block + 1); +- if (block[3] == 1) +- ro_open_parent(); +- else +- if (ro_ok_to_quit()) +- ro_quit(); +- break; +- case 6: /* Mouse click. */ +- ro_mouse(block); +- break; +- case 7: /* Finished drag. */ +- ro_drag_finished(block); +- break; +- case 8: /* Key pressed. */ +- ro_insert_key((char_u *) &block[6]); +- break; +- case 9: +- ro_menu_selection(block); +- break; +- case 10: /* Scroll request. */ +- ro_scroll(block); +- break; +- case 11: /* Lose caret. */ +- if (block[0] == gui.window_handle) +- gui_focus_change(FALSE); +- break; +- case 12: /* Gain caret. */ +- if (block[0] == gui.window_handle) +- gui_focus_change(TRUE); +- break; +- case 17: /* User message. */ +- case 18: /* User message recorded. */ +- ro_message(block); +- break; +- } +- } +- +- /* +- * GUI input routine called by gui_wait_for_chars(). Waits for a character +- * from the keyboard. +- * wtime == -1 Wait forever. +- * wtime == 0 This should never happen. +- * wtime > 0 Wait wtime milliseconds for a character. +- * Returns OK if a character was found to be available within the given time, +- * or FAIL otherwise. +- */ +- int +- gui_mch_wait_for_chars(long wtime) +- { +- int block[64]; +- int reason; +- int start_time = -1; +- int ctime = wtime / 10; /* delay in cs */ +- +- if (wtime != -1) +- { +- swi(OS_ReadMonotonicTime); +- start_time = r0; +- } +- +- for (;;) +- { +- if (ro_dragging) +- reason = wimp_poll(0, block); /* Always return immediately */ +- else if (wtime == -1) +- reason = wimp_poll(1, block); +- else +- reason = wimp_pollidle(0, block, start_time + ctime); +- +- process_event(reason, block); +- +- if (input_available() || ro_return_early) +- { +- ro_return_early = FALSE; +- return OK; /* There is something to process (key / menu event) */ +- } +- +- if (wtime != -1) +- { +- swi(OS_ReadMonotonicTime); +- if (r0 - start_time > ctime) +- return FAIL; /* We've been waiting too long - return failure */ +- } +- } +- } +- +- /* Flush any output to the screen */ +- void +- gui_mch_flush(void) +- { +- } +- +- /* +- * Clear a rectangular region of the screen from text pos(row1, col1) to +- * (row2, col2) inclusive. +- */ +- void +- gui_mch_clear_block(int row1, int col1, int row2, int col2) +- { +- swi(ColourTrans_ReturnGCOL, gui.back_pixel << 8, 0, 0, 1<<7, 0); +- plot_rectangle(96 + 5, r0, +- FILL_X(col1), -FILL_Y(row2 + 1), +- FILL_X(col2 + 1), -FILL_Y(row1)); +- } +- +- void +- gui_mch_clear_all(void) +- { +- if (redraw_block) +- { +- swi(ColourTrans_SetGCOL, gui.back_pixel << 8, 0, 0, 1<<7, 0); +- swi(OS_WriteI + 16); +- } +- else +- { +- int block[44]; +- block[0] = gui.window_handle; +- block[1] = 0; +- block[2] = -gui.num_rows * gui.char_height; +- block[3] = gui.num_cols * gui.char_width; +- block[4] = 0; +- swi(Wimp_UpdateWindow, 0, block); +- while (r0) +- { +- swi(ColourTrans_SetGCOL, gui.back_pixel << 8, 0, 0, 1<<7, 0); +- swi(OS_WriteI + 16); +- swi(Wimp_GetRectangle, 0, block); +- } +- } +- } +- +- /* +- * Delete the given number of lines from the given row, scrolling up any +- * text further down within the scroll region. +- */ +- void +- gui_mch_delete_lines(int row, int num_lines) +- { +- int top_from = -row - num_lines; +- int bot_from = -gui.scroll_region_bot - 1; +- int bot_to = bot_from + num_lines; +- +- swi(ColourTrans_SetGCOL, gui.back_pixel << 8, 0, 0, 0x80, 0); +- +- /* Changed without checking! */ +- swi(Wimp_BlockCopy, gui.window_handle, +- gui.scroll_region_left * gui.char_width, +- bot_from * gui.char_height, +- (gui.scroll_region_right - gui.scroll_region_left +- + 1) * gui.char_width, +- top_from * gui.char_height, +- +- gui.scroll_region_left * gui.char_width, +- bot_to * gui.char_height); +- +- gui_clear_block(gui.scroll_region_bot - num_lines + 1, +- gui.scroll_region_left, +- gui.scroll_region_bot, gui.scroll_region_right); +- } +- +- /* +- * Insert the given number of lines before the given row, scrolling down any +- * following text within the scroll region. +- */ +- void +- gui_mch_insert_lines(int row, int num_lines) +- { +- int top_from = -row; +- int bot_to = -gui.scroll_region_bot - 1; +- int bot_from = bot_to + num_lines; +- +- swi(ColourTrans_SetGCOL, gui.back_pixel << 8, 0, 0, 0x80, 0); +- +- swi(Wimp_BlockCopy, gui.window_handle, +- gui.scroll_region_left * gui.char_width, +- bot_from * gui.char_height, +- (gui.scroll_region_right - gui.scroll_region_left +- + 1) * gui.char_width, +- top_from * gui.char_height, +- +- gui.scroll_region_left * gui.char_width, +- bot_to * gui.char_height); +- +- gui_clear_block(row, gui.scroll_region_left, +- row + num_lines - 1, gui.scroll_region_right); +- } +- +- /* Put selection in clipboard buffer. +- * Should we become the new owner? +- */ +- void +- clip_mch_request_selection(VimClipboard *cbd) +- { +- int block[64]; /* Will be used in Wimp_Poll. */ +- int reason; +- char_u *buffer; +- long_u length; +- +- block[0] = 48; /* Size of block. */ +- block[3] = 0; /* Original message. */ +- block[4] = 0x10; /* Data request. */ +- block[5] = gui.window_handle; +- block[6] = RO_LOAD_CLIPBOARD; /* Internal handle. */ +- block[7] = block[8] = 0; /* (x,y) not used. */ +- block[9] = 4; +- block[10] = 0xfff; /* We want text files if possible, I think. */ +- block[11] = -1; /* End of list. */ +- swi(Wimp_SendMessage, 17, block, 0); /* Broadcast request. */ +- +- /* OK, we've sent the request. Poll until we get a null poll (failure) or +- * we load the clipboard. +- * If we receive a DataSave event with icon handle = -2 then put it on the +- * clipboard. RISC OS should ensure that key events will not be delivered +- * until the clipboard operation completes (unless the owner starts idling +- * - we can't wait forever!). +- */ +- for (;;) +- { +- reason = wimp_poll(0, block); +- if (reason == 0) +- return; /* Failed to get clipboard. */ +- if ((reason == 17 || reason == 18) && +- block[4] == 1 && block[6] == RO_LOAD_CLIPBOARD) +- break; /* Got it - stop waiting. */ +- process_event(reason, block); +- if (ro_return_early) +- return; +- } +- /* Tell owner to save data in . */ +- block[0] = 60; +- block[3] = block[2]; /* Copy myref -> yourref */ +- block[4] = 2; /* DataSaveAck. */ +- block[9] = -1; /* Data is unsafe. */ +- strcpy( ((char_u *) block) + 44, ""); +- swi(Wimp_SendMessage, 17, block, block[1]); +- +- /* Wait again for reply. */ +- for (;;) +- { +- reason = wimp_poll(0, block); +- if (reason == 0) +- return; /* Other program has given up! */ +- if ((reason == 17 || reason == 18) && block[4] == 3 && block[6] == RO_LOAD_CLIPBOARD) +- break; /* Clipboard data saved to */ +- process_event(reason, block); +- if (ro_return_early) +- return; +- } +- +- /* contains clipboard - load it. */ +- if (xswi(OS_File, 17, "") & v_flag) +- return; /* Error! */ +- if (r0 != 1 && r0 != 3) +- return; +- length = r4; +- +- buffer = lalloc(length, TRUE); /* Claim memory (and report errors). */ +- if (buffer == NULL) +- return; +- +- if (xswi(OS_File, 16, "", buffer, 0) & v_flag) +- return; +- +- clip_yank_selection(MCHAR, buffer, length, cbd); +- +- vim_free(buffer); +- +- swi(OS_FSControl, 27, "", 0, 0); /* Delete temp file. */ +- +- block[4] = 4; /* Send DataLoadAck. */ +- block[3] = block[2]; /* Copy myref -> yourref. */ +- swi(Wimp_SendMessage, 17, block, block[1]); +- } +- +- /* Not sure what this means under RISC OS. */ +- void +- clip_mch_lose_selection(VimClipboard *cbd) +- { +- } +- +- /* Tell everyone that we now own the clipboard. +- * Return OK if our claim is accepted (always, under RISC OS) +- */ +- int +- clip_mch_own_selection(VimClipboard *cbd) +- { +- int block[6]; +- block[0] = 24; /* Length of block. */ +- block[3] = 0; /* Original message. */ +- block[4] = 0xf; /* ClaimEntity. */ +- block[5] = 0x4; /* Claim clipboard only. */ +- swi(Wimp_SendMessage, 17, block, 0); +- return OK; +- } +- +- /* +- * Send the current selection to the clipboard. Do nothing for X because we +- * will fill in the selection only when requested by another app. Sounds good +- * for RISC OS too. +- */ +- void +- clip_mch_set_selection(VimClipboard *cbd) +- { +- clip_get_selection(cbd); +- } +- +- /* +- * Make a menu either grey or not grey. +- */ +- void +- gui_mch_menu_grey(vimmenu_T *menu, int grey) +- { +- menu-> greyed_out = grey; +- } +- +- /* +- * Make menu item hidden or not hidden +- */ +- void +- gui_mch_menu_hidden(vimmenu_T *menu, int hidden) +- { +- menu-> hidden = hidden; +- } +- +- /* +- * This is called after setting all the menus to grey/hidden or not. +- */ +- void +- gui_mch_draw_menubar(void) +- { +- swi(Wimp_CreateMenu, 0, -1); +- if (wimp_menu != (int *) -1) +- { +- ro_remove_menu(wimp_menu); +- wimp_menu = (int *) -1; +- } +- } +- +- /* Add or remove a scrollbar. Note that this is only called when +- * the scrollbar state is changing. +- * The scroll bar window has already been created. +- * We can't do anything except remove the scroll bar +- * until we know what size to use. +- */ +- void +- gui_mch_enable_scrollbar(sb, flag) +- scrollbar_T *sb; +- int flag; +- { +- if (!flag) +- swi(Wimp_CloseWindow, 0, & (sb->id) ); +- return; +- } +- +- void +- gui_mch_set_blinking(long waittime, long on, long off) +- { +- } +- +- /* +- * Stop the cursor blinking. Show the cursor if it wasn't shown. +- */ +- void +- gui_mch_stop_blink(void) +- { +- } +- +- /* +- * Start the cursor blinking. If it was already blinking, this restarts the +- * waiting time and shows the cursor. +- */ +- void +- gui_mch_start_blink(void) +- { +- } +- +- /* +- * Return the RGB value of a pixel as a long. +- */ +- long_u +- gui_mch_get_rgb(guicolor_T pixel) +- { +- return (long_u)pixel; +- } +- +- void +- gui_mch_set_text_area_pos(int x, int y, int w, int h) +- { +- } +- +- void +- gui_mch_enable_menu(int flag) +- { +- } +- +- void +- gui_mch_set_menu_pos(int x, int y, int w, int h) +- { +- } +- +- void +- gui_mch_add_menu(vimmenu_T *menu, int idx) +- { +- } +- +- void +- gui_mch_add_menu_item(vimmenu_T *menu, int idx) +- { +- } +- +- void +- gui_mch_new_menu_colors(void) +- { +- } +- +- void +- gui_mch_destroy_menu(vimmenu_T *menu) +- { +- } +- +- /* Size of buffer has changed. +- * Add one to max since gui.c subtracts one more than it should! +- */ +- void +- gui_mch_set_scrollbar_thumb(sb, val, size, max) +- scrollbar_T *sb; +- long val; +- long size; +- long max; +- { +- int block[10], width, height; +- +- width = (max + 1) * gui.char_width; +- height = (max + 1 + W_STATUS_HEIGHT(sb->wp)) * gui.char_height; +- +- block[0] = block[3] = 0; +- block[1] = -height + (1 << y_eigen_factor); +- block[2] = width; +- +- swi(Wimp_SetExtent, sb -> id, block); +- +- block[0] = sb -> id; +- swi(Wimp_GetWindowState, 0, block); +- block[5] = val * gui.char_width; +- block[6] = -val * gui.char_height; +- swi(Wimp_OpenWindow, 0, block, 0x4b534154, +- gui.window_handle, /* Parent window handle. */ +- (CHILD_FIX_TO_RIGHT << CHILD_LEFT ) | +- (CHILD_FIX_TO_RIGHT << CHILD_RIGHT ) | +- (CHILD_FIX_TO_BOTTOM << CHILD_TOP ) | +- (CHILD_FIX_TO_BOTTOM << CHILD_BOTTOM) | +- (CHILD_SELF_SCROLL << CHILD_SCROLL_X) | +- (CHILD_SELF_SCROLL << CHILD_SCROLL_Y) +- ); +- } +- +- /* Set the position of the scrollbar within the editor +- * window. Note that, for vertical scrollbars, x and w +- * are ignored. For horizontal bars y and h are ignored. +- */ +- void +- gui_mch_set_scrollbar_pos(sb, x, y, w, h) +- scrollbar_T *sb; +- int x; /* Horizontal sb position */ +- int y; /* Top of scroll bar */ +- int w; /* Width */ +- int h; /* Height */ +- { +- int block[24]; +- int px1, py1; /* Parent window min coords */ +- int px2, py2; /* Parent window max coords */ +- +- /* Find where the parent window is. */ +- block[0] = gui.window_handle; +- swi(Wimp_GetWindowState, 0, block); +- px1 = block[1]; +- py1 = block[2]; +- px2 = block[3]; +- py2 = block[4]; +- +- block[0] = sb -> id; +- +- /* Find out how big the scroll window is at the moment. */ +- swi(Wimp_GetWindowInfo, 0, ((char_u *)block) + 1); +- +- if (block[13] < w || block[12] > -h) +- { +- /* Current window is too small! */ +- if (block[12] > -h) +- block[12] = -h; +- if (block[13] < w) +- block[13] = w; +- swi(Wimp_SetExtent, block[0], block + 11); +- } +- +- /* This works better on the nested_wimp. */ +- if (sb-> wp) +- { +- /* This is a vertical scrollbar. */ +- block[1] = block[3] = px2 - gui.scrollbar_width + (1 << x_eigen_factor); +- block[2] = 1 + py2 - (y + h) + (1 << y_eigen_factor); +- block[4] = 1 + py2 - y; +- } +- else +- { +- /* This is a horizontal scrollbar. */ +- block[2] = block[4] = py1 + gui.scrollbar_height; +- block[1] = px1; +- block[3] = px2 - gui.scrollbar_width; +- } +- +- block[5] = 0; +- block[6] = 0; +- block[7] = -1; +- +- swi(Wimp_OpenWindow, 0, block, 0x4b534154, +- gui.window_handle, /* Parent window handle. */ +- (CHILD_FIX_TO_RIGHT << CHILD_LEFT ) | +- (CHILD_FIX_TO_RIGHT << CHILD_RIGHT ) | +- (CHILD_FIX_TO_BOTTOM << CHILD_TOP ) | +- (CHILD_FIX_TO_BOTTOM << CHILD_BOTTOM) | +- (CHILD_SELF_SCROLL << CHILD_SCROLL_X) | +- (CHILD_SELF_SCROLL << CHILD_SCROLL_Y) +- ); +- } +- +- /* Create a window with no workarea to place inside editor window. +- * (what happens without the nested wimp?) +- * Data for scrollbar is invalid. +- */ +- void +- gui_mch_create_scrollbar(sb, orient) +- scrollbar_T *sb; +- int orient; /* orient is SBAR_HORIZ or SBAR_VERT */ +- { +- int bar[] = +- { +- 0, 0, /* Visible area : min X,Y */ +- 100, 100, /* max X,Y */ +- 0, 0, /* Scroll offsets */ +- -1, /* Window in front */ +- 0x80800150 | (orient == SBAR_HORIZ ? (1 << 30) : (1 << 28)), +- 0xff070207, /* Colours */ +- 0x000c0103, /* More colours */ +- 0, -0x4000, /* Workarea extent */ +- 0x4000, 0, /* max X,Y */ +- 0x00000000, /* No title */ +- 0 << 12, /* No workarea button type */ +- 1, /* Wimp sprite area */ +- 0x00010001, /* Minimum width, height */ +- 0, 0, 0, /* Title data (none) */ +- 0 /* No icons */ +- }; +- swi(Wimp_CreateWindow, 0, bar); +- sb -> id = r0; +- } +- +- #if defined(FEAT_WINDOWS) || defined(PROTO) +- void +- gui_mch_destroy_scrollbar(scrollbar_T *sb) +- { +- swi(Wimp_DeleteWindow, 0, & (sb->id)); +- sb -> id = -1; +- } +- #endif +- +- void +- gui_mch_set_scrollbar_colors(scrollbar_T *sb) +- { +- /* Always use default RO colour scheme. */ +- } +- +- /* +- * Get current mouse coordinates in text window. +- * Note: (0,0) is the bottom left corner, positive y is UP. +- */ +- void +- gui_mch_getmouse(x, y) +- int *x; +- int *y; +- { +- int left; +- int top; +- int block[10]; +- +- block[0] = gui.window_handle; +- swi(Wimp_GetWindowState, 0, block); +- left = block[1]; +- top = block[4]; +- +- swi(Wimp_GetPointerInfo, 0, block); +- *x = block[0] - left; +- *y = top - block[1]; +- } +- +- /* MouseTo(x, y) */ +- void +- gui_mch_setmouse(x, y) +- int x; +- int y; +- { +- } +- +- void +- gui_mch_toggle_tearoffs(enable) +- int enable; +- { +- /* no tearoff menus */ +- } +- +- /* Redraw a window's title. +- * For the nested wimp we use the new 'redraw-title-bar' reason code. +- * For older wimps we mark the area of the screen where the title bar +- * is as invalid. +- */ +- void +- ro_redraw_title(window) +- int window; +- { +- if (nested_wimp) +- { +- swi(Wimp_ForceRedraw, window, 0x4b534154, 3); +- } +- else +- { +- int block[10]; +- int miny; +- +- block[0] = window; +- swi(Wimp_GetWindowState, 0, block); +- miny = block[4]; +- swi(Wimp_GetWindowOutline, 0, block); +- swi(Wimp_ForceRedraw, -1, +- block[1], miny, +- block[3], block[4]); +- } +- } +- +- /* Turn a vimmenu_T structure into a wimp menu structure. +- * -1 if resulting menu is empty. +- * Only the children and dname items in the root menu are used. +- */ +- int * +- ro_build_menu(menu) +- vimmenu_T *menu; +- { +- int *wimp_menu; +- int width = 4; +- int w; +- int size = 28; +- vimmenu_T *item; +- int *wimp_item; +- +- /* Find out how big the menu is so we can allocate memory for it */ +- for (item = menu-> children; item; item = item-> next) +- { +- if (item-> hidden == FALSE && !menu_is_separator(item->name)) +- size += 24; +- } +- +- if (size <= 28) +- return (int *) -1; /* No children - shouldn't happen */ +- +- wimp_menu = (int *) alloc(size); +- +- wimp_menu[0] = (int) menu-> dname; +- wimp_menu[1] = -1; +- wimp_menu[2] = 0; +- wimp_menu[3] = 0x00070207; +- wimp_menu[5] = 44; +- wimp_menu[6] = 0; +- +- wimp_item = wimp_menu + 7; +- +- for (item = menu-> children; item; item = item-> next) +- { +- if (menu_is_separator(item-> name)) +- { +- /* This menu entry is actually a separator. If it is not the first +- * menu entry then mark the previous menu item as needing a dotted +- * line after it. +- */ +- if (wimp_item > wimp_menu + 7) +- wimp_item[-6] |= 0x2; +- } +- else if (item-> hidden == FALSE) +- { +- wimp_item[0] = 0; +- wimp_item[1] = item-> children ? (int) ro_build_menu(item) : -1; +- wimp_item[2] = 0x07009131 | (item-> greyed_out << 22); +- wimp_item[3] = (int) item-> dname; +- wimp_item[4] = -1; +- wimp_item[5] = (int) item; /* Stuff the menu address in this unused space */ +- +- w = strlen(item-> dname) + 1; +- if (w > width) +- width = w; +- wimp_item += 6; +- } +- } +- +- wimp_menu[4] = (width + 2) * 16; +- wimp_menu[7] |= 0x100; /* Menu title is indirected */ +- wimp_item[-6] |= 0x080; /* Last entry in menu */ +- return wimp_menu; +- } +- +- static void +- ro_remove_menu(menu) +- int *menu; +- { +- int *item = menu + 7; +- +- if (menu == NULL || menu == (int *) -1) +- return; +- +- for (;;) +- { +- if (item[1] != -1) +- ro_remove_menu((int *) item[1]); /* Remove sub-menu */ +- if (item[0] & 0x80) +- break; /* This was the last entry */ +- item += 6; +- } +- vim_free(menu); +- } +- +- void +- gui_mch_show_popupmenu(menu) +- vimmenu_T *menu; +- { +- int block[10]; +- +- /* Remove the existing menu, if any */ +- if (wimp_menu != (int *) -1) +- { +- swi(Wimp_CreateMenu, 0, -1); +- ro_remove_menu(wimp_menu); +- wimp_menu = (int *) -1; +- } +- +- wimp_menu = ro_build_menu(menu); +- if (wimp_menu != (int *) -1) +- { +- swi(Wimp_GetPointerInfo, 0, block); +- swi(Wimp_CreateMenu, 0, wimp_menu, block[0] - 64, block[1] + 64); +- } +- } +- +- /* Run a command using the TaskWindow module. +- * If SHELL_FILTER is set then output is not echoed to the screen, +- * If it is not set, then \r is not sent to the output file. +- */ +- int +- gui_mch_call_shell(cmd, options) +- char_u *cmd; +- int options; /* SHELL_FILTER if called by do_filter() */ +- /* SHELL_COOKED if term needs cooked mode */ +- { +- char_u task_cmd[256]; /* Contains *TaskWindow command. */ +- int block[64]; +- int reason; +- char_u *out; +- char_u c; +- int old_msg_col; +- char_u *out_redir; +- int length; +- FILE *out_file = NULL; +- +- out_redir = strstr(cmd, " > "); +- if (out_redir == NULL) +- length = strlen(cmd); /* No redirection. */ +- else +- { +- length = out_redir - cmd; +- out_file = fopen(out_redir + 3, "wb"); +- if (out_file == NULL) +- smsg("WARNING : Can't open file %s for writing\n", out_redir + 3); +- } +- +- if (length > 180) +- { +- if (out_file) +- fclose(out_file); +- return FAIL; /* Command too long. */ +- } +- +- strcpy(task_cmd, "TaskWindow \""); +- strncpy(task_cmd + 12, cmd, length); +- sprintf(task_cmd + 12 + length, +- "\" -task &%08x -ctrl -quit -name \"Vim command\"", +- task_handle); +- +- if (options & SHELL_COOKED) +- settmode(TMODE_COOK); +- +- if (xswi(Wimp_StartTask, task_cmd) & v_flag) +- { +- /* Failed to even start a new task (out of memory?) */ +- settmode(TMODE_RAW); +- if (out_file) +- fclose(out_file); +- return FAIL; +- } +- +- /* Wait for the child process to initialise. */ +- child_handle = 0; +- while (!child_handle) +- { +- reason = wimp_poll(0, block); +- if ((reason == 17 || reason == 18) && block[4] == 0x808c2) +- child_handle = block[1]; +- else +- process_event(reason, block); +- } +- +- /* Block until finished */ +- while (child_handle) +- { +- reason = wimp_poll(1, block); +- if (reason == 3 || (reason == 8 && block[6] == 3)) +- { +- /* Close window request or CTRL-C - kill child task. */ +- block[0] = 20; +- block[3] = 0; +- block[4] = 0x808c4; /* Morite */ +- swi(Wimp_SendMessage, 17, block, child_handle); +- MSG_PUTS(_("\nSending message to terminate child process.\n")); +- continue; +- } +- else if (reason == 8) +- { +- block[0] = 28; +- block[3] = 0; +- block[4] = 0x808c0; /* Input */ +- block[5] = 1; +- /* Block[6] is OK as it is! */ +- swi(Wimp_SendMessage, 17, block, child_handle); +- continue; +- } +- else if (reason == 17 || reason == 18) +- { +- if (block[4] == 0x808c1) +- { +- /* Ack message. */ +- block[3] = block[2]; +- swi(Wimp_SendMessage, 19, block, block[1]); +- out = (char_u *)block + 24; +- old_msg_col = msg_col; +- while (block[5]--) +- { +- c = *out++; +- if (out_file && (c != '\r' || (options & SHELL_FILTER))) +- fputc(c, out_file); +- if ((options & SHELL_FILTER) == 0) +- { +- if (c == 127) +- msg_puts("\b \b"); +- else if (c > 31) +- msg_putchar(c); +- else if (c == 10) +- { +- lines_left = 8; /* Don't do More prompt! */ +- msg_putchar(10); +- } +- } +- } +- /* Flush output to the screen. */ +- windgoto(msg_row, msg_col); +- out_flush(); +- continue; +- } +- } +- process_event(reason, block); +- } +- msg_putchar('\n'); +- settmode(TMODE_RAW); +- if (out_file) +- fclose(out_file); +- return OK; +- } +- +- /* Like strsave(), but stops at any control char */ +- char_u * +- wimp_strsave(str) +- char *str; +- { +- int strlen = 0; +- char_u *retval; +- while (str[strlen] > 31) +- strlen++; +- retval = alloc(strlen + 1); +- if (retval) +- { +- memcpy(retval, str, strlen); +- retval[strlen] = '\0'; +- } +- return retval; +- } +- +- /* If we are saving then pop up a standard RISC OS save box. +- * Otherwise, open a directory viewer on the given directory (and return NULL) +- * The string we return will be freed later. +- */ +- char_u * +- gui_mch_browse(saving, title, dflt, ext, initdir, filter) +- int saving; /* write action */ +- char_u *title; /* title for the window */ +- char_u *dflt; /* default file name */ +- char_u *ext; /* extension added */ +- char_u *initdir; /* initial directory, NULL for current dir */ +- char_u *filter; /* file name filter */ +- { +- char command[256]; +- int length; +- +- if (saving) +- { +- int block[64]; +- int reason; +- int done_save = FALSE; +- char_u *retval = NULL; +- char_u *sprname; +- char_u *fname; +- int dragging_icon = FALSE; +- int filetype; +- +- if (!dflt) +- dflt = "TextFile"; +- +- block[0] = save_window; +- block[1] = 0; +- swi(Wimp_GetIconState, 0, block); +- sprname = ((char_u *) block[7]); +- block[1] = 1; +- swi(Wimp_GetIconState, 0, block); +- fname = ((char *) block[7]); +- strncpy(fname, dflt, 255); +- +- if (xswi(OS_FSControl, 31, curbuf->b_p_oft) & v_flag) +- { +- filetype = 0xfff; +- strcpy(sprname + 5, "xxx"); +- } +- else +- { +- filetype = r2; +- sprintf(sprname + 5, "%03x", filetype); +- } +- +- /* Open the save box */ +- +- swi(Wimp_GetPointerInfo, 0, block); +- swi(Wimp_CreateMenu, 0, save_window, block[0] - 64, block[1] + 64); +- swi(Wimp_SetCaretPosition, save_window, 1, 0, 0, -1, -1); +- +- while (!done_save) +- { +- reason = wimp_poll(1, block); +- switch (reason) +- { +- case 1: +- redraw_window(block); +- break; +- case 2: +- if (block[0] == save_window) +- swi(Wimp_OpenWindow, 0, block); +- else +- ro_open_window(block); +- break; +- case 3: +- done_save = TRUE; +- break; +- case 6: +- if (block[3] != save_window) +- done_save = TRUE; +- else +- { +- int drag_box[4]; +- int min_x, max_y; +- +- switch (block[4]) +- { +- case 0: /* Start drag */ +- block[0] = save_window; +- swi(Wimp_GetWindowState, 0, block); +- min_x = block[1]; +- max_y = block[4]; +- block[1] = 0; +- swi(Wimp_GetIconState, 0, block); +- drag_box[0] = block[2] + min_x; +- drag_box[1] = block[3] + max_y; +- drag_box[2] = block[4] + min_x; +- drag_box[3] = block[5] + max_y; +- +- swi(DragASprite_Start, +- 0x45, +- 1, +- sprname, +- drag_box); +- dragging_icon = TRUE; +- break; +- case 2: /* OK */ +- retval = wimp_strsave(fname); +- done_save = TRUE; +- break; +- case 3: /* Cancel */ +- done_save = TRUE; +- break; +- } +- } +- break; +- case 7: +- if (dragging_icon) +- { +- int len = 0; +- +- dragging_icon = FALSE; +- swi(Wimp_GetPointerInfo, 0, block); +- block[5] = block[3]; +- block[6] = block[4]; +- block[7] = block[0]; +- block[8] = block[1]; +- block[9] = 0; /* Don't know the size */ +- block[10] = filetype; +- +- while (fname[len] > 31) +- { +- if (fname[len] == '.') +- { +- fname += len + 1; +- len = 0; +- } +- else +- len++; +- } +- if (len > 211) +- len = 211; +- +- memcpy(((char_u *) block) + 44, fname, len); +- ((char_u *)block)[44 + len] = '\0'; +- +- block[0] = (len + 48) & 0xfc; +- block[3] = 0; +- block[4] = 1; /* DataSave */ +- +- swi(Wimp_SendMessage, 17, block, block[5], block[6]); +- } +- else +- ro_drag_finished(block); +- break; +- case 8: +- if (block[6] == 13) +- { +- retval = wimp_strsave(fname); +- done_save = TRUE; +- } +- else if (block[6] == 0x1b) +- done_save = TRUE; +- else +- swi(Wimp_ProcessKey, block[6]); +- break; +- case 17: +- case 18: +- if (block[4] == 2 && block[9] != -1) +- { +- /* DataSaveAck from dragging icon. */ +- retval = wimp_strsave(((char_u *) block) + 44); +- done_save = TRUE; +- } +- else if (block[4] == 0x400c9) +- { +- /* MenusDeleted */ +- done_save = TRUE; +- } +- else +- ro_message(block); +- break; +- } +- } +- block[0] = save_window; +- swi(Wimp_CloseWindow, 0, block); +- swi(Wimp_GetCaretPosition, 0, block); +- if (block[0] == -1) +- swi(Wimp_SetCaretPosition, gui.window_handle, -1, 0, 0, -1, -1); +- +- return retval; +- } +- else if (initdir) +- { +- /* Open a directory viewer */ +- length = strlen(initdir); +- +- if (length > 240) +- return NULL; /* Path too long! */ +- +- length = sprintf(command, "Filer_OpenDir %s", initdir); +- while (command[length - 1] == '.') +- length--; +- command[length] = '\0'; +- swi(OS_CLI, command); +- } +- return NULL; +- } +--- 0 ---- +*** ../vim-7.3.186/src/os_riscos.c 2010-08-15 21:57:27.000000000 +0200 +--- src/os_riscos.c 1970-01-01 01:00:00.000000000 +0100 +*************** +*** 1,1292 **** +- /* vi:set ts=8 sts=4 sw=4: +- * +- * VIM - Vi IMproved by Bram Moolenaar +- * +- * Do ":help uganda" in Vim to read copying and usage conditions. +- * Do ":help credits" in Vim to see a list of people who contributed. +- * See README.txt for an overview of the Vim source code. +- */ +- +- #include "vim.h" +- +- /* +- * os_riscos.c +- * +- * Thomas Leonard +- */ +- +- const char *__dynamic_da_name = "Vim heap"; /* Enable and name our dynamic area */ +- int ro_line_mode = TRUE; /* For Ex mode we much echo chars to the screen ourselves */ +- int windowed; /* Flag - are we running inside a text window? */ +- int WinLeft, WinTop; /* We might be started inside a text window */ +- int ScrollTop; /* Make cursor movements relative to ScrollTop. */ +- +- int old_escape_state = -1; +- int old_cursor_state = -1; +- +- #define rgb(r,g,b) ((b<<24) + (g<<16) + (r<<8)) +- #define NORMAL_FG 0x00000000 +- #define NORMAL_BG 0xffffffff +- +- /* Convert a DOS colour number to an RGB palette entry. +- * Mappings from X11 rgb/txt file. +- */ +- static int +- map_colour(dos) +- int dos; /* Standard DOS colour number. */ +- { +- switch (dos) +- { +- case 0: return 0; /* Black */ +- case 1: return rgb(0,0,139); /* DarkBlue */ +- case 2: return rgb(0,100,0); /* DarkGreen */ +- case 3: return rgb(0,139,139); /* DarkCyan */ +- case 4: return rgb(139,0,0); /* DarkRed */ +- case 5: return rgb(139,0,139); /* DarkMagenta */ +- case 6: return rgb(165,42,42); /* Brown, DarkYellow */ +- case 7: return rgb(211,211,211); /* LightGray, LightGrey, Gray, Grey */ +- case 8: return rgb(169,169,169); /* DarkGray, DarkGrey */ +- case 9: return rgb(173,216,230); /* Blue, LightBlue */ +- case 10: return rgb(144,238,144); /* Green, LightGreen */ +- case 11: return rgb(224,255,255); /* Cyan, LightCyan */ +- case 12: return rgb(255,0,0); /* Red, LightRed */ +- case 13: return rgb(255,0,255); /* Magenta, LightMagenta */ +- case 14: return rgb(255,255,0); /* Yellow, LightYellow */ +- case 15: return rgb(255,255,255); /* White */ +- } +- return rgb(100,100,100); +- } +- +- static void +- text_fg(fg) +- int fg; /* Foregound colour in the form &BBGGRR00 */ +- { +- xswi(ColourTrans_SetTextColour, fg, 0, 0, 0); +- } +- +- static void +- text_bg(bg) +- int bg; /* Backgound colour in the form &BBGGRR00 */ +- { +- xswi(ColourTrans_SetTextColour, bg, 0, 0, 1 << 7); +- } +- +- #define OUT_NORMAL 0 +- #define OUT_NUMBER 1 /* Reading in a number */ +- +- void +- mch_write(s, len) +- char_u *s; +- int len; +- { +- static int mode = OUT_NORMAL; +- static int x, y; /* For reading numbers in. */ +- +- if (!term_console) +- { +- /* Maybe we are running Vim remotely - don't interpret chars */ +- while (len--) +- { +- char_u c = *s++; +- swi(OS_WriteC, c); +- /* We might need to send a CR too. This shouldn't +- * hurt if we don't need it, should it? +- */ +- if (c == 10) +- swi(OS_WriteI + 13); +- } +- return; +- } +- +- while (len--) +- { +- char_u c = *s++; +- switch (mode) +- { +- case OUT_NUMBER: +- if (c < '0' || c > '9') +- { +- mode = OUT_NORMAL; +- } +- else +- { +- x = (x * 10) + c - '0'; +- continue; +- } +- /* note: no break here! */ +- +- case OUT_NORMAL: +- switch (c) +- { +- case 1: +- /* Number (in decimal) follows. */ +- mode = OUT_NUMBER; +- y = x; +- x = 0; +- break; +- case 2: +- /* Position cursor. */ +- swi(OS_WriteI + 31); +- swi(OS_WriteC, x); +- swi(OS_WriteC, y - ScrollTop); +- break; +- case 3: +- /* Set scroll region. */ +- if (x == Rows -1 && y == 0 && !windowed) +- { +- /* Whole screen - remove text window. +- * This is MUCH faster. +- */ +- swi(OS_WriteI + 26); +- } +- else +- { +- /* Create a text window. */ +- swi(OS_WriteI + 28); +- swi(OS_WriteC, WinLeft); +- swi(OS_WriteC, WinTop + x); +- swi(OS_WriteC, WinLeft + Columns - 1); +- swi(OS_WriteC, WinTop + y); +- } +- ScrollTop = y; +- break; +- case 4: +- /* Normal mode. */ +- text_fg(NORMAL_FG); +- text_bg(NORMAL_BG); +- break; +- case 5: +- /* Reverse mode. */ +- text_fg(NORMAL_BG); +- text_bg(NORMAL_FG); +- break; +- case 10: +- swi(OS_NewLine); +- break; +- case 14: +- /* Cursor invisible. */ +- swi(OS_WriteN, +- "\027\001\000\000\000\000\000\000\000\000", +- 10); +- break; +- case 15: +- /* Cursor visible. */ +- swi(OS_WriteN, +- "\027\001\002\000\000\000\000\000\000\000", +- 10); +- break; +- case 16: +- /* Cursor very visible (flash) */ +- swi(OS_WriteN, +- "\027\001\003\000\000\000\000\000\000\000", +- 10); +- case 17: +- /* Set foreground colour. */ +- text_fg(map_colour(x)); +- break; +- case 18: +- /* Set background colour. */ +- text_bg(map_colour(x)); +- break; +- case 19: +- /* Scroll text down. */ +- swi(OS_WriteN, +- "\027\007\000\002\000\000\000\000\000\000", +- 10); +- break; +- default: +- swi(OS_WriteC, c); +- } +- continue; +- +- default: +- printf("[output error]"); +- mode = OUT_NORMAL; +- } +- } +- } +- +- /* +- * mch_inchar(): low level input funcion. +- * Get a characters from the keyboard. +- * Return the number of characters that are available. +- * If wtime == 0 do not wait for characters. +- * If wtime == n wait n msecs for characters. +- * If wtime == -1 wait forever for characters. +- * +- * TODO: call convert_input() for 'fileencoding' to 'encoding' conversion. +- */ +- int +- mch_inchar(buf, maxlen, wtime, tb_change_cnt) +- char_u *buf; +- int maxlen; +- long wtime; +- int tb_change_cnt; +- { +- int got=0; +- unsigned int start_time = clock(); +- +- if (ro_line_mode) +- { +- /* We're probably in Ex mode - get whole lines at a time. */ +- +- static char_u line_buffer[256]; +- static int remaining_chars = 0; +- static int buf_pos = 0; +- +- /* Do we need to fetch another line? */ +- if (remaining_chars == 0) +- { +- int old_esc_state; +- swi(OS_Byte, 200, 1, 0xfe); +- old_esc_state = r1; +- +- buf_pos = 0; +- if (xswi(OS_ReadLine, line_buffer, 255, 0, 255) & (c_flag | v_flag)) +- { +- got_int = TRUE; /* ESC pressed */ +- r1 = 0; +- } +- line_buffer[r1] = 13; +- remaining_chars = r1 + 1; /* Count CR as part of input */ +- +- swi(OS_Byte, 200, old_esc_state, 0); +- } +- +- /* Can we send the rest of the buffer back in one go? */ +- if (remaining_chars <= maxlen) +- { +- int got = remaining_chars; +- +- memcpy(buf, line_buffer + buf_pos, got); +- remaining_chars = 0; +- return got; +- } +- +- /* Send as much as we can */ +- memcpy(buf, line_buffer + buf_pos, maxlen); +- buf_pos += maxlen; +- remaining_chars -= maxlen; +- +- return maxlen; +- } +- +- if (!term_console) +- { +- /* Use OS_ReadC for all input. +- * Avoids problems with remote access getting interference from +- * the keyboard. +- */ +- if (wtime == 0) +- return 0; /* Ignore quick key checks */ +- +- if (xswi(OS_ReadC) & c_flag) +- { +- got_int = TRUE; /* ESC pressed - can this happen? */ +- swi(OS_Byte, 124); /* Clear Escape state */ +- r0 = 0x1b; /* It *might* not have been Escape! */ +- } +- buf[0] = r0; +- return 1; +- } +- +- /* +- * OK, here's the plan: +- * +- * 1) Wait until wtime expires or we get a key +- * 2) Get keys until the keyboard buffer is empty or buf is full +- */ +- +- while (xswi(OS_Byte,145,0) & c_flag) +- { +- /* Nothing at all in the keyboard buffer. +- * Has our time expired yet? +- */ +- if ( (wtime != -1) && (clock() - start_time) >= wtime ) +- return 0; /* Nothing read - giving up */ +- } +- +- /* We've got one char (in r2) - are there any more? */ +- +- while (got < maxlen) +- { +- buf[got++] = r2; +- +- if (xswi(OS_Byte,145,0) & c_flag) +- return got; /* Keyboard buffer empty */ +- } +- return got; /* buf is full */ +- } +- +- /* +- * return non-zero if a character is available +- */ +- int +- mch_char_avail() +- { +- if (!term_console) +- return 0; /* Can't tell */ +- if (xswi(OS_Byte, 152, 0) & c_flag) +- return 0; +- return 1; +- } +- +- /* Find out how much free memory we have. +- * I don't know how to work this out exactly but, since we can claim +- * more memory from the OS, let's just report the free pool size. +- * Dynamic area 6 doesn't exist pre 3.6 according to StrongHelp, so +- * we'll use Wimp_SlotSize. If that fails (outside the desktop?) +- * then just return a big number and hope. +- */ +- long_u +- mch_avail_mem(special) +- int special; +- { +- if (xswi(Wimp_SlotSize, -1, -1) & v_flag) +- return 0x7fffffff; +- return r2; +- } +- +- void +- mch_delay(msec, ignoreinput) +- long msec; +- int ignoreinput; +- { +- int start_time, time_now; +- int csec = msec / 10; +- +- swi(OS_ReadMonotonicTime); +- start_time = r0; +- +- for (;;) +- { +- swi(OS_ReadMonotonicTime); +- time_now = r0; +- if (time_now - start_time > csec) +- return; +- #ifdef FEAT_GUI +- /* In the GUI, allow other programs to run while waiting. */ +- if (gui.in_use) +- gui_mch_wait_for_chars(start_time + csec); +- #endif +- } +- } +- +- /* +- * If the machine has job control, use it to suspend the program, +- * otherwise fake it by starting a new shell. +- */ +- void +- mch_suspend() +- { +- suspend_shell(); +- } +- +- void +- mch_init() +- { +- /* +- * Read window size first. Calls to mch_get_shellsize() will +- * simply return these values in future so that setting the +- * text window (used for scrolling) won't give strange results. +- */ +- +- int buf[7] = {132, 135, 256, 257, 1, 2, -1}; +- +- /* Command windows are no longer forced open, since if we are +- * in the desktop then we'll use the GUI version. +- * Opening a command window here messes up the GUI version startup +- */ +- #ifndef FEAT_GUI +- swi(OS_WriteI); +- #endif +- swi(OS_ReadVduVariables, buf, buf); +- WinLeft = buf[0]; +- WinTop = buf[1]; +- Columns = buf[2]; +- Rows = buf[3] + 1; /* Seems to be one off (VduVars wrong?) */ +- ScrollTop = 0; +- +- /* Are we running in a textwindow? */ +- if (Rows == buf[5] + 1 && Columns == buf[4] + 1) +- windowed = 0; +- else +- windowed = 1; +- +- /* Choose a nice colour scheme. */ +- text_fg(NORMAL_FG); +- text_bg(NORMAL_BG); +- } +- +- /* +- * Check_win checks whether we have an interactive stdout. +- */ +- /* ARGSUSED */ +- int +- mch_check_win(argc, argv) +- int argc; +- char **argv; +- { +- return OK; +- } +- +- /* +- * Return TRUE if the input comes from a terminal, FALSE otherwise. +- */ +- int +- mch_input_isatty() +- { +- if (xswi(OS_ChangeRedirection, -1, -1) & v_flag) +- return TRUE; /* Error - TRUE is probably correct though */ +- if (r0 == 0) +- return TRUE; +- return FALSE; +- } +- +- #ifdef FEAT_TITLE +- int +- mch_can_restore_title() +- { +- return FALSE; +- } +- +- int +- mch_can_restore_icon() +- { +- return FALSE; +- } +- +- +- /* +- * Set the window title and icon. +- */ +- void +- mch_settitle(title, icon) +- char_u *title; +- char_u *icon; +- { +- if (title == NULL) +- title = (char_u *) ""; +- #ifdef FEAT_GUI +- if (gui.in_use && strcmp(title, gui.window_title)) +- { +- int length; +- length = strlen(title); +- if (length >= gui.window_title_size) +- length = gui.window_title_size - 1; +- strncpy(gui.window_title, title, length); +- gui.window_title[length] = 0; +- ro_redraw_title(gui.window_handle); +- } +- #endif +- return; +- } +- +- /* +- * Restore the window/icon title. +- * "which" is one of: +- * 1 only restore title +- * 2 only restore icon +- * 3 restore title and icon +- */ +- void +- mch_restore_title(which) +- int which; +- { +- return; +- } +- #endif +- +- /* +- * Insert user name in s[len]. +- * Return OK if a name found. +- */ +- int +- mch_get_user_name(s, len) +- char_u *s; +- int len; +- { +- /* RISC OS doesn't support user names. */ +- *s = NUL; +- return FAIL; +- } +- +- /* +- * Insert host name in s[len]. +- */ +- +- void +- mch_get_host_name(s, len) +- char_u *s; +- int len; +- { +- if (xswi(OS_ReadVarVal, "Machine$Name", s, len, 0, 3) & v_flag) +- { +- /* Variable does not exist (normal operation) */ +- vim_strncpy(s, "(unknown)", len - 1); +- } +- } +- +- /* +- * return process ID +- */ +- long +- mch_get_pid() +- { +- if (xswi(Wimp_ReadSysInfo, 5) & v_flag) +- return 0; +- return r0; +- } +- +- /* +- * Get name of current directory into buffer 'buf' of length 'len' bytes. +- * Return OK for success, FAIL for failure. +- */ +- int +- mch_dirname(buf, len) +- char_u *buf; +- int len; +- { +- if (xswi(OS_FSControl, 37, "@", buf, 0, 0, len) & v_flag) +- return FAIL; +- return OK; +- } +- +- /* +- * Get absolute file name into buffer 'buf' of length 'len' bytes. +- * +- * return FAIL for failure, OK for success +- */ +- int +- mch_FullName(fname, buf, len, force) +- char_u *fname, *buf; +- int len; +- int force; /* Also expand when already absolute path name. +- * Not used under RISC OS. +- */ +- { +- if (xswi(OS_FSControl, 37, fname, buf, 0, 0, len) & v_flag) +- return FAIL; +- return OK; +- } +- +- /* +- * Return TRUE if "fname" does not depend on the current directory. +- */ +- int +- mch_isFullName(fname) +- char_u *fname; +- { +- if (strstr(fname, "::") && strstr(fname,".$.")) +- return TRUE; +- return FALSE; +- } +- +- /* +- * Get file permissions for 'name'. +- * Returns -1 when it doesn't exist. +- */ +- long +- mch_getperm(name) +- char_u *name; +- { +- struct stat statb; +- +- if (stat((char *)name, &statb)) +- return -1; +- return statb.st_mode; +- } +- +- /* +- * set file permission for 'name' to 'perm' +- * +- * return FAIL for failure, OK otherwise +- */ +- int +- mch_setperm(name, perm) +- char_u *name; +- long perm; +- { +- return (chmod((char *)name, (mode_t)perm) == 0 ? OK : FAIL); +- } +- +- /* +- * Set hidden flag for "name". +- */ +- /* ARGSUSED */ +- void +- mch_hide(name) +- char_u *name; +- { +- /* can't hide a file */ +- } +- +- /* +- * return TRUE if "name" is a directory +- * return FALSE if "name" is not a directory +- * return FALSE for error +- */ +- int +- mch_isdir(name) +- char_u *name; +- { +- if (xswi(OS_File, 17, name) & v_flag) +- return FALSE; +- if (r0 == 2 || r0 == 3) +- return TRUE; /* Count image files as directories. */ +- return FALSE; +- } +- +- /* +- * Return 1 if "name" can be executed, 0 if not. +- * Return -1 if unknown. Requires which to work. +- */ +- int +- mch_can_exe(name) +- char_u *name; +- { +- char_u *buf; +- char_u *p; +- int retval; +- +- buf = alloc((unsigned)STRLEN(name) + 7); +- if (buf == NULL) +- return -1; +- sprintf((char *)buf, "which %s", name); +- p = get_cmd_output(buf, NULL, SHELL_SILENT); +- vim_free(buf); +- if (p == NULL) +- return -1; +- /* result can be: "name: Command not found" */ +- retval = (*p != NUL && strstr((char *)p, "not found") == NULL); +- vim_free(p); +- return retval; +- } +- +- /* +- * Check what "name" is: +- * NODE_NORMAL: file or directory (or doesn't exist) +- * NODE_WRITABLE: writable device, socket, fifo, etc. +- * NODE_OTHER: non-writable things +- */ +- int +- mch_nodetype(name) +- char_u *name; +- { +- /* TODO */ +- return NODE_NORMAL; +- } +- +- void +- mch_early_init() +- { +- /* Turn off all the horrible filename munging in UnixLib. */ +- int __riscosify_control = __RISCOSIFY_NO_PROCESS; +- } +- +- void +- mch_exit(r) +- int r; +- { +- settmode(TMODE_COOK); +- exiting = TRUE; +- out_flush(); +- ml_close_all(TRUE); /* remove all memfiles */ +- +- #ifdef FEAT_GUI +- if (gui.in_use) +- gui_exit(r); +- #endif +- swi(OS_NewLine); +- if (old_escape_state != -1) +- swi(OS_Byte, 229, old_escape_state, 0); +- if (old_cursor_state != -1) +- swi(OS_Byte, 4, old_cursor_state); +- exit(r); +- } +- +- void +- mch_settmode(tmode) +- int tmode; /* TMODE_RAW or TMODE_COOK */ +- { +- if (tmode == TMODE_COOK) +- { +- ro_line_mode = TRUE; +- return; +- } +- +- ro_line_mode = FALSE; +- +- if (term_console) +- { +- /* Block cursor. */ +- swi(OS_WriteN, +- "\027\000\012\000\000\000\000\000\000\000", +- 10); +- +- /* Disable the standard cursor key actions. */ +- swi(OS_Byte, 4, 1); +- if (old_cursor_state == -1) +- old_cursor_state = r1; +- } +- +- /* Stop Escape from quitting Vim! */ +- swi(OS_Byte, 229, 1, 0); +- if (old_escape_state == -1) +- old_escape_state = r1; +- } +- +- /* +- * set mouse clicks on or off (only works for xterms) +- */ +- void +- mch_setmouse(on) +- int on; +- { +- } +- +- /* +- * set screen mode, always fails. +- */ +- /* ARGSUSED */ +- int +- mch_screenmode(arg) +- char_u *arg; +- { +- EMSG(_(e_screenmode)); +- return FAIL; +- } +- +- /* +- * Try to get the current window size. +- * Return OK when size could be determined, FAIL otherwise. +- * Simply return results stored by mch_init() if we are the +- * machine's console. If not, we don't know how big the screen is. +- */ +- int +- mch_get_shellsize() +- { +- /* if size changed: screenalloc will allocate new screen buffers */ +- return term_console ? OK : FAIL; +- } +- +- /* +- * Can't change the size. +- * Assume the user knows what he's doing and use the new values. +- */ +- void +- mch_set_shellsize() +- { +- /* Assume the user knows what he's doing and use the new values. */ +- } +- +- /* +- * Rows and/or Columns has changed. +- */ +- void +- mch_new_shellsize() +- { +- /* Nothing to do. */ +- } +- +- int +- mch_call_shell(cmd, options) +- char_u *cmd; +- int options; /* SHELL_*, see vim.h */ +- { +- int retval; +- int tmode = cur_tmode; +- +- if (cmd == NULL) +- cmd = (char_u *) "GOS"; +- +- #ifdef FEAT_GUI +- if (gui.in_use) +- return gui_mch_call_shell(cmd, options); +- #endif +- if (options & SHELL_COOKED) +- settmode(TMODE_COOK); /* set to normal mode */ +- MSG_PUTS("\n"); +- +- /* I don't even want to think about what UnixLib must +- * be doing to allow this to work... +- */ +- retval = system(cmd); +- if (retval && !(options & SHELL_SILENT)) +- EMSG(strerror(EOPSYS)); /* Doesn't seem to set errno? */ +- +- swi(OS_Byte, 229, 1, 0); /* Re-disable escape */ +- if (tmode == TMODE_RAW) +- settmode(TMODE_RAW); /* set to raw mode */ +- return retval ? FAIL : OK; +- } +- +- /* +- * Check for Escape being pressed right now. +- * [ different if !term_console? ] +- */ +- void +- mch_breakcheck() +- { +- if (xswi(OS_Byte, 121, 0xf0) & v_flag) +- return; +- if (r1 == 0xff) +- { +- got_int = TRUE; +- swi(OS_Byte, 15, 1); /* Flush input buffer */ +- } +- } +- +- /* +- * Recursively expand one path component into all matching files and/or +- * directories. +- * "path" has backslashes before chars that are not to be expanded. +- * Return the number of matches found. +- */ +- int +- mch_expandpath(gap, path, flags) +- garray_T *gap; /* Grow array for results. */ +- char_u *path; +- int flags; /* EW_* flags */ +- { +- int got; /* Number of matches. */ +- char_u *pattern; +- +- /* Plan: +- * +- * 1) Get first part of path - no wildcards +- * 2) Get next path element (wildcarded) +- * 3) Get rest of path +- * +- * If (3) is nothing then only the leaf is wildcarded - add to gap +- * Otherwise call recursively for each path in (2), passing (3) +- * +- * This is just the header function. +- */ +- +- /* We must be able to modifiy path, so make a copy */ +- pattern = vim_strsave(path); +- if (pattern == NULL) +- return 0; +- got = expand_section(gap, (char_u *)"", pattern, flags); +- vim_free(pattern); +- return got; +- } +- +- /* +- * expand_section(gap, "$.Dir1.Dir2", "ABBA*.myleaf##") +- * +- * calls expand_section(gap, "$.Dir1.Dir2.ABBA_Gold", "myleaf##") +- * and expand_section(gap, "$.Dir1.Dir2.ABBA_Live", "myleaf##") +- * +- * If rest is just a leaf then all matches are added to gap. +- * +- * Returns number of items added to gap. +- */ +- int +- expand_section(gap, root, rest, flags) +- garray_T *gap; +- char_u *root; /* Non-wildcarded path to search */ +- char_u *rest; /* Wildcarded remainder of path */ +- int flags; /* Add dirs/files/missing objects. */ +- { +- static char_u buf[MAXPATHL]; /* Temporary buffer. */ +- char_u dir[MAXPATHL]; +- int start_element = -1; /* Start of wildcarded element */ +- char_u c; +- int i; +- int got, dir_pos; +- int buflen; /* Chars used in buf[] */ +- int colon = 0; /* Dir ends in ':' */ +- +- buflen = strlen(root); +- STRNCPY(buf, root, buflen); /* Copy root into buffer. */ +- +- /* +- * Find end of nonwildcarded section. +- * Count ':' as a path sep since Vim:Bug* is a valid pathname. +- */ +- +- for (i = 0; c = rest[i]; i++) +- { +- if (c == PATHSEP) +- { +- start_element = i; +- colon = 0; +- } +- if (c == ':') +- { +- start_element = i + 1; +- colon = 1; +- } +- if (c == '#' || c == '*') +- break; +- } +- if (c == 0) +- start_element = i; +- +- /* +- * start_element +> terminator for non-wildcarded section. +- * Transfer this bit into buf. +- */ +- if (buflen + start_element + 4 >= MAXPATHL) +- return 0; /* Buffer full */ +- if (start_element >= 0) +- { +- if (*root && !colon) +- buf[buflen++] = PATHSEP; +- strncpy(buf + buflen, rest, start_element); +- buflen += start_element; +- } +- buf[buflen] = 0; +- +- /* +- * Did we reach the end of the string without hitting any wildcards? +- */ +- if (c == 0) +- { +- /* Yes - add combined path to grow array and return. */ +- addfile(gap, buf, flags); +- return 1; +- } +- +- if (start_element < 0 || !colon) +- start_element++; +- rest += start_element; +- +- /* +- * rest does contain wildcards if we get here. +- * +- * Now : have we reached the leaf names part yet? +- * If so, add all matches (files and dirs) to gap. +- * If not, get next path element and scan all matching directories. +- */ +- +- start_element = -1; +- for (i = 0; rest[i]; i++) +- { +- if (rest[i] == '.') +- { +- start_element = i; +- rest[i] = 0; /* Break string here. */ +- break; +- } +- } +- +- /* If start_element is -1 then we are matching leaf names */ +- +- r3 = 0; /* Number of objs read. */ +- dir_pos = 0; /* Position through directory. */ +- got = 0; /* Files added so far. */ +- while (dir_pos != -1) +- { +- buf[buflen] = 0; +- if (xswi(OS_GBPB, 9, +- buf, /* Directory to scan. */ +- buf + buflen + (1 - colon), /* Buffer for result. */ +- 1, /* Number of objects to read. */ +- dir_pos, /* Search position. */ +- MAXPATHL - 2 - buflen, /* Size of result buffer. */ +- rest) /* Wildcarded leafname. */ +- & v_flag) +- { +- EMSG(r0 + 4); +- r4 = -1; +- } +- dir_pos = r4; /* r4 corrupted by addfile() */ +- if (r3 > 0) +- { +- char_u *path = buf; +- if (buflen == 0) +- path++; /* Don't do '.File' */ +- else if (!colon) +- buf[buflen] = '.'; /* Join path and leaf */ +- +- /* Path -> full path of object found */ +- if (start_element == -1) +- { +- addfile(gap, path, flags); +- got++; +- } +- else +- { +- /* Scan into subdirectories and images; ignore files */ +- swi(OS_File, 17, path); +- if (r0 == 2 || r0 == 3) +- got += expand_section(gap, +- path, +- rest + start_element + 1, +- flags); +- } +- } +- } +- +- /* Restore the dot if we removed it. */ +- if (start_element >= 0) +- rest[start_element] = '.'; +- return got; +- } +- +- /* +- * mch_expand_wildcards() - this code does wild-card pattern matching using +- * the shell. It isn't used under RISC OS. +- * +- * return OK for success, FAIL for error (you may lose some memory) and put +- * an error message in *file. +- * +- * num_pat is number of input patterns +- * pat is array of pointers to input patterns +- * num_file is pointer to number of matched file names +- * file is pointer to array of pointers to matched file names +- */ +- int +- mch_expand_wildcards(num_pat, pat, num_file, file, flags) +- int num_pat; +- char_u **pat; +- int *num_file; +- char_u ***file; +- int flags; /* EW_* flags */ +- { +- /* This doesn't get called unless SPECIAL_WILDCHAR is defined. */ +- return FAIL; +- } +- +- /* +- * Return TRUE if "p" contains wildcards which can be expanded by +- * mch_expandpath(). +- */ +- int +- mch_has_exp_wildcard(p) +- char_u *p; +- { +- if (vim_strpbrk((char_u *)"*#", p)) +- return TRUE; +- return FALSE; +- } +- +- /* Return TRUE if "p" contains wildcards. */ +- int +- mch_has_wildcard(p) +- char_u *p; +- { +- if (vim_strpbrk((char_u *)"*#`", p)) +- return TRUE; +- return FALSE; +- } +- +- int /* see Unix unlink(2) */ +- mch_remove(file) +- char_u *file; /* Name of file to delete. */ +- { +- if (xswi(OS_FSControl, 27, file, 0, 0) & v_flag) +- return EXIT_FAILURE; +- return EXIT_SUCCESS; +- } +- +- /* Try to make existing scripts work without modification. +- * Return a pointer to the new string (freed by caller), or NULL +- * +- * Two main cases: +- * - Absolute : $VIM/syntax/help.vim +- * - Relative : Adfs::4.$.!Vim.Resources.Syntax/help.vim +- */ +- char_u * +- mch_munge_fname(fname) +- char_u *fname; +- { +- char_u c; +- int len; +- char_u *retval; +- +- retval = fname = vim_strsave(fname); +- if (fname == NULL) +- return NULL; +- +- if (strncmp(fname, "$VIM/", 5) == 0) +- { +- strncpy(fname, "Vim:", 4); +- for (fname += 5; c = *fname; fname++) +- { +- if (c == '.') +- break; +- if (c == '/') +- fname[-1] = '.'; +- else +- fname[-1] = c; +- } +- fname[-1] = '\0'; +- } +- else +- { +- /* Check to see if the file exists without modification. */ +- if (xswi(OS_File, 17, fname) & v_flag) +- r0 == 0; /* Invalid filename? */ +- if (r0) +- return retval; +- +- len = strlen(fname); +- if (strcmp(fname + len - 4, ".vim") == 0) +- { +- fname[len - 4] = '\0'; +- for (; c = *fname; fname++) +- { +- if (c == '/') +- *fname = '.'; +- } +- } +- } +- return retval; +- } +- +- /* QuickFix reads munged names from the error file. +- * Correct them. +- */ +- int +- ro_buflist_add(old_name) +- char_u *old_name; /* Name of file found by quickfix */ +- { +- char_u *fname; +- char_u *leaf; /* Pointer to start of leaf in old_name */ +- char_u *ptr; +- char_u c; +- int retval; +- +- if (old_name == NULL) +- return buflist_add(NULL, 0); +- +- /* Copy the name so we can mess around with it. */ +- fname = vim_strsave(old_name); +- if (fname == NULL) +- /* Out of memory - can't modify name */ +- return buflist_add(old_name, 0); +- +- /* Change `dir/main.c' into `dir.c.main' */ +- leaf = fname; +- for (ptr = fname; c = *ptr; ptr++) +- { +- if (c == '/') +- { +- leaf = ptr + 1; +- *ptr = '.'; +- } +- else if (c == '.') +- break; +- } +- if (c == '.') +- { +- /* Change `main.c' into `c.main' +- * | | +- * leaf ptr +- */ +- ptr += old_name - fname; +- *ptr = '\0'; +- sprintf(leaf, +- "%s.%s", +- ptr + 1, +- leaf - fname + old_name); +- } +- +- retval = buflist_add(fname, 0); +- free(fname); +- return retval; +- } +- +- /* Change the current directory. +- * Strip trailing dots to make it easier to use with filename completion. +- * Return 0 for success, -1 for failure. +- */ +- int +- mch_chdir(dir) +- char_u *dir; +- { +- int length; +- int retval; +- char_u *new_dir; +- +- if (p_verbose >= 5) +- { +- verbose_enter(); +- smsg((char_u *)"chdir(%s)", dir); +- verbose_leave(); +- } +- length = strlen(dir); +- if (dir[length - 1] != '.') +- return chdir(dir); /* No trailing dots - nothing to do. */ +- new_dir = vim_strsave(dir); +- if (new_dir == NULL) +- return chdir(dir); /* Can't allocate memory. */ +- +- while (new_dir[--length] == '.') +- new_dir[length] = '\0'; +- +- retval = chdir(new_dir); +- vim_free(new_dir); +- return retval; +- } +- +- /* Examine the named file, and set the 'osfiletype' option +- * (in curbuf) to the file's type. +- */ +- void +- mch_read_filetype(file) +- char_u *file; +- { +- int type; +- char_u type_string[9]; +- int i; +- +- if (xswi(OS_File, 23, file) & v_flag) +- type = 0xfff; /* Default to Text */ +- else +- type = r6; +- +- /* Type is the numerical value - see if we have a textual equivalent */ +- swi(OS_FSControl, 18, 0, type); +- ((int *) type_string)[0] = r2; +- ((int *) type_string)[1] = r3; +- type_string[8] = 0; +- for (i = 0; type_string[i] > ' '; i++) +- ; +- type_string[i] = 0; +- +- set_string_option_direct("osfiletype", -1, type_string, OPT_FREE, 0); +- return; +- } +- +- void +- mch_set_filetype(file, type) +- char_u *file; +- char_u *type; +- { +- if (xswi(OS_FSControl, 31, type) & v_flag) +- { +- EMSG(_("E366: Invalid 'osfiletype' option - using Text")); +- r2 = 0xfff; +- } +- +- swi(OS_File, 18, file, r2); +- } +- +- /* Return TRUE if the file's type matches 'type' +- * RISC OS types always start with '&' +- */ +- int +- mch_check_filetype(fname, type) +- char_u *fname; +- char_u *type; +- { +- int value; +- char *end; +- +- if (*type != '&') +- return FALSE; +- +- value = strtol(type + 1, &end, 16); +- if (*end) +- return FALSE; /* Invalid type (report error?) */ +- +- if (xswi(OS_File, 23, fname) & v_flag) +- return FALSE; /* Invalid filename? */ +- +- return (r0 && r6 == value); +- } +--- 0 ---- +*** ../vim-7.3.186/runtime/doc/os_risc.txt 2010-08-15 21:57:16.000000000 +0200 +--- runtime/doc/os_risc.txt 2011-05-10 16:19:25.000000000 +0200 +*************** +*** 1,322 **** +! *os_risc.txt* For Vim version 7.3. Last change: 2010 Aug 07 + + + VIM REFERENCE MANUAL by Thomas Leonard + + + *riscos* *RISCOS* *RISC-OS* +! This file contains the particularities for the RISC OS version of Vim. + +- The RISC OS port is a completely new port and is not based on the old "archi" +- port. + +- 1. File locations |riscos-locations| +- 2. Filename munging |riscos-munging| +- 3. Command-line use |riscos-commandline| +- 4. Desktop (GUI) use |riscos-gui| +- 5. Remote use (telnet) |riscos-remote| +- 6. Temporary files |riscos-temp-files| +- 7. Interrupting |riscos-interrupt| +- 8. Memory usage |riscos-memory| +- 9. Filetypes |riscos-filetypes| +- 10. The shell |riscos-shell| +- 11. Porting new releases |riscos-porting| +- +- If I've missed anything, email me and I'll try to fix it. In fact, even if I +- haven't missed anything then email me anyway to give me some confidence that it +- actually works! +- +- Thomas Leonard +- +- [these URLs no longer work...] +- Port homepage: http://www.ecs.soton.ac.uk/~tal197/ +- or try: http://www.soton.ac.uk/~tal197/ +- +- ============================================================================== +- *riscos-locations* +- 1. File locations +- +- The Vim executable and shared resource files are all stored inside the !Vim +- application directory. +- +- When !Vim is first seen by the filer, it aliases the *vi and *ex commands to +- run the command-line versions of Vim (see |riscos-commandline|). +- +- !Vim.Resources and !Vim.Resources2 contain the files from the standard Vim +- distribution, but modified slightly to work within the limits of ADFS, plus +- some extra files such as the window templates. +- +- User choices are read from "Choices:*" and are saved to ".*". +- If you have the new !Boot structure then these should be set up already. If +- not, set Choices$Path to a list of directories to search when looking for +- user configuration files. Set Choices$Write to the directory you want files +- to be saved into (so your search patterns and marks can be remembered between +- sessions). +- +- ============================================================================== +- *riscos-munging* +- 2. Filename munging +- +- All pathname munging is disabled by default, so Vim should behave like a +- normal RISC OS application now. So, if you want to edit "doc/html" then you +- actually type "*vi doc/html". +- +- The only times munging is done is when: +- +- - Searching included files from C programs, since these are always munged. +- See |[I|. +- Note: make sure you are in the right directory when you use this +- command (i.e. the one with subdirectories "c" and "h"). +- +- - Sourcing files using |:so|. +- Paths starting "$VIM/" are munged like this: +- +- $VIM/syntax/help.vim -> Vim:syntax.help +- +- Also, files ending in ".vim" have their extensions removed, and slashes +- replaced with dots. +- +- Some tag files and script files may have to be edited to work under this port. +- +- ============================================================================== +- *riscos-commandline* +- 3. Command-line use +- +- To use Vim from the command-line use the "*vi" command (or "*ex" for +- |Ex-mode|). +- +- Type "*vi -h" for a list of options. +- +- Running the command-line version of Vim in a large high-color mode may cause +- the scrolling to be very slow. Either change to a mode with fewer colors or +- use the GUI version. +- +- Also, holding down Ctrl will slow it down even more, and Ctrl-Shift will +- freeze it, as usual for text programs. +- +- ============================================================================== +- *riscos-gui* +- 4. Desktop use +- +- Limitations: +- +- - Left scrollbars don't work properly (right and bottom are fine). +- - Doesn't increase scroll speed if it gets behind. +- +- You can resize the window by dragging the lower-right corner, even though +- there is no icon shown there. +- +- You can use the --rows and --columns arguments to specify the initial size of +- the Vim window, like this: > +- +- *Vi -g --rows 20 --columns 80 +- +- The global clipboard is supported, so you can select some text and then +- paste it directly into another application (provided it supports the +- clipboard too). +- +- Clicking Menu now opens a menu like a normal RISC OS program. Hold down Shift +- when clicking Menu to paste (from the global clipboard). +- +- Dragging a file to the window replaces the CURRENT buffer (the one with the +- cursor, NOT the one you dragged to) with the file. +- +- Dragging with Ctrl held down causes a new Vim window to be opened for the +- file (see |:sp|). +- +- Dragging a file in with Shift held down in insert mode inserts the pathname of +- the file. +- +- :browse :w opens a standard RISC OS save box. +- :browse :e opens a directory viewer. +- +- For fonts, you have the choice of the system font, an outline font, the system +- font via ZapRedraw and any of the Zap fonts via ZapRedraw: > +- +- :set guifont= +- < To use the system font via the VDU drivers. Supports +- bold and underline. +- > +- :set guifont=Corpus.Medium +- < Use the named outline font. You can use any font, but +- only monospaced ones like Corpus look right. +- > +- :set guifont=Corpus.Medium:w8:h12:b:i +- < As before, but with size of 8 point by 12 point, and +- in bold italic. +- If only one of width and height is given then that +- value is used for both. If neither is given then 10 +- point is used. +- +- Thanks to John Kortink, Vim can use the ZapRedraw module. Start the font name +- with "!" (or "!!" for double height), like this: > +- +- :set guifont=!! +- < Use the system font, but via ZapRedraw. This gives a +- faster redraw on StrongARM processors, but you can't +- get bold or italic text. Double height. +- > +- :set guifont=!script +- < Uses the named Zap font (a directory in VimFont$Path). +- The redraw is the same speed as for "!!", but you get +- a nicer looking font. +- Only the "man+" and "script" fonts are supplied +- currently, but you can use any of the Zap fonts if +- they are in VimFont$Path. +- Vim will try to load font files "0", "B", "I" and "IB" +- from the named directory. Only "0" (normal style) MUST +- be present. Link files are not currently supported. +- +- Note that when using ZapRedraw the edit bar is drawn in front of the character +- you are on rather than behind it. Also redraw is incorrect for screen modes +- with eigen values of 0. If the font includes control characters then you can +- get Vim to display them by changing the 'isprint' option. +- +- If you find the scrolling is too slow on your machine, try experimenting +- with the 'scrolljump' and 'ttyscroll' options. +- +- In particular, StrongARM users may find that: > +- +- :set ttyscroll=0 +- +- makes scrolling faster in high-color modes. +- +- ============================================================================= +- *riscos-remote* +- 5. Remote use (telnet) +- +- I have included a built-in termcap entry, but you can edit the termcap file to +- allow other codes to be used if you want to use Vim from a remote terminal. +- +- Although I do not have an internet connection to my Acorn, I have managed to +- run Vim in a FreeTerm window using the loopback connection. +- +- It seems to work pretty well now, using "*vi -T ansi". +- +- ============================================================================== +- *riscos-temp-files* +- 6. Temporary files +- +- If Vim crashes then the swap and backup files (if any) will be in the +- directories set with the 'directory' and 'bdir' options. By default the swap +- files are in (i.e. inside !Scrap) and backups are in the +- directory you were saving to. Vim will allow you to try and recover the file +- when you next try to edit it. +- +- To see a list of swap files, press and type "*vi -r". +- +- Vim no longer brings up ATTENTION warnings if you try to edit two files with +- the same name in different directories. +- +- However, it also no longer warns if you try to edit the same file twice (with +- two copies of Vim), though you will still be warned when you save that the +- datestamp has changed. +- +- ============================================================================== +- *riscos-interrupt* +- 7. Interrupting +- +- To break out of a looping macro, or similar, hold down Escape in the +- command-line version, or press CTRL-C in the GUI version. +- +- ============================================================================== +- *riscos-memory* +- 8. Memory usage +- +- Vim will use dynamic areas on RISC OS 3.5 or later. If you can use them on +- older machines then edit the !RunTxt and GVim files. I don't know what UnixLib +- does by default on these machines so I'm playing safe. +- +- It doesn't work at all well without dynamic areas, since it can't change its +- memory allocation once running. Hence you should edit "!Vim.GVim" and +- "!Vim.!RunTxt" to choose the best size for you. You probably need at least +- about 1400K. +- +- ============================================================================== +- *riscos-filetypes* +- 9. Filetypes +- +- You can now specify that autocommands are only executed for files of certain +- types. The filetype is given in the form &xxx, when xxx is the filetype. +- +- Filetypes must be specified by number (e.g. &fff for Text). +- +- The system has changed from version 5.3. The new sequence of events is: +- +- - A file is loaded. |'osfiletype'| is set to the RISC OS filetype. +- - Based on the filetype and pathname, Vim will try to set |'filetype'| to the +- Vim-type of the file. +- - Setting this option may load syntax files and perform other actions. +- - Saving the file will give it a filetype of |'osfiletype'|. +- +- Some examples may make this clearer: +- +- Kind of file loaded osfiletype filetype ~ +- C code "c.hellow" Text (&fff) C +- LaTeX document LaTeX (&2a8) TeX +- Draw document DrawFile (&aff) (not changed) +- +- ============================================================================== +- *riscos-shell* +- 10. The shell +- +- - Bangs (!s) are only replaced if they are followed by a space or end-of-line, +- since many pathnames contain them. +- +- - You can prefix the command with "~", which stops any output from being +- displayed. This also means that you don't have to press afterwards, +- and stops the screen from being redrawn. {only in the GUI version} +- +- ============================================================================== +- *riscos-porting* +- 11. Porting new releases to RISC OS +- +- Downloading everything you need: +- +- - Get the latest source distribution (see www.vim.org) +- - Get the runtime environment files (e.g. these help files) +- - Get the RISC OS binary distribution (if possible) +- +- +- Unarchiving: +- +- - Create a raFS disk and put the archives on it +- - Un-gzip them +- - Un-tar them (*tar xELf 50 archive/tar) +- +- +- Recompiling the sources: +- +- - Create c, s, and h directories. +- - Put all the header files in "h". \ +- - Put all the C files in "c". | And lose the extensions +- - Put the assembler file ("swis/s") in "s". / +- - Rename all the files in "proto" to "h", like this: +- raFS::VimSrc.source.proto.file/pro +- becomes +- raFS::VimSrc.source.h.file_pro +- - In the files "h.proto" and "c.termlib", search and replace +- .pro" +- with +- _pro.h" +- - Create a simple Makefile if desired and do "*make -k". +- Use "CC = gcc -DRISCOS -DUSE_GUI -O2 -x c" in the Makefile. +- - Save the binary as !Vim.Vim in the binary distribution. +- +- +- Updating the run-time environment: +- +- - Replace old or missing files inside !Vim.Resources with the +- new files. +- - Remove files in "doc" not ending in "/txt", except for "tags". +- - Lose the extensions from the files in "doc". +- - Edit the "doc.tags" file. Remove extensions from the second column: > +- :%s/^\(.[^\t]*\t.*\)\.txt\t/\1\t/ +- - Remove extensions from the syntax files. Split them into two directories +- to avoid the 77 entry limit on old ADFS filesystems. +- - Edit "Vim:FileType" to match "*.c.*" as well as "*/c" and so on. +- Add filetype checking too. +- - Edit "Vim:Menu" and remove all the keys from the menus: > +- :%s/[^ \t]*// +- < + vim:tw=78:ts=8:ft=help:norl: +--- 1,12 ---- +! *os_risc.txt* For Vim version 7.3. Last change: 2011 May 10 + + + VIM REFERENCE MANUAL by Thomas Leonard + + + *riscos* *RISCOS* *RISC-OS* +! The RISC OS support has been removed from Vim with patch 7.3.187. +! If you would like to use Vim on RISC OS get the files from before that patch. + + + vim:tw=78:ts=8:ft=help:norl: +*** ../vim-7.3.186/src/version.c 2011-05-10 16:12:40.000000000 +0200 +--- src/version.c 2011-05-10 16:37:20.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 187, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +81. At social functions you introduce your husband as "my domain server." + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.188 b/source/ap/vim/patches/7.3.188 new file mode 100644 index 00000000..f5845430 --- /dev/null +++ b/source/ap/vim/patches/7.3.188 @@ -0,0 +1,184 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.188 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.188 +Problem: More RISC OS files to remove. +Solution: Remove them. Update the file list. +Files: src/proto/gui_riscos.pro, src/proto/os_riscos.pro, Filelist + + +*** ../vim-7.3.187/src/proto/gui_riscos.pro 2010-08-15 21:57:28.000000000 +0200 +--- src/proto/gui_riscos.pro 1970-01-01 01:00:00.000000000 +0100 +*************** +*** 1,66 **** +- /* Prototypes for gui_riscos.c +- * Based on gui_x11_pro.h (10 March 2002 version) +- */ +- void gui_mch_prepare __ARGS((int *argc, char **argv)); +- int gui_mch_init_check __ARGS((void)); +- int gui_mch_init __ARGS((void)); +- void gui_mch_uninit __ARGS((void)); +- void gui_mch_new_colors __ARGS((void)); +- int gui_mch_open __ARGS((void)); +- void gui_init_tooltip_font __ARGS((void)); +- void gui_init_menu_font __ARGS((void));void gui_mch_exit __ARGS((int rc)); +- int gui_mch_get_winpos __ARGS((int *x, int *y)); +- void gui_mch_set_winpos __ARGS((int x, int y)); +- void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height)); +- void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h)); +- int gui_mch_init_font __ARGS((char_u *font_name, int do_fontset)); +- GuiFont gui_mch_get_font __ARGS((char_u *name, int giveErrorIfMissing)); +- int gui_mch_adjust_charheight __ARGS((void)); +- void gui_mch_set_font __ARGS((GuiFont font)); +- void gui_mch_set_fontset __ARGS((GuiFontset fontset)); +- void gui_mch_free_font __ARGS((GuiFont font)); +- void gui_mch_free_fontset __ARGS((GuiFontset fontset)); +- GuiFontset gui_mch_get_fontset __ARGS((char_u *name, int giveErrorIfMissing, int fixed_width)); +- guicolor_T gui_mch_get_color __ARGS((char_u *reqname)); +- void gui_mch_set_fg_color __ARGS((guicolor_T color)); +- void gui_mch_set_bg_color __ARGS((guicolor_T color)); +- void gui_mch_draw_string __ARGS((int row, int col, char_u *s, int len, int flags)); +- int gui_mch_haskey __ARGS((char_u *name)); +- void gui_mch_beep __ARGS((void)); +- void gui_mch_flash __ARGS((int msec)); +- void gui_mch_invert_rectangle __ARGS((int r, int c, int nr, int nc)); +- void gui_mch_iconify __ARGS((void)); +- void gui_mch_set_foreground __ARGS((void)); +- void gui_mch_draw_hollow_cursor __ARGS((guicolor_T color)); +- void gui_mch_draw_part_cursor __ARGS((int w, int h, guicolor_T color)); +- void gui_mch_update __ARGS((void)); +- int gui_mch_wait_for_chars __ARGS((long wtime)); +- void gui_mch_flush __ARGS((void)); +- void gui_mch_clear_block __ARGS((int row1, int col1, int row2, int col2)); +- void gui_mch_clear_all __ARGS((void)); +- void gui_mch_delete_lines __ARGS((int row, int num_lines)); +- void gui_mch_insert_lines __ARGS((int row, int num_lines)); +- void clip_mch_lose_selection __ARGS((VimClipboard *cbd)); +- int clip_mch_own_selection __ARGS((VimClipboard *cbd)); +- void clip_mch_request_selection __ARGS((VimClipboard *cbd)); +- void clip_mch_set_selection __ARGS((VimClipboard *cbd)); +- void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey)); +- void gui_mch_menu_hidden __ARGS((vimmenu_T *menu, int hidden)); +- void gui_mch_draw_menubar __ARGS((void)); +- void gui_mch_set_blinking __ARGS((long waittime, long on, long off)); +- void gui_mch_stop_blink __ARGS((void)); +- void gui_mch_start_blink __ARGS((void)); +- void process_event __ARGS((int event, int *block)); +- void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu)); +- long_u gui_mch_get_rgb __ARGS((guicolor_T pixel)); +- void gui_mch_getmouse __ARGS((int *x, int *y)); +- void gui_mch_setmouse __ARGS((int x, int y)); +- void gui_mch_drawsign __ARGS((int row, int col, int typenr)); +- void gui_mch_destroy_sign __ARGS((XImage *sign)); +- void gui_mch_mousehide __ARGS((int hide)); +- void mch_set_mouse_shape __ARGS((int shape)); +- void gui_mch_menu_set_tip __ARGS((vimmenu_T *menu)); +- +- void ro_redraw_title __ARGS((int window)); +- int ro_ok_to_quit __ARGS((void)); +- /* vim: set ft=c : */ +--- 0 ---- +*** ../vim-7.3.187/src/proto/os_riscos.pro 2010-08-15 21:57:28.000000000 +0200 +--- src/proto/os_riscos.pro 1970-01-01 01:00:00.000000000 +0100 +*************** +*** 1,49 **** +- /* os_riscos.c */ +- void mch_write __ARGS((char_u *s, int len)); +- int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt)); +- int mch_char_avail __ARGS((void)); +- long_u mch_avail_mem __ARGS((int special)); +- void mch_delay __ARGS((long msec, int ignoreinput)); +- void mch_suspend __ARGS((void)); +- void mch_init __ARGS((void)); +- int mch_check_win __ARGS((int argc, char **argv)); +- int mch_input_isatty __ARGS((void)); +- int mch_can_restore_title __ARGS((void)); +- int mch_can_restore_icon __ARGS((void)); +- void mch_settitle __ARGS((char_u *title, char_u *icon)); +- void mch_restore_title __ARGS((int which)); +- int mch_get_user_name __ARGS((char_u *s, int len)); +- void mch_get_host_name __ARGS((char_u *s, int len)); +- long mch_get_pid __ARGS((void)); +- int mch_dirname __ARGS((char_u *buf, int len)); +- int mch_FullName __ARGS((char_u *fname, char_u *buf, int len, int force)); +- int mch_isFullName __ARGS((char_u *fname)); +- long mch_getperm __ARGS((char_u *name)); +- int mch_setperm __ARGS((char_u *name, long perm)); +- void mch_hide __ARGS((char_u *name)); +- int mch_isdir __ARGS((char_u *name)); +- int mch_can_exe __ARGS((char_u *name)); +- int mch_nodetype __ARGS((char_u *name)); +- void mch_early_init __ARGS((void)); +- void mch_exit __ARGS((int r)); +- void mch_settmode __ARGS((int tmode)); +- void mch_setmouse __ARGS((int on)); +- int mch_screenmode __ARGS((char_u *arg)); +- int mch_get_shellsize __ARGS((void)); +- void mch_set_shellsize __ARGS((void)); +- void mch_new_shellsize __ARGS((void)); +- int mch_call_shell __ARGS((char_u *cmd, int options)); +- void mch_breakcheck __ARGS((void)); +- int mch_expandpath __ARGS((garray_T *gap, char_u *path, int flags)); +- int expand_section __ARGS((garray_T *gap, char_u *root, char_u *rest, int flags)); +- int mch_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags)); +- int mch_has_exp_wildcard __ARGS((char_u *p)); +- int mch_has_wildcard __ARGS((char_u *p)); +- int mch_remove __ARGS((char_u *file)); +- char_u *mch_munge_fname __ARGS((char_u *fname)); +- int ro_buflist_add __ARGS((char_u *old_name)); +- int mch_chdir __ARGS((char_u *dir)); +- void mch_read_filetype __ARGS((char_u *file)); +- void mch_set_filetype __ARGS((char_u *file, char_u *type)); +- int mch_check_filetype __ARGS((char_u *fname, char_u *type)); +- /* vim: set ft=c : */ +--- 0 ---- +*** ../vim-7.3.187/Filelist 2011-03-22 18:10:34.000000000 +0100 +--- Filelist 2011-05-10 17:19:21.000000000 +0200 +*************** +*** 428,435 **** + README_os390.txt \ + src/Make_mint.mak \ + src/Make_ro.mak \ +- src/gui_riscos.c \ +- src/gui_riscos.h \ + src/if_sniff.c \ + src/infplist.xml \ + src/link.390 \ +--- 428,433 ---- +*************** +*** 437,446 **** + src/os_beos.h \ + src/os_beos.rsrc \ + src/os_mint.h \ +- src/os_riscos.c \ +- src/os_riscos.h \ +- src/proto/gui_riscos.pro \ +- src/proto/os_riscos.pro \ + src/os_vms_fix.com \ + src/toolbar.phi \ + +--- 435,440 ---- +*** ../vim-7.3.187/src/version.c 2011-05-10 16:41:13.000000000 +0200 +--- src/version.c 2011-05-10 17:20:50.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 188, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +83. Batteries in the TV remote now last for months. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.189 b/source/ap/vim/patches/7.3.189 new file mode 100644 index 00000000..f7a9667c --- /dev/null +++ b/source/ap/vim/patches/7.3.189 @@ -0,0 +1,49 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.189 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.189 (after 7.3.186) +Problem: Can't build without +clipboard feature. (Christian Ebert) +Solution: Add the missing #ifdef. +Files: src/normal.c + + +*** ../vim-7.3.188/src/normal.c 2011-05-10 16:12:40.000000000 +0200 +--- src/normal.c 2011-05-10 17:25:26.000000000 +0200 +*************** +*** 1204,1212 **** +--- 1204,1215 ---- + #ifdef FEAT_EVAL + { + int regname = 0; ++ + /* Adjust the register according to 'clipboard', so that when + * "unnamed" is present it becomes '*' or '+' instead of '"'. */ ++ # ifdef FEAT_CLIPBOARD + adjust_clip_reg(®name); ++ # endif + set_reg_var(regname); + } + #endif +*** ../vim-7.3.188/src/version.c 2011-05-10 17:21:34.000000000 +0200 +--- src/version.c 2011-05-10 17:29:21.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 189, + /**/ + +-- +If your nose runs, and your feet smell, you might be upside down. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.190 b/source/ap/vim/patches/7.3.190 new file mode 100644 index 00000000..4adef8ab --- /dev/null +++ b/source/ap/vim/patches/7.3.190 @@ -0,0 +1,48 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.190 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.190 +Problem: When there is a "containedin" syntax argument highlighting may be + wrong. (Radek) +Solution: Reset current_next_list. (Ben Schmidt) +Files: src/syntax.c + + +*** ../vim-7.3.189/src/syntax.c 2011-04-11 16:56:29.000000000 +0200 +--- src/syntax.c 2011-05-19 12:02:43.000000000 +0200 +*************** +*** 2566,2571 **** +--- 2566,2574 ---- + #endif + update_si_attr(current_state.ga_len - 1); + ++ /* nextgroup= should not match in the end pattern */ ++ current_next_list = NULL; ++ + /* what matches next may be different now, clear it */ + next_match_idx = 0; + next_match_col = MAXCOL; +*** ../vim-7.3.189/src/version.c 2011-05-10 17:29:28.000000000 +0200 +--- src/version.c 2011-05-19 12:13:28.000000000 +0200 +*************** +*** 716,717 **** +--- 716,719 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 190, + /**/ + +-- +From "know your smileys": + :'-D Laughing so much that they're crying + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.191 b/source/ap/vim/patches/7.3.191 new file mode 100644 index 00000000..14b63cea --- /dev/null +++ b/source/ap/vim/patches/7.3.191 @@ -0,0 +1,526 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.191 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.191 +Problem: Still some RISC OS stuff to remove. +Solution: Remove files and lines. (Hong Xu) + Remove the 'osfiletype' option code. +Files: README_extra.txt, src/Make_ro.mak, src/INSTALL, src/Makefile, + src/buffer.c, src/eval.c, src/feature.h, src/option.c, + src/option.h, src/structs.h, src/version.c, src/pty.c, Filelist + + +*** ../vim-7.3.190/README_extra.txt 2010-08-15 21:57:32.000000000 +0200 +--- README_extra.txt 2011-05-19 12:35:16.000000000 +0200 +*************** +*** 13,21 **** + + src/os_amiga.* Files for the Amiga port. + +- src/gui_riscos.* +- src/os_riscos.* Files for the RISC OS port. +- + src/gui_beos.* + src/os_beos.* Files for the BeOS port. + +--- 13,18 ---- +*** ../vim-7.3.190/src/Make_ro.mak 2010-08-15 21:57:27.000000000 +0200 +--- src/Make_ro.mak 1970-01-01 01:00:00.000000000 +0100 +*************** +*** 1,135 **** +- # +- # Makefile for Vim on RISC OS - Andy Wingate +- # +- +- GCC = gcc -mthrowback +- CFLAGS = -DRISCOS -DFEAT_GUI +- CC = $(GCC) $(CFLAGS) -O2 +- # -DUP_BC_PC_EXTERN for term.c needed as BC defined in termlib.c and term.c +- +- TERMFLAG = -DUP_BC_PC_EXTERN +- +- ASMFLAGS = -throwback -objasm -gcc +- +- OBJS = o.buffer o.charset o.diff o.digraph o.edit o.eval o.ex_cmds o.ex_cmds2 \ +- o.ex_docmd o.ex_eval o.ex_getln o.fileio o.fold o.getchar \ +- o.hardcopy o.hashtab o.main o.mark o.mbyte \ +- o.memfile o.memline o.menu o.message o.misc1 o.misc2 o.move \ +- o.normal o.ops o.option o.popupmnu o.quickfix o.regexp o.screen \ +- o.search \ +- o.spell o.syntax o.tag o.term o.termlib o.ui o.undo o.version \ +- o.window o.os_riscos o.swis o.gui o.gui_riscos +- +- Vim: $(OBJS) +- $(GCC) -o Vim $(OBJS) +- +- install: Vim +- squeeze -v Vim @.!Vim.Vim +- +- clean: +- create o.!fake! 0 +- wipe o.* ~cf +- remove Vim +- +- o.swis: s.swis +- as $(ASMFLAGS) -o o.swis s.swis +- +- # Rules for object files +- +- o.%: c.% +- $(CC) -c $< -o $@ +- +- o.buffer: c.buffer +- +- o.charset: c.charset +- +- o.digraph: c.digraph +- +- o.diff: c.diff +- +- o.edit: c.edit +- +- o.eval: c.eval +- +- o.ex_cmds: c.ex_cmds +- +- o.ex_cmds2: c.ex_cmds2 +- +- o.ex_docmd: c.ex_docmd +- +- o.ex_eval: c.ex_eval +- +- o.ex_getln: c.ex_getln +- +- o.fileio: c.fileio +- +- o.fold: c.fold +- +- o.getchar: c.getchar +- +- o.hardcopy: c.hardcopy +- +- o.hashtab: c.hashtab +- +- o.gui: c.gui +- +- o.gui_riscos: c.gui_riscos +- +- o.main: c.main +- +- o.mark: c.mark +- +- o.mbyte: c.mbyte +- +- o.memfile: c.memfile +- +- o.memline: c.memline +- +- o.menu: c.menu +- +- o.message: c.message +- +- o.misc1: c.misc1 +- +- o.misc2: c.misc2 +- +- o.move: c.move +- +- o.normal: c.normal +- +- o.ops: c.ops +- +- o.option: c.option +- +- o.os_riscos: c.os_riscos +- +- o.pty: c.pty +- +- o.popupmnu: c.popupmnu +- +- o.quickfix: c.quickfix +- +- o.regexp: c.regexp +- +- o.screen: c.screen +- +- o.search: c.search +- +- o.spell: c.spell +- +- o.syntax: c.syntax +- +- o.tag: c.tag +- +- o.term: c.term +- $(CC) $(TERMFLAG) -c c.term -o o.term +- +- o.termlib: c.termlib +- +- o.ui: c.ui +- +- o.undo: c.undo +- +- o.version: c.version +- +- o.window: c.window +--- 0 ---- +*** ../vim-7.3.190/src/INSTALL 2010-08-15 21:57:28.000000000 +0200 +--- src/INSTALL 2011-05-19 12:36:17.000000000 +0200 +*************** +*** 6,14 **** + Contents: + 1. Generic + 2. Unix +! 3. RISC OS +! 4. OS/2 (with EMX 0.9b) +! 5. Atari MiNT + + See INSTALLami.txt for Amiga + See INSTALLmac.txt for Macintosh +--- 6,13 ---- + Contents: + 1. Generic + 2. Unix +! 3. OS/2 (with EMX 0.9b) +! 4. Atari MiNT + + See INSTALLami.txt for Amiga + See INSTALLmac.txt for Macintosh +*************** +*** 174,198 **** + ./configure --without-local-dir + + +! 3. RISC OS +! ============= +! +! Much file renaming is needed before you can compile anything. +! You'll need UnixLib to link against, GCC and GNU make. +! +! I suggest you get the RISC OS binary distribution, which includes the +! Templates file and the loader. +! +! Try here: http://www.ecs.soton.ac.uk/~tal197 +! +! Do +! :help riscos +! +! within the editor for more information, or read the +! ../runtime/doc/os_risc.txt help file. +! +! +! 4. OS/2 + ======= + + Summary: +--- 173,179 ---- + ./configure --without-local-dir + + +! 3. OS/2 + ======= + + Summary: +*************** +*** 237,243 **** + Check ../runtime/doc/os_os2.txt for additional info on running Vim. + + +! 5. Atari MiNT + ============= + + [NOTE: this is quite old, it might not work anymore] +--- 218,224 ---- + Check ../runtime/doc/os_os2.txt for additional info on running Vim. + + +! 4. Atari MiNT + ============= + + [NOTE: this is quite old, it might not work anymore] +*** ../vim-7.3.190/src/Makefile 2011-04-01 13:05:37.000000000 +0200 +--- src/Makefile 2011-05-19 12:37:52.000000000 +0200 +*************** +*** 29,35 **** + # - Uncomment the line "CONF_OPT_X = --without-x" if you have X11 but + # want to disable using X11 libraries. This speeds up starting Vim, + # but the window title will not be set and the X11 selection can not +! # used. + # - Uncomment the line "CONF_OPT_XSMP = --disable-xsmp" if you have the + # X11 Session Management Protocol (XSMP) library (libSM) but do not + # want to use it. +--- 29,35 ---- + # - Uncomment the line "CONF_OPT_X = --without-x" if you have X11 but + # want to disable using X11 libraries. This speeds up starting Vim, + # but the window title will not be set and the X11 selection can not +! # be used. + # - Uncomment the line "CONF_OPT_XSMP = --disable-xsmp" if you have the + # X11 Session Management Protocol (XSMP) library (libSM) but do not + # want to use it. +*************** +*** 730,741 **** + ### USL for Unix Systems Laboratories (SYSV 4.2) + #EXTRA_DEFS = -DUSL + +- ### RISCos on MIPS without X11 +- #EXTRA_DEFS = -DMIPS +- +- ### RISCos on MIPS with X11 +- #EXTRA_LIBS = -lsun +- + ### (6) A/UX 3.1.1 with gcc (Jim Jagielski) + #CC= gcc -D_POSIX_SOURCE + #CFLAGS= -O2 +--- 730,735 ---- +*************** +*** 1633,1639 **** + RSRC_DIR = os_mac_rsrc + + PRO_MANUAL = os_amiga.pro os_msdos.pro os_win16.pro os_win32.pro \ +! os_mswin.pro os_beos.pro os_vms.pro os_riscos.pro $(PERL_PRO) + + # Default target is making the executable and tools + all: $(VIMTARGET) $(TOOLS) languages $(GUI_BUNDLE) +--- 1627,1633 ---- + RSRC_DIR = os_mac_rsrc + + PRO_MANUAL = os_amiga.pro os_msdos.pro os_win16.pro os_win32.pro \ +! os_mswin.pro os_beos.pro os_vms.pro $(PERL_PRO) + + # Default target is making the executable and tools + all: $(VIMTARGET) $(TOOLS) languages $(GUI_BUNDLE) +*** ../vim-7.3.190/src/buffer.c 2011-05-05 17:32:40.000000000 +0200 +--- src/buffer.c 2011-05-19 13:09:25.000000000 +0200 +*************** +*** 1808,1816 **** + #ifdef FEAT_AUTOCMD + clear_string_option(&buf->b_p_ft); + #endif +- #ifdef FEAT_OSFILETYPE +- clear_string_option(&buf->b_p_oft); +- #endif + #ifdef FEAT_CINDENT + clear_string_option(&buf->b_p_cink); + clear_string_option(&buf->b_p_cino); +--- 1808,1813 ---- +*** ../vim-7.3.190/src/eval.c 2011-05-10 16:41:13.000000000 +0200 +--- src/eval.c 2011-05-19 13:09:43.000000000 +0200 +*************** +*** 12076,12084 **** + #ifdef FEAT_OLE + "ole", + #endif +- #ifdef FEAT_OSFILETYPE +- "osfiletype", +- #endif + #ifdef FEAT_PATH_EXTRA + "path_extra", + #endif +--- 12076,12081 ---- +*** ../vim-7.3.190/src/feature.h 2010-08-15 21:57:31.000000000 +0200 +--- src/feature.h 2011-05-19 13:09:56.000000000 +0200 +*************** +*** 506,520 **** + #endif + + /* +- * +osfiletype filetype checking in autocommand patterns. +- * Only on systems that support filetypes (RISC OS). +- */ +- #if 0 +- # define FEAT_OSFILETYPE +- # define DFLT_OFT "Text" +- #endif +- +- /* + * +viminfo reading/writing the viminfo file. Takes about 8Kbyte + * of code. + * VIMINFO_FILE Location of user .viminfo file (should start with $). +--- 506,511 ---- +*** ../vim-7.3.190/src/option.c 2011-04-28 17:24:54.000000000 +0200 +--- src/option.c 2011-05-19 13:11:42.000000000 +0200 +*************** +*** 140,148 **** + #define PV_MOD OPT_BUF(BV_MOD) + #define PV_MPS OPT_BUF(BV_MPS) + #define PV_NF OPT_BUF(BV_NF) +- #ifdef FEAT_OSFILETYPE +- # define PV_OFT OPT_BUF(BV_OFT) +- #endif + #ifdef FEAT_COMPL_FUNC + # define PV_OFU OPT_BUF(BV_OFU) + #endif +--- 140,145 ---- +*************** +*** 337,345 **** + static int p_mod; + static char_u *p_mps; + static char_u *p_nf; +- #ifdef FEAT_OSFILETYPE +- static char_u *p_oft; +- #endif + static int p_pi; + #ifdef FEAT_TEXTOBJ + static char_u *p_qe; +--- 334,339 ---- +*************** +*** 1901,1914 **** + (char_u *)NULL, PV_NONE, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, + {"osfiletype", "oft", P_STRING|P_ALLOCED|P_VI_DEF, +- #ifdef FEAT_OSFILETYPE +- (char_u *)&p_oft, PV_OFT, +- {(char_u *)DFLT_OFT, (char_u *)0L} +- #else + (char_u *)NULL, PV_NONE, +! {(char_u *)0L, (char_u *)0L} +! #endif +! SCRIPTID_INIT}, + {"paragraphs", "para", P_STRING|P_VI_DEF, + (char_u *)&p_para, PV_NONE, + {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp", +--- 1895,1902 ---- + (char_u *)NULL, PV_NONE, + {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, + {"osfiletype", "oft", P_STRING|P_ALLOCED|P_VI_DEF, + (char_u *)NULL, PV_NONE, +! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, + {"paragraphs", "para", P_STRING|P_VI_DEF, + (char_u *)&p_para, PV_NONE, + {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp", +*************** +*** 5282,5290 **** + #ifdef FEAT_AUTOCMD + check_string_option(&buf->b_p_ft); + #endif +- #ifdef FEAT_OSFILETYPE +- check_string_option(&buf->b_p_oft); +- #endif + #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) + check_string_option(&buf->b_p_cinw); + #endif +--- 5270,5275 ---- +*************** +*** 9665,9673 **** + case PV_MA: return (char_u *)&(curbuf->b_p_ma); + case PV_MOD: return (char_u *)&(curbuf->b_changed); + case PV_NF: return (char_u *)&(curbuf->b_p_nf); +- #ifdef FEAT_OSFILETYPE +- case PV_OFT: return (char_u *)&(curbuf->b_p_oft); +- #endif + case PV_PI: return (char_u *)&(curbuf->b_p_pi); + #ifdef FEAT_TEXTOBJ + case PV_QE: return (char_u *)&(curbuf->b_p_qe); +--- 9650,9655 ---- +*************** +*** 10018,10026 **** + /* Don't copy 'filetype', it must be detected */ + buf->b_p_ft = empty_option; + #endif +- #ifdef FEAT_OSFILETYPE +- buf->b_p_oft = vim_strsave(p_oft); +- #endif + buf->b_p_pi = p_pi; + #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) + buf->b_p_cinw = vim_strsave(p_cinw); +--- 10000,10005 ---- +*** ../vim-7.3.190/src/option.h 2011-02-12 13:59:55.000000000 +0100 +--- src/option.h 2011-05-19 13:11:46.000000000 +0200 +*************** +*** 984,992 **** + , BV_MOD + , BV_MPS + , BV_NF +- #ifdef FEAT_OSFILETYPE +- , BV_OFT +- #endif + #ifdef FEAT_COMPL_FUNC + , BV_OFU + #endif +--- 984,989 ---- +*** ../vim-7.3.190/src/structs.h 2011-05-10 16:41:13.000000000 +0200 +--- src/structs.h 2011-05-19 13:11:58.000000000 +0200 +*************** +*** 1530,1538 **** + int b_p_ml_nobin; /* b_p_ml saved for binary mode */ + int b_p_ma; /* 'modifiable' */ + char_u *b_p_nf; /* 'nrformats' */ +- #ifdef FEAT_OSFILETYPE +- char_u *b_p_oft; /* 'osfiletype' */ +- #endif + int b_p_pi; /* 'preserveindent' */ + #ifdef FEAT_TEXTOBJ + char_u *b_p_qe; /* 'quoteescape' */ +--- 1530,1535 ---- +*** ../vim-7.3.190/src/version.c 2011-05-19 12:14:03.000000000 +0200 +--- src/version.c 2011-05-19 13:26:42.000000000 +0200 +*************** +*** 426,436 **** + "-ole", + # endif + #endif +- #ifdef FEAT_OSFILETYPE +- "+osfiletype", +- #else +- "-osfiletype", +- #endif + #ifdef FEAT_PATH_EXTRA + "+path_extra", + #else +--- 426,431 ---- +*** ../vim-7.3.190/src/pty.c 2011-04-11 14:24:33.000000000 +0200 +--- src/pty.c 2011-05-19 12:43:26.000000000 +0200 +*************** +*** 123,130 **** + static void initmaster __ARGS((int)); + + /* +! * Open all ptys with O_NOCTTY, just to be on the safe side +! * (RISCos mips breaks otherwise) + */ + #ifndef O_NOCTTY + # define O_NOCTTY 0 +--- 123,129 ---- + static void initmaster __ARGS((int)); + + /* +! * Open all ptys with O_NOCTTY, just to be on the safe side. + */ + #ifndef O_NOCTTY + # define O_NOCTTY 0 +*** ../vim-7.3.190/Filelist 2011-05-10 17:21:34.000000000 +0200 +--- Filelist 2011-05-19 13:37:25.000000000 +0200 +*************** +*** 427,433 **** + $(SRC_VMS) \ + README_os390.txt \ + src/Make_mint.mak \ +- src/Make_ro.mak \ + src/if_sniff.c \ + src/infplist.xml \ + src/link.390 \ +--- 427,432 ---- +*** ../vim-7.3.190/src/version.c 2011-05-19 12:14:03.000000000 +0200 +--- src/version.c 2011-05-19 13:26:42.000000000 +0200 +*************** +*** 716,717 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 191, + /**/ + +-- +From "know your smileys": + :-& Eating spaghetti + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.192 b/source/ap/vim/patches/7.3.192 new file mode 100644 index 00000000..5dab19b4 --- /dev/null +++ b/source/ap/vim/patches/7.3.192 @@ -0,0 +1,61 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.192 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.192 +Problem: Ex command ":s/ \?/ /g" splits multi-byte characters into bytes. + (Dominique Pelle) +Solution: Advance over whole character instead of one byte. +Files: src/ex_cmds.c + + +*** ../vim-7.3.191/src/ex_cmds.c 2011-05-10 16:41:13.000000000 +0200 +--- src/ex_cmds.c 2011-05-19 14:23:33.000000000 +0200 +*************** +*** 4625,4631 **** + * for a match in this line again. */ + skip_match = TRUE; + else +! ++matchcol; /* search for a match at next column */ + goto skip; + } + +--- 4625,4639 ---- + * for a match in this line again. */ + skip_match = TRUE; + else +! { +! /* search for a match at next column */ +! #ifdef FEAT_MBYTE +! if (has_mbyte) +! matchcol += mb_ptr2len(sub_firstline + matchcol); +! else +! #endif +! ++matchcol; +! } + goto skip; + } + +*** ../vim-7.3.191/src/version.c 2011-05-19 13:40:47.000000000 +0200 +--- src/version.c 2011-05-19 14:28:44.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 192, + /**/ + +-- +From "know your smileys": + :-F Bucktoothed vampire with one tooth missing + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.193 b/source/ap/vim/patches/7.3.193 new file mode 100644 index 00000000..acee9ec0 --- /dev/null +++ b/source/ap/vim/patches/7.3.193 @@ -0,0 +1,70 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.193 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.193 +Problem: In the command line window ":close" doesn't work properly. (Tony + Mechelynck) +Solution: Use Ctrl_C instead of K_IGNORE for cmdwin_result. (Jean-Rene + David) +Files: src/ex_docmd.c, src/ex_getln.c + + +*** ../vim-7.3.192/src/ex_docmd.c 2011-05-10 16:41:13.000000000 +0200 +--- src/ex_docmd.c 2011-05-19 14:42:56.000000000 +0200 +*************** +*** 6472,6478 **** + { + # ifdef FEAT_CMDWIN + if (cmdwin_type != 0) +! cmdwin_result = K_IGNORE; + else + # endif + if (!text_locked() +--- 6472,6478 ---- + { + # ifdef FEAT_CMDWIN + if (cmdwin_type != 0) +! cmdwin_result = Ctrl_C; + else + # endif + if (!text_locked() +*** ../vim-7.3.192/src/ex_getln.c 2011-04-28 17:21:49.000000000 +0200 +--- src/ex_getln.c 2011-05-19 14:42:56.000000000 +0200 +*************** +*** 6324,6329 **** +--- 6324,6335 ---- + ccline.cmdbuff = vim_strsave((char_u *)"qa"); + cmdwin_result = CAR; + } ++ else if (cmdwin_result == Ctrl_C) ++ { ++ /* :q or :close, don't execute any command ++ * and don't modify the cmd window. */ ++ ccline.cmdbuff = NULL; ++ } + else + ccline.cmdbuff = vim_strsave(ml_get_curline()); + if (ccline.cmdbuff == NULL) +*** ../vim-7.3.192/src/version.c 2011-05-19 14:30:07.000000000 +0200 +--- src/version.c 2011-05-19 14:48:12.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 193, + /**/ + +-- +There's no place like $(HOME)! + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.194 b/source/ap/vim/patches/7.3.194 new file mode 100644 index 00000000..5a73c009 --- /dev/null +++ b/source/ap/vim/patches/7.3.194 @@ -0,0 +1,48 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.194 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.194 +Problem: When "b" is a symlink to directory "a", resolve("b/") doesn't + result in "a/". (ZyX) +Solution: Remove the trailing slash. (Jean-Rene David) +Files: src/eval.c + + +*** ../vim-7.3.193/src/eval.c 2011-05-19 13:40:47.000000000 +0200 +--- src/eval.c 2011-05-19 14:55:27.000000000 +0200 +*************** +*** 14980,14986 **** +--- 14980,14989 ---- + + len = STRLEN(p); + if (len > 0 && after_pathsep(p, p + len)) ++ { + has_trailing_pathsep = TRUE; ++ p[len - 1] = NUL; /* the trailing slash breaks readlink() */ ++ } + + q = getnextcomp(p); + if (*q != NUL) +*** ../vim-7.3.193/src/version.c 2011-05-19 14:50:49.000000000 +0200 +--- src/version.c 2011-05-19 14:54:40.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 194, + /**/ + +-- +Momento mori, ergo carpe diem + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.195 b/source/ap/vim/patches/7.3.195 new file mode 100644 index 00000000..ba1fc219 --- /dev/null +++ b/source/ap/vim/patches/7.3.195 @@ -0,0 +1,199 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.195 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.195 +Problem: "} else" causes following lines to be indented too much. (Rouben + Rostamian) +Solution: Better detection for the "else". (Lech Lorens) +Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok + + +*** ../vim-7.3.194/src/misc1.c 2011-05-10 16:41:13.000000000 +0200 +--- src/misc1.c 2011-05-19 16:30:28.000000000 +0200 +*************** +*** 5482,5489 **** + * Recognize a line that starts with '{' or '}', or ends with ';', ',', '{' or + * '}'. + * Don't consider "} else" a terminated line. +! * Don't consider a line where there are unmatched opening braces before '}', +! * ';' or ',' a terminated line. + * Return the character terminating the line (ending char's have precedence if + * both apply in order to determine initializations). + */ +--- 5482,5489 ---- + * Recognize a line that starts with '{' or '}', or ends with ';', ',', '{' or + * '}'. + * Don't consider "} else" a terminated line. +! * If a line begins with an "else", only consider it terminated if no unmatched +! * opening braces follow (handle "else { foo();" correctly). + * Return the character terminating the line (ending char's have precedence if + * both apply in order to determine initializations). + */ +*************** +*** 5493,5513 **** + int incl_open; /* include '{' at the end as terminator */ + int incl_comma; /* recognize a trailing comma */ + { +! char_u found_start = 0; +! unsigned n_open = 0; + + s = cin_skipcomment(s); + + if (*s == '{' || (*s == '}' && !cin_iselse(s))) + found_start = *s; + + while (*s) + { + /* skip over comments, "" strings and 'c'haracters */ + s = skip_string(cin_skipcomment(s)); + if (*s == '}' && n_open > 0) + --n_open; +! if (n_open == 0 + && (*s == ';' || *s == '}' || (incl_comma && *s == ',')) + && cin_nocode(s + 1)) + return *s; +--- 5493,5517 ---- + int incl_open; /* include '{' at the end as terminator */ + int incl_comma; /* recognize a trailing comma */ + { +! char_u found_start = 0; +! unsigned n_open = 0; +! int is_else = FALSE; + + s = cin_skipcomment(s); + + if (*s == '{' || (*s == '}' && !cin_iselse(s))) + found_start = *s; + ++ if (!found_start) ++ is_else = cin_iselse(s); ++ + while (*s) + { + /* skip over comments, "" strings and 'c'haracters */ + s = skip_string(cin_skipcomment(s)); + if (*s == '}' && n_open > 0) + --n_open; +! if ((!is_else || n_open == 0) + && (*s == ';' || *s == '}' || (incl_comma && *s == ',')) + && cin_nocode(s + 1)) + return *s; +*** ../vim-7.3.194/src/testdir/test3.in 2011-05-10 13:38:23.000000000 +0200 +--- src/testdir/test3.in 2011-05-19 16:29:01.000000000 +0200 +*************** +*** 1345,1351 **** + + STARTTEST + :set cino& +! 2kdd=][ + ENDTEST + + void func(void) +--- 1345,1351 ---- + + STARTTEST + :set cino& +! 2kdd=4][ + ENDTEST + + void func(void) +*************** +*** 1359,1364 **** +--- 1359,1392 ---- + printf("Foo!\n"); + } + ++ void func1(void) ++ { ++ char* tab[] = {"foo", "bar", ++ "baz", "quux", ++ "this line used", "to be indented incorrectly"}; ++ foo(); ++ } ++ ++ void func2(void) ++ { ++ int tab[] = ++ {1, 2, ++ 3, 4, ++ 5, 6}; ++ ++ printf("This line used to be indented incorrectly.\n"); ++ } ++ ++ void func3(void) ++ { ++ int tab[] = { ++ 1, 2, ++ 3, 4, ++ 5, 6}; ++ ++ printf("Don't you dare indent this line incorrectly!\n); ++ } ++ + STARTTEST + :set cino& + 2kdd=][ +*** ../vim-7.3.194/src/testdir/test3.ok 2011-05-10 13:38:23.000000000 +0200 +--- src/testdir/test3.ok 2011-05-19 16:29:01.000000000 +0200 +*************** +*** 1216,1221 **** +--- 1216,1249 ---- + printf("Foo!\n"); + } + ++ void func1(void) ++ { ++ char* tab[] = {"foo", "bar", ++ "baz", "quux", ++ "this line used", "to be indented incorrectly"}; ++ foo(); ++ } ++ ++ void func2(void) ++ { ++ int tab[] = ++ {1, 2, ++ 3, 4, ++ 5, 6}; ++ ++ printf("This line used to be indented incorrectly.\n"); ++ } ++ ++ void func3(void) ++ { ++ int tab[] = { ++ 1, 2, ++ 3, 4, ++ 5, 6}; ++ ++ printf("Don't you dare indent this line incorrectly!\n); ++ } ++ + + void func(void) + { +*** ../vim-7.3.194/src/version.c 2011-05-19 14:59:07.000000000 +0200 +--- src/version.c 2011-05-19 16:34:16.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 195, + /**/ + +-- +I AM THANKFUL... +...for the taxes that I pay because it means that I am employed. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.196 b/source/ap/vim/patches/7.3.196 new file mode 100644 index 00000000..0d6be8c9 --- /dev/null +++ b/source/ap/vim/patches/7.3.196 @@ -0,0 +1,224 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.196 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.196 +Problem: Can't intercept a character that is going to be inserted. +Solution: Add the InsertCharPre autocommand event. (Jakson A. Aquino) +Files: runtime/doc/autocmd.txt, runtime/doc/eval.txt, + runtime/doc/map.txt, src/edit.c, src/eval.c, src/fileio.c, + src/vim.h + + +*** ../mercurial/vim73/runtime/doc/autocmd.txt 2011-04-28 19:01:26.000000000 +0200 +--- runtime/doc/autocmd.txt 2011-05-19 17:12:17.000000000 +0200 +*************** +*** 299,304 **** +--- 299,306 ---- + |InsertEnter| starting Insert mode + |InsertChange| when typing while in Insert or Replace mode + |InsertLeave| when leaving Insert mode ++ |InsertCharPre| when a character was typed in Insert mode, before ++ inserting it + + |ColorScheme| after loading a color scheme + +*************** +*** 657,662 **** +--- 659,675 ---- + indicates the new mode. + Be careful not to move the cursor or do + anything else that the user does not expect. ++ *InsertCharPre* ++ InsertCharPre When a character is typed in Insert mode, ++ before inserting the char. ++ The |v:char| variable indicates the char typed ++ and can be changed during the event to insert ++ a different character. When |v:char| is set ++ to more than one character this text is ++ inserted literally. ++ It is not allowed to change the text |textlock|. ++ The event is not triggered when 'paste' is ++ set. + *InsertEnter* + InsertEnter Just before starting Insert mode. Also for + Replace mode and Virtual Replace mode. The +*** ../mercurial/vim73/runtime/doc/eval.txt 2011-05-19 12:22:41.000000000 +0200 +--- runtime/doc/eval.txt 2011-05-19 16:55:58.000000000 +0200 +*************** +*** 1293,1298 **** +--- 1293,1299 ---- + *v:char* *char-variable* + v:char Argument for evaluating 'formatexpr' and used for the typed + character when using in an abbreviation |:map-|. ++ It is also used by the |InsertPreChar| event. + + *v:charconvert_from* *charconvert_from-variable* + v:charconvert_from +*** ../mercurial/vim73/runtime/doc/map.txt 2011-05-10 17:17:38.000000000 +0200 +--- runtime/doc/map.txt 2011-05-19 16:40:34.000000000 +0200 +*************** +*** 226,232 **** + + For abbreviations |v:char| is set to the character that was typed to trigger + the abbreviation. You can use this to decide how to expand the {lhs}. You +! can't change v:char and you should not insert it. + + Be very careful about side effects! The expression is evaluated while + obtaining characters, you may very well make the command dysfunctional. +--- 226,232 ---- + + For abbreviations |v:char| is set to the character that was typed to trigger + the abbreviation. You can use this to decide how to expand the {lhs}. You +! you should not either insert or change the v:char. + + Be very careful about side effects! The expression is evaluated while + obtaining characters, you may very well make the command dysfunctional. +*** ../mercurial/vim73/src/edit.c 2011-05-10 14:22:10.000000000 +0200 +--- src/edit.c 2011-05-19 17:20:53.000000000 +0200 +*************** +*** 1381,1390 **** + goto do_intr; + #endif + + /* + * Insert a nomal character. + */ +! normalchar: + #ifdef FEAT_SMARTINDENT + /* Try to perform smart-indenting. */ + ins_try_si(c); +--- 1381,1425 ---- + goto do_intr; + #endif + ++ normalchar: + /* + * Insert a nomal character. + */ +! #ifdef FEAT_AUTOCMD +! if (!p_paste) +! { +! /* Trigger the InsertCharPre event. Lock the text to avoid +! * weird things from happening. */ +! set_vim_var_char(c); +! ++textlock; +! if (apply_autocmds(EVENT_INSERTCHARPRE, NULL, NULL, +! FALSE, curbuf)) +! { +! /* Get the new value of v:char. If it is more than one +! * character insert it literally. */ +! char_u *s = get_vim_var_str(VV_CHAR); +! if (MB_CHARLEN(s) > 1) +! { +! if (stop_arrow() != FAIL) +! { +! ins_str(s); +! AppendToRedobuffLit(s, -1); +! } +! c = NUL; +! } +! else +! c = PTR2CHAR(s); +! } +! +! set_vim_var_string(VV_CHAR, NULL, -1); +! --textlock; +! +! /* If the new value is an empty string then don't insert a +! * char. */ +! if (c == NUL) +! break; +! } +! #endif + #ifdef FEAT_SMARTINDENT + /* Try to perform smart-indenting. */ + ins_try_si(c); +*************** +*** 3491,3501 **** + return; + } + p += len; +! #ifdef FEAT_MBYTE +! c = mb_ptr2char(p); +! #else +! c = *p; +! #endif + ins_compl_addleader(c); + } + +--- 3526,3532 ---- + return; + } + p += len; +! c = PTR2CHAR(p); + ins_compl_addleader(c); + } + +*** ../mercurial/vim73/src/eval.c 2011-05-19 14:59:07.000000000 +0200 +--- src/eval.c 2011-05-19 16:40:39.000000000 +0200 +*************** +*** 352,358 **** + {VV_NAME("swapname", VAR_STRING), VV_RO}, + {VV_NAME("swapchoice", VAR_STRING), 0}, + {VV_NAME("swapcommand", VAR_STRING), VV_RO}, +! {VV_NAME("char", VAR_STRING), VV_RO}, + {VV_NAME("mouse_win", VAR_NUMBER), 0}, + {VV_NAME("mouse_lnum", VAR_NUMBER), 0}, + {VV_NAME("mouse_col", VAR_NUMBER), 0}, +--- 352,358 ---- + {VV_NAME("swapname", VAR_STRING), VV_RO}, + {VV_NAME("swapchoice", VAR_STRING), 0}, + {VV_NAME("swapcommand", VAR_STRING), VV_RO}, +! {VV_NAME("char", VAR_STRING), 0}, + {VV_NAME("mouse_win", VAR_NUMBER), 0}, + {VV_NAME("mouse_lnum", VAR_NUMBER), 0}, + {VV_NAME("mouse_col", VAR_NUMBER), 0}, +*** ../mercurial/vim73/src/fileio.c 2011-05-10 16:41:13.000000000 +0200 +--- src/fileio.c 2011-05-19 16:40:39.000000000 +0200 +*************** +*** 7662,7667 **** +--- 7662,7668 ---- + {"InsertChange", EVENT_INSERTCHANGE}, + {"InsertEnter", EVENT_INSERTENTER}, + {"InsertLeave", EVENT_INSERTLEAVE}, ++ {"InsertCharPre", EVENT_INSERTCHARPRE}, + {"MenuPopup", EVENT_MENUPOPUP}, + {"QuickFixCmdPost", EVENT_QUICKFIXCMDPOST}, + {"QuickFixCmdPre", EVENT_QUICKFIXCMDPRE}, +*** ../mercurial/vim73/src/vim.h 2011-05-10 16:41:13.000000000 +0200 +--- src/vim.h 2011-05-19 16:40:39.000000000 +0200 +*************** +*** 1274,1279 **** +--- 1274,1280 ---- + EVENT_WINENTER, /* after entering a window */ + EVENT_WINLEAVE, /* before leaving a window */ + EVENT_ENCODINGCHANGED, /* after changing the 'encoding' option */ ++ EVENT_INSERTCHARPRE, /* before inserting a char */ + EVENT_CURSORHOLD, /* cursor in same position for a while */ + EVENT_CURSORHOLDI, /* idem, in Insert mode */ + EVENT_FUNCUNDEFINED, /* if calling a function which doesn't exist */ +*** ../vim-7.3.195/src/version.c 2011-05-19 16:35:05.000000000 +0200 +--- src/version.c 2011-05-19 17:15:41.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 196, + /**/ + +-- +I AM THANKFUL... +...for the mess to clean after a party because it means I have +been surrounded by friends. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.197 b/source/ap/vim/patches/7.3.197 new file mode 100644 index 00000000..c33a2cb2 --- /dev/null +++ b/source/ap/vim/patches/7.3.197 @@ -0,0 +1,78 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.197 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.197 +Problem: When a QuickfixCmdPost event removes all errors, Vim still tries + to jump to the first error, resulting in E42. +Solution: Get the number of error after the autocmd event. (Mike Lundy) +Files: src/quickfix.c + + +*** ../mercurial/vim73/src/quickfix.c 2011-05-10 16:41:13.000000000 +0200 +--- src/quickfix.c 2011-05-19 17:34:11.000000000 +0200 +*************** +*** 2813,2829 **** + (eap->cmdidx != CMD_grepadd + && eap->cmdidx != CMD_lgrepadd), + *eap->cmdlinep); + #ifdef FEAT_AUTOCMD + if (au_name != NULL) + apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, + curbuf->b_fname, TRUE, curbuf); + #endif + if (res > 0 && !eap->forceit) +- { +- if (wp != NULL) +- qi = GET_LOC_LIST(wp); + qf_jump(qi, 0, 0, FALSE); /* display first error */ +- } + + mch_remove(fname); + vim_free(fname); +--- 2813,2833 ---- + (eap->cmdidx != CMD_grepadd + && eap->cmdidx != CMD_lgrepadd), + *eap->cmdlinep); ++ if (wp != NULL) ++ qi = GET_LOC_LIST(wp); + #ifdef FEAT_AUTOCMD + if (au_name != NULL) ++ { + apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, + curbuf->b_fname, TRUE, curbuf); ++ if (qi->qf_curlist < qi->qf_listcount) ++ res = qi->qf_lists[qi->qf_curlist].qf_count; ++ else ++ res = 0; ++ } + #endif + if (res > 0 && !eap->forceit) + qf_jump(qi, 0, 0, FALSE); /* display first error */ + + mch_remove(fname); + vim_free(fname); +*** ../vim-7.3.196/src/version.c 2011-05-19 17:25:36.000000000 +0200 +--- src/version.c 2011-05-19 17:41:50.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 197, + /**/ + +-- +I AM THANKFUL... +...for the clothes that fit a little too snug because it +means I have more than enough to eat. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.198 b/source/ap/vim/patches/7.3.198 new file mode 100644 index 00000000..5ef4a8aa --- /dev/null +++ b/source/ap/vim/patches/7.3.198 @@ -0,0 +1,403 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.198 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.198 +Problem: No completion for ":lang". +Solution: Get locales to complete from. (Dominique Pelle) +Files: src/eval.c, src/ex_cmds2.c, src/ex_getln.c, + src/proto/ex_cmds2.pro, src/proto/ex_getln.pro, src/vim.h + + +*** ../mercurial/vim73/src/eval.c 2011-05-19 17:25:36.000000000 +0200 +--- src/eval.c 2011-05-19 17:52:02.000000000 +0200 +*************** +*** 911,916 **** +--- 911,917 ---- + hash_clear(&compat_hashtab); + + free_scriptnames(); ++ free_locales(); + + /* global variables */ + vars_clear(&globvarht); +*** ../mercurial/vim73/src/ex_cmds2.c 2011-05-10 16:41:13.000000000 +0200 +--- src/ex_cmds2.c 2011-05-19 18:16:54.000000000 +0200 +*************** +*** 1476,1482 **** + #endif + + /* +! * Ask the user what to do when abondoning a changed buffer. + * Must check 'write' option first! + */ + void +--- 1476,1482 ---- + #endif + + /* +! * Ask the user what to do when abandoning a changed buffer. + * Must check 'write' option first! + */ + void +*************** +*** 4153,4158 **** +--- 4153,4234 ---- + } + + # if defined(FEAT_CMDL_COMPL) || defined(PROTO) ++ ++ static char_u **locales = NULL; /* Array of all available locales */ ++ static int did_init_locales = FALSE; ++ ++ static void init_locales __ARGS((void)); ++ static char_u **find_locales __ARGS((void)); ++ ++ /* ++ * Lazy initialization of all available locales. ++ */ ++ static void ++ init_locales() ++ { ++ if (!did_init_locales) ++ { ++ did_init_locales = TRUE; ++ locales = find_locales(); ++ } ++ } ++ ++ /* Return an array of strings for all available locales + NULL for the ++ * last element. Return NULL in case of error. */ ++ static char_u ** ++ find_locales() ++ { ++ garray_T locales_ga; ++ char_u *loc; ++ ++ /* Find all available locales by running command "locale -a". If this ++ * doesn't work we won't have completion. */ ++ char_u *locale_a = get_cmd_output((char_u *)"locale -a", ++ NULL, SHELL_SILENT); ++ if (locale_a == NULL) ++ return NULL; ++ ga_init2(&locales_ga, sizeof(char_u *), 20); ++ ++ /* Transform locale_a string where each locale is separated by "\n" ++ * into an array of locale strings. */ ++ loc = (char_u *)strtok((char *)locale_a, "\n"); ++ ++ while (loc != NULL) ++ { ++ if (ga_grow(&locales_ga, 1) == FAIL) ++ break; ++ loc = vim_strsave(loc); ++ if (loc == NULL) ++ break; ++ ++ ((char_u **)locales_ga.ga_data)[locales_ga.ga_len++] = loc; ++ loc = (char_u *)strtok(NULL, "\n"); ++ } ++ vim_free(locale_a); ++ if (ga_grow(&locales_ga, 1) == FAIL) ++ { ++ ga_clear(&locales_ga); ++ return NULL; ++ } ++ ((char_u **)locales_ga.ga_data)[locales_ga.ga_len] = NULL; ++ return (char_u **)locales_ga.ga_data; ++ } ++ ++ # if defined(EXITFREE) || defined(PROTO) ++ void ++ free_locales() ++ { ++ int i; ++ if (locales != NULL) ++ { ++ for (i = 0; locales[i] != NULL; i++) ++ vim_free(locales[i]); ++ vim_free(locales); ++ locales = NULL; ++ } ++ } ++ # endif ++ + /* + * Function given to ExpandGeneric() to obtain the possible arguments of the + * ":language" command. +*************** +*** 4168,4174 **** + return (char_u *)"ctype"; + if (idx == 2) + return (char_u *)"time"; +! return NULL; + } + # endif + +--- 4244,4268 ---- + return (char_u *)"ctype"; + if (idx == 2) + return (char_u *)"time"; +! +! init_locales(); +! if (locales == NULL) +! return NULL; +! return locales[idx - 3]; +! } +! +! /* +! * Function given to ExpandGeneric() to obtain the available locales. +! */ +! char_u * +! get_locales(xp, idx) +! expand_T *xp UNUSED; +! int idx; +! { +! init_locales(); +! if (locales == NULL) +! return NULL; +! return locales[idx]; + } + # endif + +*** ../mercurial/vim73/src/ex_getln.c 2011-05-19 14:50:49.000000000 +0200 +--- src/ex_getln.c 2011-05-19 18:18:49.000000000 +0200 +*************** +*** 4571,4618 **** + int context; + char_u *((*func)__ARGS((expand_T *, int))); + int ic; + } tab[] = + { +! {EXPAND_COMMANDS, get_command_name, FALSE}, +! {EXPAND_BEHAVE, get_behave_arg, TRUE}, + #ifdef FEAT_USR_CMDS +! {EXPAND_USER_COMMANDS, get_user_commands, FALSE}, +! {EXPAND_USER_CMD_FLAGS, get_user_cmd_flags, FALSE}, +! {EXPAND_USER_NARGS, get_user_cmd_nargs, FALSE}, +! {EXPAND_USER_COMPLETE, get_user_cmd_complete, FALSE}, + #endif + #ifdef FEAT_EVAL +! {EXPAND_USER_VARS, get_user_var_name, FALSE}, +! {EXPAND_FUNCTIONS, get_function_name, FALSE}, +! {EXPAND_USER_FUNC, get_user_func_name, FALSE}, +! {EXPAND_EXPRESSION, get_expr_name, FALSE}, + #endif + #ifdef FEAT_MENU +! {EXPAND_MENUS, get_menu_name, FALSE}, +! {EXPAND_MENUNAMES, get_menu_names, FALSE}, + #endif + #ifdef FEAT_SYN_HL +! {EXPAND_SYNTAX, get_syntax_name, TRUE}, + #endif +! {EXPAND_HIGHLIGHT, get_highlight_name, TRUE}, + #ifdef FEAT_AUTOCMD +! {EXPAND_EVENTS, get_event_name, TRUE}, +! {EXPAND_AUGROUP, get_augroup_name, TRUE}, + #endif + #ifdef FEAT_CSCOPE +! {EXPAND_CSCOPE, get_cscope_name, TRUE}, + #endif + #ifdef FEAT_SIGNS +! {EXPAND_SIGN, get_sign_name, TRUE}, + #endif + #ifdef FEAT_PROFILE +! {EXPAND_PROFILE, get_profile_name, TRUE}, + #endif + #if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \ + && (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE)) +! {EXPAND_LANGUAGE, get_lang_arg, TRUE}, + #endif +! {EXPAND_ENV_VARS, get_env_name, TRUE}, + }; + int i; + +--- 4571,4620 ---- + int context; + char_u *((*func)__ARGS((expand_T *, int))); + int ic; ++ int escaped; + } tab[] = + { +! {EXPAND_COMMANDS, get_command_name, FALSE, TRUE}, +! {EXPAND_BEHAVE, get_behave_arg, TRUE, TRUE}, + #ifdef FEAT_USR_CMDS +! {EXPAND_USER_COMMANDS, get_user_commands, FALSE, TRUE}, +! {EXPAND_USER_CMD_FLAGS, get_user_cmd_flags, FALSE, TRUE}, +! {EXPAND_USER_NARGS, get_user_cmd_nargs, FALSE, TRUE}, +! {EXPAND_USER_COMPLETE, get_user_cmd_complete, FALSE, TRUE}, + #endif + #ifdef FEAT_EVAL +! {EXPAND_USER_VARS, get_user_var_name, FALSE, TRUE}, +! {EXPAND_FUNCTIONS, get_function_name, FALSE, TRUE}, +! {EXPAND_USER_FUNC, get_user_func_name, FALSE, TRUE}, +! {EXPAND_EXPRESSION, get_expr_name, FALSE, TRUE}, + #endif + #ifdef FEAT_MENU +! {EXPAND_MENUS, get_menu_name, FALSE, TRUE}, +! {EXPAND_MENUNAMES, get_menu_names, FALSE, TRUE}, + #endif + #ifdef FEAT_SYN_HL +! {EXPAND_SYNTAX, get_syntax_name, TRUE, TRUE}, + #endif +! {EXPAND_HIGHLIGHT, get_highlight_name, TRUE, TRUE}, + #ifdef FEAT_AUTOCMD +! {EXPAND_EVENTS, get_event_name, TRUE, TRUE}, +! {EXPAND_AUGROUP, get_augroup_name, TRUE, TRUE}, + #endif + #ifdef FEAT_CSCOPE +! {EXPAND_CSCOPE, get_cscope_name, TRUE, TRUE}, + #endif + #ifdef FEAT_SIGNS +! {EXPAND_SIGN, get_sign_name, TRUE, TRUE}, + #endif + #ifdef FEAT_PROFILE +! {EXPAND_PROFILE, get_profile_name, TRUE, TRUE}, + #endif + #if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \ + && (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE)) +! {EXPAND_LANGUAGE, get_lang_arg, TRUE, FALSE}, +! {EXPAND_LOCALES, get_locales, TRUE, FALSE}, + #endif +! {EXPAND_ENV_VARS, get_env_name, TRUE, TRUE}, + }; + int i; + +*************** +*** 4626,4632 **** + { + if (tab[i].ic) + regmatch.rm_ic = TRUE; +! ret = ExpandGeneric(xp, ®match, num_file, file, tab[i].func); + break; + } + } +--- 4628,4635 ---- + { + if (tab[i].ic) + regmatch.rm_ic = TRUE; +! ret = ExpandGeneric(xp, ®match, num_file, file, +! tab[i].func, tab[i].escaped); + break; + } + } +*************** +*** 4648,4660 **** + * Returns OK when no problems encountered, FAIL for error (out of memory). + */ + int +! ExpandGeneric(xp, regmatch, num_file, file, func) + expand_T *xp; + regmatch_T *regmatch; + int *num_file; + char_u ***file; + char_u *((*func)__ARGS((expand_T *, int))); + /* returns a string from the list */ + { + int i; + int count = 0; +--- 4651,4664 ---- + * Returns OK when no problems encountered, FAIL for error (out of memory). + */ + int +! ExpandGeneric(xp, regmatch, num_file, file, func, escaped) + expand_T *xp; + regmatch_T *regmatch; + int *num_file; + char_u ***file; + char_u *((*func)__ARGS((expand_T *, int))); + /* returns a string from the list */ ++ int escaped; + { + int i; + int count = 0; +*************** +*** 4679,4685 **** + { + if (round) + { +! str = vim_strsave_escaped(str, (char_u *)" \t\\."); + (*file)[count] = str; + #ifdef FEAT_MENU + if (func == get_menu_names && str != NULL) +--- 4683,4692 ---- + { + if (round) + { +! if (escaped) +! str = vim_strsave_escaped(str, (char_u *)" \t\\."); +! else +! str = vim_strsave(str); + (*file)[count] = str; + #ifdef FEAT_MENU + if (func == get_menu_names && str != NULL) +*** ../mercurial/vim73/src/proto/ex_cmds2.pro 2010-05-15 21:22:11.000000000 +0200 +--- src/proto/ex_cmds2.pro 2011-05-19 17:53:52.000000000 +0200 +*************** +*** 83,87 **** +--- 83,89 ---- + char_u *get_mess_lang __ARGS((void)); + void set_lang_var __ARGS((void)); + void ex_language __ARGS((exarg_T *eap)); ++ void free_locales __ARGS((void)); + char_u *get_lang_arg __ARGS((expand_T *xp, int idx)); ++ char_u *get_locales __ARGS((expand_T *xp, int idx)); + /* vim: set ft=c : */ +*** ../mercurial/vim73/src/proto/ex_getln.pro 2010-08-16 21:23:30.000000000 +0200 +--- src/proto/ex_getln.pro 2011-05-19 17:54:00.000000000 +0200 +*************** +*** 31,37 **** + char_u *addstar __ARGS((char_u *fname, int len, int context)); + void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col)); + int expand_cmdline __ARGS((expand_T *xp, char_u *str, int col, int *matchcount, char_u ***matches)); +! int ExpandGeneric __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file, char_u *((*func)(expand_T *, int)))); + char_u *globpath __ARGS((char_u *path, char_u *file, int expand_options)); + void init_history __ARGS((void)); + int get_histtype __ARGS((char_u *name)); +--- 31,37 ---- + char_u *addstar __ARGS((char_u *fname, int len, int context)); + void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col)); + int expand_cmdline __ARGS((expand_T *xp, char_u *str, int col, int *matchcount, char_u ***matches)); +! int ExpandGeneric __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file, char_u *((*func)(expand_T *, int)), int escaped)); + char_u *globpath __ARGS((char_u *path, char_u *file, int expand_options)); + void init_history __ARGS((void)); + int get_histtype __ARGS((char_u *name)); +*** ../mercurial/vim73/src/vim.h 2011-05-19 17:25:36.000000000 +0200 +--- src/vim.h 2011-05-19 17:52:02.000000000 +0200 +*************** +*** 779,784 **** +--- 779,785 ---- + #define EXPAND_FILETYPE 37 + #define EXPAND_FILES_IN_PATH 38 + #define EXPAND_OWNSYNTAX 39 ++ #define EXPAND_LOCALES 40 + + /* Values for exmode_active (0 is no exmode) */ + #define EXMODE_NORMAL 1 +*** ../vim-7.3.197/src/version.c 2011-05-19 17:42:54.000000000 +0200 +--- src/version.c 2011-05-19 18:24:58.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 198, + /**/ + +-- +The primary purpose of the DATA statement is to give names to constants; +instead of referring to pi as 3.141592653589793 at every appearance, the +variable PI can be given that value with a DATA statement and used instead +of the longer form of the constant. This also simplifies modifying the +program, should the value of pi change. + -- FORTRAN manual for Xerox Computers + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.199 b/source/ap/vim/patches/7.3.199 new file mode 100644 index 00000000..8bdd97ab --- /dev/null +++ b/source/ap/vim/patches/7.3.199 @@ -0,0 +1,57 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.199 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.199 +Problem: MS-Windows: Compilation problem of OLE with MingW compiler. +Solution: Put #ifdef around declarations. (Guopeng Wen) +Files: src/if_ole.h + + +*** ../mercurial/vim73/src/if_ole.h 2010-05-15 21:22:11.000000000 +0200 +--- src/if_ole.h 2011-05-25 12:05:50.000000000 +0200 +*************** +*** 46,53 **** + /* header files for imported files */ + #include "oaidl.h" + +! void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t); +! void __RPC_USER MIDL_user_free( void __RPC_FAR * ); + + #ifndef __IVim_INTERFACE_DEFINED__ + #define __IVim_INTERFACE_DEFINED__ +--- 46,56 ---- + /* header files for imported files */ + #include "oaidl.h" + +! #ifndef __MIDL_user_allocate_free_DEFINED__ +! #define __MIDL_user_allocate_free_DEFINED__ +! void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t); +! void __RPC_USER MIDL_user_free( void __RPC_FAR * ); +! #endif + + #ifndef __IVim_INTERFACE_DEFINED__ + #define __IVim_INTERFACE_DEFINED__ +*** ../vim-7.3.198/src/version.c 2011-05-19 18:26:34.000000000 +0200 +--- src/version.c 2011-05-25 12:08:54.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 199, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +104. When people ask about the Presidential Election you ask "Which country?" + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.200 b/source/ap/vim/patches/7.3.200 new file mode 100644 index 00000000..60194711 --- /dev/null +++ b/source/ap/vim/patches/7.3.200 @@ -0,0 +1,75 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.200 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.200 (after 7.3.198) +Problem: CTRL-D doesn't complete :lang. +Solution: Add the missing part of the change. (Dominique Pelle) +Files: src/ex_docmd.c + + +*** ../mercurial/vim73/src/ex_docmd.c 2011-05-19 14:50:49.000000000 +0200 +--- src/ex_docmd.c 2011-05-25 12:45:02.000000000 +0200 +*************** +*** 3861,3873 **** + #if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \ + && (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE)) + case CMD_language: +! if (*skiptowhite(arg) == NUL) + { + xp->xp_context = EXPAND_LANGUAGE; + xp->xp_pattern = arg; + } + else +! xp->xp_context = EXPAND_NOTHING; + break; + #endif + #if defined(FEAT_PROFILE) +--- 3861,3884 ---- + #if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \ + && (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE)) + case CMD_language: +! p = skiptowhite(arg); +! if (*p == NUL) + { + xp->xp_context = EXPAND_LANGUAGE; + xp->xp_pattern = arg; + } + else +! { +! if ( STRNCMP(arg, "messages", p - arg) == 0 +! || STRNCMP(arg, "ctype", p - arg) == 0 +! || STRNCMP(arg, "time", p - arg) == 0) +! { +! xp->xp_context = EXPAND_LOCALES; +! xp->xp_pattern = skipwhite(p); +! } +! else +! xp->xp_context = EXPAND_NOTHING; +! } + break; + #endif + #if defined(FEAT_PROFILE) +*** ../vim-7.3.199/src/version.c 2011-05-25 12:09:46.000000000 +0200 +--- src/version.c 2011-05-25 12:49:49.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 200, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +105. When someone asks you for your address, you tell them your URL. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.201 b/source/ap/vim/patches/7.3.201 new file mode 100644 index 00000000..0481afd8 --- /dev/null +++ b/source/ap/vim/patches/7.3.201 @@ -0,0 +1,124 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.201 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.201 (after 7.3.195) +Problem: "} else" still causes following lines to be indented too much. +Solution: Better detection for the "else" block. (Lech Lorens) +Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok + + +*** ../mercurial/vim73/src/misc1.c 2011-05-19 16:35:05.000000000 +0200 +--- src/misc1.c 2011-05-25 13:29:45.000000000 +0200 +*************** +*** 7541,7557 **** + + /* + * When searching for a terminated line, don't use the +! * one between the "if" and the "else". + * Need to use the scope of this "else". XXX + * If whilelevel != 0 continue looking for a "do {". + */ +! if (cin_iselse(l) +! && whilelevel == 0 +! && ((trypos = find_start_brace(ind_maxcomment)) +! == NULL + || find_match(LOOKFOR_IF, trypos->lnum, +! ind_maxparen, ind_maxcomment) == FAIL)) +! break; + } + + /* +--- 7541,7565 ---- + + /* + * When searching for a terminated line, don't use the +! * one between the "if" and the matching "else". + * Need to use the scope of this "else". XXX + * If whilelevel != 0 continue looking for a "do {". + */ +! if (cin_iselse(l) && whilelevel == 0) +! { +! /* If we're looking at "} else", let's make sure we +! * find the opening brace of the enclosing scope, +! * not the one from "if () {". */ +! if (*l == '}') +! curwin->w_cursor.col = +! (l - ml_get_curline()) + 1; +! +! if ((trypos = find_start_brace(ind_maxcomment)) +! == NULL + || find_match(LOOKFOR_IF, trypos->lnum, +! ind_maxparen, ind_maxcomment) == FAIL) +! break; +! } + } + + /* +*** ../mercurial/vim73/src/testdir/test3.in 2011-05-19 16:35:05.000000000 +0200 +--- src/testdir/test3.in 2011-05-25 13:23:51.000000000 +0200 +*************** +*** 1413,1418 **** +--- 1413,1433 ---- + } + + STARTTEST ++ :set cino& ++ 2kdd=][ ++ ENDTEST ++ ++ void func(void) ++ { ++ for (int i = 0; i < 10; ++i) ++ if (i & 1) { ++ foo(1); ++ } else ++ foo(0); ++ baz(); ++ } ++ ++ STARTTEST + :g/^STARTTEST/.,/^ENDTEST/d + :1;/start of AUTO/,$wq! test.out + ENDTEST +*** ../mercurial/vim73/src/testdir/test3.ok 2011-05-19 16:35:05.000000000 +0200 +--- src/testdir/test3.ok 2011-05-25 13:23:51.000000000 +0200 +*************** +*** 1262,1264 **** +--- 1262,1275 ---- + foo(); + } + ++ ++ void func(void) ++ { ++ for (int i = 0; i < 10; ++i) ++ if (i & 1) { ++ foo(1); ++ } else ++ foo(0); ++ baz(); ++ } ++ +*** ../vim-7.3.200/src/version.c 2011-05-25 12:51:17.000000000 +0200 +--- src/version.c 2011-05-25 13:33:16.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 201, + /**/ + +-- +Laughing helps. It's like jogging on the inside. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.202 b/source/ap/vim/patches/7.3.202 new file mode 100644 index 00000000..1289e085 --- /dev/null +++ b/source/ap/vim/patches/7.3.202 @@ -0,0 +1,868 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.202 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.202 +Problem: Cannot influence the indent inside a namespace. +Solution: Add the "N" 'cino' parameter. (Konstantin Lepa) +Files: runtime/doc/indent.txt, src/misc1.c, src/testdir/test3.in, + src/testdir/test3.ok + + +*** ../mercurial/vim73/runtime/doc/indent.txt 2011-04-28 19:01:26.000000000 +0200 +--- runtime/doc/indent.txt 2011-05-25 14:35:37.000000000 +0200 +*************** +*** 128,140 **** + used CTRL-T or CTRL-D. + + *cinoptions-values* +! The 'cinoptions' option sets how Vim performs indentation. In the list below, + "N" represents a number of your choice (the number can be negative). When + there is an 's' after the number, Vim multiplies the number by 'shiftwidth': + "1s" is 'shiftwidth', "2s" is two times 'shiftwidth', etc. You can use a +! decimal point, too: "-0.5s" is minus half a 'shiftwidth'. The examples below +! assume a 'shiftwidth' of 4. +! + >N Amount added for "normal" indent. Used after a line that should + increase the indent (lines starting with "if", an opening brace, + etc.). (default 'shiftwidth'). +--- 128,147 ---- + used CTRL-T or CTRL-D. + + *cinoptions-values* +! The 'cinoptions' option sets how Vim performs indentation. The value after +! the option character can be one of these (N is any number): +! N indent N spaces +! -N indent N spaces to the left +! Ns N times 'shiftwidth spaces +! -Ns N times 'shiftwidth spaces to the left +! +! In the list below, + "N" represents a number of your choice (the number can be negative). When + there is an 's' after the number, Vim multiplies the number by 'shiftwidth': + "1s" is 'shiftwidth', "2s" is two times 'shiftwidth', etc. You can use a +! decimal point, too: "-0.5s" is minus half a 'shiftwidth'. +! The examples below assume a 'shiftwidth' of 4. +! *cino->* + >N Amount added for "normal" indent. Used after a line that should + increase the indent (lines starting with "if", an opening brace, + etc.). (default 'shiftwidth'). +*************** +*** 145,150 **** +--- 152,158 ---- + foo; foo; foo; + } } } + < ++ *cino-e* + eN Add N to the prevailing indent inside a set of braces if the + opening brace at the End of the line (more precise: is not the + first character in a line). This is useful if you want a +*************** +*** 160,165 **** +--- 168,174 ---- + bar; bar; bar; + } } } + < ++ *cino-n* + nN Add N to the prevailing indent for a statement after an "if", + "while", etc., if it is NOT inside a set of braces. This is + useful if you want a different indent when there is no '{' +*************** +*** 174,179 **** +--- 183,189 ---- + bar; bar; bar; + } } } + < ++ *cino-f* + fN Place the first opening brace of a function or other block in + column N. This applies only for an opening brace that is not + inside other braces and is at the start of the line. What comes +*************** +*** 184,189 **** +--- 194,200 ---- + { { { + int foo; int foo; int foo; + < ++ *cino-{* + {N Place opening braces N characters from the prevailing indent. + This applies only for opening braces that are inside other + braces. (default 0). +*************** +*** 193,198 **** +--- 204,210 ---- + { { { + foo; foo; foo; + < ++ *cino-}* + }N Place closing braces N characters from the matching opening + brace. (default 0). + +*************** +*** 202,207 **** +--- 214,220 ---- + foo; foo; foo; + } } } + < ++ *cino-^* + ^N Add N to the prevailing indent inside a set of braces if the + opening brace is in column 0. This can specify a different + indent for whole of a function (some may like to set it to a +*************** +*** 216,221 **** +--- 229,235 ---- + } } } + } } } + < ++ *cino-L* + LN Controls placement of jump labels. If N is negative, the label + will be placed at column 1. If N is non-negative, the indent of + the label will be the prevailing indent minus N. (default -1). +*************** +*** 229,234 **** +--- 243,249 ---- + } } } + } } } + < ++ *cino-:* + :N Place case labels N characters from the indent of the switch(). + (default 'shiftwidth'). + +*************** +*** 240,245 **** +--- 255,261 ---- + default: default: + } } + < ++ *cino-=* + =N Place statements occurring after a case label N characters from + the indent of the label. (default 'shiftwidth'). + +*************** +*** 247,252 **** +--- 263,269 ---- + case 11: case 11: a = a + 1; + a = a + 1; b = b + 1; + < ++ *cino-l* + lN If N != 0 Vim will align with a case label instead of the + statement after it in the same line. + +*************** +*** 256,261 **** +--- 273,279 ---- + break; break; + } } + < ++ *cino-b* + bN If N != 0 Vim will align a final "break" with the case label, + so that case..break looks like a sort of block. (default: 0). + When using 1, consider adding "0=break" to 'cinkeys'. +*************** +*** 272,277 **** +--- 290,296 ---- + break; break; + } } + < ++ *cino-g* + gN Place C++ scope declarations N characters from the indent of the + block they are in. (default 'shiftwidth'). A scope declaration + can be "public:", "protected:" or "private:". +*************** +*** 283,288 **** +--- 302,308 ---- + private: private: + } } + < ++ *cino-h* + hN Place statements occurring after a C++ scope declaration N + characters from the indent of the label. (default + 'shiftwidth'). +*************** +*** 291,296 **** +--- 311,331 ---- + public: public: a = a + 1; + a = a + 1; b = b + 1; + < ++ *cino-N* ++ NN Indent inside C++ namespace N characters extra compared to a ++ normal block. (default 0). ++ ++ cino= cino=N-s > ++ namespace { namespace { ++ void function(); void function(); ++ } } ++ ++ namespace my namespace my ++ { { ++ void function(); void function(); ++ } } ++ < ++ *cino-p* + pN Parameter declarations for K&R-style function declarations will + be indented N characters from the margin. (default + 'shiftwidth'). +*************** +*** 300,305 **** +--- 335,341 ---- + int a; int a; int a; + char b; char b; char b; + < ++ *cino-t* + tN Indent a function return type declaration N characters from the + margin. (default 'shiftwidth'). + +*************** +*** 307,312 **** +--- 343,349 ---- + int int int + func() func() func() + < ++ *cino-i* + iN Indent C++ base class declarations and constructor + initializations, if they start in a new line (otherwise they + are aligned at the right side of the ':'). +*************** +*** 330,335 **** +--- 368,374 ---- + a = b + 9 * a = b + 9 * + c; c; + < ++ *cino-c* + cN Indent comment lines after the comment opener, when there is no + other text with which to align, N characters from the comment + opener. (default 3). See also |format-comments|. +*************** +*** 339,344 **** +--- 378,384 ---- + text. text. + */ */ + < ++ *cino-C* + CN When N is non-zero, indent comment lines by the amount specified + with the c flag above even if there is other text behind the + comment opener. (default 0). +*************** +*** 349,360 **** +--- 389,402 ---- + ********/ ********/ + < (Example uses ":set comments& comments-=s1:/* comments^=s0:/*") + ++ *cino-/* + /N Indent comment lines N characters extra. (default 0). + cino= cino=/4 > + a = b; a = b; + /* comment */ /* comment */ + c = d; c = d; + < ++ *cino-(* + (N When in unclosed parentheses, indent N characters from the line + with the unclosed parentheses. Add a 'shiftwidth' for every + unclosed parentheses. When N is 0 or the unclosed parentheses +*************** +*** 370,375 **** +--- 412,418 ---- + (c2 || c3)) (c2 || c3)) + { { + < ++ *cino-u* + uN Same as (N, but for one level deeper. (default 'shiftwidth'). + + cino= cino=u2 > +*************** +*** 377,382 **** +--- 420,426 ---- + && (c22345 && (c22345 + || c3)) || c3)) + < ++ *cino-U* + UN When N is non-zero, do not ignore the indenting specified by + ( or u in case that the unclosed parentheses is the first + non-white character in its line. (default 0). +*************** +*** 388,393 **** +--- 432,438 ---- + c3 c3 + ) && c4; ) && c4; + < ++ *cino-2* + wN When in unclosed parentheses and N is non-zero and either + using "(0" or "u0", respectively, or using "U0" and the unclosed + parentheses is the first non-white character in its line, line +*************** +*** 400,405 **** +--- 445,451 ---- + || c3)) || c3)) + foo; foo; + < ++ *cino-W* + WN When in unclosed parentheses and N is non-zero and either + using "(0" or "u0", respectively and the unclosed parentheses is + the last non-white character in its line and it is not the +*************** +*** 414,419 **** +--- 460,466 ---- + a_short_line(argument, a_short_line(argument, + argument); argument); + < ++ *cino-m* + mN When N is non-zero, line up a line starting with a closing + parentheses with the first character of the line with the + matching opening parentheses. (default 0). +*************** +*** 428,433 **** +--- 475,481 ---- + ) ) + foo; foo; + < ++ *cino-M* + MN When N is non-zero, line up a line starting with a closing + parentheses with the first character of the previous line. + (default 0). +*************** +*** 437,443 **** + cond2 cond2 + ) ) + < +! *java-cinoptions* *java-indenting* + jN Indent java anonymous classes correctly. The value 'N' is + currently unused but must be non-zero (e.g. 'j1'). 'j1' will + indent for example the following code snippet correctly: > +--- 485,491 ---- + cond2 cond2 + ) ) + < +! *java-cinoptions* *java-indenting* *cino-j* + jN Indent java anonymous classes correctly. The value 'N' is + currently unused but must be non-zero (e.g. 'j1'). 'j1' will + indent for example the following code snippet correctly: > +*************** +*** 448,454 **** + } + }); + < +! *javascript-cinoptions* *javascript-indenting* + JN Indent JavaScript object declarations correctly by not confusing + them with labels. The value 'N' is currently unused but must be + non-zero (e.g. 'J1'). > +--- 496,502 ---- + } + }); + < +! *javascript-cinoptions* *javascript-indenting* *cino-J* + JN Indent JavaScript object declarations correctly by not confusing + them with labels. The value 'N' is currently unused but must be + non-zero (e.g. 'J1'). > +*************** +*** 483,489 **** + + + The defaults, spelled out in full, are: +! cinoptions=>s,e0,n0,f0,{0,}0,^0,L-1,:s,=s,l0,b0,gs,hs,ps,ts,is,+s, + c3,C0,/0,(2s,us,U0,w0,W0,m0,j0,J0,)20,*70,#0 + + Vim puts a line in column 1 if: +--- 534,540 ---- + + + The defaults, spelled out in full, are: +! cinoptions=>s,e0,n0,f0,{0,}0,^0,L-1,:s,=s,l0,b0,gs,hs,N0,ps,ts,is,+s, + c3,C0,/0,(2s,us,U0,w0,W0,m0,j0,J0,)20,*70,#0 + + Vim puts a line in column 1 if: +*** ../mercurial/vim73/src/misc1.c 2011-05-25 13:33:59.000000000 +0200 +--- src/misc1.c 2011-05-25 14:57:31.000000000 +0200 +*************** +*** 4959,4964 **** +--- 4959,4965 ---- + static int corr_ind_maxparen __ARGS((int ind_maxparen, pos_T *startpos)); + static int find_last_paren __ARGS((char_u *l, int start, int end)); + static int find_match __ARGS((int lookfor, linenr_T ourscope, int ind_maxparen, int ind_maxcomment)); ++ static int cin_is_cpp_namespace __ARGS((char_u *)); + + static int ind_hash_comment = 0; /* # starts a comment */ + +*************** +*** 5221,5226 **** +--- 5222,5271 ---- + return (*(s = cin_skipcomment(s + i)) == ':' && s[1] != ':'); + } + ++ /* Maximum number of lines to search back for a "namespace" line. */ ++ #define FIND_NAMESPACE_LIM 20 ++ ++ /* ++ * Recognize a "namespace" scope declaration. ++ */ ++ static int ++ cin_is_cpp_namespace(s) ++ char_u *s; ++ { ++ char_u *p; ++ int has_name = FALSE; ++ ++ s = cin_skipcomment(s); ++ if (STRNCMP(s, "namespace", 9) == 0 && (s[9] == NUL || !vim_iswordc(s[9]))) ++ { ++ p = cin_skipcomment(skipwhite(s + 9)); ++ while (*p != NUL) ++ { ++ if (vim_iswhite(*p)) ++ { ++ has_name = TRUE; /* found end of a name */ ++ p = cin_skipcomment(skipwhite(p)); ++ } ++ else if (*p == '{') ++ { ++ break; ++ } ++ else if (vim_iswordc(*p)) ++ { ++ if (has_name) ++ return FALSE; /* word character after skipping past name */ ++ ++p; ++ } ++ else ++ { ++ return FALSE; ++ } ++ } ++ return TRUE; ++ } ++ return FALSE; ++ } ++ + /* + * Return a pointer to the first non-empty non-comment character after a ':'. + * Return NULL if not found. +*************** +*** 6296,6301 **** +--- 6341,6351 ---- + */ + int ind_keep_case_label = 0; + ++ /* ++ * handle C++ namespace ++ */ ++ int ind_cpp_namespace = 0; ++ + pos_T cur_curpos; + int amount; + int scope_amount; +*************** +*** 6336,6341 **** +--- 6386,6392 ---- + int n; + int iscase; + int lookfor_break; ++ int lookfor_cpp_namespace = FALSE; + int cont_amount = 0; /* amount for continuation line */ + int original_line_islabel; + +*************** +*** 6409,6414 **** +--- 6460,6466 ---- + case 'J': ind_js = n; break; + case 'l': ind_keep_case_label = n; break; + case '#': ind_hash_comment = n; break; ++ case 'N': ind_cpp_namespace = n; break; + } + if (*options == ',') + ++options; +*************** +*** 6976,6986 **** +--- 7028,7051 ---- + if (start_brace == BRACE_IN_COL0) /* '{' is in column 0 */ + { + amount = ind_open_left_imag; ++ lookfor_cpp_namespace = TRUE; ++ } ++ else if (start_brace == BRACE_AT_START && ++ lookfor_cpp_namespace) /* '{' is at start */ ++ { ++ ++ lookfor_cpp_namespace = TRUE; + } + else + { + if (start_brace == BRACE_AT_END) /* '{' is at end of line */ ++ { + amount += ind_open_imag; ++ ++ l = skipwhite(ml_get_curline()); ++ if (cin_is_cpp_namespace(l)) ++ amount += ind_cpp_namespace; ++ } + else + { + /* Compensate for adding ind_open_extra later. */ +*************** +*** 7151,7156 **** +--- 7216,7261 ---- + else + amount += ind_continuation; + } ++ else if (lookfor_cpp_namespace) ++ { ++ if (curwin->w_cursor.lnum == ourscope) ++ continue; ++ ++ if (curwin->w_cursor.lnum == 0 ++ || curwin->w_cursor.lnum ++ < ourscope - FIND_NAMESPACE_LIM) ++ break; ++ ++ l = ml_get_curline(); ++ ++ /* ++ * If we're in a comment now, skip to the start of the ++ * comment. ++ */ ++ trypos = find_start_comment(ind_maxcomment); ++ if (trypos != NULL) ++ { ++ curwin->w_cursor.lnum = trypos->lnum + 1; ++ curwin->w_cursor.col = 0; ++ continue; ++ } ++ ++ /* ++ * Skip preprocessor directives and blank lines. ++ */ ++ if (cin_ispreproc_cont(&l, &curwin->w_cursor.lnum)) ++ continue; ++ ++ if (cin_is_cpp_namespace(l)) ++ { ++ amount += ind_cpp_namespace; ++ break; ++ } ++ ++ if (cin_nocode(l)) ++ continue; ++ ++ } + else if (lookfor != LOOKFOR_TERM + && lookfor != LOOKFOR_CPP_BASECLASS) + { +*** ../mercurial/vim73/src/testdir/test3.in 2011-05-25 13:33:59.000000000 +0200 +--- src/testdir/test3.in 2011-05-25 14:47:31.000000000 +0200 +*************** +*** 799,804 **** +--- 799,867 ---- + df */ + hello + } ++ ++ /* valid namespaces with normal indent */ ++ namespace ++ { ++ { ++ 111111111111; ++ } ++ } ++ namespace /* test */ ++ { ++ 11111111111111111; ++ } ++ namespace // test ++ { ++ 111111111111111111; ++ } ++ namespace ++ { ++ 111111111111111111; ++ } ++ namespace test ++ { ++ 111111111111111111; ++ } ++ namespace{ ++ 111111111111111111; ++ } ++ namespace test{ ++ 111111111111111111; ++ } ++ namespace { ++ 111111111111111111; ++ } ++ namespace test { ++ 111111111111111111; ++ namespace test2 { ++ 22222222222222222; ++ } ++ } ++ ++ /* invalid namespaces use block indent */ ++ namespace test test2 { ++ 111111111111111111111; ++ } ++ namespace11111111111 { ++ 111111111111; ++ } ++ namespace() { ++ 1111111111111; ++ } ++ namespace() ++ { ++ 111111111111111111; ++ } ++ namespace test test2 ++ { ++ 1111111111111111111; ++ } ++ namespace111111111 ++ { ++ 111111111111111111; ++ } ++ + /* end of AUTO */ + + STARTTEST +*************** +*** 1428,1433 **** +--- 1491,1566 ---- + } + + STARTTEST ++ :set cino=N-s ++ /namespaces ++ =/^NAMESPACEEND ++ ENDTEST ++ ++ /* valid namespaces with normal indent */ ++ namespace ++ { ++ { ++ 111111111111; ++ } ++ } ++ namespace /* test */ ++ { ++ 11111111111111111; ++ } ++ namespace // test ++ { ++ 111111111111111111; ++ } ++ namespace ++ { ++ 111111111111111111; ++ } ++ namespace test ++ { ++ 111111111111111111; ++ } ++ namespace{ ++ 111111111111111111; ++ } ++ namespace test{ ++ 111111111111111111; ++ } ++ namespace { ++ 111111111111111111; ++ } ++ namespace test { ++ 111111111111111111; ++ namespace test2 { ++ 22222222222222222; ++ } ++ } ++ ++ /* invalid namespaces use block indent */ ++ namespace test test2 { ++ 111111111111111111111; ++ } ++ namespace11111111111 { ++ 111111111111; ++ } ++ namespace() { ++ 1111111111111; ++ } ++ namespace() ++ { ++ 111111111111111111; ++ } ++ namespace test test2 ++ { ++ 1111111111111111111; ++ } ++ namespace111111111 ++ { ++ 111111111111111111; ++ } ++ NAMESPACEEND ++ ++ ++ STARTTEST + :g/^STARTTEST/.,/^ENDTEST/d + :1;/start of AUTO/,$wq! test.out + ENDTEST +*** ../mercurial/vim73/src/testdir/test3.ok 2011-05-25 13:33:59.000000000 +0200 +--- src/testdir/test3.ok 2011-05-25 14:48:02.000000000 +0200 +*************** +*** 787,792 **** +--- 787,855 ---- + df */ + hello + } ++ ++ /* valid namespaces with normal indent */ ++ namespace ++ { ++ { ++ 111111111111; ++ } ++ } ++ namespace /* test */ ++ { ++ 11111111111111111; ++ } ++ namespace // test ++ { ++ 111111111111111111; ++ } ++ namespace ++ { ++ 111111111111111111; ++ } ++ namespace test ++ { ++ 111111111111111111; ++ } ++ namespace{ ++ 111111111111111111; ++ } ++ namespace test{ ++ 111111111111111111; ++ } ++ namespace { ++ 111111111111111111; ++ } ++ namespace test { ++ 111111111111111111; ++ namespace test2 { ++ 22222222222222222; ++ } ++ } ++ ++ /* invalid namespaces use block indent */ ++ namespace test test2 { ++ 111111111111111111111; ++ } ++ namespace11111111111 { ++ 111111111111; ++ } ++ namespace() { ++ 1111111111111; ++ } ++ namespace() ++ { ++ 111111111111111111; ++ } ++ namespace test test2 ++ { ++ 1111111111111111111; ++ } ++ namespace111111111 ++ { ++ 111111111111111111; ++ } ++ + /* end of AUTO */ + + +*************** +*** 1273,1275 **** +--- 1336,1403 ---- + baz(); + } + ++ ++ /* valid namespaces with normal indent */ ++ namespace ++ { ++ { ++ 111111111111; ++ } ++ } ++ namespace /* test */ ++ { ++ 11111111111111111; ++ } ++ namespace // test ++ { ++ 111111111111111111; ++ } ++ namespace ++ { ++ 111111111111111111; ++ } ++ namespace test ++ { ++ 111111111111111111; ++ } ++ namespace{ ++ 111111111111111111; ++ } ++ namespace test{ ++ 111111111111111111; ++ } ++ namespace { ++ 111111111111111111; ++ } ++ namespace test { ++ 111111111111111111; ++ namespace test2 { ++ 22222222222222222; ++ } ++ } ++ ++ /* invalid namespaces use block indent */ ++ namespace test test2 { ++ 111111111111111111111; ++ } ++ namespace11111111111 { ++ 111111111111; ++ } ++ namespace() { ++ 1111111111111; ++ } ++ namespace() ++ { ++ 111111111111111111; ++ } ++ namespace test test2 ++ { ++ 1111111111111111111; ++ } ++ namespace111111111 ++ { ++ 111111111111111111; ++ } ++ NAMESPACEEND ++ ++ +*** ../vim-7.3.201/src/version.c 2011-05-25 13:33:59.000000000 +0200 +--- src/version.c 2011-05-25 15:14:20.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 202, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +107. When using your phone you forget that you don't have to use your + keyboard. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.203 b/source/ap/vim/patches/7.3.203 new file mode 100644 index 00000000..62c29897 --- /dev/null +++ b/source/ap/vim/patches/7.3.203 @@ -0,0 +1,102 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.203 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.203 +Problem: MS-Windows: Can't run an external command without a console window. +Solution: Support ":!start /b cmd". (Xaizek) +Files: runtime/doc/os_win32.txt, src/os_win32.c + + +*** ../mercurial/vim73/src/os_win32.c 2011-05-05 18:31:54.000000000 +0200 +--- src/os_win32.c 2011-05-25 16:45:31.000000000 +0200 +*************** +*** 3401,3406 **** +--- 3401,3407 ---- + { + STARTUPINFO si; + PROCESS_INFORMATION pi; ++ DWORD flags = CREATE_NEW_CONSOLE; + + si.cb = sizeof(si); + si.lpReserved = NULL; +*************** +*** 3418,3423 **** +--- 3419,3440 ---- + si.dwFlags = STARTF_USESHOWWINDOW; + si.wShowWindow = SW_SHOWMINNOACTIVE; + } ++ else if ((STRNICMP(cmdbase, "/b", 2) == 0) ++ && vim_iswhite(cmdbase[2])) ++ { ++ cmdbase = skipwhite(cmdbase + 2); ++ flags = CREATE_NO_WINDOW; ++ si.dwFlags = STARTF_USESTDHANDLES; ++ si.hStdInput = CreateFile("\\\\.\\NUL", // File name ++ GENERIC_READ, // Access flags ++ 0, // Share flags ++ NULL, // Security att. ++ OPEN_EXISTING, // Open flags ++ FILE_ATTRIBUTE_NORMAL, // File att. ++ NULL); // Temp file ++ si.hStdOutput = si.hStdInput; ++ si.hStdError = si.hStdInput; ++ } + + /* When the command is in double quotes, but 'shellxquote' is + * empty, keep the double quotes around the command. +*************** +*** 3445,3451 **** + NULL, // Process security attributes + NULL, // Thread security attributes + FALSE, // Inherit handles +! CREATE_NEW_CONSOLE, // Creation flags + NULL, // Environment + NULL, // Current directory + &si, // Startup information +--- 3462,3468 ---- + NULL, // Process security attributes + NULL, // Thread security attributes + FALSE, // Inherit handles +! flags, // Creation flags + NULL, // Environment + NULL, // Current directory + &si, // Startup information +*************** +*** 3458,3463 **** +--- 3475,3485 ---- + EMSG(_("E371: Command not found")); + #endif + } ++ if (si.hStdInput != NULL) ++ { ++ /* Close the handle to \\.\NUL */ ++ CloseHandle(si.hStdInput); ++ } + /* Close the handles to the subprocess, so that it goes away */ + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); +*** ../vim-7.3.202/src/version.c 2011-05-25 15:16:06.000000000 +0200 +--- src/version.c 2011-05-25 17:05:59.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 203, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +108. While reading a magazine, you look for the Zoom icon for a better + look at a photograph. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.204 b/source/ap/vim/patches/7.3.204 new file mode 100644 index 00000000..b2b63602 --- /dev/null +++ b/source/ap/vim/patches/7.3.204 @@ -0,0 +1,51 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.204 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.204 (after 7.3.201) +Problem: Compiler warning. +Solution: Add type cast. (Mike Williams) +Files: src/misc1.c + + +*** ../mercurial/vim73/src/misc1.c 2011-05-25 15:16:06.000000000 +0200 +--- src/misc1.c 2011-05-25 17:25:10.000000000 +0200 +*************** +*** 7657,7663 **** + * not the one from "if () {". */ + if (*l == '}') + curwin->w_cursor.col = +! (l - ml_get_curline()) + 1; + + if ((trypos = find_start_brace(ind_maxcomment)) + == NULL +--- 7657,7663 ---- + * not the one from "if () {". */ + if (*l == '}') + curwin->w_cursor.col = +! (colnr_T)(l - ml_get_curline()) + 1; + + if ((trypos = find_start_brace(ind_maxcomment)) + == NULL +*** ../vim-7.3.203/src/version.c 2011-05-25 17:06:16.000000000 +0200 +--- src/version.c 2011-05-25 17:29:32.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 204, + /**/ + +-- +In a world without walls and borders, who needs windows and gates? + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.205 b/source/ap/vim/patches/7.3.205 new file mode 100644 index 00000000..b49a040e --- /dev/null +++ b/source/ap/vim/patches/7.3.205 @@ -0,0 +1,93 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.205 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.205 +Problem: Syntax "extend" doesn't work correctly. +Solution: Avoid calling check_state_ends() recursively (Ben Schmidt) +Files: src/syntax.c + + +*** ../mercurial/vim73/src/syntax.c 2011-05-19 12:14:03.000000000 +0200 +--- src/syntax.c 2011-05-25 17:47:46.000000000 +0200 +*************** +*** 990,996 **** +--- 990,999 ---- + * previous line and regions that have "keepend". + */ + if (current_state.ga_len > 0) ++ { + syn_update_ends(TRUE); ++ check_state_ends(); ++ } + + next_match_idx = -1; + ++current_line_id; +*************** +*** 1064,1070 **** + } + } + check_keepend(); +- check_state_ends(); + } + + /**************************************** +--- 1067,1072 ---- +*************** +*** 2533,2539 **** + check_state_ends() + { + stateitem_T *cur_si; +! int had_extend = FALSE; + + cur_si = &CUR_STATE(current_state.ga_len - 1); + for (;;) +--- 2535,2541 ---- + check_state_ends() + { + stateitem_T *cur_si; +! int had_extend; + + cur_si = &CUR_STATE(current_state.ga_len - 1); + for (;;) +*************** +*** 2586,2593 **** + + /* When the ended item has "extend", another item with + * "keepend" now needs to check for its end. */ +! if (cur_si->si_flags & HL_EXTEND) +! had_extend = TRUE; + + pop_current_state(); + +--- 2588,2594 ---- + + /* When the ended item has "extend", another item with + * "keepend" now needs to check for its end. */ +! had_extend = (cur_si->si_flags & HL_EXTEND); + + pop_current_state(); + +*** ../vim-7.3.204/src/version.c 2011-05-25 17:29:40.000000000 +0200 +--- src/version.c 2011-05-25 17:52:57.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 205, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +110. You actually volunteer to become your employer's webmaster. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.206 b/source/ap/vim/patches/7.3.206 new file mode 100644 index 00000000..8a91f0ae --- /dev/null +++ b/source/ap/vim/patches/7.3.206 @@ -0,0 +1,54 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.206 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.206 +Problem: 64bit MS-Windows compiler warning. +Solution: Use HandleToLong() instead of type cast. (Mike Williams) +Files: src/gui_w32.c + + +*** ../mercurial/vim73/src/gui_w32.c 2011-01-17 20:08:04.000000000 +0100 +--- src/gui_w32.c 2011-05-25 21:14:10.000000000 +0200 +*************** +*** 1575,1581 **** + + #ifdef FEAT_EVAL + /* set the v:windowid variable */ +! set_vim_var_nr(VV_WINDOWID, (long)s_hwnd); + #endif + + theend: +--- 1575,1581 ---- + + #ifdef FEAT_EVAL + /* set the v:windowid variable */ +! set_vim_var_nr(VV_WINDOWID, HandleToLong(s_hwnd)); + #endif + + theend: +*** ../vim-7.3.205/src/version.c 2011-05-25 17:56:23.000000000 +0200 +--- src/version.c 2011-05-25 21:16:17.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 206, + /**/ + +-- +FIXME and XXX are two common keywords used to mark broken or incomplete code +not only since XXX as a sex reference would grab everybody's attention but +simply due to the fact that Vim would highlight these words. + -- Hendrik Scholz + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.207 b/source/ap/vim/patches/7.3.207 new file mode 100644 index 00000000..95b335ec --- /dev/null +++ b/source/ap/vim/patches/7.3.207 @@ -0,0 +1,54 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.207 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.207 +Problem: Can't compile with MSVC with pentium4 and 64 bit. +Solution: Only use SSE2 for 32 bit. (Mike Williams) +Files: src/Make_mvc.mak + + +*** ../mercurial/vim73/src/Make_mvc.mak 2011-02-15 18:06:11.000000000 +0100 +--- src/Make_mvc.mak 2011-06-04 11:59:38.000000000 +0200 +*************** +*** 409,416 **** + CPUARG = + !endif + !else +! # VC8/9 only allows specifying SSE architecture +! !if "$(CPUNR)" == "pentium4" + CPUARG = /arch:SSE2 + !endif + !endif +--- 409,416 ---- + CPUARG = + !endif + !else +! # VC8/9/10 only allows specifying SSE architecture but only for 32bit +! !if "$(ASSEMBLY_ARCHITECTURE)" == "x86" && "$(CPUNR)" == "pentium4" + CPUARG = /arch:SSE2 + !endif + !endif +*** ../vim-7.3.206/src/version.c 2011-05-25 21:18:02.000000000 +0200 +--- src/version.c 2011-06-12 20:30:30.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 207, + /**/ + +-- +"The question of whether computers can think is just like the question +of whether submarines can swim." -- Edsger W. Dijkstra + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.208 b/source/ap/vim/patches/7.3.208 new file mode 100644 index 00000000..c5a79295 --- /dev/null +++ b/source/ap/vim/patches/7.3.208 @@ -0,0 +1,51 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.208 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.208 +Problem: Early terminated if statement. +Solution: Remove the semicolon. (Lech Lorens) +Files: src/gui_mac.c + + +*** ../mercurial/vim73/src/gui_mac.c 2011-01-17 20:08:04.000000000 +0100 +--- src/gui_mac.c 2011-06-06 05:35:46.000000000 +0200 +*************** +*** 1840,1846 **** + p.v -= gui.scrollbar_height; + p.v -= p.v % gui.char_height; + p.v += 2 * gui.border_width; +! if (gui.which_scrollbars[SBAR_BOTTOM]); + p.v += gui.scrollbar_height; + + ZoomWindowIdeal(whichWindow, thePart, &p); +--- 1840,1846 ---- + p.v -= gui.scrollbar_height; + p.v -= p.v % gui.char_height; + p.v += 2 * gui.border_width; +! if (gui.which_scrollbars[SBAR_BOTTOM]) + p.v += gui.scrollbar_height; + + ZoomWindowIdeal(whichWindow, thePart, &p); +*** ../vim-7.3.207/src/version.c 2011-06-12 20:31:25.000000000 +0200 +--- src/version.c 2011-06-12 20:33:00.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 208, + /**/ + +-- +Keep America beautiful. Swallow your beer cans. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.209 b/source/ap/vim/patches/7.3.209 new file mode 100644 index 00000000..afd4ab82 --- /dev/null +++ b/source/ap/vim/patches/7.3.209 @@ -0,0 +1,95 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.209 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.209 +Problem: MSVC Install instructions point to wrong batch file. +Solution: Add a batch file for use with MSVC 10. +Files: src/msvc2010.bat, src/INSTALLpc.txt, Filelist + + +*** ../mercurial/vim73/src/msvc2010.bat 2011-06-12 20:35:31.000000000 +0200 +--- src/msvc2010.bat 2011-06-09 05:08:35.000000000 +0200 +*************** +*** 0 **** +--- 1,7 ---- ++ @echo off ++ rem To be used on MS-Windows for Visual C++ 2010 Express Edition ++ rem aka Microsoft Visual Studio 10.0. ++ rem See INSTALLpc.txt for information. ++ @echo on ++ ++ call "%VS100COMNTOOLS%%vsvars32.bat" +*** ../mercurial/vim73/src/INSTALLpc.txt 2010-08-16 21:23:30.000000000 +0200 +--- src/INSTALLpc.txt 2011-06-08 06:47:46.000000000 +0200 +*************** +*** 28,35 **** + 9. MS-DOS + + The currently preferred method is using the free Visual C++ Toolkit 2008 +! |msvc-2008-express|. If you need the executable to run on Windows 98 or ME, +! use the 2003 one |msvc-2003-toolkit|. + + + 1. Microsoft Visual C++ +--- 28,36 ---- + 9. MS-DOS + + The currently preferred method is using the free Visual C++ Toolkit 2008 +! |msvc-2008-express|, the produced binary runs on most MS-Windows systems. If +! you need the executable to run on Windows 98 or ME, use the 2003 one +! |msvc-2003-toolkit|. + + + 1. Microsoft Visual C++ +*************** +*** 176,182 **** + http://www.microsoft.com/express/vc/Default.aspx + This includes the IDE and the debugger. + +! To set the environment execute the msvc2008.bat script. You can then build + Vim with Make_mvc.mak. + + +--- 177,183 ---- + http://www.microsoft.com/express/vc/Default.aspx + This includes the IDE and the debugger. + +! To set the environment execute the msvc2010.bat script. You can then build + Vim with Make_mvc.mak. + + +*** ../mercurial/vim73/Filelist 2011-05-19 13:40:47.000000000 +0200 +--- Filelist 2011-06-09 05:17:25.000000000 +0200 +*************** +*** 262,267 **** +--- 262,268 ---- + src/bigvim.bat \ + src/msvcsetup.bat \ + src/msvc2008.bat \ ++ src/msvc2010.bat \ + src/dimm.idl \ + src/dlldata.c \ + src/dosinst.c \ +*** ../vim-7.3.208/src/version.c 2011-06-12 20:33:30.000000000 +0200 +--- src/version.c 2011-06-12 20:34:44.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 209, + /**/ + +-- +"Hit any key to continue" is a lie. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.210 b/source/ap/vim/patches/7.3.210 new file mode 100644 index 00000000..f02fe6fe --- /dev/null +++ b/source/ap/vim/patches/7.3.210 @@ -0,0 +1,182 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.210 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.210 +Problem: Can't always find the file when using cscope. +Solution: Add the 'cscoperelative' option. (Raghavendra D Prabhu) +Files: runtime/doc/if_cscop.txt, runtime/doc/options.txt, + src/if_cscope.c, src/options.c, src/options.h + + +*** ../mercurial/vim73/runtime/doc/if_cscop.txt 2010-09-30 21:38:08.000000000 +0200 +--- runtime/doc/if_cscop.txt 2011-06-12 19:54:26.000000000 +0200 +*************** +*** 271,276 **** +--- 271,285 ---- + :set cst + :set nocst + < ++ *cscoperelative* *csre* ++ If 'cscoperelative' set, then in absence of a prefix given to cscope (prefx ++ is the argument to -P option of cscope), basename of cscope.out location ++ (usually the project root directory) will be used as the prefix to construt ++ absolute path.The default is off. Note: This option is only effective when ++ cscope (cscopeprg) is initialized without a prefix path (-P). Examples: > ++ :set csre ++ :set nocsre ++ < + *cscopetagorder* *csto* + The value of 'csto' determines the order in which |:cstag| performs a search. + If 'csto' is set to zero, cscope database(s) are searched first, followed +*** ../mercurial/vim73/runtime/doc/options.txt 2011-05-19 12:22:41.000000000 +0200 +--- runtime/doc/options.txt 2011-06-12 20:00:10.000000000 +0200 +*************** +*** 2209,2214 **** +--- 2209,2224 ---- + Specifies whether to use quickfix window to show cscope results. + See |cscopequickfix|. + ++ *'cscoperelative'* *'csre'* ++ 'cscoperelative' 'csre' boolean (default off) ++ global ++ {not available when compiled without the |+cscope| ++ feature} ++ {not in Vi} ++ In the absence of a prefix (-P) for cscope. setting this option enables ++ to use the basename of cscope.out path as the prefix. ++ See |cscoperelative|. ++ + *'cscopetag'* *'cst'* *'nocscopetag'* *'nocst'* + 'cscopetag' 'cst' boolean (default off) + global +*** ../mercurial/vim73/src/if_cscope.c 2011-05-05 16:41:19.000000000 +0200 +--- src/if_cscope.c 2011-06-12 20:25:17.000000000 +0200 +*************** +*** 2471,2512 **** + */ + static char * + cs_resolve_file(i, name) +! int i; + char *name; + { +! char *fullname; +! int len; + + /* +! * ppath is freed when we destroy the cscope connection. +! * fullname is freed after cs_make_vim_style_matches, after it's been +! * copied into the tag buffer used by vim + */ + len = (int)(strlen(name) + 2); + if (csinfo[i].ppath != NULL) + len += (int)strlen(csinfo[i].ppath); + + if ((fullname = (char *)alloc(len)) == NULL) + return NULL; + +! /* +! * note/example: this won't work if the cscope output already starts + * "../.." and the prefix path is also "../..". if something like this +! * happens, you are screwed up and need to fix how you're using cscope. +! */ +! if (csinfo[i].ppath != NULL && +! (strncmp(name, csinfo[i].ppath, strlen(csinfo[i].ppath)) != 0) && +! (name[0] != '/') + #ifdef WIN32 +! && name[0] != '\\' && name[1] != ':' + #endif +! ) + (void)sprintf(fullname, "%s/%s", csinfo[i].ppath, name); + else + (void)sprintf(fullname, "%s", name); + + return fullname; +! } /* cs_resolve_file */ + + + /* +--- 2471,2531 ---- + */ + static char * + cs_resolve_file(i, name) +! int i; + char *name; + { +! char *fullname; +! int len; +! char_u *csdir = NULL; + + /* +! * Ppath is freed when we destroy the cscope connection. +! * Fullname is freed after cs_make_vim_style_matches, after it's been +! * copied into the tag buffer used by Vim. + */ + len = (int)(strlen(name) + 2); + if (csinfo[i].ppath != NULL) + len += (int)strlen(csinfo[i].ppath); ++ else if (p_csre && csinfo[i].fname != NULL) ++ { ++ /* If 'cscoperelative' is set and ppath is not set, use cscope.out ++ * path in path resolution. */ ++ csdir = alloc(MAXPATHL); ++ if (csdir != NULL) ++ { ++ vim_strncpy(csdir, (char_u *)csinfo[i].fname, ++ gettail((char_u *)csinfo[i].fname) - 1 - (char_u *)csinfo[i].fname); ++ len += (int)STRLEN(csdir); ++ } ++ } + + if ((fullname = (char *)alloc(len)) == NULL) + return NULL; + +! /* Note/example: this won't work if the cscope output already starts + * "../.." and the prefix path is also "../..". if something like this +! * happens, you are screwed up and need to fix how you're using cscope. */ +! if (csinfo[i].ppath != NULL +! && (strncmp(name, csinfo[i].ppath, strlen(csinfo[i].ppath)) != 0) +! && (name[0] != '/') + #ifdef WIN32 +! && name[0] != '\\' && name[1] != ':' + #endif +! ) + (void)sprintf(fullname, "%s/%s", csinfo[i].ppath, name); ++ else if (csdir != NULL && csinfo[i].fname != NULL && STRLEN(csdir) > 0) ++ { ++ /* Check for csdir to be non empty to avoid empty path concatenated to ++ * cscope output. TODO: avoid the unnecessary alloc/free of fullname. */ ++ vim_free(fullname); ++ fullname = concat_fnames(csdir, (char_u *)name, TRUE); ++ } + else + (void)sprintf(fullname, "%s", name); + ++ vim_free(csdir); + return fullname; +! } + + + /* +*** ../vim-7.3.209/src/version.c 2011-06-12 20:36:00.000000000 +0200 +--- src/version.c 2011-06-12 20:37:48.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 210, + /**/ + +-- +Apathy Error: Don't bother striking any key. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.211 b/source/ap/vim/patches/7.3.211 new file mode 100644 index 00000000..4760c106 --- /dev/null +++ b/source/ap/vim/patches/7.3.211 @@ -0,0 +1,51 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.211 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.211 (after 7.3.210) +Problem: Compiler warning. +Solution: Add type cast. +Files: src/if_cscope.c + + +*** ../mercurial/vim73/src/if_cscope.c 2011-06-12 20:42:17.000000000 +0200 +--- src/if_cscope.c 2011-06-12 21:22:53.000000000 +0200 +*************** +*** 2518,2524 **** + /* Check for csdir to be non empty to avoid empty path concatenated to + * cscope output. TODO: avoid the unnecessary alloc/free of fullname. */ + vim_free(fullname); +! fullname = concat_fnames(csdir, (char_u *)name, TRUE); + } + else + (void)sprintf(fullname, "%s", name); +--- 2518,2524 ---- + /* Check for csdir to be non empty to avoid empty path concatenated to + * cscope output. TODO: avoid the unnecessary alloc/free of fullname. */ + vim_free(fullname); +! fullname = (char *)concat_fnames(csdir, (char_u *)name, TRUE); + } + else + (void)sprintf(fullname, "%s", name); +*** ../vim-7.3.210/src/version.c 2011-06-12 20:42:17.000000000 +0200 +--- src/version.c 2011-06-12 21:24:03.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 211, + /**/ + +-- +Did you ever see a "Hit any key to continue" message in a music piece? + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.212 b/source/ap/vim/patches/7.3.212 new file mode 100644 index 00000000..d5086db0 --- /dev/null +++ b/source/ap/vim/patches/7.3.212 @@ -0,0 +1,243 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.212 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.212 +Problem: With Python 3.2 ":py3" fails. +Solution: Move PyEval_InitThreads() to after Py_Initialize(). (Roland + Puntaier) Check abiflags in configure. (Andreas Behr) +Files: src/if_python3.c, src/auto/configure, src/configure.in + + +*** ../mercurial/vim73/src/if_python3.c 2011-02-25 15:18:46.000000000 +0100 +--- src/if_python3.c 2011-06-11 04:24:49.000000000 +0200 +*************** +*** 547,560 **** + Py_SetPythonHome(PYTHON3_HOME); + #endif + +- /* initialise threads */ +- PyEval_InitThreads(); +- + #if !defined(MACOS) || defined(MACOS_X_UNIX) + Py_Initialize(); + #else + PyMac_Initialize(); + #endif + + #ifdef DYNAMIC_PYTHON3 + get_py3_exceptions(); +--- 547,559 ---- + Py_SetPythonHome(PYTHON3_HOME); + #endif + + #if !defined(MACOS) || defined(MACOS_X_UNIX) + Py_Initialize(); + #else + PyMac_Initialize(); + #endif ++ /* initialise threads, must be after Py_Initialize() */ ++ PyEval_InitThreads(); + + #ifdef DYNAMIC_PYTHON3 + get_py3_exceptions(); +*** ../mercurial/vim73/src/auto/configure 2011-05-10 15:41:59.000000000 +0200 +--- src/auto/configure 2011-06-12 21:33:16.000000000 +0200 +*************** +*** 5505,5510 **** +--- 5505,5527 ---- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_version" >&5 + $as_echo "$vi_cv_var_python3_version" >&6; } + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's abiflags" >&5 ++ $as_echo_n "checking Python's abiflags... " >&6; } ++ if test "${vi_cv_var_python3_abiflags+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++ else ++ ++ vi_cv_var_python3_abiflags= ++ if ${vi_cv_path_python3} -c \ ++ "import sys; sys.exit(${vi_cv_var_python3_version} < 3.2)" ++ then ++ vi_cv_var_python3_abiflags=`${vi_cv_path_python3} -c \ ++ "import sys; print(sys.abiflags)"` ++ fi ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_abiflags" >&5 ++ $as_echo "$vi_cv_var_python3_abiflags" >&6; } ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's install prefix" >&5 + $as_echo_n "checking Python's install prefix... " >&6; } + if test "${vi_cv_path_python3_pfx+set}" = set; then : +*************** +*** 5555,5563 **** + else + + vi_cv_path_python3_conf= + for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do + for subdir in lib64 lib share; do +! d="${path}/${subdir}/python${vi_cv_var_python3_version}/config" + if test -d "$d" && test -f "$d/config.c"; then + vi_cv_path_python3_conf="$d" + fi +--- 5572,5584 ---- + else + + vi_cv_path_python3_conf= ++ config_dir="config" ++ if test "${vi_cv_var_python3_abiflags}" != ""; then ++ config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" ++ fi + for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do + for subdir in lib64 lib share; do +! d="${path}/${subdir}/python${vi_cv_var_python3_version}/${config_dir}" + if test -d "$d" && test -f "$d/config.c"; then + vi_cv_path_python3_conf="$d" + fi +*************** +*** 5592,5598 **** + eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" + rm -f -- "${tmp_mkf}" + vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}" +! vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS} ${python3_LINKFORSHARED}" + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//` + +--- 5613,5619 ---- + eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" + rm -f -- "${tmp_mkf}" + vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}" +! vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}" + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//` + +*************** +*** 5601,5609 **** + + PYTHON3_LIBS="${vi_cv_path_python3_plibs}" + if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then +! PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + else +! PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + fi + PYTHON3_SRC="if_python3.c" + if test "x$MACOSX" = "xyes"; then +--- 5622,5630 ---- + + PYTHON3_LIBS="${vi_cv_path_python3_plibs}" + if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then +! PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + else +! PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + fi + PYTHON3_SRC="if_python3.c" + if test "x$MACOSX" = "xyes"; then +*** ../mercurial/vim73/src/configure.in 2011-05-10 15:41:59.000000000 +0200 +--- src/configure.in 2011-06-12 21:31:18.000000000 +0200 +*************** +*** 992,997 **** +--- 992,1008 ---- + ${vi_cv_path_python3} -c 'import sys; print(sys.version[:3])'` + ]]) + ++ dnl -- get abiflags for python 3.2 or higher (PEP 3149) ++ AC_CACHE_CHECK(Python's abiflags,vi_cv_var_python3_abiflags, ++ [ ++ vi_cv_var_python3_abiflags= ++ if ${vi_cv_path_python3} -c \ ++ "import sys; sys.exit(${vi_cv_var_python3_version} < 3.2)" ++ then ++ vi_cv_var_python3_abiflags=`${vi_cv_path_python3} -c \ ++ "import sys; print(sys.abiflags)"` ++ fi ]) ++ + dnl -- find where python3 thinks it was installed + AC_CACHE_CHECK(Python's install prefix,vi_cv_path_python3_pfx, + [ vi_cv_path_python3_pfx=` +*************** +*** 1021,1029 **** + AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf, + [ + vi_cv_path_python3_conf= + for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do + for subdir in lib64 lib share; do +! d="${path}/${subdir}/python${vi_cv_var_python3_version}/config" + if test -d "$d" && test -f "$d/config.c"; then + vi_cv_path_python3_conf="$d" + fi +--- 1032,1044 ---- + AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf, + [ + vi_cv_path_python3_conf= ++ config_dir="config" ++ if test "${vi_cv_var_python3_abiflags}" != ""; then ++ config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" ++ fi + for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do + for subdir in lib64 lib share; do +! d="${path}/${subdir}/python${vi_cv_var_python3_version}/${config_dir}" + if test -d "$d" && test -f "$d/config.c"; then + vi_cv_path_python3_conf="$d" + fi +*************** +*** 1055,1061 **** + eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" + rm -f -- "${tmp_mkf}" + vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}" +! vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS} ${python3_LINKFORSHARED}" + dnl remove -ltermcap, it can conflict with an earlier -lncurses + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//` +--- 1070,1076 ---- + eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" + rm -f -- "${tmp_mkf}" + vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}" +! vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}" + dnl remove -ltermcap, it can conflict with an earlier -lncurses + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//` +*************** +*** 1063,1071 **** + + PYTHON3_LIBS="${vi_cv_path_python3_plibs}" + if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then +! PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + else +! PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + fi + PYTHON3_SRC="if_python3.c" + dnl For Mac OSX 10.2 config.o is included in the Python library. +--- 1078,1086 ---- + + PYTHON3_LIBS="${vi_cv_path_python3_plibs}" + if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then +! PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + else +! PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + fi + PYTHON3_SRC="if_python3.c" + dnl For Mac OSX 10.2 config.o is included in the Python library. +*** ../vim-7.3.211/src/version.c 2011-06-12 21:24:56.000000000 +0200 +--- src/version.c 2011-06-12 21:35:31.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 212, + /**/ + +-- +In Joseph Heller's novel "Catch-22", the main character tries to get out of a +war by proving he is crazy. But the mere fact he wants to get out of the war +only shows he isn't crazy -- creating the original "Catch-22". + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.213 b/source/ap/vim/patches/7.3.213 new file mode 100644 index 00000000..d3ef325e --- /dev/null +++ b/source/ap/vim/patches/7.3.213 @@ -0,0 +1,142 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.213 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.213 +Problem: Javascript object literal is not indented correctly. +Solution: Make a special case for when "J1" is in 'cino'. (Luc Deschenaux) +Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok + + +*** ../mercurial/vim73/src/misc1.c 2011-05-25 17:29:40.000000000 +0200 +--- src/misc1.c 2011-06-10 04:58:10.000000000 +0200 +*************** +*** 6965,6971 **** + * ldfd) { + * } + */ +! if ((ind_keep_case_label + && cin_iscase(skipwhite(ml_get_curline()), FALSE))) + amount = get_indent(); + else +--- 6965,6971 ---- + * ldfd) { + * } + */ +! if (ind_js || (ind_keep_case_label + && cin_iscase(skipwhite(ml_get_curline()), FALSE))) + amount = get_indent(); + else +*** ../mercurial/vim73/src/testdir/test3.in 2011-05-25 15:16:06.000000000 +0200 +--- src/testdir/test3.in 2011-06-12 21:44:12.000000000 +0200 +*************** +*** 1492,1501 **** + + STARTTEST + :set cino=N-s +! /namespaces + =/^NAMESPACEEND + ENDTEST + + /* valid namespaces with normal indent */ + namespace + { +--- 1492,1502 ---- + + STARTTEST + :set cino=N-s +! /^NAMESPACESTART + =/^NAMESPACEEND + ENDTEST + ++ NAMESPACESTART + /* valid namespaces with normal indent */ + namespace + { +*************** +*** 1561,1566 **** +--- 1562,1588 ---- + + + STARTTEST ++ :set cino=J1 ++ /^JSSTART ++ =/^JSEND ++ ENDTEST ++ ++ JSSTART ++ var bar = { ++ foo: { ++ that: this, ++ some: ok, ++ }, ++ "bar":{ ++ a : 2, ++ b: "123abc", ++ x: 4, ++ "y": 5 ++ } ++ } ++ JSEND ++ ++ STARTTEST + :g/^STARTTEST/.,/^ENDTEST/d + :1;/start of AUTO/,$wq! test.out + ENDTEST +*** ../mercurial/vim73/src/testdir/test3.ok 2011-05-25 15:16:06.000000000 +0200 +--- src/testdir/test3.ok 2011-06-12 21:44:26.000000000 +0200 +*************** +*** 1337,1342 **** +--- 1337,1343 ---- + } + + ++ NAMESPACESTART + /* valid namespaces with normal indent */ + namespace + { +*************** +*** 1401,1403 **** +--- 1402,1420 ---- + NAMESPACEEND + + ++ ++ JSSTART ++ var bar = { ++ foo: { ++ that: this, ++ some: ok, ++ }, ++ "bar":{ ++ a : 2, ++ b: "123abc", ++ x: 4, ++ "y": 5 ++ } ++ } ++ JSEND ++ +*** ../vim-7.3.212/src/version.c 2011-06-12 21:37:06.000000000 +0200 +--- src/version.c 2011-06-12 21:48:34.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 213, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +169. You hire a housekeeper for your home page. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.214 b/source/ap/vim/patches/7.3.214 new file mode 100644 index 00000000..a095bbc4 --- /dev/null +++ b/source/ap/vim/patches/7.3.214 @@ -0,0 +1,55 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.214 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.214 +Problem: The text displayed by ":z-" isn't exactly like old Vi. +Solution: Add one to the start line number. (ChangZhuo Chen) +Files: src/ex_cmds.c + + +*** ../mercurial/vim73/src/ex_cmds.c 2011-05-19 14:30:07.000000000 +0200 +--- src/ex_cmds.c 2011-05-19 14:23:33.000000000 +0200 +*************** +*** 4097,4104 **** + switch (*kind) + { + case '-': +! start = lnum - bigness * (linenr_T)(x - kind); +! end = start + bigness; + curs = end; + break; + +--- 4097,4104 ---- + switch (*kind) + { + case '-': +! start = lnum - bigness * (linenr_T)(x - kind) + 1; +! end = start + bigness - 1; + curs = end; + break; + +*** ../vim-7.3.213/src/version.c 2011-06-12 21:51:01.000000000 +0200 +--- src/version.c 2011-06-12 22:02:20.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 214, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +170. You introduce your wife as "my_lady@home.wife" and refer to your + children as "forked processes." + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.215 b/source/ap/vim/patches/7.3.215 new file mode 100644 index 00000000..24d37fbf --- /dev/null +++ b/source/ap/vim/patches/7.3.215 @@ -0,0 +1,63 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.215 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.215 (after 7.3.210) +Problem: Wrong file names in previous patch. (Toothpik) +Solution: Include the option changes. +Files: src/option.c, src/option.h + + +*** ../mercurial/vim73/src/option.c 2011-05-19 13:40:47.000000000 +0200 +--- src/option.c 2011-06-12 19:58:17.000000000 +0200 +*************** +*** 901,906 **** +--- 901,913 ---- + {(char_u *)0L, (char_u *)0L} + #endif + SCRIPTID_INIT}, ++ {"cscoperelative", "csre", P_BOOL|P_VI_DEF|P_VIM, ++ #ifdef FEAT_CSCOPE ++ (char_u *)&p_csre, PV_NONE, ++ #else ++ (char_u *)NULL, PV_NONE, ++ #endif ++ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, + {"cscopetag", "cst", P_BOOL|P_VI_DEF|P_VIM, + #ifdef FEAT_CSCOPE + (char_u *)&p_cst, PV_NONE, +*** ../mercurial/vim73/src/option.h 2011-05-19 13:40:47.000000000 +0200 +--- src/option.h 2011-06-12 19:58:49.000000000 +0200 +*************** +*** 391,396 **** +--- 391,397 ---- + EXTERN char_u *p_cpo; /* 'cpoptions' */ + #ifdef FEAT_CSCOPE + EXTERN char_u *p_csprg; /* 'cscopeprg' */ ++ EXTERN int p_csre; /* 'cscoperelative' */ + # ifdef FEAT_QUICKFIX + EXTERN char_u *p_csqf; /* 'cscopequickfix' */ + # define CSQF_CMDS "sgdctefi" +*** ../vim-7.3.214/src/version.c 2011-06-12 22:03:15.000000000 +0200 +--- src/version.c 2011-06-12 22:12:34.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 215, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +171. You invent another person and chat with yourself in empty chat rooms. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.216 b/source/ap/vim/patches/7.3.216 new file mode 100644 index 00000000..a52bc936 --- /dev/null +++ b/source/ap/vim/patches/7.3.216 @@ -0,0 +1,263 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.216 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.216 +Problem: When recovering a file a range of lines is missing. (Charles Jie) +Solution: Reset the index when advancing to the next pointer block. Add a + test to verify recovery works. +Files: src/memline.c, src/testdir/test78.in, src/testdir/test78.ok, + src/testdir/Makefile, src/testdir/Make_amiga.mak, + src/testdir/Make_dos.mak, src/testdir/Make_ming.mak, + src/testdir/Make_os2.mak, src/testdir/Make_vms.mms + + +*** ../mercurial/vim73/src/memline.c 2011-05-10 16:41:13.000000000 +0200 +--- src/memline.c 2011-06-13 00:56:09.000000000 +0200 +*************** +*** 1507,1512 **** +--- 1507,1513 ---- + bnum = pp->pb_pointer[idx].pe_bnum; + line_count = pp->pb_pointer[idx].pe_line_count; + page_count = pp->pb_pointer[idx].pe_page_count; ++ idx = 0; + continue; + } + } +*** ../mercurial/vim73/src/testdir/test78.in 2011-06-13 01:05:54.000000000 +0200 +--- src/testdir/test78.in 2011-06-13 00:54:48.000000000 +0200 +*************** +*** 0 **** +--- 1,46 ---- ++ Inserts 10000 lines with text to fill the swap file with two levels of pointer ++ blocks. Then recovers from the swap file and checks all text is restored. ++ ++ We need about 10000 lines of 100 characters to get two levels of pointer ++ blocks. ++ ++ STARTTEST ++ :so small.vim ++ :set nocp fileformat=unix undolevels=-1 ++ :e! Xtest ++ ggdG ++ :let text = "\tabcdefghijklmnoparstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnoparstuvwxyz0123456789" ++ :let i = 1 ++ :let linecount = 10000 ++ :while i <= linecount | call append(i - 1, i . text) | let i += 1 | endwhile ++ :preserve ++ :" get the name of the swap file ++ :redir => swapname ++ :swapname ++ :redir END ++ :let swapname = substitute(swapname, '[[:blank:][:cntrl:]]*\(.\{-}\)[[:blank:][:cntrl:]]*$', '\1', '') ++ :" make a copy of the swap file in Xswap ++ :set bin ++ :exe 'sp ' . swapname ++ :w! Xswap ++ :echo swapname ++ :set nobin ++ :new ++ :only! ++ :bwipe! Xtest ++ :call rename('Xswap', swapname) ++ :recover Xtest ++ :call delete(swapname) ++ :new ++ :call append(0, 'recovery start') ++ :wincmd w ++ :let linedollar = line('$') ++ :if linedollar < linecount | exe 'wincmd w' | call append(line('$'), "expected " . linecount . " lines but found only " . linedollar) | exe 'wincmd w' | let linecount = linedollar | endif ++ :let i = 1 ++ :while i <= linecount | if getline(i) != i . text | exe 'wincmd w' | call append(line('$'), i . ' differs') | exe 'wincmd w' | endif | let i += 1 | endwhile ++ :q! ++ :call append(line('$'), 'recovery end') ++ :w! test.out ++ :qa! ++ ENDTEST ++ +*** ../mercurial/vim73/src/testdir/test78.ok 2011-06-13 01:05:54.000000000 +0200 +--- src/testdir/test78.ok 2011-06-13 00:25:05.000000000 +0200 +*************** +*** 0 **** +--- 1,3 ---- ++ recovery start ++ ++ recovery end +*** ../mercurial/vim73/src/testdir/Makefile 2011-03-22 18:10:34.000000000 +0100 +--- src/testdir/Makefile 2011-06-13 00:35:46.000000000 +0200 +*************** +*** 25,31 **** + test59.out test60.out test61.out test62.out test63.out \ + test64.out test65.out test66.out test67.out test68.out \ + test69.out test70.out test71.out test72.out test73.out \ +! test74.out test75.out test76.out test77.out + + SCRIPTS_GUI = test16.out + +--- 25,31 ---- + test59.out test60.out test61.out test62.out test63.out \ + test64.out test65.out test66.out test67.out test68.out \ + test69.out test70.out test71.out test72.out test73.out \ +! test74.out test75.out test76.out test77.out test78.out + + SCRIPTS_GUI = test16.out + +*************** +*** 71,77 **** + fi \ + else echo $* NO OUTPUT >>test.log; \ + fi" +! # -rm -rf X* test.ok viminfo + + test49.out: test49.vim + +--- 71,77 ---- + fi \ + else echo $* NO OUTPUT >>test.log; \ + fi" +! -rm -rf X* test.ok viminfo + + test49.out: test49.vim + +*** ../mercurial/vim73/src/testdir/Make_amiga.mak 2011-03-22 18:10:34.000000000 +0100 +--- src/testdir/Make_amiga.mak 2011-06-13 01:00:42.000000000 +0200 +*************** +*** 28,34 **** + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out test70.out \ + test71.out test72.out test73.out test74.out test75.out \ +! test76.out test77.out + + .SUFFIXES: .in .out + +--- 28,34 ---- + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out test70.out \ + test71.out test72.out test73.out test74.out test75.out \ +! test76.out test77.out test78.out + + .SUFFIXES: .in .out + +*************** +*** 125,127 **** +--- 125,128 ---- + test75.out: test75.in + test76.out: test76.in + test77.out: test77.in ++ test78.out: test78.in +*** ../mercurial/vim73/src/testdir/Make_dos.mak 2011-03-22 18:10:34.000000000 +0100 +--- src/testdir/Make_dos.mak 2011-06-13 01:00:55.000000000 +0200 +*************** +*** 28,34 **** + test37.out test38.out test39.out test40.out test41.out \ + test42.out test52.out test65.out test66.out test67.out \ + test68.out test69.out test71.out test72.out test73.out \ +! test74.out test75.out test76.out test77.out + + SCRIPTS32 = test50.out test70.out + +--- 28,34 ---- + test37.out test38.out test39.out test40.out test41.out \ + test42.out test52.out test65.out test66.out test67.out \ + test68.out test69.out test71.out test72.out test73.out \ +! test74.out test75.out test76.out test77.out test78.out + + SCRIPTS32 = test50.out test70.out + +*** ../mercurial/vim73/src/testdir/Make_ming.mak 2011-03-22 18:10:34.000000000 +0100 +--- src/testdir/Make_ming.mak 2011-06-13 01:01:02.000000000 +0200 +*************** +*** 48,54 **** + test37.out test38.out test39.out test40.out test41.out \ + test42.out test52.out test65.out test66.out test67.out \ + test68.out test69.out test71.out test72.out test73.out \ +! test74.out test75.out test76.out test77.out + + SCRIPTS32 = test50.out test70.out + +--- 48,54 ---- + test37.out test38.out test39.out test40.out test41.out \ + test42.out test52.out test65.out test66.out test67.out \ + test68.out test69.out test71.out test72.out test73.out \ +! test74.out test75.out test76.out test77.out test78.out + + SCRIPTS32 = test50.out test70.out + +*** ../mercurial/vim73/src/testdir/Make_os2.mak 2011-03-22 18:10:34.000000000 +0100 +--- src/testdir/Make_os2.mak 2011-06-13 01:01:08.000000000 +0200 +*************** +*** 28,34 **** + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out test70.out \ + test71.out test72.out test73.out test74.out test75.out \ +! test76.out test77.out + + .SUFFIXES: .in .out + +--- 28,34 ---- + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out test70.out \ + test71.out test72.out test73.out test74.out test75.out \ +! test76.out test77.out test78.out + + .SUFFIXES: .in .out + +*** ../mercurial/vim73/src/testdir/Make_vms.mms 2011-04-28 19:05:01.000000000 +0200 +--- src/testdir/Make_vms.mms 2011-06-13 01:01:29.000000000 +0200 +*************** +*** 4,10 **** + # Authors: Zoltan Arpadffy, + # Sandor Kopanyi, + # +! # Last change: 2011 Mar 03 + # + # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64. + # Edit the lines in the Configuration section below to select. +--- 4,10 ---- + # Authors: Zoltan Arpadffy, + # Sandor Kopanyi, + # +! # Last change: 2011 Jun 13 + # + # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64. + # Edit the lines in the Configuration section below to select. +*************** +*** 75,81 **** + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out \ + test71.out test72.out test74.out test75.out test76.out \ +! test77.out + + # Known problems: + # Test 30: a problem around mac format - unknown reason +--- 75,81 ---- + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out \ + test71.out test72.out test74.out test75.out test76.out \ +! test77.out test78.out + + # Known problems: + # Test 30: a problem around mac format - unknown reason +*** ../vim-7.3.215/src/version.c 2011-06-12 22:13:37.000000000 +0200 +--- src/version.c 2011-06-13 00:59:02.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 216, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +172. You join listservers just for the extra e-mail. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.217 b/source/ap/vim/patches/7.3.217 new file mode 100644 index 00000000..be04b863 --- /dev/null +++ b/source/ap/vim/patches/7.3.217 @@ -0,0 +1,63 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.217 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.217 +Problem: Inside an "if" a ":wincmd" causes problems. +Solution: When skipping commands let ":wincmd" skip over its argument. +Files: src/ex_docmd.c + + +*** ../mercurial/vim73/src/ex_docmd.c 2011-05-25 12:51:17.000000000 +0200 +--- src/ex_docmd.c 2011-06-13 01:15:17.000000000 +0200 +*************** +*** 2595,2600 **** +--- 2595,2601 ---- + case CMD_unlet: + case CMD_verbose: + case CMD_vertical: ++ case CMD_wincmd: + break; + + default: goto doend; +*************** +*** 8237,8243 **** + p = skipwhite(p); + if (*p != NUL && *p != '"' && eap->nextcmd == NULL) + EMSG(_(e_invarg)); +! else + { + /* Pass flags on for ":vertical wincmd ]". */ + postponed_split_flags = cmdmod.split; +--- 8238,8244 ---- + p = skipwhite(p); + if (*p != NUL && *p != '"' && eap->nextcmd == NULL) + EMSG(_(e_invarg)); +! else if (!eap->skip) + { + /* Pass flags on for ":vertical wincmd ]". */ + postponed_split_flags = cmdmod.split; +*** ../vim-7.3.216/src/version.c 2011-06-13 01:07:22.000000000 +0200 +--- src/version.c 2011-06-13 01:18:48.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 217, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +173. You keep tracking down the email addresses of all your friends + (even childhood friends). + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.218 b/source/ap/vim/patches/7.3.218 new file mode 100644 index 00000000..1da18d81 --- /dev/null +++ b/source/ap/vim/patches/7.3.218 @@ -0,0 +1,91 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.218 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.218 (after 7.3.212) +Problem: Tiny configuration problem with Python 3. +Solution: Add abiflags in one more place. (Andreas Behr) +Files: src/auto/configure, src/configure.in + + +*** ../mercurial/vim73/src/auto/configure 2011-06-12 21:37:06.000000000 +0200 +--- src/auto/configure 2011-06-13 01:26:50.000000000 +0200 +*************** +*** 5607,5613 **** + @echo "python3_BASEMODLIBS='$(BASEMODLIBS)'" + @echo "python3_LIBS='$(LIBS)'" + @echo "python3_SYSLIBS='$(SYSLIBS)'" +- @echo "python3_LINKFORSHARED='$(LINKFORSHARED)'" + @echo "python3_INSTSONAME='$(INSTSONAME)'" + eof + eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" +--- 5607,5612 ---- +*************** +*** 5624,5630 **** + if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then + PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + else +! PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + fi + PYTHON3_SRC="if_python3.c" + if test "x$MACOSX" = "xyes"; then +--- 5623,5629 ---- + if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then + PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + else +! PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + fi + PYTHON3_SRC="if_python3.c" + if test "x$MACOSX" = "xyes"; then +*** ../mercurial/vim73/src/configure.in 2011-06-12 21:37:06.000000000 +0200 +--- src/configure.in 2011-06-13 01:26:35.000000000 +0200 +*************** +*** 1063,1069 **** + @echo "python3_BASEMODLIBS='$(BASEMODLIBS)'" + @echo "python3_LIBS='$(LIBS)'" + @echo "python3_SYSLIBS='$(SYSLIBS)'" +- @echo "python3_LINKFORSHARED='$(LINKFORSHARED)'" + @echo "python3_INSTSONAME='$(INSTSONAME)'" + eof + dnl -- delete the lines from make about Entering/Leaving directory +--- 1063,1068 ---- +*************** +*** 1080,1086 **** + if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then + PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + else +! PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + fi + PYTHON3_SRC="if_python3.c" + dnl For Mac OSX 10.2 config.o is included in the Python library. +--- 1079,1085 ---- + if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then + PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + else +! PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" + fi + PYTHON3_SRC="if_python3.c" + dnl For Mac OSX 10.2 config.o is included in the Python library. +*** ../vim-7.3.217/src/version.c 2011-06-13 01:19:48.000000000 +0200 +--- src/version.c 2011-06-13 01:29:42.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 218, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +174. You know what a listserv is. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.219 b/source/ap/vim/patches/7.3.219 new file mode 100644 index 00000000..2ec11179 --- /dev/null +++ b/source/ap/vim/patches/7.3.219 @@ -0,0 +1,92 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.219 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.219 +Problem: Can't compile with GTK on Mac. +Solution: Add some #ifdef trickery. (Ben Schmidt) +Files: src/os_mac_conv.c, src/os_macosx.m, src/vim.h + + +*** ../mercurial/vim73/src/os_mac_conv.c 2010-08-16 21:23:30.000000000 +0200 +--- src/os_mac_conv.c 2011-06-13 01:55:17.000000000 +0200 +*************** +*** 14,19 **** +--- 14,21 ---- + */ + + #define NO_X11_INCLUDES ++ #define BalloonEval int /* used in header files */ ++ + #include "vim.h" + #ifndef FEAT_GUI_MAC + # include +*** ../mercurial/vim73/src/os_macosx.m 2010-10-10 17:08:28.000000000 +0200 +--- src/os_macosx.m 2011-06-13 01:58:47.000000000 +0200 +*************** +*** 18,23 **** +--- 18,24 ---- + /* Avoid a conflict for the definition of Boolean between Mac header files and + * X11 header files. */ + #define NO_X11_INCLUDES ++ #define BalloonEval int /* used in header files */ + + #include "vim.h" + #import +*************** +*** 27,35 **** + * Clipboard support for the console. + * Don't include this when building the GUI version, the functions in + * gui_mac.c are used then. TODO: remove those instead? +! * But for MacVim we need these ones. + */ +! #if defined(FEAT_CLIPBOARD) && (!defined(FEAT_GUI) || defined(FEAT_GUI_MACVIM)) + + /* Used to identify clipboard data copied from Vim. */ + +--- 28,36 ---- + * Clipboard support for the console. + * Don't include this when building the GUI version, the functions in + * gui_mac.c are used then. TODO: remove those instead? +! * But for MacVim we do need these ones. + */ +! #if defined(FEAT_CLIPBOARD) && (!defined(FEAT_GUI_ENABLED) || defined(FEAT_GUI_MACVIM)) + + /* Used to identify clipboard data copied from Vim. */ + +*** ../mercurial/vim73/src/vim.h 2011-05-19 18:26:34.000000000 +0200 +--- src/vim.h 2011-06-13 01:57:17.000000000 +0200 +*************** +*** 121,126 **** +--- 121,127 ---- + || defined(FEAT_GUI_W32) \ + || defined(FEAT_GUI_W16) \ + || defined(FEAT_GUI_PHOTON) ++ # define FEAT_GUI_ENABLED /* also defined with NO_X11_INCLUDES */ + # if !defined(FEAT_GUI) && !defined(NO_X11_INCLUDES) + # define FEAT_GUI + # endif +*** ../vim-7.3.218/src/version.c 2011-06-13 01:32:42.000000000 +0200 +--- src/version.c 2011-06-13 02:03:02.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 219, + /**/ + +-- +If Microsoft would build a car... +... the oil, water temperature, and alternator warning lights would +all be replaced by a single "General Protection Fault" warning light. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.220 b/source/ap/vim/patches/7.3.220 new file mode 100644 index 00000000..0122e7fc --- /dev/null +++ b/source/ap/vim/patches/7.3.220 @@ -0,0 +1,1230 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.220 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.220 +Problem: Python 3: vim.error is a 'str' instead of an 'Exception' object, + so 'except' or 'raise' it causes a 'SystemError' exception. + Buffer objects do not support slice assignment. + When exchanging text between Vim and Python, multibyte texts become + gabage or cause Unicode Expceptions, etc. + 'py3file' tries to read in the file as Unicode, sometimes causes + UnicodeDecodeException +Solution: Fix the problems. (lilydjwg) +Files: src/if_py_both.h, src/if_python.c, src/if_python3.c + + +*** ../mercurial/vim73/src/if_py_both.h 2011-03-22 15:47:18.000000000 +0100 +--- src/if_py_both.h 2011-06-18 23:54:25.000000000 +0200 +*************** +*** 65,74 **** + OutputWrite(PyObject *self, PyObject *args) + { + int len; +! char *str; + int error = ((OutputObject *)(self))->error; + +! if (!PyArg_ParseTuple(args, "s#", &str, &len)) + return NULL; + + Py_BEGIN_ALLOW_THREADS +--- 65,74 ---- + OutputWrite(PyObject *self, PyObject *args) + { + int len; +! char *str = NULL; + int error = ((OutputObject *)(self))->error; + +! if (!PyArg_ParseTuple(args, "es#", p_enc, &str, &len)) + return NULL; + + Py_BEGIN_ALLOW_THREADS +*************** +*** 76,81 **** +--- 76,82 ---- + writer((writefn)(error ? emsg : msg), (char_u *)str, len); + Python_Release_Vim(); + Py_END_ALLOW_THREADS ++ PyMem_Free(str); + + Py_INCREF(Py_None); + return Py_None; +*************** +*** 104,113 **** + for (i = 0; i < n; ++i) + { + PyObject *line = PyList_GetItem(list, i); +! char *str; + PyInt len; + +! if (!PyArg_Parse(line, "s#", &str, &len)) { + PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings")); + Py_DECREF(list); + return NULL; +--- 105,114 ---- + for (i = 0; i < n; ++i) + { + PyObject *line = PyList_GetItem(list, i); +! char *str = NULL; + PyInt len; + +! if (!PyArg_Parse(line, "es#", p_enc, &str, &len)) { + PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings")); + Py_DECREF(list); + return NULL; +*************** +*** 118,123 **** +--- 119,125 ---- + writer((writefn)(error ? emsg : msg), (char_u *)str, len); + Python_Release_Vim(); + Py_END_ALLOW_THREADS ++ PyMem_Free(str); + } + + Py_DECREF(list); +*************** +*** 681,686 **** +--- 683,689 ---- + { + const char *str; + char *save; ++ PyObject *bytes; + PyInt len; + PyInt i; + char *p; +*************** +*** 691,698 **** + return NULL; + } + +! str = PyString_AsString(obj); +! len = PyString_Size(obj); + + /* + * Error checking: String must not contain newlines, as we +--- 694,702 ---- + return NULL; + } + +! bytes = PyString_AsBytes(obj); /* for Python 2 this does nothing */ +! str = PyString_AsString(bytes); +! len = PyString_Size(bytes); + + /* + * Error checking: String must not contain newlines, as we +*************** +*** 731,736 **** +--- 735,741 ---- + } + + save[i] = '\0'; ++ PyString_FreeBytes(bytes); /* Python 2 does nothing here */ + + return save; + } +*************** +*** 817,823 **** + invalidate_botline(); + } + +! /* Replace a line in the specified buffer. The line number is + * in Vim format (1-based). The replacement line is given as + * a Python string object. The object is checked for validity + * and correct format. Errors are returned as a value of FAIL. +--- 822,829 ---- + invalidate_botline(); + } + +! /* +! * Replace a line in the specified buffer. The line number is + * in Vim format (1-based). The replacement line is given as + * a Python string object. The object is checked for validity + * and correct format. Errors are returned as a value of FAIL. +*************** +*** 908,913 **** +--- 914,1106 ---- + } + } + ++ /* Replace a range of lines in the specified buffer. The line numbers are in ++ * Vim format (1-based). The range is from lo up to, but not including, hi. ++ * The replacement lines are given as a Python list of string objects. The ++ * list is checked for validity and correct format. Errors are returned as a ++ * value of FAIL. The return value is OK on success. ++ * If OK is returned and len_change is not NULL, *len_change ++ * is set to the change in the buffer length. ++ */ ++ static int ++ SetBufferLineList(buf_T *buf, PyInt lo, PyInt hi, PyObject *list, PyInt *len_change) ++ { ++ /* First of all, we check the thpe of the supplied Python object. ++ * There are three cases: ++ * 1. NULL, or None - this is a deletion. ++ * 2. A list - this is a replacement. ++ * 3. Anything else - this is an error. ++ */ ++ if (list == Py_None || list == NULL) ++ { ++ PyInt i; ++ PyInt n = (int)(hi - lo); ++ buf_T *savebuf = curbuf; ++ ++ PyErr_Clear(); ++ curbuf = buf; ++ ++ if (u_savedel((linenr_T)lo, (long)n) == FAIL) ++ PyErr_SetVim(_("cannot save undo information")); ++ else ++ { ++ for (i = 0; i < n; ++i) ++ { ++ if (ml_delete((linenr_T)lo, FALSE) == FAIL) ++ { ++ PyErr_SetVim(_("cannot delete line")); ++ break; ++ } ++ } ++ if (buf == curwin->w_buffer) ++ py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n); ++ deleted_lines_mark((linenr_T)lo, (long)i); ++ } ++ ++ curbuf = savebuf; ++ ++ if (PyErr_Occurred() || VimErrorCheck()) ++ return FAIL; ++ ++ if (len_change) ++ *len_change = -n; ++ ++ return OK; ++ } ++ else if (PyList_Check(list)) ++ { ++ PyInt i; ++ PyInt new_len = PyList_Size(list); ++ PyInt old_len = hi - lo; ++ PyInt extra = 0; /* lines added to text, can be negative */ ++ char **array; ++ buf_T *savebuf; ++ ++ if (new_len == 0) /* avoid allocating zero bytes */ ++ array = NULL; ++ else ++ { ++ array = (char **)alloc((unsigned)(new_len * sizeof(char *))); ++ if (array == NULL) ++ { ++ PyErr_NoMemory(); ++ return FAIL; ++ } ++ } ++ ++ for (i = 0; i < new_len; ++i) ++ { ++ PyObject *line = PyList_GetItem(list, i); ++ ++ array[i] = StringToLine(line); ++ if (array[i] == NULL) ++ { ++ while (i) ++ vim_free(array[--i]); ++ vim_free(array); ++ return FAIL; ++ } ++ } ++ ++ savebuf = curbuf; ++ ++ PyErr_Clear(); ++ curbuf = buf; ++ ++ if (u_save((linenr_T)(lo-1), (linenr_T)hi) == FAIL) ++ PyErr_SetVim(_("cannot save undo information")); ++ ++ /* If the size of the range is reducing (ie, new_len < old_len) we ++ * need to delete some old_len. We do this at the start, by ++ * repeatedly deleting line "lo". ++ */ ++ if (!PyErr_Occurred()) ++ { ++ for (i = 0; i < old_len - new_len; ++i) ++ if (ml_delete((linenr_T)lo, FALSE) == FAIL) ++ { ++ PyErr_SetVim(_("cannot delete line")); ++ break; ++ } ++ extra -= i; ++ } ++ ++ /* For as long as possible, replace the existing old_len with the ++ * new old_len. This is a more efficient operation, as it requires ++ * less memory allocation and freeing. ++ */ ++ if (!PyErr_Occurred()) ++ { ++ for (i = 0; i < old_len && i < new_len; ++i) ++ if (ml_replace((linenr_T)(lo+i), (char_u *)array[i], FALSE) ++ == FAIL) ++ { ++ PyErr_SetVim(_("cannot replace line")); ++ break; ++ } ++ } ++ else ++ i = 0; ++ ++ /* Now we may need to insert the remaining new old_len. If we do, we ++ * must free the strings as we finish with them (we can't pass the ++ * responsibility to vim in this case). ++ */ ++ if (!PyErr_Occurred()) ++ { ++ while (i < new_len) ++ { ++ if (ml_append((linenr_T)(lo + i - 1), ++ (char_u *)array[i], 0, FALSE) == FAIL) ++ { ++ PyErr_SetVim(_("cannot insert line")); ++ break; ++ } ++ vim_free(array[i]); ++ ++i; ++ ++extra; ++ } ++ } ++ ++ /* Free any left-over old_len, as a result of an error */ ++ while (i < new_len) ++ { ++ vim_free(array[i]); ++ ++i; ++ } ++ ++ /* Free the array of old_len. All of its contents have now ++ * been dealt with (either freed, or the responsibility passed ++ * to vim. ++ */ ++ vim_free(array); ++ ++ /* Adjust marks. Invalidate any which lie in the ++ * changed range, and move any in the remainder of the buffer. ++ */ ++ mark_adjust((linenr_T)lo, (linenr_T)(hi - 1), ++ (long)MAXLNUM, (long)extra); ++ changed_lines((linenr_T)lo, 0, (linenr_T)hi, (long)extra); ++ ++ if (buf == curwin->w_buffer) ++ py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)extra); ++ ++ curbuf = savebuf; ++ ++ if (PyErr_Occurred() || VimErrorCheck()) ++ return FAIL; ++ ++ if (len_change) ++ *len_change = new_len - old_len; ++ ++ return OK; ++ } ++ else ++ { ++ PyErr_BadArgument(); ++ return FAIL; ++ } ++ } + + /* Insert a number of lines into the specified buffer after the specifed line. + * The line number is in Vim format (1-based). The lines to be inserted are +*************** +*** 1108,1113 **** +--- 1301,1340 ---- + return -1; + + if (new_end) ++ *new_end = end + len_change; ++ ++ return 0; ++ } ++ ++ static PyInt ++ RBAsSlice(BufferObject *self, PyInt lo, PyInt hi, PyObject *val, PyInt start, PyInt end, PyInt *new_end) ++ { ++ PyInt size; ++ PyInt len_change; ++ ++ /* Self must be a valid buffer */ ++ if (CheckBuffer(self)) ++ return -1; ++ ++ /* Sort out the slice range */ ++ size = end - start + 1; ++ ++ if (lo < 0) ++ lo = 0; ++ else if (lo > size) ++ lo = size; ++ if (hi < 0) ++ hi = 0; ++ if (hi < lo) ++ hi = lo; ++ else if (hi > size) ++ hi = size; ++ ++ if (SetBufferLineList(self->buf, lo + start, hi + start, ++ val, &len_change) == FAIL) ++ return -1; ++ ++ if (new_end) + *new_end = end + len_change; + + return 0; +*** ../mercurial/vim73/src/if_python.c 2011-03-26 18:32:00.000000000 +0100 +--- src/if_python.c 2011-06-19 00:02:15.000000000 +0200 +*************** +*** 56,61 **** +--- 56,65 ---- + + static void init_structs(void); + ++ /* No-op conversion functions, use with care! */ ++ #define PyString_AsBytes(obj) (obj) ++ #define PyString_FreeBytes(obj) ++ + #if !defined(FEAT_PYTHON) && defined(PROTO) + /* Use this to be able to generate prototypes without python being used. */ + # define PyObject Py_ssize_t +*************** +*** 129,134 **** +--- 133,139 ---- + */ + # define PyArg_Parse dll_PyArg_Parse + # define PyArg_ParseTuple dll_PyArg_ParseTuple ++ # define PyMem_Free dll_PyMem_Free + # define PyDict_SetItemString dll_PyDict_SetItemString + # define PyErr_BadArgument dll_PyErr_BadArgument + # define PyErr_Clear dll_PyErr_Clear +*************** +*** 189,194 **** +--- 194,200 ---- + */ + static int(*dll_PyArg_Parse)(PyObject *, char *, ...); + static int(*dll_PyArg_ParseTuple)(PyObject *, char *, ...); ++ static int(*dll_PyMem_Free)(void *); + static int(*dll_PyDict_SetItemString)(PyObject *dp, char *key, PyObject *item); + static int(*dll_PyErr_BadArgument)(void); + static void(*dll_PyErr_Clear)(void); +*************** +*** 271,276 **** +--- 277,283 ---- + { + {"PyArg_Parse", (PYTHON_PROC*)&dll_PyArg_Parse}, + {"PyArg_ParseTuple", (PYTHON_PROC*)&dll_PyArg_ParseTuple}, ++ {"PyMem_Free", (PYTHON_PROC*)&dll_PyMem_Free}, + {"PyDict_SetItemString", (PYTHON_PROC*)&dll_PyDict_SetItemString}, + {"PyErr_BadArgument", (PYTHON_PROC*)&dll_PyErr_BadArgument}, + {"PyErr_Clear", (PYTHON_PROC*)&dll_PyErr_Clear}, +*************** +*** 833,876 **** + static PyObject *CurrentGetattr(PyObject *, char *); + static int CurrentSetattr(PyObject *, char *, PyObject *); + +- /* Common routines for buffers and line ranges +- * ------------------------------------------- +- */ +- +- static PyInt +- RBAssSlice(BufferObject *self, PyInt lo, PyInt hi, PyObject *val, PyInt start, PyInt end, PyInt *new_end) +- { +- PyInt size; +- PyInt len_change; +- +- /* Self must be a valid buffer */ +- if (CheckBuffer(self)) +- return -1; +- +- /* Sort out the slice range */ +- size = end - start + 1; +- +- if (lo < 0) +- lo = 0; +- else if (lo > size) +- lo = size; +- if (hi < 0) +- hi = 0; +- if (hi < lo) +- hi = lo; +- else if (hi > size) +- hi = size; +- +- if (SetBufferLineList(self->buf, lo + start, hi + start, +- val, &len_change) == FAIL) +- return -1; +- +- if (new_end) +- *new_end = end + len_change; +- +- return 0; +- } +- + static PySequenceMethods BufferAsSeq = { + (PyInquiry) BufferLength, /* sq_length, len(x) */ + (binaryfunc) 0, /* BufferConcat, */ /* sq_concat, x+y */ +--- 840,845 ---- +*************** +*** 1038,1044 **** + static PyInt + BufferAssSlice(PyObject *self, PyInt lo, PyInt hi, PyObject *val) + { +! return RBAssSlice((BufferObject *)(self), lo, hi, val, 1, + (PyInt)((BufferObject *)(self))->buf->b_ml.ml_line_count, + NULL); + } +--- 1007,1013 ---- + static PyInt + BufferAssSlice(PyObject *self, PyInt lo, PyInt hi, PyObject *val) + { +! return RBAsSlice((BufferObject *)(self), lo, hi, val, 1, + (PyInt)((BufferObject *)(self))->buf->b_ml.ml_line_count, + NULL); + } +*************** +*** 1088,1094 **** + static PyInt + RangeAssSlice(PyObject *self, PyInt lo, PyInt hi, PyObject *val) + { +! return RBAssSlice(((RangeObject *)(self))->buf, lo, hi, val, + ((RangeObject *)(self))->start, + ((RangeObject *)(self))->end, + &((RangeObject *)(self))->end); +--- 1057,1063 ---- + static PyInt + RangeAssSlice(PyObject *self, PyInt lo, PyInt hi, PyObject *val) + { +! return RBAsSlice(((RangeObject *)(self))->buf, lo, hi, val, + ((RangeObject *)(self))->start, + ((RangeObject *)(self))->end, + &((RangeObject *)(self))->end); +*************** +*** 1435,1628 **** + * 4. Utility functions for handling the interface between Vim and Python. + */ + +- /* Replace a range of lines in the specified buffer. The line numbers are in +- * Vim format (1-based). The range is from lo up to, but not including, hi. +- * The replacement lines are given as a Python list of string objects. The +- * list is checked for validity and correct format. Errors are returned as a +- * value of FAIL. The return value is OK on success. +- * If OK is returned and len_change is not NULL, *len_change +- * is set to the change in the buffer length. +- */ +- static int +- SetBufferLineList(buf_T *buf, PyInt lo, PyInt hi, PyObject *list, PyInt *len_change) +- { +- /* First of all, we check the thpe of the supplied Python object. +- * There are three cases: +- * 1. NULL, or None - this is a deletion. +- * 2. A list - this is a replacement. +- * 3. Anything else - this is an error. +- */ +- if (list == Py_None || list == NULL) +- { +- PyInt i; +- PyInt n = (int)(hi - lo); +- buf_T *savebuf = curbuf; +- +- PyErr_Clear(); +- curbuf = buf; +- +- if (u_savedel((linenr_T)lo, (long)n) == FAIL) +- PyErr_SetVim(_("cannot save undo information")); +- else +- { +- for (i = 0; i < n; ++i) +- { +- if (ml_delete((linenr_T)lo, FALSE) == FAIL) +- { +- PyErr_SetVim(_("cannot delete line")); +- break; +- } +- } +- if (buf == curwin->w_buffer) +- py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n); +- deleted_lines_mark((linenr_T)lo, (long)i); +- } +- +- curbuf = savebuf; +- +- if (PyErr_Occurred() || VimErrorCheck()) +- return FAIL; +- +- if (len_change) +- *len_change = -n; +- +- return OK; +- } +- else if (PyList_Check(list)) +- { +- PyInt i; +- PyInt new_len = PyList_Size(list); +- PyInt old_len = hi - lo; +- PyInt extra = 0; /* lines added to text, can be negative */ +- char **array; +- buf_T *savebuf; +- +- if (new_len == 0) /* avoid allocating zero bytes */ +- array = NULL; +- else +- { +- array = (char **)alloc((unsigned)(new_len * sizeof(char *))); +- if (array == NULL) +- { +- PyErr_NoMemory(); +- return FAIL; +- } +- } +- +- for (i = 0; i < new_len; ++i) +- { +- PyObject *line = PyList_GetItem(list, i); +- +- array[i] = StringToLine(line); +- if (array[i] == NULL) +- { +- while (i) +- vim_free(array[--i]); +- vim_free(array); +- return FAIL; +- } +- } +- +- savebuf = curbuf; +- +- PyErr_Clear(); +- curbuf = buf; +- +- if (u_save((linenr_T)(lo-1), (linenr_T)hi) == FAIL) +- PyErr_SetVim(_("cannot save undo information")); +- +- /* If the size of the range is reducing (ie, new_len < old_len) we +- * need to delete some old_len. We do this at the start, by +- * repeatedly deleting line "lo". +- */ +- if (!PyErr_Occurred()) +- { +- for (i = 0; i < old_len - new_len; ++i) +- if (ml_delete((linenr_T)lo, FALSE) == FAIL) +- { +- PyErr_SetVim(_("cannot delete line")); +- break; +- } +- extra -= i; +- } +- +- /* For as long as possible, replace the existing old_len with the +- * new old_len. This is a more efficient operation, as it requires +- * less memory allocation and freeing. +- */ +- if (!PyErr_Occurred()) +- { +- for (i = 0; i < old_len && i < new_len; ++i) +- if (ml_replace((linenr_T)(lo+i), (char_u *)array[i], FALSE) +- == FAIL) +- { +- PyErr_SetVim(_("cannot replace line")); +- break; +- } +- } +- else +- i = 0; +- +- /* Now we may need to insert the remaining new old_len. If we do, we +- * must free the strings as we finish with them (we can't pass the +- * responsibility to vim in this case). +- */ +- if (!PyErr_Occurred()) +- { +- while (i < new_len) +- { +- if (ml_append((linenr_T)(lo + i - 1), +- (char_u *)array[i], 0, FALSE) == FAIL) +- { +- PyErr_SetVim(_("cannot insert line")); +- break; +- } +- vim_free(array[i]); +- ++i; +- ++extra; +- } +- } +- +- /* Free any left-over old_len, as a result of an error */ +- while (i < new_len) +- { +- vim_free(array[i]); +- ++i; +- } +- +- /* Free the array of old_len. All of its contents have now +- * been dealt with (either freed, or the responsibility passed +- * to vim. +- */ +- vim_free(array); +- +- /* Adjust marks. Invalidate any which lie in the +- * changed range, and move any in the remainder of the buffer. +- */ +- mark_adjust((linenr_T)lo, (linenr_T)(hi - 1), +- (long)MAXLNUM, (long)extra); +- changed_lines((linenr_T)lo, 0, (linenr_T)hi, (long)extra); +- +- if (buf == curwin->w_buffer) +- py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)extra); +- +- curbuf = savebuf; +- +- if (PyErr_Occurred() || VimErrorCheck()) +- return FAIL; +- +- if (len_change) +- *len_change = new_len - old_len; +- +- return OK; +- } +- else +- { +- PyErr_BadArgument(); +- return FAIL; +- } +- } +- + /* Convert a Vim line into a Python string. + * All internal newlines are replaced by null characters. + * +--- 1404,1409 ---- +*** ../mercurial/vim73/src/if_python3.c 2011-06-12 21:37:06.000000000 +0200 +--- src/if_python3.c 2011-06-19 00:10:42.000000000 +0200 +*************** +*** 70,77 **** + + #define PyInt Py_ssize_t + #define PyString_Check(obj) PyUnicode_Check(obj) +! #define PyString_AsString(obj) _PyUnicode_AsString(obj) +! #define PyString_Size(obj) PyUnicode_GET_SIZE(obj) + #define PyString_FromString(repr) PyUnicode_FromString(repr) + + #if defined(DYNAMIC_PYTHON3) || defined(PROTO) +--- 70,79 ---- + + #define PyInt Py_ssize_t + #define PyString_Check(obj) PyUnicode_Check(obj) +! #define PyString_AsBytes(obj) PyUnicode_AsEncodedString(obj, (char *)p_enc, NULL); +! #define PyString_FreeBytes(obj) Py_XDECREF(bytes) +! #define PyString_AsString(obj) PyBytes_AsString(obj) +! #define PyString_Size(obj) PyBytes_GET_SIZE(bytes) + #define PyString_FromString(repr) PyUnicode_FromString(repr) + + #if defined(DYNAMIC_PYTHON3) || defined(PROTO) +*************** +*** 99,104 **** +--- 101,107 ---- + # define PyArg_Parse py3_PyArg_Parse + # undef PyArg_ParseTuple + # define PyArg_ParseTuple py3_PyArg_ParseTuple ++ # define PyMem_Free py3_PyMem_Free + # define PyDict_SetItemString py3_PyDict_SetItemString + # define PyErr_BadArgument py3_PyErr_BadArgument + # define PyErr_Clear py3_PyErr_Clear +*************** +*** 140,147 **** +--- 143,155 ---- + # define PyModule_AddObject py3_PyModule_AddObject + # define PyImport_AppendInittab py3_PyImport_AppendInittab + # define _PyUnicode_AsString py3__PyUnicode_AsString ++ # undef PyUnicode_AsEncodedString ++ # define PyUnicode_AsEncodedString py3_PyUnicode_AsEncodedString ++ # undef PyBytes_AsString ++ # define PyBytes_AsString py3_PyBytes_AsString + # define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr + # define PySlice_Type (*py3_PySlice_Type) ++ # define PyErr_NewException py3_PyErr_NewException + # ifdef Py_DEBUG + # define _Py_NegativeRefcount py3__Py_NegativeRefcount + # define _Py_RefTotal (*py3__Py_RefTotal) +*************** +*** 157,164 **** + # define PyModule_Create2 py3_PyModule_Create2 + # undef PyUnicode_FromString + # define PyUnicode_FromString py3_PyUnicode_FromString +! # undef PyUnicode_FromStringAndSize +! # define PyUnicode_FromStringAndSize py3_PyUnicode_FromStringAndSize + + # ifdef Py_DEBUG + # undef PyObject_NEW +--- 165,172 ---- + # define PyModule_Create2 py3_PyModule_Create2 + # undef PyUnicode_FromString + # define PyUnicode_FromString py3_PyUnicode_FromString +! # undef PyUnicode_Decode +! # define PyUnicode_Decode py3_PyUnicode_Decode + + # ifdef Py_DEBUG + # undef PyObject_NEW +*************** +*** 199,205 **** + static int (*py3_PyType_Ready)(PyTypeObject *type); + static int (*py3_PyDict_SetItemString)(PyObject *dp, char *key, PyObject *item); + static PyObject* (*py3_PyUnicode_FromString)(const char *u); +! static PyObject* (*py3_PyUnicode_FromStringAndSize)(const char *u, Py_ssize_t size); + static long (*py3_PyLong_AsLong)(PyObject *); + static void (*py3_PyErr_SetNone)(PyObject *); + static void (*py3_PyEval_InitThreads)(void); +--- 207,214 ---- + static int (*py3_PyType_Ready)(PyTypeObject *type); + static int (*py3_PyDict_SetItemString)(PyObject *dp, char *key, PyObject *item); + static PyObject* (*py3_PyUnicode_FromString)(const char *u); +! static PyObject* (*py3_PyUnicode_Decode)(const char *u, Py_ssize_t size, +! const char *encoding, const char *errors); + static long (*py3_PyLong_AsLong)(PyObject *); + static void (*py3_PyErr_SetNone)(PyObject *); + static void (*py3_PyEval_InitThreads)(void); +*************** +*** 207,212 **** +--- 216,222 ---- + static PyThreadState*(*py3_PyEval_SaveThread)(void); + static int (*py3_PyArg_Parse)(PyObject *, char *, ...); + static int (*py3_PyArg_ParseTuple)(PyObject *, char *, ...); ++ static int (*py3_PyMem_Free)(void *); + static int (*py3_Py_IsInitialized)(void); + static void (*py3_PyErr_Clear)(void); + static PyObject*(*py3__PyObject_Init)(PyObject *, PyTypeObject *); +*************** +*** 214,224 **** +--- 224,237 ---- + static int (*py3_PyModule_AddObject)(PyObject *m, const char *name, PyObject *o); + static int (*py3_PyImport_AppendInittab)(const char *name, PyObject* (*initfunc)(void)); + static char* (*py3__PyUnicode_AsString)(PyObject *unicode); ++ static PyObject* (*py3_PyUnicode_AsEncodedString)(PyObject *unicode, const char* encoding, const char* errors); ++ static char* (*py3_PyBytes_AsString)(PyObject *bytes); + static PyObject* (*py3_PyObject_GenericGetAttr)(PyObject *obj, PyObject *name); + static PyObject* (*py3_PyModule_Create2)(struct PyModuleDef* module, int module_api_version); + static PyObject* (*py3_PyType_GenericAlloc)(PyTypeObject *type, Py_ssize_t nitems); + static PyObject* (*py3_PyType_GenericNew)(PyTypeObject *type, PyObject *args, PyObject *kwds); + static PyTypeObject* py3_PySlice_Type; ++ static PyObject* (*py3_PyErr_NewException)(char *name, PyObject *base, PyObject *dict); + # ifdef Py_DEBUG + static void (*py3__Py_NegativeRefcount)(const char *fname, int lineno, PyObject *op); + static Py_ssize_t* py3__Py_RefTotal; +*************** +*** 259,264 **** +--- 272,278 ---- + {"Py_SetPythonHome", (PYTHON_PROC*)&py3_Py_SetPythonHome}, + {"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize}, + {"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple}, ++ {"PyMem_Free", (PYTHON_PROC*)&py3_PyMem_Free}, + {"PyList_New", (PYTHON_PROC*)&py3_PyList_New}, + {"PyGILState_Ensure", (PYTHON_PROC*)&py3_PyGILState_Ensure}, + {"PyGILState_Release", (PYTHON_PROC*)&py3_PyGILState_Release}, +*************** +*** 289,295 **** + {"PyEval_RestoreThread", (PYTHON_PROC*)&py3_PyEval_RestoreThread}, + {"PyEval_SaveThread", (PYTHON_PROC*)&py3_PyEval_SaveThread}, + {"PyArg_Parse", (PYTHON_PROC*)&py3_PyArg_Parse}, +- {"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple}, + {"Py_IsInitialized", (PYTHON_PROC*)&py3_Py_IsInitialized}, + {"_Py_NoneStruct", (PYTHON_PROC*)&py3__Py_NoneStruct}, + {"PyErr_Clear", (PYTHON_PROC*)&py3_PyErr_Clear}, +--- 303,308 ---- +*************** +*** 297,307 **** +--- 310,322 ---- + {"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject}, + {"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab}, + {"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString}, ++ {"PyBytes_AsString", (PYTHON_PROC*)&py3_PyBytes_AsString}, + {"PyObject_GenericGetAttr", (PYTHON_PROC*)&py3_PyObject_GenericGetAttr}, + {"PyModule_Create2", (PYTHON_PROC*)&py3_PyModule_Create2}, + {"PyType_GenericAlloc", (PYTHON_PROC*)&py3_PyType_GenericAlloc}, + {"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew}, + {"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type}, ++ {"PyErr_NewException", (PYTHON_PROC*)&py3_PyErr_NewException}, + # ifdef Py_DEBUG + {"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount}, + {"_Py_RefTotal", (PYTHON_PROC*)&py3__Py_RefTotal}, +*************** +*** 337,343 **** + py3_runtime_link_init(char *libname, int verbose) + { + int i; +! void *ucs_from_string, *ucs_from_string_and_size; + + # if !(defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)) && defined(UNIX) && defined(FEAT_PYTHON) + /* Can't have Python and Python3 loaded at the same time. +--- 352,358 ---- + py3_runtime_link_init(char *libname, int verbose) + { + int i; +! void *ucs_from_string, *ucs_decode, *ucs_as_encoded_string; + + # if !(defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)) && defined(UNIX) && defined(FEAT_PYTHON) + /* Can't have Python and Python3 loaded at the same time. +*************** +*** 377,395 **** + /* Load unicode functions separately as only the ucs2 or the ucs4 functions + * will be present in the library. */ + ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicodeUCS2_FromString"); +! ucs_from_string_and_size = symbol_from_dll(hinstPy3, +! "PyUnicodeUCS2_FromStringAndSize"); +! if (!ucs_from_string || !ucs_from_string_and_size) + { + ucs_from_string = symbol_from_dll(hinstPy3, + "PyUnicodeUCS4_FromString"); +! ucs_from_string_and_size = symbol_from_dll(hinstPy3, +! "PyUnicodeUCS4_FromStringAndSize"); + } +! if (ucs_from_string && ucs_from_string_and_size) + { + py3_PyUnicode_FromString = ucs_from_string; +! py3_PyUnicode_FromStringAndSize = ucs_from_string_and_size; + } + else + { +--- 392,415 ---- + /* Load unicode functions separately as only the ucs2 or the ucs4 functions + * will be present in the library. */ + ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicodeUCS2_FromString"); +! ucs_decode = symbol_from_dll(hinstPy3, +! "PyUnicodeUCS2_Decode"); +! ucs_as_encoded_string = symbol_from_dll(hinstPy3, +! "PyUnicodeUCS2_AsEncodedString"); +! if (!ucs_from_string || !ucs_decode || !ucs_as_encoded_string) + { + ucs_from_string = symbol_from_dll(hinstPy3, + "PyUnicodeUCS4_FromString"); +! ucs_decode = symbol_from_dll(hinstPy3, +! "PyUnicodeUCS4_Decode"); +! ucs_as_encoded_string = symbol_from_dll(hinstPy3, +! "PyUnicodeUCS4_AsEncodedString"); + } +! if (ucs_from_string && ucs_decode && ucs_as_encoded_string) + { + py3_PyUnicode_FromString = ucs_from_string; +! py3_PyUnicode_Decode = ucs_decode; +! py3_PyUnicode_AsEncodedString = ucs_as_encoded_string; + } + else + { +*************** +*** 567,574 **** + /* Remove the element from sys.path that was added because of our + * argv[0] value in Py3Init_vim(). Previously we used an empty + * string, but dependinding on the OS we then get an empty entry or +! * the current directory in sys.path. */ +! PyRun_SimpleString("import sys; sys.path = list(filter(lambda x: x != '/must>not&exist', sys.path))"); + + // lock is created and acquired in PyEval_InitThreads() and thread + // state is created in Py_Initialize() +--- 587,597 ---- + /* Remove the element from sys.path that was added because of our + * argv[0] value in Py3Init_vim(). Previously we used an empty + * string, but dependinding on the OS we then get an empty entry or +! * the current directory in sys.path. +! * Only after vim has been imported, the element does exist in +! * sys.path. +! */ +! PyRun_SimpleString("import vim; import sys; sys.path = list(filter(lambda x: not x.endswith('must>not&exist'), sys.path))"); + + // lock is created and acquired in PyEval_InitThreads() and thread + // state is created in Py_Initialize() +*************** +*** 605,610 **** +--- 628,635 ---- + #if defined(HAVE_LOCALE_H) || defined(X_LOCALE) + char *saved_locale; + #endif ++ PyObject *cmdstr; ++ PyObject *cmdbytes; + + #if defined(MACOS) && !defined(MACOS_X_UNIX) + GetPort(&oldPort); +*************** +*** 634,640 **** + + pygilstate = PyGILState_Ensure(); + +! PyRun_SimpleString((char *)(cmd)); + + PyGILState_Release(pygilstate); + +--- 659,671 ---- + + pygilstate = PyGILState_Ensure(); + +! /* PyRun_SimpleString expects a UTF-8 string. Wrong encoding may cause +! * SyntaxError (unicode error). */ +! cmdstr = PyUnicode_Decode(cmd, strlen(cmd), (char *)p_enc, NULL); +! cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", NULL); +! Py_XDECREF(cmdstr); +! PyRun_SimpleString(PyBytes_AsString(cmdbytes)); +! Py_XDECREF(cmdbytes); + + PyGILState_Release(pygilstate); + +*************** +*** 693,699 **** + * different options under Windows, meaning that stdio pointers aren't + * compatible between the two. Yuk. + * +! * construct: exec(compile(open('a_filename').read(), 'a_filename', 'exec')) + * + * We need to escape any backslashes or single quotes in the file name, so that + * Python won't mangle the file name. +--- 724,733 ---- + * different options under Windows, meaning that stdio pointers aren't + * compatible between the two. Yuk. + * +! * construct: exec(compile(open('a_filename', 'rb').read(), 'a_filename', 'exec')) +! * +! * Using bytes so that Python can detect the source encoding as it normally +! * does. The doc does not say "compile" accept bytes, though. + * + * We need to escape any backslashes or single quotes in the file name, so that + * Python won't mangle the file name. +*************** +*** 716,723 **** + return; + if (i==0) + { +! strcpy(p,"').read(),'"); +! p += 11; + } + else + { +--- 750,757 ---- + return; + if (i==0) + { +! strcpy(p,"','rb').read(),'"); +! p += 16; + } + else + { +*************** +*** 812,819 **** + + static Py_ssize_t BufferLength(PyObject *); + static PyObject *BufferItem(PyObject *, Py_ssize_t); +- static Py_ssize_t BufferAsItem(PyObject *, Py_ssize_t, PyObject *); + static PyObject* BufferSubscript(PyObject *self, PyObject* idx); + + + /* Line range type - Implementation functions +--- 846,853 ---- + + static Py_ssize_t BufferLength(PyObject *); + static PyObject *BufferItem(PyObject *, Py_ssize_t); + static PyObject* BufferSubscript(PyObject *self, PyObject* idx); ++ static Py_ssize_t BufferAsSubscript(PyObject *self, PyObject* idx, PyObject* val); + + + /* Line range type - Implementation functions +*************** +*** 835,841 **** + (ssizeargfunc) 0, /* sq_repeat, x*n */ + (ssizeargfunc) BufferItem, /* sq_item, x[i] */ + 0, /* was_sq_slice, x[i:j] */ +! (ssizeobjargproc) BufferAsItem, /* sq_ass_item, x[i]=v */ + 0, /* sq_ass_slice, x[i:j]=v */ + 0, /* sq_contains */ + 0, /* sq_inplace_concat */ +--- 869,875 ---- + (ssizeargfunc) 0, /* sq_repeat, x*n */ + (ssizeargfunc) BufferItem, /* sq_item, x[i] */ + 0, /* was_sq_slice, x[i:j] */ +! 0, /* sq_ass_item, x[i]=v */ + 0, /* sq_ass_slice, x[i:j]=v */ + 0, /* sq_contains */ + 0, /* sq_inplace_concat */ +*************** +*** 845,851 **** + PyMappingMethods BufferAsMapping = { + /* mp_length */ (lenfunc)BufferLength, + /* mp_subscript */ (binaryfunc)BufferSubscript, +! /* mp_ass_subscript */ (objobjargproc)0, + }; + + +--- 879,885 ---- + PyMappingMethods BufferAsMapping = { + /* mp_length */ (lenfunc)BufferLength, + /* mp_subscript */ (binaryfunc)BufferSubscript, +! /* mp_ass_subscript */ (objobjargproc)BufferAsSubscript, + }; + + +*************** +*** 897,902 **** +--- 931,938 ---- + + if (this->buf && this->buf != INVALID_BUFFER_VALUE) + this->buf->b_python3_ref = NULL; ++ ++ Py_TYPE(self)->tp_free((PyObject*)self); + } + + static PyObject * +*************** +*** 975,989 **** + (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count); + } + +- static Py_ssize_t +- BufferAsItem(PyObject *self, Py_ssize_t n, PyObject *val) +- { +- return RBAsItem((BufferObject *)(self), n, val, 1, +- (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, +- NULL); +- } +- +- + static PyObject * + BufferSubscript(PyObject *self, PyObject* idx) + { +--- 1011,1016 ---- +*************** +*** 999,1011 **** + &step, &slicelen) < 0) { + return NULL; + } +! return BufferSlice(self,start,stop+1); + } else { + PyErr_SetString(PyExc_IndexError, "Index must be int or slice"); + return NULL; + } + } + + static PySequenceMethods RangeAsSeq = { + (lenfunc) RangeLength, /* sq_length, len(x) */ + (binaryfunc) 0, /* RangeConcat, sq_concat, x+y */ +--- 1026,1064 ---- + &step, &slicelen) < 0) { + return NULL; + } +! return BufferSlice(self,start,stop); + } else { + PyErr_SetString(PyExc_IndexError, "Index must be int or slice"); + return NULL; + } + } + ++ static Py_ssize_t ++ BufferAsSubscript(PyObject *self, PyObject* idx, PyObject* val) ++ { ++ if (PyLong_Check(idx)) { ++ long n = PyLong_AsLong(idx); ++ return RBAsItem((BufferObject *)(self), n, val, 1, ++ (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, ++ NULL); ++ } else if (PySlice_Check(idx)) { ++ Py_ssize_t start, stop, step, slicelen; ++ ++ if (PySlice_GetIndicesEx((PySliceObject *)idx, ++ (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1, ++ &start, &stop, ++ &step, &slicelen) < 0) { ++ return -1; ++ } ++ return RBAsSlice((BufferObject *)(self), start, stop, val, 1, ++ (PyInt)((BufferObject *)(self))->buf->b_ml.ml_line_count, ++ NULL); ++ } else { ++ PyErr_SetString(PyExc_IndexError, "Index must be int or slice"); ++ return -1; ++ } ++ } ++ + static PySequenceMethods RangeAsSeq = { + (lenfunc) RangeLength, /* sq_length, len(x) */ + (binaryfunc) 0, /* RangeConcat, sq_concat, x+y */ +*************** +*** 1032,1037 **** +--- 1085,1091 ---- + RangeDestructor(PyObject *self) + { + Py_DECREF(((RangeObject *)(self))->buf); ++ Py_TYPE(self)->tp_free((PyObject*)self); + } + + static PyObject * +*************** +*** 1159,1164 **** +--- 1213,1220 ---- + + if (this->win && this->win != INVALID_WINDOW_VALUE) + this->win->w_python3_ref = NULL; ++ ++ Py_TYPE(self)->tp_free((PyObject*)self); + } + + static PyObject * +*************** +*** 1350,1357 **** + PySys_SetArgv(1, argv); + + mod = PyModule_Create(&vimmodule); + +! VimError = Py_BuildValue("s", "vim.error"); + + PyModule_AddObject(mod, "error", VimError); + Py_INCREF((PyObject *)(void *)&TheBufferList); +--- 1406,1416 ---- + PySys_SetArgv(1, argv); + + mod = PyModule_Create(&vimmodule); ++ if (mod == NULL) ++ return NULL; + +! VimError = PyErr_NewException("vim.error", NULL, NULL); +! Py_INCREF(VimError); + + PyModule_AddObject(mod, "error", VimError); + Py_INCREF((PyObject *)(void *)&TheBufferList); +*************** +*** 1404,1410 **** + } + *p = '\0'; + +! result = PyUnicode_FromStringAndSize(tmp, len); + + vim_free(tmp); + return result; +--- 1463,1469 ---- + } + *p = '\0'; + +! result = PyUnicode_Decode(tmp, len, (char *)p_enc, NULL); + + vim_free(tmp); + return result; +*** ../vim-7.3.219/src/version.c 2011-06-13 02:03:55.000000000 +0200 +--- src/version.c 2011-06-19 00:25:38.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 220, + /**/ + +-- +I'm in shape. Round IS a shape. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.221 b/source/ap/vim/patches/7.3.221 new file mode 100644 index 00000000..7211a4a6 --- /dev/null +++ b/source/ap/vim/patches/7.3.221 @@ -0,0 +1,287 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.221 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.221 +Problem: Text from the clipboard is sometimes handled as linewise, but not + consistently. +Solution: Assume the text is linewise when it ends in a CR or NL. +Files: src/gui_gtk_x11.c, src/gui_mac.c, src/ops.c, src/os_msdos.c, + src/os_mswin.c, src/os_qnx.c, src/ui.c + + +*** ../mercurial/vim73/src/gui_gtk_x11.c 2011-02-25 17:10:22.000000000 +0100 +--- src/gui_gtk_x11.c 2011-06-19 00:58:31.000000000 +0200 +*************** +*** 1173,1179 **** + char_u *tmpbuf = NULL; + guchar *tmpbuf_utf8 = NULL; + int len; +! int motion_type; + + if (data->selection == clip_plus.gtk_sel_atom) + cbd = &clip_plus; +--- 1173,1179 ---- + char_u *tmpbuf = NULL; + guchar *tmpbuf_utf8 = NULL; + int len; +! int motion_type = MAUTO; + + if (data->selection == clip_plus.gtk_sel_atom) + cbd = &clip_plus; +*************** +*** 1182,1188 **** + + text = (char_u *)data->data; + len = data->length; +- motion_type = MCHAR; + + if (text == NULL || len <= 0) + { +--- 1182,1187 ---- +*** ../mercurial/vim73/src/gui_mac.c 2011-06-12 20:33:30.000000000 +0200 +--- src/gui_mac.c 2011-06-19 00:59:07.000000000 +0200 +*************** +*** 4671,4677 **** + if (flavor) + type = **textOfClip; + else +! type = (strchr(*textOfClip, '\r') != NULL) ? MLINE : MCHAR; + + tempclip = lalloc(scrapSize + 1, TRUE); + mch_memmove(tempclip, *textOfClip + flavor, scrapSize); +--- 4671,4677 ---- + if (flavor) + type = **textOfClip; + else +! type = MAUTO; + + tempclip = lalloc(scrapSize + 1, TRUE); + mch_memmove(tempclip, *textOfClip + flavor, scrapSize); +*** ../mercurial/vim73/src/ops.c 2011-04-01 16:28:33.000000000 +0200 +--- src/ops.c 2011-06-19 00:59:39.000000000 +0200 +*************** +*** 5733,5739 **** + } + } + +! /* Convert from the GUI selection string into the '*'/'+' register */ + void + clip_yank_selection(type, str, len, cbd) + int type; +--- 5733,5741 ---- + } + } + +! /* +! * Convert from the GUI selection string into the '*'/'+' register. +! */ + void + clip_yank_selection(type, str, len, cbd) + int type; +*************** +*** 6090,6098 **** + if (yank_type == MBLOCK) + yank_type = MAUTO; + #endif +- if (yank_type == MAUTO) +- yank_type = ((len > 0 && (str[len - 1] == '\n' || str[len - 1] == '\r')) +- ? MLINE : MCHAR); + str_to_reg(y_current, yank_type, str, len, block_len); + + # ifdef FEAT_CLIPBOARD +--- 6092,6097 ---- +*************** +*** 6113,6125 **** + * is appended. + */ + static void +! str_to_reg(y_ptr, type, str, len, blocklen) + struct yankreg *y_ptr; /* pointer to yank register */ +! int type; /* MCHAR, MLINE or MBLOCK */ + char_u *str; /* string to put in register */ + long len; /* length of string */ + long blocklen; /* width of Visual block */ + { + int lnum; + long start; + long i; +--- 6112,6125 ---- + * is appended. + */ + static void +! str_to_reg(y_ptr, yank_type, str, len, blocklen) + struct yankreg *y_ptr; /* pointer to yank register */ +! int yank_type; /* MCHAR, MLINE, MBLOCK, MAUTO */ + char_u *str; /* string to put in register */ + long len; /* length of string */ + long blocklen; /* width of Visual block */ + { ++ int type; /* MCHAR, MLINE or MBLOCK */ + int lnum; + long start; + long i; +*************** +*** 6136,6141 **** +--- 6136,6147 ---- + if (y_ptr->y_array == NULL) /* NULL means empty register */ + y_ptr->y_size = 0; + ++ if (yank_type == MAUTO) ++ type = ((len > 0 && (str[len - 1] == NL || str[len - 1] == CAR)) ++ ? MLINE : MCHAR); ++ else ++ type = yank_type; ++ + /* + * Count the number of lines within the string + */ +*** ../mercurial/vim73/src/os_msdos.c 2010-12-17 18:06:00.000000000 +0100 +--- src/os_msdos.c 2011-06-19 01:00:56.000000000 +0200 +*************** +*** 2232,2238 **** + void + clip_mch_request_selection(VimClipboard *cbd) + { +! int type = MCHAR; + char_u *pAllocated = NULL; + char_u *pClipText = NULL; + int clip_data_format = 0; +--- 2232,2238 ---- + void + clip_mch_request_selection(VimClipboard *cbd) + { +! int type = MAUTO; + char_u *pAllocated = NULL; + char_u *pClipText = NULL; + int clip_data_format = 0; +*************** +*** 2280,2293 **** + { + clip_data_format = CF_TEXT; + pClipText = pAllocated; +- type = (vim_strchr((char*)pClipText, '\r') != NULL) ? MLINE : MCHAR; + } + + else if ((pAllocated = Win16GetClipboardData(CF_OEMTEXT)) != NULL) + { + clip_data_format = CF_OEMTEXT; + pClipText = pAllocated; +- type = (vim_strchr((char*)pClipText, '\r') != NULL) ? MLINE : MCHAR; + } + + /* Did we get anything? */ +--- 2280,2291 ---- +*** ../mercurial/vim73/src/os_mswin.c 2011-01-17 20:08:04.000000000 +0100 +--- src/os_mswin.c 2011-06-19 01:01:51.000000000 +0200 +*************** +*** 1410,1418 **** + { + char_u *temp_clipboard; + +! /* If the type is not known guess it. */ + if (metadata.type == -1) +! metadata.type = (vim_strchr(str, '\n') == NULL) ? MCHAR : MLINE; + + /* Translate into . */ + temp_clipboard = crnl_to_nl(str, &str_size); +--- 1410,1418 ---- + { + char_u *temp_clipboard; + +! /* If the type is not known detect it. */ + if (metadata.type == -1) +! metadata.type = MAUTO; + + /* Translate into . */ + temp_clipboard = crnl_to_nl(str, &str_size); +*** ../mercurial/vim73/src/os_qnx.c 2010-05-15 21:22:11.000000000 +0200 +--- src/os_qnx.c 2011-06-19 01:02:26.000000000 +0200 +*************** +*** 93,99 **** + clip_length = clip_header->length - 1; + + if( clip_text != NULL && is_type_set == FALSE ) +! type = (strchr( clip_text, '\r' ) != NULL) ? MLINE : MCHAR; + } + + if( (clip_text != NULL) && (clip_length > 0) ) +--- 93,99 ---- + clip_length = clip_header->length - 1; + + if( clip_text != NULL && is_type_set == FALSE ) +! type = MAUTO; + } + + if( (clip_text != NULL) && (clip_length > 0) ) +*** ../mercurial/vim73/src/ui.c 2010-09-21 22:09:28.000000000 +0200 +--- src/ui.c 2011-06-19 01:03:31.000000000 +0200 +*************** +*** 1609,1615 **** + + #if defined(FEAT_HANGULIN) || defined(PROTO) + void +! push_raw_key (s, len) + char_u *s; + int len; + { +--- 1609,1615 ---- + + #if defined(FEAT_HANGULIN) || defined(PROTO) + void +! push_raw_key(s, len) + char_u *s; + int len; + { +*************** +*** 2016,2022 **** + long_u *length; + int *format; + { +! int motion_type; + long_u len; + char_u *p; + char **text_list = NULL; +--- 2016,2022 ---- + long_u *length; + int *format; + { +! int motion_type = MAUTO; + long_u len; + char_u *p; + char **text_list = NULL; +*************** +*** 2036,2042 **** + *(int *)success = FALSE; + return; + } +- motion_type = MCHAR; + p = (char_u *)value; + len = *length; + if (*type == vim_atom) +--- 2036,2041 ---- +*** ../vim-7.3.220/src/version.c 2011-06-19 00:27:46.000000000 +0200 +--- src/version.c 2011-06-19 01:03:59.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 221, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +190. You quickly hand over your wallet, leather jacket, and car keys + during a mugging, then proceed to beat the crap out of your + assailant when he asks for your laptop. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.222 b/source/ap/vim/patches/7.3.222 new file mode 100644 index 00000000..87151b5a --- /dev/null +++ b/source/ap/vim/patches/7.3.222 @@ -0,0 +1,71 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.22 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.222 +Problem: Warning for building GvimExt. +Solution: Comment-out the DESCRIPTION line. (Mike Williams) +Files: src/GvimExt/gvimext.def, src/GvimExt/gvimext_ming.def + + +*** ../mercurial/vim73/src/GvimExt/gvimext.def 2010-05-15 21:22:11.000000000 +0200 +--- src/GvimExt/gvimext.def 2011-06-15 03:50:55.000000000 +0200 +*************** +*** 1,7 **** + ;gvimdef.def : Declares the module parameters for the DLL. + + LIBRARY gvimext +! DESCRIPTION 'Vim Shell Extension' + + EXPORTS + DllCanUnloadNow private +--- 1,7 ---- + ;gvimdef.def : Declares the module parameters for the DLL. + + LIBRARY gvimext +! ; DESCRIPTION 'Vim Shell Extension' + + EXPORTS + DllCanUnloadNow private +*** ../mercurial/vim73/src/GvimExt/gvimext_ming.def 2010-05-15 21:22:11.000000000 +0200 +--- src/GvimExt/gvimext_ming.def 2011-06-15 03:51:05.000000000 +0200 +*************** +*** 3,9 **** + ;Hence this is the same file as gvimext.def with private removed + + LIBRARY gvimext +! DESCRIPTION 'Vim Shell Extension build with MinGW' + + EXPORTS + DllCanUnloadNow = DllCanUnloadNow@0 +--- 3,9 ---- + ;Hence this is the same file as gvimext.def with private removed + + LIBRARY gvimext +! ; DESCRIPTION 'Vim Shell Extension build with MinGW' + + EXPORTS + DllCanUnloadNow = DllCanUnloadNow@0 +*** ../vim-7.3.221/src/version.c 2011-06-19 01:14:23.000000000 +0200 +--- src/version.c 2011-06-19 01:26:57.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 222, + /**/ + +-- +What is the difference between a professional and an amateur? +The ark was built by an amateur; professionals gave us the Titanic. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.223 b/source/ap/vim/patches/7.3.223 new file mode 100644 index 00000000..e151c5b7 --- /dev/null +++ b/source/ap/vim/patches/7.3.223 @@ -0,0 +1,387 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.223 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.223 +Problem: MingW cross compilation doesn't work with tiny features. +Solution: Move acp_to_enc(), enc_to_utf16() and utf16_to_enc() outside of + "#ifdef CLIPBOARD". Fix typo in makefile. +Files: src/Make_ming.mak, src/os_mswin.c + + +*** ../mercurial/vim73/src/Make_ming.mak 2010-12-30 14:50:46.000000000 +0100 +--- src/Make_ming.mak 2011-06-19 01:20:16.000000000 +0200 +*************** +*** 87,93 **** + + # If you are using gettext-0.10.35 from http://sourceforge.net/projects/gettext + # or gettext-0.10.37 from http://sourceforge.net/projects/mingwrep/ +! # uncomment the following, but I can't build a static versión with them, ?-(| + #GETTEXT=c:/gettext-0.10.37-20010430 + #STATIC_GETTEXT=USE_STATIC_GETTEXT + #DYNAMIC_GETTEXT=DYNAMIC_GETTEXT +--- 87,93 ---- + + # If you are using gettext-0.10.35 from http://sourceforge.net/projects/gettext + # or gettext-0.10.37 from http://sourceforge.net/projects/mingwrep/ +! # uncomment the following, but I can't build a static version with them, ?-(| + #GETTEXT=c:/gettext-0.10.37-20010430 + #STATIC_GETTEXT=USE_STATIC_GETTEXT + #DYNAMIC_GETTEXT=DYNAMIC_GETTEXT +*** ../mercurial/vim73/src/os_mswin.c 2011-06-19 01:14:23.000000000 +0200 +--- src/os_mswin.c 2011-06-19 01:25:23.000000000 +0200 +*************** +*** 1105,1236 **** + return ret; + } + +- #if defined(FEAT_MBYTE) || defined(PROTO) +- /* +- * Note: the following two functions are only guaranteed to work when using +- * valid MS-Windows codepages or when iconv() is available. +- */ +- +- /* +- * Convert "str" from 'encoding' to UTF-16. +- * Input in "str" with length "*lenp". When "lenp" is NULL, use strlen(). +- * Output is returned as an allocated string. "*lenp" is set to the length of +- * the result. A trailing NUL is always added. +- * Returns NULL when out of memory. +- */ +- short_u * +- enc_to_utf16(char_u *str, int *lenp) +- { +- vimconv_T conv; +- WCHAR *ret; +- char_u *allocbuf = NULL; +- int len_loc; +- int length; +- +- if (lenp == NULL) +- { +- len_loc = (int)STRLEN(str) + 1; +- lenp = &len_loc; +- } +- +- if (enc_codepage > 0) +- { +- /* We can do any CP### -> UTF-16 in one pass, and we can do it +- * without iconv() (convert_* may need iconv). */ +- MultiByteToWideChar_alloc(enc_codepage, 0, str, *lenp, &ret, &length); +- } +- else +- { +- /* Use "latin1" by default, we might be called before we have p_enc +- * set up. Convert to utf-8 first, works better with iconv(). Does +- * nothing if 'encoding' is "utf-8". */ +- conv.vc_type = CONV_NONE; +- if (convert_setup(&conv, p_enc ? p_enc : (char_u *)"latin1", +- (char_u *)"utf-8") == FAIL) +- return NULL; +- if (conv.vc_type != CONV_NONE) +- { +- str = allocbuf = string_convert(&conv, str, lenp); +- if (str == NULL) +- return NULL; +- } +- convert_setup(&conv, NULL, NULL); +- +- length = utf8_to_utf16(str, *lenp, NULL, NULL); +- ret = (WCHAR *)alloc((unsigned)((length + 1) * sizeof(WCHAR))); +- if (ret != NULL) +- { +- utf8_to_utf16(str, *lenp, (short_u *)ret, NULL); +- ret[length] = 0; +- } +- +- vim_free(allocbuf); +- } +- +- *lenp = length; +- return (short_u *)ret; +- } +- +- /* +- * Convert an UTF-16 string to 'encoding'. +- * Input in "str" with length (counted in wide characters) "*lenp". When +- * "lenp" is NULL, use wcslen(). +- * Output is returned as an allocated string. If "*lenp" is not NULL it is +- * set to the length of the result. +- * Returns NULL when out of memory. +- */ +- char_u * +- utf16_to_enc(short_u *str, int *lenp) +- { +- vimconv_T conv; +- char_u *utf8_str = NULL, *enc_str = NULL; +- int len_loc; +- +- if (lenp == NULL) +- { +- len_loc = (int)wcslen(str) + 1; +- lenp = &len_loc; +- } +- +- if (enc_codepage > 0) +- { +- /* We can do any UTF-16 -> CP### in one pass. */ +- int length; +- +- WideCharToMultiByte_alloc(enc_codepage, 0, str, *lenp, +- (LPSTR *)&enc_str, &length, 0, 0); +- *lenp = length; +- return enc_str; +- } +- +- /* Avoid allocating zero bytes, it generates an error message. */ +- utf8_str = alloc(utf16_to_utf8(str, *lenp == 0 ? 1 : *lenp, NULL)); +- if (utf8_str != NULL) +- { +- *lenp = utf16_to_utf8(str, *lenp, utf8_str); +- +- /* We might be called before we have p_enc set up. */ +- conv.vc_type = CONV_NONE; +- convert_setup(&conv, (char_u *)"utf-8", +- p_enc? p_enc: (char_u *)"latin1"); +- if (conv.vc_type == CONV_NONE) +- { +- /* p_enc is utf-8, so we're done. */ +- enc_str = utf8_str; +- } +- else +- { +- enc_str = string_convert(&conv, utf8_str, lenp); +- vim_free(utf8_str); +- } +- +- convert_setup(&conv, NULL, NULL); +- } +- +- return enc_str; +- } +- #endif /* FEAT_MBYTE */ +- + /* + * Wait for another process to Close the Clipboard. + * Returns TRUE for success. +--- 1105,1110 ---- +*************** +*** 1436,1467 **** + #endif + } + +- #if (defined(FEAT_MBYTE) && defined(WIN3264)) || defined(PROTO) +- /* +- * Convert from the active codepage to 'encoding'. +- * Input is "str[str_size]". +- * The result is in allocated memory: "out[outlen]". With terminating NUL. +- */ +- void +- acp_to_enc(str, str_size, out, outlen) +- char_u *str; +- int str_size; +- char_u **out; +- int *outlen; +- +- { +- LPWSTR widestr; +- +- MultiByteToWideChar_alloc(GetACP(), 0, str, str_size, &widestr, outlen); +- if (widestr != NULL) +- { +- ++*outlen; /* Include the 0 after the string */ +- *out = utf16_to_enc((short_u *)widestr, outlen); +- vim_free(widestr); +- } +- } +- #endif +- + /* + * Send the current selection to the clipboard. + */ +--- 1310,1315 ---- +*************** +*** 1626,1631 **** +--- 1474,1631 ---- + + #endif /* FEAT_CLIPBOARD */ + ++ #if defined(FEAT_MBYTE) || defined(PROTO) ++ /* ++ * Note: the following two functions are only guaranteed to work when using ++ * valid MS-Windows codepages or when iconv() is available. ++ */ ++ ++ /* ++ * Convert "str" from 'encoding' to UTF-16. ++ * Input in "str" with length "*lenp". When "lenp" is NULL, use strlen(). ++ * Output is returned as an allocated string. "*lenp" is set to the length of ++ * the result. A trailing NUL is always added. ++ * Returns NULL when out of memory. ++ */ ++ short_u * ++ enc_to_utf16(char_u *str, int *lenp) ++ { ++ vimconv_T conv; ++ WCHAR *ret; ++ char_u *allocbuf = NULL; ++ int len_loc; ++ int length; ++ ++ if (lenp == NULL) ++ { ++ len_loc = (int)STRLEN(str) + 1; ++ lenp = &len_loc; ++ } ++ ++ if (enc_codepage > 0) ++ { ++ /* We can do any CP### -> UTF-16 in one pass, and we can do it ++ * without iconv() (convert_* may need iconv). */ ++ MultiByteToWideChar_alloc(enc_codepage, 0, str, *lenp, &ret, &length); ++ } ++ else ++ { ++ /* Use "latin1" by default, we might be called before we have p_enc ++ * set up. Convert to utf-8 first, works better with iconv(). Does ++ * nothing if 'encoding' is "utf-8". */ ++ conv.vc_type = CONV_NONE; ++ if (convert_setup(&conv, p_enc ? p_enc : (char_u *)"latin1", ++ (char_u *)"utf-8") == FAIL) ++ return NULL; ++ if (conv.vc_type != CONV_NONE) ++ { ++ str = allocbuf = string_convert(&conv, str, lenp); ++ if (str == NULL) ++ return NULL; ++ } ++ convert_setup(&conv, NULL, NULL); ++ ++ length = utf8_to_utf16(str, *lenp, NULL, NULL); ++ ret = (WCHAR *)alloc((unsigned)((length + 1) * sizeof(WCHAR))); ++ if (ret != NULL) ++ { ++ utf8_to_utf16(str, *lenp, (short_u *)ret, NULL); ++ ret[length] = 0; ++ } ++ ++ vim_free(allocbuf); ++ } ++ ++ *lenp = length; ++ return (short_u *)ret; ++ } ++ ++ /* ++ * Convert an UTF-16 string to 'encoding'. ++ * Input in "str" with length (counted in wide characters) "*lenp". When ++ * "lenp" is NULL, use wcslen(). ++ * Output is returned as an allocated string. If "*lenp" is not NULL it is ++ * set to the length of the result. ++ * Returns NULL when out of memory. ++ */ ++ char_u * ++ utf16_to_enc(short_u *str, int *lenp) ++ { ++ vimconv_T conv; ++ char_u *utf8_str = NULL, *enc_str = NULL; ++ int len_loc; ++ ++ if (lenp == NULL) ++ { ++ len_loc = (int)wcslen(str) + 1; ++ lenp = &len_loc; ++ } ++ ++ if (enc_codepage > 0) ++ { ++ /* We can do any UTF-16 -> CP### in one pass. */ ++ int length; ++ ++ WideCharToMultiByte_alloc(enc_codepage, 0, str, *lenp, ++ (LPSTR *)&enc_str, &length, 0, 0); ++ *lenp = length; ++ return enc_str; ++ } ++ ++ /* Avoid allocating zero bytes, it generates an error message. */ ++ utf8_str = alloc(utf16_to_utf8(str, *lenp == 0 ? 1 : *lenp, NULL)); ++ if (utf8_str != NULL) ++ { ++ *lenp = utf16_to_utf8(str, *lenp, utf8_str); ++ ++ /* We might be called before we have p_enc set up. */ ++ conv.vc_type = CONV_NONE; ++ convert_setup(&conv, (char_u *)"utf-8", ++ p_enc? p_enc: (char_u *)"latin1"); ++ if (conv.vc_type == CONV_NONE) ++ { ++ /* p_enc is utf-8, so we're done. */ ++ enc_str = utf8_str; ++ } ++ else ++ { ++ enc_str = string_convert(&conv, utf8_str, lenp); ++ vim_free(utf8_str); ++ } ++ ++ convert_setup(&conv, NULL, NULL); ++ } ++ ++ return enc_str; ++ } ++ #endif /* FEAT_MBYTE */ ++ ++ #if (defined(FEAT_MBYTE) && defined(WIN3264)) || defined(PROTO) ++ /* ++ * Convert from the active codepage to 'encoding'. ++ * Input is "str[str_size]". ++ * The result is in allocated memory: "out[outlen]". With terminating NUL. ++ */ ++ void ++ acp_to_enc(str, str_size, out, outlen) ++ char_u *str; ++ int str_size; ++ char_u **out; ++ int *outlen; ++ ++ { ++ LPWSTR widestr; ++ ++ MultiByteToWideChar_alloc(GetACP(), 0, str, str_size, &widestr, outlen); ++ if (widestr != NULL) ++ { ++ ++*outlen; /* Include the 0 after the string */ ++ *out = utf16_to_enc((short_u *)widestr, outlen); ++ vim_free(widestr); ++ } ++ } ++ #endif ++ + + /* + * Debugging helper: expose the MCH_WRITE_DUMP stuff to other modules +*** ../vim-7.3.222/src/version.c 2011-06-19 01:27:29.000000000 +0200 +--- src/version.c 2011-06-19 01:28:41.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 223, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +191. You rate eating establishments not by the quality of the food, + but by the availability of electrical outlets for your PowerBook. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.224 b/source/ap/vim/patches/7.3.224 new file mode 100644 index 00000000..1673f476 --- /dev/null +++ b/source/ap/vim/patches/7.3.224 @@ -0,0 +1,162 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.224 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.224 +Problem: Can't pass dict to sort function. +Solution: Add the optional {dict} argument to sort(). (ZyX) +Files: runtime/doc/eval.txt, src/eval.c + + +*** ../mercurial/vim73/runtime/doc/eval.txt 2011-05-19 17:25:36.000000000 +0200 +--- runtime/doc/eval.txt 2011-06-19 02:42:52.000000000 +0200 +*************** +*** 1919,1925 **** + simplify( {filename}) String simplify filename as much as possible + sin( {expr}) Float sine of {expr} + sinh( {expr}) Float hyperbolic sine of {expr} +! sort( {list} [, {func}]) List sort {list}, using {func} to compare + soundfold( {word}) String sound-fold {word} + spellbadword() String badly spelled word at cursor + spellsuggest( {word} [, {max} [, {capital}]]) +--- 1922,1929 ---- + simplify( {filename}) String simplify filename as much as possible + sin( {expr}) Float sine of {expr} + sinh( {expr}) Float hyperbolic sine of {expr} +! sort( {list} [, {func} [, {dict}]]) +! List sort {list}, using {func} to compare + soundfold( {word}) String sound-fold {word} + spellbadword() String badly spelled word at cursor + spellsuggest( {word} [, {max} [, {capital}]]) +*************** +*** 5275,5281 **** + {only available when compiled with the |+float| feature} + + +! sort({list} [, {func}]) *sort()* *E702* + Sort the items in {list} in-place. Returns {list}. If you + want a list to remain unmodified make a copy first: > + :let sortedlist = sort(copy(mylist)) +--- 5279,5285 ---- + {only available when compiled with the |+float| feature} + + +! sort({list} [, {func} [, {dict}]]) *sort()* *E702* + Sort the items in {list} in-place. Returns {list}. If you + want a list to remain unmodified make a copy first: > + :let sortedlist = sort(copy(mylist)) +*************** +*** 5283,5288 **** +--- 5287,5294 ---- + Numbers sort after Strings, |Lists| after Numbers. + For sorting text in the current buffer use |:sort|. + When {func} is given and it is one then case is ignored. ++ {dict} is for functions with the "dict" attribute. It will be ++ used to set the local variable "self". |Dictionary-function| + When {func} is a |Funcref| or a function name, this function + is called to compare items. The function is invoked with two + items as argument and must return zero if they are equal, 1 or +*** ../mercurial/vim73/src/eval.c 2011-05-19 18:26:34.000000000 +0200 +--- src/eval.c 2011-06-19 02:51:13.000000000 +0200 +*************** +*** 7930,7936 **** + {"sin", 1, 1, f_sin}, + {"sinh", 1, 1, f_sinh}, + #endif +! {"sort", 1, 2, f_sort}, + {"soundfold", 1, 1, f_soundfold}, + {"spellbadword", 0, 1, f_spellbadword}, + {"spellsuggest", 1, 3, f_spellsuggest}, +--- 7930,7936 ---- + {"sin", 1, 1, f_sin}, + {"sinh", 1, 1, f_sinh}, + #endif +! {"sort", 1, 3, f_sort}, + {"soundfold", 1, 1, f_soundfold}, + {"spellbadword", 0, 1, f_spellbadword}, + {"spellsuggest", 1, 3, f_spellsuggest}, +*************** +*** 16366,16371 **** +--- 16366,16372 ---- + + static int item_compare_ic; + static char_u *item_compare_func; ++ static dict_T *item_compare_selfdict; + static int item_compare_func_err; + #define ITEM_COMPARE_FAIL 999 + +*************** +*** 16425,16431 **** + + rettv.v_type = VAR_UNKNOWN; /* clear_tv() uses this */ + res = call_func(item_compare_func, (int)STRLEN(item_compare_func), +! &rettv, 2, argv, 0L, 0L, &dummy, TRUE, NULL); + clear_tv(&argv[0]); + clear_tv(&argv[1]); + +--- 16426,16433 ---- + + rettv.v_type = VAR_UNKNOWN; /* clear_tv() uses this */ + res = call_func(item_compare_func, (int)STRLEN(item_compare_func), +! &rettv, 2, argv, 0L, 0L, &dummy, TRUE, +! item_compare_selfdict); + clear_tv(&argv[0]); + clear_tv(&argv[1]); + +*************** +*** 16471,16478 **** +--- 16473,16482 ---- + + item_compare_ic = FALSE; + item_compare_func = NULL; ++ item_compare_selfdict = NULL; + if (argvars[1].v_type != VAR_UNKNOWN) + { ++ /* optional second argument: {func} */ + if (argvars[1].v_type == VAR_FUNC) + item_compare_func = argvars[1].vval.v_string; + else +*************** +*** 16487,16492 **** +--- 16491,16507 ---- + else + item_compare_func = get_tv_string(&argvars[1]); + } ++ ++ if (argvars[2].v_type != VAR_UNKNOWN) ++ { ++ /* optional third argument: {dict} */ ++ if (argvars[2].v_type != VAR_DICT) ++ { ++ EMSG(_(e_dictreq)); ++ return; ++ } ++ item_compare_selfdict = argvars[2].vval.v_dict; ++ } + } + + /* Make an array with each entry pointing to an item in the List. */ +*** ../vim-7.3.223/src/version.c 2011-06-19 01:30:01.000000000 +0200 +--- src/version.c 2011-06-19 02:52:46.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 224, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +193. You ask your girlfriend to drive home so you can sit back with + your PDA and download the information to your laptop + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.225 b/source/ap/vim/patches/7.3.225 new file mode 100644 index 00000000..5a32b9a6 Binary files /dev/null and b/source/ap/vim/patches/7.3.225 differ diff --git a/source/ap/vim/patches/7.3.226 b/source/ap/vim/patches/7.3.226 new file mode 100644 index 00000000..0002aa77 --- /dev/null +++ b/source/ap/vim/patches/7.3.226 @@ -0,0 +1,58 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.226 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.226 +Problem: On a 64 bit system "syn sync fromstart" is very slow. (Bjorn + Steinbrink) +Solution: Store the state when starting to parse from the first line. +Files: src/syntax.c + + +*** ../mercurial/vim73/src/syntax.c 2011-05-25 17:56:23.000000000 +0200 +--- src/syntax.c 2011-06-19 04:47:08.000000000 +0200 +*************** +*** 559,565 **** + if (INVALID_STATE(¤t_state)) + { + syn_sync(wp, lnum, last_valid); +! first_stored = current_lnum + syn_block->b_syn_sync_minlines; + } + else + first_stored = current_lnum; +--- 559,571 ---- + if (INVALID_STATE(¤t_state)) + { + syn_sync(wp, lnum, last_valid); +! if (current_lnum == 1) +! /* First line is always valid, no matter "minlines". */ +! first_stored = 1; +! else +! /* Need to parse "minlines" lines before state can be considered +! * valid to store. */ +! first_stored = current_lnum + syn_block->b_syn_sync_minlines; + } + else + first_stored = current_lnum; +*** ../vim-7.3.225/src/version.c 2011-06-19 04:31:54.000000000 +0200 +--- src/version.c 2011-06-19 04:49:53.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 226, + /**/ + +-- +Press any key to continue, press any other key to quit. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.227 b/source/ap/vim/patches/7.3.227 new file mode 100644 index 00000000..55d5a9c6 --- /dev/null +++ b/source/ap/vim/patches/7.3.227 @@ -0,0 +1,109 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.227 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.227 (after 7.3.221) +Problem: Mac OS doesn't have the linewise clipboard fix. +Solution: Also change the Mac OS file. (Bjorn Winckler) +Files: src/os_macosx.m + + +*** ../mercurial/vim73/src/os_macosx.m 2011-06-13 02:03:55.000000000 +0200 +--- src/os_macosx.m 2011-06-20 00:23:57.000000000 +0200 +*************** +*** 65,71 **** + NSString *bestType = [pb availableTypeFromArray:supportedTypes]; + if (!bestType) goto releasepool; + +! int motion_type = MCHAR; + NSString *string = nil; + + if ([bestType isEqual:VimPboardType]) +--- 65,71 ---- + NSString *bestType = [pb availableTypeFromArray:supportedTypes]; + if (!bestType) goto releasepool; + +! int motion_type = MAUTO; + NSString *string = nil; + + if ([bestType isEqual:VimPboardType]) +*************** +*** 89,97 **** + + if (!string) + { +! /* Use NSStringPboardType. The motion type is set to line-wise if the +! * string contains at least one EOL character, otherwise it is set to +! * character-wise (block-wise is never used). + */ + NSMutableString *mstring = + [[pb stringForType:NSStringPboardType] mutableCopy]; +--- 89,95 ---- + + if (!string) + { +! /* Use NSStringPboardType. The motion type is detected automatically. + */ + NSMutableString *mstring = + [[pb stringForType:NSStringPboardType] mutableCopy]; +*************** +*** 108,126 **** + options:0 range:range]; + } + +- /* Scan for newline character to decide whether the string should be +- * pasted line-wise or character-wise. +- */ +- motion_type = MCHAR; +- if (0 < n || NSNotFound != [mstring rangeOfString:@"\n"].location) +- motion_type = MLINE; +- + string = mstring; + } + + if (!(MCHAR == motion_type || MLINE == motion_type || MBLOCK == motion_type + || MAUTO == motion_type)) +! motion_type = MCHAR; + + char_u *str = (char_u*)[string UTF8String]; + int len = [string lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; +--- 106,118 ---- + options:0 range:range]; + } + + string = mstring; + } + ++ /* Default to MAUTO, uses MCHAR or MLINE depending on trailing NL. */ + if (!(MCHAR == motion_type || MLINE == motion_type || MBLOCK == motion_type + || MAUTO == motion_type)) +! motion_type = MAUTO; + + char_u *str = (char_u*)[string UTF8String]; + int len = [string lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; +*** ../vim-7.3.226/src/version.c 2011-06-19 04:54:17.000000000 +0200 +--- src/version.c 2011-06-20 00:21:53.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 227, + /**/ + +-- +Some of the well know MS-Windows errors: + EMULTI Multitasking attempted, system confused + EKEYBOARD Keyboard locked, try getting out of this one! + EXPLAIN Unexplained error, please tell us what happened + EFUTURE Reserved for our future mistakes + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.228 b/source/ap/vim/patches/7.3.228 new file mode 100644 index 00000000..3edede59 --- /dev/null +++ b/source/ap/vim/patches/7.3.228 @@ -0,0 +1,45 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.228 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.228 +Problem: "2gj" does not always move to the correct position. +Solution: Get length of line after moving to a next line. (James Vega) +Files: src/normal.c + + +*** ../mercurial/vim73/src/normal.c 2011-05-10 17:29:28.000000000 +0200 +--- src/normal.c 2011-06-20 00:41:43.000000000 +0200 +*************** +*** 4533,4538 **** +--- 4533,4539 ---- + } + curwin->w_cursor.lnum++; + curwin->w_curswant %= width2; ++ linelen = linetabsize(ml_get_curline()); + } + } + } +*** ../vim-7.3.227/src/version.c 2011-06-20 00:25:37.000000000 +0200 +--- src/version.c 2011-06-20 00:45:15.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 228, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +197. Your desk collapses under the weight of your computer peripherals. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.229 b/source/ap/vim/patches/7.3.229 new file mode 100644 index 00000000..b133f7a4 --- /dev/null +++ b/source/ap/vim/patches/7.3.229 @@ -0,0 +1,55 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.229 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.229 +Problem: Using fork() makes gvim crash on Mac when build with + CoreFoundation. +Solution: Disallow fork() when __APPLE__ is defined. (Hisashi T Fujinaka) +Files: src/gui.c + + +*** ../mercurial/vim73/src/gui.c 2011-05-10 16:41:13.000000000 +0200 +--- src/gui.c 2011-06-20 00:51:21.000000000 +0200 +*************** +*** 59,65 **** + gui_start() + { + char_u *old_term; +! #if defined(UNIX) && !defined(__BEOS__) && !defined(MACOS_X) + # define MAY_FORK + int dofork = TRUE; + #endif +--- 59,66 ---- + gui_start() + { + char_u *old_term; +! #if defined(UNIX) && !defined(__BEOS__) && !defined(MACOS_X) \ +! && !defined(__APPLE__) + # define MAY_FORK + int dofork = TRUE; + #endif +*** ../vim-7.3.228/src/version.c 2011-06-20 00:45:55.000000000 +0200 +--- src/version.c 2011-06-20 00:50:42.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 229, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +198. You read all the quotes at Netaholics Anonymous and keep thinking + "What's wrong with that?" + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.230 b/source/ap/vim/patches/7.3.230 new file mode 100644 index 00000000..80fcdf13 --- /dev/null +++ b/source/ap/vim/patches/7.3.230 @@ -0,0 +1,70 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.230 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.230 +Problem: ":wundo" and ":rundo" don't unescape their argument. (Aaron + Thoma) +Solution: Use FILE1 instead of XFILE. +Files: src/ex_cmds.h + + +*** ../mercurial/vim73/src/ex_cmds.h 2010-08-20 11:09:02.000000000 +0200 +--- src/ex_cmds.h 2011-06-20 04:44:13.000000000 +0200 +*************** +*** 788,794 **** + EX(CMD_rubyfile, "rubyfile", ex_rubyfile, + RANGE|FILE1|NEEDARG|CMDWIN), + EX(CMD_rundo, "rundo", ex_rundo, +! NEEDARG|EXTRA|XFILE), + EX(CMD_rviminfo, "rviminfo", ex_viminfo, + BANG|FILE1|TRLBAR|CMDWIN), + EX(CMD_substitute, "substitute", do_sub, +--- 788,794 ---- + EX(CMD_rubyfile, "rubyfile", ex_rubyfile, + RANGE|FILE1|NEEDARG|CMDWIN), + EX(CMD_rundo, "rundo", ex_rundo, +! NEEDARG|FILE1), + EX(CMD_rviminfo, "rviminfo", ex_viminfo, + BANG|FILE1|TRLBAR|CMDWIN), + EX(CMD_substitute, "substitute", do_sub, +*************** +*** 1078,1084 **** + EX(CMD_wsverb, "wsverb", ex_wsverb, + EXTRA|NOTADR|NEEDARG), + EX(CMD_wundo, "wundo", ex_wundo, +! BANG|NEEDARG|EXTRA|XFILE), + EX(CMD_wviminfo, "wviminfo", ex_viminfo, + BANG|FILE1|TRLBAR|CMDWIN), + EX(CMD_xit, "xit", ex_exit, +--- 1078,1084 ---- + EX(CMD_wsverb, "wsverb", ex_wsverb, + EXTRA|NOTADR|NEEDARG), + EX(CMD_wundo, "wundo", ex_wundo, +! BANG|NEEDARG|FILE1), + EX(CMD_wviminfo, "wviminfo", ex_viminfo, + BANG|FILE1|TRLBAR|CMDWIN), + EX(CMD_xit, "xit", ex_exit, +*** ../vim-7.3.229/src/version.c 2011-06-20 00:53:10.000000000 +0200 +--- src/version.c 2011-06-20 05:02:40.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 230, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +201. When somebody asks you where you are, you tell them in which chat room. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.231 b/source/ap/vim/patches/7.3.231 new file mode 100644 index 00000000..266d0a2b --- /dev/null +++ b/source/ap/vim/patches/7.3.231 @@ -0,0 +1,128 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.231 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Note: this is a weird patch, it redoes patches from 7.3.202 and 7.3.203 +that failed when applied as a patch, but the mercurial repository +already had this, thus won't change anything there. + + +Patch 7.3.231 +Problem: Runtime file patches failed. +Solution: Redo the patches made against the patched files instead of the + files in the mercurial repository. +Files: runtime/doc/indent.txt, runtime/doc/os_win32.txt + + +*** ../vim-7.3.230/runtime/doc/indent.txt 2011-05-25 15:16:06.000000000 +0200 +--- runtime/doc/indent.txt 2011-05-31 22:23:39.000000000 +0200 +*************** +*** 356,363 **** + BaseClass(3) BaseClass(3) + {} {} + < +! +N Indent a continuation line (a line that spills onto the next) N +! additional characters. (default 'shiftwidth'). + + cino= cino=+10 > + a = b + 9 * a = b + 9 * +--- 357,368 ---- + BaseClass(3) BaseClass(3) + {} {} + < +! *cino-+* +! +N Indent a continuation line (a line that spills onto the next) +! inside a function N additional characters. (default +! 'shiftwidth'). +! Outside of a function, when the previous line ended in a +! backslash, the 2 * N is used. + + cino= cino=+10 > + a = b + 9 * a = b + 9 * +*************** +*** 509,522 **** +--- 514,532 ---- + } + } + < ++ *cino-)* + )N Vim searches for unclosed parentheses at most N lines away. + This limits the time needed to search for parentheses. (default + 20 lines). + ++ *cino-star* + *N Vim searches for unclosed comments at most N lines away. This + limits the time needed to search for the start of a comment. ++ If your /* */ comments stop indenting afer N lines this is the ++ value you will want to change. + (default 70 lines). + ++ *cino-#* + #N When N is non-zero recognize shell/Perl comments, starting with + '#'. Default N is zero: don't recognizes '#' comments. Note + that lines starting with # will still be seen as preprocessor +*** ../vim-7.3.230/runtime/doc/os_win32.txt 2010-08-15 21:57:16.000000000 +0200 +--- runtime/doc/os_win32.txt 2011-05-28 18:17:58.000000000 +0200 +*************** +*** 313,318 **** +--- 313,349 ---- + with :!start do not get passed Vim's open file handles, which means they do + not have to be closed before Vim. + To avoid this special treatment, use ":! start". ++ There are two optional arguments (see the next Q): ++ /min the window will be minimized. ++ /b" no console window will be opened ++ You can only one of these flags at a time. A second second one will be ++ treated as the start of the command. ++ ++ Q. How do I avoid getting a window for programs that I run asynchronously? ++ A. You have two possible solutions depending on what exactly do you want: ++ 1) You may use the /min flag in order to run program in a minimized state ++ with no other changes. It will work equally for console and GUI ++ applications. ++ 2) You can use the /b flag to run console applications without creating a ++ console window for them (GUI applications are not affected). But you ++ should use this flag only if the application you run doesn't require any ++ input. Otherwise it will get an EOF error because its input stream ++ (stdin) would be redirected to \\.\NUL (stdoud and stderr too). ++ ++ Example for a console application, run Exuberant ctags: > ++ :!start /min ctags -R . ++ < When it has finished you should see file named "tags" in your current ++ directory. You should notice the window title blinking on your taskbar. ++ This is more noticable for commands that take longer. ++ Now delete the "tags" file and run this command: > ++ :!start /b ctags -R . ++ < You should have the same "tags" file, but this time there will be no ++ blinking on the taskbar. ++ Example for a GUI application: > ++ :!start /min notepad ++ :!start /b notepad ++ < The first command runs notepad minimized and the second one runs it ++ normally. + + Q. I'm using Win32s, and when I try to run an external command like "make", + Vim doesn't wait for it to finish! Help! +*** ../vim-7.3.230/src/version.c 2011-06-20 05:02:53.000000000 +0200 +--- src/version.c 2011-06-26 03:14:03.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 231, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +222. You send more than 20 personal e-mails a day. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.232 b/source/ap/vim/patches/7.3.232 new file mode 100644 index 00000000..982d7478 --- /dev/null +++ b/source/ap/vim/patches/7.3.232 @@ -0,0 +1,84 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.232 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.232 +Problem: Python doesn't compile without +multi_byte +Solution: Use "latin1" when MULTI_BYTE is not defined. +Files: src/if_py_both.h + + +*** ../vim-7.3.231/src/if_py_both.h 2011-06-19 00:27:46.000000000 +0200 +--- src/if_py_both.h 2011-06-26 03:58:07.000000000 +0200 +*************** +*** 12,17 **** +--- 12,23 ---- + * Common code for if_python.c and if_python3.c. + */ + ++ #ifdef FEAT_MBYTE ++ # define ENC_OPT p_enc ++ #else ++ # define ENC_OPT "latin1" ++ #endif ++ + /* + * obtain a lock on the Vim data structures + */ +*************** +*** 68,74 **** + char *str = NULL; + int error = ((OutputObject *)(self))->error; + +! if (!PyArg_ParseTuple(args, "es#", p_enc, &str, &len)) + return NULL; + + Py_BEGIN_ALLOW_THREADS +--- 74,80 ---- + char *str = NULL; + int error = ((OutputObject *)(self))->error; + +! if (!PyArg_ParseTuple(args, "es#", ENC_OPT, &str, &len)) + return NULL; + + Py_BEGIN_ALLOW_THREADS +*************** +*** 108,114 **** + char *str = NULL; + PyInt len; + +! if (!PyArg_Parse(line, "es#", p_enc, &str, &len)) { + PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings")); + Py_DECREF(list); + return NULL; +--- 114,120 ---- + char *str = NULL; + PyInt len; + +! if (!PyArg_Parse(line, "es#", ENC_OPT, &str, &len)) { + PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings")); + Py_DECREF(list); + return NULL; +*** ../vim-7.3.231/src/version.c 2011-06-26 03:16:58.000000000 +0200 +--- src/version.c 2011-06-26 04:00:40.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 232, + /**/ + +-- +If evolution theories are correct, humans will soon grow a third +hand for operating the mouse. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.233 b/source/ap/vim/patches/7.3.233 new file mode 100644 index 00000000..2dcbf89a --- /dev/null +++ b/source/ap/vim/patches/7.3.233 @@ -0,0 +1,81 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.233 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.233 +Problem: ":scriptnames" and ":breaklist" show long file names. +Solution: Shorten to use "~/" when possible. (Jean-Rene David) +Files: src/ex_cmds2.c + + +*** ../vim-7.3.232/src/ex_cmds2.c 2011-05-19 18:26:34.000000000 +0200 +--- src/ex_cmds2.c 2011-06-26 04:20:24.000000000 +0200 +*************** +*** 682,691 **** + for (i = 0; i < dbg_breakp.ga_len; ++i) + { + bp = &BREAKP(i); + smsg((char_u *)_("%3d %s %s line %ld"), + bp->dbg_nr, + bp->dbg_type == DBG_FUNC ? "func" : "file", +! bp->dbg_name, + (long)bp->dbg_lnum); + } + } +--- 682,693 ---- + for (i = 0; i < dbg_breakp.ga_len; ++i) + { + bp = &BREAKP(i); ++ if (bp->dbg_type == DBG_FILE) ++ home_replace(NULL, bp->dbg_name, NameBuff, MAXPATHL, TRUE); + smsg((char_u *)_("%3d %s %s line %ld"), + bp->dbg_nr, + bp->dbg_type == DBG_FUNC ? "func" : "file", +! bp->dbg_type == DBG_FUNC ? bp->dbg_name : NameBuff, + (long)bp->dbg_lnum); + } + } +*************** +*** 3268,3274 **** + + for (i = 1; i <= script_items.ga_len && !got_int; ++i) + if (SCRIPT_ITEM(i).sn_name != NULL) +! smsg((char_u *)"%3d: %s", i, SCRIPT_ITEM(i).sn_name); + } + + # if defined(BACKSLASH_IN_FILENAME) || defined(PROTO) +--- 3270,3280 ---- + + for (i = 1; i <= script_items.ga_len && !got_int; ++i) + if (SCRIPT_ITEM(i).sn_name != NULL) +! { +! home_replace(NULL, SCRIPT_ITEM(i).sn_name, +! NameBuff, MAXPATHL, TRUE); +! smsg((char_u *)"%3d: %s", i, NameBuff); +! } + } + + # if defined(BACKSLASH_IN_FILENAME) || defined(PROTO) +*** ../vim-7.3.232/src/version.c 2011-06-26 04:01:37.000000000 +0200 +--- src/version.c 2011-06-26 04:23:48.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 233, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +223. You set up a web-cam as your home's security system. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.234 b/source/ap/vim/patches/7.3.234 new file mode 100644 index 00000000..a60df3db --- /dev/null +++ b/source/ap/vim/patches/7.3.234 @@ -0,0 +1,178 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.234 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.234 +Problem: With GTK menu may be popping down. +Solution: Use event time instead of GDK_CURRENT_TIME. (Hong Xu) +Files: src/gui.c, src/gui.h, src/gui_gtk.c, src/gui_gtk_x11.c + + +*** ../vim-7.3.233/src/gui.c 2011-06-20 00:53:10.000000000 +0200 +--- src/gui.c 2011-06-26 04:38:09.000000000 +0200 +*************** +*** 84,89 **** +--- 84,93 ---- + gui.starting = TRUE; + full_screen = FALSE; + ++ #ifdef FEAT_GUI_GTK ++ gui.event_time = GDK_CURRENT_TIME; ++ #endif ++ + #ifdef MAY_FORK + if (!gui.dofork || vim_strchr(p_go, GO_FORG) || recursive) + dofork = FALSE; +*** ../vim-7.3.233/src/gui.h 2011-05-10 16:41:13.000000000 +0200 +--- src/gui.h 2011-06-26 04:41:21.000000000 +0200 +*************** +*** 401,406 **** +--- 401,408 ---- + GtkAccelGroup *accel_group; + GtkWidget *filedlg; /* file selection dialog */ + char_u *browse_fname; /* file name from filedlg */ ++ ++ guint32 event_time; + #endif /* FEAT_GUI_GTK */ + + #if defined(FEAT_GUI_TABLINE) \ +*** ../vim-7.3.233/src/gui_gtk.c 2011-01-17 20:08:03.000000000 +0100 +--- src/gui_gtk.c 2011-06-26 04:38:09.000000000 +0200 +*************** +*** 1391,1397 **** + gtk_menu_popup(GTK_MENU(menu->submenu_id), + NULL, NULL, + (GtkMenuPositionFunc)NULL, NULL, +! 3U, (guint32)GDK_CURRENT_TIME); + } + + /* Ugly global variable to pass "mouse_pos" flag from gui_make_popup() to +--- 1391,1397 ---- + gtk_menu_popup(GTK_MENU(menu->submenu_id), + NULL, NULL, + (GtkMenuPositionFunc)NULL, NULL, +! 3U, gui.event_time); + } + + /* Ugly global variable to pass "mouse_pos" flag from gui_make_popup() to +*** ../vim-7.3.233/src/gui_gtk_x11.c 2011-06-19 01:14:22.000000000 +0200 +--- src/gui_gtk_x11.c 2011-06-26 04:39:57.000000000 +0200 +*************** +*** 88,95 **** + # include + #endif + +- static guint32 clipboard_event_time = CurrentTime; +- + /* + * Easy-to-use macro for multihead support. + */ +--- 88,93 ---- +*************** +*** 934,940 **** + guint state; + char_u *s, *d; + +! clipboard_event_time = event->time; + key_sym = event->keyval; + state = event->state; + +--- 932,938 ---- + guint state; + char_u *s, *d; + +! gui.event_time = event->time; + key_sym = event->keyval; + state = event->state; + +*************** +*** 1129,1135 **** + GdkEventKey *event, + gpointer data UNUSED) + { +! clipboard_event_time = event->time; + /* + * GTK+ 2 input methods may do fancy stuff on key release events too. + * With the default IM for instance, you can enter any UCS code point +--- 1127,1133 ---- + GdkEventKey *event, + gpointer data UNUSED) + { +! gui.event_time = event->time; + /* + * GTK+ 2 input methods may do fancy stuff on key release events too. + * With the default IM for instance, you can enter any UCS code point +*************** +*** 1622,1628 **** + int x, y; + int_u vim_modifiers; + +! clipboard_event_time = event->time; + + /* Make sure we have focus now we've been selected */ + if (gtk_socket_id != 0 && !GTK_WIDGET_HAS_FOCUS(widget)) +--- 1620,1626 ---- + int x, y; + int_u vim_modifiers; + +! gui.event_time = event->time; + + /* Make sure we have focus now we've been selected */ + if (gtk_socket_id != 0 && !GTK_WIDGET_HAS_FOCUS(widget)) +*************** +*** 1733,1739 **** + int x, y; + int_u vim_modifiers; + +! clipboard_event_time = event->time; + + /* Remove any motion "machine gun" timers used for automatic further + extension of allocation areas if outside of the applications window +--- 1731,1737 ---- + int x, y; + int_u vim_modifiers; + +! gui.event_time = event->time; + + /* Remove any motion "machine gun" timers used for automatic further + extension of allocation areas if outside of the applications window +*************** +*** 5654,5660 **** + int success; + + success = gtk_selection_owner_set(gui.drawarea, cbd->gtk_sel_atom, +! clipboard_event_time); + gui_mch_update(); + return (success) ? OK : FAIL; + } +--- 5652,5658 ---- + int success; + + success = gtk_selection_owner_set(gui.drawarea, cbd->gtk_sel_atom, +! gui.event_time); + gui_mch_update(); + return (success) ? OK : FAIL; + } +*** ../vim-7.3.233/src/version.c 2011-06-26 04:25:24.000000000 +0200 +--- src/version.c 2011-06-26 04:47:02.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 234, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +225. You sign up for free subscriptions for all the computer magazines + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.235 b/source/ap/vim/patches/7.3.235 new file mode 100644 index 00000000..a852c852 --- /dev/null +++ b/source/ap/vim/patches/7.3.235 @@ -0,0 +1,360 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.235 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.235 +Problem: ";" gets stuck on a "t" command, it's not useful. +Solution: Add the ';' flag in 'cpo'. (Christian Brabandt) +Files: runtime/doc/motion.txt, runtime/doc/options.txt, src/option.h, + src/search.c src/testdir/test81.in, src/testdir/test81.ok, + src/testdir/Makefile, src/testdir/Make_amiga.mak, + src/testdir/Make_dos.mak, src/testdir/Make_ming.mak, + src/testdir/Make_os2.mak, src/testdir/Make_vms.mms + + +*** ../vim-7.3.234/runtime/doc/motion.txt 2010-08-15 21:57:17.000000000 +0200 +--- runtime/doc/motion.txt 2011-06-26 05:15:58.000000000 +0200 +*************** +*** 269,279 **** + {char} can be entered like with the |f| command. + + *;* +! ; Repeat latest f, t, F or T [count] times. + + *,* + , Repeat latest f, t, F or T in opposite direction +! [count] times. + + ============================================================================== + 3. Up-down motions *up-down-motions* +--- 269,279 ---- + {char} can be entered like with the |f| command. + + *;* +! ; Repeat latest f, t, F or T [count] times. See |cpo-;| + + *,* + , Repeat latest f, t, F or T in opposite direction +! [count] times. See also |cpo-;| + + ============================================================================== + 3. Up-down motions *up-down-motions* +*** ../vim-7.3.234/runtime/doc/options.txt 2011-06-12 20:42:17.000000000 +0200 +--- runtime/doc/options.txt 2011-06-26 05:15:58.000000000 +0200 +*************** +*** 2090,2095 **** +--- 2117,2128 ---- + *cpo->* + > When appending to a register, put a line break before + the appended text. ++ *cpo-;* ++ ; When using |,| or |;| to repeat the last |t| search ++ and the cursor is right in front of the searched ++ character, the cursor won't move. When not included, ++ the cursor would skip over it and jump to the ++ following occurence. + + POSIX flags. These are not included in the Vi default value, except + when $VIM_POSIX was set on startup. |posix| +*** ../vim-7.3.234/src/option.h 2011-06-12 22:13:37.000000000 +0200 +--- src/option.h 2011-06-26 05:17:58.000000000 +0200 +*************** +*** 169,178 **** + #define CPO_SUBPERCENT '/' /* % in :s string uses previous one */ + #define CPO_BACKSL '\\' /* \ is not special in [] */ + #define CPO_CHDIR '.' /* don't chdir if buffer is modified */ + /* default values for Vim, Vi and POSIX */ + #define CPO_VIM "aABceFs" +! #define CPO_VI "aAbBcCdDeEfFgHiIjJkKlLmMnoOpPqrRsStuvwWxXyZ$!%*-+<>" +! #define CPO_ALL "aAbBcCdDeEfFgHiIjJkKlLmMnoOpPqrRsStuvwWxXyZ$!%*-+<>#{|&/\\." + + /* characters for p_ww option: */ + #define WW_ALL "bshl<>[],~" +--- 169,180 ---- + #define CPO_SUBPERCENT '/' /* % in :s string uses previous one */ + #define CPO_BACKSL '\\' /* \ is not special in [] */ + #define CPO_CHDIR '.' /* don't chdir if buffer is modified */ ++ #define CPO_SCOLON ';' /* using "," and ";" will skip over char if ++ * cursor would not move */ + /* default values for Vim, Vi and POSIX */ + #define CPO_VIM "aABceFs" +! #define CPO_VI "aAbBcCdDeEfFgHiIjJkKlLmMnoOpPqrRsStuvwWxXyZ$!%*-+<>;" +! #define CPO_ALL "aAbBcCdDeEfFgHiIjJkKlLmMnoOpPqrRsStuvwWxXyZ$!%*-+<>#{|&/\\.;" + + /* characters for p_ww option: */ + #define WW_ALL "bshl<>[],~" +*** ../vim-7.3.234/src/search.c 2011-05-10 16:41:13.000000000 +0200 +--- src/search.c 2011-06-26 05:20:45.000000000 +0200 +*************** +*** 1546,1551 **** +--- 1546,1552 ---- + int col; + char_u *p; + int len; ++ int stop = TRUE; + #ifdef FEAT_MBYTE + static char_u bytes[MB_MAXBYTES]; + static int bytelen = 1; /* >1 for multi-byte char */ +*************** +*** 1580,1585 **** +--- 1581,1592 ---- + t_cmd = last_t_cmd; + c = lastc; + /* For multi-byte re-use last bytes[] and bytelen. */ ++ ++ /* Force a move of at least one char, so ";" and "," will move the ++ * cursor, even if the cursor is right in front of char we are looking ++ * at. */ ++ if (vim_strchr(p_cpo, CPO_SCOLON) == NULL && count == 1) ++ stop = FALSE; + } + + if (dir == BACKWARD) +*************** +*** 1612,1625 **** + } + if (bytelen == 1) + { +! if (p[col] == c) + break; + } + else + { +! if (vim_memcmp(p + col, bytes, bytelen) == 0) + break; + } + } + } + else +--- 1619,1633 ---- + } + if (bytelen == 1) + { +! if (p[col] == c && stop) + break; + } + else + { +! if (vim_memcmp(p + col, bytes, bytelen) == 0 && stop) + break; + } ++ stop = TRUE; + } + } + else +*************** +*** 1629,1636 **** + { + if ((col += dir) < 0 || col >= len) + return FAIL; +! if (p[col] == c) + break; + } + } + } +--- 1637,1645 ---- + { + if ((col += dir) < 0 || col >= len) + return FAIL; +! if (p[col] == c && stop) + break; ++ stop = TRUE; + } + } + } +*** ../vim-7.3.234/src/testdir/test81.in 2011-06-26 05:34:33.000000000 +0200 +--- src/testdir/test81.in 2011-06-26 05:30:31.000000000 +0200 +*************** +*** 0 **** +--- 1,18 ---- ++ Test for t movement command and 'cpo-;' setting ++ ++ STARTTEST ++ :set nocompatible ++ :set cpo-=; ++ /firstline/ ++ j0tt;D ++ $Ty;D:set cpo+=; ++ j0tt;;D ++ $Ty;;D:?firstline?+1,$w! test.out ++ :qa! ++ ENDTEST ++ ++ firstline ++ aaa two three four ++ bbb yee yoo four ++ ccc two three four ++ ddd yee yoo four +*** ../vim-7.3.234/src/testdir/test81.ok 2011-06-26 05:34:33.000000000 +0200 +--- src/testdir/test81.ok 2011-06-26 05:31:33.000000000 +0200 +*************** +*** 0 **** +--- 1,4 ---- ++ aaa two ++ bbb y ++ ccc ++ ddd yee y +*** ../vim-7.3.234/src/testdir/Makefile 2011-06-19 04:31:54.000000000 +0200 +--- src/testdir/Makefile 2011-06-26 05:09:56.000000000 +0200 +*************** +*** 26,32 **** + test64.out test65.out test66.out test67.out test68.out \ + test69.out test70.out test71.out test72.out test73.out \ + test74.out test75.out test76.out test77.out test78.out \ +! test79.out test80.out + + SCRIPTS_GUI = test16.out + +--- 26,32 ---- + test64.out test65.out test66.out test67.out test68.out \ + test69.out test70.out test71.out test72.out test73.out \ + test74.out test75.out test76.out test77.out test78.out \ +! test79.out test80.out test81.out + + SCRIPTS_GUI = test16.out + +*** ../vim-7.3.234/src/testdir/Make_amiga.mak 2011-06-19 04:31:54.000000000 +0200 +--- src/testdir/Make_amiga.mak 2011-06-26 05:09:07.000000000 +0200 +*************** +*** 28,34 **** + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out test70.out \ + test71.out test72.out test73.out test74.out test75.out \ +! test76.out test77.out test78.out test79.out test80.out + + .SUFFIXES: .in .out + +--- 28,35 ---- + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out test70.out \ + test71.out test72.out test73.out test74.out test75.out \ +! test76.out test77.out test78.out test79.out test80.out \ +! test81.out + + .SUFFIXES: .in .out + +*************** +*** 128,130 **** +--- 129,132 ---- + test78.out: test78.in + test79.out: test79.in + test80.out: test80.in ++ test81.out: test81.in +*** ../vim-7.3.234/src/testdir/Make_dos.mak 2011-06-19 04:31:54.000000000 +0200 +--- src/testdir/Make_dos.mak 2011-06-26 05:09:16.000000000 +0200 +*************** +*** 29,35 **** + test42.out test52.out test65.out test66.out test67.out \ + test68.out test69.out test71.out test72.out test73.out \ + test74.out test75.out test76.out test77.out test78.out \ +! test79.out test80.out + + SCRIPTS32 = test50.out test70.out + +--- 29,35 ---- + test42.out test52.out test65.out test66.out test67.out \ + test68.out test69.out test71.out test72.out test73.out \ + test74.out test75.out test76.out test77.out test78.out \ +! test79.out test80.out test81.out + + SCRIPTS32 = test50.out test70.out + +*** ../vim-7.3.234/src/testdir/Make_ming.mak 2011-06-19 04:31:54.000000000 +0200 +--- src/testdir/Make_ming.mak 2011-06-26 05:09:24.000000000 +0200 +*************** +*** 49,55 **** + test42.out test52.out test65.out test66.out test67.out \ + test68.out test69.out test71.out test72.out test73.out \ + test74.out test75.out test76.out test77.out test78.out \ +! test79.out test80.out + + SCRIPTS32 = test50.out test70.out + +--- 49,55 ---- + test42.out test52.out test65.out test66.out test67.out \ + test68.out test69.out test71.out test72.out test73.out \ + test74.out test75.out test76.out test77.out test78.out \ +! test79.out test80.out test81.out + + SCRIPTS32 = test50.out test70.out + +*** ../vim-7.3.234/src/testdir/Make_os2.mak 2011-06-19 04:31:54.000000000 +0200 +--- src/testdir/Make_os2.mak 2011-06-26 05:09:33.000000000 +0200 +*************** +*** 28,34 **** + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out test70.out \ + test71.out test72.out test73.out test74.out test75.out \ +! test76.out test77.out test78.out test79.out test80.out + + .SUFFIXES: .in .out + +--- 28,35 ---- + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out test70.out \ + test71.out test72.out test73.out test74.out test75.out \ +! test76.out test77.out test78.out test79.out test80.out \ +! test81.out + + .SUFFIXES: .in .out + +*** ../vim-7.3.234/src/testdir/Make_vms.mms 2011-06-19 04:31:54.000000000 +0200 +--- src/testdir/Make_vms.mms 2011-06-26 05:09:42.000000000 +0200 +*************** +*** 4,10 **** + # Authors: Zoltan Arpadffy, + # Sandor Kopanyi, + # +! # Last change: 2011 Jun 19 + # + # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64. + # Edit the lines in the Configuration section below to select. +--- 4,10 ---- + # Authors: Zoltan Arpadffy, + # Sandor Kopanyi, + # +! # Last change: 2011 Jun 26 + # + # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64. + # Edit the lines in the Configuration section below to select. +*************** +*** 75,81 **** + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out \ + test71.out test72.out test74.out test75.out test76.out \ +! test77.out test78.out test79.out test80.out + + # Known problems: + # Test 30: a problem around mac format - unknown reason +--- 75,81 ---- + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out \ + test71.out test72.out test74.out test75.out test76.out \ +! test77.out test78.out test79.out test80.out test81.out + + # Known problems: + # Test 30: a problem around mac format - unknown reason +*** ../vim-7.3.234/src/version.c 2011-06-26 04:48:56.000000000 +0200 +--- src/version.c 2011-06-26 05:33:53.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 235, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +226. You sit down at the computer right after dinner and your spouse + says "See you in the morning." + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.236 b/source/ap/vim/patches/7.3.236 new file mode 100644 index 00000000..3be69e30 --- /dev/null +++ b/source/ap/vim/patches/7.3.236 @@ -0,0 +1,87 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.236 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.236 (after 7.3.232) +Problem: Python 3 doesn't compile without +multi_byte +Solution: Use "latin1" when MULTI_BYTE is not defined. (lilydjwg) +Files: src/if_python3.c + + +*** ../vim-7.3.235/src/if_python3.c 2011-06-19 00:27:46.000000000 +0200 +--- src/if_python3.c 2011-06-26 19:10:57.000000000 +0200 +*************** +*** 70,76 **** + + #define PyInt Py_ssize_t + #define PyString_Check(obj) PyUnicode_Check(obj) +! #define PyString_AsBytes(obj) PyUnicode_AsEncodedString(obj, (char *)p_enc, NULL); + #define PyString_FreeBytes(obj) Py_XDECREF(bytes) + #define PyString_AsString(obj) PyBytes_AsString(obj) + #define PyString_Size(obj) PyBytes_GET_SIZE(bytes) +--- 70,76 ---- + + #define PyInt Py_ssize_t + #define PyString_Check(obj) PyUnicode_Check(obj) +! #define PyString_AsBytes(obj) PyUnicode_AsEncodedString(obj, (char *)ENC_OPT, NULL); + #define PyString_FreeBytes(obj) Py_XDECREF(bytes) + #define PyString_AsString(obj) PyBytes_AsString(obj) + #define PyString_Size(obj) PyBytes_GET_SIZE(bytes) +*************** +*** 661,667 **** + + /* PyRun_SimpleString expects a UTF-8 string. Wrong encoding may cause + * SyntaxError (unicode error). */ +! cmdstr = PyUnicode_Decode(cmd, strlen(cmd), (char *)p_enc, NULL); + cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", NULL); + Py_XDECREF(cmdstr); + PyRun_SimpleString(PyBytes_AsString(cmdbytes)); +--- 661,667 ---- + + /* PyRun_SimpleString expects a UTF-8 string. Wrong encoding may cause + * SyntaxError (unicode error). */ +! cmdstr = PyUnicode_Decode(cmd, strlen(cmd), (char *)ENC_OPT, NULL); + cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", NULL); + Py_XDECREF(cmdstr); + PyRun_SimpleString(PyBytes_AsString(cmdbytes)); +*************** +*** 1463,1469 **** + } + *p = '\0'; + +! result = PyUnicode_Decode(tmp, len, (char *)p_enc, NULL); + + vim_free(tmp); + return result; +--- 1463,1469 ---- + } + *p = '\0'; + +! result = PyUnicode_Decode(tmp, len, (char *)ENC_OPT, NULL); + + vim_free(tmp); + return result; +*** ../vim-7.3.235/src/version.c 2011-06-26 05:36:07.000000000 +0200 +--- src/version.c 2011-06-26 19:12:12.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 236, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +228. You spend Saturday night making the counter on your home page + pass that 2000 mark. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.237 b/source/ap/vim/patches/7.3.237 new file mode 100644 index 00000000..ead50ca6 --- /dev/null +++ b/source/ap/vim/patches/7.3.237 @@ -0,0 +1,222 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.237 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.237 +Problem: "filetype" completion doesn't work on Windows. (Yue Wu) +Solution: Don't use a glob pattern for the directories, use a list of + directories. (Dominique Pelle) +Files: src/ex_getln.c + + +*** ../vim-7.3.236/src/ex_getln.c 2011-05-19 18:26:34.000000000 +0200 +--- src/ex_getln.c 2011-06-26 19:36:36.000000000 +0200 +*************** +*** 110,116 **** + static int expand_showtail __ARGS((expand_T *xp)); + #ifdef FEAT_CMDL_COMPL + static int expand_shellcmd __ARGS((char_u *filepat, int *num_file, char_u ***file, int flagsarg)); +! static int ExpandRTDir __ARGS((char_u *pat, int *num_file, char_u ***file, char *dirname)); + # if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL) + static int ExpandUserDefined __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file)); + static int ExpandUserList __ARGS((expand_T *xp, int *num_file, char_u ***file)); +--- 110,116 ---- + static int expand_showtail __ARGS((expand_T *xp)); + #ifdef FEAT_CMDL_COMPL + static int expand_shellcmd __ARGS((char_u *filepat, int *num_file, char_u ***file, int flagsarg)); +! static int ExpandRTDir __ARGS((char_u *pat, int *num_file, char_u ***file, char *dirname[])); + # if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL) + static int ExpandUserDefined __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file)); + static int ExpandUserList __ARGS((expand_T *xp, int *num_file, char_u ***file)); +*************** +*** 4536,4548 **** + || xp->xp_context == EXPAND_TAGS_LISTFILES) + return expand_tags(xp->xp_context == EXPAND_TAGS, pat, num_file, file); + if (xp->xp_context == EXPAND_COLORS) +! return ExpandRTDir(pat, num_file, file, "colors"); + if (xp->xp_context == EXPAND_COMPILER) +! return ExpandRTDir(pat, num_file, file, "compiler"); + if (xp->xp_context == EXPAND_OWNSYNTAX) +! return ExpandRTDir(pat, num_file, file, "syntax"); + if (xp->xp_context == EXPAND_FILETYPE) +! return ExpandRTDir(pat, num_file, file, "{syntax,indent,ftplugin}"); + # if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL) + if (xp->xp_context == EXPAND_USER_LIST) + return ExpandUserList(xp, num_file, file); +--- 4536,4560 ---- + || xp->xp_context == EXPAND_TAGS_LISTFILES) + return expand_tags(xp->xp_context == EXPAND_TAGS, pat, num_file, file); + if (xp->xp_context == EXPAND_COLORS) +! { +! char *directories[] = {"colors", NULL}; +! return ExpandRTDir(pat, num_file, file, directories); +! } + if (xp->xp_context == EXPAND_COMPILER) +! { +! char *directories[] = {"colors", NULL}; +! return ExpandRTDir(pat, num_file, file, directories); +! } + if (xp->xp_context == EXPAND_OWNSYNTAX) +! { +! char *directories[] = {"syntax", NULL}; +! return ExpandRTDir(pat, num_file, file, directories); +! } + if (xp->xp_context == EXPAND_FILETYPE) +! { +! char *directories[] = {"syntax", "indent", "ftplugin", NULL}; +! return ExpandRTDir(pat, num_file, file, directories); +! } + # if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL) + if (xp->xp_context == EXPAND_USER_LIST) + return ExpandUserList(xp, num_file, file); +*************** +*** 4995,5051 **** + /* + * Expand color scheme, compiler or filetype names: + * 'runtimepath'/{dirnames}/{pat}.vim +! * dirnames may contain one directory (ex: "colorscheme") or can be a glob +! * expression matching multiple directories (ex: "{syntax,ftplugin,indent}"). + */ + static int + ExpandRTDir(pat, num_file, file, dirnames) + char_u *pat; + int *num_file; + char_u ***file; +! char *dirnames; + { +! char_u *all; + char_u *s; + char_u *e; + garray_T ga; + + *num_file = 0; + *file = NULL; +! s = alloc((unsigned)(STRLEN(pat) + STRLEN(dirnames) + 7)); +! if (s == NULL) +! return FAIL; +! sprintf((char *)s, "%s/%s*.vim", dirnames, pat); +! all = globpath(p_rtp, s, 0); +! vim_free(s); +! if (all == NULL) +! return FAIL; + +! ga_init2(&ga, (int)sizeof(char *), 3); +! for (s = all; *s != NUL; s = e) + { +! e = vim_strchr(s, '\n'); +! if (e == NULL) +! e = s + STRLEN(s); +! if (ga_grow(&ga, 1) == FAIL) +! break; +! if (e - 4 > s && STRNICMP(e - 4, ".vim", 4) == 0) + { +! for (s = e - 4; s > all; mb_ptr_back(all, s)) +! if (*s == '\n' || vim_ispathsep(*s)) +! break; +! ++s; +! ((char_u **)ga.ga_data)[ga.ga_len] = + vim_strnsave(s, (int)(e - s - 4)); +! ++ga.ga_len; + } +! if (*e != NUL) +! ++e; + } +! vim_free(all); + + /* Sort and remove duplicates which can happen when specifying multiple +! * directories in dirnames such as "{syntax,ftplugin,indent}". */ + remove_duplicates(&ga); + + *file = ga.ga_data; +--- 5007,5074 ---- + /* + * Expand color scheme, compiler or filetype names: + * 'runtimepath'/{dirnames}/{pat}.vim +! * "dirnames" is an array with one or more directory names. + */ + static int + ExpandRTDir(pat, num_file, file, dirnames) + char_u *pat; + int *num_file; + char_u ***file; +! char *dirnames[]; + { +! char_u *matches; + char_u *s; + char_u *e; + garray_T ga; ++ int i; ++ int pat_len; + + *num_file = 0; + *file = NULL; +! pat_len = STRLEN(pat); +! ga_init2(&ga, (int)sizeof(char *), 10); + +! for (i = 0; dirnames[i] != NULL; ++i) + { +! s = alloc((unsigned)(STRLEN(dirnames[i]) + pat_len + 7)); +! if (s == NULL) + { +! ga_clear_strings(&ga); +! return FAIL; +! } +! sprintf((char *)s, "%s/%s*.vim", dirnames[i], pat); +! matches = globpath(p_rtp, s, 0); +! vim_free(s); +! if (matches == NULL) +! continue; +! +! for (s = matches; *s != NUL; s = e) +! { +! e = vim_strchr(s, '\n'); +! if (e == NULL) +! e = s + STRLEN(s); +! if (ga_grow(&ga, 1) == FAIL) +! break; +! if (e - 4 > s && STRNICMP(e - 4, ".vim", 4) == 0) +! { +! for (s = e - 4; s > matches; mb_ptr_back(matches, s)) +! if (*s == '\n' || vim_ispathsep(*s)) +! break; +! ++s; +! ((char_u **)ga.ga_data)[ga.ga_len] = + vim_strnsave(s, (int)(e - s - 4)); +! ++ga.ga_len; +! } +! if (*e != NUL) +! ++e; + } +! vim_free(matches); + } +! if (ga.ga_len == 0) +! return FAIL; + + /* Sort and remove duplicates which can happen when specifying multiple +! * directories in dirnames. */ + remove_duplicates(&ga); + + *file = ga.ga_data; +*** ../vim-7.3.236/src/version.c 2011-06-26 19:13:33.000000000 +0200 +--- src/version.c 2011-06-26 19:39:39.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 237, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +230. You spend your Friday nights typing away at your keyboard + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.238 b/source/ap/vim/patches/7.3.238 new file mode 100644 index 00000000..289b1a43 --- /dev/null +++ b/source/ap/vim/patches/7.3.238 @@ -0,0 +1,53 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.238 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.238 +Problem: Compiler warning for conversion. +Solution: Add type cast. (Mike Williams) +Files: src/ex_getln.c + + +*** ../vim-7.3.237/src/ex_getln.c 2011-06-26 19:40:14.000000000 +0200 +--- src/ex_getln.c 2011-07-04 14:23:27.000000000 +0200 +*************** +*** 5025,5031 **** + + *num_file = 0; + *file = NULL; +! pat_len = STRLEN(pat); + ga_init2(&ga, (int)sizeof(char *), 10); + + for (i = 0; dirnames[i] != NULL; ++i) +--- 5025,5031 ---- + + *num_file = 0; + *file = NULL; +! pat_len = (int)STRLEN(pat); + ga_init2(&ga, (int)sizeof(char *), 10); + + for (i = 0; dirnames[i] != NULL; ++i) +*** ../vim-7.3.237/src/version.c 2011-06-26 19:40:14.000000000 +0200 +--- src/version.c 2011-07-07 15:04:00.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 238, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +255. You work for a newspaper and your editor asks you to write an + article about Internet addiction...in the "first person." + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.239 b/source/ap/vim/patches/7.3.239 new file mode 100644 index 00000000..1c03da3f --- /dev/null +++ b/source/ap/vim/patches/7.3.239 @@ -0,0 +1,321 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.239 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.239 +Problem: Python corrects the cursor column without taking 'virtualedit' + into account. (lilydjwg) +Solution: Call check_cursor_col_win(). +Files: src/if_py_both.h, src/mbyte.c, src/misc2.c, src/normal.c, + src/proto/mbyte.pro, src/proto/misc2.pro + + +*** ../vim-7.3.238/src/if_py_both.h 2011-06-26 04:01:37.000000000 +0200 +--- src/if_py_both.h 2011-07-07 14:28:19.000000000 +0200 +*************** +*** 534,540 **** + { + long lnum; + long col; +- long len; + + if (!PyArg_Parse(val, "(ll)", &lnum, &col)) + return -1; +--- 534,539 ---- +*************** +*** 549,566 **** + if (VimErrorCheck()) + return -1; + +- /* When column is out of range silently correct it. */ +- len = (long)STRLEN(ml_get_buf(this->win->w_buffer, lnum, FALSE)); +- if (col > len) +- col = len; +- + this->win->w_cursor.lnum = lnum; + this->win->w_cursor.col = col; + #ifdef FEAT_VIRTUALEDIT + this->win->w_cursor.coladd = 0; + #endif +! update_screen(VALID); + + return 0; + } + else if (strcmp(name, "height") == 0) +--- 548,562 ---- + if (VimErrorCheck()) + return -1; + + this->win->w_cursor.lnum = lnum; + this->win->w_cursor.col = col; + #ifdef FEAT_VIRTUALEDIT + this->win->w_cursor.coladd = 0; + #endif +! /* When column is out of range silently correct it. */ +! check_cursor_col_win(this->win); + ++ update_screen(VALID); + return 0; + } + else if (strcmp(name, "height") == 0) +*** ../vim-7.3.238/src/mbyte.c 2011-04-11 14:29:13.000000000 +0200 +--- src/mbyte.c 2011-07-07 14:27:07.000000000 +0200 +*************** +*** 3563,3569 **** + void + mb_adjust_cursor() + { +! mb_adjustpos(&curwin->w_cursor); + } + + /* +--- 3563,3569 ---- + void + mb_adjust_cursor() + { +! mb_adjustpos(curbuf, &curwin->w_cursor); + } + + /* +*************** +*** 3571,3577 **** + * If it points to a tail byte it's moved backwards to the head byte. + */ + void +! mb_adjustpos(lp) + pos_T *lp; + { + char_u *p; +--- 3571,3578 ---- + * If it points to a tail byte it's moved backwards to the head byte. + */ + void +! mb_adjustpos(buf, lp) +! buf_T *buf; + pos_T *lp; + { + char_u *p; +*************** +*** 3582,3588 **** + #endif + ) + { +! p = ml_get(lp->lnum); + lp->col -= (*mb_head_off)(p, p + lp->col); + #ifdef FEAT_VIRTUALEDIT + /* Reset "coladd" when the cursor would be on the right half of a +--- 3583,3589 ---- + #endif + ) + { +! p = ml_get_buf(buf, lp->lnum, FALSE); + lp->col -= (*mb_head_off)(p, p + lp->col); + #ifdef FEAT_VIRTUALEDIT + /* Reset "coladd" when the cursor would be on the right half of a +*** ../vim-7.3.238/src/misc2.c 2011-04-11 16:56:29.000000000 +0200 +--- src/misc2.c 2011-07-07 14:27:50.000000000 +0200 +*************** +*** 333,339 **** + #ifdef FEAT_MBYTE + /* prevent from moving onto a trail byte */ + if (has_mbyte) +! mb_adjustpos(pos); + #endif + + if (col < wcol) +--- 333,339 ---- + #ifdef FEAT_MBYTE + /* prevent from moving onto a trail byte */ + if (has_mbyte) +! mb_adjustpos(curbuf, pos); + #endif + + if (col < wcol) +*************** +*** 544,559 **** + void + check_cursor_col() + { + colnr_T len; + #ifdef FEAT_VIRTUALEDIT +! colnr_T oldcol = curwin->w_cursor.col; +! colnr_T oldcoladd = curwin->w_cursor.col + curwin->w_cursor.coladd; + #endif + +! len = (colnr_T)STRLEN(ml_get_curline()); + if (len == 0) +! curwin->w_cursor.col = 0; +! else if (curwin->w_cursor.col >= len) + { + /* Allow cursor past end-of-line when: + * - in Insert mode or restarting Insert mode +--- 544,569 ---- + void + check_cursor_col() + { ++ check_cursor_col_win(curwin); ++ } ++ ++ /* ++ * Make sure win->w_cursor.col is valid. ++ */ ++ void ++ check_cursor_col_win(win) ++ win_T *win; ++ { + colnr_T len; + #ifdef FEAT_VIRTUALEDIT +! colnr_T oldcol = win->w_cursor.col; +! colnr_T oldcoladd = win->w_cursor.col + win->w_cursor.coladd; + #endif + +! len = (colnr_T)STRLEN(ml_get_buf(win->w_buffer, win->w_cursor.lnum, FALSE)); + if (len == 0) +! win->w_cursor.col = 0; +! else if (win->w_cursor.col >= len) + { + /* Allow cursor past end-of-line when: + * - in Insert mode or restarting Insert mode +*************** +*** 567,599 **** + || (ve_flags & VE_ONEMORE) + #endif + || virtual_active()) +! curwin->w_cursor.col = len; + else + { +! curwin->w_cursor.col = len - 1; + #ifdef FEAT_MBYTE +! /* prevent cursor from moving on the trail byte */ + if (has_mbyte) +! mb_adjust_cursor(); + #endif + } + } +! else if (curwin->w_cursor.col < 0) +! curwin->w_cursor.col = 0; + + #ifdef FEAT_VIRTUALEDIT + /* If virtual editing is on, we can leave the cursor on the old position, + * only we must set it to virtual. But don't do it when at the end of the + * line. */ + if (oldcol == MAXCOL) +! curwin->w_cursor.coladd = 0; + else if (ve_flags == VE_ALL) + { +! if (oldcoladd > curwin->w_cursor.col) +! curwin->w_cursor.coladd = oldcoladd - curwin->w_cursor.col; + else + /* avoid weird number when there is a miscalculation or overflow */ +! curwin->w_cursor.coladd = 0; + } + #endif + } +--- 577,609 ---- + || (ve_flags & VE_ONEMORE) + #endif + || virtual_active()) +! win->w_cursor.col = len; + else + { +! win->w_cursor.col = len - 1; + #ifdef FEAT_MBYTE +! /* Move the cursor to the head byte. */ + if (has_mbyte) +! mb_adjustpos(win->w_buffer, &win->w_cursor); + #endif + } + } +! else if (win->w_cursor.col < 0) +! win->w_cursor.col = 0; + + #ifdef FEAT_VIRTUALEDIT + /* If virtual editing is on, we can leave the cursor on the old position, + * only we must set it to virtual. But don't do it when at the end of the + * line. */ + if (oldcol == MAXCOL) +! win->w_cursor.coladd = 0; + else if (ve_flags == VE_ALL) + { +! if (oldcoladd > win->w_cursor.col) +! win->w_cursor.coladd = oldcoladd - win->w_cursor.col; + else + /* avoid weird number when there is a miscalculation or overflow */ +! win->w_cursor.coladd = 0; + } + #endif + } +*** ../vim-7.3.238/src/normal.c 2011-06-20 00:45:55.000000000 +0200 +--- src/normal.c 2011-07-07 14:27:57.000000000 +0200 +*************** +*** 8774,8780 **** + { + --pp->col; + #ifdef FEAT_MBYTE +! mb_adjustpos(pp); + #endif + } + else if (pp->lnum > 1) +--- 8774,8780 ---- + { + --pp->col; + #ifdef FEAT_MBYTE +! mb_adjustpos(curbuf, pp); + #endif + } + else if (pp->lnum > 1) +*** ../vim-7.3.238/src/proto/mbyte.pro 2010-08-15 21:57:28.000000000 +0200 +--- src/proto/mbyte.pro 2011-07-07 14:27:09.000000000 +0200 +*************** +*** 56,62 **** + int utf_valid_string __ARGS((char_u *s, char_u *end)); + int dbcs_screen_tail_off __ARGS((char_u *base, char_u *p)); + void mb_adjust_cursor __ARGS((void)); +! void mb_adjustpos __ARGS((pos_T *lp)); + char_u *mb_prevptr __ARGS((char_u *line, char_u *p)); + int mb_charlen __ARGS((char_u *str)); + int mb_charlen_len __ARGS((char_u *str, int len)); +--- 56,62 ---- + int utf_valid_string __ARGS((char_u *s, char_u *end)); + int dbcs_screen_tail_off __ARGS((char_u *base, char_u *p)); + void mb_adjust_cursor __ARGS((void)); +! void mb_adjustpos __ARGS((buf_T *buf, pos_T *lp)); + char_u *mb_prevptr __ARGS((char_u *line, char_u *p)); + int mb_charlen __ARGS((char_u *str)); + int mb_charlen_len __ARGS((char_u *str, int len)); +*** ../vim-7.3.238/src/proto/misc2.pro 2011-04-11 16:56:29.000000000 +0200 +--- src/proto/misc2.pro 2011-07-07 14:26:57.000000000 +0200 +*************** +*** 14,19 **** +--- 14,20 ---- + linenr_T get_cursor_rel_lnum __ARGS((win_T *wp, linenr_T lnum)); + void check_cursor_lnum __ARGS((void)); + void check_cursor_col __ARGS((void)); ++ void check_cursor_col_win __ARGS((win_T *win)); + void check_cursor __ARGS((void)); + void adjust_cursor_col __ARGS((void)); + int leftcol_changed __ARGS((void)); +*** ../vim-7.3.238/src/version.c 2011-07-07 15:04:38.000000000 +0200 +--- src/version.c 2011-07-07 15:05:49.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 239, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +256. You are able to write down over 250 symptoms of being an internet + addict, even though they only asked for 101. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.240 b/source/ap/vim/patches/7.3.240 new file mode 100644 index 00000000..7048ac1f --- /dev/null +++ b/source/ap/vim/patches/7.3.240 @@ -0,0 +1,795 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.240 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Note: I haven't verified this works or even compiles. Please send me a +patch if you see a problem and can fix it. + +Patch 7.3.240 +Problem: External commands can't use pipes on MS-Windows. +Solution: Implement pipes and use them when 'shelltemp' isn't set. (Vincent + Berthoux) +Files: src/eval.c, src/ex_cmds.c, src/misc2.c, src/os_unix.c, + src/os_win32.c, src/proto/misc2.pro, src/ui.c + + +*** ../vim-7.3.239/src/eval.c 2011-06-19 02:55:32.000000000 +0200 +--- src/eval.c 2011-07-07 15:44:56.000000000 +0200 +*************** +*** 11931,11937 **** + #ifdef FEAT_SEARCHPATH + "file_in_path", + #endif +! #if defined(UNIX) && !defined(USE_SYSTEM) + "filterpipe", + #endif + #ifdef FEAT_FIND_ID +--- 11931,11937 ---- + #ifdef FEAT_SEARCHPATH + "file_in_path", + #endif +! #if (defined(UNIX) && !defined(USE_SYSTEM)) || defined(WIN3264) + "filterpipe", + #endif + #ifdef FEAT_FIND_ID +*** ../vim-7.3.239/src/ex_cmds.c 2011-06-12 22:03:15.000000000 +0200 +--- src/ex_cmds.c 2011-07-07 15:44:56.000000000 +0200 +*************** +*** 1107,1113 **** + if (do_out) + shell_flags |= SHELL_DOOUT; + +! #if !defined(USE_SYSTEM) && defined(UNIX) + if (!do_in && do_out && !p_stmp) + { + /* Use a pipe to fetch stdout of the command, do not use a temp file. */ +--- 1107,1113 ---- + if (do_out) + shell_flags |= SHELL_DOOUT; + +! #if (!defined(USE_SYSTEM) && defined(UNIX)) || defined(WIN3264) + if (!do_in && do_out && !p_stmp) + { + /* Use a pipe to fetch stdout of the command, do not use a temp file. */ +*** ../vim-7.3.239/src/misc2.c 2011-07-07 15:08:53.000000000 +0200 +--- src/misc2.c 2011-07-07 15:55:42.000000000 +0200 +*************** +*** 2146,2151 **** +--- 2146,2170 ---- + } + } + ++ #if (defined(UNIX) && !defined(USE_SYSTEM)) || defined(WIN3264) ++ /* ++ * Append the text in "gap" below the cursor line and clear "gap". ++ */ ++ void ++ append_ga_line(gap) ++ garray_T *gap; ++ { ++ /* Remove trailing CR. */ ++ if (gap->ga_len > 0 ++ && !curbuf->b_p_bin ++ && ((char_u *)gap->ga_data)[gap->ga_len - 1] == CAR) ++ --gap->ga_len; ++ ga_append(gap, NUL); ++ ml_append(curwin->w_cursor.lnum++, gap->ga_data, 0, FALSE); ++ gap->ga_len = 0; ++ } ++ #endif ++ + /************************************************************************ + * functions that use lookup tables for various things, generally to do with + * special key codes. +*** ../vim-7.3.239/src/os_unix.c 2011-04-11 16:56:29.000000000 +0200 +--- src/os_unix.c 2011-07-07 15:54:58.000000000 +0200 +*************** +*** 3660,3686 **** + /* Nothing to do. */ + } + +- #ifndef USE_SYSTEM +- static void append_ga_line __ARGS((garray_T *gap)); +- +- /* +- * Append the text in "gap" below the cursor line and clear "gap". +- */ +- static void +- append_ga_line(gap) +- garray_T *gap; +- { +- /* Remove trailing CR. */ +- if (gap->ga_len > 0 +- && !curbuf->b_p_bin +- && ((char_u *)gap->ga_data)[gap->ga_len - 1] == CAR) +- --gap->ga_len; +- ga_append(gap, NUL); +- ml_append(curwin->w_cursor.lnum++, gap->ga_data, 0, FALSE); +- gap->ga_len = 0; +- } +- #endif +- + int + mch_call_shell(cmd, options) + char_u *cmd; +--- 3660,3665 ---- +*** ../vim-7.3.239/src/os_win32.c 2011-05-25 17:06:16.000000000 +0200 +--- src/os_win32.c 2011-07-07 16:08:30.000000000 +0200 +*************** +*** 417,422 **** +--- 417,427 ---- + static PGNSECINFO pGetNamedSecurityInfo; + #endif + ++ typedef BOOL (WINAPI *PSETHANDLEINFORMATION)(HANDLE, DWORD, DWORD); ++ ++ static BOOL allowPiping = FALSE; ++ static PSETHANDLEINFORMATION pSetHandleInformation; ++ + /* + * Set g_PlatformId to VER_PLATFORM_WIN32_NT (NT) or + * VER_PLATFORM_WIN32_WINDOWS (Win95). +*************** +*** 467,472 **** +--- 472,489 ---- + } + } + #endif ++ /* ++ * If we are on windows NT, try to load the pipe functions, only ++ * available from Win2K. ++ */ ++ if (g_PlatformId == VER_PLATFORM_WIN32_NT) ++ { ++ HANDLE kernel32 = GetModuleHandle("kernel32"); ++ pSetHandleInformation = (PSETHANDLEINFORMATION)GetProcAddress( ++ kernel32, "SetHandleInformation"); ++ ++ allowPiping = pSetHandleInformation != NULL; ++ } + done = TRUE; + } + } +*************** +*** 1635,1641 **** + } + + #if ((defined(__MINGW32__) || defined (__CYGWIN32__)) && \ +! __MSVCRT_VERSION__ >= 0x800) || (defined(_MSC_VER) && _MSC_VER >= 1400) + /* + * Bad parameter handler. + * +--- 1652,1658 ---- + } + + #if ((defined(__MINGW32__) || defined (__CYGWIN32__)) && \ +! __MSVCRT_VERSION__ >= 0x800) || (defined(_MSC_VER) && _MSC_VER >= 1400) + /* + * Bad parameter handler. + * +*************** +*** 3210,3216 **** + * 4. Prompt the user to press a key to close the console window + */ + static int +! mch_system(char *cmd, int options) + { + STARTUPINFO si; + PROCESS_INFORMATION pi; +--- 3227,3233 ---- + * 4. Prompt the user to press a key to close the console window + */ + static int +! mch_system_classic(char *cmd, int options) + { + STARTUPINFO si; + PROCESS_INFORMATION pi; +*************** +*** 3315,3320 **** +--- 3332,3829 ---- + + return ret; + } ++ ++ /* ++ * Thread launched by the gui to send the current buffer data to the ++ * process. This way avoid to hang up vim totally if the children ++ * process take a long time to process the lines. ++ */ ++ static DWORD WINAPI ++ sub_process_writer(LPVOID param) ++ { ++ HANDLE g_hChildStd_IN_Wr = param; ++ linenr_T lnum = curbuf->b_op_start.lnum; ++ DWORD len = 0; ++ DWORD l; ++ char_u *lp = ml_get(lnum); ++ char_u *s; ++ int written = 0; ++ ++ for (;;) ++ { ++ l = (DWORD)STRLEN(lp + written); ++ if (l == 0) ++ len = 0; ++ else if (lp[written] == NL) ++ { ++ /* NL -> NUL translation */ ++ WriteFile(g_hChildStd_IN_Wr, "", 1, &len, NULL); ++ } ++ else ++ { ++ s = vim_strchr(lp + written, NL); ++ WriteFile(g_hChildStd_IN_Wr, (char *)lp + written, ++ s == NULL ? l : (DWORD)(s - (lp + written)), ++ &len, NULL); ++ } ++ if (len == (int)l) ++ { ++ /* Finished a line, add a NL, unless this line should not have ++ * one. */ ++ if (lnum != curbuf->b_op_end.lnum ++ || !curbuf->b_p_bin ++ || (lnum != curbuf->b_no_eol_lnum ++ && (lnum != curbuf->b_ml.ml_line_count ++ || curbuf->b_p_eol))) ++ { ++ WriteFile(g_hChildStd_IN_Wr, "\n", 1, &ignored, NULL); ++ } ++ ++ ++lnum; ++ if (lnum > curbuf->b_op_end.lnum) ++ break; ++ ++ lp = ml_get(lnum); ++ written = 0; ++ } ++ else if (len > 0) ++ written += len; ++ } ++ ++ /* finished all the lines, close pipe */ ++ CloseHandle(g_hChildStd_IN_Wr); ++ ExitThread(0); ++ } ++ ++ ++ # define BUFLEN 100 /* length for buffer, stolen from unix version */ ++ ++ /* ++ * This function read from the children's stdout and write the ++ * data on screen or in the buffer accordingly. ++ */ ++ static void ++ dump_pipe(int options, ++ HANDLE g_hChildStd_OUT_Rd, ++ garray_T *ga, ++ char_u buffer[], ++ DWORD *buffer_off) ++ { ++ DWORD availableBytes = 0; ++ DWORD i; ++ int c; ++ char_u *p; ++ int ret; ++ DWORD len; ++ DWORD toRead; ++ int repeatCount; ++ ++ /* we query the pipe to see if there is any data to read ++ * to avoid to perform a blocking read */ ++ ret = PeekNamedPipe(g_hChildStd_OUT_Rd, /* pipe to query */ ++ NULL, /* optional buffer */ ++ 0, /* buffe size */ ++ NULL, /* number of read bytes */ ++ &availableBytes, /* available bytes total */ ++ NULL); /* byteLeft */ ++ ++ repeatCount = 0; ++ /* We got real data in the pipe, read it */ ++ while (ret != 0 && availableBytes > 0 && availableBytes > 0) ++ { ++ repeatCount++; ++ toRead = ++ # ifdef FEAT_MBYTE ++ (DWORD)(BUFLEN - *buffer_off); ++ # else ++ (DWORD)BUFLEN; ++ # endif ++ toRead = availableBytes < toRead ? availableBytes : toRead; ++ ReadFile(g_hChildStd_OUT_Rd, buffer ++ # ifdef FEAT_MBYTE ++ + *buffer_off, toRead ++ # else ++ , toRead ++ # endif ++ , &len, NULL); ++ ++ /* If we haven't read anything, there is a problem */ ++ if (len == 0) ++ break; ++ ++ availableBytes -= len; ++ ++ if (options & SHELL_READ) ++ { ++ /* Do NUL -> NL translation, append NL separated ++ * lines to the current buffer. */ ++ for (i = 0; i < len; ++i) ++ { ++ if (buffer[i] == NL) ++ append_ga_line(ga); ++ else if (buffer[i] == NUL) ++ ga_append(ga, NL); ++ else ++ ga_append(ga, buffer[i]); ++ } ++ } ++ # ifdef FEAT_MBYTE ++ else if (has_mbyte) ++ { ++ int l; ++ ++ len += *buffer_off; ++ buffer[len] = NUL; ++ ++ /* Check if the last character in buffer[] is ++ * incomplete, keep these bytes for the next ++ * round. */ ++ for (p = buffer; p < buffer + len; p += l) ++ { ++ l = mb_cptr2len(p); ++ if (l == 0) ++ l = 1; /* NUL byte? */ ++ else if (MB_BYTE2LEN(*p) != l) ++ break; ++ } ++ if (p == buffer) /* no complete character */ ++ { ++ /* avoid getting stuck at an illegal byte */ ++ if (len >= 12) ++ ++p; ++ else ++ { ++ *buffer_off = len; ++ return; ++ } ++ } ++ c = *p; ++ *p = NUL; ++ msg_puts(buffer); ++ if (p < buffer + len) ++ { ++ *p = c; ++ *buffer_off = (DWORD)((buffer + len) - p); ++ mch_memmove(buffer, p, *buffer_off); ++ return; ++ } ++ *buffer_off = 0; ++ } ++ # endif /* FEAT_MBYTE */ ++ else ++ { ++ buffer[len] = NUL; ++ msg_puts(buffer); ++ } ++ ++ windgoto(msg_row, msg_col); ++ cursor_on(); ++ out_flush(); ++ } ++ } ++ ++ /* ++ * Version of system to use for windows NT > 5.0 (Win2K), use pipe ++ * for communication and doesn't open any new window. ++ */ ++ static int ++ mch_system_piped(char *cmd, int options) ++ { ++ STARTUPINFO si; ++ PROCESS_INFORMATION pi; ++ DWORD ret = 0; ++ ++ HANDLE g_hChildStd_IN_Rd = NULL; ++ HANDLE g_hChildStd_IN_Wr = NULL; ++ HANDLE g_hChildStd_OUT_Rd = NULL; ++ HANDLE g_hChildStd_OUT_Wr = NULL; ++ ++ char_u buffer[BUFLEN + 1]; /* reading buffer + size */ ++ DWORD len; ++ ++ /* buffer used to receive keys */ ++ char_u ta_buf[BUFLEN + 1]; /* TypeAHead */ ++ int ta_len = 0; /* valid bytes in ta_buf[] */ ++ ++ DWORD i; ++ int c; ++ int noread_cnt = 0; ++ garray_T ga; ++ int delay = 1; ++ # ifdef FEAT_MBYTE ++ DWORD buffer_off = 0; /* valid bytes in buffer[] */ ++ # endif ++ ++ SECURITY_ATTRIBUTES saAttr; ++ ++ /* Set the bInheritHandle flag so pipe handles are inherited. */ ++ saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); ++ saAttr.bInheritHandle = TRUE; ++ saAttr.lpSecurityDescriptor = NULL; ++ ++ if ( ! CreatePipe(&g_hChildStd_OUT_Rd, &g_hChildStd_OUT_Wr, &saAttr, 0) ++ /* Ensure the read handle to the pipe for STDOUT is not inherited. */ ++ || ! pSetHandleInformation(g_hChildStd_OUT_Rd, HANDLE_FLAG_INHERIT, 0) ++ /* Create a pipe for the child process's STDIN. */ ++ || ! CreatePipe(&g_hChildStd_IN_Rd, &g_hChildStd_IN_Wr, &saAttr, 0) ++ /* Ensure the write handle to the pipe for STDIN is not inherited. */ ++ || ! pSetHandleInformation(g_hChildStd_IN_Wr, HANDLE_FLAG_INHERIT, 0) ) ++ { ++ CloseHandle(g_hChildStd_IN_Rd); ++ CloseHandle(g_hChildStd_IN_Wr); ++ CloseHandle(g_hChildStd_OUT_Rd); ++ CloseHandle(g_hChildStd_OUT_Wr); ++ MSG_PUTS(_("\nCannot create pipes\n")); ++ } ++ ++ si.cb = sizeof(si); ++ si.lpReserved = NULL; ++ si.lpDesktop = NULL; ++ si.lpTitle = NULL; ++ si.dwFlags = STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES; ++ ++ /* set-up our file redirection */ ++ si.hStdError = g_hChildStd_OUT_Wr; ++ si.hStdOutput = g_hChildStd_OUT_Wr; ++ si.hStdInput = g_hChildStd_IN_Rd; ++ si.wShowWindow = SW_HIDE; ++ si.cbReserved2 = 0; ++ si.lpReserved2 = NULL; ++ ++ if (options & SHELL_READ) ++ ga_init2(&ga, 1, BUFLEN); ++ ++ /* Now, run the command */ ++ CreateProcess(NULL, /* Executable name */ ++ cmd, /* Command to execute */ ++ NULL, /* Process security attributes */ ++ NULL, /* Thread security attributes */ ++ ++ // this command can be litigeous, handle inheritence was ++ // deactivated for pending temp file, but, if we deactivate ++ // it, the pipes don't work for some reason. ++ TRUE, /* Inherit handles, first deactivated, ++ * but needed */ ++ CREATE_DEFAULT_ERROR_MODE, /* Creation flags */ ++ NULL, /* Environment */ ++ NULL, /* Current directory */ ++ &si, /* Startup information */ ++ &pi); /* Process information */ ++ ++ ++ /* Close our unused side of the pipes */ ++ CloseHandle(g_hChildStd_IN_Rd); ++ CloseHandle(g_hChildStd_OUT_Wr); ++ ++ if (options & SHELL_WRITE) ++ { ++ HANDLE thread = ++ CreateThread(NULL, /* security attributes */ ++ 0, /* default stack size */ ++ sub_process_writer, /* function to be executed */ ++ g_hChildStd_IN_Wr, /* parameter */ ++ 0, /* creation flag, start immediately */ ++ NULL); /* we don't care about thread id */ ++ CloseHandle(thread); ++ g_hChildStd_IN_Wr = NULL; ++ } ++ ++ /* Keep updating the window while waiting for the shell to finish. */ ++ for (;;) ++ { ++ MSG msg; ++ ++ if (PeekMessage(&msg, (HWND)NULL, 0, 0, PM_REMOVE)) ++ { ++ TranslateMessage(&msg); ++ DispatchMessage(&msg); ++ } ++ ++ /* write pipe information in the window */ ++ if ((options & (SHELL_READ|SHELL_WRITE)) ++ # ifdef FEAT_GUI ++ || gui.in_use ++ # endif ++ ) ++ { ++ len = 0; ++ if (!(options & SHELL_EXPAND) ++ && ((options & ++ (SHELL_READ|SHELL_WRITE|SHELL_COOKED)) ++ != (SHELL_READ|SHELL_WRITE|SHELL_COOKED) ++ # ifdef FEAT_GUI ++ || gui.in_use ++ # endif ++ ) ++ && (ta_len > 0 || noread_cnt > 4)) ++ { ++ if (ta_len == 0) ++ { ++ /* Get extra characters when we don't have any. Reset the ++ * counter and timer. */ ++ noread_cnt = 0; ++ # if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) ++ gettimeofday(&start_tv, NULL); ++ # endif ++ len = ui_inchar(ta_buf, BUFLEN, 10L, 0); ++ } ++ if (ta_len > 0 || len > 0) ++ { ++ /* ++ * For pipes: Check for CTRL-C: send interrupt signal to ++ * child. Check for CTRL-D: EOF, close pipe to child. ++ */ ++ if (len == 1 && cmd != NULL) ++ { ++ if (ta_buf[ta_len] == Ctrl_C) ++ { ++ /* Learn what exit code is expected, for ++ * now put 9 as SIGKILL */ ++ TerminateProcess(pi.hProcess, 9); ++ } ++ if (ta_buf[ta_len] == Ctrl_D) ++ { ++ CloseHandle(g_hChildStd_IN_Wr); ++ g_hChildStd_IN_Wr = NULL; ++ } ++ } ++ ++ /* replace K_BS by and K_DEL by */ ++ for (i = ta_len; i < ta_len + len; ++i) ++ { ++ if (ta_buf[i] == CSI && len - i > 2) ++ { ++ c = TERMCAP2KEY(ta_buf[i + 1], ta_buf[i + 2]); ++ if (c == K_DEL || c == K_KDEL || c == K_BS) ++ { ++ mch_memmove(ta_buf + i + 1, ta_buf + i + 3, ++ (size_t)(len - i - 2)); ++ if (c == K_DEL || c == K_KDEL) ++ ta_buf[i] = DEL; ++ else ++ ta_buf[i] = Ctrl_H; ++ len -= 2; ++ } ++ } ++ else if (ta_buf[i] == '\r') ++ ta_buf[i] = '\n'; ++ # ifdef FEAT_MBYTE ++ if (has_mbyte) ++ i += (*mb_ptr2len_len)(ta_buf + i, ++ ta_len + len - i) - 1; ++ # endif ++ } ++ ++ /* ++ * For pipes: echo the typed characters. For a pty this ++ * does not seem to work. ++ */ ++ for (i = ta_len; i < ta_len + len; ++i) ++ { ++ if (ta_buf[i] == '\n' || ta_buf[i] == '\b') ++ msg_putchar(ta_buf[i]); ++ # ifdef FEAT_MBYTE ++ else if (has_mbyte) ++ { ++ int l = (*mb_ptr2len)(ta_buf + i); ++ ++ msg_outtrans_len(ta_buf + i, l); ++ i += l - 1; ++ } ++ # endif ++ else ++ msg_outtrans_len(ta_buf + i, 1); ++ } ++ windgoto(msg_row, msg_col); ++ out_flush(); ++ ++ ta_len += len; ++ ++ /* ++ * Write the characters to the child, unless EOF has been ++ * typed for pipes. Write one character at a time, to ++ * avoid losing too much typeahead. When writing buffer ++ * lines, drop the typed characters (only check for ++ * CTRL-C). ++ */ ++ if (options & SHELL_WRITE) ++ ta_len = 0; ++ else if (g_hChildStd_IN_Wr != NULL) ++ { ++ WriteFile(g_hChildStd_IN_Wr, (char*)ta_buf, ++ 1, &len, NULL); ++ // if we are typing in, we want to keep things reactive ++ delay = 1; ++ if (len > 0) ++ { ++ ta_len -= len; ++ mch_memmove(ta_buf, ta_buf + len, ta_len); ++ } ++ } ++ } ++ } ++ } ++ ++ if (ta_len) ++ ui_inchar_undo(ta_buf, ta_len); ++ ++ if (WaitForSingleObject(pi.hProcess, delay) != WAIT_TIMEOUT) ++ { ++ dump_pipe(options, g_hChildStd_OUT_Rd, ++ &ga, buffer, &buffer_off); ++ break; ++ } ++ ++ ++noread_cnt; ++ dump_pipe(options, g_hChildStd_OUT_Rd, ++ &ga, buffer, &buffer_off); ++ ++ /* We start waiting for a very short time and then increase it, so ++ * that we respond quickly when the process is quick, and don't ++ * consume too much overhead when it's slow. */ ++ if (delay < 50) ++ delay += 10; ++ } ++ ++ /* Close the pipe */ ++ CloseHandle(g_hChildStd_OUT_Rd); ++ if (g_hChildStd_IN_Wr != NULL) ++ CloseHandle(g_hChildStd_IN_Wr); ++ ++ WaitForSingleObject(pi.hProcess, INFINITE); ++ ++ /* Get the command exit code */ ++ GetExitCodeProcess(pi.hProcess, &ret); ++ ++ if (options & SHELL_READ) ++ { ++ if (ga.ga_len > 0) ++ { ++ append_ga_line(&ga); ++ /* remember that the NL was missing */ ++ curbuf->b_no_eol_lnum = curwin->w_cursor.lnum; ++ } ++ else ++ curbuf->b_no_eol_lnum = 0; ++ ga_clear(&ga); ++ } ++ ++ /* Close the handles to the subprocess, so that it goes away */ ++ CloseHandle(pi.hThread); ++ CloseHandle(pi.hProcess); ++ ++ return ret; ++ } ++ ++ static int ++ mch_system(char *cmd, int options) ++ { ++ /* if we can pipe and the shelltemp option is off */ ++ if (allowPiping && !p_stmp) ++ return mch_system_piped(cmd, options); ++ else ++ return mch_system_classic(cmd, options); ++ } + #else + + # define mch_system(c, o) system(c) +*************** +*** 3388,3394 **** + char_u *newcmd; + long_u cmdlen = ( + #ifdef FEAT_GUI_W32 +! STRLEN(vimrun_path) + + #endif + STRLEN(p_sh) + STRLEN(p_shcf) + STRLEN(cmd) + 10); + +--- 3897,3903 ---- + char_u *newcmd; + long_u cmdlen = ( + #ifdef FEAT_GUI_W32 +! (allowPiping && !p_stmp ? 0 : STRLEN(vimrun_path)) + + #endif + STRLEN(p_sh) + STRLEN(p_shcf) + STRLEN(cmd) + 10); + +*************** +*** 3497,3503 **** + MB_ICONWARNING); + need_vimrun_warning = FALSE; + } +! if (!s_dont_use_vimrun) + /* Use vimrun to execute the command. It opens a console + * window, which can be closed without killing Vim. */ + vim_snprintf((char *)newcmd, cmdlen, "%s%s%s %s %s", +--- 4006,4012 ---- + MB_ICONWARNING); + need_vimrun_warning = FALSE; + } +! if (!s_dont_use_vimrun && (!allowPiping || p_stmp)) + /* Use vimrun to execute the command. It opens a console + * window, which can be closed without killing Vim. */ + vim_snprintf((char *)newcmd, cmdlen, "%s%s%s %s %s", +*************** +*** 3521,3527 **** + /* Print the return value, unless "vimrun" was used. */ + if (x != 0 && !(options & SHELL_SILENT) && !emsg_silent + #if defined(FEAT_GUI_W32) +! && ((options & SHELL_DOOUT) || s_dont_use_vimrun) + #endif + ) + { +--- 4030,4037 ---- + /* Print the return value, unless "vimrun" was used. */ + if (x != 0 && !(options & SHELL_SILENT) && !emsg_silent + #if defined(FEAT_GUI_W32) +! && ((options & SHELL_DOOUT) || s_dont_use_vimrun +! || (allowPiping && !p_stmp)) + #endif + ) + { +*** ../vim-7.3.239/src/proto/misc2.pro 2011-07-07 15:08:53.000000000 +0200 +--- src/proto/misc2.pro 2011-07-07 15:56:16.000000000 +0200 +*************** +*** 58,63 **** +--- 58,64 ---- + char_u *ga_concat_strings __ARGS((garray_T *gap)); + void ga_concat __ARGS((garray_T *gap, char_u *s)); + void ga_append __ARGS((garray_T *gap, int c)); ++ void append_ga_line __ARGS((garray_T *gap)); + int name_to_mod_mask __ARGS((int c)); + int simplify_key __ARGS((int key, int *modifiers)); + int handle_x_keys __ARGS((int key)); +*** ../vim-7.3.239/src/ui.c 2011-06-19 01:14:23.000000000 +0200 +--- src/ui.c 2011-07-07 15:44:56.000000000 +0200 +*************** +*** 58,64 **** + #endif + } + +! #if defined(UNIX) || defined(VMS) || defined(PROTO) + /* + * When executing an external program, there may be some typed characters that + * are not consumed by it. Give them back to ui_inchar() and they are stored +--- 58,64 ---- + #endif + } + +! #if defined(UNIX) || defined(VMS) || defined(PROTO) || defined(WIN3264) + /* + * When executing an external program, there may be some typed characters that + * are not consumed by it. Give them back to ui_inchar() and they are stored +*** ../vim-7.3.239/src/version.c 2011-07-07 15:08:53.000000000 +0200 +--- src/version.c 2011-07-07 16:14:20.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 240, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +257. Your "hundred-and-one" lists include well over 101 items, since you + automatically interpret all numbers in hexadecimal notation. + (hex 101 = decimal 257) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.241 b/source/ap/vim/patches/7.3.241 new file mode 100644 index 00000000..3b73c4de --- /dev/null +++ b/source/ap/vim/patches/7.3.241 @@ -0,0 +1,71 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.241 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.241 +Problem: Using CTRL-R CTRL-W on the command line may insert only part of + the word. +Solution: Use the cursor position instead of assuming it is at the end of + the command. (Tyru) +Files: src/ex_getln.c + + +*** ../vim-7.3.240/src/ex_getln.c 2011-07-07 15:04:38.000000000 +0200 +--- src/ex_getln.c 2011-07-07 16:38:50.000000000 +0200 +*************** +*** 3046,3052 **** + int len; + + /* Locate start of last word in the cmd buffer. */ +! for (w = ccline.cmdbuff + ccline.cmdlen; w > ccline.cmdbuff; ) + { + #ifdef FEAT_MBYTE + if (has_mbyte) +--- 3046,3052 ---- + int len; + + /* Locate start of last word in the cmd buffer. */ +! for (w = ccline.cmdbuff + ccline.cmdpos; w > ccline.cmdbuff; ) + { + #ifdef FEAT_MBYTE + if (has_mbyte) +*************** +*** 3064,3070 **** + --w; + } + } +! len = (int)((ccline.cmdbuff + ccline.cmdlen) - w); + if (p_ic ? STRNICMP(w, arg, len) == 0 : STRNCMP(w, arg, len) == 0) + p += len; + } +--- 3064,3070 ---- + --w; + } + } +! len = (int)((ccline.cmdbuff + ccline.cmdpos) - w); + if (p_ic ? STRNICMP(w, arg, len) == 0 : STRNCMP(w, arg, len) == 0) + p += len; + } +*** ../vim-7.3.240/src/version.c 2011-07-07 16:20:45.000000000 +0200 +--- src/version.c 2011-07-07 16:41:29.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 241, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +258. When you want to see your girlfriend, you surf to her homepage. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.242 b/source/ap/vim/patches/7.3.242 new file mode 100644 index 00000000..0cf4db92 --- /dev/null +++ b/source/ap/vim/patches/7.3.242 @@ -0,0 +1,71 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.242 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.242 +Problem: Illegal memory access in after_pathsep(). +Solution: Check that the pointer is not at the start of the file name. + (Dominique Pelle) +Files: src/misc2.c + + +*** ../vim-7.3.241/src/misc2.c 2011-07-07 16:20:45.000000000 +0200 +--- src/misc2.c 2011-07-07 17:05:41.000000000 +0200 +*************** +*** 3247,3253 **** + #if defined(FEAT_MBYTE) || defined(PROTO) + /* + * Return TRUE if "p" points to just after a path separator. +! * Take care of multi-byte characters. + * "b" must point to the start of the file name + */ + int +--- 3247,3253 ---- + #if defined(FEAT_MBYTE) || defined(PROTO) + /* + * Return TRUE if "p" points to just after a path separator. +! * Takes care of multi-byte characters. + * "b" must point to the start of the file name + */ + int +*************** +*** 3255,3261 **** + char_u *b; + char_u *p; + { +! return vim_ispathsep(p[-1]) + && (!has_mbyte || (*mb_head_off)(b, p - 1) == 0); + } + #endif +--- 3255,3261 ---- + char_u *b; + char_u *p; + { +! return p > b && vim_ispathsep(p[-1]) + && (!has_mbyte || (*mb_head_off)(b, p - 1) == 0); + } + #endif +*** ../vim-7.3.241/src/version.c 2011-07-07 16:44:33.000000000 +0200 +--- src/version.c 2011-07-07 17:05:49.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 242, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +260. Co-workers have to E-mail you about the fire alarm to get + you out of the building. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.243 b/source/ap/vim/patches/7.3.243 new file mode 100644 index 00000000..f1f913d4 --- /dev/null +++ b/source/ap/vim/patches/7.3.243 @@ -0,0 +1,52 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.243 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.243 +Problem: Illegal memory access in readline(). +Solution: Swap the conditions. (Dominique Pelle) +Files: src/eval.c + + +*** ../vim-7.3.242/src/eval.c 2011-07-07 16:20:45.000000000 +0200 +--- src/eval.c 2011-07-07 17:32:16.000000000 +0200 +*************** +*** 14318,14324 **** + tolist = 0; + for ( ; filtd < buflen || readlen <= 0; ++filtd) + { +! if (buf[filtd] == '\n' || readlen <= 0) + { + /* In binary mode add an empty list item when the last + * non-empty line ends in a '\n'. */ +--- 14318,14324 ---- + tolist = 0; + for ( ; filtd < buflen || readlen <= 0; ++filtd) + { +! if (readlen <= 0 || buf[filtd] == '\n') + { + /* In binary mode add an empty list item when the last + * non-empty line ends in a '\n'. */ +*** ../vim-7.3.242/src/version.c 2011-07-07 17:15:29.000000000 +0200 +--- src/version.c 2011-07-07 17:32:30.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 243, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +261. You find diskettes in your pockets when doing laundry. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.244 b/source/ap/vim/patches/7.3.244 new file mode 100644 index 00000000..4cff94f2 --- /dev/null +++ b/source/ap/vim/patches/7.3.244 @@ -0,0 +1,48 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.244 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.244 +Problem: MS-Windows: Build problem with old compiler. (John Beckett) +Solution: Only use HandleToLong() when available. (Mike Williams) +Files: src/gui_w32.c + + +*** ../vim-7.3.243/src/gui_w32.c 2011-05-25 21:18:02.000000000 +0200 +--- src/gui_w32.c 2011-07-07 17:42:36.000000000 +0200 +*************** +*** 1574,1579 **** +--- 1574,1583 ---- + #endif + + #ifdef FEAT_EVAL ++ # if _MSC_VER < 1400 ++ /* HandleToLong() only exists in compilers that can do 64 bit builds */ ++ # define HandleToLong(h) ((long)(h)) ++ # endif + /* set the v:windowid variable */ + set_vim_var_nr(VV_WINDOWID, HandleToLong(s_hwnd)); + #endif +*** ../vim-7.3.243/src/version.c 2011-07-07 17:36:52.000000000 +0200 +--- src/version.c 2011-07-07 17:43:21.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 244, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +262. Your computer has it's own phone line - but your daughter doesn't. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.245 b/source/ap/vim/patches/7.3.245 new file mode 100644 index 00000000..b05fe433 --- /dev/null +++ b/source/ap/vim/patches/7.3.245 @@ -0,0 +1,81 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.245 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.245 +Problem: Python 3.2 libraries not correctly detected. +Solution: Add the suffix to the library name. (Niclas Zeising) +Files: src/auto/configure, src/configure.in + + +*** ../vim-7.3.244/src/auto/configure 2011-06-13 01:32:42.000000000 +0200 +--- src/auto/configure 2011-07-13 17:57:05.000000000 +0200 +*************** +*** 5611,5617 **** + eof + eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" + rm -f -- "${tmp_mkf}" +! vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}" + vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}" + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//` +--- 5611,5617 ---- + eof + eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" + rm -f -- "${tmp_mkf}" +! vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" + vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}" + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//` +*** ../vim-7.3.244/src/configure.in 2011-06-13 01:32:42.000000000 +0200 +--- src/configure.in 2011-07-13 17:57:01.000000000 +0200 +*************** +*** 1068,1074 **** + dnl -- delete the lines from make about Entering/Leaving directory + eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" + rm -f -- "${tmp_mkf}" +! vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}" + vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}" + dnl remove -ltermcap, it can conflict with an earlier -lncurses + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` +--- 1068,1074 ---- + dnl -- delete the lines from make about Entering/Leaving directory + eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" + rm -f -- "${tmp_mkf}" +! vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" + vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}" + dnl remove -ltermcap, it can conflict with an earlier -lncurses + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` +*** ../vim-7.3.244/src/version.c 2011-07-07 17:43:37.000000000 +0200 +--- src/version.c 2011-07-15 13:09:17.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 245, + /**/ + + +-- + When danger reared its ugly head, + He bravely turned his tail and fled + Yes, Brave Sir Robin turned about + And gallantly he chickened out + Bravely taking to his feet + He beat a very brave retreat + Bravest of the brave Sir Robin + Petrified of being dead + Soiled his pants then brave Sir Robin + Turned away and fled. + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.246 b/source/ap/vim/patches/7.3.246 new file mode 100644 index 00000000..d9982ea0 --- /dev/null +++ b/source/ap/vim/patches/7.3.246 @@ -0,0 +1,55 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.246 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.246 (after 7.3.235) +Problem: Repeating "f4" in "4444" skips one 4. +Solution: Check the t_cmd flag. (Christian Brabandt) +Files: src/search.c + + +*** ../vim-7.3.245/src/search.c 2011-06-26 05:36:07.000000000 +0200 +--- src/search.c 2011-07-15 13:16:49.000000000 +0200 +*************** +*** 1585,1591 **** + /* Force a move of at least one char, so ";" and "," will move the + * cursor, even if the cursor is right in front of char we are looking + * at. */ +! if (vim_strchr(p_cpo, CPO_SCOLON) == NULL && count == 1) + stop = FALSE; + } + +--- 1585,1591 ---- + /* Force a move of at least one char, so ";" and "," will move the + * cursor, even if the cursor is right in front of char we are looking + * at. */ +! if (vim_strchr(p_cpo, CPO_SCOLON) == NULL && count == 1 && t_cmd) + stop = FALSE; + } + +*** ../vim-7.3.245/src/version.c 2011-07-15 13:09:46.000000000 +0200 +--- src/version.c 2011-07-15 13:20:40.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 246, + /**/ + +-- + GALAHAD turns back. We see from his POV the lovely ZOOT standing by him + smiling enchantingly and a number of equally delectable GIRLIES draped + around in the seductively poulticed room. They look at him smilingly and + wave. + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.247 b/source/ap/vim/patches/7.3.247 new file mode 100644 index 00000000..a0cb566c --- /dev/null +++ b/source/ap/vim/patches/7.3.247 @@ -0,0 +1,95 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.247 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.247 +Problem: Running tests changes the users viminfo file. Test for patch + 7.3.246 missing. +Solution: Add "nviminfo" to the 'viminfo' option. Include the test. +Files: src/testdir/test78.in, src/testdir/test81.in + + +*** ../vim-7.3.246/src/testdir/test78.in 2011-06-13 01:07:22.000000000 +0200 +--- src/testdir/test78.in 2011-07-15 13:26:22.000000000 +0200 +*************** +*** 6,12 **** + + STARTTEST + :so small.vim +! :set nocp fileformat=unix undolevels=-1 + :e! Xtest + ggdG + :let text = "\tabcdefghijklmnoparstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnoparstuvwxyz0123456789" +--- 6,12 ---- + + STARTTEST + :so small.vim +! :set nocp fileformat=unix undolevels=-1 viminfo+=nviminfo + :e! Xtest + ggdG + :let text = "\tabcdefghijklmnoparstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnoparstuvwxyz0123456789" +*** ../vim-7.3.246/src/testdir/test81.in 2011-06-26 05:36:07.000000000 +0200 +--- src/testdir/test81.in 2011-07-15 13:25:00.000000000 +0200 +*************** +*** 1,10 **** + Test for t movement command and 'cpo-;' setting + + STARTTEST +! :set nocompatible + :set cpo-=; + /firstline/ + j0tt;D + $Ty;D:set cpo+=; + j0tt;;D + $Ty;;D:?firstline?+1,$w! test.out +--- 1,12 ---- + Test for t movement command and 'cpo-;' setting + + STARTTEST +! :set nocompatible viminfo+=nviminfo + :set cpo-=; + /firstline/ + j0tt;D ++ 0fz;D ++ $Fy;D + $Ty;D:set cpo+=; + j0tt;;D + $Ty;;D:?firstline?+1,$w! test.out +*************** +*** 13,18 **** +--- 15,22 ---- + + firstline + aaa two three four ++ zzz ++ yyy + bbb yee yoo four + ccc two three four + ddd yee yoo four +*** ../vim-7.3.246/src/version.c 2011-07-15 13:21:24.000000000 +0200 +--- src/version.c 2011-07-15 13:31:14.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 247, + /**/ + +-- +ZOOT: I'm afraid our life must seem very dull and quiet compared to yours. + We are but eightscore young blondes, all between sixteen and + nineteen-and-a-half, cut off in this castle, with no one to protect us. + Oooh. It is a lonely life ... bathing ... dressing ... undressing ... + making exciting underwear.... + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.248 b/source/ap/vim/patches/7.3.248 new file mode 100644 index 00000000..6fbf3f6c --- /dev/null +++ b/source/ap/vim/patches/7.3.248 @@ -0,0 +1,129 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.248 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.248 +Problem: PC Install instructions missing install instructions. +Solution: Step-by-step explanation. (Michael Soyka) +Files: src/INSTALLpc.txt + + +*** ../vim-7.3.247/src/INSTALLpc.txt 2011-06-12 20:36:00.000000000 +0200 +--- src/INSTALLpc.txt 2011-07-15 13:49:46.000000000 +0200 +*************** +*** 11,19 **** + this, then you will get the default behavior as is documented, which should + be fine for most people. + +! With the exception of the last two sections (Windows 3.1 and MS-DOS), +! this document assumes that you are building Vim for Win32 +! (Windows NT/2000/XP/2003/Vista and Windows 95/98/Me) + + + Contents: +--- 11,19 ---- + this, then you will get the default behavior as is documented, which should + be fine for most people. + +! With the exception of two sections (Windows 3.1 and MS-DOS), this document +! assumes that you are building Vim for Win32 or later. +! (Windows 95/98/Me/NT/2000/XP/2003/Vista/7) + + + Contents: +*************** +*** 27,32 **** +--- 27,35 ---- + 8. Windows 3.1 + 9. MS-DOS + ++ 10. Installing after building from sources ++ ++ + The currently preferred method is using the free Visual C++ Toolkit 2008 + |msvc-2008-express|, the produced binary runs on most MS-Windows systems. If + you need the executable to run on Windows 98 or ME, use the 2003 one +*************** +*** 409,411 **** +--- 412,470 ---- + + If you get all kinds of strange error messages when compiling, try adding + changing the file format from "unix" to "dos". ++ ++ ++ 10. Installing after building from sources ++ ========================================== ++ ++ [provided by Michael Soyka] ++ ++ After you've built the Vim binaries as described above, you're ready to ++ install Vim on your system. However, if you've obtained the Vim sources ++ using Mercurial or by downloading them as a unix tar file, you must first ++ create a "vim73" directory. If you instead downloaded the sources as ++ zip files, you can skip this setup as the zip archives already have the ++ correct directory structure. ++ ++ A. Create a Vim "runtime" subdirectory named "vim73" ++ ----------------------------------------------------- ++ If you obtained your Vim sources as zip files, you can skip this step. ++ Otherwise, continue reading. ++ ++ Go to the directory that contains the Vim "src" and "runtime" ++ directories and create a new subdirectory named "vim73". ++ ++ Copy the "runtime" files into "vim73": ++ copy runtime\* vim73 ++ ++ B. Copy the new binaries into the "vim73" directory ++ ---------------------------------------------------- ++ Regardless of how you installed the Vim sources, you need to copy the ++ new binaries you created above into "vim73": ++ ++ copy src\*.exe vim73 ++ copy src\GvimExt\gvimext.dll vim73 ++ copy src\xxd\xxd.exe vim73 ++ ++ C. Move the "vim73" directory into the Vim installation subdirectory ++ --------------------------------------------------------------------- ++ Move the "vim73" subdirectory into the subdirectory where you want Vim ++ to be installed. Typically, this subdirectory will be named "vim". ++ If you already have a "vim73" subdirectory in "vim", delete it first ++ by running its unstal.exe program. ++ ++ D. Install Vim ++ --------------- ++ "cd" to your Vim installation subdirectory "vim\vim73" and run the ++ "install.exe" program. It will ask you a number of questions about ++ how you would like to have your Vim setup. Among these are: ++ - You can tell it to write a "_vimrc" file with your preferences in the ++ parent directory. ++ - It can also install an "Edit with Vim" entry in the Windows Explorer ++ popup menu. ++ - You can have it create batch files, so that you can run Vim from the ++ console or in a shell. You can select one of the directories in your ++ PATH or add the directory to PATH using the Windows Control Panel. ++ - Create entries for Vim on the desktop and in the Start menu. ++ ++ Happy Vimming! +*** ../vim-7.3.247/src/version.c 2011-07-15 13:33:17.000000000 +0200 +--- src/version.c 2011-07-15 13:51:03.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 248, + /**/ + +-- +Linux is just like a wigwam: no Windows, no Gates and an Apache inside. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.249 b/source/ap/vim/patches/7.3.249 new file mode 100644 index 00000000..661f9797 --- /dev/null +++ b/source/ap/vim/patches/7.3.249 @@ -0,0 +1,134 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.249 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.249 +Problem: Wrong indenting for array initializer. +Solution: Detect '}' in a better way. (Lech Lorens) +Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok + + +*** ../vim-7.3.248/src/misc1.c 2011-06-12 21:51:01.000000000 +0200 +--- src/misc1.c 2011-07-15 14:06:44.000000000 +0200 +*************** +*** 7945,7952 **** + * If we're at the end of a block, skip to the start of + * that block. + */ +! curwin->w_cursor.col = 0; +! if (*cin_skipcomment(l) == '}' + && (trypos = find_start_brace(ind_maxcomment)) + != NULL) /* XXX */ + { +--- 7945,7951 ---- + * If we're at the end of a block, skip to the start of + * that block. + */ +! if (find_last_paren(l, '{', '}') + && (trypos = find_start_brace(ind_maxcomment)) + != NULL) /* XXX */ + { +*** ../vim-7.3.248/src/testdir/test3.in 2011-06-12 21:51:01.000000000 +0200 +--- src/testdir/test3.in 2011-07-15 14:03:41.000000000 +0200 +*************** +*** 1452,1457 **** +--- 1452,1487 ---- + + STARTTEST + :set cino& ++ :set cino+=l1 ++ 2kdd=][ ++ ENDTEST ++ ++ void func(void) ++ { ++ int tab[] = ++ { ++ 1, 2, 3, ++ 4, 5, 6}; ++ ++ printf("Indent this line correctly!\n"); ++ ++ switch (foo) ++ { ++ case bar: ++ printf("bar"); ++ break; ++ case baz: { ++ printf("baz"); ++ break; ++ } ++ case quux: ++ printf("But don't break the indentation of this instruction\n"); ++ break; ++ } ++ } ++ ++ STARTTEST ++ :set cino& + 2kdd=][ + ENDTEST + +*** ../vim-7.3.248/src/testdir/test3.ok 2011-06-12 21:51:01.000000000 +0200 +--- src/testdir/test3.ok 2011-07-15 14:03:41.000000000 +0200 +*************** +*** 1310,1315 **** +--- 1310,1340 ---- + + void func(void) + { ++ int tab[] = ++ { ++ 1, 2, 3, ++ 4, 5, 6}; ++ ++ printf("Indent this line correctly!\n"); ++ ++ switch (foo) ++ { ++ case bar: ++ printf("bar"); ++ break; ++ case baz: { ++ printf("baz"); ++ break; ++ } ++ case quux: ++ printf("But don't break the indentation of this instruction\n"); ++ break; ++ } ++ } ++ ++ ++ void func(void) ++ { + cout << "a" + << "b" + << ") :" +*** ../vim-7.3.248/src/version.c 2011-07-15 13:51:57.000000000 +0200 +--- src/version.c 2011-07-15 14:12:05.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 249, + /**/ + +-- + GALAHAD hurries to the door and pushes through it. As he leaves the room + we CUT TO the reverse to show that he is now in a room full of bathing + and romping GIRLIES, all innocent, wide-eyed and beautiful. They smile + enchantingly at him as he tries to keep walking without being diverted by + the lovely sights assaulting his eyeballs. + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.250 b/source/ap/vim/patches/7.3.250 new file mode 100644 index 00000000..fc33328b --- /dev/null +++ b/source/ap/vim/patches/7.3.250 @@ -0,0 +1,104 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.250 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.250 +Problem: Python: Errors in Unicode characters not handled nicely. +Solution: Add the surrogateescape error handler. (lilydjwg) +Files: src/if_python3.c + + +*** ../vim-7.3.249/src/if_python3.c 2011-06-26 19:13:33.000000000 +0200 +--- src/if_python3.c 2011-07-15 15:50:01.000000000 +0200 +*************** +*** 68,76 **** + + static void init_structs(void); + + #define PyInt Py_ssize_t + #define PyString_Check(obj) PyUnicode_Check(obj) +! #define PyString_AsBytes(obj) PyUnicode_AsEncodedString(obj, (char *)ENC_OPT, NULL); + #define PyString_FreeBytes(obj) Py_XDECREF(bytes) + #define PyString_AsString(obj) PyBytes_AsString(obj) + #define PyString_Size(obj) PyBytes_GET_SIZE(bytes) +--- 68,83 ---- + + static void init_structs(void); + ++ /* The "surrogateescape" error handler is new in Python 3.1 */ ++ #if PY_VERSION_HEX >= 0x030100f0 ++ # define CODEC_ERROR_HANDLER "surrogateescape" ++ #else ++ # define CODEC_ERROR_HANDLER NULL ++ #endif ++ + #define PyInt Py_ssize_t + #define PyString_Check(obj) PyUnicode_Check(obj) +! #define PyString_AsBytes(obj) PyUnicode_AsEncodedString(obj, (char *)ENC_OPT, CODEC_ERROR_HANDLER); + #define PyString_FreeBytes(obj) Py_XDECREF(bytes) + #define PyString_AsString(obj) PyBytes_AsString(obj) + #define PyString_Size(obj) PyBytes_GET_SIZE(bytes) +*************** +*** 661,668 **** + + /* PyRun_SimpleString expects a UTF-8 string. Wrong encoding may cause + * SyntaxError (unicode error). */ +! cmdstr = PyUnicode_Decode(cmd, strlen(cmd), (char *)ENC_OPT, NULL); +! cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", NULL); + Py_XDECREF(cmdstr); + PyRun_SimpleString(PyBytes_AsString(cmdbytes)); + Py_XDECREF(cmdbytes); +--- 668,676 ---- + + /* PyRun_SimpleString expects a UTF-8 string. Wrong encoding may cause + * SyntaxError (unicode error). */ +! cmdstr = PyUnicode_Decode(cmd, strlen(cmd), +! (char *)ENC_OPT, CODEC_ERROR_HANDLER); +! cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", CODEC_ERROR_HANDLER); + Py_XDECREF(cmdstr); + PyRun_SimpleString(PyBytes_AsString(cmdbytes)); + Py_XDECREF(cmdbytes); +*************** +*** 1463,1469 **** + } + *p = '\0'; + +! result = PyUnicode_Decode(tmp, len, (char *)ENC_OPT, NULL); + + vim_free(tmp); + return result; +--- 1471,1477 ---- + } + *p = '\0'; + +! result = PyUnicode_Decode(tmp, len, (char *)ENC_OPT, CODEC_ERROR_HANDLER); + + vim_free(tmp); + return result; +*** ../vim-7.3.249/src/version.c 2011-07-15 14:12:25.000000000 +0200 +--- src/version.c 2011-07-15 15:46:19.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 250, + /**/ + +-- +DINGO: You must spank her well and after you have spanked her you + may deal with her as you like and then ... spank me. +AMAZING: And spank me! +STUNNER: And me. +LOVELY: And me. + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.251 b/source/ap/vim/patches/7.3.251 new file mode 100644 index 00000000..43aa4148 --- /dev/null +++ b/source/ap/vim/patches/7.3.251 @@ -0,0 +1,184 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.251 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.251 +Problem: "gH" deletes the current line, except when it's the last + line. +Solution: Set the "include" flag to indicate the last line is to be deleted. +Files: src/normal.c, src/ops.c + + +*** ../vim-7.3.250/src/normal.c 2011-07-07 15:08:53.000000000 +0200 +--- src/normal.c 2011-07-15 16:53:12.000000000 +0200 +*************** +*** 1795,1811 **** + { + oap->inclusive = FALSE; + /* Try to include the newline, unless it's an operator +! * that works on lines only */ +! if (*p_sel != 'o' +! && !op_on_lines(oap->op_type) +! && oap->end.lnum < curbuf->b_ml.ml_line_count) + { +! ++oap->end.lnum; +! oap->end.col = 0; + # ifdef FEAT_VIRTUALEDIT +! oap->end.coladd = 0; + # endif +! ++oap->line_count; + } + } + } +--- 1795,1819 ---- + { + oap->inclusive = FALSE; + /* Try to include the newline, unless it's an operator +! * that works on lines only. */ +! if (*p_sel != 'o' && !op_on_lines(oap->op_type)) + { +! if (oap->end.lnum < curbuf->b_ml.ml_line_count) +! { +! ++oap->end.lnum; +! oap->end.col = 0; + # ifdef FEAT_VIRTUALEDIT +! oap->end.coladd = 0; + # endif +! ++oap->line_count; +! } +! else +! { +! /* Cannot move below the last line, make the op +! * inclusive to tell the operation to include the +! * line break. */ +! oap->inclusive = TRUE; +! } + } + } + } +*** ../vim-7.3.250/src/ops.c 2011-06-19 01:14:22.000000000 +0200 +--- src/ops.c 2011-07-15 17:28:28.000000000 +0200 +*************** +*** 1650,1656 **** + && oap->line_count > 1 + && oap->op_type == OP_DELETE) + { +! ptr = ml_get(oap->end.lnum) + oap->end.col + oap->inclusive; + ptr = skipwhite(ptr); + if (*ptr == NUL && inindent(0)) + oap->motion_type = MLINE; +--- 1650,1658 ---- + && oap->line_count > 1 + && oap->op_type == OP_DELETE) + { +! ptr = ml_get(oap->end.lnum) + oap->end.col; +! if (*ptr != NUL) +! ptr += oap->inclusive; + ptr = skipwhite(ptr); + if (*ptr == NUL && inindent(0)) + oap->motion_type = MLINE; +*************** +*** 1920,1930 **** + curwin->w_cursor.coladd = 0; + } + #endif +! (void)del_bytes((long)n, !virtual_op, oap->op_type == OP_DELETE + #ifdef FEAT_VISUAL + && !oap->is_VIsual + #endif + ); + } + else /* delete characters between lines */ + { +--- 1922,1941 ---- + curwin->w_cursor.coladd = 0; + } + #endif +! if (oap->inclusive && oap->end.lnum == curbuf->b_ml.ml_line_count +! && n > (int)STRLEN(ml_get(oap->end.lnum))) +! { +! /* Special case: gH deletes the last line. */ +! del_lines(1L, FALSE); +! } +! else +! { +! (void)del_bytes((long)n, !virtual_op, oap->op_type == OP_DELETE + #ifdef FEAT_VISUAL + && !oap->is_VIsual + #endif + ); ++ } + } + else /* delete characters between lines */ + { +*************** +*** 1941,1957 **** + ++curwin->w_cursor.lnum; + del_lines((long)(oap->line_count - 2), FALSE); + +! /* delete from start of line until op_end */ +! curwin->w_cursor.col = 0; +! (void)del_bytes((long)(oap->end.col + 1 - !oap->inclusive), +! !virtual_op, oap->op_type == OP_DELETE + #ifdef FEAT_VISUAL + && !oap->is_VIsual + #endif + ); +! curwin->w_cursor = curpos; /* restore curwin->w_cursor */ +! +! (void)do_join(2, FALSE, FALSE); + } + } + +--- 1952,1980 ---- + ++curwin->w_cursor.lnum; + del_lines((long)(oap->line_count - 2), FALSE); + +! n = (oap->end.col + 1 - !oap->inclusive); +! if (oap->inclusive && oap->end.lnum == curbuf->b_ml.ml_line_count +! && n > (int)STRLEN(ml_get(oap->end.lnum))) +! { +! /* Special case: gH deletes the last line. */ +! del_lines(1L, FALSE); +! curwin->w_cursor = curpos; /* restore curwin->w_cursor */ +! if (curwin->w_cursor.lnum > 1) +! --curwin->w_cursor.lnum; +! } +! else +! { +! /* delete from start of line until op_end */ +! curwin->w_cursor.col = 0; +! (void)del_bytes((long)n, !virtual_op, oap->op_type == OP_DELETE + #ifdef FEAT_VISUAL + && !oap->is_VIsual + #endif + ); +! curwin->w_cursor = curpos; /* restore curwin->w_cursor */ +! } +! if (curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) +! (void)do_join(2, FALSE, FALSE); + } + } + +*** ../vim-7.3.250/src/version.c 2011-07-15 15:54:39.000000000 +0200 +--- src/version.c 2011-07-15 17:35:18.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 251, + /**/ + +-- + ### Hiroshima 45, Chernobyl 86, Windows 95 ### + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.252 b/source/ap/vim/patches/7.3.252 new file mode 100644 index 00000000..e24b73be --- /dev/null +++ b/source/ap/vim/patches/7.3.252 @@ -0,0 +1,43 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.252 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.252 (after 7.3.247) +Problem: Tests fail. (David Northfield) +Solution: Add missing update for .ok file. +Files: src/testdir/test81.ok + + +*** ../vim-7.3.251/src/testdir/test81.ok 2011-06-26 05:36:07.000000000 +0200 +--- src/testdir/test81.ok 2011-07-15 13:14:27.000000000 +0200 +*************** +*** 1,4 **** +--- 1,6 ---- + aaa two ++ z ++ y + bbb y + ccc + ddd yee y +*** ../vim-7.3.251/src/version.c 2011-07-15 17:51:30.000000000 +0200 +--- src/version.c 2011-07-15 17:55:25.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 252, + /**/ + +-- +You cannot propel yourself forward by patting yourself on the back. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.253 b/source/ap/vim/patches/7.3.253 new file mode 100644 index 00000000..70e415b5 --- /dev/null +++ b/source/ap/vim/patches/7.3.253 @@ -0,0 +1,539 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.253 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.253 +Problem: "echo 'abc' > ''" returns 0 or 1, depending on 'ignorecase'. + Checks in mb_strnicmp() for illegal and truncated bytes are + wrong. Should not assume that byte length is equal before case + folding. +Solution: Add utf_safe_read_char_adv() and utf_strnicmp(). Add a test for + this. (Ivan Krasilnikov) +Files: src/mbyte.c src/testdir/test82.in, src/testdir/test82.ok, + src/testdir/Makefile, src/testdir/Make_amiga.mak, + src/testdir/Make_dos.mak, src/testdir/Make_ming.mak, + src/testdir/Make_os2.mak, src/testdir/Make_vms.mms + + +*** ../vim-7.3.252/src/mbyte.c 2011-07-07 15:08:53.000000000 +0200 +--- src/mbyte.c 2011-07-15 20:13:52.000000000 +0200 +*************** +*** 132,137 **** +--- 132,138 ---- + static int dbcs_char2cells __ARGS((int c)); + static int dbcs_ptr2cells_len __ARGS((char_u *p, int size)); + static int dbcs_ptr2char __ARGS((char_u *p)); ++ static int utf_safe_read_char_adv __ARGS((char_u **s, size_t *n)); + + /* + * Lookup table to quickly get the length in bytes of a UTF-8 character from +*************** +*** 1701,1706 **** +--- 1702,1767 ---- + } + + /* ++ * Convert a UTF-8 byte sequence to a wide character. ++ * String is assumed to be terminated by NUL or after "n" bytes, whichever ++ * comes first. ++ * The function is safe in the sense that it never accesses memory beyond the ++ * first "n" bytes of "s". ++ * ++ * On success, returns decoded codepoint, advances "s" to the beginning of ++ * next character and decreases "n" accordingly. ++ * ++ * If end of string was reached, returns 0 and, if "n" > 0, advances "s" past ++ * NUL byte. ++ * ++ * If byte sequence is illegal or incomplete, returns -1 and does not advance ++ * "s". ++ */ ++ static int ++ utf_safe_read_char_adv(s, n) ++ char_u **s; ++ size_t *n; ++ { ++ int c, k; ++ ++ if (*n == 0) /* end of buffer */ ++ return 0; ++ ++ k = utf8len_tab_zero[**s]; ++ ++ if (k == 1) ++ { ++ /* ASCII character or NUL */ ++ (*n)--; ++ return *(*s)++; ++ } ++ ++ if ((size_t)k <= *n) ++ { ++ /* We have a multibyte sequence and it isn't truncated by buffer ++ * limits so utf_ptr2char() is safe to use. Or the first byte is ++ * illegal (k=0), and it's also safe to use utf_ptr2char(). */ ++ c = utf_ptr2char(*s); ++ ++ /* On failure, utf_ptr2char() returns the first byte, so here we ++ * check equality with the first byte. The only non-ASCII character ++ * which equals the first byte of its own UTF-8 representation is ++ * U+00C3 (UTF-8: 0xC3 0x83), so need to check that special case too. ++ * It's safe even if n=1, else we would have k=2 > n. */ ++ if (c != (int)(**s) || (c == 0xC3 && (*s)[1] == 0x83)) ++ { ++ /* byte sequence was successfully decoded */ ++ *s += k; ++ *n -= k; ++ return c; ++ } ++ } ++ ++ /* byte sequence is incomplete or illegal */ ++ return -1; ++ } ++ ++ /* + * Get character at **pp and advance *pp to the next character. + * Note: composing characters are skipped! + */ +*************** +*** 2667,2673 **** + {0x10400,0x10427,1,40} + }; + +! static int utf_convert(int a, convertStruct table[], int tableSize); + + /* + * Generic conversion function for case operations. +--- 2728,2735 ---- + {0x10400,0x10427,1,40} + }; + +! static int utf_convert __ARGS((int a, convertStruct table[], int tableSize)); +! static int utf_strnicmp __ARGS((char_u *s1, char_u *s2, size_t n1, size_t n2)); + + /* + * Generic conversion function for case operations. +*************** +*** 3079,3084 **** +--- 3141,3220 ---- + return (utf_tolower(a) != a); + } + ++ static int ++ utf_strnicmp(s1, s2, n1, n2) ++ char_u *s1, *s2; ++ size_t n1, n2; ++ { ++ int c1, c2, cdiff; ++ char_u buffer[6]; ++ ++ for (;;) ++ { ++ c1 = utf_safe_read_char_adv(&s1, &n1); ++ c2 = utf_safe_read_char_adv(&s2, &n2); ++ ++ if (c1 <= 0 || c2 <= 0) ++ break; ++ ++ if (c1 == c2) ++ continue; ++ ++ cdiff = utf_fold(c1) - utf_fold(c2); ++ if (cdiff != 0) ++ return cdiff; ++ } ++ ++ /* some string ended or has an incomplete/illegal character sequence */ ++ ++ if (c1 == 0 || c2 == 0) ++ { ++ /* some string ended. shorter string is smaller */ ++ if (c1 == 0 && c2 == 0) ++ return 0; ++ return c1 == 0 ? -1 : 1; ++ } ++ ++ /* Continue with bytewise comparison to produce some result that ++ * would make comparison operations involving this function transitive. ++ * ++ * If only one string had an error, comparison should be made with ++ * folded version of the other string. In this case it is enough ++ * to fold just one character to determine the result of comparison. */ ++ ++ if (c1 != -1 && c2 == -1) ++ { ++ n1 = utf_char2bytes(utf_fold(c1), buffer); ++ s1 = buffer; ++ } ++ else if (c2 != -1 && c1 == -1) ++ { ++ n2 = utf_char2bytes(utf_fold(c2), buffer); ++ s2 = buffer; ++ } ++ ++ while (n1 > 0 && n2 > 0 && *s1 != NUL && *s2 != NUL) ++ { ++ cdiff = (int)(*s1) - (int)(*s2); ++ if (cdiff != 0) ++ return cdiff; ++ ++ s1++; ++ s2++; ++ n1--; ++ n2--; ++ } ++ ++ if (n1 > 0 && *s1 == NUL) ++ n1 = 0; ++ if (n2 > 0 && *s2 == NUL) ++ n2 = 0; ++ ++ if (n1 == 0 && n2 == 0) ++ return 0; ++ return n1 == 0 ? -1 : 1; ++ } ++ + /* + * Version of strnicmp() that handles multi-byte characters. + * Needed for Big5, Sjift-JIS and UTF-8 encoding. Other DBCS encodings can +*************** +*** 3092,3140 **** + char_u *s1, *s2; + size_t nn; + { +! int i, j, l; + int cdiff; +- int incomplete = FALSE; + int n = (int)nn; + +! for (i = 0; i < n; i += l) + { +! if (s1[i] == NUL && s2[i] == NUL) /* both strings end */ +! return 0; +! if (enc_utf8) +! { +! l = utf_byte2len(s1[i]); +! if (l > n - i) +! { +! l = n - i; /* incomplete character */ +! incomplete = TRUE; +! } +! /* Check directly first, it's faster. */ +! for (j = 0; j < l; ++j) +! { +! if (s1[i + j] != s2[i + j]) +! break; +! if (s1[i + j] == 0) +! /* Both stings have the same bytes but are incomplete or +! * have illegal bytes, accept them as equal. */ +! l = j; +! } +! if (j < l) +! { +! /* If one of the two characters is incomplete return -1. */ +! if (incomplete || i + utf_byte2len(s2[i]) > n) +! return -1; +! /* Don't case-fold illegal bytes or truncated characters. */ +! if (utf_ptr2len(s1 + i) < l || utf_ptr2len(s2 + i) < l) +! return -1; +! cdiff = utf_fold(utf_ptr2char(s1 + i)) +! - utf_fold(utf_ptr2char(s2 + i)); +! if (cdiff != 0) +! return cdiff; +! } +! } +! else + { + l = (*mb_ptr2len)(s1 + i); + if (l <= 1) + { +--- 3228,3248 ---- + char_u *s1, *s2; + size_t nn; + { +! int i, l; + int cdiff; + int n = (int)nn; + +! if (enc_utf8) + { +! return utf_strnicmp(s1, s2, nn, nn); +! } +! else +! { +! for (i = 0; i < n; i += l) + { ++ if (s1[i] == NUL && s2[i] == NUL) /* both strings end */ ++ return 0; ++ + l = (*mb_ptr2len)(s1 + i); + if (l <= 1) + { +*** ../vim-7.3.252/src/testdir/test82.in 2011-07-15 21:16:03.000000000 +0200 +--- src/testdir/test82.in 2011-07-15 18:22:46.000000000 +0200 +*************** +*** 0 **** +--- 1,93 ---- ++ Tests for case-insensitive UTF-8 comparisons (utf_strnicmp() in mbyte.c) ++ ++ STARTTEST ++ :so small.vim ++ :if !has("multi_byte") ++ : e! test.ok ++ : w! test.out ++ : qa! ++ :endif ++ :set enc=utf8 ++ ggdG ++ : ++ :function! Ch(a, op, b, expected) ++ : if eval(printf('"%s" %s "%s"', a:a, a:op, a:b)) != a:expected ++ : call append(line('$'), printf('"%s" %s "%s" should return %d', a:a, a:op, a:b, a:expected)) ++ : else ++ : let b:passed += 1 ++ : endif ++ :endfunction ++ : ++ :function! Chk(a, b, result) ++ : if a:result == 0 ++ : call Ch(a:a, '==?', a:b, 1) ++ : call Ch(a:a, '!=?', a:b, 0) ++ : call Ch(a:a, '<=?', a:b, 1) ++ : call Ch(a:a, '>=?', a:b, 1) ++ : call Ch(a:a, '?', a:b, 0) ++ : elseif a:result > 0 ++ : call Ch(a:a, '==?', a:b, 0) ++ : call Ch(a:a, '!=?', a:b, 1) ++ : call Ch(a:a, '<=?', a:b, 0) ++ : call Ch(a:a, '>=?', a:b, 1) ++ : call Ch(a:a, '?', a:b, 1) ++ : else ++ : call Ch(a:a, '==?', a:b, 0) ++ : call Ch(a:a, '!=?', a:b, 1) ++ : call Ch(a:a, '<=?', a:b, 1) ++ : call Ch(a:a, '>=?', a:b, 0) ++ : call Ch(a:a, '?', a:b, 0) ++ : endif ++ :endfunction ++ : ++ :function! Check(a, b, result) ++ : call Chk(a:a, a:b, a:result) ++ : call Chk(a:b, a:a, -a:result) ++ :endfunction ++ : ++ :function! LT(a, b) ++ : call Check(a:a, a:b, -1) ++ :endfunction ++ : ++ :function! GT(a, b) ++ : call Check(a:a, a:b, 1) ++ :endfunction ++ : ++ :function! EQ(a, b) ++ : call Check(a:a, a:b, 0) ++ :endfunction ++ : ++ :let b:passed=0 ++ :call EQ('', '') ++ :call LT('', 'a') ++ :call EQ('abc', 'abc') ++ :call EQ('Abc', 'abC') ++ :call LT('ab', 'abc') ++ :call LT('AB', 'abc') ++ :call LT('ab', 'aBc') ++ :call EQ('\xd0\xb9\xd1\x86\xd1\x83\xd0\xba\xd0\xb5\xd0\xbd', '\xd0\xb9\xd0\xa6\xd0\xa3\xd0\xba\xd0\x95\xd0\xbd') ++ :call LT('\xd0\xb9\xd1\x86\xd1\x83\xd0\xba\xd0\xb5\xd0\xbd', '\xd0\xaf\xd1\x86\xd1\x83\xd0\xba\xd0\xb5\xd0\xbd') ++ :call EQ('\xe2\x84\xaa', 'k') ++ :call LT('\xe2\x84\xaa', 'kkkkkk') ++ :call EQ('\xe2\x84\xaa\xe2\x84\xaa\xe2\x84\xaa', 'kkk') ++ :call LT('kk', '\xe2\x84\xaa\xe2\x84\xaa\xe2\x84\xaa') ++ :call EQ('\xe2\x84\xaa\xe2\x84\xa6k\xe2\x84\xaak\xcf\x89', 'k\xcf\x89\xe2\x84\xaakk\xe2\x84\xa6') ++ :call EQ('Abc\x80', 'AbC\x80') ++ :call LT('Abc\x80', 'AbC\x81') ++ :call LT('Abc', 'AbC\x80') ++ :call LT('abc\x80DEF', 'abc\x80def') " case folding stops at the first bad character ++ :call LT('\xc3XYZ', '\xc3xyz') ++ :call EQ('\xef\xbc\xba', '\xef\xbd\x9a') " FF3A (upper), FF5A (lower) ++ :call GT('\xef\xbc\xba', '\xef\xbc\xff') " first string is ok and equals \xef\xbd\x9a after folding, second string is illegal and was left unchanged, then the strings were bytewise compared ++ :call LT('\xc3', '\xc3\x83') ++ :call EQ('\xc3\xa3xYz', '\xc3\x83XyZ') ++ :for n in range(0x60, 0xFF) | call LT(printf('xYz\x%.2X', n-1), printf('XyZ\x%.2X', n)) | endfor ++ :for n in range(0x80, 0xBF) | call EQ(printf('xYz\xc2\x%.2XUvW', n), printf('XyZ\xc2\x%.2XuVw', n)) | endfor ++ :for n in range(0xC0, 0xFF) | call LT(printf('xYz\xc2\x%.2XUvW', n), printf('XyZ\xc2\x%.2XuVw', n)) | endfor ++ :call append(0, printf('%d checks passed', b:passed)) ++ :wq! test.out ++ ENDTEST ++ +*** ../vim-7.3.252/src/testdir/test82.ok 2011-07-15 21:16:03.000000000 +0200 +--- src/testdir/test82.ok 2011-07-15 18:37:33.000000000 +0200 +*************** +*** 0 **** +--- 1,2 ---- ++ 3732 checks passed ++ +*** ../vim-7.3.252/src/testdir/Makefile 2011-06-26 05:36:07.000000000 +0200 +--- src/testdir/Makefile 2011-07-15 18:30:08.000000000 +0200 +*************** +*** 26,32 **** + test64.out test65.out test66.out test67.out test68.out \ + test69.out test70.out test71.out test72.out test73.out \ + test74.out test75.out test76.out test77.out test78.out \ +! test79.out test80.out test81.out + + SCRIPTS_GUI = test16.out + +--- 26,32 ---- + test64.out test65.out test66.out test67.out test68.out \ + test69.out test70.out test71.out test72.out test73.out \ + test74.out test75.out test76.out test77.out test78.out \ +! test79.out test80.out test81.out test82.out + + SCRIPTS_GUI = test16.out + +*** ../vim-7.3.252/src/testdir/Make_amiga.mak 2011-06-26 05:36:07.000000000 +0200 +--- src/testdir/Make_amiga.mak 2011-07-15 18:29:50.000000000 +0200 +*************** +*** 29,35 **** + test66.out test67.out test68.out test69.out test70.out \ + test71.out test72.out test73.out test74.out test75.out \ + test76.out test77.out test78.out test79.out test80.out \ +! test81.out + + .SUFFIXES: .in .out + +--- 29,35 ---- + test66.out test67.out test68.out test69.out test70.out \ + test71.out test72.out test73.out test74.out test75.out \ + test76.out test77.out test78.out test79.out test80.out \ +! test81.out test82.out + + .SUFFIXES: .in .out + +*************** +*** 130,132 **** +--- 130,133 ---- + test79.out: test79.in + test80.out: test80.in + test81.out: test81.in ++ test82.out: test82.in +*** ../vim-7.3.252/src/testdir/Make_dos.mak 2011-06-26 05:36:07.000000000 +0200 +--- src/testdir/Make_dos.mak 2011-07-15 18:30:02.000000000 +0200 +*************** +*** 29,35 **** + test42.out test52.out test65.out test66.out test67.out \ + test68.out test69.out test71.out test72.out test73.out \ + test74.out test75.out test76.out test77.out test78.out \ +! test79.out test80.out test81.out + + SCRIPTS32 = test50.out test70.out + +--- 29,35 ---- + test42.out test52.out test65.out test66.out test67.out \ + test68.out test69.out test71.out test72.out test73.out \ + test74.out test75.out test76.out test77.out test78.out \ +! test79.out test80.out test81.out test82.out + + SCRIPTS32 = test50.out test70.out + +*** ../vim-7.3.252/src/testdir/Make_ming.mak 2011-06-26 05:36:07.000000000 +0200 +--- src/testdir/Make_ming.mak 2011-07-15 18:30:15.000000000 +0200 +*************** +*** 49,55 **** + test42.out test52.out test65.out test66.out test67.out \ + test68.out test69.out test71.out test72.out test73.out \ + test74.out test75.out test76.out test77.out test78.out \ +! test79.out test80.out test81.out + + SCRIPTS32 = test50.out test70.out + +--- 49,55 ---- + test42.out test52.out test65.out test66.out test67.out \ + test68.out test69.out test71.out test72.out test73.out \ + test74.out test75.out test76.out test77.out test78.out \ +! test79.out test80.out test81.out test82.out + + SCRIPTS32 = test50.out test70.out + +*** ../vim-7.3.252/src/testdir/Make_os2.mak 2011-06-26 05:36:07.000000000 +0200 +--- src/testdir/Make_os2.mak 2011-07-15 18:30:25.000000000 +0200 +*************** +*** 29,35 **** + test66.out test67.out test68.out test69.out test70.out \ + test71.out test72.out test73.out test74.out test75.out \ + test76.out test77.out test78.out test79.out test80.out \ +! test81.out + + .SUFFIXES: .in .out + +--- 29,35 ---- + test66.out test67.out test68.out test69.out test70.out \ + test71.out test72.out test73.out test74.out test75.out \ + test76.out test77.out test78.out test79.out test80.out \ +! test81.out test82.out + + .SUFFIXES: .in .out + +*** ../vim-7.3.252/src/testdir/Make_vms.mms 2011-06-26 05:36:07.000000000 +0200 +--- src/testdir/Make_vms.mms 2011-07-15 18:30:33.000000000 +0200 +*************** +*** 4,10 **** + # Authors: Zoltan Arpadffy, + # Sandor Kopanyi, + # +! # Last change: 2011 Jun 26 + # + # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64. + # Edit the lines in the Configuration section below to select. +--- 4,10 ---- + # Authors: Zoltan Arpadffy, + # Sandor Kopanyi, + # +! # Last change: 2011 Jul 15 + # + # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64. + # Edit the lines in the Configuration section below to select. +*************** +*** 75,81 **** + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out \ + test71.out test72.out test74.out test75.out test76.out \ +! test77.out test78.out test79.out test80.out test81.out + + # Known problems: + # Test 30: a problem around mac format - unknown reason +--- 75,82 ---- + test61.out test62.out test63.out test64.out test65.out \ + test66.out test67.out test68.out test69.out \ + test71.out test72.out test74.out test75.out test76.out \ +! test77.out test78.out test79.out test80.out test81.out \ +! test82.out + + # Known problems: + # Test 30: a problem around mac format - unknown reason +*** ../vim-7.3.252/src/version.c 2011-07-15 17:56:11.000000000 +0200 +--- src/version.c 2011-07-15 21:12:26.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 253, + /**/ + +-- +"Intelligence has much less practical application than you'd think." + -- Scott Adams, Dilbert. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.254 b/source/ap/vim/patches/7.3.254 new file mode 100644 index 00000000..85176a7a --- /dev/null +++ b/source/ap/vim/patches/7.3.254 @@ -0,0 +1,47 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.254 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.254 +Problem: The coladd field is not reset when setting the line number for a + ":call" command. +Solution: Reset it. +Files: src/eval.c + + +*** ../vim-7.3.253/src/eval.c 2011-07-07 17:36:52.000000000 +0200 +--- src/eval.c 2011-07-07 17:51:42.000000000 +0200 +*************** +*** 3430,3435 **** +--- 3430,3438 ---- + { + curwin->w_cursor.lnum = lnum; + curwin->w_cursor.col = 0; ++ #ifdef FEAT_VIRTUALEDIT ++ curwin->w_cursor.coladd = 0; ++ #endif + } + arg = startarg; + if (get_func_tv(name, (int)STRLEN(name), &rettv, &arg, +*** ../vim-7.3.253/src/version.c 2011-07-15 21:16:54.000000000 +0200 +--- src/version.c 2011-07-15 21:23:16.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 254, + /**/ + +-- +Eight Megabytes And Continually Swapping. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.255 b/source/ap/vim/patches/7.3.255 new file mode 100644 index 00000000..c01a585e --- /dev/null +++ b/source/ap/vim/patches/7.3.255 @@ -0,0 +1,81 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.255 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.255 +Problem: When editing a file such as "File[2010-08-15].vim" an E16 error is + given. (Manuel Stol) +Solution: Don't give an error for failing to compile the regexp. +Files: src/ex_docmd.c, src/misc1.c, src/vim.h + + +*** ../vim-7.3.254/src/ex_docmd.c 2011-06-13 01:19:48.000000000 +0200 +--- src/ex_docmd.c 2011-07-20 14:48:01.000000000 +0200 +*************** +*** 7069,7075 **** + old_arg_count = GARGCOUNT; + if (expand_wildcards(old_arg_count, old_arg_files, + &new_arg_file_count, &new_arg_files, +! EW_FILE|EW_NOTFOUND|EW_ADDSLASH) == OK + && new_arg_file_count > 0) + { + alist_set(&global_alist, new_arg_file_count, new_arg_files, +--- 7069,7075 ---- + old_arg_count = GARGCOUNT; + if (expand_wildcards(old_arg_count, old_arg_files, + &new_arg_file_count, &new_arg_files, +! EW_FILE|EW_NOTFOUND|EW_ADDSLASH|EW_NOERROR) == OK + && new_arg_file_count > 0) + { + alist_set(&global_alist, new_arg_file_count, new_arg_files, +*** ../vim-7.3.254/src/misc1.c 2011-07-15 14:12:25.000000000 +0200 +--- src/misc1.c 2011-07-20 14:55:09.000000000 +0200 +*************** +*** 9043,9050 **** +--- 9043,9054 ---- + } + + /* compile the regexp into a program */ ++ if (flags & EW_NOERROR) ++ ++emsg_silent; + regmatch.rm_ic = TRUE; /* Always ignore case */ + regmatch.regprog = vim_regcomp(pat, RE_MAGIC); ++ if (flags & EW_NOERROR) ++ --emsg_silent; + vim_free(pat); + + if (regmatch.regprog == NULL) +*** ../vim-7.3.254/src/vim.h 2011-06-13 02:03:55.000000000 +0200 +--- src/vim.h 2011-07-20 14:50:13.000000000 +0200 +*************** +*** 815,820 **** +--- 815,821 ---- + #define EW_EXEC 0x40 /* executable files */ + #define EW_PATH 0x80 /* search in 'path' too */ + #define EW_ICASE 0x100 /* ignore case */ ++ #define EW_NOERROR 0x200 /* no error for bad regexp */ + /* Note: mostly EW_NOTFOUND and EW_SILENT are mutually exclusive: EW_NOTFOUND + * is used when executing commands and EW_SILENT for interactive expanding. */ + +*** ../vim-7.3.254/src/version.c 2011-07-15 21:24:06.000000000 +0200 +--- src/version.c 2011-07-20 15:03:52.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 255, + /**/ + +-- +Not too long ago, a program was something you watched on TV... + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.256 b/source/ap/vim/patches/7.3.256 new file mode 100644 index 00000000..b8c9f00d --- /dev/null +++ b/source/ap/vim/patches/7.3.256 @@ -0,0 +1,322 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.256 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.256 +Problem: Javascript indenting not sufficiently tested. +Solution: Add more tests. (Luc Deschenaux) Mark the lines that are indented + wrong. +Files: src/testdir/test3.in, src/testdir/test3.ok + + +*** ../vim-7.3.255/src/testdir/test3.in 2011-07-15 14:12:25.000000000 +0200 +--- src/testdir/test3.in 2011-07-15 21:05:49.000000000 +0200 +*************** +*** 1592,1598 **** + + + STARTTEST +! :set cino=J1 + /^JSSTART + =/^JSEND + ENDTEST +--- 1592,1598 ---- + + + STARTTEST +! :set cino=j1,J1 + /^JSSTART + =/^JSEND + ENDTEST +*************** +*** 1613,1618 **** +--- 1613,1757 ---- + JSEND + + STARTTEST ++ :set cino=j1,J1 ++ /^JSSTART ++ =/^JSEND ++ ENDTEST ++ ++ JSSTART ++ var foo = [ ++ 1, // indent 8 more ++ 2, ++ 3 ++ ]; // indent 8 less ++ JSEND ++ ++ STARTTEST ++ :set cino=j1,J1 ++ /^JSSTART ++ =/^JSEND ++ ENDTEST ++ ++ JSSTART ++ function bar() { ++ var foo = [ ++ 1, ++ 2, ++ 3 ++ ]; // indent 16 less ++ } ++ JSEND ++ ++ STARTTEST ++ :set cino=j1,J1 ++ /^JSSTART ++ =/^JSEND ++ ENDTEST ++ ++ JSSTART ++ (function($){ ++ ++ var class_name='myclass'; ++ ++ function private_method() { ++ } ++ ++ var public_method={ ++ method: function(options,args){ ++ private_method(); ++ } ++ } ++ ++ function init(options) { ++ ++ $(this).data(class_name+'_public',$.extend({},{ ++ foo: 'bar', ++ bar: 2, // indent 8 more ++ foobar: [ // indent 8 more ++ 1, // indent 8 more ++ 2, // indent 16 more ++ 3 // indent 16 more ++ ], ++ callback: function(){ // indent 8 more ++ return true; // indent 8 more ++ } // indent 8 more ++ }, options||{})); ++ } ++ ++ $.fn[class_name]=function() { ++ ++ var _arguments=arguments; ++ return this.each(function(){ ++ ++ var options=$(this).data(class_name+'_public'); ++ if (!options) { ++ init.apply(this,_arguments); ++ ++ } else { ++ var method=public_method[_arguments[0]]; ++ ++ if (typeof(method)!='function') { ++ console.log(class_name+' has no method "'+_arguments[0]+'"'); ++ return false; ++ } ++ _arguments[0]=options; ++ method.apply(this,_arguments); ++ } ++ }); ++ } ++ ++ })(jQuery); ++ JSEND ++ ++ STARTTEST ++ :set cino=j1,J1 ++ /^JSSTART ++ =/^JSEND ++ ENDTEST ++ ++ JSSTART ++ function init(options) { ++ $(this).data(class_name+'_public',$.extend({},{ ++ foo: 'bar', ++ bar: 2, ++ foobar: [ ++ 1, // indent 8 more ++ 2, // indent 8 more ++ 3 // indent 8 more ++ ], ++ callback: function(){ ++ return true; ++ } ++ }, options||{})); ++ } ++ JSEND ++ ++ STARTTEST ++ :set cino=j1,J1 ++ /^JSSTART ++ =/^JSEND ++ ENDTEST ++ ++ JSSTART ++ (function($){ ++ function init(options) { ++ $(this).data(class_name+'_public',$.extend({},{ ++ foo: 'bar', ++ bar: 2, // indent 8 more ++ foobar: [ // indent 8 more ++ 1, // indent 8 more ++ 2, // indent 16 more ++ 3 // indent 16 more ++ ], ++ callback: function(){ // indent 8 more ++ return true; // indent 8 more ++ } // indent 8 more ++ }, options||{})); ++ } ++ })(jQuery); ++ JSEND ++ ++ STARTTEST + :g/^STARTTEST/.,/^ENDTEST/d + :1;/start of AUTO/,$wq! test.out + ENDTEST +*** ../vim-7.3.255/src/testdir/test3.ok 2011-07-15 14:12:25.000000000 +0200 +--- src/testdir/test3.ok 2011-07-15 21:06:38.000000000 +0200 +*************** +*** 1443,1445 **** +--- 1443,1559 ---- + } + JSEND + ++ ++ JSSTART ++ var foo = [ ++ 1, // indent 8 more ++ 2, ++ 3 ++ ]; // indent 8 less ++ JSEND ++ ++ ++ JSSTART ++ function bar() { ++ var foo = [ ++ 1, ++ 2, ++ 3 ++ ]; // indent 16 less ++ } ++ JSEND ++ ++ ++ JSSTART ++ (function($){ ++ ++ var class_name='myclass'; ++ ++ function private_method() { ++ } ++ ++ var public_method={ ++ method: function(options,args){ ++ private_method(); ++ } ++ } ++ ++ function init(options) { ++ ++ $(this).data(class_name+'_public',$.extend({},{ ++ foo: 'bar', ++ bar: 2, // indent 8 more ++ foobar: [ // indent 8 more ++ 1, // indent 8 more ++ 2, // indent 16 more ++ 3 // indent 16 more ++ ], ++ callback: function(){ // indent 8 more ++ return true; // indent 8 more ++ } // indent 8 more ++ }, options||{})); ++ } ++ ++ $.fn[class_name]=function() { ++ ++ var _arguments=arguments; ++ return this.each(function(){ ++ ++ var options=$(this).data(class_name+'_public'); ++ if (!options) { ++ init.apply(this,_arguments); ++ ++ } else { ++ var method=public_method[_arguments[0]]; ++ ++ if (typeof(method)!='function') { ++ console.log(class_name+' has no method "'+_arguments[0]+'"'); ++ return false; ++ } ++ _arguments[0]=options; ++ method.apply(this,_arguments); ++ } ++ }); ++ } ++ ++ })(jQuery); ++ JSEND ++ ++ ++ JSSTART ++ function init(options) { ++ $(this).data(class_name+'_public',$.extend({},{ ++ foo: 'bar', ++ bar: 2, ++ foobar: [ ++ 1, // indent 8 more ++ 2, // indent 8 more ++ 3 // indent 8 more ++ ], ++ callback: function(){ ++ return true; ++ } ++ }, options||{})); ++ } ++ JSEND ++ ++ ++ JSSTART ++ (function($){ ++ function init(options) { ++ $(this).data(class_name+'_public',$.extend({},{ ++ foo: 'bar', ++ bar: 2, // indent 8 more ++ foobar: [ // indent 8 more ++ 1, // indent 8 more ++ 2, // indent 16 more ++ 3 // indent 16 more ++ ], ++ callback: function(){ // indent 8 more ++ return true; // indent 8 more ++ } // indent 8 more ++ }, options||{})); ++ } ++ })(jQuery); ++ JSEND ++ +*** ../vim-7.3.255/src/version.c 2011-07-20 15:04:52.000000000 +0200 +--- src/version.c 2011-07-20 15:08:13.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 256, + /**/ + +-- +Not too long ago, a keyboard was something to make music with... + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.257 b/source/ap/vim/patches/7.3.257 new file mode 100644 index 00000000..f6292bf8 --- /dev/null +++ b/source/ap/vim/patches/7.3.257 @@ -0,0 +1,97 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.257 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.257 +Problem: Not all completions are available to user commands. +Solution: Add "color", "compiler", "file_in_path" and "locale". (Dominique + Pelle) +Files: src/ex_docmd.c, runtime/doc/map.txt + + +*** ../vim-7.3.256/src/ex_docmd.c 2011-07-20 15:04:52.000000000 +0200 +--- src/ex_docmd.c 2011-07-20 16:10:28.000000000 +0200 +*************** +*** 5297,5303 **** +--- 5297,5305 ---- + { + {EXPAND_AUGROUP, "augroup"}, + {EXPAND_BUFFERS, "buffer"}, ++ {EXPAND_COLORS, "color"}, + {EXPAND_COMMANDS, "command"}, ++ {EXPAND_COMPILER, "compiler"}, + #if defined(FEAT_CSCOPE) + {EXPAND_CSCOPE, "cscope"}, + #endif +*************** +*** 5310,5319 **** +--- 5312,5326 ---- + {EXPAND_EVENTS, "event"}, + {EXPAND_EXPRESSION, "expression"}, + {EXPAND_FILES, "file"}, ++ {EXPAND_FILES_IN_PATH, "file_in_path"}, + {EXPAND_FILETYPE, "filetype"}, + {EXPAND_FUNCTIONS, "function"}, + {EXPAND_HELP, "help"}, + {EXPAND_HIGHLIGHT, "highlight"}, ++ #if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \ ++ && (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE)) ++ {EXPAND_LOCALES, "locale"}, ++ #endif + {EXPAND_MAPPINGS, "mapping"}, + {EXPAND_MENUS, "menu"}, + {EXPAND_OWNSYNTAX, "syntax"}, +*** ../vim-7.3.256/runtime/doc/map.txt 2011-05-19 17:25:36.000000000 +0200 +--- runtime/doc/map.txt 2011-07-20 16:10:28.000000000 +0200 +*************** +*** 1202,1221 **** +--- 1211,1236 ---- + + -complete=augroup autocmd groups + -complete=buffer buffer names ++ -complete=color color schemes + -complete=command Ex command (and arguments) ++ -complete=compiler compilers ++ -complete=cscope |:cscope| suboptions + -complete=dir directory names + -complete=environment environment variable names + -complete=event autocommand events + -complete=expression Vim expression + -complete=file file and directory names ++ -complete=file_in_path file and directory names in |'path'| + -complete=filetype filetype names |'filetype'| + -complete=function function name + -complete=help help subjects + -complete=highlight highlight groups ++ -complete=locale locale names (as output of locale -a) + -complete=mapping mapping name + -complete=menu menus + -complete=option options + -complete=shellcmd Shell command ++ -complete=sign |:sign| suboptions + -complete=syntax syntax file names |'syntax'| + -complete=tag tags + -complete=tag_listfiles tags, file names are shown when CTRL-D is hit +*** ../vim-7.3.256/src/version.c 2011-07-20 15:09:38.000000000 +0200 +--- src/version.c 2011-07-20 16:30:31.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 257, + /**/ + +-- +I have to exercise early in the morning before my brain +figures out what I'm doing. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.258 b/source/ap/vim/patches/7.3.258 new file mode 100644 index 00000000..277cbe77 --- /dev/null +++ b/source/ap/vim/patches/7.3.258 @@ -0,0 +1,70 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.258 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.258 +Problem: MS-Windows: The edit with existing vim context menu entries can be + unwanted. +Solution: Let a registry entry disable them. (Jerome Vuarand) +Files: src/GvimExt/gvimext.cpp + + +*** ../vim-7.3.257/src/GvimExt/gvimext.cpp 2010-08-15 21:57:29.000000000 +0200 +--- src/GvimExt/gvimext.cpp 2011-07-20 16:48:09.000000000 +0200 +*************** +*** 586,593 **** + + // Initialize m_cntOfHWnd to 0 + m_cntOfHWnd = 0; +! // Retrieve all the vim instances +! EnumWindows(EnumWindowsProc, (LPARAM)this); + + if (cbFiles > 1) + { +--- 586,608 ---- + + // Initialize m_cntOfHWnd to 0 + m_cntOfHWnd = 0; +! +! HKEY keyhandle; +! bool showExisting = true; +! +! // Check whether "Edit with existing Vim" entries are disabled. +! if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Vim\\Gvim", 0, +! KEY_READ, &keyhandle) == ERROR_SUCCESS) +! { +! if (RegQueryValueEx(keyhandle, "DisableEditWithExisting", 0, NULL, +! NULL, NULL) == ERROR_SUCCESS) +! showExisting = false; +! RegCloseKey(keyhandle); +! } +! +! // Retrieve all the vim instances, unless disabled. +! if (showExisting) +! EnumWindows(EnumWindowsProc, (LPARAM)this); + + if (cbFiles > 1) + { +*** ../vim-7.3.257/src/version.c 2011-07-20 16:36:35.000000000 +0200 +--- src/version.c 2011-07-20 16:54:34.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 258, + /**/ + +-- +What the word 'politics' means: 'Poli' in Latin meaning 'many' and 'tics' +meaning 'bloodsucking creatures'. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.259 b/source/ap/vim/patches/7.3.259 new file mode 100644 index 00000000..91f9dfa1 --- /dev/null +++ b/source/ap/vim/patches/7.3.259 @@ -0,0 +1,503 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.259 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.259 +Problem: Equivalence classes only work for latin characters. +Solution: Add the Unicode equivalence characters. (Dominique Pelle) +Files: runtime/doc/pattern.txt, src/regexp.c, src/testdir/test44.in, + src/testdir/test44.ok + + +*** ../vim-7.3.258/runtime/doc/pattern.txt 2010-08-15 21:57:14.000000000 +0200 +--- runtime/doc/pattern.txt 2011-07-20 17:44:03.000000000 +0200 +*************** +*** 1027,1037 **** + These items only work for 8-bit characters. + */[[=* *[==]* + - An equivalence class. This means that characters are matched that +! have almost the same meaning, e.g., when ignoring accents. The form +! is: + [=a=] +- Currently this is only implemented for latin1. Also works for the +- latin1 characters in utf-8 and latin9. + */[[.* *[..]* + - A collation element. This currently simply accepts a single + character in the form: +--- 1036,1044 ---- + These items only work for 8-bit characters. + */[[=* *[==]* + - An equivalence class. This means that characters are matched that +! have almost the same meaning, e.g., when ignoring accents. This +! only works for Unicode, latin1 and latin9. The form is: + [=a=] + */[[.* *[..]* + - A collation element. This currently simply accepts a single + character in the form: +*** ../vim-7.3.258/src/regexp.c 2011-06-19 04:31:54.000000000 +0200 +--- src/regexp.c 2011-07-20 17:56:52.000000000 +0200 +*************** +*** 666,673 **** +--- 666,677 ---- + static void regc __ARGS((int b)); + #ifdef FEAT_MBYTE + static void regmbc __ARGS((int c)); ++ # define REGMBC(x) regmbc(x); ++ # define CASEMBC(x) case x: + #else + # define regmbc(c) regc(c) ++ # define REGMBC(x) ++ # define CASEMBC(x) + #endif + static void reginsert __ARGS((int, char_u *)); + static void reginsert_limits __ARGS((int, long, long, char_u *)); +*************** +*** 787,854 **** + switch (c) + { + case 'A': case '\300': case '\301': case '\302': + case '\303': case '\304': case '\305': + regmbc('A'); regmbc('\300'); regmbc('\301'); + regmbc('\302'); regmbc('\303'); regmbc('\304'); + regmbc('\305'); + return; + case 'C': case '\307': + regmbc('C'); regmbc('\307'); + return; + case 'E': case '\310': case '\311': case '\312': case '\313': + regmbc('E'); regmbc('\310'); regmbc('\311'); + regmbc('\312'); regmbc('\313'); + return; + case 'I': case '\314': case '\315': case '\316': case '\317': + regmbc('I'); regmbc('\314'); regmbc('\315'); + regmbc('\316'); regmbc('\317'); + return; + case 'N': case '\321': + regmbc('N'); regmbc('\321'); + return; + case 'O': case '\322': case '\323': case '\324': case '\325': +! case '\326': + regmbc('O'); regmbc('\322'); regmbc('\323'); + regmbc('\324'); regmbc('\325'); regmbc('\326'); + return; + case 'U': case '\331': case '\332': case '\333': case '\334': + regmbc('U'); regmbc('\331'); regmbc('\332'); + regmbc('\333'); regmbc('\334'); + return; + case 'Y': case '\335': + regmbc('Y'); regmbc('\335'); + return; + case 'a': case '\340': case '\341': case '\342': + case '\343': case '\344': case '\345': + regmbc('a'); regmbc('\340'); regmbc('\341'); + regmbc('\342'); regmbc('\343'); regmbc('\344'); + regmbc('\345'); + return; + case 'c': case '\347': + regmbc('c'); regmbc('\347'); + return; + case 'e': case '\350': case '\351': case '\352': case '\353': + regmbc('e'); regmbc('\350'); regmbc('\351'); + regmbc('\352'); regmbc('\353'); + return; + case 'i': case '\354': case '\355': case '\356': case '\357': + regmbc('i'); regmbc('\354'); regmbc('\355'); + regmbc('\356'); regmbc('\357'); + return; + case 'n': case '\361': + regmbc('n'); regmbc('\361'); + return; + case 'o': case '\362': case '\363': case '\364': case '\365': +! case '\366': + regmbc('o'); regmbc('\362'); regmbc('\363'); + regmbc('\364'); regmbc('\365'); regmbc('\366'); + return; + case 'u': case '\371': case '\372': case '\373': case '\374': + regmbc('u'); regmbc('\371'); regmbc('\372'); + regmbc('\373'); regmbc('\374'); + return; + case 'y': case '\375': case '\377': + regmbc('y'); regmbc('\375'); regmbc('\377'); + return; + } + #endif +--- 791,1085 ---- + switch (c) + { + case 'A': case '\300': case '\301': case '\302': ++ CASEMBC(0x100) CASEMBC(0x102) CASEMBC(0x104) CASEMBC(0x1cd) ++ CASEMBC(0x1de) CASEMBC(0x1e0) CASEMBC(0x1ea2) + case '\303': case '\304': case '\305': + regmbc('A'); regmbc('\300'); regmbc('\301'); + regmbc('\302'); regmbc('\303'); regmbc('\304'); + regmbc('\305'); ++ REGMBC(0x100) REGMBC(0x102) REGMBC(0x104) ++ REGMBC(0x1cd) REGMBC(0x1de) REGMBC(0x1e0) ++ REGMBC(0x1ea2) ++ return; ++ case 'B': CASEMBC(0x1e02) CASEMBC(0x1e06) ++ regmbc('B'); REGMBC(0x1e02) REGMBC(0x1e06) + return; + case 'C': case '\307': ++ CASEMBC(0x106) CASEMBC(0x108) CASEMBC(0x10a) CASEMBC(0x10c) + regmbc('C'); regmbc('\307'); ++ REGMBC(0x106) REGMBC(0x108) REGMBC(0x10a) ++ REGMBC(0x10c) ++ return; ++ case 'D': CASEMBC(0x10e) CASEMBC(0x110) CASEMBC(0x1e0a) ++ CASEMBC(0x1e0e) CASEMBC(0x1e10) ++ regmbc('D'); REGMBC(0x10e) REGMBC(0x110) ++ REGMBC(0x1e0a) REGMBC(0x1e0e) REGMBC(0x1e10) + return; + case 'E': case '\310': case '\311': case '\312': case '\313': ++ CASEMBC(0x112) CASEMBC(0x114) CASEMBC(0x116) CASEMBC(0x118) ++ CASEMBC(0x11a) CASEMBC(0x1eba) CASEMBC(0x1ebc) + regmbc('E'); regmbc('\310'); regmbc('\311'); + regmbc('\312'); regmbc('\313'); ++ REGMBC(0x112) REGMBC(0x114) REGMBC(0x116) ++ REGMBC(0x118) REGMBC(0x11a) REGMBC(0x1eba) ++ REGMBC(0x1ebc) ++ return; ++ case 'F': CASEMBC(0x1e1e) ++ regmbc('F'); REGMBC(0x1e1e) ++ return; ++ case 'G': CASEMBC(0x11c) CASEMBC(0x11e) CASEMBC(0x120) ++ CASEMBC(0x122) CASEMBC(0x1e4) CASEMBC(0x1e6) CASEMBC(0x1f4) ++ CASEMBC(0x1e20) ++ regmbc('G'); REGMBC(0x11c) REGMBC(0x11e) ++ REGMBC(0x120) REGMBC(0x122) REGMBC(0x1e4) ++ REGMBC(0x1e6) REGMBC(0x1f4) REGMBC(0x1e20) ++ return; ++ case 'H': CASEMBC(0x124) CASEMBC(0x126) CASEMBC(0x1e22) ++ CASEMBC(0x1e26) CASEMBC(0x1e28) ++ regmbc('H'); REGMBC(0x124) REGMBC(0x126) ++ REGMBC(0x1e22) REGMBC(0x1e26) REGMBC(0x1e28) + return; + case 'I': case '\314': case '\315': case '\316': case '\317': ++ CASEMBC(0x128) CASEMBC(0x12a) CASEMBC(0x12c) CASEMBC(0x12e) ++ CASEMBC(0x130) CASEMBC(0x1cf) CASEMBC(0x1ec8) + regmbc('I'); regmbc('\314'); regmbc('\315'); + regmbc('\316'); regmbc('\317'); ++ REGMBC(0x128) REGMBC(0x12a) REGMBC(0x12c) ++ REGMBC(0x12e) REGMBC(0x130) REGMBC(0x1cf) ++ REGMBC(0x1ec8) ++ return; ++ case 'J': CASEMBC(0x134) ++ regmbc('J'); REGMBC(0x134) ++ return; ++ case 'K': CASEMBC(0x136) CASEMBC(0x1e8) CASEMBC(0x1e30) ++ CASEMBC(0x1e34) ++ regmbc('K'); REGMBC(0x136) REGMBC(0x1e8) ++ REGMBC(0x1e30) REGMBC(0x1e34) ++ return; ++ case 'L': CASEMBC(0x139) CASEMBC(0x13b) CASEMBC(0x13d) ++ CASEMBC(0x13f) CASEMBC(0x141) CASEMBC(0x1e3a) ++ regmbc('L'); REGMBC(0x139) REGMBC(0x13b) ++ REGMBC(0x13d) REGMBC(0x13f) REGMBC(0x141) ++ REGMBC(0x1e3a) ++ return; ++ case 'M': CASEMBC(0x1e3e) CASEMBC(0x1e40) ++ regmbc('M'); REGMBC(0x1e3e) REGMBC(0x1e40) + return; + case 'N': case '\321': ++ CASEMBC(0x143) CASEMBC(0x145) CASEMBC(0x147) CASEMBC(0x1e44) ++ CASEMBC(0x1e48) + regmbc('N'); regmbc('\321'); ++ REGMBC(0x143) REGMBC(0x145) REGMBC(0x147) ++ REGMBC(0x1e44) REGMBC(0x1e48) + return; + case 'O': case '\322': case '\323': case '\324': case '\325': +! case '\326': case '\330': +! CASEMBC(0x14c) CASEMBC(0x14e) CASEMBC(0x150) CASEMBC(0x1a0) +! CASEMBC(0x1d1) CASEMBC(0x1ea) CASEMBC(0x1ec) CASEMBC(0x1ece) + regmbc('O'); regmbc('\322'); regmbc('\323'); + regmbc('\324'); regmbc('\325'); regmbc('\326'); ++ regmbc('\330'); ++ REGMBC(0x14c) REGMBC(0x14e) REGMBC(0x150) ++ REGMBC(0x1a0) REGMBC(0x1d1) REGMBC(0x1ea) ++ REGMBC(0x1ec) REGMBC(0x1ece) ++ return; ++ case 'P': case 0x1e54: case 0x1e56: ++ regmbc('P'); REGMBC(0x1e54) REGMBC(0x1e56) ++ return; ++ case 'R': CASEMBC(0x154) CASEMBC(0x156) CASEMBC(0x158) ++ CASEMBC(0x1e58) CASEMBC(0x1e5e) ++ regmbc('R'); REGMBC(0x154) REGMBC(0x156) REGMBC(0x158) ++ REGMBC(0x1e58) REGMBC(0x1e5e) ++ return; ++ case 'S': CASEMBC(0x15a) CASEMBC(0x15c) CASEMBC(0x15e) ++ CASEMBC(0x160) CASEMBC(0x1e60) ++ regmbc('S'); REGMBC(0x15a) REGMBC(0x15c) ++ REGMBC(0x15e) REGMBC(0x160) REGMBC(0x1e60) ++ return; ++ case 'T': CASEMBC(0x162) CASEMBC(0x164) CASEMBC(0x166) ++ CASEMBC(0x1e6a) CASEMBC(0x1e6e) ++ regmbc('T'); REGMBC(0x162) REGMBC(0x164) ++ REGMBC(0x166) REGMBC(0x1e6a) REGMBC(0x1e6e) + return; + case 'U': case '\331': case '\332': case '\333': case '\334': ++ CASEMBC(0x168) CASEMBC(0x16a) CASEMBC(0x16c) CASEMBC(0x16e) ++ CASEMBC(0x170) CASEMBC(0x172) CASEMBC(0x1af) CASEMBC(0x1d3) ++ CASEMBC(0x1ee6) + regmbc('U'); regmbc('\331'); regmbc('\332'); + regmbc('\333'); regmbc('\334'); ++ REGMBC(0x168) REGMBC(0x16a) REGMBC(0x16c) ++ REGMBC(0x16e) REGMBC(0x170) REGMBC(0x172) ++ REGMBC(0x1af) REGMBC(0x1d3) REGMBC(0x1ee6) ++ return; ++ case 'V': CASEMBC(0x1e7c) ++ regmbc('V'); REGMBC(0x1e7c) ++ return; ++ case 'W': CASEMBC(0x174) CASEMBC(0x1e80) CASEMBC(0x1e82) ++ CASEMBC(0x1e84) CASEMBC(0x1e86) ++ regmbc('W'); REGMBC(0x174) REGMBC(0x1e80) ++ REGMBC(0x1e82) REGMBC(0x1e84) REGMBC(0x1e86) ++ return; ++ case 'X': CASEMBC(0x1e8a) CASEMBC(0x1e8c) ++ regmbc('X'); REGMBC(0x1e8a) REGMBC(0x1e8c) + return; + case 'Y': case '\335': ++ CASEMBC(0x176) CASEMBC(0x178) CASEMBC(0x1e8e) CASEMBC(0x1ef2) ++ CASEMBC(0x1ef6) CASEMBC(0x1ef8) + regmbc('Y'); regmbc('\335'); ++ REGMBC(0x176) REGMBC(0x178) REGMBC(0x1e8e) ++ REGMBC(0x1ef2) REGMBC(0x1ef6) REGMBC(0x1ef8) ++ return; ++ case 'Z': CASEMBC(0x179) CASEMBC(0x17b) CASEMBC(0x17d) ++ CASEMBC(0x1b5) CASEMBC(0x1e90) CASEMBC(0x1e94) ++ regmbc('Z'); REGMBC(0x179) REGMBC(0x17b) ++ REGMBC(0x17d) REGMBC(0x1b5) REGMBC(0x1e90) ++ REGMBC(0x1e94) + return; + case 'a': case '\340': case '\341': case '\342': + case '\343': case '\344': case '\345': ++ CASEMBC(0x101) CASEMBC(0x103) CASEMBC(0x105) CASEMBC(0x1ce) ++ CASEMBC(0x1df) CASEMBC(0x1e1) CASEMBC(0x1ea3) + regmbc('a'); regmbc('\340'); regmbc('\341'); + regmbc('\342'); regmbc('\343'); regmbc('\344'); + regmbc('\345'); ++ REGMBC(0x101) REGMBC(0x103) REGMBC(0x105) ++ REGMBC(0x1ce) REGMBC(0x1df) REGMBC(0x1e1) ++ REGMBC(0x1ea3) ++ return; ++ case 'b': CASEMBC(0x1e03) CASEMBC(0x1e07) ++ regmbc('b'); REGMBC(0x1e03) REGMBC(0x1e07) + return; + case 'c': case '\347': ++ CASEMBC(0x107) CASEMBC(0x109) CASEMBC(0x10b) CASEMBC(0x10d) + regmbc('c'); regmbc('\347'); ++ REGMBC(0x107) REGMBC(0x109) REGMBC(0x10b) ++ REGMBC(0x10d) ++ return; ++ case 'd': CASEMBC(0x10f) CASEMBC(0x111) CASEMBC(0x1d0b) ++ CASEMBC(0x1e11) ++ regmbc('d'); REGMBC(0x10f) REGMBC(0x111) ++ REGMBC(0x1e0b) REGMBC(0x01e0f) REGMBC(0x1e11) + return; + case 'e': case '\350': case '\351': case '\352': case '\353': ++ CASEMBC(0x113) CASEMBC(0x115) CASEMBC(0x117) CASEMBC(0x119) ++ CASEMBC(0x11b) CASEMBC(0x1ebb) CASEMBC(0x1ebd) + regmbc('e'); regmbc('\350'); regmbc('\351'); + regmbc('\352'); regmbc('\353'); ++ REGMBC(0x113) REGMBC(0x115) REGMBC(0x117) ++ REGMBC(0x119) REGMBC(0x11b) REGMBC(0x1ebb) ++ REGMBC(0x1ebd) ++ return; ++ case 'f': CASEMBC(0x1e1f) ++ regmbc('f'); REGMBC(0x1e1f) ++ return; ++ case 'g': CASEMBC(0x11d) CASEMBC(0x11f) CASEMBC(0x121) ++ CASEMBC(0x123) CASEMBC(0x1e5) CASEMBC(0x1e7) CASEMBC(0x1f5) ++ CASEMBC(0x1e21) ++ regmbc('g'); REGMBC(0x11d) REGMBC(0x11f) ++ REGMBC(0x121) REGMBC(0x123) REGMBC(0x1e5) ++ REGMBC(0x1e7) REGMBC(0x1f5) REGMBC(0x1e21) ++ return; ++ case 'h': CASEMBC(0x125) CASEMBC(0x127) CASEMBC(0x1e23) ++ CASEMBC(0x1e27) CASEMBC(0x1e29) CASEMBC(0x1e96) ++ regmbc('h'); REGMBC(0x125) REGMBC(0x127) ++ REGMBC(0x1e23) REGMBC(0x1e27) REGMBC(0x1e29) ++ REGMBC(0x1e96) + return; + case 'i': case '\354': case '\355': case '\356': case '\357': ++ CASEMBC(0x129) CASEMBC(0x12b) CASEMBC(0x12d) CASEMBC(0x12f) ++ CASEMBC(0x1d0) CASEMBC(0x1ec9) + regmbc('i'); regmbc('\354'); regmbc('\355'); + regmbc('\356'); regmbc('\357'); ++ REGMBC(0x129) REGMBC(0x12b) REGMBC(0x12d) ++ REGMBC(0x12f) REGMBC(0x1d0) REGMBC(0x1ec9) ++ return; ++ case 'j': CASEMBC(0x135) CASEMBC(0x1f0) ++ regmbc('j'); REGMBC(0x135) REGMBC(0x1f0) ++ return; ++ case 'k': CASEMBC(0x137) CASEMBC(0x1e9) CASEMBC(0x1e31) ++ CASEMBC(0x1e35) ++ regmbc('k'); REGMBC(0x137) REGMBC(0x1e9) ++ REGMBC(0x1e31) REGMBC(0x1e35) ++ return; ++ case 'l': CASEMBC(0x13a) CASEMBC(0x13c) CASEMBC(0x13e) ++ CASEMBC(0x140) CASEMBC(0x142) CASEMBC(0x1e3b) ++ regmbc('l'); REGMBC(0x13a) REGMBC(0x13c) ++ REGMBC(0x13e) REGMBC(0x140) REGMBC(0x142) ++ REGMBC(0x1e3b) ++ return; ++ case 'm': CASEMBC(0x1e3f) CASEMBC(0x1e41) ++ regmbc('m'); REGMBC(0x1e3f) REGMBC(0x1e41) + return; + case 'n': case '\361': ++ CASEMBC(0x144) CASEMBC(0x146) CASEMBC(0x148) CASEMBC(0x149) ++ CASEMBC(0x1e45) CASEMBC(0x1e49) + regmbc('n'); regmbc('\361'); ++ REGMBC(0x144) REGMBC(0x146) REGMBC(0x148) ++ REGMBC(0x149) REGMBC(0x1e45) REGMBC(0x1e49) + return; + case 'o': case '\362': case '\363': case '\364': case '\365': +! case '\366': case '\370': +! CASEMBC(0x14d) CASEMBC(0x14f) CASEMBC(0x151) CASEMBC(0x1a1) +! CASEMBC(0x1d2) CASEMBC(0x1eb) CASEMBC(0x1ed) CASEMBC(0x1ecf) + regmbc('o'); regmbc('\362'); regmbc('\363'); + regmbc('\364'); regmbc('\365'); regmbc('\366'); ++ regmbc('\370'); ++ REGMBC(0x14d) REGMBC(0x14f) REGMBC(0x151) ++ REGMBC(0x1a1) REGMBC(0x1d2) REGMBC(0x1eb) ++ REGMBC(0x1ed) REGMBC(0x1ecf) ++ return; ++ case 'p': CASEMBC(0x1e55) CASEMBC(0x1e57) ++ regmbc('p'); REGMBC(0x1e55) REGMBC(0x1e57) ++ return; ++ case 'r': CASEMBC(0x155) CASEMBC(0x157) CASEMBC(0x159) ++ CASEMBC(0x1e59) CASEMBC(0x1e5f) ++ regmbc('r'); REGMBC(0x155) REGMBC(0x157) REGMBC(0x159) ++ REGMBC(0x1e59) REGMBC(0x1e5f) ++ return; ++ case 's': CASEMBC(0x15b) CASEMBC(0x15d) CASEMBC(0x15f) ++ CASEMBC(0x161) CASEMBC(0x1e61) ++ regmbc('s'); REGMBC(0x15b) REGMBC(0x15d) ++ REGMBC(0x15f) REGMBC(0x161) REGMBC(0x1e61) ++ return; ++ case 't': CASEMBC(0x163) CASEMBC(0x165) CASEMBC(0x167) ++ CASEMBC(0x1e6b) CASEMBC(0x1e6f) CASEMBC(0x1e97) ++ regmbc('t'); REGMBC(0x163) REGMBC(0x165) REGMBC(0x167) ++ REGMBC(0x1e6b) REGMBC(0x1e6f) REGMBC(0x1e97) + return; + case 'u': case '\371': case '\372': case '\373': case '\374': ++ CASEMBC(0x169) CASEMBC(0x16b) CASEMBC(0x16d) CASEMBC(0x16f) ++ CASEMBC(0x171) CASEMBC(0x173) CASEMBC(0x1b0) CASEMBC(0x1d4) ++ CASEMBC(0x1ee7) + regmbc('u'); regmbc('\371'); regmbc('\372'); + regmbc('\373'); regmbc('\374'); ++ REGMBC(0x169) REGMBC(0x16b) REGMBC(0x16d) ++ REGMBC(0x16f) REGMBC(0x171) REGMBC(0x173) ++ REGMBC(0x1b0) REGMBC(0x1d4) REGMBC(0x1ee7) ++ return; ++ case 'v': CASEMBC(0x1e7d) ++ regmbc('v'); REGMBC(0x1e7d) ++ return; ++ case 'w': CASEMBC(0x175) CASEMBC(0x1e81) CASEMBC(0x1e83) ++ CASEMBC(0x1e85) CASEMBC(0x1e87) CASEMBC(0x1e98) ++ regmbc('w'); REGMBC(0x175) REGMBC(0x1e81) ++ REGMBC(0x1e83) REGMBC(0x1e85) REGMBC(0x1e87) ++ REGMBC(0x1e98) ++ return; ++ case 'x': CASEMBC(0x1e8b) CASEMBC(0x1e8d) ++ regmbc('x'); REGMBC(0x1e8b) REGMBC(0x1e8d) + return; + case 'y': case '\375': case '\377': ++ CASEMBC(0x177) CASEMBC(0x1e8f) CASEMBC(0x1e99) ++ CASEMBC(0x1ef3) CASEMBC(0x1ef7) CASEMBC(0x1ef9) + regmbc('y'); regmbc('\375'); regmbc('\377'); ++ REGMBC(0x177) REGMBC(0x1e8f) REGMBC(0x1e99) ++ REGMBC(0x1ef3) REGMBC(0x1ef7) REGMBC(0x1ef9) ++ return; ++ case 'z': CASEMBC(0x17a) CASEMBC(0x17c) CASEMBC(0x17e) ++ CASEMBC(0x1b6) CASEMBC(0x1e91) CASEMBC(0x1e95) ++ regmbc('z'); REGMBC(0x17a) REGMBC(0x17c) ++ REGMBC(0x17e) REGMBC(0x1b6) REGMBC(0x1e91) ++ REGMBC(0x1e95) + return; + } + #endif +*************** +*** 2468,2473 **** +--- 2699,2706 ---- + regmbc(c) + int c; + { ++ if (!has_mbyte && c > 0xff) ++ return; + if (regcode == JUST_CALC_SIZE) + regsize += (*mb_char2len)(c); + else +*************** +*** 2588,2594 **** + else + offset = (int)(val - scan); + /* When the offset uses more than 16 bits it can no longer fit in the two +! * bytes avaliable. Use a global flag to avoid having to check return + * values in too many places. */ + if (offset > 0xffff) + reg_toolong = TRUE; +--- 2821,2827 ---- + else + offset = (int)(val - scan); + /* When the offset uses more than 16 bits it can no longer fit in the two +! * bytes available. Use a global flag to avoid having to check return + * values in too many places. */ + if (offset > 0xffff) + reg_toolong = TRUE; +*** ../vim-7.3.258/src/testdir/test44.in 2010-08-15 21:57:29.000000000 +0200 +--- src/testdir/test44.in 2011-07-20 17:36:49.000000000 +0200 +*************** +*** 27,32 **** +--- 27,34 ---- + x/\%U12345678 + x/[\U1234abcd\u1234\uabcd] + x/\%d21879b ++ x/ [[=A=]]* [[=B=]]* [[=C=]]* [[=D=]]* [[=E=]]* [[=F=]]* [[=G=]]* [[=H=]]* [[=I=]]* [[=J=]]* [[=K=]]* [[=L=]]* [[=M=]]* [[=N=]]* [[=O=]]* [[=P=]]* [[=Q=]]* [[=R=]]* [[=S=]]* [[=T=]]* [[=U=]]* [[=V=]]* [[=W=]]* [[=X=]]* [[=Y=]]* [[=Z=]]*/e ++ x/ [[=a=]]* [[=b=]]* [[=c=]]* [[=d=]]* [[=e=]]* [[=f=]]* [[=g=]]* [[=h=]]* [[=i=]]* [[=j=]]* [[=k=]]* [[=l=]]* [[=m=]]* [[=n=]]* [[=o=]]* [[=p=]]* [[=q=]]* [[=r=]]* [[=s=]]* [[=t=]]* [[=u=]]* [[=v=]]* [[=w=]]* [[=x=]]* [[=y=]]* [[=z=]]*/e + x:?^1?,$w! test.out + :e! test.out + G:put =matchstr(\"×בגד\", \".\", 0, 2) " ב +*************** +*** 53,55 **** +--- 55,59 ---- + e ü’…™¸y + f ü’Š¯z + g aå•·bb ++ h AÀÃÂÃÄÅĀĂĄÇǞǠẢ BḂḆ CÇĆĈĊČ DÄŽÄḊḎḠEÈÉÊËĒĔĖĘĚẺẼ FḞ GĜĞĠĢǤǦǴḠ HĤĦḢḦḨ IÃŒÃÃŽÃĨĪĬĮİÇỈ JÄ´ KĶǨḰḴ LĹĻĽĿÅḺ MḾṀ NÑŃŅŇṄṈ OÒÓÔÕÖØŌŎÅƠǑǪǬỎ PṔṖ Q RŔŖŘṘṞ SŚŜŞŠṠ TŢŤŦṪṮ UÙÚÛÜŨŪŬŮŰŲƯǓỦ Vá¹¼ WŴẀẂẄẆ XẊẌ YÃŶŸẎỲỶỸ ZŹŻŽƵáºáº” ++ i aàáâãäåÄăąǎǟǡả bḃḇ cÃ§Ä‡Ä‰Ä‹Ä dÄđḋá¸á¸‘ eèéêëēĕėęěẻẽ fḟ gÄğġģǥǧǵḡ hĥħḣḧḩẖ iìíîïĩīĭįÇỉ jĵǰ kķǩḱḵ lĺļľŀłḻ mḿṠnñńņňʼnṅṉ oòóôõöøÅÅÅ‘Æ¡Ç’Ç«Ç­á» pṕṗ q rŕŗřṙṟ sÅ›Åşšṡ tţťŧṫṯẗ uùúûüũūŭůűųưǔủ vá¹½ wŵáºáºƒáº…ẇẘ xẋẠyýÿŷáºáº™á»³á»·á»¹ zźżžƶẑẕ +*** ../vim-7.3.258/src/testdir/test44.ok 2010-08-15 21:57:29.000000000 +0200 +--- src/testdir/test44.ok 2011-07-20 17:36:49.000000000 +0200 +*************** +*** 14,19 **** +--- 14,21 ---- + e y + f z + g abb ++ h AÀÃÂÃÄÅĀĂĄÇǞǠẢ BḂḆ CÇĆĈĊČ DÄŽÄḊḎḠEÈÉÊËĒĔĖĘĚẺẼ FḞ GĜĞĠĢǤǦǴḠ HĤĦḢḦḨ IÃŒÃÃŽÃĨĪĬĮİÇỈ JÄ´ KĶǨḰḴ LĹĻĽĿÅḺ MḾṀ NÑŃŅŇṄṈ OÒÓÔÕÖØŌŎÅƠǑǪǬỎ PṔṖ Q RŔŖŘṘṞ SŚŜŞŠṠ TŢŤŦṪṮ UÙÚÛÜŨŪŬŮŰŲƯǓỦ Vá¹¼ WŴẀẂẄẆ XẊẌ YÃŶŸẎỲỶỸ ZŹŻŽƵẠ++ i aàáâãäåÄăąǎǟǡả bḃḇ cÃ§Ä‡Ä‰Ä‹Ä dÄđḋá¸á¸‘ eèéêëēĕėęěẻẽ fḟ gÄğġģǥǧǵḡ hĥħḣḧḩẖ iìíîïĩīĭįÇỉ jĵǰ kķǩḱḵ lĺļľŀłḻ mḿṠnñńņňʼnṅṉ oòóôõöøÅÅÅ‘Æ¡Ç’Ç«Ç­á» pṕṗ q rŕŗřṙṟ sÅ›Åşšṡ tţťŧṫṯẗ uùúûüũūŭůűųưǔủ vá¹½ wŵáºáºƒáº…ẇẘ xẋẠyýÿŷáºáº™á»³á»·á»¹ zźżžƶẑ + ב + בג + × +*** ../vim-7.3.258/src/version.c 2011-07-20 17:27:17.000000000 +0200 +--- src/version.c 2011-07-20 17:38:32.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 259, + /**/ + +-- +Not too long ago, compress was something you did to garbage... + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.260 b/source/ap/vim/patches/7.3.260 new file mode 100644 index 00000000..ba9af57a --- /dev/null +++ b/source/ap/vim/patches/7.3.260 @@ -0,0 +1,69 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.260 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.260 +Problem: CursorHold triggers on an incomplete mapping. (Will Gray) +Solution: Don't trigger CursorHold when there is typeahead. +Files: src/fileio.c + + +*** ../vim-7.3.259/src/fileio.c 2011-05-19 17:25:36.000000000 +0200 +--- src/fileio.c 2011-07-20 18:22:16.000000000 +0200 +*************** +*** 9044,9050 **** + { + int state; + +! if (!did_cursorhold && has_cursorhold() && !Recording + #ifdef FEAT_INS_EXPAND + && !ins_compl_active() + #endif +--- 9044,9053 ---- + { + int state; + +! if (!did_cursorhold +! && has_cursorhold() +! && !Recording +! && typebuf.tb_len == 0 + #ifdef FEAT_INS_EXPAND + && !ins_compl_active() + #endif +*************** +*** 9935,9940 **** +--- 9938,9945 ---- + if ((c == ';' || c == '>') && match == FALSE) + { + *pattern = NUL; /* Terminate the string */ ++ /* TODO: match with 'filetype' of buffer that "fname" comes ++ * from. */ + match = mch_check_filetype(fname, type_start); + *pattern = c; /* Restore the terminator */ + type_start = pattern + 1; +*** ../vim-7.3.259/src/version.c 2011-07-20 17:58:14.000000000 +0200 +--- src/version.c 2011-07-20 18:25:15.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 260, + /**/ + +-- +LAUNCELOT: At last! A call! A cry of distress ... + (he draws his sword, and turns to CONCORDE) + Concorde! Brave, Concorde ... you shall not have died in vain! +CONCORDE: I'm not quite dead, sir ... + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.261 b/source/ap/vim/patches/7.3.261 new file mode 100644 index 00000000..4c03f6b5 --- /dev/null +++ b/source/ap/vim/patches/7.3.261 @@ -0,0 +1,53 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.261 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.261 +Problem: G++ error message errornously recognized as error. +Solution: Ignore "In file included from" line also when it ends in a colon. + (Fernando Castillo) +Files: src/option.h + + +*** ../vim-7.3.260/src/option.h 2011-06-26 05:36:07.000000000 +0200 +--- src/option.h 2011-07-27 13:44:08.000000000 +0200 +*************** +*** 33,39 **** + # ifdef EBCDIC + #define DFLT_EFM "%*[^ ] %*[^ ] %f:%l%*[ ]%m,%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory `%f',%X%*\\a[%*\\d]: Leaving directory `%f',%DMaking %*\\a in %f,%f|%l| %m" + # else +! #define DFLT_EFM "%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%-G%f:%l: (Each undeclared identifier is reported only once,%-G%f:%l: for each function it appears in.),%-GIn file included from %f:%l:%c,%-GIn file included from %f:%l,%-Gfrom %f:%l:%c,%-Gfrom %f:%l,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory `%f',%X%*\\a[%*\\d]: Leaving directory `%f',%D%*\\a: Entering directory `%f',%X%*\\a: Leaving directory `%f',%DMaking %*\\a in %f,%f|%l| %m" + # endif + # endif + # endif +--- 33,39 ---- + # ifdef EBCDIC + #define DFLT_EFM "%*[^ ] %*[^ ] %f:%l%*[ ]%m,%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory `%f',%X%*\\a[%*\\d]: Leaving directory `%f',%DMaking %*\\a in %f,%f|%l| %m" + # else +! #define DFLT_EFM "%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%-G%f:%l: (Each undeclared identifier is reported only once,%-G%f:%l: for each function it appears in.),%-GIn file included from %f:%l:%c:,%-GIn file included from %f:%l:%c,%-GIn file included from %f:%l,%-Gfrom %f:%l:%c,%-Gfrom %f:%l,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory `%f',%X%*\\a[%*\\d]: Leaving directory `%f',%D%*\\a: Entering directory `%f',%X%*\\a: Leaving directory `%f',%DMaking %*\\a in %f,%f|%l| %m" + # endif + # endif + # endif +*** ../vim-7.3.260/src/version.c 2011-07-20 18:29:33.000000000 +0200 +--- src/version.c 2011-07-27 13:46:23.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 261, + /**/ + +-- +Have you heard about the new Barbie doll? It's called Divorce +Barbie. It comes with all of Ken's stuff. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.262 b/source/ap/vim/patches/7.3.262 new file mode 100644 index 00000000..b3bd5cd8 --- /dev/null +++ b/source/ap/vim/patches/7.3.262 @@ -0,0 +1,1356 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.262 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.262 +Problem: Photon code style doesn't match Vim style. +Solution: Clean up some of it. (Elias Diem) +Files: src/gui_photon.c + + +*** ../vim-7.3.261/src/gui_photon.c 2011-01-17 20:08:03.000000000 +0100 +--- src/gui_photon.c 2011-07-27 14:07:02.000000000 +0200 +*************** +*** 32,40 **** + #endif + + #define ARRAY_LENGTH(a) (sizeof(a) / sizeof(a[0])) +! #define RGB(r,g,b) PgRGB(r,g,b) + +! #define EVENT_BUFFER_SIZE sizeof( PhEvent_t ) + 1000 + + /* Some defines for gui_mch_mousehide() */ + #define MOUSE_HIDE TRUE +--- 32,40 ---- + #endif + + #define ARRAY_LENGTH(a) (sizeof(a) / sizeof(a[0])) +! #define RGB(r, g, b) PgRGB(r, g, b) + +! #define EVENT_BUFFER_SIZE sizeof(PhEvent_t) + 1000 + + /* Some defines for gui_mch_mousehide() */ + #define MOUSE_HIDE TRUE +*************** +*** 206,258 **** + static PtCallbackF_t gui_ph_handle_menu_unrealized; + + #ifdef USE_PANEL_GROUP +! static void gui_ph_get_panelgroup_margins( short*, short*, short*, short* ); + #endif + + #ifdef FEAT_TOOLBAR +! static PhImage_t *gui_ph_toolbar_find_icon( vimmenu_T *menu ); + #endif + +! static void gui_ph_draw_start( void ); +! static void gui_ph_draw_end( void ); + + /* Set the text for the balloon */ +! static PtWidget_t * gui_ph_show_tooltip( PtWidget_t *window, + PtWidget_t *widget, + int position, + char *text, + char *font, + PgColor_t fill_color, +! PgColor_t text_color ); + + /****************************************************************************/ + +! static PtWidget_t * gui_ph_show_tooltip( PtWidget_t *window, + PtWidget_t *widget, + int position, + char *text, + char *font, + PgColor_t fill_color, +! PgColor_t text_color ) + { + PtArg_t arg; + vimmenu_T *menu; + char_u *tooltip; + +! PtSetArg( &arg, Pt_ARG_POINTER, &menu, 0 ); +! PtGetResources( widget, 1, &arg ); + + /* Override the text and position */ + + tooltip = text; +! if( menu != NULL ) + { + int index = MENU_INDEX_TIP; +! if( menu->strings[ index ] != NULL ) + tooltip = menu->strings[ index ]; + } + +! return( PtInflateBalloon( + window, + widget, + /* Don't put the balloon at the bottom, +--- 206,258 ---- + static PtCallbackF_t gui_ph_handle_menu_unrealized; + + #ifdef USE_PANEL_GROUP +! static void gui_ph_get_panelgroup_margins(short*, short*, short*, short*); + #endif + + #ifdef FEAT_TOOLBAR +! static PhImage_t *gui_ph_toolbar_find_icon(vimmenu_T *menu); + #endif + +! static void gui_ph_draw_start(void); +! static void gui_ph_draw_end(void); + + /* Set the text for the balloon */ +! static PtWidget_t * gui_ph_show_tooltip(PtWidget_t *window, + PtWidget_t *widget, + int position, + char *text, + char *font, + PgColor_t fill_color, +! PgColor_t text_color); + + /****************************************************************************/ + +! static PtWidget_t * gui_ph_show_tooltip(PtWidget_t *window, + PtWidget_t *widget, + int position, + char *text, + char *font, + PgColor_t fill_color, +! PgColor_t text_color) + { + PtArg_t arg; + vimmenu_T *menu; + char_u *tooltip; + +! PtSetArg(&arg, Pt_ARG_POINTER, &menu, 0); +! PtGetResources(widget, 1, &arg); + + /* Override the text and position */ + + tooltip = text; +! if (menu != NULL) + { + int index = MENU_INDEX_TIP; +! if (menu->strings[ index ] != NULL) + tooltip = menu->strings[ index ]; + } + +! return PtInflateBalloon( + window, + widget, + /* Don't put the balloon at the bottom, +*************** +*** 261,285 **** + tooltip, + font, + fill_color, +! text_color ) ); + } + + static void +! gui_ph_resize_container( void ) + { + PhArea_t area; + +! PtWidgetArea( gui.vimWindow, &area ); +! PtWidgetPos ( gui.vimContainer, &area.pos ); + +! PtSetResource( gui.vimContainer, Pt_ARG_AREA, &area, 0 ); + } + + static int + gui_ph_handle_menu_resize( + PtWidget_t *widget, + void *other, +! PtCallbackInfo_t *info ) + { + PtContainerCallback_t *sizes = info->cbdata; + PtWidget_t *container; +--- 261,285 ---- + tooltip, + font, + fill_color, +! text_color); + } + + static void +! gui_ph_resize_container(void) + { + PhArea_t area; + +! PtWidgetArea(gui.vimWindow, &area); +! PtWidgetPos (gui.vimContainer, &area.pos); + +! PtSetResource(gui.vimContainer, Pt_ARG_AREA, &area, 0); + } + + static int + gui_ph_handle_menu_resize( + PtWidget_t *widget, + void *other, +! PtCallbackInfo_t *info) + { + PtContainerCallback_t *sizes = info->cbdata; + PtWidget_t *container; +*************** +*** 291,297 **** + /* Because vim treats the toolbar and menubar separately, + * and here they're lumped together into a PtToolbarGroup, + * we only need either menu_height or toolbar_height set at once */ +! if( gui.menu_is_active ) + { + gui.menu_height = height; + gui.toolbar_height = 0; +--- 291,297 ---- + /* Because vim treats the toolbar and menubar separately, + * and here they're lumped together into a PtToolbarGroup, + * we only need either menu_height or toolbar_height set at once */ +! if (gui.menu_is_active) + { + gui.menu_height = height; + gui.toolbar_height = 0; +*************** +*** 310,325 **** + container = gui.vimContainer; + #endif + +! PtSetResource( container, Pt_ARG_POS, &below_menu, 0 ); + + gui_ph_resize_container(); + + #ifdef USE_PANEL_GROUP + gui_ph_get_panelgroup_margins( + &pg_margin_top, &pg_margin_bottom, +! &pg_margin_left, &pg_margin_right ); + #endif +! return( Pt_CONTINUE ); + } + + /* +--- 310,325 ---- + container = gui.vimContainer; + #endif + +! PtSetResource(container, Pt_ARG_POS, &below_menu, 0); + + gui_ph_resize_container(); + + #ifdef USE_PANEL_GROUP + gui_ph_get_panelgroup_margins( + &pg_margin_top, &pg_margin_bottom, +! &pg_margin_left, &pg_margin_right); + #endif +! return Pt_CONTINUE; + } + + /* +*************** +*** 330,352 **** + gui_ph_handle_timer_cursor( + PtWidget_t *widget, + void *data, +! PtCallbackInfo_t *info ) + { +! if( blink_state == BLINK_ON ) + { + gui_undraw_cursor(); + blink_state = BLINK_OFF; +! PtSetResource( gui_ph_timer_cursor, Pt_ARG_TIMER_INITIAL, +! blink_offtime, 0 ); + } + else + { + gui_update_cursor(TRUE, FALSE); + blink_state = BLINK_ON; +! PtSetResource( gui_ph_timer_cursor, Pt_ARG_TIMER_INITIAL, +! blink_ontime, 0 ); + } +! return( Pt_CONTINUE ); + } + + static int +--- 330,352 ---- + gui_ph_handle_timer_cursor( + PtWidget_t *widget, + void *data, +! PtCallbackInfo_t *info) + { +! if (blink_state == BLINK_ON) + { + gui_undraw_cursor(); + blink_state = BLINK_OFF; +! PtSetResource(gui_ph_timer_cursor, Pt_ARG_TIMER_INITIAL, +! blink_offtime, 0); + } + else + { + gui_update_cursor(TRUE, FALSE); + blink_state = BLINK_ON; +! PtSetResource(gui_ph_timer_cursor, Pt_ARG_TIMER_INITIAL, +! blink_ontime, 0); + } +! return Pt_CONTINUE; + } + + static int +*************** +*** 354,360 **** + { + is_timeout = TRUE; + +! return( Pt_CONTINUE ); + } + + static int +--- 354,360 ---- + { + is_timeout = TRUE; + +! return Pt_CONTINUE; + } + + static int +*************** +*** 402,408 **** + break; + } + +! return( Pt_CONTINUE ); + } + + static int +--- 402,408 ---- + break; + } + +! return Pt_CONTINUE; + } + + static int +*************** +*** 426,438 **** + + case Pt_SCROLL_SET: + /* FIXME: return straight away here? */ +! return( Pt_CONTINUE ); + break; + } + + gui_drag_scrollbar(sb, value, dragging); + } +! return( Pt_CONTINUE ); + } + + static int +--- 426,438 ---- + + case Pt_SCROLL_SET: + /* FIXME: return straight away here? */ +! return Pt_CONTINUE; + break; + } + + gui_drag_scrollbar(sb, value, dragging); + } +! return Pt_CONTINUE; + } + + static int +*************** +*** 453,459 **** + /* We're a good lil photon program, aren't we? yes we are, yeess wee arrr */ + if( key->key_flags & Pk_KF_Compose ) + { +! return( Pt_CONTINUE ); + } + + if( (key->key_flags & Pk_KF_Cap_Valid) && +--- 453,459 ---- + /* We're a good lil photon program, aren't we? yes we are, yeess wee arrr */ + if( key->key_flags & Pk_KF_Compose ) + { +! return Pt_CONTINUE; + } + + if( (key->key_flags & Pk_KF_Cap_Valid) && +*************** +*** 473,479 **** + gui_is_menu_shortcut( key->key_cap ) ) ) ) + { + /* Fallthrough and let photon look for the hotkey */ +! return( Pt_CONTINUE ); + } + #endif + +--- 473,479 ---- + gui_is_menu_shortcut( key->key_cap ) ) ) ) + { + /* Fallthrough and let photon look for the hotkey */ +! return Pt_CONTINUE; + } + #endif + +*************** +*** 544,550 **** + add_to_input_buf( string, len ); + } + +! return( Pt_CONSUME ); + } + len = 0; + #endif +--- 544,550 ---- + add_to_input_buf( string, len ); + } + +! return Pt_CONSUME; + } + len = 0; + #endif +*************** +*** 579,585 **** + } + else + { +! return( Pt_CONTINUE ); + } + } + else +--- 579,585 ---- + } + else + { +! return Pt_CONTINUE; + } + } + else +*************** +*** 622,632 **** + if( len > 0 ) + { + add_to_input_buf( string, len ); +! return( Pt_CONSUME ); + } + } + +! return( Pt_CONTINUE ); + } + + static int +--- 622,632 ---- + if( len > 0 ) + { + add_to_input_buf( string, len ); +! return Pt_CONSUME; + } + } + +! return Pt_CONTINUE; + } + + static int +*************** +*** 652,658 **** + if( info->event->type == Ph_EV_PTR_MOTION_NOBUTTON ) + { + gui_mouse_moved( mouse_x, mouse_y ); +! return( Pt_CONTINUE ); + } + + if( pointer->key_mods & Pk_KM_Shift ) +--- 652,658 ---- + if( info->event->type == Ph_EV_PTR_MOTION_NOBUTTON ) + { + gui_mouse_moved( mouse_x, mouse_y ); +! return Pt_CONTINUE; + } + + if( pointer->key_mods & Pk_KM_Shift ) +*************** +*** 702,708 **** + gui_send_mouse_event( button , mouse_x, mouse_y, repeated_click, modifiers ); + } + +! return( Pt_CONTINUE ); + } + + /* Handle a focus change of the PtRaw widget */ +--- 702,708 ---- + gui_send_mouse_event( button , mouse_x, mouse_y, repeated_click, modifiers ); + } + +! return Pt_CONTINUE; + } + + /* Handle a focus change of the PtRaw widget */ +*************** +*** 721,727 **** + PtAddEventHandler( gui.vimTextArea, Ph_EV_PTR_MOTION_NOBUTTON, + gui_ph_handle_mouse, NULL ); + } +! return( Pt_CONTINUE ); + } + + static void +--- 721,727 ---- + PtAddEventHandler( gui.vimTextArea, Ph_EV_PTR_MOTION_NOBUTTON, + gui_ph_handle_mouse, NULL ); + } +! return Pt_CONTINUE; + } + + static void +*************** +*** 793,799 **** + PtRealizeWidget( menu->submenu_id ); + } + +! return( Pt_CONTINUE ); + } + + /* This is used for pulldown/popup menus and also toolbar buttons */ +--- 793,799 ---- + PtRealizeWidget( menu->submenu_id ); + } + +! return Pt_CONTINUE; + } + + /* This is used for pulldown/popup menus and also toolbar buttons */ +*************** +*** 805,811 **** + vimmenu_T *menu = (vimmenu_T *) data; + gui_menu_cb( menu ); + } +! return( Pt_CONTINUE ); + } + + /* Stop focus from disappearing into the menubar... */ +--- 805,811 ---- + vimmenu_T *menu = (vimmenu_T *) data; + gui_menu_cb( menu ); + } +! return Pt_CONTINUE; + } + + /* Stop focus from disappearing into the menubar... */ +*************** +*** 816,822 **** + PtCallbackInfo_t *info ) + { + PtGiveFocus( gui.vimTextArea, NULL ); +! return( Pt_CONTINUE ); + } + + static int +--- 816,822 ---- + PtCallbackInfo_t *info ) + { + PtGiveFocus( gui.vimTextArea, NULL ); +! return Pt_CONTINUE; + } + + static int +*************** +*** 826,832 **** + PtCallbackInfo_t *info ) + { + gui_set_shellsize( FALSE, TRUE, RESIZE_BOTH ); +! return( Pt_CONTINUE ); + } + + /****************************************************************************/ +--- 826,832 ---- + PtCallbackInfo_t *info ) + { + gui_set_shellsize( FALSE, TRUE, RESIZE_BOTH ); +! return Pt_CONTINUE; + } + + /****************************************************************************/ +*************** +*** 878,884 **** + ( STRCMP( items->dname, name ) != 0 ) ) + items = items->next; + } +! return( items ); + } + + static void +--- 878,884 ---- + ( STRCMP( items->dname, name ) != 0 ) ) + items = items->next; + } +! return items; + } + + static void +*************** +*** 927,933 **** + gui_menu_cb( menu ); + } + } +! return( Pt_CONTINUE ); + } + + static void +--- 927,933 ---- + gui_menu_cb( menu ); + } + } +! return Pt_CONTINUE; + } + + static void +*************** +*** 974,983 **** + mark++; + + if( *mark == ')' ) +! return( TRUE); + } + } +! return( FALSE ); + } + + static void +--- 974,983 ---- + mark++; + + if( *mark == ')' ) +! return TRUE; + } + } +! return FALSE; + } + + static void +*************** +*** 1057,1063 **** + gui_ph_pg_remove_buffer( menu->dname ); + } + +! return( Pt_CONTINUE ); + } + #endif + +--- 1057,1063 ---- + gui_ph_pg_remove_buffer( menu->dname ); + } + +! return Pt_CONTINUE; + } + #endif + +*************** +*** 1071,1077 **** + PtContainerHold( gui.vimContainer ); + } + +! return( Pt_CONTINUE ); + } + + /****************************************************************************/ +--- 1071,1077 ---- + PtContainerHold( gui.vimContainer ); + } + +! return Pt_CONTINUE; + } + + /****************************************************************************/ +*************** +*** 1126,1132 **** + + gui.event_buffer = (PhEvent_t *) alloc( EVENT_BUFFER_SIZE ); + if( gui.event_buffer == NULL ) +! return( FAIL ); + + /* Get a translation so we can convert from ISO Latin-1 to UTF */ + charset_translate = PxTranslateSet( NULL, "latin1" ); +--- 1126,1132 ---- + + gui.event_buffer = (PhEvent_t *) alloc( EVENT_BUFFER_SIZE ); + if( gui.event_buffer == NULL ) +! return FAIL; + + /* Get a translation so we can convert from ISO Latin-1 to UTF */ + charset_translate = PxTranslateSet( NULL, "latin1" ); +*************** +*** 1141,1147 **** + PtSetArg( &args[ n++ ], Pt_ARG_DIM, &window_size, 0 ); + gui.vimWindow = PtCreateWidget( PtWindow, NULL, n, args ); + if( gui.vimWindow == NULL ) +! return( FAIL ); + + PtAddCallback( gui.vimWindow, Pt_CB_WINDOW, gui_ph_handle_window_cb, NULL ); + PtAddCallback( gui.vimWindow, Pt_CB_WINDOW_OPENING, +--- 1141,1147 ---- + PtSetArg( &args[ n++ ], Pt_ARG_DIM, &window_size, 0 ); + gui.vimWindow = PtCreateWidget( PtWindow, NULL, n, args ); + if( gui.vimWindow == NULL ) +! return FAIL; + + PtAddCallback( gui.vimWindow, Pt_CB_WINDOW, gui_ph_handle_window_cb, NULL ); + PtAddCallback( gui.vimWindow, Pt_CB_WINDOW_OPENING, +*************** +*** 1158,1164 **** + + gui.vimPanelGroup = PtCreateWidget( PtPanelGroup, gui.vimWindow, n, args ); + if( gui.vimPanelGroup == NULL ) +! return( FAIL ); + + PtAddCallback( gui.vimPanelGroup, Pt_CB_PG_PANEL_SWITCHING, + gui_ph_handle_pg_change, NULL ); +--- 1158,1164 ---- + + gui.vimPanelGroup = PtCreateWidget( PtPanelGroup, gui.vimWindow, n, args ); + if( gui.vimPanelGroup == NULL ) +! return FAIL; + + PtAddCallback( gui.vimPanelGroup, Pt_CB_PG_PANEL_SWITCHING, + gui_ph_handle_pg_change, NULL ); +*************** +*** 1172,1178 **** + + gui.vimContainer = PtCreateWidget( PtPane, gui.vimWindow, n, args ); + if( gui.vimContainer == NULL ) +! return( FAIL ); + + PtAddCallback( gui.vimContainer, Pt_CB_RESIZE, gui_ph_pane_resize, NULL ); + #endif +--- 1172,1178 ---- + + gui.vimContainer = PtCreateWidget( PtPane, gui.vimWindow, n, args ); + if( gui.vimContainer == NULL ) +! return FAIL; + + PtAddCallback( gui.vimContainer, Pt_CB_RESIZE, gui_ph_pane_resize, NULL ); + #endif +*************** +*** 1195,1201 **** + + gui.vimTextArea = PtCreateWidget( PtRaw, Pt_DFLT_PARENT, n, args ); + if( gui.vimTextArea == NULL) +! return( FAIL ); + + /* TODO: use PtAddEventHandlers instead? */ + /* Not using Ph_EV_BUT_REPEAT because vim wouldn't use it anyway */ +--- 1195,1201 ---- + + gui.vimTextArea = PtCreateWidget( PtRaw, Pt_DFLT_PARENT, n, args ); + if( gui.vimTextArea == NULL) +! return FAIL; + + /* TODO: use PtAddEventHandlers instead? */ + /* Not using Ph_EV_BUT_REPEAT because vim wouldn't use it anyway */ +*************** +*** 1220,1230 **** + */ + gui_ph_timer_cursor = PtCreateWidget( PtTimer, gui.vimWindow, 0, NULL ); + if( gui_ph_timer_cursor == NULL ) +! return( FAIL ); + + gui_ph_timer_timeout = PtCreateWidget( PtTimer, gui.vimWindow, 0, NULL ); + if( gui_ph_timer_timeout == NULL ) +! return( FAIL ); + + PtAddCallback( gui_ph_timer_cursor, Pt_CB_TIMER_ACTIVATE, + gui_ph_handle_timer_cursor, NULL); +--- 1220,1230 ---- + */ + gui_ph_timer_cursor = PtCreateWidget( PtTimer, gui.vimWindow, 0, NULL ); + if( gui_ph_timer_cursor == NULL ) +! return FAIL; + + gui_ph_timer_timeout = PtCreateWidget( PtTimer, gui.vimWindow, 0, NULL ); + if( gui_ph_timer_timeout == NULL ) +! return FAIL; + + PtAddCallback( gui_ph_timer_cursor, Pt_CB_TIMER_ACTIVATE, + gui_ph_handle_timer_cursor, NULL); +*************** +*** 1239,1245 **** + gui.vimToolBarGroup = PtCreateWidget( PtToolbarGroup, gui.vimWindow, + n, args ); + if( gui.vimToolBarGroup == NULL ) +! return( FAIL ); + + PtAddCallback( gui.vimToolBarGroup, Pt_CB_RESIZE, + gui_ph_handle_menu_resize, NULL ); +--- 1239,1245 ---- + gui.vimToolBarGroup = PtCreateWidget( PtToolbarGroup, gui.vimWindow, + n, args ); + if( gui.vimToolBarGroup == NULL ) +! return FAIL; + + PtAddCallback( gui.vimToolBarGroup, Pt_CB_RESIZE, + gui_ph_handle_menu_resize, NULL ); +*************** +*** 1254,1260 **** + } + gui.vimMenuBar = PtCreateWidget( PtMenuBar, gui.vimToolBarGroup, n, args ); + if( gui.vimMenuBar == NULL ) +! return( FAIL ); + + # ifdef FEAT_TOOLBAR + n = 0; +--- 1254,1260 ---- + } + gui.vimMenuBar = PtCreateWidget( PtMenuBar, gui.vimToolBarGroup, n, args ); + if( gui.vimMenuBar == NULL ) +! return FAIL; + + # ifdef FEAT_TOOLBAR + n = 0; +*************** +*** 1273,1279 **** + + gui.vimToolBar = PtCreateWidget( PtToolbar, gui.vimToolBarGroup, n, args ); + if( gui.vimToolBar == NULL ) +! return( FAIL ); + + /* + * Size for the toolbar is fetched in gui_mch_show_toolbar, after +--- 1273,1279 ---- + + gui.vimToolBar = PtCreateWidget( PtToolbar, gui.vimToolBarGroup, n, args ); + if( gui.vimToolBar == NULL ) +! return FAIL; + + /* + * Size for the toolbar is fetched in gui_mch_show_toolbar, after +*************** +*** 1284,1296 **** + + #endif + +! return( OK ); + } + + int + gui_mch_init_check(void) + { +! return( (is_photon_available == TRUE) ? OK : FAIL ); + } + + int +--- 1284,1296 ---- + + #endif + +! return OK; + } + + int + gui_mch_init_check(void) + { +! return (is_photon_available == TRUE) ? OK : FAIL; + } + + int +*************** +*** 1310,1316 **** + if (gui_win_x != -1 && gui_win_y != -1) + gui_mch_set_winpos(gui_win_x, gui_win_y); + +! return( (PtRealizeWidget( gui.vimWindow ) == 0) ? OK : FAIL ); + } + + void +--- 1310,1316 ---- + if (gui_win_x != -1 && gui_win_y != -1) + gui_mch_set_winpos(gui_win_x, gui_win_y); + +! return (PtRealizeWidget( gui.vimWindow ) == 0) ? OK : FAIL; + } + + void +*************** +*** 1336,1342 **** + exit_gui_mch_update( void *data ) + { + *(int *)data = FALSE; +! return( Pt_END ); + } + + void +--- 1336,1342 ---- + exit_gui_mch_update( void *data ) + { + *(int *)data = FALSE; +! return Pt_END; + } + + void +*************** +*** 1365,1374 **** + if( input_available() ) + { + PtSetResource( gui_ph_timer_timeout, Pt_ARG_TIMER_INITIAL, 0, 0 ); +! return( OK ); + } + else if( is_timeout == TRUE ) +! return( FAIL ); + } + } + +--- 1365,1374 ---- + if( input_available() ) + { + PtSetResource( gui_ph_timer_timeout, Pt_ARG_TIMER_INITIAL, 0, 0 ); +! return OK; + } + else if( is_timeout == TRUE ) +! return FAIL; + } + } + +*************** +*** 1446,1454 **** + vim_free( default_path ); + + if( file.ret == Pt_FSDIALOG_BTN1 ) +! return( vim_strsave( file.path ) ); + } +! return( NULL ); + } + #endif + +--- 1446,1454 ---- + vim_free( default_path ); + + if( file.ret == Pt_FSDIALOG_BTN1 ) +! return vim_strsave(file.path); + } +! return NULL; + } + #endif + +*************** +*** 1470,1476 **** + + PtModalUnblock( modal_ctrl, (void *) button ); + +! return( Pt_TRUE ); + } + + static int +--- 1470,1476 ---- + + PtModalUnblock( modal_ctrl, (void *) button ); + +! return Pt_TRUE; + } + + static int +*************** +*** 1478,1484 **** + { + if( info->reason_subtype == Pt_EDIT_ACTIVATE ) + gui_ph_dialog_close( 1, data ); +! return( Pt_CONTINUE ); + } + + static int +--- 1478,1484 ---- + { + if( info->reason_subtype == Pt_EDIT_ACTIVATE ) + gui_ph_dialog_close( 1, data ); +! return Pt_CONTINUE; + } + + static int +*************** +*** 1490,1498 **** + if( ( key->key_flags & Pk_KF_Cap_Valid ) && ( key->key_cap == Pk_Escape ) ) + { + gui_ph_dialog_close( 0, data ); +! return( Pt_CONSUME ); + } +! return( Pt_PROCESS ); + } + + int +--- 1490,1498 ---- + if( ( key->key_flags & Pk_KF_Cap_Valid ) && ( key->key_cap == Pk_Escape ) ) + { + gui_ph_dialog_close( 0, data ); +! return Pt_CONSUME; + } +! return Pt_PROCESS; + } + + int +*************** +*** 1519,1525 **** + button_count = len = i = 0; + + if( buttons == NULL || *buttons == NUL ) +! return( -1 ); + + /* There is one less separator than buttons, so bump up the button count */ + button_count = 1; +--- 1519,1525 ---- + button_count = len = i = 0; + + if( buttons == NULL || *buttons == NUL ) +! return -1; + + /* There is one less separator than buttons, so bump up the button count */ + button_count = 1; +*************** +*** 1637,1643 **** + vim_free( button_array ); + vim_free( buttons_copy ); + +! return( dialog_result ); + } + #endif + /****************************************************************************/ +--- 1637,1643 ---- + vim_free( button_array ); + vim_free( buttons_copy ); + +! return dialog_result; + } + #endif + /****************************************************************************/ +*************** +*** 1653,1659 **** + *x = pos->x; + *y = pos->y; + +! return( OK ); + } + + void +--- 1653,1659 ---- + *x = pos->x; + *y = pos->y; + +! return OK; + } + + void +*************** +*** 1975,1985 **** + hex_digit(int c) + { + if (VIM_ISDIGIT(c)) +! return( c - '0' ); + c = TOLOWER_ASC(c); + if (c >= 'a' && c <= 'f') +! return( c - 'a' + 10 ); +! return( -1000 ); + } + + +--- 1975,1985 ---- + hex_digit(int c) + { + if (VIM_ISDIGIT(c)) +! return c - '0'; + c = TOLOWER_ASC(c); + if (c >= 'a' && c <= 'f') +! return c - 'a' + 10; +! return -1000; + } + + +*************** +*** 2065,2077 **** + b = hex_digit( name[5] ) * 16 + hex_digit( name[6] ); + if( r < 0 || g < 0 || b < 0 ) + return INVALCOLOR; +! return( RGB( r, g, b ) ); + } + + for( i = 0; i < ARRAY_LENGTH( table ); i++ ) + { + if( STRICMP( name, table[i].name ) == 0 ) +! return( table[i].colour ); + } + + /* +--- 2065,2077 ---- + b = hex_digit( name[5] ) * 16 + hex_digit( name[6] ); + if( r < 0 || g < 0 || b < 0 ) + return INVALCOLOR; +! return RGB(r, g, b); + } + + for( i = 0; i < ARRAY_LENGTH( table ); i++ ) + { + if( STRICMP( name, table[i].name ) == 0 ) +! return table[i].colour; + } + + /* +*************** +*** 2115,2121 **** + if (STRICMP(color, name) == 0) + { + fclose(fd); +! return( (guicolor_T) RGB(r,g,b) ); + } + } + +--- 2115,2121 ---- + if (STRICMP(color, name) == 0) + { + fclose(fd); +! return (guicolor_T)RGB(r, g, b); + } + } + +*************** +*** 2451,2458 **** + for (i = 0; special_keys[i].key_sym != 0; i++) + if (name[0] == special_keys[i].vim_code0 && + name[1] == special_keys[i].vim_code1) +! return( OK ); +! return( FAIL ); + } + + /****************************************************************************/ +--- 2451,2458 ---- + for (i = 0; special_keys[i].key_sym != 0; i++) + if (name[0] == special_keys[i].vim_code0 && + name[1] == special_keys[i].vim_code1) +! return OK; +! return FAIL; + } + + /****************************************************************************/ +*************** +*** 2512,2518 **** + + temp_phi = &external_icon; + } +! return( temp_phi ); + } + + /* +--- 2512,2518 ---- + + temp_phi = &external_icon; + } +! return temp_phi; + } + + /* +*************** +*** 2541,2556 **** + icon = gui_ph_toolbar_load_icon( full_pathname ); + + if( icon != NULL ) +! return( icon ); + } + + if( menu->iconidx >= 0 && + ( menu->iconidx < ARRAY_LENGTH( gui_ph_toolbar_images ) ) ) + { +! return( gui_ph_toolbar_images[ menu->iconidx ] ); + } + +! return( NULL ); + } + #endif + +--- 2541,2556 ---- + icon = gui_ph_toolbar_load_icon( full_pathname ); + + if( icon != NULL ) +! return icon; + } + + if( menu->iconidx >= 0 && + ( menu->iconidx < ARRAY_LENGTH( gui_ph_toolbar_images ) ) ) + { +! return gui_ph_toolbar_images[menu->iconidx]; + } + +! return NULL; + } + #endif + +*************** +*** 2895,2905 **** + * at least has the bits we're checking for */ + if( font_size == info.size && + style == (info.style & style) ) +! return( (GuiFont) font_tag ); + } + vim_free( font_tag ); + } +! return( NULL ); + } + + /* +--- 2895,2905 ---- + * at least has the bits we're checking for */ + if( font_size == info.size && + style == (info.style & style) ) +! return (GuiFont)font_tag; + } + vim_free( font_tag ); + } +! return NULL; + } + + /* +*************** +*** 2957,2965 **** + } + } + } +! return( TRUE ); + } +! return( FALSE ); + } + + int +--- 2957,2965 ---- + } + } + } +! return TRUE; + } +! return FALSE; + } + + int +*************** +*** 2985,2991 **** + "pcterm12", -1, PHFONT_FIXED, NULL ); + + if( font_tag == NULL ) +! return( FAIL ); + + gui_mch_free_font( gui.norm_font ); + gui.norm_font = font_tag; +--- 2985,2991 ---- + "pcterm12", -1, PHFONT_FIXED, NULL ); + + if( font_tag == NULL ) +! return FAIL; + + gui_mch_free_font( gui.norm_font ); + gui.norm_font = font_tag; +*************** +*** 2997,3009 **** + { + if( gui_ph_parse_font_name( vim_font_name, &font_name, &font_flags, + &font_size ) == FALSE ) +! return( FAIL ); + + font_tag = gui_ph_get_font( font_name, font_flags, font_size, 0 ); + if( font_tag == NULL ) + { + vim_free( font_name ); +! return( FAIL ); + } + + gui_mch_free_font( gui.norm_font ); +--- 2997,3009 ---- + { + if( gui_ph_parse_font_name( vim_font_name, &font_name, &font_flags, + &font_size ) == FALSE ) +! return FAIL; + + font_tag = gui_ph_get_font( font_name, font_flags, font_size, 0 ); + if( font_tag == NULL ) + { + vim_free( font_name ); +! return FAIL; + } + + gui_mch_free_font( gui.norm_font ); +*************** +*** 3026,3032 **** + gui.char_ascent = - extent.ul.y; + + vim_free( font_name ); +! return( OK ); + } + + /* +--- 3026,3032 ---- + gui.char_ascent = - extent.ul.y; + + vim_free( font_name ); +! return OK; + } + + /* +*************** +*** 3042,3048 **** + gui.char_height = - info.ascender + info.descender + p_linespace; + gui.char_ascent = - info.ascender + p_linespace / 2; + +! return( OK ); + } + + GuiFont +--- 3042,3048 ---- + gui.char_height = - info.ascender + info.descender + p_linespace; + gui.char_ascent = - info.ascender + p_linespace / 2; + +! return OK; + } + + GuiFont +*************** +*** 3060,3072 **** + vim_free( font_name ); + + if( font_tag != NULL ) +! return( (GuiFont) font_tag ); + } + + if( report_error ) + EMSG2(e_font, vim_font_name ); + +! return( FAIL ); + } + + #if defined(FEAT_EVAL) || defined(PROTO) +--- 3060,3072 ---- + vim_free( font_name ); + + if( font_tag != NULL ) +! return (GuiFont)font_tag; + } + + if( report_error ) + EMSG2(e_font, vim_font_name ); + +! return FAIL; + } + + #if defined(FEAT_EVAL) || defined(PROTO) +*** ../vim-7.3.261/src/version.c 2011-07-27 13:59:12.000000000 +0200 +--- src/version.c 2011-07-27 14:08:08.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 262, + /**/ + +-- +You know you use Vim too much when you have this alias in your +~/.bashrc file: alias :e=/bin/vim (Eljay Love-Jensen) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.263 b/source/ap/vim/patches/7.3.263 new file mode 100644 index 00000000..98850988 --- /dev/null +++ b/source/ap/vim/patches/7.3.263 @@ -0,0 +1,162 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.263 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.263 +Problem: Perl and Tcl have a few code style problems. +Solution: Clean it up. (Elias Diem) +Files: src/if_perl.xs, src/if_tcl.c + + +*** ../vim-7.3.262/src/if_perl.xs 2010-10-23 14:02:48.000000000 +0200 +--- src/if_perl.xs 2011-07-27 14:11:03.000000000 +0200 +*************** +*** 755,761 **** + #ifdef HAVE_SANDBOX + if (sandbox) + { +! safe = perl_get_sv( "VIM::safe", FALSE ); + # ifndef MAKE_TEST /* avoid a warning for unreachable code */ + if (safe == NULL || !SvTRUE(safe)) + EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module")); +--- 755,761 ---- + #ifdef HAVE_SANDBOX + if (sandbox) + { +! safe = perl_get_sv("VIM::safe", FALSE); + # ifndef MAKE_TEST /* avoid a warning for unreachable code */ + if (safe == NULL || !SvTRUE(safe)) + EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module")); +*************** +*** 1108,1114 **** + VIWIN win + + PPCODE: +! if(items == 1) + { + EXTEND(sp, 2); + if (!win_valid(win)) +--- 1108,1114 ---- + VIWIN win + + PPCODE: +! if (items == 1) + { + EXTEND(sp, 2); + if (!win_valid(win)) +*************** +*** 1116,1122 **** + PUSHs(sv_2mortal(newSViv(win->w_cursor.lnum))); + PUSHs(sv_2mortal(newSViv(win->w_cursor.col))); + } +! else if(items == 3) + { + int lnum, col; + +--- 1116,1122 ---- + PUSHs(sv_2mortal(newSViv(win->w_cursor.lnum))); + PUSHs(sv_2mortal(newSViv(win->w_cursor.col))); + } +! else if (items == 3) + { + int lnum, col; + +*************** +*** 1249,1257 **** + { + lnum = SvIV(ST(1)); + count = 1 + SvIV(ST(2)) - lnum; +! if(count == 0) + count = 1; +! if(count < 0) + { + lnum -= count; + count = -count; +--- 1249,1257 ---- + { + lnum = SvIV(ST(1)); + count = 1 + SvIV(ST(2)) - lnum; +! if (count == 0) + count = 1; +! if (count < 0) + { + lnum -= count; + count = -count; +*** ../vim-7.3.262/src/if_tcl.c 2010-12-17 20:23:56.000000000 +0100 +--- src/if_tcl.c 2011-07-27 14:11:03.000000000 +0200 +*************** +*** 1884,1897 **** + { + int newerr = OK; + +! if (error == TCL_EXIT ) + { + int retval; + char buf[50]; + Tcl_Obj *robj; + + robj = Tcl_GetObjResult(tclinfo.interp); +! if( Tcl_GetIntFromObj(tclinfo.interp, robj, &retval) != TCL_OK ) + { + EMSG(_("E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org")); + newerr = FAIL; +--- 1884,1897 ---- + { + int newerr = OK; + +! if (error == TCL_EXIT) + { + int retval; + char buf[50]; + Tcl_Obj *robj; + + robj = Tcl_GetObjResult(tclinfo.interp); +! if (Tcl_GetIntFromObj(tclinfo.interp, robj, &retval) != TCL_OK) + { + EMSG(_("E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org")); + newerr = FAIL; +*************** +*** 1900,1906 **** + { + sprintf(buf, _("E572: exit code %d"), retval); + tclerrmsg(buf); +! if (retval == 0 ) + { + did_emsg = 0; + newerr = OK; +--- 1900,1906 ---- + { + sprintf(buf, _("E572: exit code %d"), retval); + tclerrmsg(buf); +! if (retval == 0) + { + did_emsg = 0; + newerr = OK; +*** ../vim-7.3.262/src/version.c 2011-07-27 14:09:05.000000000 +0200 +--- src/version.c 2011-07-27 14:12:05.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 263, + /**/ + +-- +DEAD PERSON: I don't want to go in the cart! +CUSTOMER: Oh, don't be such a baby. +MORTICIAN: I can't take him... +DEAD PERSON: I feel fine! +CUSTOMER: Oh, do us a favor... +MORTICIAN: I can't. + The Quest for the Holy Grail (Monty Python) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.264 b/source/ap/vim/patches/7.3.264 new file mode 100644 index 00000000..71ec851f --- /dev/null +++ b/source/ap/vim/patches/7.3.264 @@ -0,0 +1,159 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.264 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.264 +Problem: When the current directory name contains wildcard characters, such + as "foo[with]bar", the tags file can't be found. (Jeremy + Erickson) +Solution: When searching for matching files also match without expanding + wildcards. This is a bit of a hack. +Files: src/vim.h, src/misc1.c, src/misc2.c + + +*** ../vim-7.3.263/src/vim.h 2011-07-20 15:04:52.000000000 +0200 +--- src/vim.h 2011-07-27 16:21:38.000000000 +0200 +*************** +*** 816,821 **** +--- 816,822 ---- + #define EW_PATH 0x80 /* search in 'path' too */ + #define EW_ICASE 0x100 /* ignore case */ + #define EW_NOERROR 0x200 /* no error for bad regexp */ ++ #define EW_NOTWILD 0x400 /* add match with literal name if exists */ + /* Note: mostly EW_NOTFOUND and EW_SILENT are mutually exclusive: EW_NOTFOUND + * is used when executing commands and EW_SILENT for interactive expanding. */ + +*** ../vim-7.3.263/src/misc1.c 2011-07-20 15:04:52.000000000 +0200 +--- src/misc1.c 2011-07-27 17:24:39.000000000 +0200 +*************** +*** 9119,9125 **** + * all entries found with "matchname". */ + if ((p[0] != '.' || starts_with_dot) + && (matchname == NULL +! || vim_regexec(®match, p, (colnr_T)0))) + { + #ifdef WIN3264 + STRCPY(s, p); +--- 9119,9127 ---- + * all entries found with "matchname". */ + if ((p[0] != '.' || starts_with_dot) + && (matchname == NULL +! || vim_regexec(®match, p, (colnr_T)0) +! || ((flags & EW_NOTWILD) +! && fnamencmp(path + (s - buf), p, e - s) == 0))) + { + #ifdef WIN3264 + STRCPY(s, p); +*************** +*** 9323,9329 **** + e = p; + *e = NUL; + +! /* now we have one wildcard component between "s" and "e" */ + /* Remove backslashes between "wildoff" and the start of the wildcard + * component. */ + for (p = buf + wildoff; p < s; ++p) +--- 9325,9331 ---- + e = p; + *e = NUL; + +! /* Now we have one wildcard component between "s" and "e". */ + /* Remove backslashes between "wildoff" and the start of the wildcard + * component. */ + for (p = buf + wildoff; p < s; ++p) +*************** +*** 9390,9396 **** + if (dp == NULL) + break; + if ((dp->d_name[0] != '.' || starts_with_dot) +! && vim_regexec(®match, (char_u *)dp->d_name, (colnr_T)0)) + { + STRCPY(s, dp->d_name); + len = STRLEN(buf); +--- 9392,9400 ---- + if (dp == NULL) + break; + if ((dp->d_name[0] != '.' || starts_with_dot) +! && (vim_regexec(®match, (char_u *)dp->d_name, (colnr_T)0) +! || ((flags & EW_NOTWILD) +! && fnamencmp(path + (s - buf), dp->d_name, e - s) == 0))) + { + STRCPY(s, dp->d_name); + len = STRLEN(buf); +*** ../vim-7.3.263/src/misc2.c 2011-07-07 17:15:29.000000000 +0200 +--- src/misc2.c 2011-07-27 17:21:10.000000000 +0200 +*************** +*** 4653,4661 **** + { + if (r_ptr[0] == '\\' && r_ptr[1] == ';') + { +! /* overwrite the escape char, +! * use STRLEN(r_ptr) to move the trailing '\0' +! */ + STRMOVE(r_ptr, r_ptr + 1); + r_ptr++; + } +--- 4653,4660 ---- + { + if (r_ptr[0] == '\\' && r_ptr[1] == ';') + { +! /* Overwrite the escape char, +! * use STRLEN(r_ptr) to move the trailing '\0'. */ + STRMOVE(r_ptr, r_ptr + 1); + r_ptr++; + } +*************** +*** 4914,4923 **** + stackp->ffs_filearray_size = 0; + } + else + expand_wildcards((dirptrs[1] == NULL) ? 1 : 2, dirptrs, + &stackp->ffs_filearray_size, + &stackp->ffs_filearray, +! EW_DIR|EW_ADDSLASH|EW_SILENT); + + stackp->ffs_filearray_cur = 0; + stackp->ffs_stage = 0; +--- 4913,4925 ---- + stackp->ffs_filearray_size = 0; + } + else ++ /* Add EW_NOTWILD because the expanded path may contain ++ * wildcard characters that are to be taken literally. ++ * This is a bit of a hack. */ + expand_wildcards((dirptrs[1] == NULL) ? 1 : 2, dirptrs, + &stackp->ffs_filearray_size, + &stackp->ffs_filearray, +! EW_DIR|EW_ADDSLASH|EW_SILENT|EW_NOTWILD); + + stackp->ffs_filearray_cur = 0; + stackp->ffs_stage = 0; +*** ../vim-7.3.263/src/version.c 2011-07-27 14:15:41.000000000 +0200 +--- src/version.c 2011-07-27 17:25:44.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 264, + /**/ + +-- +CUSTOMER: You're not fooling anyone y'know. Look, isn't there something + you can do? +DEAD PERSON: I feel happy... I feel happy. + [whop] +CUSTOMER: Ah, thanks very much. +MORTICIAN: Not at all. See you on Thursday. +CUSTOMER: Right. + The Quest for the Holy Grail (Monty Python) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.265 b/source/ap/vim/patches/7.3.265 new file mode 100644 index 00000000..98cb1b4e --- /dev/null +++ b/source/ap/vim/patches/7.3.265 @@ -0,0 +1,145 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.265 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.265 +Problem: When storing a pattern in search history there is no proper check + for the separator character. +Solution: Pass the separator character to in_history(). (Muraoka Taro) +Files: src/ex_getln.c + + +*** ../vim-7.3.264/src/ex_getln.c 2011-07-07 16:44:33.000000000 +0200 +--- src/ex_getln.c 2011-07-27 17:50:35.000000000 +0200 +*************** +*** 67,73 **** + + static int hist_char2type __ARGS((int c)); + +! static int in_history __ARGS((int, char_u *, int)); + # ifdef FEAT_EVAL + static int calc_hist_idx __ARGS((int histype, int num)); + # endif +--- 67,73 ---- + + static int hist_char2type __ARGS((int c)); + +! static int in_history __ARGS((int, char_u *, int, int)); + # ifdef FEAT_EVAL + static int calc_hist_idx __ARGS((int histype, int num)); + # endif +*************** +*** 5289,5301 **** + * If 'move_to_front' is TRUE, matching entry is moved to end of history. + */ + static int +! in_history(type, str, move_to_front) + int type; + char_u *str; + int move_to_front; /* Move the entry to the front if it exists */ + { + int i; + int last_i = -1; + + if (hisidx[type] < 0) + return FALSE; +--- 5289,5303 ---- + * If 'move_to_front' is TRUE, matching entry is moved to end of history. + */ + static int +! in_history(type, str, move_to_front, sep) + int type; + char_u *str; + int move_to_front; /* Move the entry to the front if it exists */ ++ int sep; + { + int i; + int last_i = -1; ++ char_u *p; + + if (hisidx[type] < 0) + return FALSE; +*************** +*** 5304,5310 **** + { + if (history[type][i].hisstr == NULL) + return FALSE; +! if (STRCMP(str, history[type][i].hisstr) == 0) + { + if (!move_to_front) + return TRUE; +--- 5306,5317 ---- + { + if (history[type][i].hisstr == NULL) + return FALSE; +! +! /* For search history, check that the separator character matches as +! * well. */ +! p = history[type][i].hisstr; +! if (STRCMP(str, p) == 0 +! && (type != HIST_SEARCH || sep == p[STRLEN(p) + 1])) + { + if (!move_to_front) + return TRUE; +*************** +*** 5398,5404 **** + } + last_maptick = -1; + } +! if (!in_history(histype, new_entry, TRUE)) + { + if (++hisidx[histype] == hislen) + hisidx[histype] = 0; +--- 5405,5411 ---- + } + last_maptick = -1; + } +! if (!in_history(histype, new_entry, TRUE, sep)) + { + if (++hisidx[histype] == hislen) + hisidx[histype] = 0; +*************** +*** 5977,5983 **** + if (val != NULL && *val != NUL) + { + if (!in_history(type, val + (type == HIST_SEARCH), +! viminfo_add_at_front)) + { + /* Need to re-allocate to append the separator byte. */ + len = STRLEN(val); +--- 5984,5990 ---- + if (val != NULL && *val != NUL) + { + if (!in_history(type, val + (type == HIST_SEARCH), +! viminfo_add_at_front, *val)) + { + /* Need to re-allocate to append the separator byte. */ + len = STRLEN(val); +*** ../vim-7.3.264/src/version.c 2011-07-27 17:31:42.000000000 +0200 +--- src/version.c 2011-07-27 17:58:22.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 265, + /**/ + +-- + [clop clop] +MORTICIAN: Who's that then? +CUSTOMER: I don't know. +MORTICIAN: Must be a king. +CUSTOMER: Why? +MORTICIAN: He hasn't got shit all over him. + The Quest for the Holy Grail (Monty Python) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.266 b/source/ap/vim/patches/7.3.266 new file mode 100644 index 00000000..373280ee --- /dev/null +++ b/source/ap/vim/patches/7.3.266 @@ -0,0 +1,54 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.266 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.266 +Problem: In Gvim with iBus typing space in Insert mode doesn't work. +Solution: Clear xim_expected_char after checking it. +Files: src/mbyte.c + + +*** ../vim-7.3.265/src/mbyte.c 2011-07-15 21:16:54.000000000 +0200 +--- src/mbyte.c 2011-07-27 18:21:13.000000000 +0200 +*************** +*** 5170,5175 **** +--- 5170,5179 ---- + /* We had a keypad key, and XIM tried to thieve it */ + return FALSE; + ++ /* This is supposed to fix a problem with iBus, that space ++ * characters don't work in input mode. */ ++ xim_expected_char = NUL; ++ + /* Normal processing */ + return imresult; + } +*** ../vim-7.3.265/src/version.c 2011-07-27 17:58:42.000000000 +0200 +--- src/version.c 2011-07-27 18:23:00.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 266, + /**/ + +-- + [clop clop] +ARTHUR: Old woman! +DENNIS: Man! +ARTHUR: Man, sorry. What knight lives in that castle over there? +DENNIS: I'm thirty seven. +ARTHUR: What? +DENNIS: I'm thirty seven -- I'm not old! + The Quest for the Holy Grail (Monty Python) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.267 b/source/ap/vim/patches/7.3.267 new file mode 100644 index 00000000..d986e503 --- /dev/null +++ b/source/ap/vim/patches/7.3.267 @@ -0,0 +1,67 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.267 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.267 +Problem: Ruby on Mac OS X 10.7 may crash. +Solution: Avoid alloc(0). (Bjorn Winckler) +Files: src/if_ruby.c + + +*** ../vim-7.3.266/src/if_ruby.c 2011-01-17 19:53:20.000000000 +0100 +--- src/if_ruby.c 2011-08-04 18:57:43.000000000 +0200 +*************** +*** 761,771 **** + char *buff, *p; + + str = rb_obj_as_string(str); +! buff = ALLOCA_N(char, RSTRING_LEN(str)); +! strcpy(buff, RSTRING_PTR(str)); +! p = strchr(buff, '\n'); +! if (p) *p = '\0'; +! MSG(buff); + return Qnil; + } + +--- 761,779 ---- + char *buff, *p; + + str = rb_obj_as_string(str); +! if (RSTRING_LEN(str) > 0) +! { +! /* Only do this when the string isn't empty, alloc(0) causes trouble. */ +! buff = ALLOCA_N(char, RSTRING_LEN(str)); +! strcpy(buff, RSTRING_PTR(str)); +! p = strchr(buff, '\n'); +! if (p) *p = '\0'; +! MSG(buff); +! } +! else +! { +! MSG(""); +! } + return Qnil; + } + +*** ../vim-7.3.266/src/version.c 2011-07-27 18:25:40.000000000 +0200 +--- src/version.c 2011-08-04 19:07:45.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 267, + /**/ + +-- +There are 10 kinds of people: Those who understand binary and those who don't. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.268 b/source/ap/vim/patches/7.3.268 new file mode 100644 index 00000000..aa848770 --- /dev/null +++ b/source/ap/vim/patches/7.3.268 @@ -0,0 +1,69 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.268 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.268 +Problem: Vim freezes when executing an external command with zsh. +Solution: Use O_NOCTTY both in the master and slave. (Bjorn Winckler) +Files: src/os_unix.c + + +*** ../vim-7.3.267/src/os_unix.c 2011-07-07 16:20:45.000000000 +0200 +--- src/os_unix.c 2011-08-04 19:06:14.000000000 +0200 +*************** +*** 3889,3899 **** + if (p_guipty && !(options & (SHELL_READ|SHELL_WRITE))) + { + pty_master_fd = OpenPTY(&tty_name); /* open pty */ +! if (pty_master_fd >= 0 && ((pty_slave_fd = +! open(tty_name, O_RDWR | O_EXTRA, 0)) < 0)) + { +! close(pty_master_fd); +! pty_master_fd = -1; + } + } + /* +--- 3889,3909 ---- + if (p_guipty && !(options & (SHELL_READ|SHELL_WRITE))) + { + pty_master_fd = OpenPTY(&tty_name); /* open pty */ +! if (pty_master_fd >= 0) + { +! /* Leaving out O_NOCTTY may lead to waitpid() always returning +! * 0 on Mac OS X 10.7 thereby causing freezes. Let's assume +! * adding O_NOCTTY always works when defined. */ +! #ifdef O_NOCTTY +! pty_slave_fd = open(tty_name, O_RDWR | O_NOCTTY | O_EXTRA, 0); +! #else +! pty_slave_fd = open(tty_name, O_RDWR | O_EXTRA, 0); +! #endif +! if (pty_slave_fd < 0) +! { +! close(pty_master_fd); +! pty_master_fd = -1; +! } + } + } + /* +*** ../vim-7.3.267/src/version.c 2011-08-04 19:34:55.000000000 +0200 +--- src/version.c 2011-08-04 19:36:00.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 268, + /**/ + +-- +Mental Floss prevents moral decay! + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.269 b/source/ap/vim/patches/7.3.269 new file mode 100644 index 00000000..a0bfc473 --- /dev/null +++ b/source/ap/vim/patches/7.3.269 @@ -0,0 +1,112 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.269 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.269 +Problem: 'shellcmdflag' only works with one flag. +Solution: Split into multiple arguments. (Gary Johnson) +Files: src/os_unix.c + + +*** ../vim-7.3.268/src/os_unix.c 2011-08-04 19:36:47.000000000 +0200 +--- src/os_unix.c 2011-08-04 20:27:13.000000000 +0200 +*************** +*** 3795,3802 **** +--- 3795,3804 ---- + int retval = -1; + char **argv = NULL; + int argc; ++ char_u *p_shcf_copy = NULL; + int i; + char_u *p; ++ char_u *s; + int inquote; + int pty_master_fd = -1; /* for pty's */ + # ifdef FEAT_GUI +*************** +*** 3855,3860 **** +--- 3857,3875 ---- + } + if (argv == NULL) + { ++ /* ++ * Account for possible multiple args in p_shcf. ++ */ ++ p = p_shcf; ++ for (;;) ++ { ++ p = skiptowhite(p); ++ if (*p == NUL) ++ break; ++ ++argc; ++ p = skipwhite(p); ++ } ++ + argv = (char **)alloc((unsigned)((argc + 4) * sizeof(char *))); + if (argv == NULL) /* out of memory */ + goto error; +*************** +*** 3864,3870 **** + { + if (extra_shell_arg != NULL) + argv[argc++] = (char *)extra_shell_arg; +! argv[argc++] = (char *)p_shcf; + argv[argc++] = (char *)cmd; + } + argv[argc] = NULL; +--- 3879,3901 ---- + { + if (extra_shell_arg != NULL) + argv[argc++] = (char *)extra_shell_arg; +! +! /* Break 'shellcmdflag' into white separated parts. This doesn't +! * handle quoted strings, they are very unlikely to appear. */ +! p_shcf_copy = alloc((unsigned)STRLEN(p_shcf) + 1); +! if (p_shcf_copy == NULL) /* out of memory */ +! goto error; +! s = p_shcf_copy; +! p = p_shcf; +! while (*p != NUL) +! { +! argv[argc++] = (char *)s; +! while (*p && *p != ' ' && *p != TAB) +! *s++ = *p++; +! *s++ = NUL; +! p = skipwhite(p); +! } +! + argv[argc++] = (char *)cmd; + } + argv[argc] = NULL; +*************** +*** 4677,4682 **** +--- 4708,4714 ---- + } + } + vim_free(argv); ++ vim_free(p_shcf_copy); + + error: + if (!did_settmode) +*** ../vim-7.3.268/src/version.c 2011-08-04 19:36:47.000000000 +0200 +--- src/version.c 2011-08-04 20:30:44.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 269, + /**/ + +-- +Be nice to your kids... they'll be the ones choosing your nursing home. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.270 b/source/ap/vim/patches/7.3.270 new file mode 100644 index 00000000..3eaf6bfa --- /dev/null +++ b/source/ap/vim/patches/7.3.270 @@ -0,0 +1,52 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.270 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.270 +Problem: Illegal memory access. +Solution: Swap conditions. (Dominique Pelle) +Files: src/ops.c + + +*** ../vim-7.3.269/src/ops.c 2011-07-15 17:51:30.000000000 +0200 +--- src/ops.c 2011-08-10 12:07:22.000000000 +0200 +*************** +*** 6311,6317 **** + *wc += words; + + /* Add eol_size if the end of line was reached before hitting limit. */ +! if (line[i] == NUL && i < limit) + { + i += eol_size; + chars += eol_size; +--- 6311,6317 ---- + *wc += words; + + /* Add eol_size if the end of line was reached before hitting limit. */ +! if (i < limit && line[i] == NUL) + { + i += eol_size; + chars += eol_size; +*** ../vim-7.3.269/src/version.c 2011-08-04 20:31:50.000000000 +0200 +--- src/version.c 2011-08-10 12:09:30.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 270, + /**/ + +-- +An indication you must be a manager: +You give constructive feedback to your dog. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.271 b/source/ap/vim/patches/7.3.271 new file mode 100644 index 00000000..c42d19a8 --- /dev/null +++ b/source/ap/vim/patches/7.3.271 @@ -0,0 +1,504 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.271 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.271 +Problem: Code not following Vim coding style. +Solution: Fix the style. (Elias Diem) +Files: src/gui_photon.c + + +*** ../vim-7.3.270/src/gui_photon.c 2011-07-27 14:09:05.000000000 +0200 +--- src/gui_photon.c 2011-08-10 12:18:35.000000000 +0200 +*************** +*** 358,378 **** + } + + static int +! gui_ph_handle_window_cb( PtWidget_t *widget, void *data, PtCallbackInfo_t *info ) + { + PhWindowEvent_t *we = info->cbdata; + ushort_t *width, *height; + +! switch( we->event_f ) { + case Ph_WM_CLOSE: + gui_shell_closed(); + break; + + case Ph_WM_FOCUS: + /* Just in case it's hidden and needs to be shown */ +! gui_mch_mousehide( MOUSE_SHOW ); + +! if( we->event_state == Ph_WM_EVSTATE_FOCUS ) + { + gui_focus_change(TRUE); + gui_mch_start_blink(); +--- 358,378 ---- + } + + static int +! gui_ph_handle_window_cb(PtWidget_t *widget, void *data, PtCallbackInfo_t *info) + { + PhWindowEvent_t *we = info->cbdata; + ushort_t *width, *height; + +! switch (we->event_f) { + case Ph_WM_CLOSE: + gui_shell_closed(); + break; + + case Ph_WM_FOCUS: + /* Just in case it's hidden and needs to be shown */ +! gui_mch_mousehide(MOUSE_SHOW); + +! if (we->event_state == Ph_WM_EVSTATE_FOCUS) + { + gui_focus_change(TRUE); + gui_mch_start_blink(); +*************** +*** 385,401 **** + break; + + case Ph_WM_RESIZE: +! PtGetResource( gui.vimWindow, Pt_ARG_WIDTH, &width, 0 ); +! PtGetResource( gui.vimWindow, Pt_ARG_HEIGHT, &height, 0 ); + #ifdef USE_PANEL_GROUP + width -= (pg_margin_left + pg_margin_right); + height -= (pg_margin_top + pg_margin_bottom); + #endif +! gui_resize_shell( *width, *height ); +! gui_set_shellsize( FALSE, FALSE, RESIZE_BOTH ); + is_ignore_draw = FALSE; +! PtEndFlux( gui.vimContainer ); +! PtContainerRelease( gui.vimContainer ); + break; + + default: +--- 385,401 ---- + break; + + case Ph_WM_RESIZE: +! PtGetResource(gui.vimWindow, Pt_ARG_WIDTH, &width, 0); +! PtGetResource(gui.vimWindow, Pt_ARG_HEIGHT, &height, 0); + #ifdef USE_PANEL_GROUP + width -= (pg_margin_left + pg_margin_right); + height -= (pg_margin_top + pg_margin_bottom); + #endif +! gui_resize_shell(*width, *height); +! gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH); + is_ignore_draw = FALSE; +! PtEndFlux(gui.vimContainer); +! PtContainerRelease(gui.vimContainer); + break; + + default: +*************** +*** 406,412 **** + } + + static int +! gui_ph_handle_scrollbar( PtWidget_t *widget, void *data, PtCallbackInfo_t *info ) + { + PtScrollbarCallback_t *scroll; + scrollbar_T *sb; +--- 406,412 ---- + } + + static int +! gui_ph_handle_scrollbar(PtWidget_t *widget, void *data, PtCallbackInfo_t *info) + { + PtScrollbarCallback_t *scroll; + scrollbar_T *sb; +*************** +*** 415,424 **** + scroll = info->cbdata; + + sb = (scrollbar_T *) data; +! if( sb != NULL ) + { + value = scroll->position; +! switch( scroll->action ) + { + case Pt_SCROLL_DRAGGED: + dragging = TRUE; +--- 415,424 ---- + scroll = info->cbdata; + + sb = (scrollbar_T *) data; +! if (sb != NULL) + { + value = scroll->position; +! switch (scroll->action) + { + case Pt_SCROLL_DRAGGED: + dragging = TRUE; +*************** +*** 436,532 **** + } + + static int +! gui_ph_handle_keyboard( PtWidget_t *widget, void *data, PtCallbackInfo_t *info ) + { + PhKeyEvent_t *key; + unsigned char string[6]; + int len, i; + int ch, modifiers; + +! key = PhGetData( info->event ); + + ch = modifiers = len = 0; + +! if( p_mh ) +! gui_mch_mousehide( MOUSE_HIDE ); + + /* We're a good lil photon program, aren't we? yes we are, yeess wee arrr */ +! if( key->key_flags & Pk_KF_Compose ) + { + return Pt_CONTINUE; + } + +! if( (key->key_flags & Pk_KF_Cap_Valid) && +! PkIsKeyDown( key->key_flags ) ) + { + #ifdef FEAT_MENU + /* + * Only show the menu if the Alt key is down, and the Shift & Ctrl + * keys aren't down, as well as the other conditions + */ +! if( ( ( key->key_mods & Pk_KM_Alt ) && +! !( key->key_mods & Pk_KM_Shift ) && +! !( key->key_mods & Pk_KM_Ctrl ) ) && + gui.menu_is_active && +! ( *p_wak == 'y' || +! ( *p_wak == 'm' && +! gui_is_menu_shortcut( key->key_cap ) ) ) ) + { + /* Fallthrough and let photon look for the hotkey */ + return Pt_CONTINUE; + } + #endif + +! for( i = 0; special_keys[i].key_sym != 0; i++ ) + { +! if( special_keys[i].key_sym == key->key_cap ) + { + len = 0; +! if( special_keys[i].vim_code1 == NUL ) + ch = special_keys[i].vim_code0; + else + { + /* Detect if a keypad number key has been pressed + * and change the key if Num Lock is on */ +! if( key->key_cap >= Pk_KP_Enter && key->key_cap <= Pk_KP_9 +! && ( key->key_mods & Pk_KM_Num_Lock ) ) + { + /* FIXME: For now, just map the key to a ascii value + * (see ) */ + ch = key->key_cap - 0xf080; + } + else +! ch = TO_SPECIAL( special_keys[i].vim_code0, +! special_keys[i].vim_code1 ); + } + break; + } + } + +! if( key->key_mods & Pk_KM_Ctrl ) + modifiers |= MOD_MASK_CTRL; +! if( key->key_mods & Pk_KM_Alt ) + modifiers |= MOD_MASK_ALT; +! if( key->key_mods & Pk_KM_Shift ) + modifiers |= MOD_MASK_SHIFT; + + /* Is this not a special key? */ +! if( special_keys[i].key_sym == 0 ) + { +! ch = PhTo8859_1( key ); +! if( ch == -1 + #ifdef FEAT_MBYTE +! || ( enc_utf8 && ch > 127 ) + #endif + ) + { + #ifdef FEAT_MBYTE +! len = PhKeyToMb( string, key ); +! if( len > 0 ) + { + static char buf[6]; + int src_taken, dst_made; +! if( enc_utf8 != TRUE ) + { + PxTranslateFromUTF( + charset_translate, +--- 436,532 ---- + } + + static int +! gui_ph_handle_keyboard(PtWidget_t *widget, void *data, PtCallbackInfo_t *info) + { + PhKeyEvent_t *key; + unsigned char string[6]; + int len, i; + int ch, modifiers; + +! key = PhGetData(info->event); + + ch = modifiers = len = 0; + +! if (p_mh) +! gui_mch_mousehide(MOUSE_HIDE); + + /* We're a good lil photon program, aren't we? yes we are, yeess wee arrr */ +! if (key->key_flags & Pk_KF_Compose) + { + return Pt_CONTINUE; + } + +! if ((key->key_flags & Pk_KF_Cap_Valid) && +! PkIsKeyDown(key->key_flags)) + { + #ifdef FEAT_MENU + /* + * Only show the menu if the Alt key is down, and the Shift & Ctrl + * keys aren't down, as well as the other conditions + */ +! if (((key->key_mods & Pk_KM_Alt) && +! !(key->key_mods & Pk_KM_Shift) && +! !(key->key_mods & Pk_KM_Ctrl)) && + gui.menu_is_active && +! (*p_wak == 'y' || +! (*p_wak == 'm' && +! gui_is_menu_shortcut(key->key_cap)))) + { + /* Fallthrough and let photon look for the hotkey */ + return Pt_CONTINUE; + } + #endif + +! for(i = 0; special_keys[i].key_sym != 0; i++) + { +! if (special_keys[i].key_sym == key->key_cap) + { + len = 0; +! if (special_keys[i].vim_code1 == NUL) + ch = special_keys[i].vim_code0; + else + { + /* Detect if a keypad number key has been pressed + * and change the key if Num Lock is on */ +! if (key->key_cap >= Pk_KP_Enter && key->key_cap <= Pk_KP_9 +! && (key->key_mods & Pk_KM_Num_Lock)) + { + /* FIXME: For now, just map the key to a ascii value + * (see ) */ + ch = key->key_cap - 0xf080; + } + else +! ch = TO_SPECIAL(special_keys[i].vim_code0, +! special_keys[i].vim_code1); + } + break; + } + } + +! if (key->key_mods & Pk_KM_Ctrl) + modifiers |= MOD_MASK_CTRL; +! if (key->key_mods & Pk_KM_Alt) + modifiers |= MOD_MASK_ALT; +! if (key->key_mods & Pk_KM_Shift) + modifiers |= MOD_MASK_SHIFT; + + /* Is this not a special key? */ +! if (special_keys[i].key_sym == 0) + { +! ch = PhTo8859_1(key); +! if (ch == -1 + #ifdef FEAT_MBYTE +! || (enc_utf8 && ch > 127) + #endif + ) + { + #ifdef FEAT_MBYTE +! len = PhKeyToMb(string, key); +! if (len > 0) + { + static char buf[6]; + int src_taken, dst_made; +! if (enc_utf8 != TRUE) + { + PxTranslateFromUTF( + charset_translate, +*************** +*** 2931,2943 **** + name_len = (int_u) ( mark - vim_font ); + + *font_name = vim_strnsave( vim_font, name_len ); +! if( *font_name != NULL ) + { +! if( mark != NULL ) + { +! while( *mark != NUL && *mark++ == ':') + { +! switch( tolower( *mark++ ) ) + { + case 'a': *font_flags |= PF_STYLE_ANTIALIAS; break; + case 'b': *font_flags |= PF_STYLE_BOLD; break; +--- 2931,2943 ---- + name_len = (int_u) ( mark - vim_font ); + + *font_name = vim_strnsave( vim_font, name_len ); +! if (*font_name != NULL) + { +! if (mark != NULL) + { +! while (*mark != NUL && *mark++ == ':') + { +! switch (tolower(*mark++)) + { + case 'a': *font_flags |= PF_STYLE_ANTIALIAS; break; + case 'b': *font_flags |= PF_STYLE_BOLD; break; +*************** +*** 2946,2952 **** + case 's': + size = getdigits( &mark ); + /* Restrict the size to some vague limits */ +! if( size < 1 || size > 100 ) + size = 8; + + *font_size = size; +--- 2946,2952 ---- + case 's': + size = getdigits( &mark ); + /* Restrict the size to some vague limits */ +! if (size < 1 || size > 100) + size = 8; + + *font_size = size; +*************** +*** 2973,2990 **** + FontQueryInfo info; + PhRect_t extent; + +! if( vim_font_name == NULL ) + { + /* Default font */ + vim_font_name = "PC Terminal"; + } + +! if( STRCMP( vim_font_name, "*" ) == 0 ) + { + font_tag = PtFontSelection( gui.vimWindow, NULL, NULL, + "pcterm12", -1, PHFONT_FIXED, NULL ); + +! if( font_tag == NULL ) + return FAIL; + + gui_mch_free_font( gui.norm_font ); +--- 2973,2990 ---- + FontQueryInfo info; + PhRect_t extent; + +! if (vim_font_name == NULL) + { + /* Default font */ + vim_font_name = "PC Terminal"; + } + +! if (STRCMP( vim_font_name, "*" ) == 0) + { + font_tag = PtFontSelection( gui.vimWindow, NULL, NULL, + "pcterm12", -1, PHFONT_FIXED, NULL ); + +! if (font_tag == NULL) + return FAIL; + + gui_mch_free_font( gui.norm_font ); +*************** +*** 2995,3006 **** + } + else + { +! if( gui_ph_parse_font_name( vim_font_name, &font_name, &font_flags, +! &font_size ) == FALSE ) + return FAIL; + + font_tag = gui_ph_get_font( font_name, font_flags, font_size, 0 ); +! if( font_tag == NULL ) + { + vim_free( font_name ); + return FAIL; +--- 2995,3006 ---- + } + else + { +! if (gui_ph_parse_font_name( vim_font_name, &font_name, &font_flags, +! &font_size ) == FALSE) + return FAIL; + + font_tag = gui_ph_get_font( font_name, font_flags, font_size, 0 ); +! if (font_tag == NULL) + { + vim_free( font_name ); + return FAIL; +*************** +*** 3053,3069 **** + int_u font_size = 12; + int_u font_flags = 0; + +! if( gui_ph_parse_font_name( vim_font_name, &font_name, &font_flags, +! &font_size ) != FALSE ) + { + font_tag = gui_ph_get_font( font_name, font_flags, font_size, -1 ); + vim_free( font_name ); + +! if( font_tag != NULL ) + return (GuiFont)font_tag; + } + +! if( report_error ) + EMSG2(e_font, vim_font_name ); + + return FAIL; +--- 3053,3069 ---- + int_u font_size = 12; + int_u font_flags = 0; + +! if (gui_ph_parse_font_name( vim_font_name, &font_name, &font_flags, +! &font_size ) != FALSE) + { + font_tag = gui_ph_get_font( font_name, font_flags, font_size, -1 ); + vim_free( font_name ); + +! if (font_tag != NULL) + return (GuiFont)font_tag; + } + +! if (report_error) + EMSG2(e_font, vim_font_name ); + + return FAIL; +*** ../vim-7.3.270/src/version.c 2011-08-10 12:10:55.000000000 +0200 +--- src/version.c 2011-08-10 12:17:06.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 271, + /**/ + +-- +An indication you must be a manager: +You believe you never have any problems in your life, just +"issues" and "improvement opportunities". + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.272 b/source/ap/vim/patches/7.3.272 new file mode 100644 index 00000000..b512a1fd --- /dev/null +++ b/source/ap/vim/patches/7.3.272 @@ -0,0 +1,51 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.272 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.272 +Problem: ":put =list" does not add an empty line for a trailing empty + item. +Solution: Add a trailing NL when turning a list into a string. +Files: src/eval.c + + +*** ../vim-7.3.271/src/eval.c 2011-07-15 21:24:06.000000000 +0200 +--- src/eval.c 2011-08-10 12:31:51.000000000 +0200 +*************** +*** 1357,1363 **** +--- 1357,1367 ---- + { + ga_init2(&ga, (int)sizeof(char), 80); + if (tv.vval.v_list != NULL) ++ { + list_join(&ga, tv.vval.v_list, (char_u *)"\n", TRUE, 0); ++ if (tv.vval.v_list->lv_len > 0) ++ ga_append(&ga, NL); ++ } + ga_append(&ga, NUL); + retval = (char_u *)ga.ga_data; + } +*** ../vim-7.3.271/src/version.c 2011-08-10 12:19:00.000000000 +0200 +--- src/version.c 2011-08-10 12:36:41.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 272, + /**/ + +-- +Lose weight, NEVER Diet again with + The "Invisible Weight Loss Patch" + (spam e-mail) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.273 b/source/ap/vim/patches/7.3.273 new file mode 100644 index 00000000..e74eb5a2 --- /dev/null +++ b/source/ap/vim/patches/7.3.273 @@ -0,0 +1,124 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.273 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.273 +Problem: A BOM in an error file is seen as text. (Aleksey Baibarin) +Solution: Remove the BOM from the text before evaluating. (idea by Christian + Brabandt) +Files: src/quickfix.c, src/mbyte.c, src/proto/mbyte.pro, + src/testdir/test10.in + + +*** ../vim-7.3.272/src/quickfix.c 2011-05-19 17:42:54.000000000 +0200 +--- src/quickfix.c 2011-08-10 12:56:15.000000000 +0200 +*************** +*** 561,566 **** +--- 561,570 ---- + break; + + IObuff[CMDBUFFSIZE - 2] = NUL; /* for very long lines */ ++ #ifdef FEAT_MBYTE ++ remove_bom(IObuff); ++ #endif ++ + if ((efmp = vim_strrchr(IObuff, '\n')) != NULL) + *efmp = NUL; + #ifdef USE_CRNL +*** ../vim-7.3.272/src/mbyte.c 2011-07-27 18:25:40.000000000 +0200 +--- src/mbyte.c 2011-08-10 13:11:56.000000000 +0200 +*************** +*** 838,843 **** +--- 838,864 ---- + } + + /* ++ * Remove all BOM from "s" by moving remaining text. ++ */ ++ void ++ remove_bom(s) ++ char_u *s; ++ { ++ if (enc_utf8) ++ { ++ char_u *p = s; ++ ++ while ((p = vim_strbyte(p, 0xef)) != NULL) ++ { ++ if (p[1] == 0xbb && p[2] == 0xbf) ++ STRMOVE(p, p + 3); ++ else ++ ++p; ++ } ++ } ++ } ++ ++ /* + * Get class of pointer: + * 0 for blank or NUL + * 1 for punctuation +*** ../vim-7.3.272/src/proto/mbyte.pro 2011-07-07 15:08:53.000000000 +0200 +--- src/proto/mbyte.pro 2011-08-10 12:50:44.000000000 +0200 +*************** +*** 2,7 **** +--- 2,8 ---- + int enc_canon_props __ARGS((char_u *name)); + char_u *mb_init __ARGS((void)); + int bomb_size __ARGS((void)); ++ void remove_bom __ARGS((char_u *s)); + int mb_get_class __ARGS((char_u *p)); + int dbcs_class __ARGS((unsigned lead, unsigned trail)); + int latin_char2len __ARGS((int c)); +*** ../vim-7.3.272/src/testdir/test10.in 2010-08-15 21:57:29.000000000 +0200 +--- src/testdir/test10.in 2011-08-10 13:01:46.000000000 +0200 +*************** +*** 2,7 **** +--- 2,10 ---- + + STARTTEST + :so small.vim ++ :" Also test a BOM is ignored. ++ :so mbyte.vim ++ :set encoding=utf-8 + :/start of errorfile/,/end of errorfile/w! Xerrorfile + :/start of testfile/,/end of testfile/w! Xtestfile + :cf Xerrorfile +*************** +*** 20,26 **** + + start of errorfile + "Xtestfile", line 4.12: 1506-045 (S) Undeclared identifier fd_set. +! "Xtestfile", line 7 col 19; this is an error + gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include version.c + Xtestfile:13: parse error before `asd' + make: *** [vim] Error 1 +--- 23,29 ---- + + start of errorfile + "Xtestfile", line 4.12: 1506-045 (S) Undeclared identifier fd_set. +! "Xtestfile", line 7 col 19; this is an error + gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include version.c + Xtestfile:13: parse error before `asd' + make: *** [vim] Error 1 +*** ../vim-7.3.272/src/version.c 2011-08-10 12:38:02.000000000 +0200 +--- src/version.c 2011-08-10 13:14:35.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 273, + /**/ + +-- +Compilation process failed successfully. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.274 b/source/ap/vim/patches/7.3.274 new file mode 100644 index 00000000..48faf3cf --- /dev/null +++ b/source/ap/vim/patches/7.3.274 @@ -0,0 +1,55 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.274 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.274 +Problem: With concealed characters tabs do not have the right size. +Solution: Use VCOL_HLC instead of vcol. (Eiichi Sato) +Files: src/screen.c + + +*** ../vim-7.3.273/src/screen.c 2011-03-22 13:29:20.000000000 +0100 +--- src/screen.c 2011-08-10 14:22:47.000000000 +0200 +*************** +*** 4252,4258 **** + { + /* tab amount depends on current column */ + n_extra = (int)wp->w_buffer->b_p_ts +! - vcol % (int)wp->w_buffer->b_p_ts - 1; + #ifdef FEAT_MBYTE + mb_utf8 = FALSE; /* don't draw as UTF-8 */ + #endif +--- 4252,4258 ---- + { + /* tab amount depends on current column */ + n_extra = (int)wp->w_buffer->b_p_ts +! - VCOL_HLC % (int)wp->w_buffer->b_p_ts - 1; + #ifdef FEAT_MBYTE + mb_utf8 = FALSE; /* don't draw as UTF-8 */ + #endif +*** ../vim-7.3.273/src/version.c 2011-08-10 13:21:30.000000000 +0200 +--- src/version.c 2011-08-10 14:23:38.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 274, + /**/ + +-- + Arthur pulls Pin out. The MONK blesses the grenade as ... +ARTHUR: (quietly) One, two, five ... +GALAHAD: Three, sir! +ARTHUR: Three. + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.275 b/source/ap/vim/patches/7.3.275 new file mode 100644 index 00000000..2bdd145b --- /dev/null +++ b/source/ap/vim/patches/7.3.275 @@ -0,0 +1,77 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.275 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.275 +Problem: MS-Windows: When using a black background some screen updates + cause the window to flicker. +Solution: Add WS_CLIPCHILDREN to CreateWindow(). (René Aguirre) +Files: src/gui_w32.c + + +*** ../vim-7.3.274/src/gui_w32.c 2011-07-07 17:43:37.000000000 +0200 +--- src/gui_w32.c 2011-08-10 14:40:58.000000000 +0200 +*************** +*** 1379,1385 **** + s_hwnd = CreateWindowEx( + WS_EX_MDICHILD, + szVimWndClass, "Vim MSWindows GUI", +! WS_OVERLAPPEDWINDOW | WS_CHILD | WS_CLIPSIBLINGS | 0xC000, + gui_win_x == -1 ? CW_USEDEFAULT : gui_win_x, + gui_win_y == -1 ? CW_USEDEFAULT : gui_win_y, + 100, /* Any value will do */ +--- 1379,1386 ---- + s_hwnd = CreateWindowEx( + WS_EX_MDICHILD, + szVimWndClass, "Vim MSWindows GUI", +! WS_OVERLAPPEDWINDOW | WS_CHILD +! | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | 0xC000, + gui_win_x == -1 ? CW_USEDEFAULT : gui_win_x, + gui_win_y == -1 ? CW_USEDEFAULT : gui_win_y, + 100, /* Any value will do */ +*************** +*** 1410,1416 **** + * titlebar, it will be reparented below. */ + s_hwnd = CreateWindow( + szVimWndClass, "Vim MSWindows GUI", +! win_socket_id == 0 ? WS_OVERLAPPEDWINDOW : WS_POPUP, + gui_win_x == -1 ? CW_USEDEFAULT : gui_win_x, + gui_win_y == -1 ? CW_USEDEFAULT : gui_win_y, + 100, /* Any value will do */ +--- 1411,1418 ---- + * titlebar, it will be reparented below. */ + s_hwnd = CreateWindow( + szVimWndClass, "Vim MSWindows GUI", +! (win_socket_id == 0 ? WS_OVERLAPPEDWINDOW : WS_POPUP) +! | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + gui_win_x == -1 ? CW_USEDEFAULT : gui_win_x, + gui_win_y == -1 ? CW_USEDEFAULT : gui_win_y, + 100, /* Any value will do */ +*** ../vim-7.3.274/src/version.c 2011-08-10 14:32:33.000000000 +0200 +--- src/version.c 2011-08-10 14:39:14.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 275, + /**/ + +-- +ARTHUR: What does it say? +BROTHER MAYNARD: It reads ... "Here may be found the last words of Joseph of + Aramathea." "He who is valorous and pure of heart may find + the Holy Grail in the aaaaarrrrrrggghhh..." +ARTHUR: What? +BROTHER MAYNARD: "The Aaaaarrrrrrggghhh..." + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.276 b/source/ap/vim/patches/7.3.276 new file mode 100644 index 00000000..3af02457 --- /dev/null +++ b/source/ap/vim/patches/7.3.276 @@ -0,0 +1,130 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.276 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.276 +Problem: GvimExt sets $LANG in the wrong way. +Solution: Save the environment and use it for gvim. (Yasuhiro Matsumoto) +Files: src/GvimExt/gvimext.cpp + + +*** ../vim-7.3.275/src/GvimExt/gvimext.cpp 2011-07-20 17:27:17.000000000 +0200 +--- src/GvimExt/gvimext.cpp 2011-08-10 16:25:32.000000000 +0200 +*************** +*** 142,147 **** +--- 142,148 ---- + static int dyn_libintl_init(char *dir); + static void dyn_libintl_end(void); + ++ static wchar_t *oldenv = NULL; + static HINSTANCE hLibintlDLL = 0; + static char *(*dyn_libintl_gettext)(const char *) = null_libintl_gettext; + static char *(*dyn_libintl_textdomain)(const char *) = null_libintl_textdomain; +*************** +*** 339,346 **** + inc_cRefThisDLL() + { + #ifdef FEAT_GETTEXT +! if (g_cRefThisDll == 0) + dyn_gettext_load(); + #endif + InterlockedIncrement((LPLONG)&g_cRefThisDll); + } +--- 340,349 ---- + inc_cRefThisDLL() + { + #ifdef FEAT_GETTEXT +! if (g_cRefThisDll == 0) { + dyn_gettext_load(); ++ oldenv = GetEnvironmentStringsW(); ++ } + #endif + InterlockedIncrement((LPLONG)&g_cRefThisDll); + } +*************** +*** 349,356 **** + dec_cRefThisDLL() + { + #ifdef FEAT_GETTEXT +! if (InterlockedDecrement((LPLONG)&g_cRefThisDll) == 0) + dyn_gettext_free(); + #else + InterlockedDecrement((LPLONG)&g_cRefThisDll); + #endif +--- 352,364 ---- + dec_cRefThisDLL() + { + #ifdef FEAT_GETTEXT +! if (InterlockedDecrement((LPLONG)&g_cRefThisDll) == 0) { + dyn_gettext_free(); ++ if (oldenv != NULL) { ++ FreeEnvironmentStringsW(oldenv); ++ oldenv = NULL; ++ } ++ } + #else + InterlockedDecrement((LPLONG)&g_cRefThisDll); + #endif +*************** +*** 905,912 **** + NULL, // Process handle not inheritable. + NULL, // Thread handle not inheritable. + FALSE, // Set handle inheritance to FALSE. +! 0, // No creation flags. +! NULL, // Use parent's environment block. + NULL, // Use parent's starting directory. + &si, // Pointer to STARTUPINFO structure. + &pi) // Pointer to PROCESS_INFORMATION structure. +--- 913,920 ---- + NULL, // Process handle not inheritable. + NULL, // Thread handle not inheritable. + FALSE, // Set handle inheritance to FALSE. +! oldenv == NULL ? 0 : CREATE_UNICODE_ENVIRONMENT, +! oldenv, // Use unmodified environment block. + NULL, // Use parent's starting directory. + &si, // Pointer to STARTUPINFO structure. + &pi) // Pointer to PROCESS_INFORMATION structure. +*************** +*** 987,994 **** + NULL, // Process handle not inheritable. + NULL, // Thread handle not inheritable. + FALSE, // Set handle inheritance to FALSE. +! 0, // No creation flags. +! NULL, // Use parent's environment block. + NULL, // Use parent's starting directory. + &si, // Pointer to STARTUPINFO structure. + &pi) // Pointer to PROCESS_INFORMATION structure. +--- 995,1002 ---- + NULL, // Process handle not inheritable. + NULL, // Thread handle not inheritable. + FALSE, // Set handle inheritance to FALSE. +! oldenv == NULL ? 0 : CREATE_UNICODE_ENVIRONMENT, +! oldenv, // Use unmodified environment block. + NULL, // Use parent's starting directory. + &si, // Pointer to STARTUPINFO structure. + &pi) // Pointer to PROCESS_INFORMATION structure. +*** ../vim-7.3.275/src/version.c 2011-08-10 15:56:24.000000000 +0200 +--- src/version.c 2011-08-10 16:28:42.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 276, + /**/ + +-- +User: I'm having problems with my text editor. +Help desk: Which editor are you using? +User: I don't know, but it's version VI (pronounced: 6). +Help desk: Oh, then you should upgrade to version VIM (pronounced: 994). + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.277 b/source/ap/vim/patches/7.3.277 new file mode 100644 index 00000000..3509a1a6 --- /dev/null +++ b/source/ap/vim/patches/7.3.277 @@ -0,0 +1,348 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.277 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.277 +Problem: MS-Windows: some characters do not show in dialogs. +Solution: Use the wide methods when available. (Yanwei Jia) +Files: src/gui_w32.c, src/gui_w48.c, src/os_mswin.c, src/os_win32.c, + src/os_win32.h + + +*** ../vim-7.3.276/src/gui_w32.c 2011-08-10 15:56:24.000000000 +0200 +--- src/gui_w32.c 2011-08-10 16:52:55.000000000 +0200 +*************** +*** 1270,1275 **** +--- 1270,1294 ---- + pGetMonitorInfo = (TGetMonitorInfo)GetProcAddress(user32_lib, + "GetMonitorInfoA"); + } ++ ++ #ifdef FEAT_MBYTE ++ /* If the OS is Windows NT, use wide functions; ++ * this enables common dialogs input unicode from IME. */ ++ if (os_version.dwPlatformId == VER_PLATFORM_WIN32_NT) ++ { ++ pDispatchMessage = DispatchMessageW; ++ pGetMessage = GetMessageW; ++ pIsDialogMessage = IsDialogMessageW; ++ pPeekMessage = PeekMessageW; ++ } ++ else ++ { ++ pDispatchMessage = DispatchMessageA; ++ pGetMessage = GetMessageA; ++ pIsDialogMessage = IsDialogMessageA; ++ pPeekMessage = PeekMessageA; ++ } ++ #endif + } + + /* +*** ../vim-7.3.276/src/gui_w48.c 2010-10-20 21:22:17.000000000 +0200 +--- src/gui_w48.c 2011-08-10 16:49:39.000000000 +0200 +*************** +*** 390,396 **** + KillTimer(NULL, idEvent); + + /* Eat spurious WM_TIMER messages */ +! while (PeekMessage(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) + ; + + if (blink_state == BLINK_ON) +--- 390,396 ---- + KillTimer(NULL, idEvent); + + /* Eat spurious WM_TIMER messages */ +! while (pPeekMessage(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) + ; + + if (blink_state == BLINK_ON) +*************** +*** 418,424 **** + { + KillTimer(NULL, blink_timer); + /* Eat spurious WM_TIMER messages */ +! while (PeekMessage(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) + ; + blink_timer = 0; + } +--- 418,424 ---- + { + KillTimer(NULL, blink_timer); + /* Eat spurious WM_TIMER messages */ +! while (pPeekMessage(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) + ; + blink_timer = 0; + } +*************** +*** 476,482 **** + s_timed_out = TRUE; + + /* Eat spurious WM_TIMER messages */ +! while (PeekMessage(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) + ; + if (idEvent == s_wait_timer) + s_wait_timer = 0; +--- 476,482 ---- + s_timed_out = TRUE; + + /* Eat spurious WM_TIMER messages */ +! while (pPeekMessage(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) + ; + if (idEvent == s_wait_timer) + s_wait_timer = 0; +*************** +*** 1707,1713 **** + static char_u k10[] = {K_SPECIAL, 'k', ';', 0}; + #endif + +! GetMessage(&msg, NULL, 0, 0); + + #ifdef FEAT_OLE + /* Look after OLE Automation commands */ +--- 1707,1713 ---- + static char_u k10[] = {K_SPECIAL, 'k', ';', 0}; + #endif + +! pGetMessage(&msg, NULL, 0, 0); + + #ifdef FEAT_OLE + /* Look after OLE Automation commands */ +*************** +*** 1718,1724 **** + { + /* Message can't be ours, forward it. Fixes problem with Ultramon + * 3.0.4 */ +! DispatchMessage(&msg); + } + else + { +--- 1718,1724 ---- + { + /* Message can't be ours, forward it. Fixes problem with Ultramon + * 3.0.4 */ +! pDispatchMessage(&msg); + } + else + { +*************** +*** 1749,1762 **** + if (msg.message == WM_USER) + { + MyTranslateMessage(&msg); +! DispatchMessage(&msg); + return; + } + #endif + + #ifdef MSWIN_FIND_REPLACE + /* Don't process messages used by the dialog */ +! if (s_findrep_hwnd != NULL && IsDialogMessage(s_findrep_hwnd, &msg)) + { + HandleMouseHide(msg.message, msg.lParam); + return; +--- 1749,1762 ---- + if (msg.message == WM_USER) + { + MyTranslateMessage(&msg); +! pDispatchMessage(&msg); + return; + } + #endif + + #ifdef MSWIN_FIND_REPLACE + /* Don't process messages used by the dialog */ +! if (s_findrep_hwnd != NULL && pIsDialogMessage(s_findrep_hwnd, &msg)) + { + HandleMouseHide(msg.message, msg.lParam); + return; +*************** +*** 1928,1934 **** + if (vk != VK_F10 || check_map(k10, State, FALSE, TRUE, FALSE, + NULL, NULL) == NULL) + #endif +! DispatchMessage(&msg); + } + + /* +--- 1928,1934 ---- + if (vk != VK_F10 || check_map(k10, State, FALSE, TRUE, FALSE, + NULL, NULL) == NULL) + #endif +! pDispatchMessage(&msg); + } + + /* +*************** +*** 1943,1949 **** + MSG msg; + + if (!s_busy_processing) +! while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) + && !vim_is_input_buf_full()) + process_message(); + } +--- 1943,1949 ---- + MSG msg; + + if (!s_busy_processing) +! while (pPeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) + && !vim_is_input_buf_full()) + process_message(); + } +*************** +*** 2019,2025 **** + KillTimer(NULL, s_wait_timer); + + /* Eat spurious WM_TIMER messages */ +! while (PeekMessage(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) + ; + s_wait_timer = 0; + } +--- 2019,2025 ---- + KillTimer(NULL, s_wait_timer); + + /* Eat spurious WM_TIMER messages */ +! while (pPeekMessage(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) + ; + s_wait_timer = 0; + } +*** ../vim-7.3.276/src/os_mswin.c 2011-06-19 01:30:01.000000000 +0200 +--- src/os_mswin.c 2011-08-10 16:45:24.000000000 +0200 +*************** +*** 1856,1867 **** + { + MSG msg; + +! while (!*bUserAbort && PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + { +! if (!hDlgPrint || !IsDialogMessage(hDlgPrint, &msg)) + { + TranslateMessage(&msg); +! DispatchMessage(&msg); + } + } + return !*bUserAbort; +--- 1856,1867 ---- + { + MSG msg; + +! while (!*bUserAbort && pPeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + { +! if (!hDlgPrint || !pIsDialogMessage(hDlgPrint, &msg)) + { + TranslateMessage(&msg); +! pDispatchMessage(&msg); + } + } + return !*bUserAbort; +*************** +*** 3132,3141 **** + { + MSG msg; + +! while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); +! DispatchMessage(&msg); + } + } + +--- 3132,3141 ---- + { + MSG msg; + +! while (pPeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); +! pDispatchMessage(&msg); + } + } + +*** ../vim-7.3.276/src/os_win32.c 2011-07-07 16:20:45.000000000 +0200 +--- src/os_win32.c 2011-08-10 16:54:50.000000000 +0200 +*************** +*** 152,157 **** +--- 152,165 ---- + # define wcsicmp(a, b) wcscmpi((a), (b)) + #endif + ++ /* Enable common dialogs input unicode from IME if posible. */ ++ #ifdef FEAT_MBYTE ++ LRESULT (WINAPI *pDispatchMessage)(LPMSG) = DispatchMessage; ++ BOOL (WINAPI *pGetMessage)(LPMSG, HWND, UINT, UINT) = GetMessage; ++ BOOL (WINAPI *pIsDialogMessage)(HWND, LPMSG) = IsDialogMessage; ++ BOOL (WINAPI *pPeekMessage)(LPMSG, HWND, UINT, UINT, UINT) = PeekMessage; ++ #endif ++ + #ifndef FEAT_GUI_W32 + /* Win32 Console handles for input and output */ + static HANDLE g_hConIn = INVALID_HANDLE_VALUE; +*************** +*** 3284,3293 **** + { + MSG msg; + +! if (PeekMessage(&msg, (HWND)NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); +! DispatchMessage(&msg); + } + if (WaitForSingleObject(pi.hProcess, delay) != WAIT_TIMEOUT) + break; +--- 3292,3301 ---- + { + MSG msg; + +! if (pPeekMessage(&msg, (HWND)NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); +! pDispatchMessage(&msg); + } + if (WaitForSingleObject(pi.hProcess, delay) != WAIT_TIMEOUT) + break; +*** ../vim-7.3.276/src/os_win32.h 2011-05-05 18:31:54.000000000 +0200 +--- src/os_win32.h 2011-08-10 16:51:58.000000000 +0200 +*************** +*** 193,195 **** +--- 193,209 ---- + #else + # define vim_mkdir(x, y) mch_mkdir(x) + #endif ++ ++ /* Enable common dialogs input unicode from IME if posible. */ ++ #ifdef FEAT_MBYTE ++ /* The variables are defined in os_win32.c. */ ++ extern LRESULT (WINAPI *pDispatchMessage)(LPMSG); ++ extern BOOL (WINAPI *pGetMessage)(LPMSG, HWND, UINT, UINT); ++ extern BOOL (WINAPI *pIsDialogMessage)(HWND, LPMSG); ++ extern BOOL (WINAPI *pPeekMessage)(LPMSG, HWND, UINT, UINT, UINT); ++ #else ++ # define pDispatchMessage DispatchMessage ++ # define pGetMessage GetMessage ++ # define pIsDialogMessage IsDialogMessage ++ # define pPeekMessage PeekMessage ++ #endif +*** ../vim-7.3.276/src/version.c 2011-08-10 16:31:18.000000000 +0200 +--- src/version.c 2011-08-10 17:06:55.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 277, + /**/ + +-- +Veni, Vidi, VW -- I came, I saw, I drove around in a little car. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.278 b/source/ap/vim/patches/7.3.278 new file mode 100644 index 00000000..60bc0ac8 --- /dev/null +++ b/source/ap/vim/patches/7.3.278 @@ -0,0 +1,73 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.278 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.278 +Problem: Passing the file name to open in VisVim doesn't work. +Solution: Adjust the index and check for end of buffer. (Jiri Sedlak) +Files: src/VisVim/Commands.cpp + + +*** ../vim-7.3.277/src/VisVim/Commands.cpp 2010-08-15 21:57:27.000000000 +0200 +--- src/VisVim/Commands.cpp 2011-08-10 17:21:27.000000000 +0200 +*************** +*** 549,555 **** + if (g_bNewTabs) + { + sprintf(VimCmd, ":tab drop "); +! s = VimCmd + 11; + } + else + { +--- 549,555 ---- + if (g_bNewTabs) + { + sprintf(VimCmd, ":tab drop "); +! s = VimCmd + 10; + } + else + { +*************** +*** 557,564 **** + s = VimCmd + 6; + } + sprintf(FileNameTmp, "%S", (char *)FileName); +! for (p = FileNameTmp; *p != '\0' && s < FileNameTmp + MAX_OLE_STR - 4; +! ++p) + if (*p == '\\') + *s++ = '/'; + else +--- 557,563 ---- + s = VimCmd + 6; + } + sprintf(FileNameTmp, "%S", (char *)FileName); +! for (p = FileNameTmp; *p != '\0' && s < VimCmd + MAX_OLE_STR - 4; ++p) + if (*p == '\\') + *s++ = '/'; + else +*** ../vim-7.3.277/src/version.c 2011-08-10 17:07:56.000000000 +0200 +--- src/version.c 2011-08-10 17:25:20.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 278, + /**/ + +-- +ARTHUR: But if he was dying, he wouldn't bother to carve + "Aaaaarrrrrrggghhh". He'd just say it. +BROTHER MAYNARD: It's down there carved in stone. +GALAHAD: Perhaps he was dictating. + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.279 b/source/ap/vim/patches/7.3.279 new file mode 100644 index 00000000..6a8814b6 --- /dev/null +++ b/source/ap/vim/patches/7.3.279 @@ -0,0 +1,118 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.279 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.279 +Problem: With GTK, when gvim is full-screen and a tab is opened and using a + specific monitor configuration the window is too big. +Solution: Adjust the window size like on MS-Windows. (Yukihiro Nakadaira) +Files: src/gui.c, src/gui_gtk_x11.c, src/proto/gui_gtk_x11.pro + + +*** ../vim-7.3.278/src/gui.c 2011-06-26 04:48:56.000000000 +0200 +--- src/gui.c 2011-08-10 17:40:31.000000000 +0200 +*************** +*** 1407,1413 **** + if (!gui.shell_created) + return; + +! #ifdef MSWIN + /* If not setting to a user specified size and maximized, calculate the + * number of characters that fit in the maximized window. */ + if (!mustset && gui_mch_maximized()) +--- 1407,1413 ---- + if (!gui.shell_created) + return; + +! #if defined(MSWIN) || defined(FEAT_GUI_GTK) + /* If not setting to a user specified size and maximized, calculate the + * number of characters that fit in the maximized window. */ + if (!mustset && gui_mch_maximized()) +*** ../vim-7.3.278/src/gui_gtk_x11.c 2011-06-26 04:48:56.000000000 +0200 +--- src/gui_gtk_x11.c 2011-08-10 17:42:19.000000000 +0200 +*************** +*** 3900,3905 **** +--- 3900,3920 ---- + } + + /* ++ * Called when the font changed while the window is maximized. Compute the ++ * new Rows and Columns. This is like resizing the window. ++ */ ++ void ++ gui_mch_newfont() ++ { ++ int w, h; ++ ++ gtk_window_get_size(GTK_WINDOW(gui.mainwin), &w, &h); ++ w -= get_menu_tool_width(); ++ h -= get_menu_tool_height(); ++ gui_resize_shell(w, h); ++ } ++ ++ /* + * Set the windows size. + */ + void +*************** +*** 4409,4422 **** + + if (gui_mch_maximized()) + { +- int w, h; +- + /* Update lines and columns in accordance with the new font, keep the + * window maximized. */ +! gtk_window_get_size(GTK_WINDOW(gui.mainwin), &w, &h); +! w -= get_menu_tool_width(); +! h -= get_menu_tool_height(); +! gui_resize_shell(w, h); + } + else + { +--- 4424,4432 ---- + + if (gui_mch_maximized()) + { + /* Update lines and columns in accordance with the new font, keep the + * window maximized. */ +! gui_mch_newfont(); + } + else + { +*** ../vim-7.3.278/src/proto/gui_gtk_x11.pro 2010-08-15 21:57:28.000000000 +0200 +--- src/proto/gui_gtk_x11.pro 2011-08-10 17:42:29.000000000 +0200 +*************** +*** 20,25 **** +--- 20,26 ---- + void gui_mch_set_winpos __ARGS((int x, int y)); + int gui_mch_maximized __ARGS((void)); + void gui_mch_unmaximize __ARGS((void)); ++ void gui_mch_newfont __ARGS((void)); + void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction)); + void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h)); + void gui_mch_settitle __ARGS((char_u *title, char_u *icon)); +*** ../vim-7.3.278/src/version.c 2011-08-10 17:25:48.000000000 +0200 +--- src/version.c 2011-08-10 17:43:22.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 279, + /**/ + +-- +LAUNCELOT: Isn't there a St. Aaaaarrrrrrggghhh's in Cornwall? +ARTHUR: No, that's Saint Ives. + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.280 b/source/ap/vim/patches/7.3.280 new file mode 100644 index 00000000..1c1387ae --- /dev/null +++ b/source/ap/vim/patches/7.3.280 @@ -0,0 +1,181 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.280 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.280 +Problem: ":lmake" does not update the quickfix window title. +Solution: Update the title. (Lech Lorens) +Files: src/quickfix.c, src/testdir/test10.in, src/testdir/test10.ok + + +*** ../vim-7.3.279/src/quickfix.c 2011-08-10 13:21:30.000000000 +0200 +--- src/quickfix.c 2011-08-10 18:09:19.000000000 +0200 +*************** +*** 126,131 **** +--- 126,132 ---- + static win_T *qf_find_win __ARGS((qf_info_T *qi)); + static buf_T *qf_find_buf __ARGS((qf_info_T *qi)); + static void qf_update_buffer __ARGS((qf_info_T *qi)); ++ static void qf_set_title __ARGS((qf_info_T *qi)); + static void qf_fill_buffer __ARGS((qf_info_T *qi)); + #endif + static char_u *get_mef_name __ARGS((void)); +*************** +*** 2388,2395 **** + qf_fill_buffer(qi); + + if (qi->qf_lists[qi->qf_curlist].qf_title != NULL) +! set_internal_string_var((char_u *)"w:quickfix_title", +! qi->qf_lists[qi->qf_curlist].qf_title); + + curwin->w_cursor.lnum = qi->qf_lists[qi->qf_curlist].qf_index; + curwin->w_cursor.col = 0; +--- 2389,2395 ---- + qf_fill_buffer(qi); + + if (qi->qf_lists[qi->qf_curlist].qf_title != NULL) +! qf_set_title(qi); + + curwin->w_cursor.lnum = qi->qf_lists[qi->qf_curlist].qf_index; + curwin->w_cursor.col = 0; +*************** +*** 2526,2531 **** +--- 2526,2533 ---- + qf_info_T *qi; + { + buf_T *buf; ++ win_T *win; ++ win_T *curwin_save; + aco_save_T aco; + + /* Check if a buffer for the quickfix list exists. Update it. */ +*************** +*** 2537,2542 **** +--- 2539,2554 ---- + + qf_fill_buffer(qi); + ++ if (qi->qf_lists[qi->qf_curlist].qf_title != NULL ++ && (win = qf_find_win(qi)) != NULL) ++ { ++ curwin_save = curwin; ++ curwin = win; ++ qf_set_title(qi); ++ curwin = curwin_save; ++ ++ } ++ + /* restore curwin/curbuf and a few other things */ + aucmd_restbuf(&aco); + +*************** +*** 2544,2549 **** +--- 2556,2569 ---- + } + } + ++ static void ++ qf_set_title(qi) ++ qf_info_T *qi; ++ { ++ set_internal_string_var((char_u *)"w:quickfix_title", ++ qi->qf_lists[qi->qf_curlist].qf_title); ++ } ++ + /* + * Fill current buffer with quickfix errors, replacing any previous contents. + * curbuf must be the quickfix buffer! +*** ../vim-7.3.279/src/testdir/test10.in 2011-08-10 13:21:30.000000000 +0200 +--- src/testdir/test10.in 2011-08-10 18:28:31.000000000 +0200 +*************** +*** 5,13 **** + :" Also test a BOM is ignored. + :so mbyte.vim + :set encoding=utf-8 +! :/start of errorfile/,/end of errorfile/w! Xerrorfile + :/start of testfile/,/end of testfile/w! Xtestfile +! :cf Xerrorfile + rA + :cn + rB +--- 5,20 ---- + :" Also test a BOM is ignored. + :so mbyte.vim + :set encoding=utf-8 +! :7/start of errorfile/,/end of errorfile/w! Xerrorfile1 +! :7/start of errorfile/,/end of errorfile/-1w! Xerrorfile2 + :/start of testfile/,/end of testfile/w! Xtestfile +! :cf Xerrorfile2 +! :clast +! :copen +! :let a=w:quickfix_title +! :wincmd p +! gR=a  +! :cf Xerrorfile1 + rA + :cn + rB +*************** +*** 17,22 **** +--- 24,34 ---- + rD + :cn + rE ++ :cn ++ :wincmd w ++ :let a=w:quickfix_title ++ :wincmd p ++ gR=a  + :w! test.out " Write contents of this file + :qa! + ENDTEST +*************** +*** 33,38 **** +--- 45,52 ---- + "Xtestfile", linenr 19: yet another problem + + Does anyone know what is the problem and how to correction it? ++ "Xtestfile", line 21 col 9: What is the title of the quickfix window? ++ "Xtestfile", line 22 col 9: What is the title of the quickfix window? + end of errorfile + + start of testfile +*** ../vim-7.3.279/src/testdir/test10.ok 2010-08-15 21:57:29.000000000 +0200 +--- src/testdir/test10.ok 2011-08-10 18:03:53.000000000 +0200 +*************** +*** 18,23 **** + line 18 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + Eine 19 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + line 20 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +! line 21 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +! line 22 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + end of testfile +--- 18,23 ---- + line 18 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + Eine 19 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + line 20 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +! line 21 :cf Xerrorfile1xxxxxxxxxxxxxxx +! line 22 :cf Xerrorfile2xxxxxxxxxxxxxxx + end of testfile +*** ../vim-7.3.279/src/version.c 2011-08-10 17:44:41.000000000 +0200 +--- src/version.c 2011-08-10 18:35:52.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 280, + /**/ + +-- +"When I die, I want a tombstone that says "GAME OVER" - Ton Richters + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.281 b/source/ap/vim/patches/7.3.281 new file mode 100644 index 00000000..f90e95e1 --- /dev/null +++ b/source/ap/vim/patches/7.3.281 @@ -0,0 +1,134 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.281 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.281 +Problem: After using "expand('%:8')" the buffer name is changed. +Solution: Make a copy of the file name before shortening it. +Files: src/eval.c + + +*** ../vim-7.3.280/src/eval.c 2011-08-10 12:38:02.000000000 +0200 +--- src/eval.c 2011-08-17 15:12:39.000000000 +0200 +*************** +*** 23205,23210 **** +--- 23205,23211 ---- + int c; + int has_fullname = 0; + #ifdef WIN3264 ++ char_u *fname_start = *fnamep; + int has_shortname = 0; + #endif + +*************** +*** 23379,23402 **** + } + + #ifdef WIN3264 +! /* Check shortname after we have done 'heads' and before we do 'tails' + */ + if (has_shortname) + { +! pbuf = NULL; +! /* Copy the string if it is shortened by :h */ +! if (*fnamelen < (int)STRLEN(*fnamep)) + { + p = vim_strnsave(*fnamep, *fnamelen); +! if (p == 0) + return -1; + vim_free(*bufp); + *bufp = *fnamep = p; + } + + /* Split into two implementations - makes it easier. First is where +! * there isn't a full name already, second is where there is. +! */ + if (!has_fullname && !vim_isAbsName(*fnamep)) + { + if (shortpath_for_partial(fnamep, bufp, fnamelen) == FAIL) +--- 23380,23404 ---- + } + + #ifdef WIN3264 +! /* +! * Handle ":8" after we have done 'heads' and before we do 'tails'. + */ + if (has_shortname) + { +! /* Copy the string if it is shortened by :h and when it wasn't copied +! * yet, because we are going to change it in place. Avoids changing +! * the buffer name for "%:8". */ +! if (*fnamelen < (int)STRLEN(*fnamep) || *fnamep == fname_start) + { + p = vim_strnsave(*fnamep, *fnamelen); +! if (p == NULL) + return -1; + vim_free(*bufp); + *bufp = *fnamep = p; + } + + /* Split into two implementations - makes it easier. First is where +! * there isn't a full name already, second is where there is. */ + if (!has_fullname && !vim_isAbsName(*fnamep)) + { + if (shortpath_for_partial(fnamep, bufp, fnamelen) == FAIL) +*************** +*** 23404,23421 **** + } + else + { +! int l; + +! /* Simple case, already have the full-name + * Nearly always shorter, so try first time. */ +- l = *fnamelen; + if (get_short_pathname(fnamep, bufp, &l) == FAIL) + return -1; + + if (l == 0) + { +! /* Couldn't find the filename.. search the paths. +! */ + l = *fnamelen; + if (shortpath_for_invalid_fname(fnamep, bufp, &l) == FAIL) + return -1; +--- 23406,23421 ---- + } + else + { +! int l = *fnamelen; + +! /* Simple case, already have the full-name. + * Nearly always shorter, so try first time. */ + if (get_short_pathname(fnamep, bufp, &l) == FAIL) + return -1; + + if (l == 0) + { +! /* Couldn't find the filename, search the paths. */ + l = *fnamelen; + if (shortpath_for_invalid_fname(fnamep, bufp, &l) == FAIL) + return -1; +*** ../vim-7.3.280/src/version.c 2011-08-10 18:36:49.000000000 +0200 +--- src/version.c 2011-08-17 15:21:41.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 281, + /**/ + +-- +Kisses may last for as much as, but no more than, five minutes. + [real standing law in Iowa, United States of America] + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.282 b/source/ap/vim/patches/7.3.282 new file mode 100644 index 00000000..dcd16806 --- /dev/null +++ b/source/ap/vim/patches/7.3.282 @@ -0,0 +1,60 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.282 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.282 +Problem: When using input() and :echo in a loop the displayed text is + incorrect. (Benjamin Fritz) +Solution: Only restore the cursor position when there is a command line. + (Ben Schmidt) +Files: src/ex_getln.c + + +*** ../vim-7.3.281/src/ex_getln.c 2011-07-27 17:58:42.000000000 +0200 +--- src/ex_getln.c 2011-08-17 15:57:39.000000000 +0200 +*************** +*** 1969,1976 **** + # endif + s = getcmdline(firstc, 1L, 0); + restore_cmdline(&save_ccline); +! /* Restore msg_col, the prompt from input() may have changed it. */ +! msg_col = msg_col_save; + + return s; + } +--- 1969,1980 ---- + # endif + s = getcmdline(firstc, 1L, 0); + restore_cmdline(&save_ccline); +! /* Restore msg_col, the prompt from input() may have changed it. +! * But only if called recursively and the commandline is therefore being +! * restored to an old one; if not, the input() prompt stays on the screen, +! * so we need its modified msg_col left intact. */ +! if (ccline.cmdbuff != NULL) +! msg_col = msg_col_save; + + return s; + } +*** ../vim-7.3.281/src/version.c 2011-08-17 15:23:16.000000000 +0200 +--- src/version.c 2011-08-17 16:24:04.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 282, + /**/ + +-- +Why don't cannibals eat clowns? +Because they taste funny. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.283 b/source/ap/vim/patches/7.3.283 new file mode 100644 index 00000000..1a3a6358 --- /dev/null +++ b/source/ap/vim/patches/7.3.283 @@ -0,0 +1,114 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.283 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.283 +Problem: An expression mapping with a multi-byte character containing a + 0x80 byte gets messed up. (ZyX) +Solution: Unescape the expression before evaluating it (Yukihiro Nakadaira) +Files: src/getchar.c + + +*** ../vim-7.3.282/src/getchar.c 2011-04-28 17:30:05.000000000 +0200 +--- src/getchar.c 2011-08-17 17:04:38.000000000 +0200 +*************** +*** 3262,3270 **** + validate_maphash(); + + /* +! * find end of keys and skip CTRL-Vs (and backslashes) in it + * Accept backslash like CTRL-V when 'cpoptions' does not contain 'B'. +! * with :unmap white space is included in the keys, no argument possible + */ + p = keys; + do_backslash = (vim_strchr(p_cpo, CPO_BSLASH) == NULL); +--- 3262,3270 ---- + validate_maphash(); + + /* +! * Find end of keys and skip CTRL-Vs (and backslashes) in it. + * Accept backslash like CTRL-V when 'cpoptions' does not contain 'B'. +! * with :unmap white space is included in the keys, no argument possible. + */ + p = keys; + do_backslash = (vim_strchr(p_cpo, CPO_BSLASH) == NULL); +*************** +*** 4506,4517 **** +--- 4506,4528 ---- + { + char_u *res; + char_u *p; ++ char_u *expr; + char_u *save_cmd; + pos_T save_cursor; + ++ /* Remove escaping of CSI, because "str" is in a format to be used as ++ * typeahead. */ ++ expr = vim_strsave(str); ++ if (expr == NULL) ++ return NULL; ++ vim_unescape_csi(expr); ++ + save_cmd = save_cmdline_alloc(); + if (save_cmd == NULL) ++ { ++ vim_free(expr); + return NULL; ++ } + + /* Forbid changing text or using ":normal" to avoid most of the bad side + * effects. Also restore the cursor position. */ +*************** +*** 4521,4527 **** + #endif + set_vim_var_char(c); /* set v:char to the typed character */ + save_cursor = curwin->w_cursor; +! p = eval_to_string(str, NULL, FALSE); + --textlock; + #ifdef FEAT_EX_EXTRA + --ex_normal_lock; +--- 4532,4538 ---- + #endif + set_vim_var_char(c); /* set v:char to the typed character */ + save_cursor = curwin->w_cursor; +! p = eval_to_string(expr, NULL, FALSE); + --textlock; + #ifdef FEAT_EX_EXTRA + --ex_normal_lock; +*************** +*** 4529,4536 **** +--- 4540,4550 ---- + curwin->w_cursor = save_cursor; + + restore_cmdline_alloc(save_cmd); ++ vim_free(expr); ++ + if (p == NULL) + return NULL; ++ /* Escape CSI in the result to be able to use the string as typeahead. */ + res = vim_strsave_escape_csi(p); + vim_free(p); + +*** ../vim-7.3.282/src/version.c 2011-08-17 16:25:43.000000000 +0200 +--- src/version.c 2011-08-17 17:17:03.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 283, + /**/ + +-- +bashian roulette: +$ ((RANDOM%6)) || rm -rf ~ + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.284 b/source/ap/vim/patches/7.3.284 new file mode 100644 index 00000000..c621ced6 --- /dev/null +++ b/source/ap/vim/patches/7.3.284 @@ -0,0 +1,211 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.284 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.284 +Problem: The str2special() function doesn't handle multi-byte characters + properly. +Solution: Recognize multi-byte characters. (partly by Vladimir Vichniakov) +Files: src/getchar.c, src/message.c, src/misc2.c + + +*** ../vim-7.3.283/src/getchar.c 2011-08-17 17:18:14.000000000 +0200 +--- src/getchar.c 2011-08-17 20:11:58.000000000 +0200 +*************** +*** 3964,3970 **** + if (*mp->m_str == NUL) + msg_puts_attr((char_u *)"", hl_attr(HLF_8)); + else +! msg_outtrans_special(mp->m_str, FALSE); + #ifdef FEAT_EVAL + if (p_verbose > 0) + last_set_msg(mp->m_script_ID); +--- 3964,3980 ---- + if (*mp->m_str == NUL) + msg_puts_attr((char_u *)"", hl_attr(HLF_8)); + else +! { +! /* Remove escaping of CSI, because "m_str" is in a format to be used +! * as typeahead. */ +! char_u *s = vim_strsave(mp->m_str); +! if (s != NULL) +! { +! vim_unescape_csi(s); +! msg_outtrans_special(s, FALSE); +! vim_free(s); +! } +! } + #ifdef FEAT_EVAL + if (p_verbose > 0) + last_set_msg(mp->m_script_ID); +*** ../vim-7.3.283/src/message.c 2011-03-22 13:07:19.000000000 +0100 +--- src/message.c 2011-08-17 18:40:10.000000000 +0200 +*************** +*** 1547,1562 **** + if (IS_SPECIAL(c) || modifiers) /* special key */ + special = TRUE; + } +- *sp = str + 1; + + #ifdef FEAT_MBYTE +! /* For multi-byte characters check for an illegal byte. */ +! if (has_mbyte && MB_BYTE2LEN(*str) > (*mb_ptr2len)(str)) + { +! transchar_nonprint(buf, c); +! return buf; + } + #endif + + /* Make unprintable characters in <> form, also and . + * Use only for lhs of a mapping. */ +--- 1547,1573 ---- + if (IS_SPECIAL(c) || modifiers) /* special key */ + special = TRUE; + } + + #ifdef FEAT_MBYTE +! if (has_mbyte && !IS_SPECIAL(c)) + { +! int len = (*mb_ptr2len)(str); +! +! /* For multi-byte characters check for an illegal byte. */ +! if (has_mbyte && MB_BYTE2LEN(*str) > len) +! { +! transchar_nonprint(buf, c); +! *sp = str + 1; +! return buf; +! } +! /* Since 'special' is TRUE the multi-byte character 'c' will be +! * processed by get_special_key_name() */ +! c = (*mb_ptr2char)(str); +! *sp = str + len; + } ++ else + #endif ++ *sp = str + 1; + + /* Make unprintable characters in <> form, also and . + * Use only for lhs of a mapping. */ +*** ../vim-7.3.283/src/misc2.c 2011-07-27 17:31:42.000000000 +0200 +--- src/misc2.c 2011-08-17 20:27:30.000000000 +0200 +*************** +*** 2754,2759 **** +--- 2754,2760 ---- + int bit; + int key; + unsigned long n; ++ int l; + + src = *srcp; + if (src[0] != '<') +*************** +*** 2766,2773 **** + if (*bp == '-') + { + last_dash = bp; +! if (bp[1] != NUL && bp[2] == '>') +! ++bp; /* anything accepted, like */ + } + if (bp[0] == 't' && bp[1] == '_' && bp[2] && bp[3]) + bp += 3; /* skip t_xx, xx may be '-' or '>' */ +--- 2767,2783 ---- + if (*bp == '-') + { + last_dash = bp; +! if (bp[1] != NUL) +! { +! #ifdef FEAT_MBYTE +! if (has_mbyte) +! l = mb_ptr2len(bp + 1); +! else +! #endif +! l = 1; +! if (bp[l + 1] == '>') +! bp += l; /* anything accepted, like */ +! } + } + if (bp[0] == 't' && bp[1] == '_' && bp[2] && bp[3]) + bp += 3; /* skip t_xx, xx may be '-' or '>' */ +*************** +*** 2777,2791 **** + { + end_of_name = bp + 1; + +- if (STRNICMP(src + 1, "char-", 5) == 0 && VIM_ISDIGIT(src[6])) +- { +- /* or or */ +- vim_str2nr(src + 6, NULL, NULL, TRUE, TRUE, NULL, &n); +- *modp = 0; +- *srcp = end_of_name; +- return (int)n; +- } +- + /* Which modifiers are given? */ + modifiers = 0x0; + for (bp = src + 1; bp < last_dash; bp++) +--- 2787,2792 ---- +*************** +*** 2804,2814 **** + */ + if (bp >= last_dash) + { + /* + * Modifier with single letter, or special key name. + */ +! if (modifiers != 0 && last_dash[2] == '>') +! key = last_dash[1]; + else + { + key = get_special_key_code(last_dash + 1); +--- 2805,2831 ---- + */ + if (bp >= last_dash) + { ++ if (STRNICMP(last_dash + 1, "char-", 5) == 0 ++ && VIM_ISDIGIT(last_dash[6])) ++ { ++ /* or or */ ++ vim_str2nr(last_dash + 6, NULL, NULL, TRUE, TRUE, NULL, &n); ++ *modp = modifiers; ++ *srcp = end_of_name; ++ return (int)n; ++ } ++ + /* + * Modifier with single letter, or special key name. + */ +! #ifdef FEAT_MBYTE +! if (has_mbyte) +! l = mb_ptr2len(last_dash + 1); +! else +! #endif +! l = 1; +! if (modifiers != 0 && last_dash[l + 1] == '>') +! key = PTR2CHAR(last_dash + 1); + else + { + key = get_special_key_code(last_dash + 1); +*** ../vim-7.3.283/src/version.c 2011-08-17 17:18:14.000000000 +0200 +--- src/version.c 2011-08-17 20:27:47.000000000 +0200 +*************** +*** 711,712 **** +--- 711,714 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 284, + /**/ + +-- +Snoring is prohibited unless all bedroom windows are closed and securely +locked. + [real standing law in Massachusetts, United States of America] + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/source/ap/vim/patches/7.3.285 b/source/ap/vim/patches/7.3.285 new file mode 100644 index 00000000..24be28bc --- /dev/null +++ b/source/ap/vim/patches/7.3.285 @@ -0,0 +1,144 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.285 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.285 (after 7.3.284) +Problem: Mapping no longer works. +Solution: Properly check for "char-". Add a test for it. +Files: src/misc2.c, src/testdir/test75.in, src/testdir/test75.ok + + +*** ../vim-7.3.284/src/misc2.c 2011-08-17 20:33:18.000000000 +0200 +--- src/misc2.c 2011-08-19 22:08:37.000000000 +0200 +*************** +*** 2781,2786 **** +--- 2781,2792 ---- + } + if (bp[0] == 't' && bp[1] == '_' && bp[2] && bp[3]) + bp += 3; /* skip t_xx, xx may be '-' or '>' */ ++ else if (STRNICMP(bp, "char-", 5) == 0) ++ { ++ vim_str2nr(bp + 5, NULL, &l, TRUE, TRUE, NULL, NULL); ++ bp += l + 5; ++ break; ++ } + } + + if (*bp == '>') /* found matching '>' */ +*************** +*** 2810,2836 **** + { + /* or or */ + vim_str2nr(last_dash + 6, NULL, NULL, TRUE, TRUE, NULL, &n); +! *modp = modifiers; +! *srcp = end_of_name; +! return (int)n; + } +- +- /* +- * Modifier with single letter, or special key name. +- */ +- #ifdef FEAT_MBYTE +- if (has_mbyte) +- l = mb_ptr2len(last_dash + 1); +- else +- #endif +- l = 1; +- if (modifiers != 0 && last_dash[l + 1] == '>') +- key = PTR2CHAR(last_dash + 1); + else + { +! key = get_special_key_code(last_dash + 1); +! if (!keep_x_key) +! key = handle_x_keys(key); + } + + /* +--- 2816,2842 ---- + { + /* or or */ + vim_str2nr(last_dash + 6, NULL, NULL, TRUE, TRUE, NULL, &n); +! key = (int)n; + } + else + { +! /* +! * Modifier with single letter, or special key name. +! */ +! #ifdef FEAT_MBYTE +! if (has_mbyte) +! l = mb_ptr2len(last_dash + 1); +! else +! #endif +! l = 1; +! if (modifiers != 0 && last_dash[l + 1] == '>') +! key = PTR2CHAR(last_dash + 1); +! else +! { +! key = get_special_key_code(last_dash + 1); +! if (!keep_x_key) +! key = handle_x_keys(key); +! } + } + + /* +*** ../vim-7.3.284/src/testdir/test75.in 2010-10-20 21:22:17.000000000 +0200 +--- src/testdir/test75.in 2011-08-19 22:05:13.000000000 +0200 +*************** +*** 2,7 **** +--- 2,8 ---- + + STARTTEST + :so small.vim ++ :set cpo-=< + :" Test maparg() with a string result + :map foo isfoo + :vnoremap + + +
+

Skip to main content

+ +
+
+ +
+
+ + + + +
+

NSS FAQ

+ + +Newsgroup: +mozilla.dev.tech.crypto + + +
+ +

+

+

+ +General Questions + +

+ +Developer Questions + + +Licensing Questions + +

+
General Questions

+

What is Network Security Services (NSS)?

+

NSS is set of libraries, APIs, utilities, and documentation designed +to support cross-platform development of security-enabled client and +server applications. It provides a complete open-source implementation +of the crypto libraries used by Netscape and other companies in the +Netscape 6 browser, server products from iPlanet E-Commerce Solutions, the +Gateway Connected Touch Pad with Instant AOL, and other products. + +

For an +overview of NSS, see Overview of NSS. For detailed information +on the open-source NSS project, see NSS Project Page. + +
+

What can I do with NSS? Is NSS appropriate for +my application?

+

If you want add support for SSL, S/MIME, or other Internet security standards +to your application, you can use Network Security Services (NSS) to do so. Because +NSS provides complete support for all versions of SSL and TLS, it is particularly well-suited +for applications that need to communicate with the many clients and servers +that already support the SSL protocol. +

The PKCS #11 interface included in NSS means that your application can +use hardware accelerators on the server and smart +cards for two-factor authentication. +
+ +

How does NSS compare to OpenSSL?

+ +OpenSSL is an open source project that implements server-side SSL, +TLS, and a general-purpose cryptography library. It does not support PKCS #11. It is based on +the SSLeay library developed by Eric A. Young and Tim J. Hudson. OpenSSL is widely used in +Apache servers and is licensed under an Apache-style licence. + +

NSS supports both server and client applications as well as PKCS #11 and S/MIME. To permit its use +in as many contexts as possible, +NSS is triple-licensed under the Mozilla Public License, the +GNU General Public License, +and the GNU Lesser General Public License. +You may choose to use the code either under the terms of the MPL or the GPL or the LGPL. + +

How does NSS compare to SSLRef?

+SSLRef was an early reference implementation of the SSL protocol. It contains +bugs that were never fixed, doesn't support TLS or or the +new 56-bit export cipher suites, and does not contain the fix to the +Bleichenbacher attack on PKCS#1. + +

Netscape no longer maintains SSLRef or makes it available. It was built as +an example of an SSL implementation, not for creating production applications. + +

NSS was designed from the ground up for use by commercial developers. +It provides a complete software development kit +that uses the same architecture used to support security features in many client +and server products from Netscape and other companies. + +

What platforms and development environments are supported?

+

iPlanet E-Commerce Solutions has certified NSS 3.1 on 18 platforms, including AIX 4.3, HP-UX 11.0, +Red Hat Linux 6.0, Solaris (2.6 or later), Windows NT (4.0 or later), and +Windows 2000. Other contributors are in the process of certifying additional platforms. +The NSS 3.1 API requires C or C++ development environments. + +

For the latest NSS release notes and detailed platform information, see +NSS 3.1 Release Notes. + +

What cryptography standards does NSS support?

+

NSS supports SSL v2 and v3, + TLS, + PKCS #5, + PKCS #7, + PKCS #11, + PKCS #12, + S/MIME, and + X.509 v3 certificates. +For complete details, +see +Encryption Technologies. + +

What is the relationship between NSS and PSM?

+ +Personal Security Manager (PSM) is built on top of NSS. It consists of libraries +and a daemon designed to support cross-platform development of security-enabled +client applications. The PSM binary provides a client module +that performs cryptographic operations on behalf of applications. +Netscape Personal Security Manager ships with Netscape 6 and the Gateway Connected Touch Pad with Instant AOL, +and is also available for use with Communicagotr 4.7x. + +

For more information about the PSM open-source project, see Personal Security Manager. + +

Where can I get the source code?

+ +For instructions on how to check out and build the NSS 3.1 source code, see +Build Instructions for NSS 3.1. The source code may also +be downloaded as a tar file from +ftp://ftp.mozilla.org/pub/mozilla.org/security/. + +

How much does it cost?

+ +NSS source code and binaries (when they become available) are completely free. No license fees, +no royalty fees, no subscription fees. + + +

+
Developer Questions

+ +

What hardware accelerators are supported?

+

NSS supports the PKCS #11 interface for hardware acceleration. Since leading accelerator vendors such as +Chrysalis-IT, nCipher, and Rainbow Technologies also support this interface, NSS-enabled applications +can support a wide variety of hardware accelerators. +

How do I integrate smart cards into my application using +NSS?

+

NSS supports the PKCS #11 interface for smart card integration. Applications that use the PKCS #11 +interface provided by NSS will therefore support smart cards from leading vendors such as +ActiveCard, Litronic, and SecureID Technologies that also support the PKCS #11 interface. + +

How is NSS compatible with other Netscape products?

+

NSS provides tight integration with other Netscape products in two ways. +First, by using NSS to implement SSL and TLS, you can support SSL communications +with all products from Netscape and all other vendors +that support SSL and TLS. Second, NSS makes it easy +to share certificates between Netscape client and server products +and your application. + +

Does NSS require Netscape Portable Runtime (NSPR)?

+

To provide cross-platform support, NSS utilizes Netscape Portable Runtime +(NSPR) libraries as a portability interface and implementation that +provides consistent cross-platform semantics for network I/O and threading +models. You can use NSPR throughout your application or +only in the portion that calls into NSS. Netscape strongly recommends that +multithreaded applications use the NSPR or native OS threading model. (In +recent NSPR releases, the NSPR threading model is compatible with the native +threading model if the OS has native threads.) Alternatively, you can adapt +the open-source NSPR implementation to be compatible with your existing +application's threading models. More information about NSPR may be found at +Netscape Portable Runtime. +
+ +

Can I use NSS even if my application protocol isn't +HTTP?

+

Yes, SSL independent of application protocols. It works with common +Internet standard application protocols (HTTP, POP3, FTP, SMTP, etc.) as +well as custom application protocols using TCP/IP. + +
+

How long does it take to integrate NSS into my application?

+

The integration effort depends on an number of factors, such as developer +skill set, application complexity, and the level of security required for +your application. NSS includes detailed documentation of the SSL API and +sample code that demonstrates basic SSL functionality (setting up an encrypted +session, server authentication, and client authentication) to help jump start the +integration process. However, there is little or no documentation currently +available for the rest of the NSS API. If your application requires sophisticated +certificate management, smart card support, or hardware acceleration, your +integration effort will be more extensive. + +

Where can I download the NSS tools?

+ +Currently, you must download the NSS source and build it to create binary files for the NSS tools. +For more information, see NSS Tools. + + +

How can I learn more about SSL?

+ +NSS provides extensive documentation related to SSL, including high-level introductions, +detailed API documentation, sample code for simple client and server +applications, the original SSL 3.0 specification, and +information on debugging SSL applications. For details, see the +SSL/TLS Project Page. For information about the NSS tools, including those used +for debugging SSL applications, see +NSS Security Tools. + +

+
Licensing Questions

+

How is NSS licensed?

+

NSS is triple-licensed under the Mozilla Public License, the +GNU General Public License, +and the GNU Lesser General Public License. +For more details, see the Mozilla Crypto FAQ. + +

Is NSS available outside the United States?

+

Yes; see +Build Instructions for NSS 3.1. and +ftp://ftp.mozilla.org/pub/mozilla.org/security/. +However, NSS source code is subject to the U.S. Export +Administration Regulations and other U.S. law, and may not be exported or +re-exported to certain +countries (currently Cuba, Iran, Libya, North Korea, Sudan and Syria) or +to persons or entities prohibited from receiving U.S. exports (including +those (a) on the Bureau of Industry and Security Denied Parties List or +Entity List, (b) on the Office of Foreign Assets Control list of Specially +Designated Nationals and Blocked Persons, and (c) involved with missile +technology or nuclear, chemical or biological weapons). + +

For more information about U.S. export controls on encryption software, +see the Mozilla Crypto FAQ. + + + + + +

+
+
+ +
+ + diff --git a/source/l/mozilla-nss/gpl-2.0.txt b/source/l/mozilla-nss/gpl-2.0.txt new file mode 100644 index 00000000..d511905c --- /dev/null +++ b/source/l/mozilla-nss/gpl-2.0.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/source/l/mozilla-nss/lgpl-2.1.txt b/source/l/mozilla-nss/lgpl-2.1.txt new file mode 100644 index 00000000..602bfc94 --- /dev/null +++ b/source/l/mozilla-nss/lgpl-2.1.txt @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild new file mode 100755 index 00000000..2bc38d08 --- /dev/null +++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild @@ -0,0 +1,178 @@ +#!/bin/sh +# Copyright 2005, 2006, 2008, 2009, 2010, 2012 Eric Hameleers, Eindhoven, NL +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# ----------------------------------------------------------------------------- + +PKGNAM=mozilla-nss +SRCNAM=nss +VERSION=${VERSION:-3.13.5} +NSPR=${NSPR:-4.9.1} +BUILD=${BUILD:-3} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + export USE_64=1 +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf nss-${VERSION} +rm -rf nspr-${NSPR} +tar xvf $CWD/nss-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/nspr-$NSPR.tar.?z* || exit 1 +cd nss-$VERSION + +# NSS needs NSPR: +ln -s ../../nspr-$NSPR/mozilla/nsprpub mozilla/nsprpub + +# Make sure ownerships and permissions are sane: +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +echo Building ... +export LDFLAGS="-lz" +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +export BUILD_OPT=1 +export NSDISTMODE="copy" +export NSS_USE_SYSTEM_SQLITE=1 +cd mozilla/security/nss + make nss_build_all export +cd - + +# Install all the needed stuff to the package dir: +mkdir -p $PKG/usr/{bin,lib${LIBDIRSUFFIX},include/{nss,nspr}} +cd mozilla/dist/$(uname -s)* + cp -pL bin/{certutil,cmsutil,crlutil,modutil,pk12util,shlibsign,signtool,signver,ssltap} $PKG/usr/bin/ + cp -pL lib/* $PKG/usr/lib${LIBDIRSUFFIX}/ + chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/*.so* + cp -rL include/* $PKG/usr/include/nspr/ + cp -rpL ../public/nss/*.h $PKG/usr/include/nss/ + # Remove some things we do not need: + rm -f $PKG/usr/bin/*.so + rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a + rm -rf $PKG/usr/include/nspr/md + cp -L lib/libcrmf.a $PKG/usr/lib${LIBDIRSUFFIX}/ # yes, put this one back +cd - + +cd mozilla/security/nss/cmd/smimetools + cp -a smime $PKG/usr/bin/ + chmod 0755 $PKG/usr/bin/smime + sed -i -e 's#/usr/local/bin#/usr/bin#g' $PKG/usr/bin/smime +cd - + +# Install nspr-config: +cat mozilla/nsprpub/$(uname -s)*/config/nspr-config | sed -e "s,prefix=/usr/local,prefix=/usr,g" | sed -e "s,libdir=\${exec_prefix}/lib,libdir=\${exec_prefix}/lib${LIBDIRSUFFIX},g" > $PKG/usr/bin/nspr-config +chmod 755 $PKG/usr/bin/nspr-config + +# Install nss-config: +sed -e "s,@prefix@,/usr,g" \ + -e "s,@MOD_MAJOR_VERSION@,$(printf $VERSION | cut -d. -f1),g" \ + -e "s,@MOD_MINOR_VERSION@,$(printf $VERSION | cut -d. -f2),g" \ + -e "s,@MOD_PATCH_VERSION@,$(printf $VERSION | cut -d. -f3),g" \ + $CWD/nss-config.in > $PKG/usr/bin/nss-config +chmod 755 $PKG/usr/bin/nss-config + +# Provide pkg-config files: +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig +cat < $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/mozilla-nss.pc +prefix=/usr +exec_prefix=\${prefix} +libdir=/usr/lib${LIBDIRSUFFIX} +includedir=\${prefix}/include/nss + +Name: NSS +Description: Network Security Services +Version: $VERSION +Requires: nspr >= $NSPR sqlite3 +Libs: -L\${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3 -lnssutil3 +Cflags: -I\${includedir} +EOT +cat < $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/mozilla-nspr.pc +prefix=/usr +exec_prefix=\${prefix} +libdir=/usr/lib${LIBDIRSUFFIX} +includedir=\${prefix}/include/nspr + +Name: NSPR +Description: The Netscape Portable Runtime +Version: $NSPR +Libs: -L\${libdir} -lplds4 -lplc4 -lnspr4 +Cflags: -I\${includedir} +EOT + +( cd $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig + ln -s mozilla-nspr.pc nspr.pc + ln -s mozilla-nss.pc nss.pc +) + +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + $CWD/MPL-1.1.txt $CWD/gpl-2.0.txt $CWD/lgpl-2.1.txt \ + $CWD/faq.html \ + $PKG/usr/doc/$PKGNAM-$VERSION +chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Add a package description: +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz + diff --git a/source/l/mozilla-nss/nss-config.in b/source/l/mozilla-nss/nss-config.in new file mode 100644 index 00000000..f8f893e7 --- /dev/null +++ b/source/l/mozilla-nss/nss-config.in @@ -0,0 +1,145 @@ +#!/bin/sh + +prefix=@prefix@ + +major_version=@MOD_MAJOR_VERSION@ +minor_version=@MOD_MINOR_VERSION@ +patch_version=@MOD_PATCH_VERSION@ + +usage() +{ + cat <&2 +fi + +lib_ssl=yes +lib_smime=yes +lib_nss=yes +lib_nssutil=yes + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix=$optarg + ;; + --exec-prefix) + echo_exec_prefix=yes + ;; + --includedir=*) + includedir=$optarg + ;; + --includedir) + echo_includedir=yes + ;; + --libdir=*) + libdir=$optarg + ;; + --libdir) + echo_libdir=yes + ;; + --version) + echo ${major_version}.${minor_version}.${patch_version} + ;; + --cflags) + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + ssl) + lib_ssl=yes + ;; + smime) + lib_smime=yes + ;; + nss) + lib_nss=yes + ;; + nssutil) + lib_nssutil=yes + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +# Set variables that may be dependent upon other variables +if test -z "$exec_prefix"; then + exec_prefix=`pkg-config --variable=exec_prefix nss` +fi +if test -z "$includedir"; then + includedir=`pkg-config --variable=includedir nss` +fi +if test -z "$libdir"; then + libdir=`pkg-config --variable=libdir nss` +fi + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi + +if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix +fi + +if test "$echo_includedir" = "yes"; then + echo $includedir +fi + +if test "$echo_libdir" = "yes"; then + echo $libdir +fi + +if test "$echo_cflags" = "yes"; then + echo -I$includedir +fi + +if test "$echo_libs" = "yes"; then + libdirs="-Wl,-rpath-link,$libdir -L$libdir" + if test -n "$lib_ssl"; then + libdirs="$libdirs -lssl${major_version}" + fi + if test -n "$lib_smime"; then + libdirs="$libdirs -lsmime${major_version}" + fi + if test -n "$lib_nss"; then + libdirs="$libdirs -lnss${major_version}" + fi + if test -n "$lib_nssutil"; then + libdirs="$libdirs -lnssutil${major_version}" + fi + echo $libdirs +fi + diff --git a/source/l/mozilla-nss/slack-desc b/source/l/mozilla-nss/slack-desc new file mode 100644 index 00000000..7a23daaf --- /dev/null +++ b/source/l/mozilla-nss/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +mozilla-nss: mozilla-nss (Network Security Services) +mozilla-nss: +mozilla-nss: Network Security Services (NSS) is a set of libraries designed to +mozilla-nss: support cross-platform development of security-enabled client and +mozilla-nss: server applications. Applications built with NSS can support +mozilla-nss: SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, +mozilla-nss: X.509 v3 certificates, and other security standards. +mozilla-nss: +mozilla-nss: +mozilla-nss: Read http://www.mozilla.org/projects/security/pki/nss/overview.html +mozilla-nss: diff --git a/source/l/mpfr/mpfr.SlackBuild b/source/l/mpfr/mpfr.SlackBuild index a96001cd..1e56ba3d 100755 --- a/source/l/mpfr/mpfr.SlackBuild +++ b/source/l/mpfr/mpfr.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,23 +20,26 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2011 by Eric Hameleers for ARM port. PKGNAM=mpfr -VERSION=${VERSION:-$(echo mpfr-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo mpfr-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:-" -j7 "} + # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:-" -j7 "} - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -46,11 +49,19 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-mpfr @@ -65,7 +76,7 @@ fi cd $TMP rm -rf mpfr-$VERSION -tar xvf $CWD/mpfr-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/mpfr-$VERSION.tar.xz || exit 1 cd mpfr-$VERSION chown -R root:root . @@ -78,6 +89,11 @@ if [ ! -z "$(ls $CWD/patches/* 2> /dev/null)" ]; then done fi +# End of preparations +if echo "$*" | grep -qw -- --prep ; then + exit 0 +fi + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -86,7 +102,7 @@ CFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/mpfr-$VERSION \ --enable-static=yes \ --enable-shared=yes \ - --build=$ARCH-slackware-linux + --build=$TARGET make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/neon/neon.SlackBuild b/source/l/neon/neon.SlackBuild index 7725cce8..abba3b6e 100755 --- a/source/l/neon/neon.SlackBuild +++ b/source/l/neon/neon.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=neon VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/notify-python/libnotify07.patch b/source/l/notify-python/libnotify07.patch new file mode 100644 index 00000000..b7bf44b5 --- /dev/null +++ b/source/l/notify-python/libnotify07.patch @@ -0,0 +1,38 @@ +http://pkgs.fedoraproject.org/gitweb/?p=notify-python.git;a=blob_plain;f=libnotify07.patch;hb=HEAD + +diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs +--- notify-python-0.1.1/src/pynotify.defs.notify070 2010-11-02 17:11:14.928179237 -0400 ++++ notify-python-0.1.1/src/pynotify.defs 2010-11-02 17:11:51.153180231 -0400 +@@ -38,7 +38,6 @@ + '("const-gchar*" "summary") + '("const-gchar*" "message" (null-ok) (default "NULL")) + '("const-gchar*" "icon" (null-ok) (default "NULL")) +- '("GtkWidget*" "attach" (null-ok) (default "NULL")) + ) + ) + +@@ -53,24 +52,6 @@ + ) + ) + +-(define-method attach_to_widget +- (of-object "NotifyNotification") +- (c-name "notify_notification_attach_to_widget") +- (return-type "none") +- (parameters +- '("GtkWidget*" "attach") +- ) +-) +- +-(define-method attach_to_status_icon +- (of-object "NotifyNotification") +- (c-name "notify_notification_attach_to_status_icon") +- (return-type "none") +- (parameters +- '("GtkStatusIcon*" "attach") +- ) +-) +- + (define-method show + (of-object "NotifyNotification") + (c-name "notify_notification_show") diff --git a/source/l/notify-python/notify-python.SlackBuild b/source/l/notify-python/notify-python.SlackBuild index 97ce7218..9227d8d0 100755 --- a/source/l/notify-python/notify-python.SlackBuild +++ b/source/l/notify-python/notify-python.SlackBuild @@ -25,7 +25,7 @@ PKGNAM=notify-python VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -67,6 +67,9 @@ chmod -R u+w,go+r-w,a-s . # Fix http://trac.galago-project.org/ticket/121 rm -f src/pynotify.c +# Fix build with libnotify-0.7 (thanks, Fedora) +zcat $CWD/libnotify07.patch.gz | patch -p1 || exit 1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/l/notify-python/slack-desc b/source/l/notify-python/slack-desc index 3d52503b..e7718b42 100644 --- a/source/l/notify-python/slack-desc +++ b/source/l/notify-python/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler-------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| notify-python: notify-python (Python bindings for libnotify) notify-python: notify-python: The notify-python package contains bindings to use libnotify with diff --git a/source/l/pango/pango.SlackBuild b/source/l/pango/pango.SlackBuild index fd5d8966..39c2ccd1 100755 --- a/source/l/pango/pango.SlackBuild +++ b/source/l/pango/pango.SlackBuild @@ -134,8 +134,20 @@ EOF find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/pango-$VERSION cp -a \ diff --git a/source/l/phonon-gstreamer/phonon-gstreamer.SlackBuild b/source/l/phonon-gstreamer/phonon-gstreamer.SlackBuild new file mode 100755 index 00000000..eced8a74 --- /dev/null +++ b/source/l/phonon-gstreamer/phonon-gstreamer.SlackBuild @@ -0,0 +1,122 @@ +#!/bin/sh +# Copyright 2011, 2012 Eric Hameleers, Eindhoven, NL +# Copyright 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# ----------------------------------------------------------------------------- + + +PKGNAM=phonon-gstreamer +SRCNAM=phonon-backend-gstreamer +VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:" -j7 "} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +cd $SRCNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +echo Building ... +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + .. + make $NUMJOBS + make DESTDIR=$PKG install +cd - + +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + COPYING.LIB gstreamer/lgpl-* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# Compress the man page(s): +if [ -d $PKG/usr/man ]; then + find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; + for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ). +gz $i.gz ; rm $i ; done +fi + +# Strip binaries (if any): +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Add a package description: +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/phonon-gstreamer/slack-desc b/source/l/phonon-gstreamer/slack-desc new file mode 100644 index 00000000..ee2a434c --- /dev/null +++ b/source/l/phonon-gstreamer/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +phonon-gstreamer: phonon-gstreamer (gstreamer backend for phonon) +phonon-gstreamer: +phonon-gstreamer: This package provides an additional gstreamer backend for the phonon +phonon-gstreamer: multimedia framework used in KDE. +phonon-gstreamer: +phonon-gstreamer: For more information, visit: +phonon-gstreamer: https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer +phonon-gstreamer: +phonon-gstreamer: +phonon-gstreamer: +phonon-gstreamer: diff --git a/source/l/phonon-mplayer/phonon-mplayer.SlackBuild b/source/l/phonon-mplayer/phonon-mplayer.SlackBuild index cb84b3cb..38dff254 100755 --- a/source/l/phonon-mplayer/phonon-mplayer.SlackBuild +++ b/source/l/phonon-mplayer/phonon-mplayer.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2010 Eric Hameleers, Eindhoven, NL -# Copyright 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2012 Eric Hameleers, Eindhoven, NL +# Copyright 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -26,22 +26,21 @@ PKGNAM=phonon-mplayer VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:" -j4 "} + +NUMJOBS=${NUMJOBS:" -j7 "} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -51,11 +50,18 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP diff --git a/source/l/phonon-xine/phonon-backend-xine-4.4.4.find.phonon.patch b/source/l/phonon-xine/phonon-backend-xine-4.4.4.find.phonon.patch new file mode 100644 index 00000000..0ce1023c --- /dev/null +++ b/source/l/phonon-xine/phonon-backend-xine-4.4.4.find.phonon.patch @@ -0,0 +1,186 @@ +From: Andras Mantia +Date: Thu, 10 Nov 2011 08:43:52 +0000 +Subject: Use the global FindPhonon.cmake that really finds Phonon. +X-Git-Url: http://quickgit.kde.org/?p=phonon-xine.git&a=commitdiff&h=8c7fab4e433b53ac2f00093f1f464e0178c2d3e1 +--- +Use the global FindPhonon.cmake that really finds Phonon. +--- + + +--- a/cmake/FindPhonon.cmake ++++ /dev/null +@@ -1,53 +0,0 @@ +-# Find Phonon +- +-# Copyright (c) 2010, Harald Sitter +-# +-# Redistribution and use is allowed according to the terms of the BSD license. +-# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +- +-if (NOT PHONON_BUILDSYSTEM_DIR) +- find_program(PC_EXECUTABLE NAMES pkg-config +- PATH_SUFFIXES bin +- HINTS +- ${CMAKE_INSTALL_PREFIX} +- ONLY_CMAKE_FIND_ROOT_PATH +- ) +- +- if (NOT PC_EXECUTABLE) +- if (Phonon_FIND_REQUIRED) +- message(FATAL_ERROR "ERROR: Could not find pkg-config [required to find Phonon].") +- endif (Phonon_FIND_REQUIRED) +- endif (NOT PC_EXECUTABLE) +- +- if (PC_EXECUTABLE) +- execute_process(COMMAND "${PC_EXECUTABLE}" --variable=buildsystemdir phonon +- OUTPUT_VARIABLE _data_DIR +- ERROR_QUIET +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- file(TO_CMAKE_PATH "${_data_DIR}" _data_DIR) +- find_path(PHONON_BUILDSYSTEM_DIR FindPhononInternal.cmake HINTS ${_data_DIR}) +- endif (PC_EXECUTABLE) +-endif (NOT PHONON_BUILDSYSTEM_DIR) +- +-if (PHONON_BUILDSYSTEM_DIR) +- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PHONON_BUILDSYSTEM_DIR}) +- +- if (Phonon_FIND_REQUIRED) +- set(_req REQUIRED) +- endif (Phonon_FIND_REQUIRED) +- if (PHONON_FIND_QUIETLY) +- set(_quiet QUIET) +- endif (PHONON_FIND_QUIETLY) +- +- find_package(PhononInternal ${_req} ${_quiet}) +-else (PHONON_BUILDSYSTEM_DIR) +- if (_data_DIR) +- if (Phonon_FIND_REQUIRED) +- message(FATAL_ERROR "ERROR: FindPhonon.cmake not found in ${_data_DIR}") +- endif (Phonon_FIND_REQUIRED) +- else (_data_DIR) +- if (Phonon_FIND_REQUIRED) +- message(FATAL_ERROR "ERROR: Either pkg-config can not find its phonon config, or you are not using a recent enough Phonon version.") +- endif (Phonon_FIND_REQUIRED) +- endif (_data_DIR) +-endif (PHONON_BUILDSYSTEM_DIR) + +--- /dev/null ++++ b/cmake/MacroEnsureVersion.cmake +@@ -0,0 +1,117 @@ ++# This file defines the following macros for developers to use in ensuring ++# that installed software is of the right version: ++# ++# MACRO_ENSURE_VERSION - test that a version number is greater than ++# or equal to some minimum ++# MACRO_ENSURE_VERSION_RANGE - test that a version number is greater than ++# or equal to some minimum and less than some ++# maximum ++# MACRO_ENSURE_VERSION2 - deprecated, do not use in new code ++# ++ ++# MACRO_ENSURE_VERSION ++# This macro compares version numbers of the form "x.y.z" or "x.y" ++# MACRO_ENSURE_VERSION( FOO_MIN_VERSION FOO_VERSION_FOUND FOO_VERSION_OK) ++# will set FOO_VERSION_OK to true if FOO_VERSION_FOUND >= FOO_MIN_VERSION ++# Leading and trailing text is ok, e.g. ++# MACRO_ENSURE_VERSION( "2.5.31" "flex 2.5.4a" VERSION_OK) ++# which means 2.5.31 is required and "flex 2.5.4a" is what was found on the system ++ ++# Copyright (c) 2006, David Faure, ++# Copyright (c) 2007, Will Stephenson ++# ++# Redistribution and use is allowed according to the terms of the BSD license. ++# For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++ ++# MACRO_ENSURE_VERSION_RANGE ++# This macro ensures that a version number of the form ++# "x.y.z" or "x.y" falls within a range defined by ++# min_version <= found_version < max_version. ++# If this expression holds, FOO_VERSION_OK will be set TRUE ++# ++# Example: MACRO_ENSURE_VERSION_RANGE3( "0.1.0" ${FOOCODE_VERSION} "0.7.0" FOO_VERSION_OK ) ++# ++# This macro will break silently if any of x,y,z are greater than 100. ++# ++# Copyright (c) 2007, Will Stephenson ++# ++# Redistribution and use is allowed according to the terms of the BSD license. ++# For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++ ++# NORMALIZE_VERSION ++# Helper macro to convert version numbers of the form "x.y.z" ++# to an integer equal to 10^4 * x + 10^2 * y + z ++# ++# This macro will break silently if any of x,y,z are greater than 100. ++# ++# Copyright (c) 2006, David Faure, ++# Copyright (c) 2007, Will Stephenson ++# ++# Redistribution and use is allowed according to the terms of the BSD license. ++# For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++ ++# CHECK_RANGE_INCLUSIVE_LOWER ++# Helper macro to check whether x <= y < z ++# ++# Copyright (c) 2007, Will Stephenson ++# ++# Redistribution and use is allowed according to the terms of the BSD license. ++# For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++ ++ ++MACRO(NORMALIZE_VERSION _requested_version _normalized_version) ++ STRING(REGEX MATCH "[^0-9]*[0-9]+\\.[0-9]+\\.[0-9]+.*" _threePartMatch "${_requested_version}") ++ if (_threePartMatch) ++ # parse the parts of the version string ++ STRING(REGEX REPLACE "[^0-9]*([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" _major_vers "${_requested_version}") ++ STRING(REGEX REPLACE "[^0-9]*[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" _minor_vers "${_requested_version}") ++ STRING(REGEX REPLACE "[^0-9]*[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" _patch_vers "${_requested_version}") ++ else (_threePartMatch) ++ STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" _major_vers "${_requested_version}") ++ STRING(REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" _minor_vers "${_requested_version}") ++ set(_patch_vers "0") ++ endif (_threePartMatch) ++ ++ # compute an overall version number which can be compared at once ++ MATH(EXPR ${_normalized_version} "${_major_vers}*10000 + ${_minor_vers}*100 + ${_patch_vers}") ++ENDMACRO(NORMALIZE_VERSION) ++ ++MACRO(MACRO_CHECK_RANGE_INCLUSIVE_LOWER _lower_limit _value _upper_limit _ok) ++ if (${_value} LESS ${_lower_limit}) ++ set( ${_ok} FALSE ) ++ elseif (${_value} EQUAL ${_lower_limit}) ++ set( ${_ok} TRUE ) ++ elseif (${_value} EQUAL ${_upper_limit}) ++ set( ${_ok} FALSE ) ++ elseif (${_value} GREATER ${_upper_limit}) ++ set( ${_ok} FALSE ) ++ else (${_value} LESS ${_lower_limit}) ++ set( ${_ok} TRUE ) ++ endif (${_value} LESS ${_lower_limit}) ++ENDMACRO(MACRO_CHECK_RANGE_INCLUSIVE_LOWER) ++ ++MACRO(MACRO_ENSURE_VERSION requested_version found_version var_too_old) ++ NORMALIZE_VERSION( ${requested_version} req_vers_num ) ++ NORMALIZE_VERSION( ${found_version} found_vers_num ) ++ ++ if (found_vers_num LESS req_vers_num) ++ set( ${var_too_old} FALSE ) ++ else (found_vers_num LESS req_vers_num) ++ set( ${var_too_old} TRUE ) ++ endif (found_vers_num LESS req_vers_num) ++ ++ENDMACRO(MACRO_ENSURE_VERSION) ++ ++MACRO(MACRO_ENSURE_VERSION2 requested_version2 found_version2 var_too_old2) ++ MACRO_ENSURE_VERSION( ${requested_version2} ${found_version2} ${var_too_old2}) ++ENDMACRO(MACRO_ENSURE_VERSION2) ++ ++MACRO(MACRO_ENSURE_VERSION_RANGE min_version found_version max_version var_ok) ++ NORMALIZE_VERSION( ${min_version} req_vers_num ) ++ NORMALIZE_VERSION( ${found_version} found_vers_num ) ++ NORMALIZE_VERSION( ${max_version} max_vers_num ) ++ ++ MACRO_CHECK_RANGE_INCLUSIVE_LOWER( ${req_vers_num} ${found_vers_num} ${max_vers_num} ${var_ok}) ++ENDMACRO(MACRO_ENSURE_VERSION_RANGE) ++ ++ diff --git a/source/l/phonon-xine/phonon-xine.SlackBuild b/source/l/phonon-xine/phonon-xine.SlackBuild new file mode 100755 index 00000000..2aff8435 --- /dev/null +++ b/source/l/phonon-xine/phonon-xine.SlackBuild @@ -0,0 +1,131 @@ +#!/bin/sh +# Copyright 2011, 2012 Eric Hameleers, Eindhoven, NL +# Copyright 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# ----------------------------------------------------------------------------- + + +PKGNAM=phonon-xine +SRCNAM=phonon-backend-xine +VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:" -j7 "} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +cd $SRCNAM-$VERSION || exit 1 + +# Use better phonon detection routine: +cat $CWD/phonon-backend-xine-4.4.4.find.phonon.patch | patch -p1 --verbose || exit 1 + +# Switch from oxygen to hicolor icons. This way they are visible, +# even when the current icon theme is not oxygen. +for res in 16 22 32 48 64 128 sc ; do + mv xine/ox${res}-app-phonon-xine.png xine/hi${res}-app-phonon-xine.png +done + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +echo Building ... +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + .. + make $NUMJOBS + make DESTDIR=$PKG install +cd - + +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + COPYING.LIB xine/BUGS \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# Compress the man page(s): +if [ -d $PKG/usr/man ]; then + find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; + for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ). +gz $i.gz ; rm $i ; done +fi + +# Strip binaries (if any): +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Add a package description: +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/phonon-xine/slack-desc b/source/l/phonon-xine/slack-desc new file mode 100644 index 00000000..59ee7f0b --- /dev/null +++ b/source/l/phonon-xine/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +phonon-xine: phonon-xine (xine backend for phonon) +phonon-xine: +phonon-xine: This package provides an additional xine backend for the phonon +phonon-xine: multimedia framework used in KDE. +phonon-xine: +phonon-xine: For more information, visit: +phonon-xine: https://projects.kde.org/projects/kdesupport/phonon/phonon-xine +phonon-xine: +phonon-xine: +phonon-xine: +phonon-xine: diff --git a/source/l/phonon/phonon.SlackBuild b/source/l/phonon/phonon.SlackBuild index 79c9629f..2b155060 100755 --- a/source/l/phonon/phonon.SlackBuild +++ b/source/l/phonon/phonon.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2008 Robby Workman, Northport, Alabama, USA -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,27 +21,27 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL + PKGNAM=phonon VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:--j7} + # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-phonon - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -51,16 +51,23 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-phonon + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -r phonon-$VERSION -tar xvf $CWD/phonon-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/phonon-$VERSION.tar.?z* || exit 1 cd phonon-$VERSION || exit 1 chown -R root:root . @@ -78,6 +85,9 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON \ + -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins/designer \ + -DWITH_QZeitgeist=BOOL:OFF \ .. make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/phonon/slack-desc b/source/l/phonon/slack-desc index a4fbd02e..12acecb6 100644 --- a/source/l/phonon/slack-desc +++ b/source/l/phonon/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| phonon: phonon (multimedia framework for KDE4) phonon: -phonon: Phonon is the multimedia framework for KDE4. This package contains -phonon: the xine and gstreamer backends and support files for KDE. The -phonon: Phonon library itself is included with Qt. -phonon: -phonon: +phonon: Phonon is the multimedia API provided by Qt and is the standard +phonon: abstraction for handling multimedia streams within the KDE Software +phonon: Compilation. Phonon provides an API for multimedia using various +phonon: backends (gstreamer, mplayer, xine) to handle the lower level I/O. phonon: +phonon: Homepage: http://phonon.kde.org phonon: phonon: phonon: diff --git a/source/l/pil/pil.SlackBuild b/source/l/pil/pil.SlackBuild index 76e3b959..79980dee 100755 --- a/source/l/pil/pil.SlackBuild +++ b/source/l/pil/pil.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=pil ARCNAM=Imaging VERSION=${VERSION:-$(echo $ARCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/pilot-link/pilot-link.SlackBuild b/source/l/pilot-link/pilot-link.SlackBuild index 0d555da2..8dbe1321 100755 --- a/source/l/pilot-link/pilot-link.SlackBuild +++ b/source/l/pilot-link/pilot-link.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=${VERSION:-0.12.5} -BUILD=${BUILD:-3} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/polkit-gnome/polkit-gnome.SlackBuild b/source/l/polkit-gnome/polkit-gnome.SlackBuild index 82937550..00adeb0b 100755 --- a/source/l/polkit-gnome/polkit-gnome.SlackBuild +++ b/source/l/polkit-gnome/polkit-gnome.SlackBuild @@ -80,7 +80,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --enable-gtk-doc \ --disable-static \ - --disable-introspection \ + --enable-introspection \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 @@ -98,6 +98,14 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a AUTHORS COPYING HACKING NEWS README TODO \ $PKG/usr/doc/$PKGNAM-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/l/polkit-qt-1/polkit-qt-1.SlackBuild b/source/l/polkit-qt-1/polkit-qt-1.SlackBuild new file mode 100755 index 00000000..92e218ea --- /dev/null +++ b/source/l/polkit-qt-1/polkit-qt-1.SlackBuild @@ -0,0 +1,113 @@ +#!/bin/sh + +# Copyright 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=polkit-qt-1 +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +# Avoid a version number in .la files: +if [ -d /usr/lib${LIBDIRSUFFIX}/qt ]; then + QTDIR=/usr/lib${LIBDIRSUFFIX}/qt +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG/usr +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +mkdir -p build +cd build + cmake \ + $KDE_OPT_ARGS \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + .. + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd - + +if [ -d $PKG/usr/man ]; then + gzip -9 $PKG/usr/man/man?/* +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + COPYING* README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/polkit-qt-1/pull-polkit-qt-1 b/source/l/polkit-qt-1/pull-polkit-qt-1 new file mode 100644 index 00000000..42d64877 --- /dev/null +++ b/source/l/polkit-qt-1/pull-polkit-qt-1 @@ -0,0 +1,6 @@ +rm -rf polkit-qt-1 +git clone git://anongit.kde.org/polkit-qt-1 +( cd polkit-qt-1 && rm -rf .git* ) +mv polkit-qt-1 polkit-qt-1-$(date +%Y%m%d)git +tar cf polkit-qt-1-$(date +%Y%m%d)git.tar polkit-qt-1-$(date +%Y%m%d)git +xz -9 polkit-qt-1-$(date +%Y%m%d)git.tar diff --git a/source/l/polkit-qt-1/slack-desc b/source/l/polkit-qt-1/slack-desc new file mode 100644 index 00000000..ed2cf40c --- /dev/null +++ b/source/l/polkit-qt-1/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler-----------------------------------------------------| +polkit-qt-1: polkit-qt-1 (Qt polkit API wrapper) +polkit-qt-1: +polkit-qt-1: polkit-qt-1 aims to make it easy for Qt developers to take advantage +polkit-qt-1: of the polkit API. It is a convenience wrapper around QAction and +polkit-qt-1: QAbstractButton that lets you integrate those two components +polkit-qt-1: easily with polkit. +polkit-qt-1: +polkit-qt-1: Homepage: http://techbase.kde.org/Polkit-Qt-1 +polkit-qt-1: +polkit-qt-1: +polkit-qt-1: diff --git a/source/l/polkit/10-org.freedesktop.NetworkManager.pkla b/source/l/polkit/10-org.freedesktop.NetworkManager.pkla new file mode 100644 index 00000000..b2491602 --- /dev/null +++ b/source/l/polkit/10-org.freedesktop.NetworkManager.pkla @@ -0,0 +1,6 @@ +[nm-applet] +Identity=unix-group:netdev +Action=org.freedesktop.NetworkManager.* +ResultAny=yes +ResultInactive=no +ResultActive=yes diff --git a/source/l/polkit/20-plugdev-group-mount-override.pkla b/source/l/polkit/20-plugdev-group-mount-override.pkla new file mode 100644 index 00000000..8149de67 --- /dev/null +++ b/source/l/polkit/20-plugdev-group-mount-override.pkla @@ -0,0 +1,6 @@ +[plugdev group mount override] +Identity=unix-group:plugdev +Action=org.freedesktop.udisks2.filesystem-*;org.freedesktop.udisks2.eject-* +ResultAny=yes +ResultInactive=yes +ResultActive=yes diff --git a/source/l/polkit/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch b/source/l/polkit/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch deleted file mode 100644 index 9431056b..00000000 --- a/source/l/polkit/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch +++ /dev/null @@ -1,139 +0,0 @@ -From dd848a42a64a3b22a0cc60f6657b56ce9b6010ae Mon Sep 17 00:00:00 2001 -From: David Zeuthen -Date: Thu, 31 Mar 2011 12:59:09 -0400 -Subject: [PATCH 1/4] PolkitUnixProcess: Clarify that the real uid is - returned, not the effective one - -On Linux, also switch to parsing /proc//status instead of relying -on the st_uid returned by stat(2) to be the uid we want. - -This was pointed out by Neel Mehta . Thanks! - -Signed-off-by: David Zeuthen ---- - src/polkit/polkitunixprocess.c | 66 ++++++++++++++++++++++++++++++---------- - 1 files changed, 50 insertions(+), 16 deletions(-) - -diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c -index d95a1d4..876da69 100644 ---- a/src/polkit/polkitunixprocess.c -+++ b/src/polkit/polkitunixprocess.c -@@ -24,9 +24,7 @@ - #endif - - #include --#ifndef HAVE_FREEBSD --#include --#else -+#ifdef HAVE_FREEBSD - #include - #include - #include -@@ -34,6 +32,7 @@ - #include - #include - #include -+#include - - #include "polkitunixprocess.h" - #include "polkitsubject.h" -@@ -208,6 +207,8 @@ polkit_unix_process_get_pid (PolkitUnixProcess *process) - * - * Gets the uid of the owner of @process. - * -+ * Note that this returns the real user-id (not the effective user-id) of @process. -+ * - * Returns: The UNIX user id of the owner for @process or 0 if @error is set. - **/ - gint -@@ -215,17 +216,21 @@ polkit_unix_process_get_owner (PolkitUnixProcess *process, - GError **error) - { - gint result; -+ gchar *contents; -+ gchar **lines; - #ifdef HAVE_FREEBSD - struct kinfo_proc p; - #else -- struct stat statbuf; -- char procbuf[32]; -+ gchar filename[64]; -+ guint n; - #endif - - g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); - g_return_val_if_fail (error == NULL || *error == NULL, 0); - - result = 0; -+ lines = NULL; -+ contents = NULL; - - #ifdef HAVE_FREEBSD - if (get_kinfo_proc (process->pid, &p) == 0) -@@ -241,23 +246,52 @@ polkit_unix_process_get_owner (PolkitUnixProcess *process, - - result = p.ki_uid; - #else -- g_snprintf (procbuf, sizeof procbuf, "/proc/%d", process->pid); -- if (stat (procbuf, &statbuf) != 0) -+ -+ /* see 'man proc' for layout of the status file -+ * -+ * Uid, Gid: Real, effective, saved set, and file system UIDs (GIDs). -+ */ -+ g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid); -+ if (!g_file_get_contents (filename, -+ &contents, -+ NULL, -+ error)) - { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "stat() failed for /proc/%d: %s", -- process->pid, -- g_strerror (errno)); - goto out; - } -+ lines = g_strsplit (contents, "\n", -1); -+ for (n = 0; lines != NULL && lines[n] != NULL; n++) -+ { -+ gint real_uid, effective_uid; -+ if (!g_str_has_prefix (lines[n], "Uid:")) -+ continue; -+ if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2) -+ { -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Unexpected line `%s' in file %s", -+ lines[n], -+ filename); -+ goto out; -+ } -+ else -+ { -+ result = real_uid; -+ goto out; -+ } -+ } - -- result = statbuf.st_uid; -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Didn't find any line starting with `Uid:' in file %s", -+ filename); - #endif - -- out: -- -+out: -+ g_strfreev (lines); -+ g_free (contents); - return result; - } - --- -1.7.4.4 - diff --git a/source/l/polkit/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch b/source/l/polkit/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch deleted file mode 100644 index 81a163c6..00000000 --- a/source/l/polkit/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch +++ /dev/null @@ -1,623 +0,0 @@ -From 129b6223a19e7fb2753f8cad7957ac5402394076 Mon Sep 17 00:00:00 2001 -From: David Zeuthen -Date: Fri, 1 Apr 2011 12:09:45 -0400 -Subject: [PATCH 2/4] Make PolkitUnixProcess also record the uid of the - process - -This is needed to avoid possible TOCTTOU issues since a process can -change both its real uid and effective uid. - -Signed-off-by: David Zeuthen ---- - docs/polkit/polkit-1-sections.txt | 7 +- - src/polkit/polkitsubject.c | 25 +++- - src/polkit/polkitunixprocess.c | 346 +++++++++++++++++++++++++------------ - src/polkit/polkitunixprocess.h | 18 ++- - 4 files changed, 278 insertions(+), 118 deletions(-) - -diff --git a/docs/polkit/polkit-1-sections.txt b/docs/polkit/polkit-1-sections.txt -index 12141e3..9f4fcf8 100644 ---- a/docs/polkit/polkit-1-sections.txt -+++ b/docs/polkit/polkit-1-sections.txt -@@ -145,10 +145,13 @@ POLKIT_UNIX_SESSION_GET_CLASS - PolkitUnixProcess - polkit_unix_process_new - polkit_unix_process_new_full -+polkit_unix_process_new_for_owner -+polkit_unix_process_set_pid - polkit_unix_process_get_pid -+polkit_unix_process_set_start_time - polkit_unix_process_get_start_time --polkit_unix_process_set_pid --polkit_unix_process_get_owner -+polkit_unix_process_set_uid -+polkit_unix_process_get_uid - - PolkitUnixProcessClass - POLKIT_UNIX_PROCESS -diff --git a/src/polkit/polkitsubject.c b/src/polkit/polkitsubject.c -index 577afec..d2c4c20 100644 ---- a/src/polkit/polkitsubject.c -+++ b/src/polkit/polkitsubject.c -@@ -238,13 +238,18 @@ polkit_subject_from_string (const gchar *str, - { - gint scanned_pid; - guint64 scanned_starttime; -- if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2) -+ gint scanned_uid; -+ if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT ":%d", &scanned_pid, &scanned_starttime, &scanned_uid) == 3) -+ { -+ subject = polkit_unix_process_new_for_owner (scanned_pid, scanned_starttime, scanned_uid); -+ } -+ else if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2) - { - subject = polkit_unix_process_new_full (scanned_pid, scanned_starttime); - } - else if (sscanf (str, "unix-process:%d", &scanned_pid) == 1) - { -- subject = polkit_unix_process_new_full (scanned_pid, 0); -+ subject = polkit_unix_process_new (scanned_pid); - if (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) == 0) - { - g_object_unref (subject); -@@ -297,6 +302,8 @@ polkit_subject_to_gvariant (PolkitSubject *subject) - g_variant_new_uint32 (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)))); - g_variant_builder_add (&builder, "{sv}", "start-time", - g_variant_new_uint64 (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)))); -+ g_variant_builder_add (&builder, "{sv}", "uid", -+ g_variant_new_int32 (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)))); - } - else if (POLKIT_IS_UNIX_SESSION (subject)) - { -@@ -395,6 +402,7 @@ polkit_subject_new_for_gvariant (GVariant *variant, - GVariant *v; - guint32 pid; - guint64 start_time; -+ gint32 uid; - - v = lookup_asv (details_gvariant, "pid", G_VARIANT_TYPE_UINT32, error); - if (v == NULL) -@@ -414,7 +422,18 @@ polkit_subject_new_for_gvariant (GVariant *variant, - start_time = g_variant_get_uint64 (v); - g_variant_unref (v); - -- ret = polkit_unix_process_new_full (pid, start_time); -+ v = lookup_asv (details_gvariant, "uid", G_VARIANT_TYPE_INT32, error); -+ if (v != NULL) -+ { -+ uid = g_variant_get_int32 (v); -+ g_variant_unref (v); -+ } -+ else -+ { -+ uid = -1; -+ } -+ -+ ret = polkit_unix_process_new_for_owner (pid, start_time, uid); - } - else if (g_strcmp0 (kind, "unix-session") == 0) - { -diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c -index 876da69..913be3a 100644 ---- a/src/polkit/polkitunixprocess.c -+++ b/src/polkit/polkitunixprocess.c -@@ -62,6 +62,7 @@ struct _PolkitUnixProcess - - gint pid; - guint64 start_time; -+ gint uid; - }; - - struct _PolkitUnixProcessClass -@@ -74,6 +75,7 @@ enum - PROP_0, - PROP_PID, - PROP_START_TIME, -+ PROP_UID - }; - - static void subject_iface_init (PolkitSubjectIface *subject_iface); -@@ -81,6 +83,9 @@ static void subject_iface_init (PolkitSubjectIface *subject_iface); - static guint64 get_start_time_for_pid (gint pid, - GError **error); - -+static gint _polkit_unix_process_get_owner (PolkitUnixProcess *process, -+ GError **error); -+ - #ifdef HAVE_FREEBSD - static gboolean get_kinfo_proc (gint pid, struct kinfo_proc *p); - #endif -@@ -92,6 +97,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixProcess, polkit_unix_process, G_TYPE_OBJECT, - static void - polkit_unix_process_init (PolkitUnixProcess *unix_process) - { -+ unix_process->uid = -1; - } - - static void -@@ -108,6 +114,10 @@ polkit_unix_process_get_property (GObject *object, - g_value_set_int (value, unix_process->pid); - break; - -+ case PROP_UID: -+ g_value_set_int (value, unix_process->uid); -+ break; -+ - case PROP_START_TIME: - g_value_set_uint64 (value, unix_process->start_time); - break; -@@ -132,6 +142,14 @@ polkit_unix_process_set_property (GObject *object, - polkit_unix_process_set_pid (unix_process, g_value_get_int (value)); - break; - -+ case PROP_UID: -+ polkit_unix_process_set_uid (unix_process, g_value_get_int (value)); -+ break; -+ -+ case PROP_START_TIME: -+ polkit_unix_process_set_start_time (unix_process, g_value_get_uint64 (value)); -+ break; -+ - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; -@@ -139,12 +157,39 @@ polkit_unix_process_set_property (GObject *object, - } - - static void -+polkit_unix_process_constructed (GObject *object) -+{ -+ PolkitUnixProcess *process = POLKIT_UNIX_PROCESS (object); -+ -+ /* sets start_time and uid in case they are unset */ -+ -+ if (process->start_time == 0) -+ process->start_time = get_start_time_for_pid (process->pid, NULL); -+ -+ if (process->uid == -1) -+ { -+ GError *error; -+ error = NULL; -+ process->uid = _polkit_unix_process_get_owner (process, &error); -+ if (error != NULL) -+ { -+ process->uid = -1; -+ g_error_free (error); -+ } -+ } -+ -+ if (G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed != NULL) -+ G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed (object); -+} -+ -+static void - polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->get_property = polkit_unix_process_get_property; - gobject_class->set_property = polkit_unix_process_set_property; -+ gobject_class->constructed = polkit_unix_process_constructed; - - /** - * PolkitUnixProcess:pid: -@@ -156,7 +201,7 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - g_param_spec_int ("pid", - "Process ID", - "The UNIX process ID", -- -1, -+ 0, - G_MAXINT, - 0, - G_PARAM_CONSTRUCT | -@@ -166,6 +211,27 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - G_PARAM_STATIC_NICK)); - - /** -+ * PolkitUnixProcess:uid: -+ * -+ * The UNIX user id of the process or -1 if unknown. -+ * -+ * Note that this is the real user-id, not the effective user-id. -+ */ -+ g_object_class_install_property (gobject_class, -+ PROP_UID, -+ g_param_spec_int ("uid", -+ "User ID", -+ "The UNIX user ID", -+ -1, -+ G_MAXINT, -+ -1, -+ G_PARAM_CONSTRUCT | -+ G_PARAM_READWRITE | -+ G_PARAM_STATIC_NAME | -+ G_PARAM_STATIC_BLURB | -+ G_PARAM_STATIC_NICK)); -+ -+ /** - * PolkitUnixProcess:start-time: - * - * The start time of the process. -@@ -178,7 +244,8 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - 0, - G_MAXUINT64, - 0, -- G_PARAM_READABLE | -+ G_PARAM_CONSTRUCT | -+ G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB | - G_PARAM_STATIC_NICK)); -@@ -186,113 +253,50 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - } - - /** -- * polkit_unix_process_get_pid: -+ * polkit_unix_process_get_uid: - * @process: A #PolkitUnixProcess. - * -- * Gets the process id for @process. -+ * Gets the user id for @process. Note that this is the real user-id, -+ * not the effective user-id. - * -- * Returns: The process id for @process. -+ * Returns: The user id for @process or -1 if unknown. - */ - gint --polkit_unix_process_get_pid (PolkitUnixProcess *process) -+polkit_unix_process_get_uid (PolkitUnixProcess *process) - { -- g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); -- return process->pid; -+ g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), -1); -+ return process->uid; - } - - /** -- * polkit_unix_process_get_owner: -+ * polkit_unix_process_set_uid: - * @process: A #PolkitUnixProcess. -- * @error: (allow-none): Return location for error or %NULL. -+ * @uid: The user id to set for @process or -1 to unset it. - * -- * Gets the uid of the owner of @process. -+ * Sets the (real, not effective) user id for @process. -+ */ -+void -+polkit_unix_process_set_uid (PolkitUnixProcess *process, -+ gint uid) -+{ -+ g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process)); -+ g_return_if_fail (uid >= -1); -+ process->uid = uid; -+} -+ -+/** -+ * polkit_unix_process_get_pid: -+ * @process: A #PolkitUnixProcess. - * -- * Note that this returns the real user-id (not the effective user-id) of @process. -+ * Gets the process id for @process. - * -- * Returns: The UNIX user id of the owner for @process or 0 if @error is set. -- **/ -+ * Returns: The process id for @process. -+ */ - gint --polkit_unix_process_get_owner (PolkitUnixProcess *process, -- GError **error) -+polkit_unix_process_get_pid (PolkitUnixProcess *process) - { -- gint result; -- gchar *contents; -- gchar **lines; --#ifdef HAVE_FREEBSD -- struct kinfo_proc p; --#else -- gchar filename[64]; -- guint n; --#endif -- - g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); -- g_return_val_if_fail (error == NULL || *error == NULL, 0); -- -- result = 0; -- lines = NULL; -- contents = NULL; -- --#ifdef HAVE_FREEBSD -- if (get_kinfo_proc (process->pid, &p) == 0) -- { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "get_kinfo_proc() failed for pid %d: %s", -- process->pid, -- g_strerror (errno)); -- goto out; -- } -- -- result = p.ki_uid; --#else -- -- /* see 'man proc' for layout of the status file -- * -- * Uid, Gid: Real, effective, saved set, and file system UIDs (GIDs). -- */ -- g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid); -- if (!g_file_get_contents (filename, -- &contents, -- NULL, -- error)) -- { -- goto out; -- } -- lines = g_strsplit (contents, "\n", -1); -- for (n = 0; lines != NULL && lines[n] != NULL; n++) -- { -- gint real_uid, effective_uid; -- if (!g_str_has_prefix (lines[n], "Uid:")) -- continue; -- if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2) -- { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "Unexpected line `%s' in file %s", -- lines[n], -- filename); -- goto out; -- } -- else -- { -- result = real_uid; -- goto out; -- } -- } -- -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "Didn't find any line starting with `Uid:' in file %s", -- filename); --#endif -- --out: -- g_strfreev (lines); -- g_free (contents); -- return result; -+ return process->pid; - } - - /** -@@ -311,6 +315,21 @@ polkit_unix_process_get_start_time (PolkitUnixProcess *process) - } - - /** -+ * polkit_unix_process_set_start_time: -+ * @process: A #PolkitUnixProcess. -+ * @start_time: The start time for @pid. -+ * -+ * Set the start time of @process. -+ */ -+void -+polkit_unix_process_set_start_time (PolkitUnixProcess *process, -+ guint64 start_time) -+{ -+ g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process)); -+ process->start_time = start_time; -+} -+ -+/** - * polkit_unix_process_set_pid: - * @process: A #PolkitUnixProcess. - * @pid: A process id. -@@ -323,18 +342,17 @@ polkit_unix_process_set_pid (PolkitUnixProcess *process, - { - g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process)); - process->pid = pid; -- if (pid != (gint) -1) -- process->start_time = get_start_time_for_pid (pid, NULL); - } - - /** - * polkit_unix_process_new: - * @pid: The process id. - * -- * Creates a new #PolkitUnixProcess for @pid. The start time of the -- * process will be looked up in using e.g. the -- * /proc filesystem depending on the platform in -- * use. -+ * Creates a new #PolkitUnixProcess for @pid. -+ * -+ * The uid and start time of the process will be looked up in using -+ * e.g. the /proc filesystem depending on the -+ * platform in use. - * - * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref(). - */ -@@ -353,22 +371,42 @@ polkit_unix_process_new (gint pid) - * - * Creates a new #PolkitUnixProcess object for @pid and @start_time. - * -+ * The uid of the process will be looked up in using e.g. the -+ * /proc filesystem depending on the platform in -+ * use. -+ * - * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref(). - */ - PolkitSubject * - polkit_unix_process_new_full (gint pid, - guint64 start_time) - { -- PolkitUnixProcess *process; -- -- process = POLKIT_UNIX_PROCESS (polkit_unix_process_new ((gint) -1)); -- process->pid = pid; -- if (start_time != 0) -- process->start_time = start_time; -- else -- process->start_time = get_start_time_for_pid (pid, NULL); -+ return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS, -+ "pid", pid, -+ "start_time", start_time, -+ NULL)); -+} - -- return POLKIT_SUBJECT (process); -+/** -+ * polkit_unix_process_new_for_owner: -+ * @pid: The process id. -+ * @start_time: The start time for @pid or 0 to look it up in e.g. /proc. -+ * @uid: The (real, not effective) uid of the owner of @pid or -1 to look it up in e.g. /proc. -+ * -+ * Creates a new #PolkitUnixProcess object for @pid, @start_time and @uid. -+ * -+ * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref(). -+ */ -+PolkitSubject * -+polkit_unix_process_new_for_owner (gint pid, -+ guint64 start_time, -+ gint uid) -+{ -+ return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS, -+ "pid", pid, -+ "start_time", start_time, -+ "uid", uid, -+ NULL)); - } - - static guint -@@ -616,3 +654,95 @@ out: - - return start_time; - } -+ -+static gint -+_polkit_unix_process_get_owner (PolkitUnixProcess *process, -+ GError **error) -+{ -+ gint result; -+ gchar *contents; -+ gchar **lines; -+#ifdef HAVE_FREEBSD -+ struct kinfo_proc p; -+#else -+ gchar filename[64]; -+ guint n; -+#endif -+ -+ g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); -+ g_return_val_if_fail (error == NULL || *error == NULL, 0); -+ -+ result = 0; -+ lines = NULL; -+ contents = NULL; -+ -+#ifdef HAVE_FREEBSD -+ if (get_kinfo_proc (process->pid, &p) == 0) -+ { -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "get_kinfo_proc() failed for pid %d: %s", -+ process->pid, -+ g_strerror (errno)); -+ goto out; -+ } -+ -+ result = p.ki_uid; -+#else -+ -+ /* see 'man proc' for layout of the status file -+ * -+ * Uid, Gid: Real, effective, saved set, and file system UIDs (GIDs). -+ */ -+ g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid); -+ if (!g_file_get_contents (filename, -+ &contents, -+ NULL, -+ error)) -+ { -+ goto out; -+ } -+ lines = g_strsplit (contents, "\n", -1); -+ for (n = 0; lines != NULL && lines[n] != NULL; n++) -+ { -+ gint real_uid, effective_uid; -+ if (!g_str_has_prefix (lines[n], "Uid:")) -+ continue; -+ if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2) -+ { -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Unexpected line `%s' in file %s", -+ lines[n], -+ filename); -+ goto out; -+ } -+ else -+ { -+ result = real_uid; -+ goto out; -+ } -+ } -+ -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Didn't find any line starting with `Uid:' in file %s", -+ filename); -+#endif -+ -+out: -+ g_strfreev (lines); -+ g_free (contents); -+ return result; -+} -+ -+/* deprecated public method */ -+gint -+polkit_unix_process_get_owner (PolkitUnixProcess *process, -+ GError **error) -+{ -+ return _polkit_unix_process_get_owner (process, error); -+} -diff --git a/src/polkit/polkitunixprocess.h b/src/polkit/polkitunixprocess.h -index b88cd03..531a57d 100644 ---- a/src/polkit/polkitunixprocess.h -+++ b/src/polkit/polkitunixprocess.h -@@ -47,16 +47,24 @@ typedef struct _PolkitUnixProcess PolkitUnixProcess; - typedef struct _PolkitUnixProcessClass PolkitUnixProcessClass; - - GType polkit_unix_process_get_type (void) G_GNUC_CONST; --PolkitSubject *polkit_unix_process_new (gint pid); --PolkitSubject *polkit_unix_process_new_full (gint pid, -- guint64 start_time); -- -+PolkitSubject *polkit_unix_process_new (gint pid); -+PolkitSubject *polkit_unix_process_new_full (gint pid, -+ guint64 start_time); -+PolkitSubject *polkit_unix_process_new_for_owner (gint pid, -+ guint64 start_time, -+ gint uid); - gint polkit_unix_process_get_pid (PolkitUnixProcess *process); - guint64 polkit_unix_process_get_start_time (PolkitUnixProcess *process); -+gint polkit_unix_process_get_uid (PolkitUnixProcess *process); - void polkit_unix_process_set_pid (PolkitUnixProcess *process, - gint pid); -+void polkit_unix_process_set_uid (PolkitUnixProcess *process, -+ gint uid); -+void polkit_unix_process_set_start_time (PolkitUnixProcess *process, -+ guint64 start_time); -+ - gint polkit_unix_process_get_owner (PolkitUnixProcess *process, -- GError **error); -+ GError **error) G_GNUC_DEPRECATED_FOR (polkit_unix_process_get_uid); - - G_END_DECLS - --- -1.7.4.4 - diff --git a/source/l/polkit/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch b/source/l/polkit/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch deleted file mode 100644 index 90d9352e..00000000 --- a/source/l/polkit/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c23d74447c7615dc74dae259f0fc3688ec988867 Mon Sep 17 00:00:00 2001 -From: David Zeuthen -Date: Fri, 1 Apr 2011 12:12:27 -0400 -Subject: [PATCH 3/4] Use polkit_unix_process_get_uid() to get the owner of a - process - -This avoids a TOCTTOU problem. - -Signed-off-by: David Zeuthen ---- - src/polkitbackend/polkitbackendsessionmonitor.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c -index 495f752..9c331b6 100644 ---- a/src/polkitbackend/polkitbackendsessionmonitor.c -+++ b/src/polkitbackend/polkitbackendsessionmonitor.c -@@ -293,14 +293,15 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor - - if (POLKIT_IS_UNIX_PROCESS (subject)) - { -- local_error = NULL; -- uid = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject), &local_error); -- if (local_error != NULL) -+ uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)); -+ if ((gint) uid == -1) - { -- g_propagate_prefixed_error (error, local_error, "Error getting user for process: "); -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Unix process subject does not have uid set"); - goto out; - } -- - ret = polkit_unix_user_new (uid); - } - else if (POLKIT_IS_SYSTEM_BUS_NAME (subject)) --- -1.7.4.4 - diff --git a/source/l/polkit/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch b/source/l/polkit/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch deleted file mode 100644 index 8572f732..00000000 --- a/source/l/polkit/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 3b12cfac29dddd27f1f166a7574d8374cc1dccf2 Mon Sep 17 00:00:00 2001 -From: David Zeuthen -Date: Fri, 1 Apr 2011 12:13:15 -0400 -Subject: [PATCH 4/4] pkexec: Avoid TOCTTOU problems with parent process - -In a nutshell, the parent process may change its uid (either real- or -effective uid) after launching pkexec. It can do this by exec()'ing -e.g. a setuid root program. - -To avoid this problem, just use the uid the parent process had when it -executed pkexec. This happens to be the same uid of the pkexec process -itself. - -Additionally, remove some dubious code that allowed pkexec to continue -when the parent process died as there is no reason to support -something like that. Also ensure that the pkexec process is killed if -the parent process dies. - -This problem was pointed out by Neel Mehta . - -Signed-off-by: David Zeuthen ---- - src/programs/pkexec.c | 66 +++++++++++++++++++++++++++++-------------------- - 1 files changed, 39 insertions(+), 27 deletions(-) - -diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c -index 9217954..3e656be 100644 ---- a/src/programs/pkexec.c -+++ b/src/programs/pkexec.c -@@ -35,6 +35,10 @@ - #include - #include - -+#ifdef __linux__ -+#include -+#endif -+ - #include - - #ifdef POLKIT_AUTHFW_PAM -@@ -423,7 +427,6 @@ main (int argc, char *argv[]) - GPtrArray *saved_env; - gchar *opt_user; - pid_t pid_of_caller; -- uid_t uid_of_caller; - gpointer local_agent_handle; - - ret = 127; -@@ -598,40 +601,49 @@ main (int argc, char *argv[]) - */ - g_type_init (); - -- /* now check if the program that invoked us is authorized */ -+ /* make sure we are nuked if the parent process dies */ -+#ifdef __linux__ -+ if (prctl (PR_SET_PDEATHSIG, SIGTERM) != 0) -+ { -+ g_printerr ("prctl(PR_SET_PDEATHSIG, SIGTERM) failed: %s\n", g_strerror (errno)); -+ goto out; -+ } -+#else -+#warning "Please add OS specific code to catch when the parent dies" -+#endif -+ -+ /* Figure out the parent process */ - pid_of_caller = getppid (); - if (pid_of_caller == 1) - { - /* getppid() can return 1 if the parent died (meaning that we are reaped -- * by /sbin/init); get process group leader instead - for example, this -- * happens when launching via gnome-panel (alt+f2, then 'pkexec gedit'). -+ * by /sbin/init); In that case we simpy bail. - */ -- pid_of_caller = getpgrp (); -- } -- -- subject = polkit_unix_process_new (pid_of_caller); -- if (subject == NULL) -- { -- g_printerr ("No such process for pid %d: %s\n", (gint) pid_of_caller, error->message); -- g_error_free (error); -+ g_printerr ("Refusing to render service to dead parents.\n"); - goto out; - } - -- /* paranoia: check that the uid of pid_of_caller matches getuid() */ -- error = NULL; -- uid_of_caller = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject), -- &error); -- if (error != NULL) -- { -- g_printerr ("Error determing pid of caller (pid %d): %s\n", (gint) pid_of_caller, error->message); -- g_error_free (error); -- goto out; -- } -- if (uid_of_caller != getuid ()) -- { -- g_printerr ("User of caller (%d) does not match our uid (%d)\n", uid_of_caller, getuid ()); -- goto out; -- } -+ /* This process we want to check an authorization for is the process -+ * that launched us - our parent process. -+ * -+ * At the time the parent process fork()'ed and exec()'ed us, the -+ * process had the same real-uid that we have now. So we use this -+ * real-uid instead of of looking it up to avoid TOCTTOU issues -+ * (consider the parent process exec()'ing a setuid helper). -+ * -+ * On the other hand, the monotonic process start-time is guaranteed -+ * to never change so it's safe to look that up given only the PID -+ * since we are guaranteed to be nuked if the parent goes away -+ * (cf. the prctl(2) call above). -+ */ -+ subject = polkit_unix_process_new_for_owner (pid_of_caller, -+ 0, /* 0 means "look up start-time in /proc" */ -+ getuid ()); -+ /* really double-check the invariants guaranteed by the PolkitUnixProcess class */ -+ g_assert (subject != NULL); -+ g_assert (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)) == pid_of_caller); -+ g_assert (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)) >= 0); -+ g_assert (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) > 0); - - error = NULL; - authority = polkit_authority_get_sync (NULL /* GCancellable* */, &error); --- -1.7.4.4 - diff --git a/source/l/polkit/doinst.sh b/source/l/polkit/doinst.sh new file mode 100644 index 00000000..bce9ca90 --- /dev/null +++ b/source/l/polkit/doinst.sh @@ -0,0 +1,13 @@ +config() { + NEW="$1" + OLD="`dirname $NEW`/`basename $NEW .new`" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} +config etc/polkit-1/localauthority/50-local.d/20-plugdev-group-mount-override.pkla.new +config etc/polkit-1/localauthority/50-local.d/10-org.freedesktop.NetworkManager.pkla.new diff --git a/source/l/polkit/polkit.SlackBuild b/source/l/polkit/polkit.SlackBuild index 7aa40f5d..a4bb9fc1 100755 --- a/source/l/polkit/polkit.SlackBuild +++ b/source/l/polkit/polkit.SlackBuild @@ -2,7 +2,7 @@ # Copyright 2009, 2011 Robby Workman, Northport, Alabama, USA # Copyright 2010 Eric Hameleers, Eindhoven, NL -# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ PKGNAM=polkit VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -72,12 +72,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# https://bugzilla.redhat.com/show_bug.cgi?id=692922 -patch -p1 < $CWD/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch || exit 1 -patch -p1 < $CWD/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch || exit 1 -patch -p1 < $CWD/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch || exit 1 -patch -p1 < $CWD/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch || exit 1 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -90,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-gtk-doc \ --mandir=/usr/man \ --disable-static \ - --disable-introspection \ + --enable-introspection \ --with-authfw=shadow \ --enable-verbose-mode \ --with-os-type=Slackware \ @@ -109,6 +103,10 @@ CXXFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Add default policy files for udisks2 and NetworkManager events: +cat $CWD/20-plugdev-group-mount-override.pkla > $PKG/etc/polkit-1/localauthority/50-local.d/20-plugdev-group-mount-override.pkla.new +cat $CWD/10-org.freedesktop.NetworkManager.pkla > $PKG/etc/polkit-1/localauthority/50-local.d/10-org.freedesktop.NetworkManager.pkla.new + # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -131,12 +129,20 @@ fi # Add a documentation directory: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README \ + AUTHORS COPYING HACKING INSTALL NEWS README \ $PKG/usr/doc/$PKGNAM-$VERSION -( cd $PKG/usr/doc/$PKGNAM-$VERSION; ln -s ../../share/gtk-doc/html/polkit-1 html -) +( cd $PKG/usr/doc/$PKGNAM-$VERSION; ln -s ../../share/gtk-doc/html/polkit-1 html ) + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install +zcat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG diff --git a/source/l/poppler-data/poppler-data.SlackBuild b/source/l/poppler-data/poppler-data.SlackBuild index 1c77ed9b..c9937e7f 100755 --- a/source/l/poppler-data/poppler-data.SlackBuild +++ b/source/l/poppler-data/poppler-data.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -53,6 +53,14 @@ cp -a \ COPYING* README \ $PKG/usr/doc/${PKGNAM}-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/l/poppler/poppler.SlackBuild b/source/l/poppler/poppler.SlackBuild index dcf3e899..b2e5955a 100755 --- a/source/l/poppler/poppler.SlackBuild +++ b/source/l/poppler/poppler.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -61,6 +61,10 @@ cd $TMP || exit 1 rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION || exit 1 + +# Fix printing of some pdf files: +zcat $CWD/poppler_xyscale.patch.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -87,6 +91,7 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Compress and link manpages, if any: if [ -d $PKG/usr/man ]; then ( cd $PKG/usr/man for manpagedir in $(find . -type d -name "man*") ; do @@ -95,7 +100,7 @@ if [ -d $PKG/usr/man ]; then ln -s $( readlink $eachpage ).gz $eachpage.gz rm $eachpage done - gzip -9 *.* + gzip -9 *.? ) done ) diff --git a/source/l/poppler/poppler_xyscale.patch b/source/l/poppler/poppler_xyscale.patch new file mode 100644 index 00000000..bd23d36c --- /dev/null +++ b/source/l/poppler/poppler_xyscale.patch @@ -0,0 +1,47 @@ +From 36481939e3064de920e49d9d1742a85473a50963 Mon Sep 17 00:00:00 2001 +From: Thomas Freitag +Date: Sun, 22 Jul 2012 16:40:46 +0000 +Subject: Make sure xScale and yScale are always initialized + +Bug #52215 +--- +diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc +index a01a4b3..e15c2e9 100644 +--- a/poppler/PSOutputDev.cc ++++ b/poppler/PSOutputDev.cc +@@ -3521,6 +3521,7 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) { + saveState(NULL); + } + ++ xScale = yScale = 1; + switch (mode) { + + case psModePSOrigPageSizes: +@@ -3631,8 +3632,6 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) { + } else { + yScale = xScale; + } +- } else { +- xScale = yScale = 1; + } + // deal with odd bounding boxes or clipping + if (clipLLX0 < clipURX0 && clipLLY0 < clipURY0) { +@@ -3694,7 +3693,6 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) { + if (tx != 0 || ty != 0) { + writePSFmt("{0:.6g} {1:.6g} translate\n", tx, ty); + } +- xScale = yScale = 1; + break; + + case psModeForm: +@@ -3702,7 +3700,6 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) { + writePS("begin xpdf begin\n"); + writePS("pdfStartPage\n"); + tx = ty = 0; +- xScale = yScale = 1; + rotate = 0; + break; + } +-- +cgit v0.9.0.2-2-gbebe + diff --git a/source/l/pycairo/pycairo.SlackBuild b/source/l/pycairo/pycairo.SlackBuild index 1d072b74..365745b8 100755 --- a/source/l/pycairo/pycairo.SlackBuild +++ b/source/l/pycairo/pycairo.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=pycairo SRCNAM=py2cairo VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} diff --git a/source/l/pycurl/pycurl.SlackBuild b/source/l/pycurl/pycurl.SlackBuild new file mode 100755 index 00000000..4d9c4339 --- /dev/null +++ b/source/l/pycurl/pycurl.SlackBuild @@ -0,0 +1,84 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=pycurl +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +python setup.py build || exit 1 +python setup.py install --root=$PKG || exit 1 + +find $PKG | xargs file | grep -e "shared object" -e "executable" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a COPYING* NEWS README TODO \ + doc/* \ + $PKG/usr/doc/$PKGNAM-$VERSION +rm -rf $PKG/usr/share/doc/pycurl +rmdir $PKG/usr/share/doc +rmdir $PKG/usr/share + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/pycurl/slack-desc b/source/l/pycurl/slack-desc new file mode 100644 index 00000000..0ba82db1 --- /dev/null +++ b/source/l/pycurl/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler----------------------------------------------| +pycurl: pycurl (Python interface to cURL library) +pycurl: +pycurl: PycURL is a Python interface to libcurl. PycURL can be used +pycurl: to fetch objects identified by a URL from a Python program, +pycurl: similar to the urllib Python module. PycURL is mature, very +pycurl: fast, and supports a lot of features. +pycurl: +pycurl: Homepage: http://pycurl.sourceforge.net +pycurl: +pycurl: +pycurl: diff --git a/source/l/pygobject/pygobject.SlackBuild b/source/l/pygobject/pygobject.SlackBuild index 064ca3c1..e39feacb 100755 --- a/source/l/pygobject/pygobject.SlackBuild +++ b/source/l/pygobject/pygobject.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=pygobject VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -63,8 +63,11 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 cd $PKGNAM-$VERSION || exit 1 + +zcat $CWD/pygobject.flags.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -72,8 +75,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/pygobject.fix.no.introspection.crash.diff.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/l/pygobject/pygobject.fix.no.introspection.crash.diff b/source/l/pygobject/pygobject.fix.no.introspection.crash.diff deleted file mode 100644 index df59b482..00000000 --- a/source/l/pygobject/pygobject.fix.no.introspection.crash.diff +++ /dev/null @@ -1,22 +0,0 @@ -From 97774cb149c5b03d5ef82a5af3f19e2ce4d79d0b Mon Sep 17 00:00:00 2001 -From: John (J5) Palmieri -Date: Mon, 04 Oct 2010 16:43:31 +0000 -Subject: return NULL instead of -1 which fixes crash when introspection is turned off - -* see https://bugzilla.gnome.org/show_bug.cgi?id=631158 ---- -diff --git a/gi/pygi.h b/gi/pygi.h -index 551bb6f..da71d28 100644 ---- a/gi/pygi.h -+++ b/gi/pygi.h -@@ -155,7 +155,7 @@ static inline PyObject * - pygi_get_property_value (PyGObject *instance, - const gchar *attr_name) - { -- return -1; -+ return NULL; - } - - static inline gint --- -cgit v0.8.3.1 diff --git a/source/l/pygobject/pygobject.flags.diff b/source/l/pygobject/pygobject.flags.diff new file mode 100644 index 00000000..6a0e99e1 --- /dev/null +++ b/source/l/pygobject/pygobject.flags.diff @@ -0,0 +1,49 @@ +From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001 +From: Ryan Lortie +Date: Mon, 12 Mar 2012 16:44:14 -0400 +Subject: [PATCH] gio-types.defs: change some enums to flags + +These flags types were originally incorrectly handled in glib as being +enums. That bug was fixed, but they're still enums here, leading to +warnings about the mismatch. + +Change them to flags. + +https://bugzilla.gnome.org/show_bug.cgi?id=668522 +--- + gio/gio-types.defs | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gio/gio-types.defs b/gio/gio-types.defs +index 331e0bc..7eee5c8 100644 +--- a/gio/gio-types.defs ++++ b/gio/gio-types.defs +@@ -526,7 +526,7 @@ + ) + ) + +-(define-enum MountMountFlags ++(define-flags MountMountFlags + (in-module "gio") + (c-name "GMountMountFlags") + (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS") +@@ -545,7 +545,7 @@ + ) + ) + +-(define-enum DriveStartFlags ++(define-flags DriveStartFlags + (in-module "gio") + (c-name "GDriveStartFlags") + (gtype-id "G_TYPE_DRIVE_START_FLAGS") +@@ -770,7 +770,7 @@ + ) + ) + +-(define-enum SocketMsgFlags ++(define-flags SocketMsgFlags + (in-module "gio") + (c-name "GSocketMsgFlags") + (gtype-id "G_TYPE_SOCKET_MSG_FLAGS") +-- +1.7.9.1 diff --git a/source/l/pygtk/pygtk.SlackBuild b/source/l/pygtk/pygtk.SlackBuild index 7823f4dd..b4170da8 100755 --- a/source/l/pygtk/pygtk.SlackBuild +++ b/source/l/pygtk/pygtk.SlackBuild @@ -63,7 +63,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP || exit 1 rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ diff --git a/source/l/pyrex/pyrex.SlackBuild b/source/l/pyrex/pyrex.SlackBuild index 42b9f7cc..94b34c2e 100755 --- a/source/l/pyrex/pyrex.SlackBuild +++ b/source/l/pyrex/pyrex.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=Pyrex VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/qca-cyrus-sasl/slack-desc b/source/l/qca-cyrus-sasl/slack-desc index 29585fe9..55bf91d2 100644 --- a/source/l/qca-cyrus-sasl/slack-desc +++ b/source/l/qca-cyrus-sasl/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler---------------------------------------------| + |-----handy-ruler------------------------------------------------------| qca-cyrus-sasl: qca-cyrus-sasl (Cyrus SASL plugin for QCA) qca-cyrus-sasl: qca-cyrus-sasl: This plugin provides features based on Cyrus SASL version 2. diff --git a/source/l/qca-ossl/qca-ossl-openssl-1.0.0.patch b/source/l/qca-ossl/qca-ossl-openssl-1.0.0.patch new file mode 100644 index 00000000..7c6fa5bd --- /dev/null +++ b/source/l/qca-ossl/qca-ossl-openssl-1.0.0.patch @@ -0,0 +1,155 @@ +diff -ru ../qca-ossl-2.0.0-beta3/CMakeLists.txt ./CMakeLists.txt +--- ../qca-ossl-2.0.0-beta3/CMakeLists.txt 2007-06-29 23:10:53.000000000 +0200 ++++ ./CMakeLists.txt 2010-04-18 04:05:09.000000000 +0200 +@@ -1,5 +1,12 @@ + # QCA OSSL + ++INCLUDE(CheckFunctionExists) ++SET(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES}) ++CHECK_FUNCTION_EXISTS(EVP_md2 HAVE_OPENSSL_MD2) ++IF (HAVE_OPENSSL_MD2) ++ ADD_DEFINITIONS(-DHAVE_OPENSSL_MD2) ++ENDIF (HAVE_OPENSSL_MD2) ++ + SET(QCA_OSSL_SOURCES qca-ossl.cpp) + + MY_AUTOMOC( QCA_OSSL_SOURCES ) +diff -ru ../qca-ossl-2.0.0-beta3/qca-ossl.cpp ./qca-ossl.cpp +--- ../qca-ossl-2.0.0-beta3/qca-ossl.cpp 2007-12-11 07:34:57.000000000 +0100 ++++ ./qca-ossl.cpp 2010-04-18 04:08:46.000000000 +0200 +@@ -42,6 +42,15 @@ + #define OSSL_097 + #endif + ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L ++// OpenSSL 1.0.0 makes a few changes that aren't very C++ friendly... ++// Among other things, CHECKED_PTR_OF returns a void*, but is used in ++// contexts requiring STACK pointers. ++#undef CHECKED_PTR_OF ++#define CHECKED_PTR_OF(type, p) \ ++ ((_STACK*) (1 ? p : (type*)0)) ++#endif ++ + using namespace QCA; + + namespace opensslQCAPlugin { +@@ -1771,8 +1780,10 @@ + md = EVP_sha1(); + else if(alg == EMSA3_MD5) + md = EVP_md5(); ++#ifdef HAVE_OPENSSL_MD2 + else if(alg == EMSA3_MD2) + md = EVP_md2(); ++#endif + else if(alg == EMSA3_RIPEMD160) + md = EVP_ripemd160(); + else if(alg == EMSA3_Raw) +@@ -1789,8 +1800,10 @@ + md = EVP_sha1(); + else if(alg == EMSA3_MD5) + md = EVP_md5(); ++#ifdef HAVE_OPENSSL_MD2 + else if(alg == EMSA3_MD2) + md = EVP_md2(); ++#endif + else if(alg == EMSA3_RIPEMD160) + md = EVP_ripemd160(); + else if(alg == EMSA3_Raw) +@@ -3385,9 +3398,11 @@ + case NID_md5WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD5; + break; ++#ifdef HAVE_OPENSSL_MD2 + case NID_md2WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD2; + break; ++#endif + case NID_ripemd160WithRSA: + p.sigalgo = QCA::EMSA3_RIPEMD160; + break; +@@ -3871,9 +3886,11 @@ + case NID_md5WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD5; + break; ++#ifdef HAVE_OPENSSL_MD2 + case NID_md2WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD2; + break; ++#endif + case NID_ripemd160WithRSA: + p.sigalgo = QCA::EMSA3_RIPEMD160; + break; +@@ -4061,9 +4078,11 @@ + case NID_md5WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD5; + break; ++#ifdef HAVE_OPENSSL_MD2 + case NID_md2WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD2; + break; ++#endif + case NID_ripemd160WithRSA: + p.sigalgo = QCA::EMSA3_RIPEMD160; + break; +@@ -6582,7 +6601,9 @@ + list += "sha1"; + list += "sha0"; + list += "ripemd160"; ++#ifdef HAVE_OPENSSL_MD2 + list += "md2"; ++#endif + list += "md4"; + list += "md5"; + #ifdef SHA224_DIGEST_LENGTH +@@ -6597,9 +6618,11 @@ + #ifdef SHA512_DIGEST_LENGTH + list += "sha512"; + #endif ++/* + #ifdef OBJ_whirlpool + list += "whirlpool"; + #endif ++*/ + return list; + } + +@@ -6757,7 +6780,9 @@ + list += all_hash_types(); + list += all_mac_types(); + list += all_cipher_types(); ++#ifdef HAVE_OPENSSL_MD2 + list += "pbkdf1(md2)"; ++#endif + list += "pbkdf1(sha1)"; + list += "pbkdf2(sha1)"; + list += "pkey"; +@@ -6788,8 +6813,10 @@ + return new opensslHashContext( EVP_sha(), this, type); + else if ( type == "ripemd160" ) + return new opensslHashContext( EVP_ripemd160(), this, type); ++#ifdef HAVE_OPENSSL_MD2 + else if ( type == "md2" ) + return new opensslHashContext( EVP_md2(), this, type); ++#endif + else if ( type == "md4" ) + return new opensslHashContext( EVP_md4(), this, type); + else if ( type == "md5" ) +@@ -6810,14 +6837,18 @@ + else if ( type == "sha512" ) + return new opensslHashContext( EVP_sha512(), this, type); + #endif ++/* + #ifdef OBJ_whirlpool + else if ( type == "whirlpool" ) + return new opensslHashContext( EVP_whirlpool(), this, type); + #endif ++*/ + else if ( type == "pbkdf1(sha1)" ) + return new opensslPbkdf1Context( EVP_sha1(), this, type ); ++#ifdef HAVE_OPENSSL_MD2 + else if ( type == "pbkdf1(md2)" ) + return new opensslPbkdf1Context( EVP_md2(), this, type ); ++#endif + else if ( type == "pbkdf2(sha1)" ) + return new opensslPbkdf2Context( this, type ); + else if ( type == "hmac(md5)" ) diff --git a/source/l/qca-ossl/qca-ossl.SlackBuild b/source/l/qca-ossl/qca-ossl.SlackBuild index 33bba969..c1fbcc95 100755 --- a/source/l/qca-ossl/qca-ossl.SlackBuild +++ b/source/l/qca-ossl/qca-ossl.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ PKGNAM=qca-ossl VERSION=2.0.0_beta3 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -64,7 +64,7 @@ tar xvf $CWD/$PKGNAM-$(echo $VERSION | tr _ -).tar.bz2 || exit 1 cd $PKGNAM-$(echo $VERSION | tr _ -) || exit 1 chown -R root:root . # Fix a compilation error with our new openssh: -zcat $CWD/qca-ossl.nowhirlpool.diff.gz | patch -p0 --verbose || exit 1 +zcat $CWD/qca-ossl-openssl-1.0.0.patch.gz | patch -p1 --verbose || exit 1 find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ -exec chmod 755 {} \; -o \ diff --git a/source/l/qca-ossl/qca-ossl.nowhirlpool.diff b/source/l/qca-ossl/qca-ossl.nowhirlpool.diff deleted file mode 100644 index 96451e1a..00000000 --- a/source/l/qca-ossl/qca-ossl.nowhirlpool.diff +++ /dev/null @@ -1,30 +0,0 @@ -# remove whirlpool usage. the algorithm is missing on at least 0.9.8g and -# 0.9.8i, even though there's an OBJ_whirlpool definition in 0.9.8i. ---- qca-ossl.cpp 2008/08/18 09:08:51 848615 -+++ qca-ossl.cpp 2008/09/24 19:22:26 864423 -@@ -6616,9 +6616,11 @@ - #ifdef SHA512_DIGEST_LENGTH - list += "sha512"; - #endif -+/* - #ifdef OBJ_whirlpool - list += "whirlpool"; - #endif -+*/ - return list; - } - -@@ -6863,10 +6865,12 @@ - else if ( type == "sha512" ) - return new opensslHashContext( EVP_sha512(), this, type); - #endif -+/* - #ifdef OBJ_whirlpool - else if ( type == "whirlpool" ) - return new opensslHashContext( EVP_whirlpool(), this, type); - #endif -+*/ - else if ( type == "pbkdf1(sha1)" ) - return new opensslPbkdf1Context( EVP_sha1(), this, type ); - else if ( type == "pbkdf1(md2)" ) - diff --git a/source/l/qt/QElfParser-fix-type-of-sh_size.patch b/source/l/qt/QElfParser-fix-type-of-sh_size.patch new file mode 100644 index 00000000..1c30f9a4 --- /dev/null +++ b/source/l/qt/QElfParser-fix-type-of-sh_size.patch @@ -0,0 +1,41 @@ +From 9e981c4dd03effc2c52b52f529edfa8955e534ce Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 15 May 2012 14:40:15 +0200 +Subject: [PATCH] QElfParser: fix type of sh_size + +The type of the sh_size field of a section header is either Elf32_Word or Elf64_Xword, +so the type used cannot be qelfword_t (always 32 bits) but qelfoff_t. + +Change-Id: Ia380b6823913fee7a96b39f742630ae3a9ca0cb8 +Reviewed-by: Thiago Macieira +Reviewed-by: Arvid Picciani +(backport of 77b179689ba37dc909778fdd00df2701f83a2868 from qtbase) +--- + src/corelib/plugin/qelfparser_p.cpp | 4 ++-- + src/corelib/plugin/qelfparser_p.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/src/corelib/plugin/qelfparser_p.cpp ++++ b/src/corelib/plugin/qelfparser_p.cpp +@@ -61,8 +61,8 @@ const char *QElfParser::parseSectionHead + + sizeof(qelfaddr_t); // sh_addr + sh->offset = read(data); + data += sizeof(qelfoff_t); // sh_offset +- sh->size = read(data); +- data += sizeof(qelfword_t); // sh_size ++ sh->size = read(data); ++ data += sizeof(qelfoff_t); // sh_size + return data; + } + +--- a/src/corelib/plugin/qelfparser_p.h ++++ b/src/corelib/plugin/qelfparser_p.h +@@ -80,7 +80,7 @@ public: + qelfword_t name; + qelfword_t type; + qelfoff_t offset; +- qelfword_t size; ++ qelfoff_t size; + }; + + int m_endian; diff --git a/source/l/qt/QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch b/source/l/qt/QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch new file mode 100644 index 00000000..9acae10c --- /dev/null +++ b/source/l/qt/QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch @@ -0,0 +1,37 @@ +Description: + QPainter together with QPrinter leaves a lot of temporary files in + /tmp with every printout. That is a problem for embedded devices, + which have not such a large /tmp-partition. We are using 80 MByte as + tmpfs, i.e. in RAM. After some printounts cups deactivates the printer + because there is no space to copy the temporary files to /tmp. + + What happened: In QPdfBaseEnginePrivate::openPrintDevice() noone + remembers the file descriptor opened by tempFile() which is a call to + the cups library to cupsTempFile() + + Later in closePrintDevice the check for fd<0 fails, so no one closes + the file descriptor. If you later remove the file, the descriptor is + still open and cannot removed until you close the application. + + If you print 20 times and more during your application is running and + you print out large files (complicate forms with a lot of elements + produces files with 3-4 MByte) your temporary file can be full, but + you don't see (with ls) files in it. + +Bug: https://bugreports.qt.nokia.com/browse/QTBUG-14724 +Author: Georg Scherzer + +--- + src/gui/painting/qpdf.cpp | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/gui/painting/qpdf.cpp ++++ b/src/gui/painting/qpdf.cpp +@@ -1686,6 +1686,7 @@ bool QPdfBaseEnginePrivate::openPrintDev + cupsTempFile = ret.second; + outDevice = new QFile(); + static_cast(outDevice)->open(ret.first, QIODevice::WriteOnly); ++ fd = ret.first; + #endif + #ifndef QT_NO_LPR + } else { diff --git a/source/l/qt/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch b/source/l/qt/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch new file mode 100644 index 00000000..4d9834a8 --- /dev/null +++ b/source/l/qt/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch @@ -0,0 +1,97 @@ +From a91e9dd202640598d8dec091c67ec94536390e7f Mon Sep 17 00:00:00 2001 +From: "Owen W. Taylor" +Date: Mon, 17 Oct 2011 17:27:43 -0400 +Subject: [PATCH] Fix logic for figuring out what ConfigureNotify positions can be trusted + +When reading ahead in the queue for ConfigureNotify events, it's necessary +to look for intermediate ReparentNotify events as well, since they will +determine whether the position in the event can be trusted or not. + +Bug: https://bugreports.qt.nokia.com/browse/QTBUG-21900 +--- + src/gui/kernel/qapplication_x11.cpp | 47 +++++++++++++++++++++++++++++++----- + 1 file changed, 41 insertions(+), 6 deletions(-) + +--- a/src/gui/kernel/qapplication_x11.cpp ++++ b/src/gui/kernel/qapplication_x11.cpp +@@ -816,6 +816,27 @@ static Bool qt_sync_request_scanner(Disp + #endif + #endif // QT_NO_XSYNC + ++struct qt_configure_event_data ++{ ++ WId window; ++ WId parent; ++}; ++ ++static Bool qt_configure_event_scanner(Display*, XEvent *event, XPointer arg) ++{ ++ qt_configure_event_data *data = ++ reinterpret_cast(arg); ++ if (event->type == ConfigureNotify && ++ event->xconfigure.window == data->window) { ++ return true; ++ } else if (event->type == ReparentNotify && ++ event->xreparent.window == data->window) { ++ data->parent = event->xreparent.parent; ++ } ++ ++ return false; ++} ++ + static void qt_x11_create_intern_atoms() + { + const char *names[QX11Data::NAtoms]; +@@ -5281,8 +5302,11 @@ bool QETWidget::translateConfigEvent(con + if (d->extra->compress_events) { + // ConfigureNotify compression for faster opaque resizing + XEvent otherEvent; +- while (XCheckTypedWindowEvent(X11->display, internalWinId(), ConfigureNotify, +- &otherEvent)) { ++ qt_configure_event_data configureData; ++ configureData.window = internalWinId(); ++ configureData.parent = d->topData()->parentWinId; ++ while (XCheckIfEvent(X11->display, &otherEvent, ++ &qt_configure_event_scanner, (XPointer)&configureData)) { + if (qt_x11EventFilter(&otherEvent)) + continue; + +@@ -5295,13 +5319,19 @@ bool QETWidget::translateConfigEvent(con + newSize.setWidth(otherEvent.xconfigure.width); + newSize.setHeight(otherEvent.xconfigure.height); + ++ trust = isVisible() ++ && (configureData.parent == XNone || ++ configureData.parent == QX11Info::appRootWindow()); ++ + if (otherEvent.xconfigure.send_event || trust) { + newCPos.rx() = otherEvent.xconfigure.x + + otherEvent.xconfigure.border_width; + newCPos.ry() = otherEvent.xconfigure.y + + otherEvent.xconfigure.border_width; + isCPos = true; +- } ++ } else { ++ isCPos = false; ++ } + } + #ifndef QT_NO_XSYNC + qt_sync_request_event_data sync_event; +@@ -5314,9 +5344,14 @@ bool QETWidget::translateConfigEvent(con + } + + if (!isCPos) { +- // we didn't get an updated position of the toplevel. +- // either we haven't moved or there is a bug in the window manager. +- // anyway, let's query the position to be certain. ++ // If the last configure event didn't have a trustable position, ++ // it's necessary to query, see ICCCM 4.24: ++ // ++ // Any real ConfigureNotify event on a top-level window implies ++ // that the window position on the root may have changed, even ++ // though the event reports that the window position in its ++ // parent is unchanged because the window may have been reparented. ++ + int x, y; + Window child; + XTranslateCoordinates(X11->display, internalWinId(), diff --git a/source/l/qt/Qt.pc b/source/l/qt/Qt.pc new file mode 100644 index 00000000..f4c0d593 --- /dev/null +++ b/source/l/qt/Qt.pc @@ -0,0 +1,16 @@ +prefix=/usr/lib${LIBDIRSUFFIX}/qt +bindir=${prefix}/bin +datadir=${prefix} +docdir=${prefix}/doc +headerdir=${prefix}/include +importdir=${prefix}/imports +libdir=${prefix}/lib +moc=${bindir}/moc +plugindir=${prefix}/plugins +qmake=${bindir}/qmake +sysconfdir=/etc +translationdir=${prefix}/translations + +Name: Qt +Description: Qt Configuration +Version: 4.8.1 diff --git a/source/l/qt/doinst.sh b/source/l/qt/doinst.sh index 6f7c5df0..b9a2c53b 100644 --- a/source/l/qt/doinst.sh +++ b/source/l/qt/doinst.sh @@ -3,3 +3,8 @@ if [ -x sbin/ldconfig ]; then chroot . /sbin/ldconfig 2> /dev/null fi +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1 +fi + + diff --git a/source/l/qt/qt.QSortFilterProxyModel.reformatted.diff b/source/l/qt/qt.QSortFilterProxyModel.reformatted.diff deleted file mode 100644 index 0ab94b31..00000000 --- a/source/l/qt/qt.QSortFilterProxyModel.reformatted.diff +++ /dev/null @@ -1,92 +0,0 @@ ---- ./src/gui/itemviews/qsortfilterproxymodel.cpp.orig 2010-11-20 17:54:23.000000000 -0600 -+++ ./src/gui/itemviews/qsortfilterproxymodel.cpp 2011-01-07 00:40:04.000000000 -0600 -@@ -782,14 +782,14 @@ - if (orthogonal_source_to_proxy.isEmpty()) { - const int ortho_end = (orient == Qt::Horizontal) ? model->rowCount(source_parent) : model->columnCount(source_parent); - -+ orthogonal_source_to_proxy.resize(ortho_end); -+ - for (int ortho_item = 0; ortho_item < ortho_end; ++ortho_item) { - if ((orient == Qt::Horizontal) ? q->filterAcceptsRow(ortho_item, source_parent) - : q->filterAcceptsColumn(ortho_item, source_parent)) { - orthogonal_proxy_to_source.append(ortho_item); - } - } -- orthogonal_source_to_proxy.resize(orthogonal_proxy_to_source.size()); -- - if (orient == Qt::Horizontal) { - // We're reacting to columnsInserted, but we've just inserted new rows. Sort them. - sort_source_rows(orthogonal_proxy_to_source, source_parent); ---- ./tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro.orig 2010-11-20 17:54:28.000000000 -0600 -+++ ./tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro 2011-01-07 00:40:04.000000000 -0600 -@@ -1,6 +1,7 @@ - load(qttest_p4) - --SOURCES += tst_qsortfilterproxymodel.cpp -- -+INCLUDEPATH += $$PWD/../modeltest - -+SOURCES += tst_qsortfilterproxymodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp -+HEADERS += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h - ---- ./tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp.orig 2010-11-20 17:54:28.000000000 -0600 -+++ ./tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp 2011-01-07 00:41:02.000000000 -0600 -@@ -43,6 +43,9 @@ - #include - #include "../../shared/util.h" - -+#include "dynamictreemodel.h" -+#include "modeltest.h" -+ - #include - #include - -@@ -143,6 +146,7 @@ - void taskQTBUG_10287_unnecessaryMapCreation(); - - void testMultipleProxiesWithSelection(); -+ void filteredColumns(); - - protected: - void buildHierarchy(const QStringList &data, QAbstractItemModel *model); -@@ -3135,5 +3139,40 @@ - // No assert failure, it passes. - } - -+class FilteredColumnProxyModel : public QSortFilterProxyModel -+{ -+ Q_OBJECT -+public: -+ FilteredColumnProxyModel(QObject *parent = 0) -+ : QSortFilterProxyModel(parent) -+ { -+ -+ } -+ -+protected: -+ bool filterAcceptsColumn(int column, const QModelIndex &source_parent) const -+ { -+ return column % 2 != 0; -+ } -+}; -+ -+void tst_QSortFilterProxyModel::filteredColumns() -+{ -+ DynamicTreeModel *model = new DynamicTreeModel(this); -+ -+ FilteredColumnProxyModel *proxy = new FilteredColumnProxyModel(this); -+ proxy->setSourceModel(model); -+ -+ new ModelTest(proxy, this); -+ -+ ModelInsertCommand *insertCommand = new ModelInsertCommand(model, this); -+ insertCommand->setNumCols(2); -+ insertCommand->setStartRow(0); -+ insertCommand->setEndRow(0); -+ // Parent is QModelIndex() -+ insertCommand->doCommand(); -+ -+} -+ - QTEST_MAIN(tst_QSortFilterProxyModel) - #include "tst_qsortfilterproxymodel.moc" diff --git a/source/l/qt/qt.SlackBuild b/source/l/qt/qt.SlackBuild index f79d2c2a..b361aaee 100755 --- a/source/l/qt/qt.SlackBuild +++ b/source/l/qt/qt.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -35,23 +35,28 @@ # # Alternate method (we don't use this): # wget http://qt.gitorious.org/qt/kde-qt/archive-tarball/4.6.2-patched +# +# Modifications 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL +# qt 4.7.3, 4.7.4, 4.8.0, 4.8.1, 4.8.2 are built from original nokia sources. PKGNAM=qt -VERSION=$(ls qt-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) -BUILD=${BUILD:-3} +VERSION=$(ls qt-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +BUILD=${BUILD:-4} + +NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j7} - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -61,11 +66,22 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + # To prevent "qatomic_armv6.h error: output number 2 not directly addressable" + # More permanent solution is to patch gcc: + # http://bazaar.launchpad.net/~linaro-toolchain-dev/gcc-linaro/4.6/revision/106731 + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fno-strict-volatile-bitfields" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} @@ -73,23 +89,9 @@ PKG=$TMP/package-${PKGNAM} rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -#rm -rf qt-x11-opensource-src-$VERSION -#tar xvf $CWD/qt-x11-opensource-src-$VERSION.tar.gz # For qt releases -#cd qt-x11-opensource-src-$VERSION || exit 1 - -rm -rf qt-$VERSION -if [ -r $CWD/qt-$VERSION.tar.gz ]; then - tar xvf $CWD/qt-$VERSION.tar.gz || exit 1 -elif [ -r $CWD/qt-$VERSION.tar.bz2 ]; then - tar xvf $CWD/qt-$VERSION.tar.bz2 || exit 1 -elif [ -r $CWD/qt-$VERSION.tar.xz ]; then - tar xvf $CWD/qt-$VERSION.tar.xz || exit 1 -elif [ -r $CWD/qt-$VERSION.tar.lzma ]; then - tar xvf $CWD/qt-$VERSION.tar.lzma || exit 1 -else - exit 1 -fi -cd qt-$VERSION || exit 1 +rm -rf qt-everywhere-opensource-src-$VERSION +tar xvf $CWD/qt-everywhere-opensource-src-$VERSION.tar.xz # For qt releases +cd qt-everywhere-opensource-src-$VERSION || exit 1 chown -R root:root . find . \ @@ -98,28 +100,32 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# apply_patches looks for a ".svn" directory, which doesn't exist in the used snapshot. -# removing the check from apply_patches to not try to apply already applied patches -sed -i "s| test -d .svn &&||" apply_patches - -# This is only needed/wanted for qt-copy (the r###### version) that we're -# building right now. It might require manual intervention, so don't walk -# away during the build -./apply_patches - if [ $ARCH = "i486" ]; then - zcat $CWD/qt.x86.cflags.diff.gz | patch -p1 || exit 1 + sed -i -e "s/QMAKE_CFLAGS_RELEASE += -O2/QMAKE_CFLAGS_RELEASE += $SLKCFLAGS/" mkspecs/common/gcc-base.conf || exit 1 fi # Fix path to mysql header zcat $CWD/qt.mysql.h.diff.gz | patch -p1 --verbose || exit 1 -# Upstream patch required for upcoming kdepim-4.6.x: -zcat $CWD/qt.QSortFilterProxyModel.reformatted.diff.gz | patch -p1 --verbose || exit 1 +# gcc doesn't support flag "-fuse-ld=gold": +zcat $CWD/qt.ld-gold.patch.gz | patch -p1 --verbose || exit 1 + +# Stupid idea - remove it: +zcat $CWD/qt.webkit-no_Werror.patch.gz | patch -p1 --verbose || exit 1 + +# Fix cursor position bug within tables: +zcat $CWD/qt.ca89c49.cursor.position.diff.gz | patch -p1 --verbose || exit 1 + +# Fix assistant crash: +zcat $CWD/qt.assistant.memcpy-crash.diff.gz | patch -p0 --verbose || exit 1 + +# Fix webkit compiling with recent glib: +zcat $CWD/qt.webkit.glib.diff.gz | patch -p1 --verbose || exit 1 -# Blacklist compromised certificates: -zcat $CWD/qt.blacklist.bad.certs.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/qt.blacklist.bad.certs.patch02.diff.gz | patch -p1 --verbose || exit 1 +# Some patches from upstream: +zcat $CWD/QElfParser-fix-type-of-sh_size.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch.gz | patch -p1 --verbose || exit 1 export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" @@ -128,7 +134,6 @@ export OPENSOURCE_CXXFLAGS="$SLKCFLAGS" -confirm-license \ -opensource \ -prefix /usr/lib${LIBDIRSUFFIX}/qt \ - -qt-gif \ -fast \ -system-libpng \ -system-libjpeg \ @@ -152,10 +157,34 @@ make install INSTALL_ROOT=$PKG || exit 1 # The infamous qt -> qt-${VERSION} link that keeps the full path out of .la files: ( cd $PKG/usr/lib${LIBDIRSUFFIX} ; ln -sf qt qt-${VERSION} ) -# libjscore is used internally. Prevent a false dependency on this in the .la files: +# Add a missing Qt.pc which is needed by KDE applications: +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig +cat < $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/Qt.pc +prefix=/usr/lib${LIBDIRSUFFIX}/qt +bindir=\${prefix}/bin +datadir=\${prefix} +docdir=\${prefix}/doc +headerdir=\${prefix}/include +importdir=\${prefix}/imports +libdir=\${prefix}/lib +moc=\${bindir}/moc +plugindir=\${prefix}/plugins +qmake=\${bindir}/qmake +sysconfdir=\${prefix}/etc/settings +translationdir=\${prefix}/translations + +Name: Qt +Description: Qt Configuration +Version: $VERSION +EOF + +# libjscore is used internally. Prevent a false dependency on this in the .la and .pc files: sed -i "s,-ljscore,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/*.pc sed -i "s,-L../JavaScriptCore/release,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/*.pc +# libwebcore is used internally. Prevent a false dependency on this in the .la and .pc files: +sed -i "s#-L/usr/lib${LIBDIRSUFFIX}/qt/lib -L../../WebCore/release -L../../JavaScriptCore/release -L/usr/X11R6/lib$LIBDIRSUFFIX -lwebcore##g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/libQtWebKit.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/QtWebKit.pc + # Link the shared libraries into /usr/lib: ( cd $PKG/usr/lib${LIBDIRSUFFIX} for file in qt/lib/*.so* ; do @@ -163,11 +192,6 @@ sed -i "s,-L../JavaScriptCore/release,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.l done ) -if [ $ARCH = "i486" ]; then - # Put this back as shipped: - zcat $CWD/qt.x86.cflags.diff.gz | patch -p1 -R -fi - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -195,6 +219,71 @@ mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig done ) +# Add menu entries for all those hidden but great Qt applications: +# Qt logo: +convert $PKG/usr/lib$LIBDIRSUFFIX/qt/doc/src/images/qt-logo.png -resize 48x48 $PKG/usr/share/icons/hicolor/48x48/apps/qt-logo.png +convert $PKG/usr/lib$LIBDIRSUFFIX/qt/doc/src/images/qt-logo.png -resize 48x48 $PKG/usr/share/icons/hicolor/48x48/apps/qt-logo.png +# Assistant icons +install -p -m644 -D tools/assistant/tools/assistant/images/assistant.png $PKG/usr/share/icons/hicolor/32x32/apps/assistant.png +install -p -m644 -D tools/assistant/tools/assistant/images/assistant-128.png $PKG/usr/share/icons/hicolor/128x128/apps/assistant.png +# Designer icon +install -p -m644 -D tools/designer/src/designer/images/designer.png $PKG/usr/share/icons/hicolor/128x128/apps/designer.png +# Linguist icons +for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -m644 -D ${icon} $PKG/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png +done + +# And the .desktop files +mkdir -p $PKG/usr/share/applications +cat < $PKG/usr/share/applications/designer.desktop +[Desktop Entry] +Name=Qt4 Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt4 applications +Exec=designer +Icon=designer +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; +EOF +cat < $PKG/usr/share/applications/assistant.desktop +[Desktop Entry] +Name=Qt4 Assistant +Comment=Shows Qt4 documentation and examples +Exec=assistant +Icon=assistant +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development;Documentation; +EOF +cat < $PKG/usr/share/applications/linguist.desktop +[Desktop Entry] +Name=Qt4 Linguist +Comment=Add translations to Qt4 applications +Exec=linguist +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; +EOF +cat < $PKG/usr/share/applications/qtconfig.desktop +[Desktop Entry] +Name=Qt4 Config +Comment=Configure Qt4 behavior, styles, fonts +Exec=qtconfig +Icon=qt-logo +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Settings; +EOF + # Add a documentation directory: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a *GPL_EXCEPTION* FAQ* INSTALL KNOWN* LICENSE* README* changes-* \ diff --git a/source/l/qt/qt.assistant.memcpy-crash.diff b/source/l/qt/qt.assistant.memcpy-crash.diff new file mode 100644 index 00000000..f2193ee8 --- /dev/null +++ b/source/l/qt/qt.assistant.memcpy-crash.diff @@ -0,0 +1,11 @@ +--- tools/assistant/tools/assistant/mainwindow.cpp 2012-06-27 03:02:37.539564947 +0200 ++++ tools/assistant/tools/assistant/mainwindow.cpp 2012-06-27 03:03:18.843561620 +0200 +@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont() + if (helpEngine.usesAppFont()) + font = helpEngine.appFont(); + +- const QWidgetList &widgets = qApp->allWidgets(); +- foreach (QWidget* widget, widgets) ++ foreach (QWidget* widget, QApplication::allWidgets()) + widget->setFont(font); + } diff --git a/source/l/qt/qt.blacklist.bad.certs.diff b/source/l/qt/qt.blacklist.bad.certs.diff deleted file mode 100644 index 38b6d369..00000000 --- a/source/l/qt/qt.blacklist.bad.certs.diff +++ /dev/null @@ -1,67 +0,0 @@ ---- ./src/network/ssl/qsslcertificate_p.h.orig 2010-11-20 17:54:24.000000000 -0600 -+++ ./src/network/ssl/qsslcertificate_p.h 2011-03-24 18:08:59.000000000 -0500 -@@ -96,6 +96,7 @@ - static QSslCertificate QSslCertificate_from_X509(X509 *x509); - static QList certificatesFromPem(const QByteArray &pem, int count = -1); - static QList certificatesFromDer(const QByteArray &der, int count = -1); -+ static bool isBlacklisted(const QSslCertificate &certificate); - - friend class QSslSocketBackendPrivate; - ---- ./src/network/ssl/qsslcertificate.cpp.orig 2010-11-20 17:54:24.000000000 -0600 -+++ ./src/network/ssl/qsslcertificate.cpp 2011-03-24 18:08:59.000000000 -0500 -@@ -219,17 +219,19 @@ - Returns true if this certificate is valid; otherwise returns - false. - -- Note: Currently, this function only checks that the current -+ Note: Currently, this function checks that the current - data-time is within the date-time range during which the -- certificate is considered valid. No other checks are -- currently performed. -+ certificate is considered valid, and checks that the -+ certificate is not in a blacklist of fraudulent certificates. - - \sa isNull() - */ - bool QSslCertificate::isValid() const - { - const QDateTime currentTime = QDateTime::currentDateTime(); -- return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter; -+ return currentTime >= d->notValidBefore && -+ currentTime <= d->notValidAfter && -+ ! QSslCertificatePrivate::isBlacklisted(*this); - } - - /*! -@@ -798,6 +800,30 @@ - return certificates; - } - -+// These certificates are known to be fraudulent and were created during the comodo -+// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html -+static const char *certificate_blacklist[] = { -+ "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", -+ "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", -+ "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", -+ "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", -+ "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", -+ "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", -+ "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", -+ "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", -+ "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", -+ 0 -+}; -+ -+bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate) -+{ -+ for (int a = 0; certificate_blacklist[a] != 0; a++) { -+ if (certificate.serialNumber() == certificate_blacklist[a]) -+ return true; -+ } -+ return false; -+} -+ - #ifndef QT_NO_DEBUG_STREAM - QDebug operator<<(QDebug debug, const QSslCertificate &certificate) - { diff --git a/source/l/qt/qt.blacklist.bad.certs.patch02.diff b/source/l/qt/qt.blacklist.bad.certs.patch02.diff deleted file mode 100644 index b8bb1e4e..00000000 --- a/source/l/qt/qt.blacklist.bad.certs.patch02.diff +++ /dev/null @@ -1,35 +0,0 @@ -From b87528a71b66e786c11804d7b79e408aae612748 Mon Sep 17 00:00:00 2001 -From: Peter Hartmann -Date: Fri, 25 Mar 2011 13:45:24 +0100 -Subject: [PATCH] QSslSocket internals: abort on encountering blacklisted certificates - -tested manually with "openssl s_server -cert blacklisted.pem -key -key.pem" and connecting a QSslSocket. - -Reviewed-by: Markus Goetz -Task-number: QTBUG-18338 ---- - src/network/ssl/qsslsocket_openssl.cpp | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp -index 0866534..2427193 100644 ---- a/src/network/ssl/qsslsocket_openssl.cpp -+++ b/src/network/ssl/qsslsocket_openssl.cpp -@@ -1193,6 +1193,13 @@ bool QSslSocketBackendPrivate::startHandshake() - X509 *x509 = q_SSL_get_peer_certificate(ssl); - configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509); - q_X509_free(x509); -+ if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) { -+ q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted")); -+ q->setSocketError(QAbstractSocket::SslHandshakeFailedError); -+ emit q->error(QAbstractSocket::SslHandshakeFailedError); -+ plainSocket->disconnectFromHost(); -+ return false; -+ } - - // Start translating errors. - QList errors; --- -1.6.1 - diff --git a/source/l/qt/qt.ca89c49.cursor.position.diff b/source/l/qt/qt.ca89c49.cursor.position.diff new file mode 100644 index 00000000..ab3429f8 --- /dev/null +++ b/source/l/qt/qt.ca89c49.cursor.position.diff @@ -0,0 +1,31 @@ +From ca89c49fa2c5cbb3945897046f33eed9f7da846c Mon Sep 17 00:00:00 2001 +From: Jiang Jiang +Date: Tue, 3 Jul 2012 10:17:49 +0200 +Subject: [PATCH] Fix cursor truncate to include line position + +Since we could have moved the line position (QTextLine::setPosition), +the truncating position should be adjusted with that. + +Change-Id: Ie1acd4a1b6a4adfbeeb9ce8ee2dfa19d992470e8 +Reviewed-by: Eskil Abrahamsen Blomfeldt +--- + src/gui/text/qtextlayout.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp +index 16f7150..52f2793 100644 +--- a/src/gui/text/qtextlayout.cpp ++++ b/src/gui/text/qtextlayout.cpp +@@ -2616,8 +2616,8 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const + x += eng->offsetInLigature(si, pos, end, glyph_pos); + } + +- if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.width) +- x = line.width; ++ if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.x + line.width) ++ x = line.x + line.width; + + *cursorPos = pos + si->position; + return x.toReal(); +-- +1.7.10 diff --git a/source/l/qt/qt.ld-gold.patch b/source/l/qt/qt.ld-gold.patch new file mode 100644 index 00000000..0e3897e9 --- /dev/null +++ b/source/l/qt/qt.ld-gold.patch @@ -0,0 +1,22 @@ +diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri +--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me 2012-01-24 13:05:50.460890750 +0100 ++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri 2012-01-24 13:19:08.836799974 +0100 +@@ -3,12 +3,12 @@ + contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 + contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 + +-linux-g++ { +-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { +- message(Using gold linker) +- QMAKE_LFLAGS+=-fuse-ld=gold +-} +-} ++#linux-g++ { ++#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { ++# message(Using gold linker) ++# QMAKE_LFLAGS+=-fuse-ld=gold ++#} ++#} + + # We use this flag on production branches + # See https://bugs.webkit.org/show_bug.cgi?id=60824 diff --git a/source/l/qt/qt.webkit-no_Werror.patch b/source/l/qt/qt.webkit-no_Werror.patch new file mode 100644 index 00000000..b8e718e0 --- /dev/null +++ b/source/l/qt/qt.webkit-no_Werror.patch @@ -0,0 +1,13 @@ +diff -up qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri +--- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror 2012-03-14 15:01:29.000000000 +0100 ++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri 2012-03-28 17:12:33.391294004 +0200 +@@ -102,8 +102,6 @@ CONFIG -= warn_on + + # Treat warnings as errors on x86/Linux/GCC + linux-g++* { +- !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror +- + greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { + if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) { + # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr). + diff --git a/source/l/qt/qt.webkit.glib.diff b/source/l/qt/qt.webkit.glib.diff new file mode 100644 index 00000000..b1666256 --- /dev/null +++ b/source/l/qt/qt.webkit.glib.diff @@ -0,0 +1,11 @@ +--- ./src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.orig 2012-04-26 14:46:14.000000000 -0500 ++++ ./src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2012-08-06 19:53:44.134339082 -0500 +@@ -52,7 +52,7 @@ + typedef struct _GHashTable GHashTable; + typedef struct _GInputStream GInputStream; + typedef struct _GList GList; +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GPatternSpec GPatternSpec; + typedef struct _GPollableOutputStream GPollableOutputStream; + typedef struct _GSocketClient GSocketClient; diff --git a/source/l/qt/qt.x86.cflags.diff b/source/l/qt/qt.x86.cflags.diff deleted file mode 100644 index a9e65fbb..00000000 --- a/source/l/qt/qt.x86.cflags.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- qt.orig/mkspecs/common/g++.conf 2007-12-22 00:22:18.295453075 -0600 -+++ qt/mkspecs/common/g++.conf 2007-12-22 00:23:07.514257895 -0600 -@@ -7,7 +7,7 @@ - QMAKE_CFLAGS_DEPS += -M - QMAKE_CFLAGS_WARN_ON += -Wall -W - QMAKE_CFLAGS_WARN_OFF += -w --QMAKE_CFLAGS_RELEASE += -O2 -+QMAKE_CFLAGS_RELEASE += -O2 -march=i486 -mtune=i686 - QMAKE_CFLAGS_DEBUG += -g - QMAKE_CFLAGS_SHLIB += -fPIC - QMAKE_CFLAGS_STATIC_LIB += -fPIC diff --git a/source/l/qt/slack-desc b/source/l/qt/slack-desc index 3f77a7fb..f511d899 100644 --- a/source/l/qt/slack-desc +++ b/source/l/qt/slack-desc @@ -11,9 +11,9 @@ qt: qt: Qt is a complete and well-developed object-oriented framework for qt: developing graphical user interface (GUI) applications using C++. qt: +qt: Homepage: http://qt.nokia.com qt: qt: qt: qt: -qt: Homepage: http://qt.nokia.com qt: diff --git a/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild b/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild index 9664ddb2..f1bf2a15 100755 --- a/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild +++ b/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for qtscriptgenerator # Copyright 2009 Heinz Wiesinger -# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=qtscriptgenerator -VERSION=${VERSION:-0.1.0} -BUILD=${BUILD:-2} +PKGNAM=qtscriptgenerator +VERSION=${VERSION:-0.2.0} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -39,7 +39,7 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -72,11 +72,9 @@ fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PRGNAM-src-$VERSION -tar xvf $CWD/$PRGNAM-src-$VERSION.tar.?z* || exit 1 -cd $PRGNAM-src-$VERSION || exit 1 - -zcat $CWD/qtscriptgenerator.gcc44.diff.gz | patch -p1 --verbose || exit 1 +rm -rf $PKGNAM-src-$VERSION +tar xvf $CWD/$PKGNAM-src-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-src-$VERSION || exit 1 chown -R root:root . find . \ @@ -117,15 +115,15 @@ cp -a plugins/script/libqtscript* $PKG/usr/lib${LIBDIRSUFFIX}/qt/plugins/script/ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a tools/qsexec/README.TXT README.qsexec cp -a \ LICENSE.GPL README* \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/qtscriptgenerator/qtscriptgenerator.gcc44.diff b/source/l/qtscriptgenerator/qtscriptgenerator.gcc44.diff deleted file mode 100644 index 165c97df..00000000 --- a/source/l/qtscriptgenerator/qtscriptgenerator.gcc44.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./generator/parser/rpp/pp-internal.h.orig 2009-02-20 05:42:24.000000000 -0600 -+++ ./generator/parser/rpp/pp-internal.h 2010-02-18 19:12:22.000000000 -0600 -@@ -16,6 +16,7 @@ - #define PP_INTERNAL_H - - #include -+#include - - namespace rpp { - diff --git a/source/l/qtscriptgenerator/slack-desc b/source/l/qtscriptgenerator/slack-desc index f24e9f67..16f2ba05 100644 --- a/source/l/qtscriptgenerator/slack-desc +++ b/source/l/qtscriptgenerator/slack-desc @@ -5,15 +5,15 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler-------------------------------------------| + |-----handy-ruler------------------------------------------------------| qtscriptgenerator: qtscriptgenerator (Qt API Bindings for QtScript) qtscriptgenerator: -qtscriptgenerator: Qt Script Generator is a tool that generates Qt bindings -qtscriptgenerator: for Qt Script. With the generated bindings you get access -qtscriptgenerator: to substantial portions of the Qt API from within Qt -qtscriptgenerator: Script. +qtscriptgenerator: Qt Script Generator is a tool that generates Qt bindings for Qt +qtscriptgenerator: Script. With the generated bindings you get access to substantial +qtscriptgenerator: portions of the Qt API from within Qt Script. +qtscriptgenerator: +qtscriptgenerator: Homepage: http://code.google.com/p/qtscriptgenerator/ qtscriptgenerator: qtscriptgenerator: qtscriptgenerator: -qtscriptgenerator: Homepage: http://code.google.com/p/qtscriptgenerator/ qtscriptgenerator: diff --git a/source/l/raptor/raptor.SlackBuild b/source/l/raptor/raptor.SlackBuild deleted file mode 100755 index 1c57b5d0..00000000 --- a/source/l/raptor/raptor.SlackBuild +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/sh - -# Copyright 2007 Heinz Wiesinger -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Modified by Robby Workman -# No added terms or copyright claims - - -VERSION=${VERSION:-$(echo raptor-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-raptor - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf raptor-$VERSION -tar xvf $CWD/raptor-$VERSION.tar.xz || exit 1 -cd raptor-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --disable-static \ - --build=$ARCH-slackware-linux - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) - -mkdir -p $PKG/usr/doc/raptor-$VERSION -cp -a \ - AUTHORS COPYING* INSTALL* LICENSE* NEWS* \ - NOTICE README* RELEASE.html \ - $PKG/usr/doc/raptor-$VERSION -( cd $PKG/usr/doc/raptor-$VERSION - ln -s /usr/share/gtk-doc/html/raptor html -) - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/raptor-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/l/raptor/raptor.info b/source/l/raptor/raptor.info deleted file mode 100644 index 0f2bae33..00000000 --- a/source/l/raptor/raptor.info +++ /dev/null @@ -1,2 +0,0 @@ -HOMEPAGE="http://librdf.org/" -DOWNLOAD="http://download.librdf.org/source/raptor-1.4.18.tar.gz" diff --git a/source/l/raptor/slack-desc b/source/l/raptor/slack-desc deleted file mode 100644 index e15154b7..00000000 --- a/source/l/raptor/slack-desc +++ /dev/null @@ -1,12 +0,0 @@ - |-----handy-ruler------------------------------------------------------| -raptor: raptor (RDF Parser & Serializer) -raptor: -raptor: Raptor is a free software/Open Source C library that provides a set of -raptor: parsers and serializers that generate Resource Description Framework -raptor: (RDF) triples by parsing syntaxes or serialize the triples into a -raptor: syntax. The supported parsing syntaxes are RDF/XML, N-Triples, TRiG, -raptor: Turtle, RSS tag soup including all versions of RSS, Atom 1.0 and 0.3, -raptor: GRDDL and microformats for HTML, XHTML and XML. -raptor: -raptor: Homepage: http://librdf.org/ -raptor: diff --git a/source/l/raptor2/raptor2.SlackBuild b/source/l/raptor2/raptor2.SlackBuild index 4b024ce4..38c596ba 100755 --- a/source/l/raptor2/raptor2.SlackBuild +++ b/source/l/raptor2/raptor2.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2007 Heinz Wiesinger -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2012 Heinz Wiesinger, Amsterdam, NL +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,6 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Modified by Robby Workman +# Modified by Eric Hameleers # No added terms or copyright claims @@ -29,22 +30,20 @@ PKGNAM=raptor2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:--j7} + # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -54,11 +53,23 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -81,7 +92,8 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --disable-static \ - --build=$ARCH-slackware-linux + --with-icu-config=/usr/bin/icu-config \ + --build=$TARGET make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/raptor2/slack-desc b/source/l/raptor2/slack-desc index d5f1d463..309b74a1 100644 --- a/source/l/raptor2/slack-desc +++ b/source/l/raptor2/slack-desc @@ -1,3 +1,10 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + |-----handy-ruler------------------------------------------------------| raptor2: raptor2 (RDF Parser & Serializer) raptor2: diff --git a/source/l/rasqal/rasqal.SlackBuild b/source/l/rasqal/rasqal.SlackBuild index 435991a0..0da299dd 100755 --- a/source/l/rasqal/rasqal.SlackBuild +++ b/source/l/rasqal/rasqal.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007 Heinz Wiesinger -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,22 +29,20 @@ PKGNAM=rasqal VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:--j7} + # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -54,11 +52,23 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -81,7 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --disable-static \ - --build=$ARCH-slackware-linux + --build=$TARGET make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/rasqal/slack-desc b/source/l/rasqal/slack-desc index 46e8b19c..00e549d0 100644 --- a/source/l/rasqal/slack-desc +++ b/source/l/rasqal/slack-desc @@ -1,3 +1,10 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + |-----handy-ruler------------------------------------------------------| rasqal: rasqal (RDF parsing library) rasqal: @@ -7,6 +14,6 @@ rasqal: constructing the queries, executing them and returning result formats. rasqal: It currently handles the RDF Data Query Language (RDQL) and SPARQL rasqal: Query language. rasqal: -rasqal: rasqal: Homepage: http://librdf.org/ rasqal: +rasqal: diff --git a/source/l/redland/redland.SlackBuild b/source/l/redland/redland.SlackBuild index 1849481e..16d90675 100755 --- a/source/l/redland/redland.SlackBuild +++ b/source/l/redland/redland.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007 Heinz Wiesinger -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,24 +28,22 @@ PKGNAM=redland VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-4} + +NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -55,11 +53,23 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -95,8 +105,9 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --with-included-ltdl=no \ --with-bdb-lib=/usr/lib${LIBDIRSUFFIX} \ + --with-bdb-dbname=db-4.4 \ --with-threads \ - --build=$ARCH-slackware-linux + --build=$TARGET # Prevent error "No rule to make target `-lltdl', needed by `librdf.la'" sed -i -e 's# -lltdl$# #' -e '/^LIBS =/s# = # = -lltdl #' src/Makefile diff --git a/source/l/redland/slack-desc b/source/l/redland/slack-desc index db035907..f16c1d45 100644 --- a/source/l/redland/slack-desc +++ b/source/l/redland/slack-desc @@ -1,3 +1,10 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + |-----handy-ruler----------------------------------------------------| redland: redland (RDF high-level interface library) redland: diff --git a/source/l/sg3_utils/sg3_utils.SlackBuild b/source/l/sg3_utils/sg3_utils.SlackBuild new file mode 100755 index 00000000..935f6f8c --- /dev/null +++ b/source/l/sg3_utils/sg3_utils.SlackBuild @@ -0,0 +1,113 @@ +#!/bin/sh + +# Slackware build script for sg3_utils + +# Copyright 2010 Robby Workman Northport, AL, USA +# Copyright 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=sg3_utils +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$TARGET + +make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS BSD_LICENSE COPYING COVERAGE CREDITS ChangeLog NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/sg3_utils/sg3_utils.info b/source/l/sg3_utils/sg3_utils.info new file mode 100644 index 00000000..f429377e --- /dev/null +++ b/source/l/sg3_utils/sg3_utils.info @@ -0,0 +1 @@ +http://sg.danny.cz/sg/p/ diff --git a/source/l/sg3_utils/slack-desc b/source/l/sg3_utils/slack-desc new file mode 100644 index 00000000..b086caf6 --- /dev/null +++ b/source/l/sg3_utils/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +sg3_utils: sg3_utils (utilities and test programs for the linux sg driver) +sg3_utils: +sg3_utils: This package contains low level utilities for devices that use a SCSI +sg3_utils: command set. Apart from SCSI parallel interface (SPI) devices, the +sg3_utils: SCSI command set is used by ATAPI devices (CD/DVDs and tapes), USB +sg3_utils: mass storage devices, Fibre Channel disks, IEEE 1394 storage devices +sg3_utils: (that use the "SBP" protocol), SAS, iSCSI and FCoE devices (among +sg3_utils: others). +sg3_utils: +sg3_utils: Homepage: http://sg.danny.cz/sg/sg3_utils.html +sg3_utils: diff --git a/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild b/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild index eb0f00ad..76ae4733 100755 --- a/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild +++ b/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,24 +21,24 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-0.5} +PKGNAM=shared-desktop-ontologies +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j6} + +NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-shared-desktop-ontologies - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -48,17 +48,24 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf shared-desktop-ontologies-$VERSION -tar xvf $CWD/shared-desktop-ontologies-$VERSION.tar.?z* || exit 1 -cd shared-desktop-ontologies-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -86,10 +93,10 @@ cd - find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mkdir -p $PKG/usr/doc/shared-desktop-ontologies-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS LICENSE* README \ - $PKG/usr/doc/shared-desktop-ontologies-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: @@ -103,5 +110,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/shared-desktop-ontologies-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/shared-desktop-ontologies/slack-desc b/source/l/shared-desktop-ontologies/slack-desc index 8057846b..18412ab5 100644 --- a/source/l/shared-desktop-ontologies/slack-desc +++ b/source/l/shared-desktop-ontologies/slack-desc @@ -13,7 +13,7 @@ shared-desktop-ontologies: the desktop in terms of vocabulary. It contains the w shared-desktop-ontologies: ontologies such as RDF and RDFS as well as the Nepomuk ontologies shared-desktop-ontologies: which are used by projects like KDE or Strigi. shared-desktop-ontologies: +shared-desktop-ontologies: Homepage: http://oscaf.sourceforge.net shared-desktop-ontologies: shared-desktop-ontologies: -shared-desktop-ontologies: Homepage: http://oscaf.sourceforge.net shared-desktop-ontologies: diff --git a/source/l/shared-mime-info/doinst.sh b/source/l/shared-mime-info/doinst.sh index 38726225..6c596b73 100644 --- a/source/l/shared-mime-info/doinst.sh +++ b/source/l/shared-mime-info/doinst.sh @@ -6,7 +6,7 @@ if [ -x /usr/bin/update-mime-database ]; then if [ -d $homedir/.local/share/mime ]; then username=$(echo $passwdline | cut -f 1 -d :) # Sorry about the long command line, alienBOB ;-) - su $username -c "/usr/bin/update-mime-database $homemimedir 1>/dev/null 2>/dev/null" 2> /dev/null + su $username -c "/usr/bin/update-mime-database $homedir/.local/share/mime 1>/dev/null 2>/dev/null" 2> /dev/null fi done # This is just "cleanup" in case something might be missed in /home/*/ diff --git a/source/l/shared-mime-info/shared-mime-info.SlackBuild b/source/l/shared-mime-info/shared-mime-info.SlackBuild index 81d5f01b..ed72d9ba 100755 --- a/source/l/shared-mime-info/shared-mime-info.SlackBuild +++ b/source/l/shared-mime-info/shared-mime-info.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=shared-mime-info VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -75,10 +75,10 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/${PKGNAM}-$VERSION \ --disable-update-mimedb \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG +make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} mv $PKG/usr/share/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX} @@ -93,10 +93,20 @@ chmod 755 $PKG/var/log/setup/setup.07.update-mime-database find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ diff --git a/source/l/sip/sip.SlackBuild b/source/l/sip/sip.SlackBuild index 687d76f9..4412ea25 100755 --- a/source/l/sip/sip.SlackBuild +++ b/source/l/sip/sip.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2008 Aleksandar Samardzic -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,22 +22,24 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Modified by Robby Workman +# Modified by Eric Hameleers -VERSION=${VERSION:-4.11.2} -BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j6} +PKGNAM=sip +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-sip +NUMJOBS=${NUMJOBS:--j7} -# Automatically determine architecture for build & packaging: +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -47,6 +49,8 @@ elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" else SLKCFLAGS="-O2" fi @@ -54,12 +58,16 @@ fi PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()' ) +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf sip-$VERSION -tar xvf $CWD/sip-$VERSION.tar.?z* || exit 1 -cd sip-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -80,15 +88,15 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mkdir -p $PKG/usr/doc/sip-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ LICENSE COPYING* NEWS README TODO doc/* \ - $PKG/usr/doc/sip-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION chown -R root:root $PKG/usr/doc mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/sip-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz diff --git a/source/l/sip/slack-desc b/source/l/sip/slack-desc index 01147eea..d2fae243 100644 --- a/source/l/sip/slack-desc +++ b/source/l/sip/slack-desc @@ -13,7 +13,7 @@ sip: C and C++ libraries. It was originally developed to create PyQt, sip: the Python bindings for the Qt toolkit, but can be used to create sip: bindings for any C or C++ library. sip: +sip: Homepage: http://www.riverbankcomputing.co.uk/software/sip/ sip: sip: -sip: Homepage: http://www.riverbankcomputing.co.uk/software/sip/ sip: diff --git a/source/l/soprano/slack-desc b/source/l/soprano/slack-desc index 1cb3f2f8..44327e07 100644 --- a/source/l/soprano/slack-desc +++ b/source/l/soprano/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler-----------------------------------------------------| + |-----handy-ruler-----------------------------------------------------| soprano: soprano (C++/Qt4 framework for RDF data) soprano: soprano: Soprano (formally known as QRDF) is a library which provides @@ -13,7 +13,7 @@ soprano: a nice Qt interface to RDF storage solutions. It has a modular soprano: structure which allows to replace the actual RDF storage soprano: implementation used. soprano: +soprano: Homepage: http://soprano.sourceforge.net/ soprano: soprano: -soprano: Homepage: http://soprano.sourceforge.net/ soprano: diff --git a/source/l/soprano/soprano.SlackBuild b/source/l/soprano/soprano.SlackBuild index 054fb20b..5ddd9f99 100755 --- a/source/l/soprano/soprano.SlackBuild +++ b/source/l/soprano/soprano.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007-2008 Robby Workman, Northport, Alabama, USA -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Redistribution and use of this script, with or without modification, is @@ -21,27 +21,27 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2012 by Eric Hameleers for ARM port. + PKGNAM=soprano VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-soprano - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -51,24 +51,21 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-soprano + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP - -# Detect JDK, needed for libsoprano_sesame2backend.so: -if ! ls /var/log/packages/jdk-* 1> /dev/null 2> /dev/null ; then - echo - echo "JDK package not found in /var/log/packages." - echo "This is needed to compile libsoprano_sesame2backend.so." - echo - exit 1 -fi - rm -rf soprano-$VERSION tar xvf $CWD/soprano-$VERSION.tar.bz2 || exit 1 cd soprano-$VERSION || exit 1 diff --git a/source/l/sound-theme-freedesktop/slack-desc b/source/l/sound-theme-freedesktop/slack-desc new file mode 100644 index 00000000..78db32b4 --- /dev/null +++ b/source/l/sound-theme-freedesktop/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +sound-theme-freedesktop: sound-theme-freedesktop (freedesktop.org sound theme) +sound-theme-freedesktop: +sound-theme-freedesktop: The freedesktop.org sound theme is a basic set of sounds for +sound-theme-freedesktop: applications to use. +sound-theme-freedesktop: +sound-theme-freedesktop: Homepage: http://freedesktop.org/wiki/Specifications/sound-theme-spec +sound-theme-freedesktop: +sound-theme-freedesktop: +sound-theme-freedesktop: +sound-theme-freedesktop: +sound-theme-freedesktop: diff --git a/source/l/sound-theme-freedesktop/sound-theme-freedesktop.SlackBuild b/source/l/sound-theme-freedesktop/sound-theme-freedesktop.SlackBuild new file mode 100755 index 00000000..e9ab1b54 --- /dev/null +++ b/source/l/sound-theme-freedesktop/sound-theme-freedesktop.SlackBuild @@ -0,0 +1,73 @@ +#!/bin/sh + +# Slackware build script for sound-theme-freedesktop + +# Copyright 2010, 2011, 2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=sound-theme-freedesktop +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +./configure \ + --prefix=/usr \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$ARCH-slackware-linux || exit 1 + +make || exit 1 +make install DESTDIR=$PKG || exit 1 + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/sound-theme-freedesktop/sound-theme-freedesktop.url b/source/l/sound-theme-freedesktop/sound-theme-freedesktop.url new file mode 100644 index 00000000..5964491b --- /dev/null +++ b/source/l/sound-theme-freedesktop/sound-theme-freedesktop.url @@ -0,0 +1,2 @@ +http://freedesktop.org/wiki/Specifications/sound-theme-spec +http://people.freedesktop.org/~mccann/dist/ diff --git a/source/l/startup-notification/startup-notification.SlackBuild b/source/l/startup-notification/startup-notification.SlackBuild index c247069f..6fce983e 100755 --- a/source/l/startup-notification/startup-notification.SlackBuild +++ b/source/l/startup-notification/startup-notification.SlackBuild @@ -59,7 +59,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf startup-notification-$VERSION -tar xvf $CWD/startup-notification-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/startup-notification-$VERSION.tar.xz || exit 1 cd startup-notification-$VERSION chown -R root:root . find . \ diff --git a/source/l/strigi/README b/source/l/strigi/README new file mode 100644 index 00000000..218e8ce2 --- /dev/null +++ b/source/l/strigi/README @@ -0,0 +1,17 @@ +trueg's blog, +http://trueg.wordpress.com/2011/09/22/about-strigi-soprano-virtuoso-clucene-and-libstreamanalyzer/ + +recommends using a newer libstreamanalyzer (and friends) than what is currently formally released. + +I ran the script +https://projects.kde.org/projects/kdesupport/strigi/strigi/repository/revisions/master/changes/createtararchive.sh +to generate a tarball, and am hosting it at: + +http://rdieter.fedorapeople.org/strigi/strigi-0.7.6.tar.bz2 +http://rdieter.fedorapeople.org/strigi/strigi-0.7.6.tar.bz2.md5sum +http://rdieter.fedorapeople.org/strigi/strigi-0.7.6.tar.bz2.sha1sum + +for others' convenience. + +-- rex + diff --git a/source/l/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff b/source/l/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff new file mode 100644 index 00000000..d4721c39 --- /dev/null +++ b/source/l/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff @@ -0,0 +1,16 @@ +Description: Fix FTBFS with gcc 4.7 due to missing include. +Author: Cyril Brulebois +Bug-Debian: http://bugs.debian.org/667384 + +--- strigi-0.7.7.orig/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp ++++ strigi-0.7.7/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp +@@ -27,9 +27,7 @@ + #include + #include + +-#if defined(__SUNPRO_CC) + #include +-#endif + + using namespace std; + diff --git a/source/l/strigi/strigi.SlackBuild b/source/l/strigi/strigi.SlackBuild index c7cdaa79..8b7374fc 100755 --- a/source/l/strigi/strigi.SlackBuild +++ b/source/l/strigi/strigi.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007-2008 Robby Workman, Northport, Alabama, USA -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Redistribution and use of this script, with or without modification, is @@ -21,25 +21,27 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2012 by Eric Hameleers for ARM port. -VERSION=${VERSION:-$(echo strigi-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} + +PKGNAM=strigi +VERSION=${VERSION:-0.7.7} BUILD=${BUILD:-2} +NUMJOBS=${NUMJOBS:--j7} + # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-strigi -NUMJOBS=${NUMJOBS:--j6} - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -49,17 +51,27 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf strigi-$VERSION -tar xvf $CWD/strigi-$VERSION.tar.?z* || exit 1 -cd strigi-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +zcat $CWD/strigi-fix-ftbfs-with-gcc-4.7.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -88,10 +100,10 @@ cd - find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mkdir -p $PKG/usr/doc/strigi-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING NEWS README TODO \ - $PKG/usr/doc/strigi-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: @@ -105,5 +117,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/strigi-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/system-config-printer/doinst.sh b/source/l/system-config-printer/doinst.sh index 214038e7..884cda80 100644 --- a/source/l/system-config-printer/doinst.sh +++ b/source/l/system-config-printer/doinst.sh @@ -11,8 +11,8 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -config etc/dbus-1/system.d/newprinternotification.conf.new -config etc/dbus-1/system.d/printerdriversinstaller.conf.new +config etc/dbus-1/system.d/com.redhat.NewPrinterNotification.conf.new +config etc/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf.new # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then diff --git a/source/l/system-config-printer/system-config-printer.SlackBuild b/source/l/system-config-printer/system-config-printer.SlackBuild index 8ba12a89..fafaba72 100755 --- a/source/l/system-config-printer/system-config-printer.SlackBuild +++ b/source/l/system-config-printer/system-config-printer.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2010 Eric Hameleers, Eindhoven, NL -# Copyright 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL +# Copyright 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -23,27 +23,25 @@ # SUCH DAMAGE. # ----------------------------------------------------------------------------- -# Set initial variables: PKGNAM=system-config-printer -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:" -j4 "} + +NUMJOBS=${NUMJOBS:" -j7 "} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -53,11 +51,23 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -87,19 +97,23 @@ CFLAGS="$SLKCFLAGS" \ --with-udev-rules \ --program-prefix= \ --program-suffix= \ - --build=$ARCH-slackware-linux + --build=$TARGET # Build and install: -make $NUMJOBS udevrulesdir=/lib/udev/rules.d udevhelperdir=/lib/udev || make || exit 1 -make install DESTDIR=$PKG udevrulesdir=/lib/udev/rules.d udevhelperdir=/lib/udev || exit 1 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG + +# Move the udev files to the usual Slackware location: +mkdir -p $PKG/lib +mv $PKG/etc/udev $PKG/lib/ # Slackware does not use PAM. Instead, your user must be in group 'lp'. sed -i -e 's/at_console="true"/group="lp"/g' \ $PKG/etc/dbus-1/system.d/newprinternotification.conf # Don't clobber the configuration file: -mv $PKG/etc/dbus-1/system.d/newprinternotification.conf{,.new} -mv $PKG/etc/dbus-1/system.d/printerdriversinstaller.conf{,.new} +mv $PKG/etc/dbus-1/system.d/com.redhat.NewPrinterNotification.conf{,.new} +mv $PKG/etc/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf{,.new} # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/l/t1lib/t1lib.SlackBuild b/source/l/t1lib/t1lib.SlackBuild index 86002a21..dc6c69b0 100755 --- a/source/l/t1lib/t1lib.SlackBuild +++ b/source/l/t1lib/t1lib.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=t1lib VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -60,7 +60,7 @@ tar xvf $CWD/t1lib-$VERSION.tar.?z* || exit 1 cd t1lib-$VERSION # Apply Debian's patch since upstream seems inactive: -zcat $CWD/t1lib_5.1.2-3.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/t1lib_5.1.2-3.5.diff.gz | patch -p1 --verbose || exit 1 # I don't think anyone is applying this first one: #cat debian/patches/segfault.diff -b -z .segf | patch -p1 --verbose || exit 1 @@ -68,6 +68,10 @@ zcat $CWD/t1lib_5.1.2-3.diff.gz | patch -p1 --verbose || exit 1 cat debian/patches/no-config.diff | patch -p1 --verbose || exit 1 cat debian/patches/no-docs.diff | patch -p1 --verbose || exit 1 cat debian/patches/lib-cleanup.diff | patch -p1 --verbose || exit 1 +cat debian/patches/format-security.diff | patch -p1 --verbose || exit 1 +cat debian/patches/CVE-2011-0764.diff | patch -p1 --verbose || exit 1 +cat debian/patches/CVE-2011-1552_1553_1554.patch | patch -p1 --verbose || exit 1 +cat debian/patches/CVE-2010-2642.patch | patch -p1 --verbose || exit 1 chown -R root:root . find . \ diff --git a/source/l/t1lib/t1lib_5.1.2-3.5.diff b/source/l/t1lib/t1lib_5.1.2-3.5.diff new file mode 100644 index 00000000..bd137466 --- /dev/null +++ b/source/l/t1lib/t1lib_5.1.2-3.5.diff @@ -0,0 +1,2109 @@ +--- t1lib-5.1.2.orig/debian/libt1-doc.docs ++++ t1lib-5.1.2/debian/libt1-doc.docs +@@ -0,0 +1 @@ ++doc/*.pdf +--- t1lib-5.1.2.orig/debian/orig-tar.sh ++++ t1lib-5.1.2/debian/orig-tar.sh +@@ -0,0 +1,11 @@ ++#!/bin/sh -e ++ ++# called by uscan with '--upstream-version' ++ ++# move to directory 'tarballs' ++if [ -r .svn/deb-layout ]; then ++ . .svn/deb-layout ++ mv $3 $origDir ++ echo "moved $3 to $origDir" ++fi ++ +--- t1lib-5.1.2.orig/debian/libt1-5.install ++++ t1lib-5.1.2/debian/libt1-5.install +@@ -0,0 +1 @@ ++debian/tmp/usr/lib/libt1*.so.* +--- t1lib-5.1.2.orig/debian/changelog ++++ t1lib-5.1.2/debian/changelog +@@ -0,0 +1,456 @@ ++t1lib (5.1.2-3.5) unstable; urgency=high ++ ++ * Non-maintainer upload by the Security Team. ++ * Thanks Jamie Strandboge from Ubuntu for the patch. ++ * debian/patches: ++ - series: make sure CVE-2010-2642.patch is really applied so CVE-2010-2642 ++ (denial of service via oversized fonts) is really fixed. ++ - CVE-2011-1552_1553_1554 added, few more fixes for CVE-2011-1552, ++ CVE-2011-1553 and CVE-2011-1554 (heap-based buffer overflow via AFM font ++ parser) ++ ++ -- Yves-Alexis Perez Wed, 18 Jan 2012 10:43:23 +0100 ++ ++t1lib (5.1.2-3.4) unstable; urgency=high ++ ++ * Non-maintainer upload by the Security Team. ++ * debian/patches: ++ - CVE-2010-2642 added, fix heap-based buffer overflow first found in ++ evince but applicable to the embedded afmparse library found in t1lib ++ too. Fixes CVE-2011-0433 too on the same patch. ++ ++ -- Yves-Alexis Perez Sun, 15 Jan 2012 13:47:26 +0100 ++ ++t1lib (5.1.2-3.3) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * Fix arbitrary code execution CVE-2011-0764 by only using ppoints when ++ it is a valid pointer (Closes: #652996). ++ * Don't ship .la file anymore (Closes: #633247). ++ ++ -- Luk Claes Thu, 29 Dec 2011 23:21:33 +0100 ++ ++t1lib (5.1.2-3.2) unstable; urgency=low ++ ++ * Non-maintainer upload. (version 5.1.2-3.2 triggered a problem with dak) ++ * format-security.diff: use relevant "%s" format when passing a ++ variable string to a printf() function and replace printf() ++ with puts() for the model-only IfTrace0 macro. Thanks to Colin Watson ++ and Loïc Minier! (Closes: #646470) ++ ++ -- Mònica Ramírez Arceda Sat, 03 Dec 2011 21:28:31 +0100 ++ ++t1lib (5.1.2-3) unstable; urgency=low ++ ++ * New Maintainer (Closes: #430611) ++ * Solved some hyphen-used-as-minus-sign in FontDatabase.5 ++ * Reformated debian/copyrigth ++ * Added symbols control file ++ ++ -- Ruben Molina Wed, 23 Jul 2008 20:24:22 -0500 ++ ++t1lib (5.1.2-2) unstable; urgency=low ++ ++ * Add a package with debugging information. ++ ++ -- Torsten Werner Sat, 08 Mar 2008 10:21:43 +0100 ++ ++t1lib (5.1.2-1) unstable; urgency=low ++ ++ * new upstream release ++ * Correct debian/watch. ++ * Remove patch cve-2007-4033.diff because it has been integrated upstream. ++ * Remove parts of patch segfault.diff that have been integrated upstream. ++ * Do not apply the remaining segfault.diff because it does not look safe but ++ keep the patch as a reminder that something was broken in the past. ++ ++ -- Torsten Werner Sat, 08 Mar 2008 10:07:54 +0100 ++ ++t1lib (5.1.1-5) unstable; urgency=low ++ ++ * Replace Build-Depends-Indep by Build-Depends again. ++ ++ -- Torsten Werner Tue, 08 Jan 2008 21:34:25 +0100 ++ ++t1lib (5.1.1-4) unstable; urgency=low ++ ++ * Add Build-Depends-Indep: libxt-dev. (Closes: #459754) ++ ++ -- Torsten Werner Tue, 08 Jan 2008 20:29:01 +0100 ++ ++t1lib (5.1.1-3) unstable; urgency=low ++ ++ * Replace static changes of upstream files by quilt patches as requested by ++ Fedora developers. ++ * Remove postinst that removed the old /usr/doc symlink. ++ * Remove preinst that removed the old /usr/share/doc/t1lib-bin symlink. ++ * Rename menu.t1lib-bin to t1lib-bin.menu to make sure the menu file gets ++ installed. ++ * Update menu file to conform to current menu policy. ++ * Install documentation with dh_installdocs instead of dh_install and some ++ other minor cleanups. ++ * Switch to cdbs. ++ * Fix versioned Build-Depends: debhelper (>= 5). ++ * Move some Build-Depends to Build-Depends-Indep. ++ * Apply two patches provided by Patrice Dumas: ++ - Update t1libconfig's font search. ++ - Fixes a segfault. ++ * Integrate another patch that fixes a segfault. (Closes: #313236) ++ ++ -- Torsten Werner Sun, 06 Jan 2008 20:50:19 +0100 ++ ++t1lib (5.1.1-2) unstable; urgency=low ++ ++ * Add Depends: libxaw7-dev to -dev package. ++ * Switch to DH_COMPAT = 5. ++ * Update Vcs headers in debian/control. ++ * Change Standards-Version: 3.7.3. ++ * Do not link with unneeded libraries. ++ * Add LDFLAGS=-Wl,--as-needed. ++ ++ -- Torsten Werner Fri, 21 Dec 2007 22:54:43 +0100 ++ ++t1lib (5.1.1-1) unstable; urgency=low ++ ++ * new upstream version (Closes: #418664) ++ * Add XS-Vcs-* header to debian/control. ++ * Update Standards-Version to 3.7.2 (no changes). ++ * Remove Depends: libc6-dev. (Closes: #446375). ++ * Change Maintainer to myself. ++ * Replace ${Source-Version} by ${binary:Version}. ++ * Do not ignore errors of 'make distclean'. ++ ++ -- Torsten Werner Sat, 13 Oct 2007 14:46:23 +0200 ++ ++t1lib (5.1.0-3) unstable; urgency=low ++ ++ * Apply patch from Artur R. Czechowski to fix CVE-2007-4033. ++ (Closes: #439927) ++ ++ -- Torsten Werner Mon, 17 Sep 2007 23:25:45 +0200 ++ ++t1lib (5.1.0-2) unstable; urgency=low ++ ++ * Upload to unstable ++ * Bump-up Standards-Version to 3.6.2 (no changes required) ++ * Torsten Werner is sponsoring the package ++ ++ -- Artur R. Czechowski Sat, 6 Aug 2005 20:11:51 +0200 ++ ++t1lib (5.1.0-1) experimental; urgency=low ++ ++ * New upstream release ++ * README.t1lib-5.0.2 replaced with README.t1lib-5.1.0 ++ * README.win32 is no longer installed ++ * Removed misleading information from README.Debian ++ * Replace -V with -V 'libt1-5 (>= 5.0.2)' for dh_makeshlibs in debian/rules ++ * Remove some commented stuff from debian/rules ++ * Torsten Werner is sponsoring the package ++ ++ -- Artur R. Czechowski Sat, 4 Jun 2005 22:12:43 +0200 ++ ++t1lib (5.0.2-3) unstable; urgency=low ++ ++ * Update libtool (Closes: #246753) ++ * Build-Depends on individual library instead dummy xlibs-dev ++ * Added dependencies to -dev package (Closes: #249973) ++ * Thanks to Christopher L Cheney for above patches ++ * Add -V to dh_makeshlibs to make a versioned dependencies on this library ++ * Torsten Werner is sponsoring the package ++ ++ -- Artur R. Czechowski Sun, 23 May 2004 01:02:02 +0200 ++ ++t1lib (5.0.2-2) unstable; urgency=low ++ ++ * change distribution to unstable ++ * Torsten Werner is sponsoring the package ++ ++ -- Artur R. Czechowski Sun, 18 Apr 2004 13:07:23 +0200 ++ ++t1lib (5.0.2-1) experimental; urgency=low ++ ++ * New upstream release (Closes: #243916) ++ - fixed some crashes (Closes: #242570, #243378) ++ * Reference to README.t1lib-5.0.2 instead -5.0.0 in some debian/ files ++ * Torsten Werner is sponsoring the package ++ ++ -- Artur R. Czechowski Sat, 17 Apr 2004 19:22:09 +0200 ++ ++t1lib (5.0.0-5) unstable; urgency=low ++ ++ * debian/rules: documentation is build from binary-indep (Closes: #230386) ++ * debian/watch has been added ++ * Torsten Werner is sponsoring the package ++ ++ -- Artur R. Czechowski Sat, 21 Feb 2004 20:19:38 +0100 ++ ++t1lib (5.0.0-4) unstable; urgency=low ++ ++ * Added missing files in NEWS.Debian ++ ++ -- Artur R. Czechowski Wed, 21 Jan 2004 00:27:24 +0100 ++ ++t1lib (5.0.0-3) unstable; urgency=low ++ ++ * New release uploaded to unstable (finaly closes: #185097, #216501) ++ * Unleash it to allow to migrate to testing (Closes: #221198) ++ * libt1-dev and t1lib-dev conflict with each other, ++ * libt1-dev conflicts with t1lib1-dev to smooth upgrade from t1lib 1.3.1-6 ++ * t1lib-bin provides/conflicts/replaces t1lib1-bin to smooth upgrade from ++ t1lib 1.3.1-6 ++ * Some README.* files in libt1-dev ++ * Applied patch which fixes memory access bug (see #224314 for details) ++ * Torsten Werner is sponsoring the package ++ ++ -- Artur R. Czechowski Sun, 18 Jan 2004 03:00:05 +0100 ++ ++t1lib (5.0.0-2) experimental; urgency=low ++ ++ * rename source package to t1lib ++ * rename binary packages: ++ + libt1-5 -> libt1-dev ++ + t1lib5-bin -> t1lib-bin ++ + libt1-5-doc -> libt1-doc ++ * rationale for all above: ++ http://lists.debian.org/debian-devel/2003/debian-devel-200311/msg01083.html ++ and rest of this thread ++ * linking libt1x with X libraries to avoid undefined symbols (see #220111) ++ * clearing independency of X11 in README.Debian ++ * removed all tracks of t1lib0 (Conflict, Replaces, etc) ++ * Torsten Werner is sponsoring the package ++ ++ -- Artur R. Czechowski Wed, 24 Dec 2003 01:50:37 +0100 ++ ++t1lib5 (5.0.0-1) experimental; urgency=low ++ ++ * New upstream release (Closes: #185097, #216501) ++ * This release is binary incompatible with the previous one. ++ * t1lib-bin and t1lib-dev are virtual packages now ++ * removed weird ``dbl'' from configure - typo in upstream configure.in ++ * there is no necessity to conflict current -doc with the other ones ++ * library, devel and documentation package is libt1-5{,-dev,-doc} to be ++ consistent with Debian Policy 8.1 ++ * do not anymore copy config.{sub,guess} automagically ++ * update ac-tools/config.{sub,guess} to 20031007 ++ * Torsten Werner is sponsoring the package ++ ++ -- Artur R. Czechowski Sun, 9 Nov 2003 15:16:51 +0100 ++ ++t1lib (1.3.1-4) unstable; urgency=low ++ ++ * New Maintainer, Adopted Package (Closes: #189694) ++ * Prepare for migration to t1lib 5.x: ++ - all packages renamed to t1lib1{,-foo} ++ - empty packages t1lib-bin and t1lib-dev depending on t1lib1-bin ++ and t1lib1-dev ++ * Packaging from scratch using debhelper, Standards-Version is 3.6.1.0 now ++ * Remove non-existent xlib6g-dev from Build-Depends ++ * Updated README.Debian ++ * Remove symlinks from /usr/doc/t1lib* ++ * Only t1lib1-bin contains /etc/t1lib directory ++ * t1lib-dev has been split into two packages: t1lib1-dev and t1lib1-doc ++ * t1lib1-bin: change manual section for type1afm from 8 to 1 ++ * t1lib1-bin: create files in /etc/t1lib if don't exist (Closes: #58275) ++ * t1lib1-bin: remove symlink /usr/share/doc/t1lib-bin -> t1lib1 if exists ++ * Torsten Werner is sponsoring the package ++ ++ -- Artur R. Czechowski Sun, 2 Nov 2003 03:47:51 +0100 ++ ++t1lib (1.3.1-3) unstable; urgency=low ++ ++ * Change t1lib-dev's section from "devel" to "libdevel" (thanks, Katie!) ++ ++ -- Adam Conrad Mon, 18 Aug 2003 22:42:17 -0600 ++ ++t1lib (1.3.1-2) unstable; urgency=low ++ ++ * Set maintainer to QA, as this package was orphaned months ago (see #189694) ++ * Change "make" to "make without_doc" and remove build-dep on ++ tetex-bin (closes: #192291, #192290) ++ * Change libxaw-dev build-dep to libxaw7-dev, so we are asking for a real ++ package, rather than a virtual (closes: #170012) ++ * lib/Makefile.in changes (closes: #193757) ++ - add "-lm" to libt1.la target ++ - add "-L@top_srcdir@/lib/.libs/ -lt1" to libt1x.la target ++ ++ -- Adam Conrad Mon, 18 Aug 2003 21:50:22 -0600 ++ ++t1lib (1.3.1-1) unstable; urgency=low ++ ++ * New upstream version. (Closes: #127619,#127618) ++ ++ -- David Huggins-Daines Thu, 3 Jan 2002 21:53:29 -0500 ++ ++t1lib (1.2-1) unstable; urgency=low ++ ++ * New upstream version. ++ ++ -- David Huggins-Daines Wed, 22 Aug 2001 21:16:36 -0400 ++ ++t1lib (1.1.1-2.2) unstable; urgency=low ++ ++ * NMU ++ * debian/rules: if LD_LIBRARY_PATH is already set, append to it, so ++ builds under fakeroot will work (Closes: #104046) ++ ++ -- Branden Robinson Fri, 10 Aug 2001 04:57:50 -0500 ++ ++t1lib (1.1.1-2.1) unstable; urgency=low ++ ++ * NMU, with updated config.{guess,sub} for newer architectures ++ ++ -- Randolph Chung Sat, 7 Jul 2001 01:01:51 -0600 ++ ++t1lib (1.1.1-2) unstable; urgency=high ++ ++ * Yow! Major upstream weirdness. Do *not* try to print the documentation ++ when building... Closes: #94660 ++ ++ -- David Huggins-Daines Fri, 20 Apr 2001 20:35:49 -0400 ++ ++t1lib (1.1.1-1) unstable; urgency=low ++ ++ * New upstream version. Closes: #94627 (why did I never get this bug ++ report in the first place?) ++ ++ -- David Huggins-Daines Fri, 20 Apr 2001 11:16:15 -0400 ++ ++t1lib (1.0.1-2) unstable; urgency=low ++ ++ * Recompile with new XFree86 libraries and glibc. ++ ++ -- David Huggins-Daines Wed, 24 Jan 2001 22:33:43 -0500 ++ ++t1lib (1.0.1-1) unstable; urgency=low ++ ++ * New upstream version. Closes: #69689 ++ ++ -- David Huggins-Daines Thu, 9 Nov 2000 00:29:06 -0500 ++ ++t1lib (1.0-2) frozen unstable; urgency=low ++ ++ * Use dpkg-architecture to supply a target architecture name to ++ configure, should fix the compile problems on Alpha and ARM for good. ++ (closes:#57839) ++ ++ -- David Huggins-Daines Wed, 1 Mar 2000 21:22:49 -0500 ++ ++t1lib (1.0-1) unstable; urgency=low ++ ++ * New upstream version. ++ * Twiddled package names to make more sense. ++ * Move back to priority optional to satisfy dependencies of xpdf and ++ php3. ++ * Moved .la files to t1lib-dev. Added versioned Replaces: field in the ++ control file to cope with potato-to-potato upgrades (the t1lib0 ++ packages in slink were not buggy in this way) ++ * t1libconfig and associated manual pages (FontDataBase.5, ++ t1libconfig.8) are now in the t1lib-bin package, for much the same ++ reason. Unfortunately this Replaces: field cannot be versioned. ++ * The t1lib packages no longer manage the contents of /etc/t1lib/. In ++ the near future, t1lib1 may have a debconf interface for doing so. ++ The t1lib.config and FontDataBase were never used by any programs that ++ linked with t1lib anyway, thankfully. ++ ++ -- David Huggins-Daines Sun, 2 Jan 2000 03:02:30 -0500 ++ ++t1lib0 (0.9.2-1) unstable; urgency=low ++ ++ * New upstream version. ++ * Being more intelligent in t1libconfig to avoid postinst-lossage. ++ Fixes: #44095 ++ * Updated for FHS compliance. ++ ++ -- David Huggins-Daines Fri, 8 Oct 1999 15:27:46 -0400 ++ ++t1lib0 (0.9.1-4) unstable; urgency=medium ++ ++ * Updated the shlibs file since it appears that programs compiled ++ against 0.9.1 won't work with 0.9 (though the other way around does ++ work). Fixes: #43215, #43231 ++ * Removed ARCH bogosity and updated config.sub and config.guess ++ (upstream maintainer will be notified) ++ ++ -- David Huggins-Daines Sat, 21 Aug 1999 01:23:39 -0400 ++ ++t1lib0 (0.9.1-3) unstable; urgency=low ++ ++ * Conditionalize that ARCH thing, or the Hurd people will kill me. ++ ++ -- David Huggins-Daines Sat, 3 Jul 1999 13:56:12 -0400 ++ ++t1lib0 (0.9.1-2) unstable; urgency=low ++ ++ * Oops. T1lib installs a dummy config file. We remove this before ++ building the package (because we generate our own). Also, the preinst ++ has to compensate for the past brokenness by saving it before an ++ upgrade. ++ ++ -- David Huggins-Daines Fri, 2 Jul 1999 16:13:46 -0400 ++ ++t1lib0 (0.9.1-1) unstable; urgency=low ++ ++ * New upstream version. ++ * Moved back to extra, because that's the way the winds are blowing. ++ * Added ARCH variable to debian/rules to work around strange ++ architecture detection on Alpha. ++ ++ -- David Huggins-Daines Fri, 2 Jul 1999 14:58:32 -0400 ++ ++t1lib0 (0.9-1) unstable; urgency=low ++ ++ * New upstream version ++ ++ -- David Huggins-Daines Thu, 10 Jun 1999 23:00:12 -0400 ++ ++t1lib0 (0.8.1-1) unstable; urgency=low ++ ++ * New upstream version. (fixes bug #31549) ++ * Upstream move to libtool has made debian/rules a lot less contorted, ++ and slimmed up the diff considerably. Thanks! ++ * I'm now uploading m68k versions as well. ++ * Fixed "confdif" typo in t1libconfig (oops!) ++ * This release breaks binary and source compatibility. Bumping the ++ soname seems a bit extreme, since there is only one Debian package ++ (gglyph) which depends on this, and I'm simultaneously uploading a ++ fixed version. ++ ++ -- David Huggins-Daines Wed, 24 Feb 1999 17:16:41 -0500 ++ ++t1lib0 (0.7.1-5) unstable; urgency=low ++ ++ * Changed debian/rules to remove debian/files on clean. (fixes bug #26907) ++ * Changed t1libconfig to allow installation Fri, 16 Oct 1998 20:12:02 -0400 ++ ++t1lib0 (0.7.1-4) unstable; urgency=low ++ ++ * Changed debian/rules not to use debhelper, to fix PowerPC and Alpha compile ++ problems and (hopefully) make the purists happy :) ++ * Upgraded priority to Optional, since it doesn't conflict with or break ++ anything, and is relatively stable. ++ ++ -- David Huggins-Daines Fri, 18 Sep 1998 18:36:07 -0400 ++ ++t1lib0 (0.7.1-3) unstable; urgency=low ++ ++ * Changed "read" to "read foo" in t1libconfig to make it more sh-friendly. ++ * Minor change to debian/rules (fixes bug #25501) ++ ++ -- David Huggins-Daines Fri, 7 Aug 1998 13:31:28 -0400 ++ ++t1lib0 (0.7.1-2) unstable; urgency=low ++ ++ * Patched lib/t1lib/t1finfo.c to fix segfault problems with some fonts. ++ * Fixed the URLs and info in copyright and README.Debian. ++ ++ -- David Huggins-Daines Tue, 21 Jul 1998 16:01:03 -0400 ++ ++t1lib0 (0.7.1-1) unstable; urgency=low ++ ++ * Initial release. ++ ++ -- David Huggins-Daines Thu, 16 Jul 1998 22:07:08 -0400 ++ ++ +--- t1lib-5.1.2.orig/debian/libt1-5.docs ++++ t1lib-5.1.2/debian/libt1-5.docs +@@ -0,0 +1,2 @@ ++README.t1lib-* ++README.t1python +--- t1lib-5.1.2.orig/debian/libt1-dev.docs ++++ t1lib-5.1.2/debian/libt1-dev.docs +@@ -0,0 +1,2 @@ ++README.t1lib-* ++README.t1python +--- t1lib-5.1.2.orig/debian/t1libconfig ++++ t1lib-5.1.2/debian/t1libconfig +@@ -0,0 +1,163 @@ ++#!/bin/sh -e ++ ++# to test POSIX-correctness, change hash-bang to /bin/bash and uncomment ++# the following line: ++ ++# set -o posix ++ ++# Very simple configuration script for t1lib. Checks a couple of ++# directories that might contain fonts, and if they exist, adds ++# anything ending in .pfa or pfb to the font database. A few things ++# borrowed from paperconfig, (C) 1996, Yves Arrouye ++# ++ ++# note that this creates the "minimal" font database accepted by t1lib, ++# and doesn't look in every possible place for fonts. It is mostly ++# provided so that xglyph will work out of the box... ++ ++# Written by David Huggins-Daines ++ ++usage() { ++ if [ "$1" = -h ] ++ then ++ exec 1>&2 ++ echo -n U ++ else ++ echo -n u ++ fi ++ ++ echo "sage: `basename $0` [ -v, --version ] [ -h, --help ] [ --force ]" ++ echo " [ fontdirs... ]" ++ ++ if [ "$1" = -h ] ++ then ++ cat <" ++ exit 0 ++ ;; ++ -h|--help) ++ usage -h ++ ;; ++ --force) ++ force=1 ++ ;; ++ *) ++ # hairy way to remove a trailing backslash (should use perl) ++ pat=`expr $1 : "\(.*\)\/\$" || echo $1` ++ # hairier way to find a string anywhere in another string ++ # should really use perl. ++ if ! grep $pat </dev/null 2>&1 ++$fontdirs ++EOF ++ then ++ fontdirs="$fontdirs $1" ++ fi ++ ;; ++ esac ++ shift ++done ++ ++# We presume that if the database exists, then so does the ++# configuration file. Hopefully this won't break anything. ++ ++if [ $force -eq 1 ] || [ ! -e $dbase ]; then ++ fontpath="" ++ afmpath="" ++ ++ mkdir -p $confdir || true ++ ++ echo -n "Searching for Type 1 fonts and AFM files..." ++ ++ for i in $fontdirs ++ do ++ if [ -d $i ] && ls $i/*.pf[ab] > /dev/null 2>&1; then ++ if [ -n "$fontpath" ]; then ++ fontpath="$fontpath:$i" ++ else ++ fontpath="$i" ++ fi ++ ++ if ls $i/*.afm > /dev/null 2>&1; then ++ if [ -n "$afmpath" ]; then ++ afmpath="$afmpath:$i" ++ else ++ afmpath="$i" ++ fi ++ fi ++ # get a listing of all the fonts in each dir ++ find $i -maxdepth 1 -name *.pf[ab] -printf '%f\n' >> $temp ++ fi ++ done ++ if [ -z "$fontpath" ]; then ++ cat < $dbase ++ cat $temp >> $dbase ++ rm -f $temp ++ echo "done." ++ fi ++ ++ # now set the paths in the config file ++ cat <$conffile ++t1lib.config - global configuration file for t1lib. ++It was created automatically on `date` ++by the t1libconfig script. ++ ++Run /usr/sbin/t1libconfig --force to rebuild it. ++ ++ENCODING=. ++AFM=$afmpath ++TYPE1=$fontpath ++FONTDATABASE=$dbase ++EOF ++else ++ echo "Configuration and font database files already exist." ++ echo "Run /usr/sbin/t1libconfig --force to rebuild them." ++fi ++ ++exit 0 +--- t1lib-5.1.2.orig/debian/t1lib-bin.postinst ++++ t1lib-5.1.2/debian/t1lib-bin.postinst +@@ -0,0 +1,8 @@ ++#!/bin/sh ++set -e ++ ++if [ ! -f /etc/t1lib/t1lib.config ]; then ++ /usr/sbin/t1libconfig ++fi ++ ++#DEBHELPER# +--- t1lib-5.1.2.orig/debian/t1lib-bin.menu ++++ t1lib-5.1.2/debian/t1lib-bin.menu +@@ -0,0 +1,2 @@ ++?package(t1lib-bin): needs="X11" section="Applications/Viewers" \ ++ title="XGlyph" command="/usr/bin/xglyph" +--- t1lib-5.1.2.orig/debian/t1lib-bin.install ++++ t1lib-5.1.2/debian/t1lib-bin.install +@@ -0,0 +1,2 @@ ++debian/t1libconfig usr/sbin ++debian/tmp/usr/bin/* +--- t1lib-5.1.2.orig/debian/copyright ++++ t1lib-5.1.2/debian/copyright +@@ -0,0 +1,94 @@ ++This package was debianized by David Huggins-Daines on ++Fri, 19 Jun 1998 20:01:01 -0400. It has been also maintained by Artur ++R. Czechowski and Torsten Werner . ++ ++It was downloaded from ftp://sunsite.unc.edu/pub/Linux/libs/graphics/ ++ ++Upstream Author: ++ ++ Rainer Menzner ++ ++Copyright: ++ ++ Copyright (C) 1996-2003 Rainer Menzner ++ ++License: ++ ++ This package is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This package 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this package; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ ++On Debian systems, the complete text of the GNU Lesser General ++Public License can be found in `/usr/share/common-licenses/LGPL'. ++ ++The Debian packaging is (C) 2008, Ruben Molina and ++is licensed under the GPL, see `/usr/share/common-licenses/GPL'. ++ ++Please note that there are parts of t1lib that are subject to other licenses: ++- The parseAFM-package is copyrighted by Adobe Systems Inc. ++- The type1 rasterizer is copyrighted by IBM and the X11-consortium. ++ ++(from lib/t1lib/parseAFM.c) ++/* ++ * (C) 1988, 1989, 1990 by Adobe Systems Incorporated. All rights reserved. ++ * ++ * This file may be freely copied and redistributed as long as: ++ * 1) This entire notice continues to be included in the file, ++ * 2) If the file has been modified in any way, a notice of such ++ * modification is conspicuously indicated. ++ * ++ * PostScript, Display PostScript, and Adobe are registered trademarks of ++ * Adobe Systems Incorporated. ++ * ++ * ************************************************************************ ++ * THE INFORMATION BELOW IS FURNISHED AS IS, IS SUBJECT TO CHANGE WITHOUT ++ * NOTICE, AND SHOULD NOT BE CONSTRUED AS A COMMITMENT BY ADOBE SYSTEMS ++ * INCORPORATED. ADOBE SYSTEMS INCORPORATED ASSUMES NO RESPONSIBILITY OR ++ * LIABILITY FOR ANY ERRORS OR INACCURACIES, MAKES NO WARRANTY OF ANY ++ * KIND (EXPRESS, IMPLIED OR STATUTORY) WITH RESPECT TO THIS INFORMATION, ++ * AND EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR PARTICULAR PURPOSES AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. ++ * ************************************************************************ ++ */ ++ ++(from lib/type1/type1.c) ++/* $XConsortium: type1.c,v 1.5 91/10/10 11:20:06 rws Exp $ */ ++/* Copyright International Business Machines, Corp. 1991 ++ * All Rights Reserved ++ * Copyright Lexmark International, Inc. 1991 ++ * All Rights Reserved ++ * Portions Copyright (c) 1990 Adobe Systems Incorporated. ++ * All Rights Reserved ++ * ++ * License to use, copy, modify, and distribute this software and its ++ * documentation for any purpose and without fee is hereby granted, ++ * 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 IBM or Lexmark or Adobe ++ * not be used in advertising or publicity pertaining to distribution of ++ * the software without specific, written prior permission. ++ * ++ * IBM, LEXMARK, AND ADOBE PROVIDE THIS SOFTWARE "AS IS", WITHOUT ANY ++ * WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT ++ * LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A ++ * PARTICULAR PURPOSE, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. THE ++ * ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE, INCLUDING ++ * ANY DUTY TO SUPPORT OR MAINTAIN, BELONGS TO THE LICENSEE. SHOULD ANY ++ * PORTION OF THE SOFTWARE PROVE DEFECTIVE, THE LICENSEE (NOT IBM, ++ * LEXMARK, OR ADOBE) ASSUMES THE ENTIRE COST OF ALL SERVICING, REPAIR AND ++ * CORRECTION. IN NO EVENT SHALL IBM, LEXMARK, OR ADOBE BE LIABLE FOR ANY ++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ++ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF ++ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN ++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ +--- t1lib-5.1.2.orig/debian/NEWS ++++ t1lib-5.1.2/debian/NEWS +@@ -0,0 +1,9 @@ ++t1lib (5.0.0-3) unstable; urgency=low ++ ++ This version of t1lib package is binary incompatible with the previous ++ one in Debian. Details about changes are documented in following files ++ in /usr/share/doc/libt1-dev directory: ++ - changelog.gz ++ - README.t1lib-5.0.0.gz ++ ++ -- Artur R. Czechowski Sun, 18 Jan 2004 00:02:29 +0100 +--- t1lib-5.1.2.orig/debian/t1lib-bin.manpages ++++ t1lib-5.1.2/debian/t1lib-bin.manpages +@@ -0,0 +1,4 @@ ++debian/man/FontDatabase.5 ++debian/man/t1libconfig.8 ++debian/man/type1afm.1 ++debian/man/xglyph.1 +--- t1lib-5.1.2.orig/debian/rules ++++ t1lib-5.1.2/debian/rules +@@ -0,0 +1,22 @@ ++#!/usr/bin/make -f ++ ++include /usr/share/cdbs/1/rules/debhelper.mk ++include /usr/share/cdbs/1/class/autotools.mk ++include /usr/share/cdbs/1/rules/patchsys-quilt.mk ++ ++export LDFLAGS := -Wl,--as-needed ++ ++DEB_MAKE_BUILD_TARGET := without_doc ++DEB_MAKE_INSTALL_TARGET := install prefix=$(CURDIR)/debian/tmp/usr ++DEB_INSTALL_DOCS_ALL += debian/README.Debian ++ ++binary-post-install/libt1-5 :: ++ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ ++binary-post-install/libt1-5-dbg :: ++ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ ++binary-post-install/libt1-dev :: ++ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ ++binary-post-install/libt1-doc :: ++ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ ++binary-post-install/t1lib-bin :: ++ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ +--- t1lib-5.1.2.orig/debian/libt1-5.symbols ++++ t1lib-5.1.2/debian/libt1-5.symbols +@@ -0,0 +1,381 @@ ++libt1.so.5 libt1-5 #MINVER# ++ BezierTerminationTest@Base 5.1.0 ++ CRASTERCompressionType@Base 5.1.0 ++ CacheBLimit@Base 5.1.0 ++ CachedChars@Base 5.1.0 ++ CachedFonts@Base 5.1.0 ++ ConicDebug@Base 5.1.0 ++ Continuity@Base 5.1.0 ++ CurFontEnv@Base 5.1.0 ++ CurFontName@Base 5.1.0 ++ DLadd@Base 5.1.0 ++ DLdiv@Base 5.1.0 ++ DLmult@Base 5.1.0 ++ DLsub@Base 5.1.0 ++ DeviceSpecifics@Base 5.1.0 ++ FPXYboth@Base 5.1.0 ++ FPXonly@Base 5.1.0 ++ FPYonly@Base 5.1.0 ++ FPdiv@Base 5.1.0 ++ FPmult@Base 5.1.0 ++ FPstarslash@Base 5.1.0 ++ FXYConvert@Base 5.1.0 ++ FXYboth@Base 5.1.0 ++ FXonly@Base 5.1.0 ++ FYonly@Base 5.1.0 ++ FontBase@Base 5.1.0 ++ FontDebug@Base 5.1.0 ++ ForceAFMBBox@Base 5.1.0 ++ ForceFloat@Base 5.1.0 ++ FreeAFMData@Base 5.1.0 ++ GetType1CharString@Base 5.1.0 ++ HighHex@Base 5.1.0 ++ HintDebug@Base 5.1.0 ++ IXYConvert@Base 5.1.0 ++ IXYboth@Base 5.1.0 ++ IXonly@Base 5.1.0 ++ IYonly@Base 5.1.0 ++ ImageDebug@Base 5.1.0 ++ InDotSection@Base 5.1.0 ++ Init_BuiltInEncoding@Base 5.1.0 ++ InternalTrace@Base 5.1.0 ++ LineDebug@Base 5.1.0 ++ LineIOTrace@Base 5.1.0 ++ LowHex@Base 5.1.0 ++ MemoryDebug@Base 5.1.0 ++ MustCheckArgs@Base 5.1.0 ++ MustCrash@Base 5.1.0 ++ MustTraceCalls@Base 5.1.0 ++ OffPageDebug@Base 5.1.0 ++ PathDebug@Base 5.1.0 ++ ProcessHints@Base 5.1.0 ++ QueryFontLib@Base 5.1.0 ++ RegionDebug@Base 5.1.0 ++ SaveFontPaths@Base 5.1.0 ++ SearchDictName@Base 5.1.0 ++ SetFuncRequestID@Base 5.1.0 ++ SpaceDebug@Base 5.1.0 ++ StdEncArrayP@Base 5.1.0 ++ StrokeDebug@Base 5.1.0 ++ T1Close@Base 5.1.0 ++ T1GetDecrypt@Base 5.1.0 ++ T1GetFileSize@Base 5.1.0 ++ T1GetTrailer@Base 5.1.0 ++ T1Getc@Base 5.1.0 ++ T1Gets@Base 5.1.0 ++ T1Open@Base 5.1.0 ++ T1Read@Base 5.1.0 ++ T1Ungetc@Base 5.1.0 ++ T1_AAFillOutline@Base 5.1.0 ++ T1_AAGetBitsPerPixel@Base 5.1.0 ++ T1_AAGetGrayValues@Base 5.1.0 ++ T1_AAGetLevel@Base 5.1.0 ++ T1_AAHGetGrayValues@Base 5.1.0 ++ T1_AAHSetGrayValues@Base 5.1.0 ++ T1_AANGetGrayValues@Base 5.1.0 ++ T1_AANSetGrayValues@Base 5.1.0 ++ T1_AASetBitsPerPixel@Base 5.1.0 ++ T1_AASetChar@Base 5.1.0 ++ T1_AASetGrayValues@Base 5.1.0 ++ T1_AASetLevel@Base 5.1.0 ++ T1_AASetRect@Base 5.1.0 ++ T1_AASetSmartLimits@Base 5.1.0 ++ T1_AASetSmartMode@Base 5.1.0 ++ T1_AASetString@Base 5.1.0 ++ T1_AFM_ptr@Base 5.1.0 ++ T1_AbsolutePath@Base 5.1.0 ++ T1_AddFont@Base 5.1.0 ++ T1_AddFontDataBase@Base 5.1.0 ++ T1_AddFontDataBaseXLFD@Base 5.1.0 ++ T1_AddToFileSearchPath@Base 5.1.0 ++ T1_CheckEndian@Base 5.1.0 ++ T1_CheckForFontID@Base 5.1.0 ++ T1_CheckForInit@Base 5.1.0 ++ T1_ClearStrokeFlag@Base 5.1.0 ++ T1_CloseLib@Base 5.1.0 ++ T1_ConcatGlyphs@Base 5.1.0 ++ T1_ConcatOutlines@Base 5.1.0 ++ T1_CopyFont@Base 5.1.0 ++ T1_CopyGlyph@Base 5.1.0 ++ T1_CopyOutline@Base 5.1.0 ++ T1_DeleteAllSizes@Base 5.1.0 ++ T1_DeleteEncoding@Base 5.1.0 ++ T1_DeleteFont@Base 5.1.0 ++ T1_DeleteSize@Base 5.1.0 ++ T1_DumpGlyph@Base 5.1.0 ++ T1_DumpPath@Base 5.1.0 ++ T1_ENC_ptr@Base 5.1.0 ++ T1_ExtendFont@Base 5.1.0 ++ T1_ExtendHMatrix@Base 5.1.0 ++ T1_ExtendVMatrix@Base 5.1.0 ++ T1_FDBXLFD_ptr@Base 5.1.0 ++ T1_FDB_ptr@Base 5.1.0 ++ T1_FillOutline@Base 5.1.0 ++ T1_FreeCompCharData@Base 5.1.0 ++ T1_FreeGlyph@Base 5.1.0 ++ T1_FreeOutline@Base 5.1.0 ++ T1_GenerateAFMFallbackInfo@Base 5.1.0 ++ T1_GetAfmFileName@Base 5.1.0 ++ T1_GetAfmFilePath@Base 5.1.0 ++ T1_GetAllCharNames@Base 5.1.0 ++ T1_GetBitmapPad@Base 5.1.0 ++ T1_GetCharBBox@Base 5.1.0 ++ T1_GetCharName@Base 5.1.0 ++ T1_GetCharOutline@Base 5.1.0 ++ T1_GetCharString@Base 5.1.0 ++ T1_GetCharWidth@Base 5.1.0 ++ T1_GetCompCharData@Base 5.1.0 ++ T1_GetCompCharDataByIndex@Base 5.1.0 ++ T1_GetEncodingIndex@Base 5.1.0 ++ T1_GetEncodingIndices@Base 5.1.0 ++ T1_GetEncodingScheme@Base 5.1.0 ++ T1_GetExtend@Base 5.1.0 ++ T1_GetFamilyName@Base 5.1.0 ++ T1_GetFileSearchPath@Base 5.1.0 ++ T1_GetFontBBox@Base 5.1.0 ++ T1_GetFontFileName@Base 5.1.0 ++ T1_GetFontFilePath@Base 5.1.0 ++ T1_GetFontName@Base 5.1.0 ++ T1_GetFullName@Base 5.1.0 ++ T1_GetIsFixedPitch@Base 5.1.0 ++ T1_GetItalicAngle@Base 5.1.0 ++ T1_GetKerning@Base 5.1.0 ++ T1_GetLibIdent@Base 5.1.0 ++ T1_GetLinePosition@Base 5.1.0 ++ T1_GetLineThickness@Base 5.1.0 ++ T1_GetMetricsInfo@Base 5.1.0 ++ T1_GetMoveOutline@Base 5.1.0 ++ T1_GetNoCompositeChars@Base 5.1.0 ++ T1_GetNoFonts@Base 5.1.0 ++ T1_GetNoKernPairs@Base 5.1.0 ++ T1_GetNotice@Base 5.1.0 ++ T1_GetSlant@Base 5.1.0 ++ T1_GetStringBBox@Base 5.1.0 ++ T1_GetStringOutline@Base 5.1.0 ++ T1_GetStringWidth@Base 5.1.0 ++ T1_GetStrokeMode@Base 5.1.0 ++ T1_GetStrokeWidth@Base 5.1.0 ++ T1_GetTransform@Base 5.1.0 ++ T1_GetUnderlinePosition@Base 5.1.0 ++ T1_GetUnderlineThickness@Base 5.1.0 ++ T1_GetVersion@Base 5.1.0 ++ T1_GetWeight@Base 5.1.0 ++ T1_GetlenIV@Base 5.1.0 ++ T1_INFINITY@Base 5.1.0 ++ T1_InitLib@Base 5.1.0 ++ T1_IsInternalChar@Base 5.1.0 ++ T1_LoadEncoding@Base 5.1.0 ++ T1_LoadFont@Base 5.1.0 ++ T1_ManipulatePath@Base 5.1.0 ++ T1_MirrorHMatrix@Base 5.1.0 ++ T1_MirrorVMatrix@Base 5.1.0 ++ T1_PFAB_ptr@Base 5.1.0 ++ T1_PrintLog@Base 5.1.0 ++ T1_QueryCompositeChar@Base 5.1.0 ++ T1_QueryLigs@Base 5.1.0 ++ T1_QueryX11Support@Base 5.1.0 ++ T1_ReencodeFont@Base 5.1.0 ++ T1_RelativePath@Base 5.1.0 ++ T1_RotateMatrix@Base 5.1.0 ++ T1_ScaleOutline@Base 5.1.0 ++ T1_SetAfmFileName@Base 5.1.0 ++ T1_SetBitmapPad@Base 5.1.0 ++ T1_SetChar@Base 5.1.0 ++ T1_SetDefaultEncoding@Base 5.1.0 ++ T1_SetDeviceResolutions@Base 5.1.0 ++ T1_SetFileSearchPath@Base 5.1.0 ++ T1_SetFontDataBase@Base 5.1.0 ++ T1_SetFontDataBaseXLFD@Base 5.1.0 ++ T1_SetLinePosition@Base 5.1.0 ++ T1_SetLineThickness@Base 5.1.0 ++ T1_SetLogLevel@Base 5.1.0 ++ T1_SetRasterFlags@Base 5.1.0 ++ T1_SetRect@Base 5.1.0 ++ T1_SetString@Base 5.1.0 ++ T1_SetStrokeFlag@Base 5.1.0 ++ T1_SetStrokeWidth@Base 5.1.0 ++ T1_ShearHMatrix@Base 5.1.0 ++ T1_ShearVMatrix@Base 5.1.0 ++ T1_SlantFont@Base 5.1.0 ++ T1_StrError@Base 5.1.0 ++ T1_StrokeFont@Base 5.1.0 ++ T1_SubsetFont@Base 5.1.0 ++ T1_TransformFont@Base 5.1.0 ++ T1_TransformMatrix@Base 5.1.0 ++ T1_Type1OperatorFlags@Base 5.1.0 ++ T1_Up@Base 5.1.0 ++ T1_WriteAFMFallbackFile@Base 5.1.0 ++ T1_errno@Base 5.1.0 ++ T1_fdb@Base 5.1.0 ++ T1_fdbxlfd@Base 5.1.0 ++ T1aa_SmartOn@Base 5.1.0 ++ T1aa_bg@Base 5.1.0 ++ T1aa_bpp@Base 5.1.0 ++ T1aa_smartlimit1@Base 5.1.0 ++ T1aa_smartlimit2@Base 5.1.0 ++ T1eexec@Base 5.1.0 ++ T1int_CreateNewFontSize@Base 5.1.0 ++ T1int_GetLastFontSize@Base 5.1.0 ++ T1int_QueryFontSize@Base 5.1.0 ++ T1int_QuerySEAC@Base 5.1.0 ++ T1int_Type1QuerySEAC@Base 5.1.0 ++ T1io_reset@Base 5.1.0 ++ T1lib_parseFile@Base 5.1.0 ++ TheCurrentFont@Base 5.1.0 ++ Type1Char@Base 5.1.0 ++ Type1Line@Base 5.1.0 ++ currstartstem@Base 5.1.0 ++ digit_value@Base 5.1.0 ++ err_warn_msg_buf@Base 5.1.0 ++ errornumber@Base 5.1.0 ++ filestats@Base 5.1.0 ++ fill@Base 5.1.0 ++ fillrun@Base 5.1.0 ++ fontfcnA@Base 5.1.0 ++ fontfcnB@Base 5.1.0 ++ fontfcnB_ByName@Base 5.1.0 ++ fontfcnB_string@Base 5.1.0 ++ fontfcnRect@Base 5.1.0 ++ initFont@Base 5.1.0 ++ intT1_Env_GetCompletePath@Base 5.1.0 ++ intT1_FreeSearchPaths@Base 5.1.0 ++ intT1_ScanConfigFile@Base 5.1.0 ++ intT1_SetupDefaultSearchPaths@Base 5.1.0 ++ intT1_scanFontDBase@Base 5.1.0 ++ intT1_scanFontDBaseXLFD@Base 5.1.0 ++ linebuf@Base 5.1.0 ++ not_def@Base 5.1.0 ++ numalignmentzones@Base 5.1.0 ++ numstems@Base 5.1.0 ++ objFormatArray@Base 5.1.0 ++ objFormatBoolean@Base 5.1.0 ++ objFormatEncoding@Base 5.1.0 ++ objFormatFile@Base 5.1.0 ++ objFormatInteger@Base 5.1.0 ++ objFormatName@Base 5.1.0 ++ objFormatReal@Base 5.1.0 ++ objFormatString@Base 5.1.0 ++ oldhor@Base 5.1.0 ++ oldhorhalf@Base 5.1.0 ++ oldvert@Base 5.1.0 ++ oldverthalf@Base 5.1.0 ++ pFontBase@Base 5.1.0 ++ readFont@Base 5.1.0 ++ reportusage@Base 5.1.0 ++ resetFont@Base 5.1.0 ++ scan_font@Base 5.1.0 ++ scan_token@Base 5.1.0 ++ stck_state@Base 5.1.0 ++ stems@Base 5.1.0 ++ swathrightmost@Base 5.1.0 ++ swathxsort@Base 5.1.0 ++ t1_Allocate@Base 5.1.0 ++ t1_ApplyContinuity@Base 5.1.0 ++ t1_ArgErr@Base 5.1.0 ++ t1_Bezier@Base 5.1.0 ++ t1_BoundingBox@Base 5.1.0 ++ t1_BoxClip@Base 5.1.0 ++ t1_BoxPath@Base 5.1.0 ++ t1_Bresenham@Base 5.1.0 ++ t1_ChangeDirection@Base 5.1.0 ++ t1_CloseHints@Base 5.1.0 ++ t1_ClosePath@Base 5.1.0 ++ t1_Consume@Base 5.1.0 ++ t1_Copy@Base 5.1.0 ++ t1_CopyPath@Base 5.1.0 ++ t1_CopyRegion@Base 5.1.0 ++ t1_CopySpace@Base 5.1.0 ++ t1_Destroy@Base 5.1.0 ++ t1_DropSegment@Base 5.1.0 ++ t1_DumpArea@Base 5.1.0 ++ t1_DumpEdges@Base 5.1.0 ++ t1_DumpSpace@Base 5.1.0 ++ t1_DumpText@Base 5.1.0 ++ t1_Dup@Base 5.1.0 ++ t1_EmptyRegion@Base 5.1.0 ++ t1_ErrorMsg@Base 5.1.0 ++ t1_FormatFP@Base 5.1.0 ++ t1_Free@Base 5.1.0 ++ t1_HeadSegment@Base 5.1.0 ++ t1_Hint@Base 5.1.0 ++ t1_ILoc@Base 5.1.0 ++ t1_Identity@Base 5.1.0 ++ t1_InitHints@Base 5.1.0 ++ t1_InitImager@Base 5.1.0 ++ t1_InitSpaces@Base 5.1.0 ++ t1_Interior@Base 5.1.0 ++ t1_Join@Base 5.1.0 ++ t1_JoinSegment@Base 5.1.0 ++ t1_KillPath@Base 5.1.0 ++ t1_KillRegion@Base 5.1.0 ++ t1_Line@Base 5.1.0 ++ t1_Loc@Base 5.1.0 ++ t1_MInvert@Base 5.1.0 ++ t1_MMultiply@Base 5.1.0 ++ t1_MoreWorkArea@Base 5.1.0 ++ t1_MoveEdges@Base 5.1.0 ++ t1_PathDelta@Base 5.1.0 ++ t1_PathSegment@Base 5.1.0 ++ t1_PathXform@Base 5.1.0 ++ t1_Permanent@Base 5.1.0 ++ t1_Phantom@Base 5.1.0 ++ t1_Pragmatics@Base 5.1.0 ++ t1_ProcessHint@Base 5.1.0 ++ t1_PseudoSpace@Base 5.1.0 ++ t1_QueryBounds@Base 5.1.0 ++ t1_QueryLoc@Base 5.1.0 ++ t1_QueryPath@Base 5.1.0 ++ t1_QuerySpace@Base 5.1.0 ++ t1_RegionBounds@Base 5.1.0 ++ t1_Reverse@Base 5.1.0 ++ t1_ReverseSubPaths@Base 5.1.0 ++ t1_Scale@Base 5.1.0 ++ t1_Snap@Base 5.1.0 ++ t1_SortSwath@Base 5.1.0 ++ t1_StepBezier@Base 5.1.0 ++ t1_StepLine@Base 5.1.0 ++ t1_SubLoc@Base 5.1.0 ++ t1_SwathUnion@Base 5.1.0 ++ t1_TermImager@Base 5.1.0 ++ t1_Transform@Base 5.1.0 ++ t1_TypeErr@Base 5.1.0 ++ t1_UnConvert@Base 5.1.0 ++ t1_UnJumble@Base 5.1.0 ++ t1_Unique@Base 5.1.0 ++ t1_User@Base 5.1.0 ++ t1_Xform@Base 5.1.0 ++ t1_abort@Base 5.1.0 ++ t1_get_abort_message@Base 5.1.0 ++ t1lib_log_file@Base 5.1.0 ++ t1lib_log_level@Base 5.1.0 ++ tokenLength@Base 5.1.0 ++ tokenMaxP@Base 5.1.0 ++ tokenStartP@Base 5.1.0 ++ tokenTooLong@Base 5.1.0 ++ tokenType@Base 5.1.0 ++ tokenValue@Base 5.1.0 ++ vm_alloc@Base 5.1.0 ++ vm_base@Base 5.1.0 ++ vm_free@Base 5.1.0 ++ vm_init@Base 5.1.0 ++ vm_init_amount@Base 5.1.0 ++ vm_init_count@Base 5.1.0 ++ vm_next@Base 5.1.0 ++ vm_size@Base 5.1.0 ++ vm_used@Base 5.1.0 ++ wsoffsetX@Base 5.1.0 ++ wsoffsetY@Base 5.1.0 ++ wsset@Base 5.1.0 ++ xiStub@Base 5.1.0 ++ xiTemporary@Base 5.1.0 ++libt1x.so.5 libt1-5 #MINVER# ++ T1_AASetCharX@Base 5.1.1 ++ T1_AASetRectX@Base 5.1.1 ++ T1_AASetStringX@Base 5.1.1 ++ T1_ComputeAAColorsX@Base 5.1.1 ++ T1_LogicalPositionX@Base 5.1.1 ++ T1_SetCharX@Base 5.1.1 ++ T1_SetRectX@Base 5.1.1 ++ T1_SetStringX@Base 5.1.1 ++ T1_SetX11Params@Base 5.1.1 ++ T1_XImageFromGlyph@Base 5.1.1 +--- t1lib-5.1.2.orig/debian/control ++++ t1lib-5.1.2/debian/control +@@ -0,0 +1,84 @@ ++Source: t1lib ++Section: libs ++Priority: optional ++Maintainer: Ruben Molina ++Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libice-dev, libsm-dev, libx11-dev, libxext-dev, libxaw7-dev, quilt ++Standards-Version: 3.8.0 ++Homepage: ftp://sunsite.unc.edu/pub/Linux/libs/graphics/ ++ ++Package: libt1-5 ++Section: libs ++Architecture: any ++Depends: ${shlibs:Depends}, ${misc:Depends} ++Description: Type 1 font rasterizer library - runtime ++ T1lib is an enhanced rasterizer for Type 1 fonts. ++ . ++ T1lib is based on the X11R5 font rasterizer code, but operates independently ++ of X11. It includes many enhancements, including underlining, antialiasing, ++ user-defined slant and extension factors, and rotation. ++ . ++ This package contains the shared libraries needed to run programs using T1lib. ++ ++Package: libt1-dev ++Section: libdevel ++Architecture: any ++Depends: libt1-5 (= ${binary:Version}), libice-dev, libsm-dev, libx11-dev, ++ libxext-dev, libxaw7-dev ++Recommends: libt1-doc ++Conflicts: t1lib-dev, t1lib1-dev ++Description: Type 1 font rasterizer library - development ++ T1lib is an enhanced rasterizer for Type 1 fonts. ++ . ++ T1lib is based on the X11R5 font rasterizer code, but operates independently ++ of X11. It includes many enhancements, including underlining, antialiasing, ++ user-defined slant and extension factors, and rotation. ++ . ++ This package contains the header files and static libraries needed to ++ develop programs using T1lib. ++ . ++ Please note, that PDF documentation is placed in libt1-doc ++ ++Package: t1lib-bin ++Architecture: any ++Section: misc ++Depends: ${shlibs:Depends} ++Provides: t1lib1-bin ++Replaces: t1lib1-bin ++Conflicts: t1lib1-bin ++Description: Type 1 font rasterizer library - user binaries ++ T1lib is an enhanced rasterizer for Type 1 fonts. ++ . ++ T1lib is based on the X11R5 font rasterizer code, but operates independently ++ of X11. It includes many enhancements, including underlining, antialiasing, ++ user-defined slant and extension factors, and rotation. ++ . ++ This package contains the programs "xglyph" and "type1afm", included in the ++ upstream T1lib distribution. It also contains the "t1libconfig" ++ script used to configure t1lib. ++ ++Package: libt1-doc ++Architecture: all ++Section: doc ++Description: Type 1 font rasterizer library - developers documentation ++ T1lib is an enhanced rasterizer for Type 1 fonts. ++ . ++ T1lib is based on the X11R5 font rasterizer code, but operates independently ++ of X11. It includes many enhancements, including underlining, antialiasing, ++ user-defined slant and extension factors, and rotation. ++ . ++ This package contains developers documentation. ++ ++Package: libt1-5-dbg ++Section: libdevel ++Priority: extra ++Architecture: any ++Depends: libt1-5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} ++Description: Type 1 font rasterizer library - debugging runtime ++ T1lib is an enhanced rasterizer for Type 1 fonts. ++ . ++ T1lib is based on the X11R5 font rasterizer code, but operates independently ++ of X11. It includes many enhancements, including underlining, antialiasing, ++ user-defined slant and extension factors, and rotation. ++ . ++ This package contains debugging information. ++ +--- t1lib-5.1.2.orig/debian/libt1-dev.install ++++ t1lib-5.1.2/debian/libt1-dev.install +@@ -0,0 +1,3 @@ ++debian/tmp/usr/include/* ++debian/tmp/usr/lib/*.so ++debian/tmp/usr/lib/*.a +--- t1lib-5.1.2.orig/debian/compat ++++ t1lib-5.1.2/debian/compat +@@ -0,0 +1 @@ ++7 +--- t1lib-5.1.2.orig/debian/t1lib-bin.postrm ++++ t1lib-5.1.2/debian/t1lib-bin.postrm +@@ -0,0 +1,8 @@ ++#!/bin/sh ++set -e ++ ++if [ "$1" = "purge" ]; then ++ rm -rf /etc/t1lib ++fi ++ ++#DEBHELPER# +--- t1lib-5.1.2.orig/debian/watch ++++ t1lib-5.1.2/debian/watch +@@ -0,0 +1,3 @@ ++version=3 ++ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-(.*)\.tar\.gz \ ++ debian debian/orig-tar.sh +--- t1lib-5.1.2.orig/debian/README.Debian ++++ t1lib-5.1.2/debian/README.Debian +@@ -0,0 +1,25 @@ ++t1lib for Debian ++---------------- ++ ++This package has been created from scratch using debhelper. It contains ++four binary packages: ++ * shared library - libt1-5 ++ * development files - libt1-5-dev ++ * font-related binary utils - t1lib5-bin ++ * documentation - libt1-5-doc ++ ++However you can read in upstream's README that t1lib is completely independent ++of X11, you should know that package provides also libt1x library which ++contains X11 pixmap support. That's why it requires a bunch of X-libraries ++installed. If you consider this as a bad behavior, please discuss it on ++debian-devel list. ++ ++NOTE: The old 't1lib0' package will *remove* /etc/t1lib/ and its ++contents if you purge it. Since this package is now obsolete, there ++is no good solution for this; you must back up your font database and ++config file if you wish to preserve them. Sorry... ++ ++This package has been previously maintained by David Huggins-Daines, great ++thanks to him for his good job. ++ ++ -- Artur R. Czechowski , Tue, 11 Nov 2003 13:31:48 +0100 +--- t1lib-5.1.2.orig/debian/t1lib-bin.dirs ++++ t1lib-5.1.2/debian/t1lib-bin.dirs +@@ -0,0 +1 @@ ++etc/t1lib +--- t1lib-5.1.2.orig/debian/patches/no-docs.diff ++++ t1lib-5.1.2/debian/patches/no-docs.diff +@@ -0,0 +1,34 @@ ++We are using debhelper to install the documentation in the correct ++directory. ++ ++Index: t1lib-5.1.1/doc/Makefile.in ++=================================================================== ++--- t1lib-5.1.1.orig/doc/Makefile.in 2008-01-05 19:05:03.000000000 +0100 +++++ t1lib-5.1.1/doc/Makefile.in 2008-01-05 19:05:25.000000000 +0100 ++@@ -89,16 +89,16 @@ ++ ++ ++ install: dummy ++- if (test -f t1lib_doc.ps) \ ++- then \ ++- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ ++- $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ ++- fi; ++- if (test -f t1lib_doc.pdf) \ ++- then \ ++- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ ++- $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ ++- fi; +++# if (test -f t1lib_doc.ps) \ +++# then \ +++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ +++# $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ +++# fi; +++# if (test -f t1lib_doc.pdf) \ +++# then \ +++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ +++# $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ +++# fi; ++ ++ ++ uninstall: dummy +--- t1lib-5.1.2.orig/debian/patches/lib-cleanup.diff ++++ t1lib-5.1.2/debian/patches/lib-cleanup.diff +@@ -0,0 +1,59 @@ ++do not link against libraries that are not needed ++ ++Index: t1lib-5.1.1/lib/Makefile.in ++=================================================================== ++--- t1lib-5.1.1.orig/lib/Makefile.in 2008-01-05 19:17:21.000000000 +0100 +++++ t1lib-5.1.1/lib/Makefile.in 2008-01-05 19:17:38.000000000 +0100 ++@@ -24,7 +24,7 @@ ++ X_LIBS = @X_LIBS@ ++ TOPSRC = @top_srcdir@ ++ XPM_LIB = -lXpm ++-XLIB = @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ +++XLIB = -lX11 ++ LDFLAGS = @LDFLAGS@ ++ LDLIBS = @LDLIBS@ ++ AR = ar rc ++@@ -137,7 +137,7 @@ ++ $(LIBTOOL) --mode=link \ ++ $(CC) $(LDFLAGS) -o $@ $(T1LIBX_OBJS) \ ++ -version-info @T1LIB_LT_CURRENT@:@T1LIB_LT_REVISION@:@T1LIB_LT_AGE@ \ ++- libt1.la $(X_LIBS) $(XPM_LIB) $(XLIB) -no-undefined -rpath $(libdir) +++ libt1.la $(X_LIBS) $(XLIB) -no-undefined -rpath $(libdir) ++ cp t1lib/t1libx.h . ++ ++ ++Index: t1lib-5.1.1/type1afm/Makefile.in ++=================================================================== ++--- t1lib-5.1.1.orig/type1afm/Makefile.in 2008-01-05 19:17:52.000000000 +0100 +++++ t1lib-5.1.1/type1afm/Makefile.in 2008-01-05 19:18:02.000000000 +0100 ++@@ -70,7 +70,7 @@ ++ ++ type1afm: $(OBJS) ../lib/t1lib.h ++ $(LIBTOOL) --mode=link \ ++- $(CC) -o type1afm $(LDFLAGS) $(OBJS) $(T1LIB) $(LDLIBS) +++ $(CC) -o type1afm $(LDFLAGS) $(OBJS) $(T1LIB) ++ ++ .SUFFIXES: .lo ++ .c.lo: ++Index: t1lib-5.1.1/xglyph/Makefile.in ++=================================================================== ++--- t1lib-5.1.1.orig/xglyph/Makefile.in 2008-01-05 19:18:15.000000000 +0100 +++++ t1lib-5.1.1/xglyph/Makefile.in 2008-01-05 19:18:31.000000000 +0100 ++@@ -24,7 +24,7 @@ ++ X_LIBS = @X_LIBS@ ++ TOPSRC = @top_srcdir@ ++ XPM_LIB = -lXpm ++-XLIB = @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ +++XLIB = -lX11 @X_EXTRA_LIBS@ ++ LDFLAGS = @LDFLAGS@ ++ LDLIBS = @LDLIBS@ ++ AR = ar rc ++@@ -65,7 +65,7 @@ ++ ++ T1LIB = ../lib/libt1.la ++ T1LIBX = ../lib/libt1x.la ++-XAWLIB = -lXaw -lXt -lXmu +++XAWLIB = -lXaw -lXt ++ ++ ++ all: xglyph +--- t1lib-5.1.2.orig/debian/patches/no-config.diff ++++ t1lib-5.1.2/debian/patches/no-config.diff +@@ -0,0 +1,57 @@ ++do not install a static configuration file ++ ++Index: t1lib-5.1.1/lib/Makefile.in ++=================================================================== ++--- t1lib-5.1.1.orig/lib/Makefile.in 2008-01-05 19:13:57.000000000 +0100 +++++ t1lib-5.1.1/lib/Makefile.in 2008-01-05 19:14:18.000000000 +0100 ++@@ -161,17 +161,17 @@ ++ install: dummy ++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(includedir) ++- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@ +++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@ ++ $(LIBTOOL) --mode=install \ ++ $(INSTALL_DATA) $(MAIN_TARGET) $(DESTDIR)$(libdir) ++ $(LIBTOOL) --mode=install \ ++ $(INSTALL_DATA) $(MAIN_HEADER) $(DESTDIR)$(includedir) ++- if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \ ++- then \ ++- echo "Alert: Global configuration file exists, installation skipped!"; \ ++- else \ ++- $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \ ++- fi; +++# if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \ +++# then \ +++# echo "Alert: Global configuration file exists, installation skipped!"; \ +++# else \ +++# $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \ +++# fi; ++ ++ ++ uninstall: dummy ++@@ -179,7 +179,7 @@ ++ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libt1x.la ++ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1lib.h ++ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1libx.h ++- -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config +++# -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config ++ ++ ++ dummy: ++Index: t1lib-5.1.1/xglyph/xglyph.c ++=================================================================== ++--- t1lib-5.1.1.orig/xglyph/xglyph.c 2008-01-05 19:16:30.000000000 +0100 +++++ t1lib-5.1.1/xglyph/xglyph.c 2008-01-05 19:16:40.000000000 +0100 ++@@ -526,9 +526,12 @@ ++ ++ /* Check for environment entry. If not set, set it to current ++ directory so that configuration file is found there */ +++ /* It violates the Debian Policy */ +++#if 0 ++ if (getenv("T1LIB_CONFIG")==NULL){ ++ putenv( "T1LIB_CONFIG=./t1lib.config"); ++ } +++#endif ++ ++ ++ /* Set log-level: */ +--- t1lib-5.1.2.orig/debian/patches/segfault.diff ++++ t1lib-5.1.2/debian/patches/segfault.diff +@@ -0,0 +1,62 @@ ++This patch does not look safe and it has not been accepted upstream. ++Index: t1lib-5.1.1/lib/t1lib/t1base.c ++=================================================================== ++--- t1lib-5.1.1.orig/lib/t1lib/t1base.c 2005-05-18 05:08:01.000000000 +0200 +++++ t1lib-5.1.1/lib/t1lib/t1base.c 2008-01-06 20:48:32.000000000 +0100 ++@@ -455,7 +455,7 @@ ++ to test_for_t1_file() filename is substituted by an emty ++ string if the file was not found: */ ++ sprintf( err_warn_msg_buf, "Type 1 Font file %s.[pfa/pfb] not found (FontID=%d, SearchPath=%s)", ++- linebuf, m-1, T1_GetFileSearchPath(T1_PFAB_PATH)); +++ linebuf, m-1, intT1_GetFileSearchPath(T1_PFAB_PATH)); ++ if ((test_for_t1_file( &linebuf[0]))){ ++ T1_PrintLog( "intT1_scanFontDBase()", err_warn_msg_buf, T1LOG_WARNING); ++ located=0; ++@@ -579,7 +579,7 @@ ++ to test_for_t1_file() filename is substituted by an emty ++ string if the file was not found: */ ++ sprintf( err_warn_msg_buf, "Type 1 Font file %s.[pfa/pfb] not found (FontID=%d, SearchPath=%s)", ++- linebuf, m-1, T1_GetFileSearchPath(T1_PFAB_PATH)); +++ linebuf, m-1, intT1_GetFileSearchPath(T1_PFAB_PATH)); ++ if ((test_for_t1_file( &linebuf[0]))){ ++ T1_PrintLog( "intT1_scanFontDBase()", err_warn_msg_buf, T1LOG_WARNING); ++ located=0; ++Index: t1lib-5.1.1/lib/t1lib/t1env.c ++=================================================================== ++--- t1lib-5.1.1.orig/lib/t1lib/t1env.c 2008-01-06 20:48:32.000000000 +0100 +++++ t1lib-5.1.1/lib/t1lib/t1env.c 2008-01-06 20:48:32.000000000 +0100 ++@@ -807,6 +807,14 @@ ++ ++ } ++ +++/* intT1_GetFileSearchPath(): +++ call T1_GetFileSearchPath and truncate the line to avoid overflowing +++ error buffers*/ +++char *intT1_GetFileSearchPath( int type) +++{ +++ char *res = T1_GetFileSearchPath(type); +++ res[900] = 0; +++} ++ ++ /* T1_AddToFileSearchPath(): Add the specified path element to ++ the specified search path. If the existing path is the default path, ++Index: t1lib-5.1.1/lib/t1lib/t1env.h ++=================================================================== ++--- t1lib-5.1.1.orig/lib/t1lib/t1env.h 2005-05-16 20:37:43.000000000 +0200 +++++ t1lib-5.1.1/lib/t1lib/t1env.h 2008-01-06 20:48:32.000000000 +0100 ++@@ -35,6 +35,7 @@ ++ int T1_SetFileSearchPath( int type, char *pathname); ++ int T1_AddToFileSearchPath( int pathtype, int mode, char *pathname); ++ char *T1_GetFileSearchPath( int type); +++char *intT1_GetFileSearchPath( int type); ++ int T1_SetFontDataBase( char *filename); ++ int T1_AddFontDataBase( int mode, char *filename); ++ int T1_SetFontDataBaseXLFD( char *filename); ++@@ -49,6 +50,7 @@ ++ extern int T1_SetFileSearchPath( int type, char *pathname); ++ extern int T1_AddToFileSearchPath( int pathtype, int mode, char *pathname); ++ extern char *T1_GetFileSearchPath( int type); +++extern char *intT1_GetFileSearchPath( int type); ++ extern int T1_SetFontDataBase( char *filename); ++ extern int T1_AddFontDataBase( int mode, char *filename); ++ extern int T1_SetFontDataBaseXLFD( char *filename); +--- t1lib-5.1.2.orig/debian/patches/CVE-2010-2642.patch ++++ t1lib-5.1.2/debian/patches/CVE-2010-2642.patch +@@ -0,0 +1,24 @@ ++diff --git a/lib/t1lib/parseAFM.c b/lib/t1lib/parseAFM.c ++index 6a31d7f..ba64541 100644 ++--- a/lib/t1lib/parseAFM.c +++++ b/lib/t1lib/parseAFM.c ++@@ -199,7 +199,9 @@ static char *token(stream) ++ idx = 0; ++ ++ while (ch != EOF && ch != ' ' && ch != CR && ch != LF && ++- ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';'){ +++ ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';' +++ && idx < (MAX_NAME -1)) +++ { ++ ident[idx++] = ch; ++ ch = fgetc(stream); ++ } /* while */ ++@@ -235,7 +237,7 @@ static char *linetoken(stream) ++ while ((ch = fgetc(stream)) == ' ' || ch == '\t' ); ++ ++ idx = 0; ++- while (ch != EOF && ch != CR && ch != LF && ch != CTRL_Z) +++ while (ch != EOF && ch != CR && ch != LF && ch != CTRL_Z && idx < (MAX_NAME - 1)) ++ { ++ ident[idx++] = ch; ++ ch = fgetc(stream); +--- t1lib-5.1.2.orig/debian/patches/CVE-2011-0764.diff ++++ t1lib-5.1.2/debian/patches/CVE-2011-0764.diff +@@ -0,0 +1,32 @@ ++Description: Don't lookup previous point if there isn't any ++Author: Marc Deslauriers ++Forwarded: no ++ ++Index: t1lib-5.1.2/lib/type1/type1.c ++=================================================================== ++--- t1lib-5.1.2.orig/lib/type1/type1.c 2011-12-13 14:24:14.280965637 -0600 +++++ t1lib-5.1.2/lib/type1/type1.c 2011-12-13 14:25:25.893320747 -0600 ++@@ -1700,6 +1700,7 @@ ++ long pindex = 0; ++ ++ /* compute hinting for previous segment! */ +++ if (ppoints == NULL) Error0i("RLineTo: No previous point!\n"); ++ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx, dy); ++ ++ /* Allocate a new path point and pre-setup data */ ++@@ -1728,6 +1729,7 @@ ++ long pindex = 0; ++ ++ /* compute hinting for previous point! */ +++ if (ppoints == NULL) Error0i("RRCurveTo: No previous point!\n"); ++ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx1, dy1); ++ ++ /* Allocate three new path points and pre-setup data */ ++@@ -1903,6 +1905,7 @@ ++ FindStems( currx, curry, 0, 0, dx, dy); ++ } ++ else { +++ if (ppoints == NULL) Error0i("RMoveTo: No previous point!\n"); ++ FindStems( currx, curry, ppoints[numppoints-2].x, ppoints[numppoints-2].y, dx, dy); ++ } ++ +--- t1lib-5.1.2.orig/debian/patches/CVE-2011-1552_1553_1554.patch ++++ t1lib-5.1.2/debian/patches/CVE-2011-1552_1553_1554.patch +@@ -0,0 +1,133 @@ ++Author: Jaroslav Å karvada ++Description: Fix more crashes on oversized fonts ++Bug-Redhat: http://bugzilla.redhat.com/show_bug.cgi?id=692909 ++Index: t1lib-5.1.2/lib/type1/lines.c ++=================================================================== ++--- t1lib-5.1.2.orig/lib/type1/lines.c 2007-12-23 09:49:42.000000000 -0600 +++++ t1lib-5.1.2/lib/type1/lines.c 2012-01-17 14:15:08.000000000 -0600 ++@@ -67,6 +67,10 @@ ++ None. ++ */ ++ +++#define BITS (sizeof(LONG)*8) +++#define HIGHTEST(p) (((p)>>(BITS-2)) != 0) /* includes sign bit */ +++#define TOOBIG(xy) ((xy < 0) ? HIGHTEST(-xy) : HIGHTEST(xy)) +++ ++ /* ++ :h2.StepLine() - Produces Run Ends for a Line After Checks ++ ++@@ -84,6 +88,9 @@ ++ IfTrace4((LineDebug > 0), ".....StepLine: (%d,%d) to (%d,%d)\n", ++ x1, y1, x2, y2); ++ +++ if ( TOOBIG(x1) || TOOBIG(x2) || TOOBIG(y1) || TOOBIG(y2)) +++ abort("Lines this big not supported", 49); +++ ++ dy = y2 - y1; ++ ++ /* ++Index: t1lib-5.1.2/lib/type1/objects.c ++=================================================================== ++--- t1lib-5.1.2.orig/lib/type1/objects.c 2007-12-23 09:49:42.000000000 -0600 +++++ t1lib-5.1.2/lib/type1/objects.c 2012-01-17 14:15:08.000000000 -0600 ++@@ -1137,12 +1137,13 @@ ++ "Context: out of them", /* 46 */ ++ "MatrixInvert: can't", /* 47 */ ++ "xiStub called", /* 48 */ ++- "Illegal access type1 abort() message" /* 49 */ +++ "Lines this big not supported", /* 49 */ +++ "Illegal access type1 abort() message" /* 50 */ ++ }; ++ ++- /* no is valid from 1 to 48 */ ++- if ( (number<1)||(number>48)) ++- number=49; +++ /* no is valid from 1 to 49 */ +++ if ( (number<1)||(number>49)) +++ number=50; ++ return( err_msgs[number-1]); ++ ++ } ++Index: t1lib-5.1.2/lib/type1/type1.c ++=================================================================== ++--- t1lib-5.1.2.orig/lib/type1/type1.c 2012-01-17 14:13:28.000000000 -0600 +++++ t1lib-5.1.2/lib/type1/type1.c 2012-01-17 14:19:54.000000000 -0600 ++@@ -1012,6 +1012,7 @@ ++ double nextdtana = 0.0; /* tangent of post-delta against horizontal line */ ++ double nextdtanb = 0.0; /* tangent of post-delta against vertical line */ ++ +++ if (ppoints == NULL || numppoints < 1) Error0v("FindStems: No previous point!\n"); ++ ++ /* setup default hinted position */ ++ ppoints[numppoints-1].ax = ppoints[numppoints-1].x; ++@@ -1289,7 +1290,7 @@ ++ static int DoRead(CodeP) ++ int *CodeP; ++ { ++- if (strindex >= CharStringP->len) return(FALSE); /* end of string */ +++ if (!CharStringP || strindex >= CharStringP->len) return(FALSE); /* end of string */ ++ /* We handle the non-documented Adobe convention to use lenIV=-1 to ++ suppress charstring encryption. */ ++ if (blues->lenIV==-1) { ++@@ -1700,7 +1701,7 @@ ++ long pindex = 0; ++ ++ /* compute hinting for previous segment! */ ++- if (ppoints == NULL) Error0i("RLineTo: No previous point!\n"); +++ if (ppoints == NULL || numppoints < 2) Error0i("RLineTo: No previous point!\n"); ++ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx, dy); ++ ++ /* Allocate a new path point and pre-setup data */ ++@@ -1729,7 +1730,7 @@ ++ long pindex = 0; ++ ++ /* compute hinting for previous point! */ ++- if (ppoints == NULL) Error0i("RRCurveTo: No previous point!\n"); +++ if (ppoints == NULL || numppoints < 2) Error0i("RRCurveTo: No previous point!\n"); ++ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx1, dy1); ++ ++ /* Allocate three new path points and pre-setup data */ ++@@ -1788,7 +1789,9 @@ ++ long tmpind; ++ double deltax = 0.0; ++ double deltay = 0.0; ++- +++ +++ if (ppoints == NULL || numppoints < 1) Error0i("DoClosePath: No previous point!"); +++ ++ /* If this ClosePath command together with the starting point of this ++ path completes to a segment aligned to a stem, we would miss ++ hinting for this point. --> Check and explicitly care for this! */ ++@@ -1803,6 +1806,7 @@ ++ deltax = ppoints[i].x - ppoints[numppoints-1].x; ++ deltay = ppoints[i].y - ppoints[numppoints-1].y; ++ +++ if (ppoints == NULL || numppoints <= i + 1) Error0i("DoClosePath: No previous point!"); ++ /* save nummppoints and reset to move point */ ++ tmpind = numppoints; ++ numppoints = i + 1; ++@@ -1905,7 +1909,7 @@ ++ FindStems( currx, curry, 0, 0, dx, dy); ++ } ++ else { ++- if (ppoints == NULL) Error0i("RMoveTo: No previous point!\n"); +++ if (ppoints == NULL || numppoints < 2) Error0i("RMoveTo: No previous point!\n"); ++ FindStems( currx, curry, ppoints[numppoints-2].x, ppoints[numppoints-2].y, dx, dy); ++ } ++ ++@@ -2155,6 +2159,7 @@ ++ DOUBLE cx, cy; ++ DOUBLE ex, ey; ++ +++ if (ppoints == NULL || numppoints < 8) Error0v("FlxProc: No previous point!"); ++ ++ /* Our PPOINT list now contains 7 moveto commands which ++ are about to be consumed by the Flex mechanism. --> Remove these ++@@ -2324,6 +2329,7 @@ ++ /* Returns currentpoint on stack */ ++ static void FlxProc2() ++ { +++ if (ppoints == NULL || numppoints < 1) Error0v("FlxProc2: No previous point!"); ++ /* Push CurrentPoint on fake PostScript stack */ ++ PSFakePush( ppoints[numppoints-1].x); ++ PSFakePush( ppoints[numppoints-1].y); +--- t1lib-5.1.2.orig/debian/patches/format-security.diff ++++ t1lib-5.1.2/debian/patches/format-security.diff +@@ -0,0 +1,33 @@ ++--- a/lib/type1/objects.c +++++ b/lib/type1/objects.c ++@@ -957,7 +957,7 @@ ++ ++ sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n", ++ name, TypeFmt(expect), TypeFmt(obj->type)); ++- IfTrace0(TRUE,typemsg); +++ IfTrace1(TRUE, "%s", typemsg); ++ ++ ObjectPostMortem(obj); ++ ++--- a/lib/t1lib/t1subset.c +++++ b/lib/t1lib/t1subset.c ++@@ -759,7 +759,7 @@ ++ tr_len); ++ T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf, ++ T1LOG_DEBUG); ++- l+=sprintf( &(trailerbuf[l]), linebuf); /* contains the PostScript trailer */ +++ l+=sprintf( &(trailerbuf[l]), "%s", linebuf); /* contains the PostScript trailer */ ++ } ++ ++ /* compute size of output file */ ++--- a/lib/type1/objects.h +++++ b/lib/type1/objects.h ++@@ -214,7 +214,7 @@ ++ /*SHARED*/ ++ /* NDW: personally, I want to see status and error messages! */ ++ #define IfTrace0(condition,model) \ ++- {if (condition) printf(model);} +++ {if (condition) fputs(model,stdout);} ++ #define IfTrace1(condition,model,arg0) \ ++ {if (condition) printf(model,arg0);} ++ #define IfTrace2(condition,model,arg0,arg1) \ +--- t1lib-5.1.2.orig/debian/patches/series ++++ t1lib-5.1.2/debian/patches/series +@@ -0,0 +1,8 @@ ++no-docs.diff ++no-config.diff ++lib-cleanup.diff ++#segfault.diff ++format-security.diff ++CVE-2011-0764.diff ++CVE-2011-1552_1553_1554.patch ++CVE-2010-2642.patch +--- t1lib-5.1.2.orig/debian/man/FontDatabase.5 ++++ t1lib-5.1.2/debian/man/FontDatabase.5 +@@ -0,0 +1,77 @@ ++.TH FONTDATABASE 5 ++.SH NAME ++FontDataBase \- database of fonts accessible to t1lib. ++.SH DESCRIPTION ++This manual page has been written for the Debian GNU/Linux ++distribution. It has been adapted from the documentation included in ++the upstream ++.B t1lib ++distribution. ++.PP ++.B /etc/t1lib/FontDataBase ++is a text file which contains, minimally, the basenames of Type 1 font ++files to be made accessible to the ++.B t1lib ++font rasterizer library. The format is intentionally similar to that ++of the ++.B fonts.dir ++and ++.B fonts.scale ++files used by X11. ++.PP ++Line 1 of this file contains a positive integer specifying the number ++of fonts declared in that file. This is as in the ++.B fonts.dir ++files of the X11 system. ++.PP ++All remaining lines contain declarations of one font each. The only ++thing taken from such a line is the last string (delimited by white ++space) in it. It is assumed to be a filename of the format ++\fIbasename\fR.\fIsomeextension\fR. ++.PP ++The \fIbasename\fR part is assumed to be the ++.BR basename (1) ++of a fontfile. After the a string has been parsed, the ++.I extension ++is cut off and replaced in turn with ++.I .pfa ++and ++.I .pfb. ++The initialization routine tries to open a font file in ++its search path with one of the resulting filenames. ++.PP ++The remainder of the line, i.e., from beginning to the start of the ++filename string, is completely ignored and thus may contain ++information for other programs. ++.SH EXAMPLES ++Here is a minimal font database file for 4 fonts: ++.sp ++.nf ++4 ++isvl.afm ++isvli.afm ++isvd.afm ++isvdi.afm ++.fi ++.PP ++This file is \fIminimal\fR, because it contains just the information ++needed, and nothing not needed by the library. ++.PP ++Here is a more realistic example, which allows an application to match ++a fully qualified X11 fontname to a FontID in ++.B t1lib. ++This is also a valid font database file: ++.sp ++.nf ++4 ++Souvenir Souvenir-Light --- \-itc-souvenir-light-r-normal--#-0-0-0-p-0-iso8859-1 isvl.afm ++Souvenir Souvenir-LightItalic -*- \-itc-souvenir-light-i-normal--#-0-0-0-p-0-iso8859-1 isvli.afm ++ Souvenir-Demi *-- \-itc-souvenir-demi-r-normal--#-0-0-0-p-0-iso8859-1 isvd.afm ++ Souvenir-DemiItalic **- \-itc-souvenir-demi-i-normal--#-0-0-0-p-0-iso8859-1 isvdi.afm ++.fi ++.PP ++.SH FILES ++.I /etc/t1lib/FontDataBase ++.SH "SEE ALSO" ++.BR mkfontdir (1x) ++ +--- t1lib-5.1.2.orig/debian/man/t1libconfig.8 ++++ t1lib-5.1.2/debian/man/t1libconfig.8 +@@ -0,0 +1,57 @@ ++.TH T1LIBCONFIG 8 ++.SH NAME ++.B t1libconfig ++\- create the t1lib.config and FontDataBase files for t1lib ++.SH SYNOPSIS ++.B t1libconfig ++[ ++.BR \-v\fP, \fB\-\-version ++] ++[ ++.BR \-h\fP, \fB\-\-help ++] ++.B \-\-force ++] ++[ ++.B fontdirectory... ++] ++.SH DESCRIPTION ++.B t1libconfig ++scans a list of directories for Type 1 fonts and font metric files, ++and generates a configuration file and font database file for the ++.B t1lib ++rasterizer library accordingly. By default, it looks in all ++subdirectories of /usr/X11R6/lib/X11/fonts, and in ++/usr/lib/ghostscript. Extra directories to search may be specified on ++the command line. The ++.B t1libconfig ++script tries not to scan the same directory twice (this is, however, ++not foolproof, since /usr/X11R6/lib/X11/fonts and /usr/lib/X11/fonts ++typically point to the same directory on GNU/Linux systems). ++.SH OPTIONS ++.TP ++.BR \-v\fP, \fB\-\-version ++Print the version of ++.B t1libconfig ++and exit. ++.TP ++.BR \-h\fP, \fB\-\-help ++Print help about usage and exit. ++.TP ++.B \-\-force ++Force the generation of new configuration files even if these files ++already exist on the system. ++.SH FILES ++.TP 25 ++.B /etc/t1lib/t1lib.config ++Contains configuration information for t1lib, including ++colon-separated lists of paths to Type 1 font files and font metrics ++files, and the location of the default font database file ++.TP 25 ++.B /etc/t1lib/FontDataBase ++Contains a list of the names of Type 1 font files to be used by t1lib. ++.SH AUTHOR ++David Huggins-Daines ++.SH SEE ALSO ++.BR FontDataBase (5) ++ +--- t1lib-5.1.2.orig/debian/man/xglyph.1 ++++ t1lib-5.1.2/debian/man/xglyph.1 +@@ -0,0 +1,111 @@ ++.TH XGLYPH 1 ++.SH NAME ++xglyph \- demonstration program for the t1lib font rasterizer library. ++.SH SYNOPSIS ++.B xglyph ++[ ++.B fontfile... ++] ++.SH "DESCRIPTION" ++This manual page documents briefly the ++.BR xglyph ++program. ++This manual page was written for the Debian GNU/Linux distribution ++because the original program does not have a manual page. ++.PP ++.B xglyph ++is a program which demonstrates the capabilities of the ++.B t1lib ++library. It allows the user to view an arbitrary character or string ++rendered in the various ways pgossible with the library. By default, ++it writes a log file named \fIt1lib.log\fR in the current directory. ++.PP ++If invoked with no arguments, it will attempt to read the global ++configuration file and font database. It will also accept any number ++of filenames on the command line, in which case these are treated as ++font files to be loaded instead of the default font database. ++.SH "OPTIONS" ++.TP ++.BR \-\-help ++Shows a brief help text ++.TP ++.BR \-\-Help ++Shows a description of all options ++.TP ++.BR \-\-noGrid ++Don't draw grid lines when displaying glyphs ++.TP ++.BR \-\-setPad ++Set bitmap padding ++.TP ++.BR \-\-logError ++Log errors only ++.TP ++.BR \-\-logWarning ++Log errors and warnings ++.TP ++.BR \-\-logStatistic ++Log errors, warnings, and statistics ++.TP ++.BR \-\-logDebug ++Log just about everything ++.TP ++.BR \-\-ignoreForceBold ++Don't make pseudo-boldface glyphs ++.TP ++.BR \-\-ignoreFamilyAlignment ++.TP ++.BR \-\-ignoreHinting ++Ignore hints when scaling glyphs ++.TP ++.BR \-\-debugLine ++Show debugging info for line-drawing ++operations in the rasterizer ++.TP ++.BR \-\-debugRegion ++Show debugging info for region operations in ++the rasterizer ++.TP ++.BR \-\-debugPath ++Show debugging info for path operations in the ++rasterizer ++.TP ++.BR \-\-debugFont ++.TP ++.BR \-\-debugHint ++Show debugging info for hinting in the rasterizer. ++.TP ++.BR \-\-checkPerformance ++Do some simple performance tests while rasterizing. ++.TP ++.BR \-\-checkCopyFont ++Check that copying fonts works. ++.TP ++.BR \-\-checkConcatGlyphs ++Check that concatenating glyphs works. ++.TP ++.BR \-\-checkBadCharHandling ++.TP ++.BR \-\-checkDefaultEncoding ++Set a default encoding vector. ++.SH "ENVIRONMENT" ++In the Debian GNU/Linux version of this program, the environment ++variable ++.B T1LIB_CONFIG, ++if set, points to an alternate configuration ++file with which to initialize the library. ++.SH "SEE ALSO" ++.BR FontDataBase (5), ++.BR t1libconfig (8). ++.PP ++.B xglyph ++is much more fully documented in the LaTeX documentation that ++accompanies the upstream ++.B t1lib ++distribution. This documentation is installed in PostScript and source ++formats with the t1lib-dev package in /usr/share/doc/t1lib-dev, and is ++also accessible through the dwww system. ++.SH AUTHOR ++This manual page was written by David Huggins-Daines ++, for the Debian GNU/Linux system (but may ++be used by others). +--- t1lib-5.1.2.orig/debian/man/type1afm.1 ++++ t1lib-5.1.2/debian/man/type1afm.1 +@@ -0,0 +1,34 @@ ++.TH TYPE1AFM 1 ++.SH NAME ++.B type1afm ++\- create a font metrics file from a Type 1 font file ++.SH SYNOPSIS ++.B type1afm ++[ ++.BR \-l ++] ++.B fontfile ++[ ++.B fontfile... ++] ++.SH DESCRIPTION ++This manual page was written for the Debian GNU/Linux distribution ++because the original program does not have a manual page. ++.PP ++.B type1afm ++reads in Type 1 font files specified on the command line, rasterizes ++them to 1000bp, and writes AFM (font metrics) files based on the ++observed metrics information. ++.PP ++The AFM file is created in the same directory as the font file, so be ++sure that you have write access there before running this program. ++.SH OPTIONS ++.TP ++.BR \-l ++Write a log file ++.SH SEE ALSO ++.BR getafm (1) ++.SH AUTHOR ++This manual page was David Huggins-Daines ++for the Debian GNU/Linux distribution (but may be used by others) ++ diff --git a/source/l/t1lib/t1lib_5.1.2-3.diff b/source/l/t1lib/t1lib_5.1.2-3.diff deleted file mode 100644 index 8ae0b3ad..00000000 --- a/source/l/t1lib/t1lib_5.1.2-3.diff +++ /dev/null @@ -1,1830 +0,0 @@ ---- t1lib-5.1.2.orig/debian/t1libconfig -+++ t1lib-5.1.2/debian/t1libconfig -@@ -0,0 +1,163 @@ -+#!/bin/sh -e -+ -+# to test POSIX-correctness, change hash-bang to /bin/bash and uncomment -+# the following line: -+ -+# set -o posix -+ -+# Very simple configuration script for t1lib. Checks a couple of -+# directories that might contain fonts, and if they exist, adds -+# anything ending in .pfa or pfb to the font database. A few things -+# borrowed from paperconfig, (C) 1996, Yves Arrouye -+# -+ -+# note that this creates the "minimal" font database accepted by t1lib, -+# and doesn't look in every possible place for fonts. It is mostly -+# provided so that xglyph will work out of the box... -+ -+# Written by David Huggins-Daines -+ -+usage() { -+ if [ "$1" = -h ] -+ then -+ exec 1>&2 -+ echo -n U -+ else -+ echo -n u -+ fi -+ -+ echo "sage: `basename $0` [ -v, --version ] [ -h, --help ] [ --force ]" -+ echo " [ fontdirs... ]" -+ -+ if [ "$1" = -h ] -+ then -+ cat <" -+ exit 0 -+ ;; -+ -h|--help) -+ usage -h -+ ;; -+ --force) -+ force=1 -+ ;; -+ *) -+ # hairy way to remove a trailing backslash (should use perl) -+ pat=`expr $1 : "\(.*\)\/\$" || echo $1` -+ # hairier way to find a string anywhere in another string -+ # should really use perl. -+ if ! grep $pat </dev/null 2>&1 -+$fontdirs -+EOF -+ then -+ fontdirs="$fontdirs $1" -+ fi -+ ;; -+ esac -+ shift -+done -+ -+# We presume that if the database exists, then so does the -+# configuration file. Hopefully this won't break anything. -+ -+if [ $force -eq 1 ] || [ ! -e $dbase ]; then -+ fontpath="" -+ afmpath="" -+ -+ mkdir -p $confdir || true -+ -+ echo -n "Searching for Type 1 fonts and AFM files..." -+ -+ for i in $fontdirs -+ do -+ if [ -d $i ] && ls $i/*.pf[ab] > /dev/null 2>&1; then -+ if [ -n "$fontpath" ]; then -+ fontpath="$fontpath:$i" -+ else -+ fontpath="$i" -+ fi -+ -+ if ls $i/*.afm > /dev/null 2>&1; then -+ if [ -n "$afmpath" ]; then -+ afmpath="$afmpath:$i" -+ else -+ afmpath="$i" -+ fi -+ fi -+ # get a listing of all the fonts in each dir -+ find $i -maxdepth 1 -name *.pf[ab] -printf '%f\n' >> $temp -+ fi -+ done -+ if [ -z "$fontpath" ]; then -+ cat < $dbase -+ cat $temp >> $dbase -+ rm -f $temp -+ echo "done." -+ fi -+ -+ # now set the paths in the config file -+ cat <$conffile -+t1lib.config - global configuration file for t1lib. -+It was created automatically on `date` -+by the t1libconfig script. -+ -+Run /usr/sbin/t1libconfig --force to rebuild it. -+ -+ENCODING=. -+AFM=$afmpath -+TYPE1=$fontpath -+FONTDATABASE=$dbase -+EOF -+else -+ echo "Configuration and font database files already exist." -+ echo "Run /usr/sbin/t1libconfig --force to rebuild them." -+fi -+ -+exit 0 ---- t1lib-5.1.2.orig/debian/t1lib-bin.postrm -+++ t1lib-5.1.2/debian/t1lib-bin.postrm -@@ -0,0 +1,8 @@ -+#!/bin/sh -+set -e -+ -+if [ "$1" = "purge" ]; then -+ rm -rf /etc/t1lib -+fi -+ -+#DEBHELPER# ---- t1lib-5.1.2.orig/debian/libt1-5.install -+++ t1lib-5.1.2/debian/libt1-5.install -@@ -0,0 +1 @@ -+debian/tmp/usr/lib/libt1*.so.* ---- t1lib-5.1.2.orig/debian/libt1-doc.docs -+++ t1lib-5.1.2/debian/libt1-doc.docs -@@ -0,0 +1 @@ -+doc/*.pdf ---- t1lib-5.1.2.orig/debian/libt1-dev.docs -+++ t1lib-5.1.2/debian/libt1-dev.docs -@@ -0,0 +1,2 @@ -+README.t1lib-* -+README.t1python ---- t1lib-5.1.2.orig/debian/t1lib-bin.dirs -+++ t1lib-5.1.2/debian/t1lib-bin.dirs -@@ -0,0 +1 @@ -+etc/t1lib ---- t1lib-5.1.2.orig/debian/t1lib-bin.manpages -+++ t1lib-5.1.2/debian/t1lib-bin.manpages -@@ -0,0 +1,4 @@ -+debian/man/FontDatabase.5 -+debian/man/t1libconfig.8 -+debian/man/type1afm.1 -+debian/man/xglyph.1 ---- t1lib-5.1.2.orig/debian/control -+++ t1lib-5.1.2/debian/control -@@ -0,0 +1,84 @@ -+Source: t1lib -+Section: libs -+Priority: optional -+Maintainer: Ruben Molina -+Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libice-dev, libsm-dev, libx11-dev, libxext-dev, libxaw7-dev, quilt -+Standards-Version: 3.8.0 -+Homepage: ftp://sunsite.unc.edu/pub/Linux/libs/graphics/ -+ -+Package: libt1-5 -+Section: libs -+Architecture: any -+Depends: ${shlibs:Depends}, ${misc:Depends} -+Description: Type 1 font rasterizer library - runtime -+ T1lib is an enhanced rasterizer for Type 1 fonts. -+ . -+ T1lib is based on the X11R5 font rasterizer code, but operates independently -+ of X11. It includes many enhancements, including underlining, antialiasing, -+ user-defined slant and extension factors, and rotation. -+ . -+ This package contains the shared libraries needed to run programs using T1lib. -+ -+Package: libt1-dev -+Section: libdevel -+Architecture: any -+Depends: libt1-5 (= ${binary:Version}), libice-dev, libsm-dev, libx11-dev, -+ libxext-dev, libxaw7-dev -+Recommends: libt1-doc -+Conflicts: t1lib-dev, t1lib1-dev -+Description: Type 1 font rasterizer library - development -+ T1lib is an enhanced rasterizer for Type 1 fonts. -+ . -+ T1lib is based on the X11R5 font rasterizer code, but operates independently -+ of X11. It includes many enhancements, including underlining, antialiasing, -+ user-defined slant and extension factors, and rotation. -+ . -+ This package contains the header files and static libraries needed to -+ develop programs using T1lib. -+ . -+ Please note, that PDF documentation is placed in libt1-doc -+ -+Package: t1lib-bin -+Architecture: any -+Section: misc -+Depends: ${shlibs:Depends} -+Provides: t1lib1-bin -+Replaces: t1lib1-bin -+Conflicts: t1lib1-bin -+Description: Type 1 font rasterizer library - user binaries -+ T1lib is an enhanced rasterizer for Type 1 fonts. -+ . -+ T1lib is based on the X11R5 font rasterizer code, but operates independently -+ of X11. It includes many enhancements, including underlining, antialiasing, -+ user-defined slant and extension factors, and rotation. -+ . -+ This package contains the programs "xglyph" and "type1afm", included in the -+ upstream T1lib distribution. It also contains the "t1libconfig" -+ script used to configure t1lib. -+ -+Package: libt1-doc -+Architecture: all -+Section: doc -+Description: Type 1 font rasterizer library - developers documentation -+ T1lib is an enhanced rasterizer for Type 1 fonts. -+ . -+ T1lib is based on the X11R5 font rasterizer code, but operates independently -+ of X11. It includes many enhancements, including underlining, antialiasing, -+ user-defined slant and extension factors, and rotation. -+ . -+ This package contains developers documentation. -+ -+Package: libt1-5-dbg -+Section: libdevel -+Priority: extra -+Architecture: any -+Depends: libt1-5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -+Description: Type 1 font rasterizer library - debugging runtime -+ T1lib is an enhanced rasterizer for Type 1 fonts. -+ . -+ T1lib is based on the X11R5 font rasterizer code, but operates independently -+ of X11. It includes many enhancements, including underlining, antialiasing, -+ user-defined slant and extension factors, and rotation. -+ . -+ This package contains debugging information. -+ ---- t1lib-5.1.2.orig/debian/NEWS -+++ t1lib-5.1.2/debian/NEWS -@@ -0,0 +1,9 @@ -+t1lib (5.0.0-3) unstable; urgency=low -+ -+ This version of t1lib package is binary incompatible with the previous -+ one in Debian. Details about changes are documented in following files -+ in /usr/share/doc/libt1-dev directory: -+ - changelog.gz -+ - README.t1lib-5.0.0.gz -+ -+ -- Artur R. Czechowski Sun, 18 Jan 2004 00:02:29 +0100 ---- t1lib-5.1.2.orig/debian/libt1-5.symbols -+++ t1lib-5.1.2/debian/libt1-5.symbols -@@ -0,0 +1,381 @@ -+libt1.so.5 libt1-5 #MINVER# -+ BezierTerminationTest@Base 5.1.0 -+ CRASTERCompressionType@Base 5.1.0 -+ CacheBLimit@Base 5.1.0 -+ CachedChars@Base 5.1.0 -+ CachedFonts@Base 5.1.0 -+ ConicDebug@Base 5.1.0 -+ Continuity@Base 5.1.0 -+ CurFontEnv@Base 5.1.0 -+ CurFontName@Base 5.1.0 -+ DLadd@Base 5.1.0 -+ DLdiv@Base 5.1.0 -+ DLmult@Base 5.1.0 -+ DLsub@Base 5.1.0 -+ DeviceSpecifics@Base 5.1.0 -+ FPXYboth@Base 5.1.0 -+ FPXonly@Base 5.1.0 -+ FPYonly@Base 5.1.0 -+ FPdiv@Base 5.1.0 -+ FPmult@Base 5.1.0 -+ FPstarslash@Base 5.1.0 -+ FXYConvert@Base 5.1.0 -+ FXYboth@Base 5.1.0 -+ FXonly@Base 5.1.0 -+ FYonly@Base 5.1.0 -+ FontBase@Base 5.1.0 -+ FontDebug@Base 5.1.0 -+ ForceAFMBBox@Base 5.1.0 -+ ForceFloat@Base 5.1.0 -+ FreeAFMData@Base 5.1.0 -+ GetType1CharString@Base 5.1.0 -+ HighHex@Base 5.1.0 -+ HintDebug@Base 5.1.0 -+ IXYConvert@Base 5.1.0 -+ IXYboth@Base 5.1.0 -+ IXonly@Base 5.1.0 -+ IYonly@Base 5.1.0 -+ ImageDebug@Base 5.1.0 -+ InDotSection@Base 5.1.0 -+ Init_BuiltInEncoding@Base 5.1.0 -+ InternalTrace@Base 5.1.0 -+ LineDebug@Base 5.1.0 -+ LineIOTrace@Base 5.1.0 -+ LowHex@Base 5.1.0 -+ MemoryDebug@Base 5.1.0 -+ MustCheckArgs@Base 5.1.0 -+ MustCrash@Base 5.1.0 -+ MustTraceCalls@Base 5.1.0 -+ OffPageDebug@Base 5.1.0 -+ PathDebug@Base 5.1.0 -+ ProcessHints@Base 5.1.0 -+ QueryFontLib@Base 5.1.0 -+ RegionDebug@Base 5.1.0 -+ SaveFontPaths@Base 5.1.0 -+ SearchDictName@Base 5.1.0 -+ SetFuncRequestID@Base 5.1.0 -+ SpaceDebug@Base 5.1.0 -+ StdEncArrayP@Base 5.1.0 -+ StrokeDebug@Base 5.1.0 -+ T1Close@Base 5.1.0 -+ T1GetDecrypt@Base 5.1.0 -+ T1GetFileSize@Base 5.1.0 -+ T1GetTrailer@Base 5.1.0 -+ T1Getc@Base 5.1.0 -+ T1Gets@Base 5.1.0 -+ T1Open@Base 5.1.0 -+ T1Read@Base 5.1.0 -+ T1Ungetc@Base 5.1.0 -+ T1_AAFillOutline@Base 5.1.0 -+ T1_AAGetBitsPerPixel@Base 5.1.0 -+ T1_AAGetGrayValues@Base 5.1.0 -+ T1_AAGetLevel@Base 5.1.0 -+ T1_AAHGetGrayValues@Base 5.1.0 -+ T1_AAHSetGrayValues@Base 5.1.0 -+ T1_AANGetGrayValues@Base 5.1.0 -+ T1_AANSetGrayValues@Base 5.1.0 -+ T1_AASetBitsPerPixel@Base 5.1.0 -+ T1_AASetChar@Base 5.1.0 -+ T1_AASetGrayValues@Base 5.1.0 -+ T1_AASetLevel@Base 5.1.0 -+ T1_AASetRect@Base 5.1.0 -+ T1_AASetSmartLimits@Base 5.1.0 -+ T1_AASetSmartMode@Base 5.1.0 -+ T1_AASetString@Base 5.1.0 -+ T1_AFM_ptr@Base 5.1.0 -+ T1_AbsolutePath@Base 5.1.0 -+ T1_AddFont@Base 5.1.0 -+ T1_AddFontDataBase@Base 5.1.0 -+ T1_AddFontDataBaseXLFD@Base 5.1.0 -+ T1_AddToFileSearchPath@Base 5.1.0 -+ T1_CheckEndian@Base 5.1.0 -+ T1_CheckForFontID@Base 5.1.0 -+ T1_CheckForInit@Base 5.1.0 -+ T1_ClearStrokeFlag@Base 5.1.0 -+ T1_CloseLib@Base 5.1.0 -+ T1_ConcatGlyphs@Base 5.1.0 -+ T1_ConcatOutlines@Base 5.1.0 -+ T1_CopyFont@Base 5.1.0 -+ T1_CopyGlyph@Base 5.1.0 -+ T1_CopyOutline@Base 5.1.0 -+ T1_DeleteAllSizes@Base 5.1.0 -+ T1_DeleteEncoding@Base 5.1.0 -+ T1_DeleteFont@Base 5.1.0 -+ T1_DeleteSize@Base 5.1.0 -+ T1_DumpGlyph@Base 5.1.0 -+ T1_DumpPath@Base 5.1.0 -+ T1_ENC_ptr@Base 5.1.0 -+ T1_ExtendFont@Base 5.1.0 -+ T1_ExtendHMatrix@Base 5.1.0 -+ T1_ExtendVMatrix@Base 5.1.0 -+ T1_FDBXLFD_ptr@Base 5.1.0 -+ T1_FDB_ptr@Base 5.1.0 -+ T1_FillOutline@Base 5.1.0 -+ T1_FreeCompCharData@Base 5.1.0 -+ T1_FreeGlyph@Base 5.1.0 -+ T1_FreeOutline@Base 5.1.0 -+ T1_GenerateAFMFallbackInfo@Base 5.1.0 -+ T1_GetAfmFileName@Base 5.1.0 -+ T1_GetAfmFilePath@Base 5.1.0 -+ T1_GetAllCharNames@Base 5.1.0 -+ T1_GetBitmapPad@Base 5.1.0 -+ T1_GetCharBBox@Base 5.1.0 -+ T1_GetCharName@Base 5.1.0 -+ T1_GetCharOutline@Base 5.1.0 -+ T1_GetCharString@Base 5.1.0 -+ T1_GetCharWidth@Base 5.1.0 -+ T1_GetCompCharData@Base 5.1.0 -+ T1_GetCompCharDataByIndex@Base 5.1.0 -+ T1_GetEncodingIndex@Base 5.1.0 -+ T1_GetEncodingIndices@Base 5.1.0 -+ T1_GetEncodingScheme@Base 5.1.0 -+ T1_GetExtend@Base 5.1.0 -+ T1_GetFamilyName@Base 5.1.0 -+ T1_GetFileSearchPath@Base 5.1.0 -+ T1_GetFontBBox@Base 5.1.0 -+ T1_GetFontFileName@Base 5.1.0 -+ T1_GetFontFilePath@Base 5.1.0 -+ T1_GetFontName@Base 5.1.0 -+ T1_GetFullName@Base 5.1.0 -+ T1_GetIsFixedPitch@Base 5.1.0 -+ T1_GetItalicAngle@Base 5.1.0 -+ T1_GetKerning@Base 5.1.0 -+ T1_GetLibIdent@Base 5.1.0 -+ T1_GetLinePosition@Base 5.1.0 -+ T1_GetLineThickness@Base 5.1.0 -+ T1_GetMetricsInfo@Base 5.1.0 -+ T1_GetMoveOutline@Base 5.1.0 -+ T1_GetNoCompositeChars@Base 5.1.0 -+ T1_GetNoFonts@Base 5.1.0 -+ T1_GetNoKernPairs@Base 5.1.0 -+ T1_GetNotice@Base 5.1.0 -+ T1_GetSlant@Base 5.1.0 -+ T1_GetStringBBox@Base 5.1.0 -+ T1_GetStringOutline@Base 5.1.0 -+ T1_GetStringWidth@Base 5.1.0 -+ T1_GetStrokeMode@Base 5.1.0 -+ T1_GetStrokeWidth@Base 5.1.0 -+ T1_GetTransform@Base 5.1.0 -+ T1_GetUnderlinePosition@Base 5.1.0 -+ T1_GetUnderlineThickness@Base 5.1.0 -+ T1_GetVersion@Base 5.1.0 -+ T1_GetWeight@Base 5.1.0 -+ T1_GetlenIV@Base 5.1.0 -+ T1_INFINITY@Base 5.1.0 -+ T1_InitLib@Base 5.1.0 -+ T1_IsInternalChar@Base 5.1.0 -+ T1_LoadEncoding@Base 5.1.0 -+ T1_LoadFont@Base 5.1.0 -+ T1_ManipulatePath@Base 5.1.0 -+ T1_MirrorHMatrix@Base 5.1.0 -+ T1_MirrorVMatrix@Base 5.1.0 -+ T1_PFAB_ptr@Base 5.1.0 -+ T1_PrintLog@Base 5.1.0 -+ T1_QueryCompositeChar@Base 5.1.0 -+ T1_QueryLigs@Base 5.1.0 -+ T1_QueryX11Support@Base 5.1.0 -+ T1_ReencodeFont@Base 5.1.0 -+ T1_RelativePath@Base 5.1.0 -+ T1_RotateMatrix@Base 5.1.0 -+ T1_ScaleOutline@Base 5.1.0 -+ T1_SetAfmFileName@Base 5.1.0 -+ T1_SetBitmapPad@Base 5.1.0 -+ T1_SetChar@Base 5.1.0 -+ T1_SetDefaultEncoding@Base 5.1.0 -+ T1_SetDeviceResolutions@Base 5.1.0 -+ T1_SetFileSearchPath@Base 5.1.0 -+ T1_SetFontDataBase@Base 5.1.0 -+ T1_SetFontDataBaseXLFD@Base 5.1.0 -+ T1_SetLinePosition@Base 5.1.0 -+ T1_SetLineThickness@Base 5.1.0 -+ T1_SetLogLevel@Base 5.1.0 -+ T1_SetRasterFlags@Base 5.1.0 -+ T1_SetRect@Base 5.1.0 -+ T1_SetString@Base 5.1.0 -+ T1_SetStrokeFlag@Base 5.1.0 -+ T1_SetStrokeWidth@Base 5.1.0 -+ T1_ShearHMatrix@Base 5.1.0 -+ T1_ShearVMatrix@Base 5.1.0 -+ T1_SlantFont@Base 5.1.0 -+ T1_StrError@Base 5.1.0 -+ T1_StrokeFont@Base 5.1.0 -+ T1_SubsetFont@Base 5.1.0 -+ T1_TransformFont@Base 5.1.0 -+ T1_TransformMatrix@Base 5.1.0 -+ T1_Type1OperatorFlags@Base 5.1.0 -+ T1_Up@Base 5.1.0 -+ T1_WriteAFMFallbackFile@Base 5.1.0 -+ T1_errno@Base 5.1.0 -+ T1_fdb@Base 5.1.0 -+ T1_fdbxlfd@Base 5.1.0 -+ T1aa_SmartOn@Base 5.1.0 -+ T1aa_bg@Base 5.1.0 -+ T1aa_bpp@Base 5.1.0 -+ T1aa_smartlimit1@Base 5.1.0 -+ T1aa_smartlimit2@Base 5.1.0 -+ T1eexec@Base 5.1.0 -+ T1int_CreateNewFontSize@Base 5.1.0 -+ T1int_GetLastFontSize@Base 5.1.0 -+ T1int_QueryFontSize@Base 5.1.0 -+ T1int_QuerySEAC@Base 5.1.0 -+ T1int_Type1QuerySEAC@Base 5.1.0 -+ T1io_reset@Base 5.1.0 -+ T1lib_parseFile@Base 5.1.0 -+ TheCurrentFont@Base 5.1.0 -+ Type1Char@Base 5.1.0 -+ Type1Line@Base 5.1.0 -+ currstartstem@Base 5.1.0 -+ digit_value@Base 5.1.0 -+ err_warn_msg_buf@Base 5.1.0 -+ errornumber@Base 5.1.0 -+ filestats@Base 5.1.0 -+ fill@Base 5.1.0 -+ fillrun@Base 5.1.0 -+ fontfcnA@Base 5.1.0 -+ fontfcnB@Base 5.1.0 -+ fontfcnB_ByName@Base 5.1.0 -+ fontfcnB_string@Base 5.1.0 -+ fontfcnRect@Base 5.1.0 -+ initFont@Base 5.1.0 -+ intT1_Env_GetCompletePath@Base 5.1.0 -+ intT1_FreeSearchPaths@Base 5.1.0 -+ intT1_ScanConfigFile@Base 5.1.0 -+ intT1_SetupDefaultSearchPaths@Base 5.1.0 -+ intT1_scanFontDBase@Base 5.1.0 -+ intT1_scanFontDBaseXLFD@Base 5.1.0 -+ linebuf@Base 5.1.0 -+ not_def@Base 5.1.0 -+ numalignmentzones@Base 5.1.0 -+ numstems@Base 5.1.0 -+ objFormatArray@Base 5.1.0 -+ objFormatBoolean@Base 5.1.0 -+ objFormatEncoding@Base 5.1.0 -+ objFormatFile@Base 5.1.0 -+ objFormatInteger@Base 5.1.0 -+ objFormatName@Base 5.1.0 -+ objFormatReal@Base 5.1.0 -+ objFormatString@Base 5.1.0 -+ oldhor@Base 5.1.0 -+ oldhorhalf@Base 5.1.0 -+ oldvert@Base 5.1.0 -+ oldverthalf@Base 5.1.0 -+ pFontBase@Base 5.1.0 -+ readFont@Base 5.1.0 -+ reportusage@Base 5.1.0 -+ resetFont@Base 5.1.0 -+ scan_font@Base 5.1.0 -+ scan_token@Base 5.1.0 -+ stck_state@Base 5.1.0 -+ stems@Base 5.1.0 -+ swathrightmost@Base 5.1.0 -+ swathxsort@Base 5.1.0 -+ t1_Allocate@Base 5.1.0 -+ t1_ApplyContinuity@Base 5.1.0 -+ t1_ArgErr@Base 5.1.0 -+ t1_Bezier@Base 5.1.0 -+ t1_BoundingBox@Base 5.1.0 -+ t1_BoxClip@Base 5.1.0 -+ t1_BoxPath@Base 5.1.0 -+ t1_Bresenham@Base 5.1.0 -+ t1_ChangeDirection@Base 5.1.0 -+ t1_CloseHints@Base 5.1.0 -+ t1_ClosePath@Base 5.1.0 -+ t1_Consume@Base 5.1.0 -+ t1_Copy@Base 5.1.0 -+ t1_CopyPath@Base 5.1.0 -+ t1_CopyRegion@Base 5.1.0 -+ t1_CopySpace@Base 5.1.0 -+ t1_Destroy@Base 5.1.0 -+ t1_DropSegment@Base 5.1.0 -+ t1_DumpArea@Base 5.1.0 -+ t1_DumpEdges@Base 5.1.0 -+ t1_DumpSpace@Base 5.1.0 -+ t1_DumpText@Base 5.1.0 -+ t1_Dup@Base 5.1.0 -+ t1_EmptyRegion@Base 5.1.0 -+ t1_ErrorMsg@Base 5.1.0 -+ t1_FormatFP@Base 5.1.0 -+ t1_Free@Base 5.1.0 -+ t1_HeadSegment@Base 5.1.0 -+ t1_Hint@Base 5.1.0 -+ t1_ILoc@Base 5.1.0 -+ t1_Identity@Base 5.1.0 -+ t1_InitHints@Base 5.1.0 -+ t1_InitImager@Base 5.1.0 -+ t1_InitSpaces@Base 5.1.0 -+ t1_Interior@Base 5.1.0 -+ t1_Join@Base 5.1.0 -+ t1_JoinSegment@Base 5.1.0 -+ t1_KillPath@Base 5.1.0 -+ t1_KillRegion@Base 5.1.0 -+ t1_Line@Base 5.1.0 -+ t1_Loc@Base 5.1.0 -+ t1_MInvert@Base 5.1.0 -+ t1_MMultiply@Base 5.1.0 -+ t1_MoreWorkArea@Base 5.1.0 -+ t1_MoveEdges@Base 5.1.0 -+ t1_PathDelta@Base 5.1.0 -+ t1_PathSegment@Base 5.1.0 -+ t1_PathXform@Base 5.1.0 -+ t1_Permanent@Base 5.1.0 -+ t1_Phantom@Base 5.1.0 -+ t1_Pragmatics@Base 5.1.0 -+ t1_ProcessHint@Base 5.1.0 -+ t1_PseudoSpace@Base 5.1.0 -+ t1_QueryBounds@Base 5.1.0 -+ t1_QueryLoc@Base 5.1.0 -+ t1_QueryPath@Base 5.1.0 -+ t1_QuerySpace@Base 5.1.0 -+ t1_RegionBounds@Base 5.1.0 -+ t1_Reverse@Base 5.1.0 -+ t1_ReverseSubPaths@Base 5.1.0 -+ t1_Scale@Base 5.1.0 -+ t1_Snap@Base 5.1.0 -+ t1_SortSwath@Base 5.1.0 -+ t1_StepBezier@Base 5.1.0 -+ t1_StepLine@Base 5.1.0 -+ t1_SubLoc@Base 5.1.0 -+ t1_SwathUnion@Base 5.1.0 -+ t1_TermImager@Base 5.1.0 -+ t1_Transform@Base 5.1.0 -+ t1_TypeErr@Base 5.1.0 -+ t1_UnConvert@Base 5.1.0 -+ t1_UnJumble@Base 5.1.0 -+ t1_Unique@Base 5.1.0 -+ t1_User@Base 5.1.0 -+ t1_Xform@Base 5.1.0 -+ t1_abort@Base 5.1.0 -+ t1_get_abort_message@Base 5.1.0 -+ t1lib_log_file@Base 5.1.0 -+ t1lib_log_level@Base 5.1.0 -+ tokenLength@Base 5.1.0 -+ tokenMaxP@Base 5.1.0 -+ tokenStartP@Base 5.1.0 -+ tokenTooLong@Base 5.1.0 -+ tokenType@Base 5.1.0 -+ tokenValue@Base 5.1.0 -+ vm_alloc@Base 5.1.0 -+ vm_base@Base 5.1.0 -+ vm_free@Base 5.1.0 -+ vm_init@Base 5.1.0 -+ vm_init_amount@Base 5.1.0 -+ vm_init_count@Base 5.1.0 -+ vm_next@Base 5.1.0 -+ vm_size@Base 5.1.0 -+ vm_used@Base 5.1.0 -+ wsoffsetX@Base 5.1.0 -+ wsoffsetY@Base 5.1.0 -+ wsset@Base 5.1.0 -+ xiStub@Base 5.1.0 -+ xiTemporary@Base 5.1.0 -+libt1x.so.5 libt1-5 #MINVER# -+ T1_AASetCharX@Base 5.1.1 -+ T1_AASetRectX@Base 5.1.1 -+ T1_AASetStringX@Base 5.1.1 -+ T1_ComputeAAColorsX@Base 5.1.1 -+ T1_LogicalPositionX@Base 5.1.1 -+ T1_SetCharX@Base 5.1.1 -+ T1_SetRectX@Base 5.1.1 -+ T1_SetStringX@Base 5.1.1 -+ T1_SetX11Params@Base 5.1.1 -+ T1_XImageFromGlyph@Base 5.1.1 ---- t1lib-5.1.2.orig/debian/rules -+++ t1lib-5.1.2/debian/rules -@@ -0,0 +1,22 @@ -+#!/usr/bin/make -f -+ -+include /usr/share/cdbs/1/rules/debhelper.mk -+include /usr/share/cdbs/1/class/autotools.mk -+include /usr/share/cdbs/1/rules/patchsys-quilt.mk -+ -+export LDFLAGS := -Wl,--as-needed -+ -+DEB_MAKE_BUILD_TARGET := without_doc -+DEB_MAKE_INSTALL_TARGET := install prefix=$(CURDIR)/debian/tmp/usr -+DEB_INSTALL_DOCS_ALL += debian/README.Debian -+ -+binary-post-install/libt1-5 :: -+ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ -+binary-post-install/libt1-5-dbg :: -+ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ -+binary-post-install/libt1-dev :: -+ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ -+binary-post-install/libt1-doc :: -+ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ -+binary-post-install/t1lib-bin :: -+ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ ---- t1lib-5.1.2.orig/debian/compat -+++ t1lib-5.1.2/debian/compat -@@ -0,0 +1 @@ -+7 ---- t1lib-5.1.2.orig/debian/t1lib-bin.postinst -+++ t1lib-5.1.2/debian/t1lib-bin.postinst -@@ -0,0 +1,8 @@ -+#!/bin/sh -+set -e -+ -+if [ ! -f /etc/t1lib/t1lib.config ]; then -+ /usr/sbin/t1libconfig -+fi -+ -+#DEBHELPER# ---- t1lib-5.1.2.orig/debian/libt1-dev.install -+++ t1lib-5.1.2/debian/libt1-dev.install -@@ -0,0 +1,4 @@ -+debian/tmp/usr/include/* -+debian/tmp/usr/lib/*.so -+debian/tmp/usr/lib/*.la -+debian/tmp/usr/lib/*.a ---- t1lib-5.1.2.orig/debian/changelog -+++ t1lib-5.1.2/debian/changelog -@@ -0,0 +1,414 @@ -+t1lib (5.1.2-3) unstable; urgency=low -+ -+ * New Maintainer (Closes: #430611) -+ * Solved some hyphen-used-as-minus-sign in FontDatabase.5 -+ * Reformated debian/copyrigth -+ * Added symbols control file -+ -+ -- Ruben Molina Wed, 23 Jul 2008 20:24:22 -0500 -+ -+t1lib (5.1.2-2) unstable; urgency=low -+ -+ * Add a package with debugging information. -+ -+ -- Torsten Werner Sat, 08 Mar 2008 10:21:43 +0100 -+ -+t1lib (5.1.2-1) unstable; urgency=low -+ -+ * new upstream release -+ * Correct debian/watch. -+ * Remove patch cve-2007-4033.diff because it has been integrated upstream. -+ * Remove parts of patch segfault.diff that have been integrated upstream. -+ * Do not apply the remaining segfault.diff because it does not look safe but -+ keep the patch as a reminder that something was broken in the past. -+ -+ -- Torsten Werner Sat, 08 Mar 2008 10:07:54 +0100 -+ -+t1lib (5.1.1-5) unstable; urgency=low -+ -+ * Replace Build-Depends-Indep by Build-Depends again. -+ -+ -- Torsten Werner Tue, 08 Jan 2008 21:34:25 +0100 -+ -+t1lib (5.1.1-4) unstable; urgency=low -+ -+ * Add Build-Depends-Indep: libxt-dev. (Closes: #459754) -+ -+ -- Torsten Werner Tue, 08 Jan 2008 20:29:01 +0100 -+ -+t1lib (5.1.1-3) unstable; urgency=low -+ -+ * Replace static changes of upstream files by quilt patches as requested by -+ Fedora developers. -+ * Remove postinst that removed the old /usr/doc symlink. -+ * Remove preinst that removed the old /usr/share/doc/t1lib-bin symlink. -+ * Rename menu.t1lib-bin to t1lib-bin.menu to make sure the menu file gets -+ installed. -+ * Update menu file to conform to current menu policy. -+ * Install documentation with dh_installdocs instead of dh_install and some -+ other minor cleanups. -+ * Switch to cdbs. -+ * Fix versioned Build-Depends: debhelper (>= 5). -+ * Move some Build-Depends to Build-Depends-Indep. -+ * Apply two patches provided by Patrice Dumas: -+ - Update t1libconfig's font search. -+ - Fixes a segfault. -+ * Integrate another patch that fixes a segfault. (Closes: #313236) -+ -+ -- Torsten Werner Sun, 06 Jan 2008 20:50:19 +0100 -+ -+t1lib (5.1.1-2) unstable; urgency=low -+ -+ * Add Depends: libxaw7-dev to -dev package. -+ * Switch to DH_COMPAT = 5. -+ * Update Vcs headers in debian/control. -+ * Change Standards-Version: 3.7.3. -+ * Do not link with unneeded libraries. -+ * Add LDFLAGS=-Wl,--as-needed. -+ -+ -- Torsten Werner Fri, 21 Dec 2007 22:54:43 +0100 -+ -+t1lib (5.1.1-1) unstable; urgency=low -+ -+ * new upstream version (Closes: #418664) -+ * Add XS-Vcs-* header to debian/control. -+ * Update Standards-Version to 3.7.2 (no changes). -+ * Remove Depends: libc6-dev. (Closes: #446375). -+ * Change Maintainer to myself. -+ * Replace ${Source-Version} by ${binary:Version}. -+ * Do not ignore errors of 'make distclean'. -+ -+ -- Torsten Werner Sat, 13 Oct 2007 14:46:23 +0200 -+ -+t1lib (5.1.0-3) unstable; urgency=low -+ -+ * Apply patch from Artur R. Czechowski to fix CVE-2007-4033. -+ (Closes: #439927) -+ -+ -- Torsten Werner Mon, 17 Sep 2007 23:25:45 +0200 -+ -+t1lib (5.1.0-2) unstable; urgency=low -+ -+ * Upload to unstable -+ * Bump-up Standards-Version to 3.6.2 (no changes required) -+ * Torsten Werner is sponsoring the package -+ -+ -- Artur R. Czechowski Sat, 6 Aug 2005 20:11:51 +0200 -+ -+t1lib (5.1.0-1) experimental; urgency=low -+ -+ * New upstream release -+ * README.t1lib-5.0.2 replaced with README.t1lib-5.1.0 -+ * README.win32 is no longer installed -+ * Removed misleading information from README.Debian -+ * Replace -V with -V 'libt1-5 (>= 5.0.2)' for dh_makeshlibs in debian/rules -+ * Remove some commented stuff from debian/rules -+ * Torsten Werner is sponsoring the package -+ -+ -- Artur R. Czechowski Sat, 4 Jun 2005 22:12:43 +0200 -+ -+t1lib (5.0.2-3) unstable; urgency=low -+ -+ * Update libtool (Closes: #246753) -+ * Build-Depends on individual library instead dummy xlibs-dev -+ * Added dependencies to -dev package (Closes: #249973) -+ * Thanks to Christopher L Cheney for above patches -+ * Add -V to dh_makeshlibs to make a versioned dependencies on this library -+ * Torsten Werner is sponsoring the package -+ -+ -- Artur R. Czechowski Sun, 23 May 2004 01:02:02 +0200 -+ -+t1lib (5.0.2-2) unstable; urgency=low -+ -+ * change distribution to unstable -+ * Torsten Werner is sponsoring the package -+ -+ -- Artur R. Czechowski Sun, 18 Apr 2004 13:07:23 +0200 -+ -+t1lib (5.0.2-1) experimental; urgency=low -+ -+ * New upstream release (Closes: #243916) -+ - fixed some crashes (Closes: #242570, #243378) -+ * Reference to README.t1lib-5.0.2 instead -5.0.0 in some debian/ files -+ * Torsten Werner is sponsoring the package -+ -+ -- Artur R. Czechowski Sat, 17 Apr 2004 19:22:09 +0200 -+ -+t1lib (5.0.0-5) unstable; urgency=low -+ -+ * debian/rules: documentation is build from binary-indep (Closes: #230386) -+ * debian/watch has been added -+ * Torsten Werner is sponsoring the package -+ -+ -- Artur R. Czechowski Sat, 21 Feb 2004 20:19:38 +0100 -+ -+t1lib (5.0.0-4) unstable; urgency=low -+ -+ * Added missing files in NEWS.Debian -+ -+ -- Artur R. Czechowski Wed, 21 Jan 2004 00:27:24 +0100 -+ -+t1lib (5.0.0-3) unstable; urgency=low -+ -+ * New release uploaded to unstable (finaly closes: #185097, #216501) -+ * Unleash it to allow to migrate to testing (Closes: #221198) -+ * libt1-dev and t1lib-dev conflict with each other, -+ * libt1-dev conflicts with t1lib1-dev to smooth upgrade from t1lib 1.3.1-6 -+ * t1lib-bin provides/conflicts/replaces t1lib1-bin to smooth upgrade from -+ t1lib 1.3.1-6 -+ * Some README.* files in libt1-dev -+ * Applied patch which fixes memory access bug (see #224314 for details) -+ * Torsten Werner is sponsoring the package -+ -+ -- Artur R. Czechowski Sun, 18 Jan 2004 03:00:05 +0100 -+ -+t1lib (5.0.0-2) experimental; urgency=low -+ -+ * rename source package to t1lib -+ * rename binary packages: -+ + libt1-5 -> libt1-dev -+ + t1lib5-bin -> t1lib-bin -+ + libt1-5-doc -> libt1-doc -+ * rationale for all above: -+ http://lists.debian.org/debian-devel/2003/debian-devel-200311/msg01083.html -+ and rest of this thread -+ * linking libt1x with X libraries to avoid undefined symbols (see #220111) -+ * clearing independency of X11 in README.Debian -+ * removed all tracks of t1lib0 (Conflict, Replaces, etc) -+ * Torsten Werner is sponsoring the package -+ -+ -- Artur R. Czechowski Wed, 24 Dec 2003 01:50:37 +0100 -+ -+t1lib5 (5.0.0-1) experimental; urgency=low -+ -+ * New upstream release (Closes: #185097, #216501) -+ * This release is binary incompatible with the previous one. -+ * t1lib-bin and t1lib-dev are virtual packages now -+ * removed weird ``dbl'' from configure - typo in upstream configure.in -+ * there is no necessity to conflict current -doc with the other ones -+ * library, devel and documentation package is libt1-5{,-dev,-doc} to be -+ consistent with Debian Policy 8.1 -+ * do not anymore copy config.{sub,guess} automagically -+ * update ac-tools/config.{sub,guess} to 20031007 -+ * Torsten Werner is sponsoring the package -+ -+ -- Artur R. Czechowski Sun, 9 Nov 2003 15:16:51 +0100 -+ -+t1lib (1.3.1-4) unstable; urgency=low -+ -+ * New Maintainer, Adopted Package (Closes: #189694) -+ * Prepare for migration to t1lib 5.x: -+ - all packages renamed to t1lib1{,-foo} -+ - empty packages t1lib-bin and t1lib-dev depending on t1lib1-bin -+ and t1lib1-dev -+ * Packaging from scratch using debhelper, Standards-Version is 3.6.1.0 now -+ * Remove non-existent xlib6g-dev from Build-Depends -+ * Updated README.Debian -+ * Remove symlinks from /usr/doc/t1lib* -+ * Only t1lib1-bin contains /etc/t1lib directory -+ * t1lib-dev has been split into two packages: t1lib1-dev and t1lib1-doc -+ * t1lib1-bin: change manual section for type1afm from 8 to 1 -+ * t1lib1-bin: create files in /etc/t1lib if don't exist (Closes: #58275) -+ * t1lib1-bin: remove symlink /usr/share/doc/t1lib-bin -> t1lib1 if exists -+ * Torsten Werner is sponsoring the package -+ -+ -- Artur R. Czechowski Sun, 2 Nov 2003 03:47:51 +0100 -+ -+t1lib (1.3.1-3) unstable; urgency=low -+ -+ * Change t1lib-dev's section from "devel" to "libdevel" (thanks, Katie!) -+ -+ -- Adam Conrad Mon, 18 Aug 2003 22:42:17 -0600 -+ -+t1lib (1.3.1-2) unstable; urgency=low -+ -+ * Set maintainer to QA, as this package was orphaned months ago (see #189694) -+ * Change "make" to "make without_doc" and remove build-dep on -+ tetex-bin (closes: #192291, #192290) -+ * Change libxaw-dev build-dep to libxaw7-dev, so we are asking for a real -+ package, rather than a virtual (closes: #170012) -+ * lib/Makefile.in changes (closes: #193757) -+ - add "-lm" to libt1.la target -+ - add "-L@top_srcdir@/lib/.libs/ -lt1" to libt1x.la target -+ -+ -- Adam Conrad Mon, 18 Aug 2003 21:50:22 -0600 -+ -+t1lib (1.3.1-1) unstable; urgency=low -+ -+ * New upstream version. (Closes: #127619,#127618) -+ -+ -- David Huggins-Daines Thu, 3 Jan 2002 21:53:29 -0500 -+ -+t1lib (1.2-1) unstable; urgency=low -+ -+ * New upstream version. -+ -+ -- David Huggins-Daines Wed, 22 Aug 2001 21:16:36 -0400 -+ -+t1lib (1.1.1-2.2) unstable; urgency=low -+ -+ * NMU -+ * debian/rules: if LD_LIBRARY_PATH is already set, append to it, so -+ builds under fakeroot will work (Closes: #104046) -+ -+ -- Branden Robinson Fri, 10 Aug 2001 04:57:50 -0500 -+ -+t1lib (1.1.1-2.1) unstable; urgency=low -+ -+ * NMU, with updated config.{guess,sub} for newer architectures -+ -+ -- Randolph Chung Sat, 7 Jul 2001 01:01:51 -0600 -+ -+t1lib (1.1.1-2) unstable; urgency=high -+ -+ * Yow! Major upstream weirdness. Do *not* try to print the documentation -+ when building... Closes: #94660 -+ -+ -- David Huggins-Daines Fri, 20 Apr 2001 20:35:49 -0400 -+ -+t1lib (1.1.1-1) unstable; urgency=low -+ -+ * New upstream version. Closes: #94627 (why did I never get this bug -+ report in the first place?) -+ -+ -- David Huggins-Daines Fri, 20 Apr 2001 11:16:15 -0400 -+ -+t1lib (1.0.1-2) unstable; urgency=low -+ -+ * Recompile with new XFree86 libraries and glibc. -+ -+ -- David Huggins-Daines Wed, 24 Jan 2001 22:33:43 -0500 -+ -+t1lib (1.0.1-1) unstable; urgency=low -+ -+ * New upstream version. Closes: #69689 -+ -+ -- David Huggins-Daines Thu, 9 Nov 2000 00:29:06 -0500 -+ -+t1lib (1.0-2) frozen unstable; urgency=low -+ -+ * Use dpkg-architecture to supply a target architecture name to -+ configure, should fix the compile problems on Alpha and ARM for good. -+ (closes:#57839) -+ -+ -- David Huggins-Daines Wed, 1 Mar 2000 21:22:49 -0500 -+ -+t1lib (1.0-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Twiddled package names to make more sense. -+ * Move back to priority optional to satisfy dependencies of xpdf and -+ php3. -+ * Moved .la files to t1lib-dev. Added versioned Replaces: field in the -+ control file to cope with potato-to-potato upgrades (the t1lib0 -+ packages in slink were not buggy in this way) -+ * t1libconfig and associated manual pages (FontDataBase.5, -+ t1libconfig.8) are now in the t1lib-bin package, for much the same -+ reason. Unfortunately this Replaces: field cannot be versioned. -+ * The t1lib packages no longer manage the contents of /etc/t1lib/. In -+ the near future, t1lib1 may have a debconf interface for doing so. -+ The t1lib.config and FontDataBase were never used by any programs that -+ linked with t1lib anyway, thankfully. -+ -+ -- David Huggins-Daines Sun, 2 Jan 2000 03:02:30 -0500 -+ -+t1lib0 (0.9.2-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Being more intelligent in t1libconfig to avoid postinst-lossage. -+ Fixes: #44095 -+ * Updated for FHS compliance. -+ -+ -- David Huggins-Daines Fri, 8 Oct 1999 15:27:46 -0400 -+ -+t1lib0 (0.9.1-4) unstable; urgency=medium -+ -+ * Updated the shlibs file since it appears that programs compiled -+ against 0.9.1 won't work with 0.9 (though the other way around does -+ work). Fixes: #43215, #43231 -+ * Removed ARCH bogosity and updated config.sub and config.guess -+ (upstream maintainer will be notified) -+ -+ -- David Huggins-Daines Sat, 21 Aug 1999 01:23:39 -0400 -+ -+t1lib0 (0.9.1-3) unstable; urgency=low -+ -+ * Conditionalize that ARCH thing, or the Hurd people will kill me. -+ -+ -- David Huggins-Daines Sat, 3 Jul 1999 13:56:12 -0400 -+ -+t1lib0 (0.9.1-2) unstable; urgency=low -+ -+ * Oops. T1lib installs a dummy config file. We remove this before -+ building the package (because we generate our own). Also, the preinst -+ has to compensate for the past brokenness by saving it before an -+ upgrade. -+ -+ -- David Huggins-Daines Fri, 2 Jul 1999 16:13:46 -0400 -+ -+t1lib0 (0.9.1-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Moved back to extra, because that's the way the winds are blowing. -+ * Added ARCH variable to debian/rules to work around strange -+ architecture detection on Alpha. -+ -+ -- David Huggins-Daines Fri, 2 Jul 1999 14:58:32 -0400 -+ -+t1lib0 (0.9-1) unstable; urgency=low -+ -+ * New upstream version -+ -+ -- David Huggins-Daines Thu, 10 Jun 1999 23:00:12 -0400 -+ -+t1lib0 (0.8.1-1) unstable; urgency=low -+ -+ * New upstream version. (fixes bug #31549) -+ * Upstream move to libtool has made debian/rules a lot less contorted, -+ and slimmed up the diff considerably. Thanks! -+ * I'm now uploading m68k versions as well. -+ * Fixed "confdif" typo in t1libconfig (oops!) -+ * This release breaks binary and source compatibility. Bumping the -+ soname seems a bit extreme, since there is only one Debian package -+ (gglyph) which depends on this, and I'm simultaneously uploading a -+ fixed version. -+ -+ -- David Huggins-Daines Wed, 24 Feb 1999 17:16:41 -0500 -+ -+t1lib0 (0.7.1-5) unstable; urgency=low -+ -+ * Changed debian/rules to remove debian/files on clean. (fixes bug #26907) -+ * Changed t1libconfig to allow installation Fri, 16 Oct 1998 20:12:02 -0400 -+ -+t1lib0 (0.7.1-4) unstable; urgency=low -+ -+ * Changed debian/rules not to use debhelper, to fix PowerPC and Alpha compile -+ problems and (hopefully) make the purists happy :) -+ * Upgraded priority to Optional, since it doesn't conflict with or break -+ anything, and is relatively stable. -+ -+ -- David Huggins-Daines Fri, 18 Sep 1998 18:36:07 -0400 -+ -+t1lib0 (0.7.1-3) unstable; urgency=low -+ -+ * Changed "read" to "read foo" in t1libconfig to make it more sh-friendly. -+ * Minor change to debian/rules (fixes bug #25501) -+ -+ -- David Huggins-Daines Fri, 7 Aug 1998 13:31:28 -0400 -+ -+t1lib0 (0.7.1-2) unstable; urgency=low -+ -+ * Patched lib/t1lib/t1finfo.c to fix segfault problems with some fonts. -+ * Fixed the URLs and info in copyright and README.Debian. -+ -+ -- David Huggins-Daines Tue, 21 Jul 1998 16:01:03 -0400 -+ -+t1lib0 (0.7.1-1) unstable; urgency=low -+ -+ * Initial release. -+ -+ -- David Huggins-Daines Thu, 16 Jul 1998 22:07:08 -0400 -+ -+ ---- t1lib-5.1.2.orig/debian/copyright -+++ t1lib-5.1.2/debian/copyright -@@ -0,0 +1,94 @@ -+This package was debianized by David Huggins-Daines on -+Fri, 19 Jun 1998 20:01:01 -0400. It has been also maintained by Artur -+R. Czechowski and Torsten Werner . -+ -+It was downloaded from ftp://sunsite.unc.edu/pub/Linux/libs/graphics/ -+ -+Upstream Author: -+ -+ Rainer Menzner -+ -+Copyright: -+ -+ Copyright (C) 1996-2003 Rainer Menzner -+ -+License: -+ -+ This package is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This package 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 -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this package; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ -+On Debian systems, the complete text of the GNU Lesser General -+Public License can be found in `/usr/share/common-licenses/LGPL'. -+ -+The Debian packaging is (C) 2008, Ruben Molina and -+is licensed under the GPL, see `/usr/share/common-licenses/GPL'. -+ -+Please note that there are parts of t1lib that are subject to other licenses: -+- The parseAFM-package is copyrighted by Adobe Systems Inc. -+- The type1 rasterizer is copyrighted by IBM and the X11-consortium. -+ -+(from lib/t1lib/parseAFM.c) -+/* -+ * (C) 1988, 1989, 1990 by Adobe Systems Incorporated. All rights reserved. -+ * -+ * This file may be freely copied and redistributed as long as: -+ * 1) This entire notice continues to be included in the file, -+ * 2) If the file has been modified in any way, a notice of such -+ * modification is conspicuously indicated. -+ * -+ * PostScript, Display PostScript, and Adobe are registered trademarks of -+ * Adobe Systems Incorporated. -+ * -+ * ************************************************************************ -+ * THE INFORMATION BELOW IS FURNISHED AS IS, IS SUBJECT TO CHANGE WITHOUT -+ * NOTICE, AND SHOULD NOT BE CONSTRUED AS A COMMITMENT BY ADOBE SYSTEMS -+ * INCORPORATED. ADOBE SYSTEMS INCORPORATED ASSUMES NO RESPONSIBILITY OR -+ * LIABILITY FOR ANY ERRORS OR INACCURACIES, MAKES NO WARRANTY OF ANY -+ * KIND (EXPRESS, IMPLIED OR STATUTORY) WITH RESPECT TO THIS INFORMATION, -+ * AND EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR PARTICULAR PURPOSES AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. -+ * ************************************************************************ -+ */ -+ -+(from lib/type1/type1.c) -+/* $XConsortium: type1.c,v 1.5 91/10/10 11:20:06 rws Exp $ */ -+/* Copyright International Business Machines, Corp. 1991 -+ * All Rights Reserved -+ * Copyright Lexmark International, Inc. 1991 -+ * All Rights Reserved -+ * Portions Copyright (c) 1990 Adobe Systems Incorporated. -+ * All Rights Reserved -+ * -+ * License to use, copy, modify, and distribute this software and its -+ * documentation for any purpose and without fee is hereby granted, -+ * 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 IBM or Lexmark or Adobe -+ * not be used in advertising or publicity pertaining to distribution of -+ * the software without specific, written prior permission. -+ * -+ * IBM, LEXMARK, AND ADOBE PROVIDE THIS SOFTWARE "AS IS", WITHOUT ANY -+ * WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT -+ * LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -+ * PARTICULAR PURPOSE, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. THE -+ * ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE, INCLUDING -+ * ANY DUTY TO SUPPORT OR MAINTAIN, BELONGS TO THE LICENSEE. SHOULD ANY -+ * PORTION OF THE SOFTWARE PROVE DEFECTIVE, THE LICENSEE (NOT IBM, -+ * LEXMARK, OR ADOBE) ASSUMES THE ENTIRE COST OF ALL SERVICING, REPAIR AND -+ * CORRECTION. IN NO EVENT SHALL IBM, LEXMARK, OR ADOBE BE LIABLE FOR ANY -+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER -+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF -+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ ---- t1lib-5.1.2.orig/debian/t1lib-bin.menu -+++ t1lib-5.1.2/debian/t1lib-bin.menu -@@ -0,0 +1,2 @@ -+?package(t1lib-bin): needs="X11" section="Applications/Viewers" \ -+ title="XGlyph" command="/usr/bin/xglyph" ---- t1lib-5.1.2.orig/debian/watch -+++ t1lib-5.1.2/debian/watch -@@ -0,0 +1,3 @@ -+version=3 -+ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-(.*)\.tar\.gz \ -+ debian debian/orig-tar.sh ---- t1lib-5.1.2.orig/debian/libt1-5.docs -+++ t1lib-5.1.2/debian/libt1-5.docs -@@ -0,0 +1,2 @@ -+README.t1lib-* -+README.t1python ---- t1lib-5.1.2.orig/debian/t1lib-bin.install -+++ t1lib-5.1.2/debian/t1lib-bin.install -@@ -0,0 +1,2 @@ -+debian/t1libconfig usr/sbin -+debian/tmp/usr/bin/* ---- t1lib-5.1.2.orig/debian/README.Debian -+++ t1lib-5.1.2/debian/README.Debian -@@ -0,0 +1,25 @@ -+t1lib for Debian -+---------------- -+ -+This package has been created from scratch using debhelper. It contains -+four binary packages: -+ * shared library - libt1-5 -+ * development files - libt1-5-dev -+ * font-related binary utils - t1lib5-bin -+ * documentation - libt1-5-doc -+ -+However you can read in upstream's README that t1lib is completely independent -+of X11, you should know that package provides also libt1x library which -+contains X11 pixmap support. That's why it requires a bunch of X-libraries -+installed. If you consider this as a bad behavior, please discuss it on -+debian-devel list. -+ -+NOTE: The old 't1lib0' package will *remove* /etc/t1lib/ and its -+contents if you purge it. Since this package is now obsolete, there -+is no good solution for this; you must back up your font database and -+config file if you wish to preserve them. Sorry... -+ -+This package has been previously maintained by David Huggins-Daines, great -+thanks to him for his good job. -+ -+ -- Artur R. Czechowski , Tue, 11 Nov 2003 13:31:48 +0100 ---- t1lib-5.1.2.orig/debian/orig-tar.sh -+++ t1lib-5.1.2/debian/orig-tar.sh -@@ -0,0 +1,11 @@ -+#!/bin/sh -e -+ -+# called by uscan with '--upstream-version' -+ -+# move to directory 'tarballs' -+if [ -r .svn/deb-layout ]; then -+ . .svn/deb-layout -+ mv $3 $origDir -+ echo "moved $3 to $origDir" -+fi -+ ---- t1lib-5.1.2.orig/debian/patches/series -+++ t1lib-5.1.2/debian/patches/series -@@ -0,0 +1,4 @@ -+no-docs.diff -+no-config.diff -+lib-cleanup.diff -+#segfault.diff ---- t1lib-5.1.2.orig/debian/patches/no-config.diff -+++ t1lib-5.1.2/debian/patches/no-config.diff -@@ -0,0 +1,57 @@ -+do not install a static configuration file -+ -+Index: t1lib-5.1.1/lib/Makefile.in -+=================================================================== -+--- t1lib-5.1.1.orig/lib/Makefile.in 2008-01-05 19:13:57.000000000 +0100 -++++ t1lib-5.1.1/lib/Makefile.in 2008-01-05 19:14:18.000000000 +0100 -+@@ -161,17 +161,17 @@ -+ install: dummy -+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) -+ $(MKINSTALLDIRS) $(DESTDIR)$(includedir) -+- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@ -++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@ -+ $(LIBTOOL) --mode=install \ -+ $(INSTALL_DATA) $(MAIN_TARGET) $(DESTDIR)$(libdir) -+ $(LIBTOOL) --mode=install \ -+ $(INSTALL_DATA) $(MAIN_HEADER) $(DESTDIR)$(includedir) -+- if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \ -+- then \ -+- echo "Alert: Global configuration file exists, installation skipped!"; \ -+- else \ -+- $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \ -+- fi; -++# if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \ -++# then \ -++# echo "Alert: Global configuration file exists, installation skipped!"; \ -++# else \ -++# $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \ -++# fi; -+ -+ -+ uninstall: dummy -+@@ -179,7 +179,7 @@ -+ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libt1x.la -+ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1lib.h -+ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1libx.h -+- -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config -++# -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config -+ -+ -+ dummy: -+Index: t1lib-5.1.1/xglyph/xglyph.c -+=================================================================== -+--- t1lib-5.1.1.orig/xglyph/xglyph.c 2008-01-05 19:16:30.000000000 +0100 -++++ t1lib-5.1.1/xglyph/xglyph.c 2008-01-05 19:16:40.000000000 +0100 -+@@ -526,9 +526,12 @@ -+ -+ /* Check for environment entry. If not set, set it to current -+ directory so that configuration file is found there */ -++ /* It violates the Debian Policy */ -++#if 0 -+ if (getenv("T1LIB_CONFIG")==NULL){ -+ putenv( "T1LIB_CONFIG=./t1lib.config"); -+ } -++#endif -+ -+ -+ /* Set log-level: */ ---- t1lib-5.1.2.orig/debian/patches/lib-cleanup.diff -+++ t1lib-5.1.2/debian/patches/lib-cleanup.diff -@@ -0,0 +1,59 @@ -+do not link against libraries that are not needed -+ -+Index: t1lib-5.1.1/lib/Makefile.in -+=================================================================== -+--- t1lib-5.1.1.orig/lib/Makefile.in 2008-01-05 19:17:21.000000000 +0100 -++++ t1lib-5.1.1/lib/Makefile.in 2008-01-05 19:17:38.000000000 +0100 -+@@ -24,7 +24,7 @@ -+ X_LIBS = @X_LIBS@ -+ TOPSRC = @top_srcdir@ -+ XPM_LIB = -lXpm -+-XLIB = @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ -++XLIB = -lX11 -+ LDFLAGS = @LDFLAGS@ -+ LDLIBS = @LDLIBS@ -+ AR = ar rc -+@@ -137,7 +137,7 @@ -+ $(LIBTOOL) --mode=link \ -+ $(CC) $(LDFLAGS) -o $@ $(T1LIBX_OBJS) \ -+ -version-info @T1LIB_LT_CURRENT@:@T1LIB_LT_REVISION@:@T1LIB_LT_AGE@ \ -+- libt1.la $(X_LIBS) $(XPM_LIB) $(XLIB) -no-undefined -rpath $(libdir) -++ libt1.la $(X_LIBS) $(XLIB) -no-undefined -rpath $(libdir) -+ cp t1lib/t1libx.h . -+ -+ -+Index: t1lib-5.1.1/type1afm/Makefile.in -+=================================================================== -+--- t1lib-5.1.1.orig/type1afm/Makefile.in 2008-01-05 19:17:52.000000000 +0100 -++++ t1lib-5.1.1/type1afm/Makefile.in 2008-01-05 19:18:02.000000000 +0100 -+@@ -70,7 +70,7 @@ -+ -+ type1afm: $(OBJS) ../lib/t1lib.h -+ $(LIBTOOL) --mode=link \ -+- $(CC) -o type1afm $(LDFLAGS) $(OBJS) $(T1LIB) $(LDLIBS) -++ $(CC) -o type1afm $(LDFLAGS) $(OBJS) $(T1LIB) -+ -+ .SUFFIXES: .lo -+ .c.lo: -+Index: t1lib-5.1.1/xglyph/Makefile.in -+=================================================================== -+--- t1lib-5.1.1.orig/xglyph/Makefile.in 2008-01-05 19:18:15.000000000 +0100 -++++ t1lib-5.1.1/xglyph/Makefile.in 2008-01-05 19:18:31.000000000 +0100 -+@@ -24,7 +24,7 @@ -+ X_LIBS = @X_LIBS@ -+ TOPSRC = @top_srcdir@ -+ XPM_LIB = -lXpm -+-XLIB = @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ -++XLIB = -lX11 @X_EXTRA_LIBS@ -+ LDFLAGS = @LDFLAGS@ -+ LDLIBS = @LDLIBS@ -+ AR = ar rc -+@@ -65,7 +65,7 @@ -+ -+ T1LIB = ../lib/libt1.la -+ T1LIBX = ../lib/libt1x.la -+-XAWLIB = -lXaw -lXt -lXmu -++XAWLIB = -lXaw -lXt -+ -+ -+ all: xglyph ---- t1lib-5.1.2.orig/debian/patches/no-docs.diff -+++ t1lib-5.1.2/debian/patches/no-docs.diff -@@ -0,0 +1,34 @@ -+We are using debhelper to install the documentation in the correct -+directory. -+ -+Index: t1lib-5.1.1/doc/Makefile.in -+=================================================================== -+--- t1lib-5.1.1.orig/doc/Makefile.in 2008-01-05 19:05:03.000000000 +0100 -++++ t1lib-5.1.1/doc/Makefile.in 2008-01-05 19:05:25.000000000 +0100 -+@@ -89,16 +89,16 @@ -+ -+ -+ install: dummy -+- if (test -f t1lib_doc.ps) \ -+- then \ -+- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -+- $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -+- fi; -+- if (test -f t1lib_doc.pdf) \ -+- then \ -+- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -+- $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -+- fi; -++# if (test -f t1lib_doc.ps) \ -++# then \ -++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -++# $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -++# fi; -++# if (test -f t1lib_doc.pdf) \ -++# then \ -++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -++# $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -++# fi; -+ -+ -+ uninstall: dummy ---- t1lib-5.1.2.orig/debian/patches/segfault.diff -+++ t1lib-5.1.2/debian/patches/segfault.diff -@@ -0,0 +1,62 @@ -+This patch does not look safe and it has not been accepted upstream. -+Index: t1lib-5.1.1/lib/t1lib/t1base.c -+=================================================================== -+--- t1lib-5.1.1.orig/lib/t1lib/t1base.c 2005-05-18 05:08:01.000000000 +0200 -++++ t1lib-5.1.1/lib/t1lib/t1base.c 2008-01-06 20:48:32.000000000 +0100 -+@@ -455,7 +455,7 @@ -+ to test_for_t1_file() filename is substituted by an emty -+ string if the file was not found: */ -+ sprintf( err_warn_msg_buf, "Type 1 Font file %s.[pfa/pfb] not found (FontID=%d, SearchPath=%s)", -+- linebuf, m-1, T1_GetFileSearchPath(T1_PFAB_PATH)); -++ linebuf, m-1, intT1_GetFileSearchPath(T1_PFAB_PATH)); -+ if ((test_for_t1_file( &linebuf[0]))){ -+ T1_PrintLog( "intT1_scanFontDBase()", err_warn_msg_buf, T1LOG_WARNING); -+ located=0; -+@@ -579,7 +579,7 @@ -+ to test_for_t1_file() filename is substituted by an emty -+ string if the file was not found: */ -+ sprintf( err_warn_msg_buf, "Type 1 Font file %s.[pfa/pfb] not found (FontID=%d, SearchPath=%s)", -+- linebuf, m-1, T1_GetFileSearchPath(T1_PFAB_PATH)); -++ linebuf, m-1, intT1_GetFileSearchPath(T1_PFAB_PATH)); -+ if ((test_for_t1_file( &linebuf[0]))){ -+ T1_PrintLog( "intT1_scanFontDBase()", err_warn_msg_buf, T1LOG_WARNING); -+ located=0; -+Index: t1lib-5.1.1/lib/t1lib/t1env.c -+=================================================================== -+--- t1lib-5.1.1.orig/lib/t1lib/t1env.c 2008-01-06 20:48:32.000000000 +0100 -++++ t1lib-5.1.1/lib/t1lib/t1env.c 2008-01-06 20:48:32.000000000 +0100 -+@@ -807,6 +807,14 @@ -+ -+ } -+ -++/* intT1_GetFileSearchPath(): -++ call T1_GetFileSearchPath and truncate the line to avoid overflowing -++ error buffers*/ -++char *intT1_GetFileSearchPath( int type) -++{ -++ char *res = T1_GetFileSearchPath(type); -++ res[900] = 0; -++} -+ -+ /* T1_AddToFileSearchPath(): Add the specified path element to -+ the specified search path. If the existing path is the default path, -+Index: t1lib-5.1.1/lib/t1lib/t1env.h -+=================================================================== -+--- t1lib-5.1.1.orig/lib/t1lib/t1env.h 2005-05-16 20:37:43.000000000 +0200 -++++ t1lib-5.1.1/lib/t1lib/t1env.h 2008-01-06 20:48:32.000000000 +0100 -+@@ -35,6 +35,7 @@ -+ int T1_SetFileSearchPath( int type, char *pathname); -+ int T1_AddToFileSearchPath( int pathtype, int mode, char *pathname); -+ char *T1_GetFileSearchPath( int type); -++char *intT1_GetFileSearchPath( int type); -+ int T1_SetFontDataBase( char *filename); -+ int T1_AddFontDataBase( int mode, char *filename); -+ int T1_SetFontDataBaseXLFD( char *filename); -+@@ -49,6 +50,7 @@ -+ extern int T1_SetFileSearchPath( int type, char *pathname); -+ extern int T1_AddToFileSearchPath( int pathtype, int mode, char *pathname); -+ extern char *T1_GetFileSearchPath( int type); -++extern char *intT1_GetFileSearchPath( int type); -+ extern int T1_SetFontDataBase( char *filename); -+ extern int T1_AddFontDataBase( int mode, char *filename); -+ extern int T1_SetFontDataBaseXLFD( char *filename); ---- t1lib-5.1.2.orig/debian/man/type1afm.1 -+++ t1lib-5.1.2/debian/man/type1afm.1 -@@ -0,0 +1,34 @@ -+.TH TYPE1AFM 1 -+.SH NAME -+.B type1afm -+\- create a font metrics file from a Type 1 font file -+.SH SYNOPSIS -+.B type1afm -+[ -+.BR \-l -+] -+.B fontfile -+[ -+.B fontfile... -+] -+.SH DESCRIPTION -+This manual page was written for the Debian GNU/Linux distribution -+because the original program does not have a manual page. -+.PP -+.B type1afm -+reads in Type 1 font files specified on the command line, rasterizes -+them to 1000bp, and writes AFM (font metrics) files based on the -+observed metrics information. -+.PP -+The AFM file is created in the same directory as the font file, so be -+sure that you have write access there before running this program. -+.SH OPTIONS -+.TP -+.BR \-l -+Write a log file -+.SH SEE ALSO -+.BR getafm (1) -+.SH AUTHOR -+This manual page was David Huggins-Daines -+for the Debian GNU/Linux distribution (but may be used by others) -+ ---- t1lib-5.1.2.orig/debian/man/t1libconfig.8 -+++ t1lib-5.1.2/debian/man/t1libconfig.8 -@@ -0,0 +1,57 @@ -+.TH T1LIBCONFIG 8 -+.SH NAME -+.B t1libconfig -+\- create the t1lib.config and FontDataBase files for t1lib -+.SH SYNOPSIS -+.B t1libconfig -+[ -+.BR \-v\fP, \fB\-\-version -+] -+[ -+.BR \-h\fP, \fB\-\-help -+] -+.B \-\-force -+] -+[ -+.B fontdirectory... -+] -+.SH DESCRIPTION -+.B t1libconfig -+scans a list of directories for Type 1 fonts and font metric files, -+and generates a configuration file and font database file for the -+.B t1lib -+rasterizer library accordingly. By default, it looks in all -+subdirectories of /usr/X11R6/lib/X11/fonts, and in -+/usr/lib/ghostscript. Extra directories to search may be specified on -+the command line. The -+.B t1libconfig -+script tries not to scan the same directory twice (this is, however, -+not foolproof, since /usr/X11R6/lib/X11/fonts and /usr/lib/X11/fonts -+typically point to the same directory on GNU/Linux systems). -+.SH OPTIONS -+.TP -+.BR \-v\fP, \fB\-\-version -+Print the version of -+.B t1libconfig -+and exit. -+.TP -+.BR \-h\fP, \fB\-\-help -+Print help about usage and exit. -+.TP -+.B \-\-force -+Force the generation of new configuration files even if these files -+already exist on the system. -+.SH FILES -+.TP 25 -+.B /etc/t1lib/t1lib.config -+Contains configuration information for t1lib, including -+colon-separated lists of paths to Type 1 font files and font metrics -+files, and the location of the default font database file -+.TP 25 -+.B /etc/t1lib/FontDataBase -+Contains a list of the names of Type 1 font files to be used by t1lib. -+.SH AUTHOR -+David Huggins-Daines -+.SH SEE ALSO -+.BR FontDataBase (5) -+ ---- t1lib-5.1.2.orig/debian/man/xglyph.1 -+++ t1lib-5.1.2/debian/man/xglyph.1 -@@ -0,0 +1,111 @@ -+.TH XGLYPH 1 -+.SH NAME -+xglyph \- demonstration program for the t1lib font rasterizer library. -+.SH SYNOPSIS -+.B xglyph -+[ -+.B fontfile... -+] -+.SH "DESCRIPTION" -+This manual page documents briefly the -+.BR xglyph -+program. -+This manual page was written for the Debian GNU/Linux distribution -+because the original program does not have a manual page. -+.PP -+.B xglyph -+is a program which demonstrates the capabilities of the -+.B t1lib -+library. It allows the user to view an arbitrary character or string -+rendered in the various ways pgossible with the library. By default, -+it writes a log file named \fIt1lib.log\fR in the current directory. -+.PP -+If invoked with no arguments, it will attempt to read the global -+configuration file and font database. It will also accept any number -+of filenames on the command line, in which case these are treated as -+font files to be loaded instead of the default font database. -+.SH "OPTIONS" -+.TP -+.BR \-\-help -+Shows a brief help text -+.TP -+.BR \-\-Help -+Shows a description of all options -+.TP -+.BR \-\-noGrid -+Don't draw grid lines when displaying glyphs -+.TP -+.BR \-\-setPad -+Set bitmap padding -+.TP -+.BR \-\-logError -+Log errors only -+.TP -+.BR \-\-logWarning -+Log errors and warnings -+.TP -+.BR \-\-logStatistic -+Log errors, warnings, and statistics -+.TP -+.BR \-\-logDebug -+Log just about everything -+.TP -+.BR \-\-ignoreForceBold -+Don't make pseudo-boldface glyphs -+.TP -+.BR \-\-ignoreFamilyAlignment -+.TP -+.BR \-\-ignoreHinting -+Ignore hints when scaling glyphs -+.TP -+.BR \-\-debugLine -+Show debugging info for line-drawing -+operations in the rasterizer -+.TP -+.BR \-\-debugRegion -+Show debugging info for region operations in -+the rasterizer -+.TP -+.BR \-\-debugPath -+Show debugging info for path operations in the -+rasterizer -+.TP -+.BR \-\-debugFont -+.TP -+.BR \-\-debugHint -+Show debugging info for hinting in the rasterizer. -+.TP -+.BR \-\-checkPerformance -+Do some simple performance tests while rasterizing. -+.TP -+.BR \-\-checkCopyFont -+Check that copying fonts works. -+.TP -+.BR \-\-checkConcatGlyphs -+Check that concatenating glyphs works. -+.TP -+.BR \-\-checkBadCharHandling -+.TP -+.BR \-\-checkDefaultEncoding -+Set a default encoding vector. -+.SH "ENVIRONMENT" -+In the Debian GNU/Linux version of this program, the environment -+variable -+.B T1LIB_CONFIG, -+if set, points to an alternate configuration -+file with which to initialize the library. -+.SH "SEE ALSO" -+.BR FontDataBase (5), -+.BR t1libconfig (8). -+.PP -+.B xglyph -+is much more fully documented in the LaTeX documentation that -+accompanies the upstream -+.B t1lib -+distribution. This documentation is installed in PostScript and source -+formats with the t1lib-dev package in /usr/share/doc/t1lib-dev, and is -+also accessible through the dwww system. -+.SH AUTHOR -+This manual page was written by David Huggins-Daines -+, for the Debian GNU/Linux system (but may -+be used by others). ---- t1lib-5.1.2.orig/debian/man/FontDatabase.5 -+++ t1lib-5.1.2/debian/man/FontDatabase.5 -@@ -0,0 +1,77 @@ -+.TH FONTDATABASE 5 -+.SH NAME -+FontDataBase \- database of fonts accessible to t1lib. -+.SH DESCRIPTION -+This manual page has been written for the Debian GNU/Linux -+distribution. It has been adapted from the documentation included in -+the upstream -+.B t1lib -+distribution. -+.PP -+.B /etc/t1lib/FontDataBase -+is a text file which contains, minimally, the basenames of Type 1 font -+files to be made accessible to the -+.B t1lib -+font rasterizer library. The format is intentionally similar to that -+of the -+.B fonts.dir -+and -+.B fonts.scale -+files used by X11. -+.PP -+Line 1 of this file contains a positive integer specifying the number -+of fonts declared in that file. This is as in the -+.B fonts.dir -+files of the X11 system. -+.PP -+All remaining lines contain declarations of one font each. The only -+thing taken from such a line is the last string (delimited by white -+space) in it. It is assumed to be a filename of the format -+\fIbasename\fR.\fIsomeextension\fR. -+.PP -+The \fIbasename\fR part is assumed to be the -+.BR basename (1) -+of a fontfile. After the a string has been parsed, the -+.I extension -+is cut off and replaced in turn with -+.I .pfa -+and -+.I .pfb. -+The initialization routine tries to open a font file in -+its search path with one of the resulting filenames. -+.PP -+The remainder of the line, i.e., from beginning to the start of the -+filename string, is completely ignored and thus may contain -+information for other programs. -+.SH EXAMPLES -+Here is a minimal font database file for 4 fonts: -+.sp -+.nf -+4 -+isvl.afm -+isvli.afm -+isvd.afm -+isvdi.afm -+.fi -+.PP -+This file is \fIminimal\fR, because it contains just the information -+needed, and nothing not needed by the library. -+.PP -+Here is a more realistic example, which allows an application to match -+a fully qualified X11 fontname to a FontID in -+.B t1lib. -+This is also a valid font database file: -+.sp -+.nf -+4 -+Souvenir Souvenir-Light --- \-itc-souvenir-light-r-normal--#-0-0-0-p-0-iso8859-1 isvl.afm -+Souvenir Souvenir-LightItalic -*- \-itc-souvenir-light-i-normal--#-0-0-0-p-0-iso8859-1 isvli.afm -+ Souvenir-Demi *-- \-itc-souvenir-demi-r-normal--#-0-0-0-p-0-iso8859-1 isvd.afm -+ Souvenir-DemiItalic **- \-itc-souvenir-demi-i-normal--#-0-0-0-p-0-iso8859-1 isvdi.afm -+.fi -+.PP -+.SH FILES -+.I /etc/t1lib/FontDataBase -+.SH "SEE ALSO" -+.BR mkfontdir (1x) -+ diff --git a/source/l/taglib/taglib.SlackBuild b/source/l/taglib/taglib.SlackBuild index 1f3673fc..31794626 100755 --- a/source/l/taglib/taglib.SlackBuild +++ b/source/l/taglib/taglib.SlackBuild @@ -69,14 +69,13 @@ find . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-mp4 \ - --enable-asf \ - --program-prefix="" \ - --program-suffix="" \ - --build=$ARCH-slackware-linux +CXX=gcc \ +cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX="${LIBDIRSUFFIX}" \ + -DWITH_MP4=ON \ + -DWITH_ASF=ON \ + . make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/urwid/urwid.SlackBuild b/source/l/urwid/urwid.SlackBuild index b34a618a..152be625 100755 --- a/source/l/urwid/urwid.SlackBuild +++ b/source/l/urwid/urwid.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for urwid # Copyright 2009 Andrew Psaltis +# Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +26,7 @@ # Modified by Robby Workman PRGNAM=urwid -VERSION=0.9.9.1 +VERSION=1.0.1 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/l/v4l-utils/slack-desc b/source/l/v4l-utils/slack-desc index 57491159..1f235d18 100644 --- a/source/l/v4l-utils/slack-desc +++ b/source/l/v4l-utils/slack-desc @@ -11,9 +11,9 @@ v4l-utils: v4l-utils: libv4l is a collection of libraries which adds a thin abstraction v4l-utils: layer on top of video4linux2 devices. The purpose of this (thin) v4l-utils: layer is to make it easy for application writers to support a wide -v4l-utils: variety of devices without having to write seperate code for +v4l-utils: variety of devices without having to write separate code for v4l-utils: different devices in the same class. Linux V4L2 and DVB API v4l-utils: utilities are also included. v4l-utils: -v4l-utils: Homepage: http://freshmeat.net/projects/libv4l +v4l-utils: Homepage: http://linuxtv.org v4l-utils: diff --git a/source/l/v4l-utils/v4l-utils.SlackBuild b/source/l/v4l-utils/v4l-utils.SlackBuild index c0ffa36b..da783994 100755 --- a/source/l/v4l-utils/v4l-utils.SlackBuild +++ b/source/l/v4l-utils/v4l-utils.SlackBuild @@ -78,9 +78,9 @@ export CFLAGS="$SLKCFLAGS" export CPPFLAGS="$SLKCFLAGS" export LDFLAGS="$SLKLDFLAGS" make ${NUMJOBS} PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} || \ - make PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} || \ + make PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} MANDIR=/usr/man || \ exit 1 -make install PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG || exit 1 +make install PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} MANDIR=/usr/man DESTDIR=$PKG || exit 1 # System udev files should go under /lib: if [ -r $PKG/etc/udev/rules.d/70-infrared.rules ]; then diff --git a/source/l/virtuoso-ose/virtuoso-opensource-6.1.3.unicode.patch b/source/l/virtuoso-ose/virtuoso-opensource-6.1.3.unicode.patch new file mode 100644 index 00000000..6aa5e5a5 --- /dev/null +++ b/source/l/virtuoso-ose/virtuoso-opensource-6.1.3.unicode.patch @@ -0,0 +1,16 @@ +--- libsrc/Wi/xqf.c 3 Mar 2011 11:56:45 -0000 1.21.2.9 ++++ libsrc/Wi/xqf.c 26 Aug 2011 19:34:56 -0000 1.21.2.12 +@@ -3520,6 +3552,12 @@ + desc = xqf_str_parser_descs + desc_idx; + if (DV_DB_NULL == arg_dtp) + return NEW_DB_NULL; ++ /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */ ++ if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING) ++ { ++ res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING); ++ goto res_ready; ++ } + if (DV_STRING != arg_dtp) + { + caddr_t err = NULL; + diff --git a/source/l/virtuoso-ose/virtuoso-ose.SlackBuild b/source/l/virtuoso-ose/virtuoso-ose.SlackBuild index 5dd4fe5c..bb9d88ab 100755 --- a/source/l/virtuoso-ose/virtuoso-ose.SlackBuild +++ b/source/l/virtuoso-ose/virtuoso-ose.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2009, 2010 Eric Hameleers, Eindhoven, NL -# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011 Eric Hameleers, Eindhoven, NL +# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=virtuoso-opensource VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -61,6 +61,11 @@ cd $TMP rm -rf virtuoso-opensource-$VERSION tar xvf $CWD/virtuoso-opensource-$VERSION.tar.xz || exit 1 cd virtuoso-opensource-$VERSION || exit 1 + +# Apply a patch that fixes Unicode issue as described here: +# https://bugs.kde.org/show_bug.cgi?id=271664 +cat $CWD/virtuoso-opensource-6.1.3.unicode.patch | patch -p0 --verbose || exit + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/l/vte/fix_meta_alt_keybinding.patch b/source/l/vte/fix_meta_alt_keybinding.patch new file mode 100644 index 00000000..bd364be5 --- /dev/null +++ b/source/l/vte/fix_meta_alt_keybinding.patch @@ -0,0 +1,74 @@ +From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Tue, 15 Nov 2011 03:06:40 -0500 +Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2 + compatibility + +Also, since VTE_META_MASK is now a mask with multiple bits set, code that +compares gdk key modifiers to VTE_META_MASK by numerical equality is no +longer guaranteed to work. Therefore, for such comparisons a new function, +vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits +matching matching VTE_META_MASK are set, then all are set. + +https://bugzilla.gnome.org/show_bug.cgi?id=663779 +--- + src/keymap.c | 15 +++++++++++++-- + src/keymap.h | 2 +- + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/src/keymap.c b/src/keymap.c +index 9a21669..95b4c5b 100644 +--- a/src/keymap.c ++++ b/src/keymap.c +@@ -990,6 +990,17 @@ static const struct _vte_keymap_group { + {GDK_KEY (F35), _vte_keymap_GDK_F35}, + }; + ++/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK, ++ * despite being a compound mask, is treated as indivisible. */ ++GdkModifierType ++_vte_keymap_fixup_modifiers(GdkModifierType modifiers, ++ GdkModifierType mask) ++{ ++ if (modifiers & VTE_META_MASK) ++ modifiers |= VTE_META_MASK; ++ return modifiers & mask; ++} ++ + /* Map the specified keyval/modifier setup, dependent on the mode, to either + * a literal string or a capability name. */ + void +@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval, + } else { + fkey_mode = fkey_default; + } +- modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK); ++ modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK); + + /* Search for the conditions. */ + for (i = 0; entries[i].normal_length || entries[i].special[0]; i++) +@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval, + return; + } + +- switch (modifiers & significant_modifiers) { ++ switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) { + case 0: + modifier = 0; + break; +diff --git a/src/keymap.h b/src/keymap.h +index 243e22e..21d9b8e 100644 +--- a/src/keymap.h ++++ b/src/keymap.h +@@ -27,7 +27,7 @@ + + G_BEGIN_DECLS + +-#define VTE_META_MASK GDK_META_MASK ++#define VTE_META_MASK (GDK_META_MASK | GDK_MOD1_MASK) + #define VTE_NUMLOCK_MASK GDK_MOD2_MASK + + /* Map the specified keyval/modifier setup, dependent on the mode, to either +-- +1.7.8.rc3 + diff --git a/source/l/vte/vte.SlackBuild b/source/l/vte/vte.SlackBuild index 858b119a..70386cb1 100755 --- a/source/l/vte/vte.SlackBuild +++ b/source/l/vte/vte.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=vte VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -70,6 +70,12 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# https://bugzilla.gnome.org/show_bug.cgi?id=663779 +zcat $CWD/fix_meta_alt_keybinding.patch.gz | patch -p1 || exit 1 + +# Escape sequences can cause high CPU usage (CVE-2012-2738): +zcat $CWD/vte.escape.cpu.usage.diff.gz | patch -p1 || exit 1 + # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/vte/vte.escape.cpu.usage.diff b/source/l/vte/vte.escape.cpu.usage.diff new file mode 100644 index 00000000..e82cf468 --- /dev/null +++ b/source/l/vte/vte.escape.cpu.usage.diff @@ -0,0 +1,89 @@ +--- ./src/table.c.orig 2011-08-16 16:52:48.000000000 -0500 ++++ ./src/table.c 2012-08-08 21:25:15.080344805 -0500 +@@ -550,7 +550,7 @@ + if (G_UNLIKELY (*array == NULL)) { + *array = g_value_array_new(1); + } +- g_value_set_long(&value, total); ++ g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT)); + g_value_array_append(*array, &value); + } while (i++ < arginfo->length); + g_value_unset(&value); +--- ./src/vteseq.c.orig 2011-08-16 16:52:48.000000000 -0500 ++++ ./src/vteseq.c 2012-08-08 21:25:15.104344804 -0500 +@@ -557,7 +557,7 @@ + GValueArray *params, + VteTerminalSequenceHandler handler) + { +- vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG); ++ vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT); + } + + static void +@@ -1392,7 +1392,7 @@ + static void + vte_sequence_handler_DC (VteTerminal *terminal, GValueArray *params) + { +- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_dc); ++ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_dc); + } + + /* Delete a line at the current cursor position. */ +@@ -1785,7 +1785,7 @@ + static void + vte_sequence_handler_RI (VteTerminal *terminal, GValueArray *params) + { +- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_nd); ++ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_nd); + } + + /* Save cursor (position). */ +@@ -2777,8 +2777,7 @@ + { + GValue *value; + VteScreen *screen; +- long param, end, row; +- int i; ++ long param, end, row, i, limit; + screen = terminal->pvt->screen; + /* The default is one. */ + param = 1; +@@ -2796,7 +2795,13 @@ + } else { + end = screen->insert_delta + terminal->row_count - 1; + } +- /* Insert the new lines at the cursor. */ ++ ++ /* Only allow to insert as many lines as there are between this row ++ * and the end of the scrolling region. See bug #676090. ++ */ ++ limit = end - row + 1; ++ param = MIN (param, limit); ++ + for (i = 0; i < param; i++) { + /* Clear a line off the end of the region and add one to the + * top of the region. */ +@@ -2817,8 +2822,7 @@ + { + GValue *value; + VteScreen *screen; +- long param, end, row; +- int i; ++ long param, end, row, i, limit; + + screen = terminal->pvt->screen; + /* The default is one. */ +@@ -2837,6 +2841,13 @@ + } else { + end = screen->insert_delta + terminal->row_count - 1; + } ++ ++ /* Only allow to delete as many lines as there are between this row ++ * and the end of the scrolling region. See bug #676090. ++ */ ++ limit = end - row + 1; ++ param = MIN (param, limit); ++ + /* Clear them from below the current cursor. */ + for (i = 0; i < param; i++) { + /* Insert a line at the end of the region and remove one from diff --git a/source/l/wv2/slack-desc b/source/l/wv2/slack-desc deleted file mode 100644 index e5861a4b..00000000 --- a/source/l/wv2/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -wv2: wv2 (MS Word document import library) -wv2: -wv2: wv2 is a portable MS Word .doc import filter that is used by KWord. -wv2: Currently, it supports MS Word 6, MS Word 95, MS Word 97, MS Word -wv2: 2000, and MS Word 2002 (XP) documents. Older versions like Word 2, 3, -wv2: 4, and 5 aren't supported yet, but might be in the future. -wv2: -wv2: wv2's authors are Shaheed Haque, Werner Trobin, and David Faure. -wv2: -wv2: -wv2: diff --git a/source/l/wv2/wv2.SlackBuild b/source/l/wv2/wv2.SlackBuild deleted file mode 100755 index 79d04b50..00000000 --- a/source/l/wv2/wv2.SlackBuild +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh - -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -VERSION=0.4.2 -BUILD=${BUILD:-1} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -NUMJOBS=${NUMJOBS:-" -j7 "} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-wv2 -rm -rf $PKG -mkdir -p $TMP $PKG - -cd $TMP -rm -rf wv2-$VERSION -tar xvf $CWD/wv2-$VERSION.tar.?z* || exit 1 -cd wv2-$VERSION -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - $KDE_OPT_ARGS \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - .. - make $NUMJOBS || exit 1 - make install DESTDIR=$PKG || exit 1 -cd - - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/wv2-$VERSION -cp -a \ - AUTHORS COPYING.LIB README RELEASE THANKS TODO \ - $PKG/usr/doc/wv2-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/wv2-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/l/zlib/zlib.SlackBuild b/source/l/zlib/zlib.SlackBuild index 9d5f928d..eb284280 100755 --- a/source/l/zlib/zlib.SlackBuild +++ b/source/l/zlib/zlib.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=zlib VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -64,13 +64,6 @@ rm -rf zlib-$VERSION tar xvf $CWD/zlib-$VERSION.tar.?z* || exit 1 cd zlib-$VERSION || exit 1 -# Attempt to work around a problem that affects libxml2 on 64-bits -# and probably breaks other things as well. The issue stems from -# misuse of zlib by other libraries, but there's no other good place -# to put this fix. Note to self - keep an eye on upstream for a -# proper fix. -zcat $CWD/zlib.largefile64_source.diff.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -104,6 +97,18 @@ cat zlib.3 | gzip -9c > $PKG/usr/man/man3/zlib.3.gz mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig cat zlib.pc > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/zlib.pc +# Now that libkmod requires libz, we had better move the shared library +# up a level: +mkdir $PKG/lib${LIBDIRSUFFIX} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + for file in lib*.so.?.* ; do + mv $file ../../lib${LIBDIRSUFFIX} + ln -sf ../../lib${LIBDIRSUFFIX}/$file . + done + cp -a lib*.so.? ../../lib${LIBDIRSUFFIX} +) + +# Strip binaries: ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/l/zlib/zlib.largefile64_source.diff b/source/l/zlib/zlib.largefile64_source.diff deleted file mode 100644 index 61d7b84d..00000000 --- a/source/l/zlib/zlib.largefile64_source.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./zlib.h.orig 2010-04-19 23:12:48.000000000 -0500 -+++ ./zlib.h 2011-02-09 12:12:15.000000000 -0600 -@@ -1578,7 +1578,7 @@ - # define gzoffset gzoffset64 - # define adler32_combine adler32_combine64 - # define crc32_combine crc32_combine64 --# ifdef _LARGEFILE64_SOURCE -+# ifndef _LARGEFILE64_SOURCE - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); diff --git a/source/local/README b/source/local/README deleted file mode 100644 index 4e535154..00000000 --- a/source/local/README +++ /dev/null @@ -1 +0,0 @@ -Build scripts that are unique to this $ARCH. diff --git a/source/local/jre/COPYRIGHT b/source/local/jre/COPYRIGHT deleted file mode 100644 index fcb67309..00000000 --- a/source/local/jre/COPYRIGHT +++ /dev/null @@ -1,70 +0,0 @@ -Copyright © 2006, 2011, Oracle and/or its affiliates. -All rights reserved. - -This software and related documentation are provided under a -license agreement containing restrictions on use and -disclosure and are protected by intellectual property laws. -Except as expressly permitted in your license agreement or -allowed by law, you may not use, copy, reproduce, translate, -broadcast, modify, license, transmit, distribute, exhibit, -perform, publish, or display any part, in any form, or by -any means. Reverse engineering, disassembly, or -decompilation of this software, unless required by law for -interoperability, is prohibited. - -The information contained herein is subject to change -without notice and is not warranted to be error-free. If -you find any errors, please report them to us in writing. - -If this is software or related software documentation that -is delivered to the U.S. Government or anyone licensing it -on behalf of the U.S. Government, the following notice is -applicable: - -U.S. GOVERNMENT RIGHTS Programs, software, databases, and -related documentation and technical data delivered to U.S. -Government customers are "commercial computer software" or -"commercial technical data" pursuant to the applicable -Federal Acquisition Regulation and agency-specific -supplemental regulations. As such, the use, duplication, -disclosure, modification, and adaptation shall be subject to -the restrictions and license terms set forth in the -applicable Government contract, and, to the extent -applicable by the terms of the Government contract, the -additional rights set forth in FAR 52.227-19, Commercial -Computer Software License (December 2007). Oracle America, -Inc., 500 Oracle Parkway, Redwood City, CA 94065. - -This software or hardware is developed for general use in a -variety of information management applications. It is not -developed or intended for use in any inherently dangerous -applications, including applications which may create a risk -of personal injury. If you use this software or hardware in -dangerous applications, then you shall be responsible to -take all appropriate fail-safe, backup, redundancy, and -other measures to ensure its safe use. Oracle Corporation -and its affiliates disclaim any liability for any damages -caused by use of this software or hardware in dangerous -applications. - -Oracle and Java are registered trademarks of Oracle and/or -its affiliates. Other names may be trademarks of their -respective owners. - -AMD, Opteron, the AMD logo, and the AMD Opteron logo are -trademarks or registered trademarks of Advanced Micro -Devices. Intel and Intel Xeon are trademarks or registered -trademarks of Intel Corporation. All SPARC trademarks are -used under license and are trademarks or registered -trademarks of SPARC International, Inc. UNIX is a -registered trademark licensed through X/Open Company, Ltd. - -This software or hardware and documentation may provide -access to or information on content, products, and services -from third parties. Oracle Corporation and its affiliates -are not responsible for and expressly disclaim all -warranties of any kind with respect to third-party content, -products, and services. Oracle Corporation and its -affiliates will not be responsible for any loss, costs, or -damages incurred due to your access to or use of third-party -content, products, or services. diff --git a/source/local/jre/README b/source/local/jre/README deleted file mode 100644 index cdb30f2c..00000000 --- a/source/local/jre/README +++ /dev/null @@ -1 +0,0 @@ -Please refer to http://java.com/licensereadme diff --git a/source/local/jre/THIRDPARTYLICENSEREADME.txt b/source/local/jre/THIRDPARTYLICENSEREADME.txt deleted file mode 100644 index 4381e7df..00000000 --- a/source/local/jre/THIRDPARTYLICENSEREADME.txt +++ /dev/null @@ -1 +0,0 @@ -Please refer to http://java.com/thirdpartylicense diff --git a/source/local/jre/Welcome.html b/source/local/jre/Welcome.html deleted file mode 100644 index 33a0ba54..00000000 --- a/source/local/jre/Welcome.html +++ /dev/null @@ -1,26 +0,0 @@ - - - -Welcome to the Java(TM) Platform - - - - -

Welcome to the JavaTM Platform

-

Welcome to the JavaTM Standard Edition Runtime - Environment. This provides complete runtime support for Java applications. -

The runtime environment includes the JavaTM - Plug-in product which supports the Java environment inside web browsers. -

References

-

-See the Java Plug-in product -documentation for more information on using the Java Plug-in product. -

See the Java Platform web site for - more information on the Java Platform. -

- -Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. - -

- - diff --git a/source/local/jre/jre.SlackBuild b/source/local/jre/jre.SlackBuild deleted file mode 100755 index 297bfeb3..00000000 --- a/source/local/jre/jre.SlackBuild +++ /dev/null @@ -1,130 +0,0 @@ -#!/bin/sh - -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -# Note that the slack-desc file mentions the JRE version (edit when upgrading)! - -VERSION=6u25 -DVER=1.6.0_25 -ARCH=x86_64 -BUILD=${BUILD:-1} - -# As of jre-6u12 a 64bit plugin is available. -# SUN says: -# Please note that the 64-bit JRE only works with the 64-bit browser plug-in, -# while the 32-bit JRE only works with 32-bit browser plug-in. -# If you use both 32-bit and 64-bit browsers interchangeably, you will need to -# have both 32-bit and 64-bit JRE's installed on your machine. -JAVA_ARCH=${JAVA_ARCH:-x64} # or i586 if you want the 32bit version - -if [ "$JAVA_ARCH" = "x64" ]; then - LIB_ARCH=amd64 -else - LIB_ARCH=i386 -fi - -if [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-jre -rm -rf $PKG -mkdir -p $TMP $PKG - -cd $PKG -mkdir -p usr/lib${LIBDIRSUFFIX} -cd usr/lib${LIBDIRSUFFIX} -yes yes | sh $( ls --indicator-style none $CWD/jre-${VERSION}-linux-${JAVA_ARCH}*.bin | tail -1) || exit 1 -mkdir -p $PKG/etc/profile.d -for file in $(ls $CWD/profile.d/*) ; do - cat $file | sed -e "s#lib/java#lib${LIBDIRSUFFIX}/java#" \ - > $PKG/etc/profile.d/$(basename $file) -done -chown -R root:root $PKG -( cd $PKG - find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; -) -chmod 755 $PKG/etc/profile.d/* -( cd $PKG/usr/lib${LIBDIRSUFFIX} - mv jre${DVER} java || exit 1 - ln -sf java jre${DVER} -) || exit 1 -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins -( cd $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins - ln -sf /usr/lib${LIBDIRSUFFIX}/java/lib/${LIB_ARCH}/libnpjp2.so libnpjp2.so -) -( cd $PKG/usr/lib${LIBDIRSUFFIX} - ln -sf ./java/lib/${LIB_ARCH}/server/libjvm.so . -) - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cat << EOF > $PKG/install/doinst.sh -# Clean up a potential upgrade mess caused by changing the -# installation directory to /usr/lib${LIBDIRSUFFIX}/java/: -if [ -L usr/lib${LIBDIRSUFFIX}/java ]; then - rm -rf usr/lib${LIBDIRSUFFIX}/java - mkdir -p usr/lib${LIBDIRSUFFIX}/java/man - mkdir -p usr/lib${LIBDIRSUFFIX}/java/lib/${LIB_ARCH}/server - mkdir -p usr/lib/java/lib${LIBDIRSUFFIX}/${LIB_ARCH}/client - mkdir -p usr/lib${LIBDIRSUFFIX}/java/javaws - mkdir -p usr/lib${LIBDIRSUFFIX}/java/bin - mkdir -p usr/lib${LIBDIRSUFFIX}/mozilla/plugins -fi -if [ -L ControlPanel ]; then - rm -f ControlPanel -fi -if [ -L ja ]; then - rm -f ja -fi -if [ -L javaws ]; then - rm -f javaws -fi -if [ -L libjsig.so ]; then - rm -f libjsig.so -fi -# End cleanup. -EOF - -# Install the desktop/mime files: -mkdir -p $PKG/usr/share/{applications,icons,mime} -cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/desktop/applications/* \ - $PKG/usr/share/applications/ -cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/desktop/icons/hicolor \ - $PKG/usr/share/icons/ -cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/desktop/mime/packages \ - $PKG/usr/share/mime/ - -# We ship the package unmodified, so we do not compress manpages. - -cd $PKG -/sbin/makepkg -l y -c n $TMP/jre-$(echo $VERSION | tr - _)-${ARCH}-$BUILD.txz - diff --git a/source/local/jre/profile.d/jre.csh b/source/local/jre/profile.d/jre.csh deleted file mode 100755 index 2beb66ec..00000000 --- a/source/local/jre/profile.d/jre.csh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/csh -setenv JAVA_HOME /usr/lib/java -setenv MANPATH ${MANPATH}:${JAVA_HOME}/man -setenv PATH ${PATH}:${JAVA_HOME}/bin diff --git a/source/local/jre/profile.d/jre.sh b/source/local/jre/profile.d/jre.sh deleted file mode 100755 index 227c15cb..00000000 --- a/source/local/jre/profile.d/jre.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -export JAVA_HOME=/usr/lib/java -export MANPATH="${MANPATH}:${JAVA_HOME}/man" -export PATH="${PATH}:${JAVA_HOME}/bin" diff --git a/source/local/jre/slack-desc b/source/local/jre/slack-desc deleted file mode 100644 index 925218e2..00000000 --- a/source/local/jre/slack-desc +++ /dev/null @@ -1,18 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| -jre: Java(TM) 2 Platform Standard Edition Runtime Environment. -jre: -jre: The J2SE(TM) Runtime Environment (JRE) is intended for software -jre: developers and vendors to redistribute with their applications. -jre: It contains the Java virtual machine, runtime class libraries, and -jre: Java application launcher that are necessary to run programs written -jre: in the Java programming language. -jre: -jre: If you need development tools, obtain the jdk from /extra, or see the -jre: web page: http://java.com/ -jre: diff --git a/source/n/ModemManager/ModemManager.SlackBuild b/source/n/ModemManager/ModemManager.SlackBuild new file mode 100755 index 00000000..5089e02d --- /dev/null +++ b/source/n/ModemManager/ModemManager.SlackBuild @@ -0,0 +1,105 @@ +#!/bin/sh + +# Slackware build script for ModemManager + +# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Modified by Eric Hameleers, Eindhoven, NL + +PKGNAM=ModemManager +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} +TAG=${TAG:-} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* +cd $PKGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/2.4.5 \ + --build=$ARCH-slackware-linux + +make $NUMJOBS +make install DESTDIR=$PKG + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog INSTALL NEWS README \ + $PKG/usr/doc/$PKGNAM-$VERSION +cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} + diff --git a/source/n/ModemManager/slack-desc b/source/n/ModemManager/slack-desc new file mode 100644 index 00000000..2455ad8e --- /dev/null +++ b/source/n/ModemManager/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +ModemManager: ModemManager (mobile broadband modem API) +ModemManager: +ModemManager: ModemManager provides a unified high level API for communicating with +ModemManager: mobile broadband modems. +ModemManager: +ModemManager: +ModemManager: +ModemManager: +ModemManager: For more info, see: +ModemManager: http://cgit.freedesktop.org/ModemManager/ModemManager/ +ModemManager: diff --git a/source/n/NetworkManager/11-initialize-nm-remote-settings.patch b/source/n/NetworkManager/11-initialize-nm-remote-settings.patch new file mode 100644 index 00000000..fff4194b --- /dev/null +++ b/source/n/NetworkManager/11-initialize-nm-remote-settings.patch @@ -0,0 +1,27 @@ +commit dd0460697c4e281fe277b53916d5251332e1aafc +Author: Jiří KlimeÅ¡ +Date: Tue Mar 27 22:36:55 2012 +0200 + + libnm-glib: initialize NMRemoteSettings in nm_remote_settings_new() (rh #806664) + + The object was not initialized after creation in nm_remote_settings_new(). This + was a regression caused by 762df85234e7a042a2a5d31053e6cc273ae3e2ec. + +diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c +index 8f213f9..b6b6c18 100644 +--- a/libnm-glib/nm-remote-settings.c ++++ b/libnm-glib/nm-remote-settings.c +@@ -728,7 +728,12 @@ properties_changed_cb (DBusGProxy *proxy, + NMRemoteSettings * + nm_remote_settings_new (DBusGConnection *bus) + { +- return g_object_new (NM_TYPE_REMOTE_SETTINGS, NM_REMOTE_SETTINGS_BUS, bus, NULL); ++ NMRemoteSettings *settings; ++ ++ settings = g_object_new (NM_TYPE_REMOTE_SETTINGS, NM_REMOTE_SETTINGS_BUS, bus, NULL); ++ ++ _nm_remote_settings_ensure_inited (settings); ++ return settings; + } + + static void diff --git a/source/n/NetworkManager/55NetworkManager b/source/n/NetworkManager/55NetworkManager new file mode 100644 index 00000000..f3c6df5e --- /dev/null +++ b/source/n/NetworkManager/55NetworkManager @@ -0,0 +1,42 @@ +#!/bin/sh +# If we are running NetworkManager, tell it we are going to sleep. +# TODO: Make NetworkManager smarter about how to handle sleep/resume +# If we are asleep for less time than it takes for TCP to reset a +# connection, and we are assigned the same IP on resume, we should +# not break established connections. Apple can do this, and it is +# rather nifty. + +. "${PM_FUNCTIONS}" + +suspend_nm() +{ + # Tell NetworkManager to shut down networking + printf "Having NetworkManager put all interaces to sleep..." + dbus_send --system \ + --dest=org.freedesktop.NetworkManager \ + /org/freedesktop/NetworkManager \ + org.freedesktop.NetworkManager.sleep && \ + echo Done. || echo Failed. +} + +resume_nm() +{ + # Wake up NetworkManager and make it do a new connection + printf "Having NetworkManager wake interfaces back up..." + dbus_send --system \ + --dest=org.freedesktop.NetworkManager \ + /org/freedesktop/NetworkManager \ + org.freedesktop.NetworkManager.wake && \ + echo Done. || echo Failed. +} + +case "$1" in + hibernate|suspend) + suspend_nm + ;; + thaw|resume) + resume_nm + ;; + *) exit $NA + ;; +esac diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild new file mode 100755 index 00000000..d7e9d1f8 --- /dev/null +++ b/source/n/NetworkManager/NetworkManager.SlackBuild @@ -0,0 +1,154 @@ +#!/bin/sh + +# Slackware build script for NetworkManager + +# Copyright 2010,2011 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Modified 2011, 2012 by Eric Hameleers, Eindhoven, NL + +PKGNAM=NetworkManager +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} +TAG=${TAG:-} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +zcat $CWD/11-initialize-nm-remote-settings.patch.gz | patch -p1 --verbose || exit 1 + +# Find the version off pppd installed or else assume we are on -current: +PPPD=$( basename $(find /usr/lib${LIBDIRSUFFIX}/pppd -type d -maxdepth 1 -mindepth 1) ) +[ -z "$PPPD" ] && PPPD=2.4.5 + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/$PPPD \ + --with-crypto=nss \ + --enable-more-warnings=no \ + --without-resolvconf \ + --with-dhcpcd=/sbin/dhcpcd \ + --with-dhclient=yes \ + --build=$TARGET || exit 1 + +make $NUMJOBS || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +# Don't run NetworkManager by default just because it got installed. +# Instead, the init script will have to be made executable first. +# This should avoid nasty surprises on potentially remotely located machines. +chmod 644 $PKG/etc/rc.d/rc.networkmanager + +# Don't clobber existing rc.networkmanager +mv $PKG/etc/rc.d/rc.networkmanager $PKG/etc/rc.d/rc.networkmanager.new + +# Add a 'starter' NetworkManager.conf file +# This sets the hostname (during postinstall) to match the system's name +# and defines dhcpcd as the dhcp client to use +mkdir -p $PKG/etc/NetworkManager +cat $CWD/NetworkManager.conf.new > \ + $PKG/etc/NetworkManager/NetworkManager.conf.new + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS CONTRIBUTING COPYING ChangeLog INSTALL NEWS README TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION +# In case someone needs this still: +cp $CWD/55NetworkManager $PKG/usr/doc/$PKGNAM-$VERSION/ +cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG/usr/doc/$PKGNAM-$VERSION/ChangeLog + touch -r ChangeLog $PKG/usr/doc/$PKGNAM-$VERSION/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} + diff --git a/source/n/NetworkManager/NetworkManager.conf.new b/source/n/NetworkManager/NetworkManager.conf.new new file mode 100644 index 00000000..71945e90 --- /dev/null +++ b/source/n/NetworkManager/NetworkManager.conf.new @@ -0,0 +1,11 @@ +# /etc/NetworkManager/NetworkManager.conf +# +# See NetworkManager.conf(5) for more information on this file + +[main] +plugins=keyfile +dhcp=dhcpcd + +[keyfile] +hostname=yourhostname + diff --git a/source/n/NetworkManager/README b/source/n/NetworkManager/README new file mode 100644 index 00000000..5556f27f --- /dev/null +++ b/source/n/NetworkManager/README @@ -0,0 +1,15 @@ +NetworkManager attempts to keep an active network connection available at all +times. The point of NetworkManager is to make networking configuration and +setup as painless and automatic as possible. NetworkManager is intended to +replace default route, replace other routes, set IP addresses, and in general +configure networking as NM sees fit (with the possibility of manual override as +necessary). In effect, the goal of NetworkManager is to make networking Just +Work with a minimum of user hassle, but still allow customization and a high +level of manual network control. + +You will probably want to install network-manager-applet (for a configuration +UI) for sure, along with ModemManager (if you want support for configuring +broadband modem connections) perhaps one or more of the VPN-related addons. + +You will also need to start rc.networkmanager during boot - you can use +rc.local, or perhaps you'll want to edit rc.M's call to rc.wicd... :-) diff --git a/source/n/NetworkManager/doinst.sh b/source/n/NetworkManager/doinst.sh new file mode 100644 index 00000000..2b419b26 --- /dev/null +++ b/source/n/NetworkManager/doinst.sh @@ -0,0 +1,32 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname ${NEW})/$(basename ${NEW} .new)" + if [ -e ${OLD} ]; then + cp -a ${OLD} ${NEW}.incoming + cat ${NEW} > ${NEW}.incoming + mv ${NEW}.incoming ${NEW} + fi + config ${NEW} +} + +if [ -e etc/HOSTNAME ]; then + sed -i "s,yourhostname,$(cat etc/HOSTNAME | cut -f1 -d .)," \ + etc/NetworkManager/NetworkManager.conf.new +fi + +preserve_perms etc/rc.d/rc.networkmanager.new +config etc/NetworkManager/NetworkManager.conf.new + diff --git a/source/n/NetworkManager/slack-desc b/source/n/NetworkManager/slack-desc new file mode 100644 index 00000000..2a47aaa3 --- /dev/null +++ b/source/n/NetworkManager/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +NetworkManager: NetworkManager (Networking that Just Works) +NetworkManager: +NetworkManager: The point of NetworkManager is to make networking configuration and +NetworkManager: setup as painless and automatic as possible. NetworkManager sets IP +NetworkManager: addresses, default routes, associating with wireless access points +NetworkManager: or wired LANs, and other network configuration settings in a simple, +NetworkManager: automated fashion (manual overrides are still possible). +NetworkManager: +NetworkManager: +NetworkManager: Home page: http://projects.gnome.org/NetworkManager/ +NetworkManager: diff --git a/source/n/alpine/alpine.SlackBuild b/source/n/alpine/alpine.SlackBuild index 1dd64e6a..07961ff2 100755 --- a/source/n/alpine/alpine.SlackBuild +++ b/source/n/alpine/alpine.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,9 @@ PKGNAM=alpine -VERSION=${VERSION:-2.00} -ALPINEBUILD=${ALPINEBUILD:-3} -IMAPDBUILD=${IMAPDBUILD:-2} +VERSION=${VERSION:-2.02} +ALPINEBUILD=${ALPINEBUILD:-1} +IMAPDBUILD=${IMAPDBUILD:-1} PINEPGP=${PINEPGP:-0.18.0} # Automatically determine the architecture we're building on: @@ -37,8 +37,8 @@ if [ -z "$ARCH" ]; then esac fi -# There are reports that > 1 won't work here: -NUMJOBS=${NUMJOBS:-" -j1 "} +# We don't use this below as it breaks the build. +NUMJOBS=${NUMJOBS:-" -j6 "} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -55,9 +55,9 @@ elif [ "$ARCH" = "x86_64" ]; then fi cd $TMP -rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 -cd ${PKGNAM}-$VERSION +rm -rf re-alpine-${VERSION} +tar xvf $CWD/re-alpine-$VERSION.tar.?z* || exit 1 +cd re-alpine-$VERSION # Make sure ownerships and permissions are sane: chown -R root:root . @@ -86,17 +86,12 @@ CFLAGS="$SLKCFLAGS" \ --program-suffix= \ --build=$ARCH-slackware-linux -# This seems to ignore sysconfdir and libdir, so it's pretty useless to try them. -# Brute-force it. -# Eric says: no! Use configure parameters. -#zcat $CWD/alpine.config.h.diff.gz | patch -p1 --verbose || exit 1 - # Correct paths and programs in tech-notes.txt: zcat $CWD/alpine.tech-notes.txt.diff.gz | patch -p1 --verbose || exit 1 # Build and install: # Since we build non-compliant to RFC3501 we have to answer 'y' half-way: -echo y | make $NUMJOBS EXTRACFLAGS="-fPIC" SSLTYPE=unix || exit 1 +echo y | make EXTRACFLAGS="-fPIC" SSLTYPE=unix || exit 1 make install SSLTYPE=unix DESTDIR=$PKG || exit 1 @@ -171,11 +166,10 @@ PKG2=/tmp/package-imapd cd $TMP rm -rf $PKG2 mkdir -p $PKG2 -cd ${PKGNAM}-$VERSION/imap +cd re-alpine-$VERSION/imap mkdir -p $PKG2/usr/doc/imapd-$VERSION cp -a \ CONTENTS LICENSE.txt NOTICE SUPPORT \ - imap/docs/md5.txt \ $PKG2/usr/doc/imapd-$VERSION cat << EOF > $PKG2/usr/doc/imapd-$VERSION/additional-imap-documentation Additional documentation for imapd may be found in the alpine diff --git a/source/n/alpine/alpine.config.h.diff b/source/n/alpine/alpine.config.h.diff deleted file mode 100644 index 03064373..00000000 --- a/source/n/alpine/alpine.config.h.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- ./include/config.h.orig 2008-08-06 20:59:51.000000000 -0500 -+++ ./include/config.h 2008-08-06 21:00:37.000000000 -0500 -@@ -557,10 +557,10 @@ - #define STDC_HEADERS 1 - - /* System pinerc */ --#define SYSTEM_PINERC "/usr/lib/pine.conf" -+#define SYSTEM_PINERC "/etc/pine.conf" - - /* System fixed pinerc */ --#define SYSTEM_PINERC_FIXED "/usr/lib/pine.conf.fixed" -+#define SYSTEM_PINERC_FIXED "/etc/pine.conf.fixed" - - /* Pine-Centric Host Specifier */ - #define SYSTYPE "LNX" diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild index dc7014a3..eed6f86a 100755 --- a/source/n/bind/bind.SlackBuild +++ b/source/n/bind/bind.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,8 @@ PKGNAM=bind -VERSION=${VERSION:-9.7.3} -BUILD=${BUILD:-2} +VERSION=${VERSION:-9.9.1-P3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/bind/caching-example/named.root b/source/n/bind/caching-example/named.root index d081faaf..8fbbb656 100644 --- a/source/n/bind/caching-example/named.root +++ b/source/n/bind/caching-example/named.root @@ -9,8 +9,8 @@ ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: Jun 17, 2010 -; related version of root zone: 2010061700 +; last update: Jun 8, 2011 +; related version of root zone: 2011060800 ; ; formerly NS.INTERNIC.NET ; @@ -32,6 +32,7 @@ C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 128.8.10.90 +D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2D::D ; ; FORMERLY NS.NASA.GOV ; diff --git a/source/n/bluez-hcidump/bluez-hcidump-2.4.tar.sign b/source/n/bluez-hcidump/bluez-hcidump-2.4.tar.sign new file mode 100644 index 00000000..42ee696a --- /dev/null +++ b/source/n/bluez-hcidump/bluez-hcidump-2.4.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (GNU/Linux) + +iQIcBAABAgAGBQJPkb1tAAoJEAbKn10dzyZZFUkP/A2hX9Rjeg16vDfycTRnDJy2 +jrcA2ExrKnb8uYgvCuYlY1cXb+tS5xCGQt1YlFowV9ukx9tt5C0krAIKjfeZ90tJ +o/nD/us60t0n5sAOK230W1l8XBDuawnIN3zjznLCzntybOyl5lc9Uia5tCCd69rg +7UOmj6Ahsk0g8GEqIQgYhddM6Q/HQNjKGKqYPzjdInORgJz+C5E/ONpbsbL8MAfG +t/8S1CfnBuwaRCM8pUdCBLO2bj7oKHLE/vipccorMWDuXEsU1a1rilbbBlONLLFb +pgfqjkpAdqgICS9+YkdA7e+i/Ha2B0hS1qS7x5PGApSwWXaxNDMiaksMEHkh4B6A +b1va/nOepb+IlS67tF/SB0S7PyUyuKpBv6Ln8dpdz5gwbyJ2XGDNdmhe/4zTFjiv +HVrvS3Ms0ULv7NRX9rXiNEK1rmJ61uVzHInMJQUcASr4ZrdYSaCZ53Ejr+bqCDWV +DogI+ZSHOBgDSCSbY0UMhQtqxOE24vgT8IlJwQJNFMhRXpj550Jz1qbjUGNybnAI +fNYJ8RxdoLriJUY7+MmniUvcen6vAd/yXI4sp+GF6Akt72gkCA0T0Y41vIL3sQnj +M26O9Nn+j/GowSYATEj6QCWUCBH/BUxau+9tQfq7axiMOeiYJOAe3yciW6pP1Ysh +ZVBKF6fOxaegTPiooruJ +=q5pj +-----END PGP SIGNATURE----- diff --git a/source/n/bluez-hcidump/bluez-hcidump.SlackBuild b/source/n/bluez-hcidump/bluez-hcidump.SlackBuild index e03037ab..247e67dc 100755 --- a/source/n/bluez-hcidump/bluez-hcidump.SlackBuild +++ b/source/n/bluez-hcidump/bluez-hcidump.SlackBuild @@ -22,7 +22,7 @@ PKGNAM=bluez-hcidump -VERSION=${VERSION:-2.0} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -76,7 +76,6 @@ CFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/man \ - --disable-static \ --build=$ARCH-slackware-linux # Build and install: diff --git a/source/n/bluez/bluez-4.91.tar.sign b/source/n/bluez/bluez-4.91.tar.sign deleted file mode 100644 index bb9b05b6..00000000 --- a/source/n/bluez/bluez-4.91.tar.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBNkiAFyGugalF9Dw4RAqa6AJ9bxkhDm2sW6JqVMT8JwSa/5eFZaQCbBuKA -27f95iFeuRTVrhRkoFiTOto= -=u4px ------END PGP SIGNATURE----- diff --git a/source/n/bluez/bluez-4.99.tar.sign b/source/n/bluez/bluez-4.99.tar.sign new file mode 100644 index 00000000..a9a039be --- /dev/null +++ b/source/n/bluez/bluez-4.99.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (GNU/Linux) + +iQIcBAABAgAGBQJPVkejAAoJEAbKn10dzyZZ0rEP/1BvYxUAoYf0cP2pQIqDwzkV +l9PSVsxKq/n3rNwKEWBufo3heHYxVAG5prlPiY8yHj4Q0tFNiCSPL+zLObG++iDy +3x+wxmaNaqbYurXQolHOqmH1L4OeMqT3mdzlb7xN48RLHLiS0XwTUMu2VBcM00me +nd03q+7gV6c1v3bXrDalUJuQQYHeubSLT6YMDKmMj/7PiLfA8hEoOE1uWefcBcas +B9xi5IBY208Cdq5odL6ae8ybvvG/PTDSFAOZNCzqIjJMYEwBosh1TbPN1AvUu1z2 +bzbgAa3oaRXnGZNDJ07pwa+2A+jAAtDRNO2R6z5lovpT568nwY6bmDIvbcIHuMHj +xhrhbUvPnhIcn+no+WkAtYjNe8ydcdH8BkeA7o1oauRAYJlGoTIVugobu2a608NN +7bGChWnhTPaKty8p0NGuE5gFvMwwLeE3W3d50+JH6icNBZbZOYK+88q1OI9hTHSW +fUm/tydzqRwPDuqgt6CiYxT49AuwQ+MjfED0fwvlfta8A+tYUDkgaOkpUcJvq8v/ +Bnd0mUkT7l2fiymw7hfzJEh9EXBWmXJBs77zkYPBmzv/YDSCpMWZuEHI7gvcBu4j +BN/+pJfYwo/kPRS0nXc/Xt438H806SUdvD926MmRwmg5jYmBRVJSemYtPHfkC03L +MO/geWyy5aH5w/+THCgN +=BIdO +-----END PGP SIGNATURE----- diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild index 0403c932..d77c1514 100755 --- a/source/n/bluez/bluez.SlackBuild +++ b/source/n/bluez/bluez.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for bluez - http://www.bluez.org -# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PKGNAM=bluez VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -70,16 +70,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fixup the dbus config file for our usage: -zcat $CWD/patches/bluez-dbus-config.patch.gz | patch -p1 --verbose || exit 1 - -# Use a wrapper to check rc.bluetooth mode before starting bluetoothd -zcat $CWD/patches/bluez-run_udev_helper.patch.gz | patch -p1 --verbose || exit 1 - -# Unbreak a Dell USB mouse -# https://bugzilla.novell.com/show_bug.cgi?id=522287 -# https://bugzilla.redhat.com/show_bug.cgi?id=517088 -zcat $CWD/patches/bluez-unbreak_dell_mouse.patch.gz | patch -p1 --verbose || exit 1 +# Enable the audio socket in audio.conf: +zcat $CWD/bluez.enable.audio.socket.diff.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -89,10 +81,13 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --mandir=/usr/man \ --localstatedir=/var \ + --enable-datafiles \ + --enable-audio \ --enable-gstreamer \ --enable-alsa \ --enable-usb \ --enable-tools\ + --enable-input \ --enable-bccmd \ --enable-hid2hci \ --enable-dfutool \ @@ -101,38 +96,30 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-dund \ --enable-cups \ --enable-service \ - --enable-udevrules \ - --enable-configfiles \ + --enable-network \ + --enable-serial \ + --enable-health \ + --enable-pnat \ + --enable-maemo6 \ + --enable-wiimote \ + --enable-test \ + --enable-dbusoob \ + --with-ouifile=/usr/share/hwdata/oui.txt \ --disable-silent-rules \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# I'm don't think we need this, but I'll leave it commented just in case: -# http://bugs.archlinux.org/task/4930 -# The dbus-1 and bluetooth linkages are obvious, but I had to get the rt and -# pthread ones from the old bluez-utils (VERSION=3.36) tests/Makefile -#gcc $SLKCFLAGS $(pkg-config --cflags dbus-1) -DVERSION=3.36 \ -# -L$(pwd)/lib/.libs -ldbus-1 -lbluetooth -lpthread -lrt \ -# $CWD/passkey-agent.c -o $PKG/usr/bin/passkey-agent || exit 1 - +cp scripts/bluetooth-serial.rules $PKG/lib/udev/rules.d/97-bluetooth-serial.rules || exit 1 cp -a scripts/bluetooth_serial $PKG/lib/udev/bluetooth_serial || exit 1 chmod 0755 $PKG/lib/udev/bluetooth_serial -cat $CWD/config/bluetooth.sh > $PKG/lib/udev/bluetooth.sh -chmod 0755 $PKG/lib/udev/bluetooth.sh - -# SuSE says this is safe... :-) -mkdir -p $PKG/etc/modprobe.d -cat $CWD/config/bluetooth.modprobe > $PKG/etc/modprobe.d/bluetooth.conf - mkdir -p $PKG/etc/bluetooth cp -a audio/audio.conf $PKG/etc/bluetooth cp -a input/input.conf $PKG/etc/bluetooth cp -a network/network.conf $PKG/etc/bluetooth cp -a serial/serial.conf $PKG/etc/bluetooth -cp -a tools/rfcomm.conf $PKG/etc/bluetooth chmod 644 $PKG/etc/bluetooth/*.conf mkdir -p $PKG/etc/alsa diff --git a/source/n/bluez/bluez.enable.audio.socket.diff b/source/n/bluez/bluez.enable.audio.socket.diff new file mode 100644 index 00000000..52b9d0c6 --- /dev/null +++ b/source/n/bluez/bluez.enable.audio.socket.diff @@ -0,0 +1,12 @@ +--- ./audio/audio.conf.orig 2010-08-25 00:10:02.000000000 -0500 ++++ ./audio/audio.conf 2012-09-09 12:36:31.766492102 -0500 +@@ -4,6 +4,9 @@ + # particular interface + [General] + ++# Enable the audio socket ++Enable=Socket ++ + # Switch to master role for incoming connections (defaults to true) + #Master=true + diff --git a/source/n/bluez/config/bluetooth.sh b/source/n/bluez/config/bluetooth.sh deleted file mode 100644 index 22034551..00000000 --- a/source/n/bluez/config/bluetooth.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# Check whether /etc/rc.d/rc.bluetooth is executable before starting -# the bluetooth subsystem for hotplugged bluetooth devices -[ -x /etc/rc.d/rc.bluetooth ] && exec /usr/sbin/bluetoothd --udev -exit 0 - diff --git a/source/n/bluez/config/rc.bluetooth b/source/n/bluez/config/rc.bluetooth index 12540d83..296c4542 100644 --- a/source/n/bluez/config/rc.bluetooth +++ b/source/n/bluez/config/rc.bluetooth @@ -1,12 +1,11 @@ #!/bin/sh bluez_start() { - # bluetoothd requires dbus, but dbus isn't started early enough during - # system boot, so we have to re-trigger the events now - udevadm trigger --subsystem-match=bluetooth --action=add + /usr/sbin/bluetoothd } bluez_stop() { + udevadm trigger --subsystem-match=bluetooth --action=remove pkill -TERM bluetoothd 1>/dev/null 2>/dev/null } diff --git a/source/n/bluez/doinst.sh b/source/n/bluez/doinst.sh index 0d4dde1d..fe68ad7f 100644 --- a/source/n/bluez/doinst.sh +++ b/source/n/bluez/doinst.sh @@ -25,5 +25,4 @@ config etc/bluetooth/main.conf.new config etc/bluetooth/network.conf.new config etc/bluetooth/serial.conf.new config etc/bluetooth/rfcomm.conf.new -config etc/modprobe.d/bluetooth.conf.new diff --git a/source/n/bluez/passkey-agent.c b/source/n/bluez/passkey-agent.c deleted file mode 100644 index 8ac91d27..00000000 --- a/source/n/bluez/passkey-agent.c +++ /dev/null @@ -1,418 +0,0 @@ -/* - * - * BlueZ - Bluetooth protocol stack for Linux - * - * Copyright (C) 2004-2008 Marcel Holtmann - * - * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include - -#include - -#define INTERFACE "org.bluez.Security" - -static char *passkey = NULL; -static char *address = NULL; - -static int do_reject = 0; - -static volatile sig_atomic_t __io_canceled = 0; -static volatile sig_atomic_t __io_terminated = 0; - -static void sig_term(int sig) -{ - __io_canceled = 1; -} - -static DBusHandlerResult agent_filter(DBusConnection *conn, - DBusMessage *msg, void *data) -{ - const char *name, *old, *new; - - if (!dbus_message_is_signal(msg, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - - if (!dbus_message_get_args(msg, NULL, - DBUS_TYPE_STRING, &name, DBUS_TYPE_STRING, &old, - DBUS_TYPE_STRING, &new, DBUS_TYPE_INVALID)) { - fprintf(stderr, "Invalid arguments for NameOwnerChanged signal"); - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } - - if (!strcmp(name, "org.bluez") && *new == '\0') { - fprintf(stderr, "Passkey service has been terminated\n"); - __io_terminated = 1; - } - - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -} - -static DBusHandlerResult request_message(DBusConnection *conn, - DBusMessage *msg, void *data) -{ - DBusMessage *reply; - const char *path, *address; - dbus_bool_t numeric; - - if (!passkey) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - - if (!dbus_message_get_args(msg, NULL, - DBUS_TYPE_STRING, &path, DBUS_TYPE_STRING, &address, - DBUS_TYPE_BOOLEAN, &numeric, DBUS_TYPE_INVALID)) { - fprintf(stderr, "Invalid arguments for passkey Request method"); - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } - - if (do_reject) { - reply = dbus_message_new_error(msg, - "org.bluez.Error.Rejected", ""); - goto send; - } - - reply = dbus_message_new_method_return(msg); - if (!reply) { - fprintf(stderr, "Can't create reply message\n"); - return DBUS_HANDLER_RESULT_NEED_MEMORY; - } - - printf("Passkey request for device %s\n", address); - - dbus_message_append_args(reply, DBUS_TYPE_STRING, &passkey, - DBUS_TYPE_INVALID); - -send: - dbus_connection_send(conn, reply, NULL); - - dbus_connection_flush(conn); - - dbus_message_unref(reply); - - return DBUS_HANDLER_RESULT_HANDLED; -} - -static DBusHandlerResult cancel_message(DBusConnection *conn, - DBusMessage *msg, void *data) -{ - DBusMessage *reply; - const char *path, *address; - - if (!dbus_message_get_args(msg, NULL, - DBUS_TYPE_STRING, &path, DBUS_TYPE_STRING, &address, - DBUS_TYPE_INVALID)) { - fprintf(stderr, "Invalid arguments for passkey Confirm method"); - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } - - printf("Request canceled for device %s\n", address); - - reply = dbus_message_new_method_return(msg); - if (!reply) { - fprintf(stderr, "Can't create reply message\n"); - return DBUS_HANDLER_RESULT_NEED_MEMORY; - } - - dbus_connection_send(conn, reply, NULL); - - dbus_connection_flush(conn); - - dbus_message_unref(reply); - - return DBUS_HANDLER_RESULT_HANDLED; -} - -static DBusHandlerResult release_message(DBusConnection *conn, - DBusMessage *msg, void *data) -{ - DBusMessage *reply; - - if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_INVALID)) { - fprintf(stderr, "Invalid arguments for passkey Release method"); - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } - - if (!__io_canceled) - fprintf(stderr, "Passkey service has been released\n"); - - __io_terminated = 1; - - reply = dbus_message_new_method_return(msg); - if (!reply) { - fprintf(stderr, "Can't create reply message\n"); - return DBUS_HANDLER_RESULT_NEED_MEMORY; - } - - dbus_connection_send(conn, reply, NULL); - - dbus_connection_flush(conn); - - dbus_message_unref(reply); - - return DBUS_HANDLER_RESULT_HANDLED; -} - -static DBusHandlerResult agent_message(DBusConnection *conn, - DBusMessage *msg, void *data) -{ - if (dbus_message_is_method_call(msg, "org.bluez.PasskeyAgent", "Request")) - return request_message(conn, msg, data); - - if (dbus_message_is_method_call(msg, "org.bluez.PasskeyAgent", "Cancel")) - return cancel_message(conn, msg, data); - - if (dbus_message_is_method_call(msg, "org.bluez.PasskeyAgent", "Release")) - return release_message(conn, msg, data); - - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -} - -static const DBusObjectPathVTable agent_table = { - .message_function = agent_message, -}; - -static int register_agent(DBusConnection *conn, const char *agent_path, - const char *remote_address, int use_default) -{ - DBusMessage *msg, *reply; - DBusError err; - const char *path, *method, *address = remote_address; - - if (!dbus_connection_register_object_path(conn, agent_path, - &agent_table, NULL)) { - fprintf(stderr, "Can't register object path for agent\n"); - return -1; - } - - if (use_default) { - path = "/org/bluez"; - method = "RegisterDefaultPasskeyAgent"; - } else { - path = "/org/bluez/hci0"; - method = "RegisterPasskeyAgent"; - } - - msg = dbus_message_new_method_call("org.bluez", path, INTERFACE, method); - if (!msg) { - fprintf(stderr, "Can't allocate new method call\n"); - return -1; - } - - if (use_default) - dbus_message_append_args(msg, DBUS_TYPE_STRING, &agent_path, - DBUS_TYPE_INVALID); - else - dbus_message_append_args(msg, DBUS_TYPE_STRING, &agent_path, - DBUS_TYPE_STRING, &address, DBUS_TYPE_INVALID); - - dbus_error_init(&err); - - reply = dbus_connection_send_with_reply_and_block(conn, msg, -1, &err); - - dbus_message_unref(msg); - - if (!reply) { - fprintf(stderr, "Can't register passkey agent\n"); - if (dbus_error_is_set(&err)) { - fprintf(stderr, "%s\n", err.message); - dbus_error_free(&err); - } - return -1; - } - - dbus_message_unref(reply); - - dbus_connection_flush(conn); - - return 0; -} - -static int unregister_agent(DBusConnection *conn, const char *agent_path, - const char *remote_address, int use_default) -{ - DBusMessage *msg, *reply; - DBusError err; - const char *path, *method, *address = remote_address; - - if (use_default) { - path = "/org/bluez"; - method = "UnregisterDefaultPasskeyAgent"; - } else { - path = "/org/bluez/hci0"; - method = "UnregisterPasskeyAgent"; - } - - msg = dbus_message_new_method_call("org.bluez", path, INTERFACE, method); - if (!msg) { - fprintf(stderr, "Can't allocate new method call\n"); - dbus_connection_unref(conn); - exit(1); - } - - if (use_default) - dbus_message_append_args(msg, DBUS_TYPE_STRING, &agent_path, - DBUS_TYPE_INVALID); - else - dbus_message_append_args(msg, DBUS_TYPE_STRING, &agent_path, - DBUS_TYPE_STRING, &address, DBUS_TYPE_INVALID); - - dbus_error_init(&err); - - reply = dbus_connection_send_with_reply_and_block(conn, msg, -1, &err); - - dbus_message_unref(msg); - - if (!reply) { - fprintf(stderr, "Can't unregister passkey agent\n"); - if (dbus_error_is_set(&err)) { - fprintf(stderr, "%s\n", err.message); - dbus_error_free(&err); - } - return -1; - } - - dbus_message_unref(reply); - - dbus_connection_flush(conn); - - dbus_connection_unregister_object_path(conn, agent_path); - - return 0; -} - -static void usage(void) -{ - printf("Bluetooth passkey agent ver %s\n\n", VERSION); - - printf("Usage:\n" - "\tpasskey-agent [--default] [--path agent-path] [address]\n" - "\n"); -} - -static struct option main_options[] = { - { "default", 0, 0, 'd' }, - { "reject", 0, 0, 'r' }, - { "path", 1, 0, 'p' }, - { "help", 0, 0, 'h' }, - { 0, 0, 0, 0 } -}; - -int main(int argc, char *argv[]) -{ - struct sigaction sa; - DBusConnection *conn; - char match_string[128], default_path[128], *agent_path = NULL; - int opt, use_default = 0; - - snprintf(default_path, sizeof(default_path), - "/org/bluez/passkey_agent_%d", getpid()); - - while ((opt = getopt_long(argc, argv, "+dp:h", main_options, NULL)) != EOF) { - switch(opt) { - case 'd': - use_default = 1; - break; - case 'r': - do_reject = 1; - break; - case 'p': - if (optarg[0] != '/') { - fprintf(stderr, "Invalid path\n"); - exit(1); - } - agent_path = strdup(optarg); - break; - case 'h': - usage(); - exit(0); - default: - exit(1); - } - } - - argc -= optind; - argv += optind; - optind = 0; - - if (argc < 1) { - usage(); - exit(1); - } - - passkey = strdup(argv[0]); - address = (argc > 1) ? strdup(argv[1]) : NULL; - - if (!use_default && !address) { - usage(); - exit(1); - } - - if (!agent_path) - agent_path = strdup(default_path); - - conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); - if (!conn) { - fprintf(stderr, "Can't get on system bus"); - exit(1); - } - - if (register_agent(conn, agent_path, address, use_default) < 0) { - dbus_connection_unref(conn); - exit(1); - } - - if (!dbus_connection_add_filter(conn, agent_filter, NULL, NULL)) - fprintf(stderr, "Can't add signal filter"); - - snprintf(match_string, sizeof(match_string), - "interface=%s,member=NameOwnerChanged,arg0=%s", - DBUS_INTERFACE_DBUS, "org.bluez"); - - dbus_bus_add_match(conn, match_string, NULL); - - memset(&sa, 0, sizeof(sa)); - sa.sa_flags = SA_NOCLDSTOP; - sa.sa_handler = sig_term; - sigaction(SIGTERM, &sa, NULL); - sigaction(SIGINT, &sa, NULL); - - while (!__io_canceled && !__io_terminated) { - if (dbus_connection_read_write_dispatch(conn, 500) != TRUE) - break; - } - - if (!__io_terminated) - unregister_agent(conn, agent_path, address, use_default); - - if (passkey) - free(passkey); - - dbus_connection_unref(conn); - - return 0; -} diff --git a/source/n/bluez/patches/bluez-dbus-config.patch b/source/n/bluez/patches/bluez-dbus-config.patch deleted file mode 100644 index 0d0fb462..00000000 --- a/source/n/bluez/patches/bluez-dbus-config.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ./src/bluetooth.conf.orig 2010-10-04 06:41:01.000000000 -0500 -+++ ./src/bluetooth.conf 2010-11-07 19:50:47.229999322 -0600 -@@ -11,13 +11,18 @@ - - - -+ - - - - - -- -+ - -+ -+ -+ - - - - -- Bitstream Vera Serif - DejaVu Serif - Liberation Serif -+ Bitstream Vera Serif - Times New Roman - Times - Nimbus Roman No9 L -@@ -25,9 +25,9 @@ - Sans-serif faces - --> - -- Bitstream Vera Sans - DejaVu Sans - Liberation Sans -+ Bitstream Vera Sans - Arial - Helvetica - Verdana -@@ -41,9 +41,9 @@ - Monospace faces - --> - -- Bitstream Vera Sans Mono - DejaVu Sans Mono - Liberation Mono -+ Bitstream Vera Sans Mono - Inconsolata - Courier New - Courier -diff -Nur fontconfig-2.8.0.orig/conf.d/60-latin.conf fontconfig-2.8.0/conf.d/60-latin.conf ---- fontconfig-2.8.0.orig/conf.d/60-latin.conf 2009-11-16 11:24:52.000000000 -0600 -+++ fontconfig-2.8.0/conf.d/60-latin.conf 2009-12-01 21:46:39.925935327 -0600 +--- ./conf.d/60-latin.conf.orig 2012-03-10 00:24:45.000000000 -0600 ++++ ./conf.d/60-latin.conf 2012-07-03 15:57:40.109978298 -0500 @@ -4,8 +4,8 @@ serif @@ -67,3 +30,65 @@ diff -Nur fontconfig-2.8.0.orig/conf.d/60-latin.conf fontconfig-2.8.0/conf.d/60- Inconsolata Andale Mono Courier New +--- ./conf.d/45-latin.conf.orig 2012-03-10 00:24:45.000000000 -0600 ++++ ./conf.d/45-latin.conf 2012-07-03 15:57:28.685978786 -0500 +@@ -10,15 +10,15 @@ + Serif faces + --> + +- Bitstream Vera Serif ++ DejaVu Serif + serif + + +- DejaVu Serif ++ Liberation Serif + serif + + +- Liberation Serif ++ Bitstream Vera Serif + serif + + +@@ -49,15 +49,15 @@ + Sans-serif faces + --> + +- Bitstream Vera Sans ++ DejaVu Sans + sans-serif + + +- DejaVu Sans ++ Liberation Sans + sans-serif + + +- Liberation Sans ++ Bitstream Vera Sans + sans-serif + + +@@ -91,10 +91,6 @@ + +- +- Bitstream Vera Sans Mono +- monospace +- + + DejaVu Sans Mono + monospace +@@ -103,6 +99,10 @@ + Liberation Mono + monospace + ++ ++ Bitstream Vera Sans Mono ++ monospace ++ + + Inconsolata + monospace diff --git a/source/x/freeglut/RATIONALE b/source/x/freeglut/RATIONALE new file mode 100644 index 00000000..0e2c59ba --- /dev/null +++ b/source/x/freeglut/RATIONALE @@ -0,0 +1,14 @@ +From mesa-8.0 git log: + + commit 34a28ccbf459ed5710aafba5e7149e8291cb808c + Author: José Fonseca + Date: Sat Jul 9 11:07:14 2011 +0100 + + glut: Remove GLUT source. + + Most distros ship freeglut, and most people don't care one vs the other, + and it hasn't been really maintained. + + So it is better to have Mesa GLUT be revisioned and built separately + from Mesa. + diff --git a/source/x/freeglut/freeglut.SlackBuild b/source/x/freeglut/freeglut.SlackBuild new file mode 100755 index 00000000..e209f82e --- /dev/null +++ b/source/x/freeglut/freeglut.SlackBuild @@ -0,0 +1,97 @@ +#!/bin/sh + +# Slackware build script for freeglut + +# Copyright 2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=freeglut +VERSION=${VERSION:-2.8.0} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j7 "} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PRGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz || exit 1 +cd $PRGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --disable-static \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html +cp -a \ + AUTHORS COPYING* INSTALL NEWS README TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION +cp -a doc/*.{html,png} $PKG/usr/doc/$PRGNAM-$VERSION/html +find $PKG/usr/doc -type f -exec chmod 0644 {} \; + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/freeglut/slack-desc b/source/x/freeglut/slack-desc new file mode 100644 index 00000000..9fcda6f5 --- /dev/null +++ b/source/x/freeglut/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +freeglut: freeglut (alternative GLUT library) +freeglut: +freeglut: freeglut is a completely OpenSourced alternative to the OpenGL +freeglut: Utility Toolkit (GLUT) library. GLUT (and hence freeglut) allows +freeglut: the user to create and manage windows containing OpenGL contexts +freeglut: on a wide range of platforms and also read the mouse, keyboard, and +freeglut: joystick functions. +freeglut: +freeglut: Homepage: http://freeglut.sourceforge.net/ +freeglut: +freeglut: diff --git a/source/x/libdrm/libdrm.SlackBuild b/source/x/libdrm/libdrm.SlackBuild index fff398a1..31181fb5 100755 --- a/source/x/libdrm/libdrm.SlackBuild +++ b/source/x/libdrm/libdrm.SlackBuild @@ -60,9 +60,6 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION -# Fix missing definitions in drm_mode.h: -zcat $CWD/libdrm.uint32_t.diff.gz | patch -p1 --verbose || exit 1 - # Make sure ownerships and permissions are sane: chown -R root:root . find . \ @@ -79,6 +76,7 @@ CFLAGS="$SLKCFLAGS" \ --enable-udev \ --enable-nouveau-experimental-api \ --enable-vmwgfx-experimental-api \ + --enable-omap-experimental-api \ --build=$ARCH-slackware-linux # Build and install: diff --git a/source/x/libdrm/libdrm.uint32_t.diff b/source/x/libdrm/libdrm.uint32_t.diff deleted file mode 100644 index 571d72ac..00000000 --- a/source/x/libdrm/libdrm.uint32_t.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./include/drm/drm_mode.h.orig 2010-01-21 12:45:40.000000000 -0600 -+++ ./include/drm/drm_mode.h 2010-02-22 13:16:36.000000000 -0600 -@@ -307,6 +307,8 @@ - #define DRM_MODE_PAGE_FLIP_EVENT 0x01 - #define DRM_MODE_PAGE_FLIP_FLAGS DRM_MODE_PAGE_FLIP_EVENT - -+#include /* needed for uint32_t and uint64_t typedefs */ -+ - struct drm_mode_crtc_page_flip { - uint32_t crtc_id; - uint32_t fb_id; diff --git a/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild b/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild index 9dcecac1..97a92cb4 100755 --- a/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild +++ b/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,9 +21,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.06.0.20100721 +VERSION=1.07.2 ARCH=noarch -BUILD=3 +BUILD=1 CWD=$(pwd) TMP=${TMP:-/tmp} diff --git a/source/x/libhangul/libhangul.SlackBuild b/source/x/libhangul/libhangul.SlackBuild index 92a9ed16..9394cc07 100755 --- a/source/x/libhangul/libhangul.SlackBuild +++ b/source/x/libhangul/libhangul.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2008, 2009 Eric Hameleers , Eindhoven, NL -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2008, 2009, 2012 Eric Hameleers , Eindhoven, NL +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -32,23 +32,27 @@ # # ----------------------------------------------------------------------------- +# Modified 2012 by Eric Hameleers for ARM port. + PKGNAM=libhangul -VERSION=${VERSION:-0.0.12} +VERSION=${VERSION:-0.1.0} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:-" -j7 "} + # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:-" -j7 "} - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -58,11 +62,19 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -93,7 +105,7 @@ CFLAGS="$SLKCFLAGS" \ --disable-static \ --program-prefix= \ --program-suffix= \ - --build=$ARCH-slackware-linux + --build=$TARGET make $NUMJOBS || make || exit 1 make DESTDIR=$PKG install || exit 1 @@ -129,5 +141,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg --linkadd y --chown n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz diff --git a/source/x/libhangul/slack-desc b/source/x/libhangul/slack-desc index 8d76a757..49b2eec1 100644 --- a/source/x/libhangul/slack-desc +++ b/source/x/libhangul/slack-desc @@ -12,7 +12,7 @@ libhangul: This library implements Hangul keyboard input with various types of libhangul: Korean keyboards. It is intended to be a base library of Korean libhangul: input methods on multiple platforms. libhangul: -libhangul: libhangul home: http://kldp.net/projects/hangul/ +libhangul: libhangul home: http://code.google.com/p/libhangul/ libhangul: libhangul: libhangul: diff --git a/source/x/mesa/get-mesa.sh b/source/x/mesa/get-mesa.sh index c014d8a1..253deeb4 100755 --- a/source/x/mesa/get-mesa.sh +++ b/source/x/mesa/get-mesa.sh @@ -1,5 +1,5 @@ # Pull a stable branch + patches -BRANCH=7.9 +BRANCH=7.10 rm -rf mesa git clone git://anongit.freedesktop.org/git/mesa/mesa diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index 7bdc273e..ca670188 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -21,14 +21,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=mesa -VERSION=7.9.2 +VERSION=8.0.4 DEMOVERS=8.0.1 BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j8} # Be sure this list is up-to-date: -DRI_DRIVERS="i810,i915,i965,mach64,mga,nouveau,r128,r200,r300,r600,radeon,savage,sis,tdfx,unichrome,swrast" +DRI_DRIVERS="i915,i965,nouveau,r200,radeon,swrast" if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -59,11 +59,6 @@ cd $TMP rm -rf Mesa-${VERSION} tar xvf $CWD/MesaLib-${VERSION}.tar.?z* || exit 1 -# If MesaLib came from git, we might already have GLUT. -if [ ! -d Mesa-${VERSION}/src/glut/glx ]; then - tar xvf $CWD/MesaGLUT-${VERSION}.tar.?z* || exit 1 -fi - cd Mesa-$VERSION # Make sure ownerships and permissions are sane: @@ -76,21 +71,14 @@ find . \ # Apply patches from git (and maybe elsewhere): # Patches obtained by: -# git checkout origin/7.9 -# git format-patch 67aeab0b77fb6be864088e69ea74a010b6543fa1.. +# git checkout origin/8.0 +# git format-patch 3d657b14b4cab98a2945904823e78cd8950944f4.. # 8.0.3 release if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then for patch in $CWD/patches/*.patch ; do patch -p1 < $patch || exit 1 ; done fi -# Revert "i915: Enable ARB_fragment_shader by default." -# https://bugzilla.redhat.com/show_bug.cgi?id=643399 -zcat $CWD/patches/i915_fragment_shader_disable.patch.gz | patch -p1 || exit 1 - -# Allow to build against libdrm-2.4.23: -zcat $CWD/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch.gz | patch -p1 || exit 1 - if [ ! -r configure ]; then autoreconf || exit 1 fi @@ -104,17 +92,13 @@ CFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/mesa-$VERSION \ --with-dri-driverdir=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \ --with-dri-drivers="$DRI_DRIVERS" \ - --enable-xcb \ - --enable-gallium-nouveau \ + --with-gallium-drivers=nouveau,swrast,r300,r600 \ + --enable-gallium-llvm \ --build=$ARCH-slackware-linux -# --enable-gallium-llvm \ -# --enable-gallium-swrast \ -# --disable-gallium-svga \ -# --disable-gallium-i915 \ -# --disable-gallium-i965 \ -# --disable-gallium-radeon \ -# --disable-gallium-r600 \ +# r300 requires llvm +# Other gallium drivers: +# galahad,i915,identity,llvmpipe,noop,nv50,nvc0,nvfx,rbug,softpipe,svga,trace make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/x/mesa/patches/i915_fragment_shader_disable.patch b/source/x/mesa/patches/i915_fragment_shader_disable.patch deleted file mode 100644 index d2aee8e7..00000000 --- a/source/x/mesa/patches/i915_fragment_shader_disable.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e5a4106be7c8b87821f6b5d21fec99a402825740 Mon Sep 17 00:00:00 2001 -From: Robert Hooker -Date: Wed, 8 Sep 2010 12:33:09 -0400 -Subject: [PATCH] Revert "i915: Enable ARB_fragment_shader by default." - -This reverts commit a58514cc9c5cc5867f9140700462c5ac5749550d. ---- - src/mesa/drivers/dri/intel/intel_screen.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c -index 0a542a7..8ae2cd2 100644 ---- a/src/mesa/drivers/dri/intel/intel_screen.c -+++ b/src/mesa/drivers/dri/intel/intel_screen.c -@@ -70,7 +70,7 @@ PUBLIC const char __driConfigOptions[] = - DRI_CONF_DESC(en, "Enable early Z in classic mode (unstable, 945-only).") - DRI_CONF_OPT_END - -- DRI_CONF_OPT_BEGIN(fragment_shader, bool, true) -+ DRI_CONF_OPT_BEGIN(fragment_shader, bool, false) - DRI_CONF_DESC(en, "Enable limited ARB_fragment_shader support on 915/945.") - DRI_CONF_OPT_END - --- -1.7.2 - diff --git a/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch b/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch deleted file mode 100644 index d0ce04d2..00000000 --- a/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -ur a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c ---- a/src/gallium/drivers/nouveau/nouveau_screen.c 2010-10-02 00:51:28.000000000 +0200 -+++ b/src/gallium/drivers/nouveau/nouveau_screen.c 2010-12-11 18:18:20.527000045 +0100 -@@ -236,7 +236,7 @@ - int ret; - - ret = nouveau_channel_alloc(dev, 0xbeef0201, 0xbeef0202, -- &screen->channel); -+ 512*1024, &screen->channel); - if (ret) - return ret; - screen->device = dev; -diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c ---- a/src/mesa/drivers/dri/nouveau/nouveau_context.c 2010-10-05 03:58:00.000000000 +0200 -+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c 2010-12-11 18:18:20.528000045 +0100 -@@ -129,7 +129,7 @@ - - /* Allocate a hardware channel. */ - ret = nouveau_channel_alloc(context_dev(ctx), 0xbeef0201, 0xbeef0202, -- &nctx->hw.chan); -+ 512*1024, &nctx->hw.chan); - if (ret) { - nouveau_error("Error initializing the FIFO.\n"); - return GL_FALSE; -Nur in b/src/mesa/drivers/dri/nouveau: nouveau_context.c.orig. -diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_surface.c b/src/mesa/drivers/dri/nouveau/nouveau_surface.c ---- a/src/mesa/drivers/dri/nouveau/nouveau_surface.c 2010-04-27 23:41:21.000000000 +0200 -+++ b/src/mesa/drivers/dri/nouveau/nouveau_surface.c 2010-12-11 18:09:19.750000046 +0100 -@@ -34,8 +34,8 @@ - unsigned flags, unsigned format, - unsigned width, unsigned height) - { -- unsigned tile_mode, cpp = _mesa_get_format_bytes(format); -- int ret; -+ unsigned tile_mode = 0, tile_flags = 0; -+ int ret, cpp = _mesa_get_format_bytes(format); - - nouveau_bo_ref(NULL, &s->bo); - -@@ -51,13 +51,21 @@ - if (layout == TILED) { - s->pitch = align(s->pitch, 256); - tile_mode = s->pitch; -+ -+ if (cpp == 4) -+ tile_flags = NOUVEAU_BO_TILE_32BPP; -+ else if (cpp == 2) -+ tile_flags = NOUVEAU_BO_TILE_16BPP; -+ -+ if (_mesa_get_format_bits(format, GL_DEPTH_BITS)) -+ tile_flags |= NOUVEAU_BO_TILE_ZETA; -+ - } else { - s->pitch = align(s->pitch, 64); -- tile_mode = 0; - } - - ret = nouveau_bo_new_tile(context_dev(ctx), flags, 0, s->pitch * height, -- tile_mode, 0, &s->bo); -+ tile_mode, tile_flags, &s->bo); - assert(!ret); - } - -diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c ---- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c 2010-10-05 03:58:00.000000000 +0200 -+++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c 2010-12-11 18:18:20.528000045 +0100 -@@ -32,7 +32,7 @@ - - /* Arbitrary pushbuf length we can assume we can get with a single - * WAIT_RING. */ --#define PUSHBUF_DWORDS 2048 -+#define PUSHBUF_DWORDS 65536 - - /* Functions to set up struct nouveau_array_state from something like - * a GL array or index buffer. */ -diff -ur a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c ---- a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2010-10-05 03:58:00.000000000 +0200 -+++ b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2010-12-11 18:15:17.756000046 +0100 -@@ -64,8 +64,8 @@ - - if (!nfb->lma_bo || nfb->lma_bo->size != size) { - nouveau_bo_ref(NULL, &nfb->lma_bo); -- nouveau_bo_new(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size, -- &nfb->lma_bo); -+ nouveau_bo_new_tile(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size, -+ 0, NOUVEAU_BO_TILE_ZETA, &nfb->lma_bo); - } - - nouveau_bo_markl(bctx, celsius, NV17TCL_LMA_DEPTH_BUFFER_OFFSET, diff --git a/source/x/mtdev/mtdev.SlackBuild b/source/x/mtdev/mtdev.SlackBuild new file mode 100755 index 00000000..e973ed34 --- /dev/null +++ b/source/x/mtdev/mtdev.SlackBuild @@ -0,0 +1,97 @@ +#!/bin/sh + +# Slackware build script for mtdev + +# Copyright 2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=mtdev +VERSION=${VERSION:-1.1.2} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PRGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +cd $PRGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux \ + --disable-static + +make +make install DESTDIR=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + COPYING ChangeLog INSTALL README \ + $PKG/usr/doc/$PRGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/mtdev/mtdev.url b/source/x/mtdev/mtdev.url new file mode 100644 index 00000000..f1989e19 --- /dev/null +++ b/source/x/mtdev/mtdev.url @@ -0,0 +1 @@ +http://bitmath.org/code/mtdev/ diff --git a/source/x/mtdev/slack-desc b/source/x/mtdev/slack-desc new file mode 100644 index 00000000..0eaaae9e --- /dev/null +++ b/source/x/mtdev/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +mtdev: mtdev (multitouch device library) +mtdev: +mtdev: mtdev is a stand-alone library which transforms all variants of +mtdev: kernel MT events to the slotted type B protocol. The events put +mtdev: into mtdev may be from any MT device, specifically type A without +mtdev: contact tracking, type A with contact tracking, or type B with +mtdev: contact tracking. +mtdev: The bulk of the mtdev code has been out there since 2008 as part of +mtdev: the Multitouch X Driver. With this package, finger tracking and +mtdev: seamless MT protocol handling is available under a free license. +mtdev: diff --git a/source/x/radeon_ucode/radeon_ucode.SlackBuild b/source/x/radeon_ucode/radeon_ucode.SlackBuild deleted file mode 100755 index 7482b4cc..00000000 --- a/source/x/radeon_ucode/radeon_ucode.SlackBuild +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# Slackware build script for radeon_ucode - -# Copyright 2010 Robby Workman, Northport, Alabama, USA -# Copyright 2010, 2011 Patrick Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PKGNAM=radeon_ucode -VERSION=20110302 -BUILD=${BUILD:-1} - -ARCH=noarch - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $PKG/lib/firmware/radeon $PKG/usr/doc/$PKGNAM-$VERSION -cp -a $CWD/ucode-$VERSION/* $PKG/lib/firmware/radeon -mv $PKG/lib/firmware/radeon/LICENSE.radeon $PKG/usr/doc/$PKGNAM-$VERSION - -chown -R root:root $PKG -find $PKG \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/x/radeon_ucode/slack-desc b/source/x/radeon_ucode/slack-desc deleted file mode 100644 index 01810b94..00000000 --- a/source/x/radeon_ucode/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -radeon_ucode: radeon_ucode (microcode/firmware for some Radeon graphics cards) -radeon_ucode: -radeon_ucode: radeon_ucode contains the microcode/firmware for some models of -radeon_ucode: ATI/AMD Radeon graphics cards. -radeon_ucode: -radeon_ucode: http://people.freedesktop.org/~agd5f/radeon_ucode/ -radeon_ucode: -radeon_ucode: -radeon_ucode: -radeon_ucode: -radeon_ucode: diff --git a/source/x/radeon_ucode/ucode-20110302/LICENSE.radeon b/source/x/radeon_ucode/ucode-20110302/LICENSE.radeon deleted file mode 100644 index 2542d649..00000000 --- a/source/x/radeon_ucode/ucode-20110302/LICENSE.radeon +++ /dev/null @@ -1,51 +0,0 @@ -Copyright (C) 2009-2011 Advanced Micro Devices, Inc. All rights reserved. - -REDISTRIBUTION: Permission is hereby granted, free of any license fees, -to any person obtaining a copy of this microcode (the "Software"), to -install, reproduce, copy and distribute copies, in binary form only, of -the Software and to permit persons to whom the Software is provided to -do the same, provided that the following conditions are met: - -No reverse engineering, decompilation, or disassembly of this Software -is permitted. - -Redistributions must reproduce the above copyright notice, this -permission notice, and the following disclaimers and notices in the -Software documentation and/or other materials provided with the -Software. - -DISCLAIMER: THE USE OF THE SOFTWARE IS AT YOUR SOLE RISK. THE SOFTWARE -IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND AND COPYRIGHT -HOLDER AND ITS LICENSORS EXPRESSLY DISCLAIM ALL WARRANTIES, EXPRESS AND -IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -COPYRIGHT HOLDER AND ITS LICENSORS DO NOT WARRANT THAT THE SOFTWARE WILL -MEET YOUR REQUIREMENTS, OR THAT THE OPERATION OF THE SOFTWARE WILL BE -UNINTERRUPTED OR ERROR-FREE. THE ENTIRE RISK ASSOCIATED WITH THE USE OF -THE SOFTWARE IS ASSUMED BY YOU. FURTHERMORE, COPYRIGHT HOLDER AND ITS -LICENSORS DO NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE -OR THE RESULTS OF THE USE OF THE SOFTWARE IN TERMS OF ITS CORRECTNESS, -ACCURACY, RELIABILITY, CURRENTNESS, OR OTHERWISE. - -DISCLAIMER: UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENCE, SHALL COPYRIGHT -HOLDER AND ITS LICENSORS OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS -("AUTHORIZED REPRESENTATIVES") BE LIABLE FOR ANY INCIDENTAL, INDIRECT, -SPECIAL OR CONSEQUENTIAL DAMAGES (INCLUDING DAMAGES FOR LOSS OF BUSINESS -PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, AND THE -LIKE) ARISING OUT OF THE USE, MISUSE OR INABILITY TO USE THE SOFTWARE, -BREACH OR DEFAULT, INCLUDING THOSE ARISING FROM INFRINGEMENT OR ALLEGED -INFRINGEMENT OF ANY PATENT, TRADEMARK, COPYRIGHT OR OTHER INTELLECTUAL -PROPERTY RIGHT EVEN IF COPYRIGHT HOLDER AND ITS AUTHORIZED -REPRESENTATIVES HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN -NO EVENT SHALL COPYRIGHT HOLDER OR ITS AUTHORIZED REPRESENTATIVES TOTAL -LIABILITY FOR ALL DAMAGES, LOSSES, AND CAUSES OF ACTION (WHETHER IN -CONTRACT, TORT (INCLUDING NEGLIGENCE) OR OTHERWISE) EXCEED THE AMOUNT OF -US$10. - -Notice: The Software is subject to United States export laws and -regulations. You agree to comply with all domestic and international -export laws and regulations that apply to the Software, including but -not limited to the Export Administration Regulations administered by the -U.S. Department of Commerce and International Traffic in Arm Regulations -administered by the U.S. Department of State. These laws include -restrictions on destinations, end users and end use. diff --git a/source/x/scim-anthy/scim-anthy.SlackBuild b/source/x/scim-anthy/scim-anthy.SlackBuild index 36850635..ee43c38b 100755 --- a/source/x/scim-anthy/scim-anthy.SlackBuild +++ b/source/x/scim-anthy/scim-anthy.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -33,12 +33,22 @@ # ----------------------------------------------------------------------------- -PRGNAM=scim-anthy -VERSION=${VERSION:-1.2.4} -ARCH=${ARCH:-x86_64} +PKGNAM=scim-anthy +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} NUMJOBS=${NUMJOBS:-" -j7 "} BUILD=${BUILD:-2} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -52,14 +62,14 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf ${PRGNAM}-${VERSION} -tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1 -cd ${PRGNAM}-${VERSION} || exit 1 +rm -rf ${PKGNAM}-${VERSION} +tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1 +cd ${PKGNAM}-${VERSION} || exit 1 zcat $CWD/scim-anthy.gcc43.diff.gz | patch -p1 --verbose || exit 1 @@ -87,10 +97,10 @@ make $NUMJOBS || make || exit 1 make DESTDIR=$PKG install || exit 1 # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ ABOUT-NLS AUTHORS COPYING ChangeLog DIARY INSTALL NEWS README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; # Compress the man page(s): @@ -109,5 +119,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz diff --git a/source/x/scim-bridge/scim-bridge.SlackBuild b/source/x/scim-bridge/scim-bridge.SlackBuild index c3494c8b..8501d9c4 100755 --- a/source/x/scim-bridge/scim-bridge.SlackBuild +++ b/source/x/scim-bridge/scim-bridge.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL -# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, MN USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -33,18 +33,19 @@ # ----------------------------------------------------------------------------- -PRGNAM=scim-bridge -VERSION=${VERSION:-0.4.16} +PKGNAM=scim-bridge +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi NUMJOBS=${NUMJOBS:-" -j7 "} @@ -68,14 +69,14 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf ${PRGNAM}-${VERSION} -tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1 -cd ${PRGNAM}-${VERSION} || exit 1 +rm -rf ${PKGNAM}-${VERSION} +tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1 +cd ${PKGNAM}-${VERSION} || exit 1 #sed -i -e "s/ -doxygen / doxygen /" $( grep -lr ' -doxygen ' * ) zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch.gz | patch -p1 --verbose || exit 1 @@ -101,7 +102,7 @@ CFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --sysconfdir=/etc \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --enable-agent \ --enable-ltdl-install \ --enable-gtk2-immodule \ @@ -129,10 +130,10 @@ fi EOINS # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING* ChangeLog INSTALL NEWS README* doc/LICENSE.* \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; # Compress the man page(s): @@ -151,5 +152,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz diff --git a/source/x/scim-hangul/scim-hangul.SlackBuild b/source/x/scim-hangul/scim-hangul.SlackBuild index 1731a202..58f17654 100755 --- a/source/x/scim-hangul/scim-hangul.SlackBuild +++ b/source/x/scim-hangul/scim-hangul.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -33,11 +33,21 @@ # ----------------------------------------------------------------------------- -PRGNAM=scim-hangul -VERSION=${VERSION:-0.3.2} -ARCH=${ARCH:-x86_64} +PKGNAM=scim-hangul +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -52,17 +62,18 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf ${PRGNAM}-${VERSION} -tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1 -cd ${PRGNAM}-${VERSION} || exit 1 +rm -rf ${PKGNAM}-${VERSION} +tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1 +cd ${PKGNAM}-${VERSION} || exit 1 zcat $CWD/scim-hangul.gcc43.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/scim-hangul.gcc47.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . find . \ @@ -89,10 +100,10 @@ make $NUMJOBS || make || exit 1 make DESTDIR=$PKG install || exit 1 # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING NEWS README ChangeLog \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; # Compress the man page(s): @@ -111,5 +122,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz diff --git a/source/x/scim-hangul/scim-hangul.gcc47.diff b/source/x/scim-hangul/scim-hangul.gcc47.diff new file mode 100644 index 00000000..7e0c52c6 --- /dev/null +++ b/source/x/scim-hangul/scim-hangul.gcc47.diff @@ -0,0 +1,11 @@ +--- ./src/scim_hangul_imengine.cpp.orig 2012-05-11 22:51:39.653751057 -0500 ++++ ./src/scim_hangul_imengine.cpp 2012-05-11 22:53:45.793739278 -0500 +@@ -33,6 +33,8 @@ + #include + #endif + ++#include ++ + #include + #include "scim_hangul_imengine.h" + diff --git a/source/x/scim-input-pad/scim-input-pad.SlackBuild b/source/x/scim-input-pad/scim-input-pad.SlackBuild index a836a3fa..e5985946 100755 --- a/source/x/scim-input-pad/scim-input-pad.SlackBuild +++ b/source/x/scim-input-pad/scim-input-pad.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2009 Eric Hameleers, Eindhoven, NL -# Copyright 2009 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -24,11 +24,21 @@ # ----------------------------------------------------------------------------- -PRGNAM=scim-input-pad -VERSION=${VERSION:-0.1.2} -ARCH=${ARCH:-x86_64} +PKGNAM=scim-input-pad +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-4} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i486" ]; then @@ -50,14 +60,14 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf ${PRGNAM}-${VERSION} -tar xvf $CWD/${PRGNAM}-${VERSION}.tar.?z* || exit 1 -cd ${PRGNAM}-${VERSION} || exit 1 +rm -rf ${PKGNAM}-${VERSION} +tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1 +cd ${PKGNAM}-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -85,11 +95,11 @@ make DESTDIR=$PKG install || exit 1 sed -i -e "s#/usr/lib${LIBDIRSUFFIX}/scim-.*/scim-helper-launcher#$(ls /usr/lib${LIBDIRSUFFIX}/scim-*/scim-helper-launcher)#" $PKG/usr/bin/scim-input-pad # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION -chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/* + $PKG/usr/doc/$PKGNAM-$VERSION +chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/* # Strip binaries: cd $PKG @@ -102,5 +112,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz diff --git a/source/x/scim-input-pad/slack-desc b/source/x/scim-input-pad/slack-desc index add837f7..d6275692 100644 --- a/source/x/scim-input-pad/slack-desc +++ b/source/x/scim-input-pad/slack-desc @@ -9,7 +9,7 @@ scim-input-pad: scim-input-pad (on-screen input pad for scim) scim-input-pad: scim-input-pad: This is scim-input-pad, which provides an on-screen input pad -scim-input-pad: to enter symbols and chinese characters. +scim-input-pad: to enter symbols and Chinese characters. scim-input-pad: scim-input-pad: scim-input-pad: diff --git a/source/x/scim-m17n/scim-m17n.SlackBuild b/source/x/scim-m17n/scim-m17n.SlackBuild index e624ca80..cf060221 100755 --- a/source/x/scim-m17n/scim-m17n.SlackBuild +++ b/source/x/scim-m17n/scim-m17n.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -33,11 +33,21 @@ # ----------------------------------------------------------------------------- -PRGNAM=scim-m17n -VERSION=${VERSION:-0.2.3} -ARCH=${ARCH:-x86_64} +PKGNAM=scim-m17n +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i486" ]; then @@ -59,14 +69,14 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf ${PRGNAM}-${VERSION} -tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1 -cd ${PRGNAM}-${VERSION} || exit 1 +rm -rf ${PKGNAM}-${VERSION} +tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1 +cd ${PKGNAM}-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -91,10 +101,10 @@ make $NUMJOBS || make || exit 1 make DESTDIR=$PKG install || exit 1 # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; # Compress the man page(s): @@ -119,5 +129,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz diff --git a/source/x/scim-pinyin/scim-pinyin.SlackBuild b/source/x/scim-pinyin/scim-pinyin.SlackBuild index 79337b1e..9eefad63 100755 --- a/source/x/scim-pinyin/scim-pinyin.SlackBuild +++ b/source/x/scim-pinyin/scim-pinyin.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007 Eric Hameleers, Eindhoven, NL -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -33,12 +33,22 @@ # ----------------------------------------------------------------------------- -PRGNAM=scim-pinyin -VERSION=${VERSION:-0.5.91} -ARCH=${ARCH:-x86_64} +PKGNAM=scim-pinyin +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} NUMJOBS=${NUMJOBS:-" -j7 "} BUILD=${BUILD:-2} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -52,14 +62,14 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf ${PRGNAM}-${VERSION} -tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1 -cd ${PRGNAM}-${VERSION} || exit 1 +rm -rf ${PKGNAM}-${VERSION} +tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1 +cd ${PKGNAM}-${VERSION} || exit 1 # Apply fix for our gcc 4.3.x zcat $CWD/scim-pinyin.gcc43.diff.gz | patch -p1 --verbose || exit 1 @@ -103,11 +113,11 @@ make DESTDIR=$PKG install || exit 1 #cd - # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/* + $PKG/usr/doc/$PKGNAM-$VERSION +chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/* # Compress the man page(s): if [ -d $PKG/usr/man ]; then @@ -125,5 +135,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz diff --git a/source/x/scim-tables/scim-tables.SlackBuild b/source/x/scim-tables/scim-tables.SlackBuild index 8f577345..a6d219c2 100755 --- a/source/x/scim-tables/scim-tables.SlackBuild +++ b/source/x/scim-tables/scim-tables.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007 Eric Hameleers, Eindhoven, NL -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -33,11 +33,21 @@ # ----------------------------------------------------------------------------- -PRGNAM=scim-tables -VERSION=${VERSION:-0.5.9} -ARCH=${ARCH:-x86_64} +PKGNAM=scim-tables +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-3} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i486" ]; then @@ -59,14 +69,14 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf ${PRGNAM}-${VERSION} -tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1 -cd ${PRGNAM}-${VERSION} || exit 1 +rm -rf ${PKGNAM}-${VERSION} +tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1 +cd ${PKGNAM}-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -92,11 +102,11 @@ make $NUMJOBS || make || exit 1 make DESTDIR=$PKG install || exit 1 # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \ - $PKG/usr/doc/$PRGNAM-$VERSION -chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/* + $PKG/usr/doc/$PKGNAM-$VERSION +chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/* # Compress the man page(s): if [ -d $PKG/usr/man ]; then @@ -115,5 +125,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz diff --git a/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch b/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch deleted file mode 100644 index 1d9590fd..00000000 --- a/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- scim-1.4.9/src/ltdl.cpp.bak 2008-11-02 14:42:40.000000000 +0800 -+++ scim-1.4.9/src/ltdl.cpp 2010-09-12 00:23:24.085978400 +0800 -@@ -3361,7 +3361,7 @@ - { - lt_dlhandle handle = 0; - char * tmp = 0; -- char * ext = 0; -+ const char * ext = 0; - size_t len; - int errors = 0; - diff --git a/source/x/scim/scim.SlackBuild b/source/x/scim/scim.SlackBuild index c0c50fb4..d03adc6e 100755 --- a/source/x/scim/scim.SlackBuild +++ b/source/x/scim/scim.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2006,2007,2008 Eric Hameleers, Eindhoven, NL -# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2006, 2007, 2008 Eric Hameleers, Eindhoven, NL +# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, MN USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -33,18 +33,19 @@ # ----------------------------------------------------------------------------- -PRGNAM=scim -VERSION=${VERSION:-1.4.9} -BUILD=${BUILD:-5} +PKGNAM=scim +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi if [ "$ARCH" = "i486" ]; then @@ -68,17 +69,15 @@ NUMJOBS=${NUMJOBS:-" -j7 "} CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf ${PRGNAM}-${VERSION} -tar xvf $CWD/${PRGNAM}-${VERSION}.tar.?z* || exit 1 -cd ${PRGNAM}-${VERSION} || exit 1 - -zcat $CWD/scim-1.4.9-fix-ltdl.cpp.patch.gz | patch -p1 --verbose || exit 1 +rm -rf ${PKGNAM}-${VERSION} +tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1 +cd ${PKGNAM}-${VERSION} || exit 1 chown -R root:root . find . \ @@ -95,6 +94,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --sysconfdir=/etc \ --disable-static \ + --with-gtk-version=2 \ --program-prefix= \ --program-suffix= \ --build=$ARCH-slackware-linux @@ -265,15 +265,15 @@ fi EOINS # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/manual/zh_CN/figures +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/figures cp -a \ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION # Install documentation and user manual cp -a docs/manual/zh_CN/user-manual.html \ - $PKG/usr/doc/$PRGNAM-$VERSION/manual/zh_CN/ + $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/ cp -a docs/manual/zh_CN/figures/*.png \ - $PKG/usr/doc/$PRGNAM-$VERSION/manual/zh_CN/figures/ + $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/figures/ # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" \ @@ -285,5 +285,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg --prepend --linkadd y --chown n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg --prepend --linkadd y --chown n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz diff --git a/source/x/x11-skel/scripts/xwmconfig b/source/x/x11-skel/scripts/xwmconfig index 944207bf..724242ab 100644 --- a/source/x/x11-skel/scripts/xwmconfig +++ b/source/x/x11-skel/scripts/xwmconfig @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 1999, 2002 Patrick Volkerding, Moorhead, Minnesota USA +# Copyright 1999, 2002, 2012 Patrick Volkerding, Moorhead, Minnesota USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -50,7 +50,7 @@ fi if [ "$USER" = "root" ]; then BACKTITLE="--backtitle \"Setting system-wide default window manager in /etc/X11/xinit/\"" else - BACKTITLE="--backtitle \"Setting default window manager in $HOME/.xinitrc\"" + BACKTITLE="--backtitle \"Setting default window manager in $HOME/.xinitrc and $HOME/.xsession\"" fi # This stops --backtitle from cluttering the initial install: @@ -211,13 +211,19 @@ if [ "$USER" = "root" ]; then fi fi -# Also set up a new $HOME/.xinitrc: +# Also set up a new $HOME/.xinitrc and $HOME/.xinitrc: if [ -r /etc/X11/xinit/$OUTPUT -a ! "$HOME" = "/" ]; then if [ -r $HOME/.xinitrc ]; then rm -f $HOME/.xinitrc-backup mv $HOME/.xinitrc $HOME/.xinitrc-backup fi cat /etc/X11/xinit/$OUTPUT > $HOME/.xinitrc + if [ -r $HOME/.xsession ]; then + rm -f $HOME/.xsession-backup + mv $HOME/.xsession $HOME/.xsession-backup + fi + cat /etc/X11/xinit/$OUTPUT > $HOME/.xsession + chmod 755 $HOME/.xsession fi rm -f $TMP/tmpscript.sh $TMP/output diff --git a/source/x/x11-skel/x11-skel.SlackBuild b/source/x/x11-skel/x11-skel.SlackBuild index cd8559b7..98381b68 100755 --- a/source/x/x11-skel/x11-skel.SlackBuild +++ b/source/x/x11-skel/x11-skel.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=7.4 -BUILD=${BUILD:-2} +VERSION=7.7 +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/x/x11/build/libX11 b/source/x/x11/build/libX11 deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libX11 +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXaw3d b/source/x/x11/build/libXaw3d new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/source/x/x11/build/libXaw3d @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xcb-proto b/source/x/x11/build/xcb-proto new file mode 100644 index 00000000..00750edc --- /dev/null +++ b/source/x/x11/build/xcb-proto @@ -0,0 +1 @@ +3 diff --git a/source/x/x11/build/xcompmgr b/source/x/x11/build/xcompmgr deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xcompmgr +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xdm b/source/x/x11/build/xdm new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/source/x/x11/build/xdm @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xf86-input-acecad b/source/x/x11/build/xf86-input-acecad deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-input-acecad +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-input-penmount b/source/x/x11/build/xf86-input-penmount deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-input-penmount +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-input-wacom b/source/x/x11/build/xf86-input-wacom new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/source/x/x11/build/xf86-input-wacom @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xf86-video-apm b/source/x/x11/build/xf86-video-apm new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/source/x/x11/build/xf86-video-apm @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xf86-video-chips b/source/x/x11/build/xf86-video-chips new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/source/x/x11/build/xf86-video-chips @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xf86-video-cirrus b/source/x/x11/build/xf86-video-cirrus deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/xf86-video-cirrus +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/xf86-video-i740 b/source/x/x11/build/xf86-video-i740 index 00750edc..b8626c4c 100644 --- a/source/x/x11/build/xf86-video-i740 +++ b/source/x/x11/build/xf86-video-i740 @@ -1 +1 @@ -3 +4 diff --git a/source/x/x11/build/xf86-video-mach64 b/source/x/x11/build/xf86-video-mach64 deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/xf86-video-mach64 +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/xf86-video-openchrome b/source/x/x11/build/xf86-video-openchrome deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-openchrome +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-video-r128 b/source/x/x11/build/xf86-video-r128 deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/xf86-video-r128 +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/xf86-video-radeonhd b/source/x/x11/build/xf86-video-radeonhd deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-radeonhd +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-video-s3 b/source/x/x11/build/xf86-video-s3 index 00750edc..b8626c4c 100644 --- a/source/x/x11/build/xf86-video-s3 +++ b/source/x/x11/build/xf86-video-s3 @@ -1 +1 @@ -3 +4 diff --git a/source/x/x11/build/xf86-video-s3virge b/source/x/x11/build/xf86-video-s3virge deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/xf86-video-s3virge +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/xf86-video-sisusb b/source/x/x11/build/xf86-video-sisusb new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/source/x/x11/build/xf86-video-sisusb @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xf86-video-tdfx b/source/x/x11/build/xf86-video-tdfx deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/xf86-video-tdfx +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/xf86-video-tga b/source/x/x11/build/xf86-video-tga index 0cfbf088..b8626c4c 100644 --- a/source/x/x11/build/xf86-video-tga +++ b/source/x/x11/build/xf86-video-tga @@ -1 +1 @@ -2 +4 diff --git a/source/x/x11/build/xf86-video-tseng b/source/x/x11/build/xf86-video-tseng new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/source/x/x11/build/xf86-video-tseng @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xf86-video-v4l b/source/x/x11/build/xf86-video-v4l index b8626c4c..7ed6ff82 100644 --- a/source/x/x11/build/xf86-video-v4l +++ b/source/x/x11/build/xf86-video-v4l @@ -1 +1 @@ -4 +5 diff --git a/source/x/x11/build/xf86-video-vesa b/source/x/x11/build/xf86-video-vesa deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/xf86-video-vesa +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/xf86-video-voodoo b/source/x/x11/build/xf86-video-voodoo new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/source/x/x11/build/xf86-video-voodoo @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xf86-video-xgi b/source/x/x11/build/xf86-video-xgi new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/source/x/x11/build/xf86-video-xgi @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/source/x/x11/build/xorg-server @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xpyb b/source/x/x11/build/xpyb new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/source/x/x11/build/xpyb @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/configure/compiz b/source/x/x11/configure/compiz index aebd49a2..8a960f3d 100644 --- a/source/x/x11/configure/compiz +++ b/source/x/x11/configure/compiz @@ -11,6 +11,6 @@ CXXFLAGS=$SLKCFLAGS \ --disable-static \ --disable-gconf \ --disable-kde \ - --enable-kde4 \ + --disable-kde4 \ --enable-librsvg \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/libXaw3d b/source/x/x11/configure/libXaw3d new file mode 100644 index 00000000..0d802fa3 --- /dev/null +++ b/source/x/x11/configure/libXaw3d @@ -0,0 +1,16 @@ +CFLAGS=$SLKCFLAGS \ +CXXFLAGS=$SLKCFLAGS \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ + --disable-static \ + --enable-multiplane-bitmaps \ + --enable-gray-stipples \ + --enable-arrow-scrollbars \ + --enable-internationalization \ + --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xf86-video-ati b/source/x/x11/configure/xf86-video-ati deleted file mode 100644 index 0eacb0c3..00000000 --- a/source/x/x11/configure/xf86-video-ati +++ /dev/null @@ -1,21 +0,0 @@ -xserver_source="/tmp/x11-build/xorg-server-1.9.3" - -# Let these just fail to build. In any case, an "exit 1" -# here is just plain wrong. -#if [ ! -d "$xserver_source" ]; then -# echo "$xserver_source does not exist, and you need it." -# exit 1 -#fi - -CFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \ -CXXFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --disable-static \ - --with-xserver-source=${xserver_source} \ - --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server index cf9bd843..778d7668 100644 --- a/source/x/x11/configure/xorg-server +++ b/source/x/x11/configure/xorg-server @@ -27,14 +27,15 @@ CFLAGS="$SLKCFLAGS" \ --with-int10=x86emu \ --with-default-font-path="${DEF_FONTPATH}" \ --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \ - --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \ - --with-os-name="Slackware 13.37" \ + --with-os-name="Slackware 14.0" \ --with-os-vendor="Slackware Linux Project" \ --with-xkb-path=/etc/X11/xkb \ --with-xkb-output=/var/lib/xkb \ $BUILD_SERVERS \ --build=$ARCH-slackware-linux +# --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri + if [ "$ARCH" = "x86_64" ]; then # To prevent the error "No rule to make target `-ldl'" sed -i -e 's#-ldl##' hw/xfree86/Makefile diff --git a/source/x/x11/doinst.sh/xdm b/source/x/x11/doinst.sh/xdm index bb08dc5f..e1d72520 100644 --- a/source/x/x11/doinst.sh/xdm +++ b/source/x/x11/doinst.sh/xdm @@ -1,15 +1,18 @@ -#!/bin/sh config() { NEW="$1" - OLD="`dirname $NEW`/`basename $NEW .new`" + OLD="$(dirname $NEW)/$(basename $NEW .new)" # If there's no config file by that name, mv it over: if [ ! -r $OLD ]; then mv $NEW $OLD - elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy rm $NEW fi # Otherwise, we leave the .new copy for the admin to consider... } -config etc/X11/xdm/xdm-config.new -config etc/X11/xdm/Xservers.new -config etc/X11/xdm/Xsession.new +for conffile in \ + Xaccess Xreset Xresources Xservers Xsession Xsetup_0 Xstartup Xwilling \ + GiveConsole TakeConsole chooser xdm-config ../app-defaults/Chooser ; +do + config etc/X11/xdm/${conffile}.new +done + diff --git a/source/x/x11/modularize b/source/x/x11/modularize index 47da583f..d6eb2f68 100644 --- a/source/x/x11/modularize +++ b/source/x/x11/modularize @@ -1,7 +1,6 @@ # If a package is listed here, it will be built apart from the # usual "grab bag" package that's made from each source directory. -applewmproto appres bdftopcf beforelight @@ -9,7 +8,6 @@ bigreqsproto bitmap compiz compositeproto -constype damageproto dmxproto dri2proto @@ -67,16 +65,15 @@ imake inputproto intel-gpu-tools kbproto -libAppleWM libFS libICE libSM -libWindowsWM libX11 libXScrnSaver -libXTrap libXau libXaw +libXaw3d +libXcm libXcomposite libXcursor libXdamage @@ -92,8 +89,6 @@ libXinerama libXmu libXp libXpm -libXprintAppUtil -libXprintUtil libXrandr libXrender libXres @@ -110,38 +105,31 @@ libpciaccess libpthread-stubs libxcb libxkbfile -libxkbui listres lndir luit makedepend -mkcfm mkcomposecache mkfontdir mkfontscale oclock pixman printproto -proxymngr randrproto recordproto rendercheck renderproto resourceproto rgb -rstart -scripts scrnsaverproto sessreg setxkbmap showfont smproxy -trapproto twm util-macros videoproto viewres -windowswmproto x11perf xauth xbacklight @@ -150,6 +138,10 @@ xbitmaps xcalc xcb-proto xcb-util +xcb-util-image +xcb-util-keysyms +xcb-util-renderutil +xcb-util-wm xclipboard xclock xcmiscproto @@ -169,17 +161,13 @@ xextproto xeyes xf86-input-acecad xf86-input-aiptek -xf86-input-citron xf86-input-evdev xf86-input-joystick -xf86-input-keyboard -xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom -xf86-video-geode xf86-video-apm xf86-video-ark xf86-video-ast @@ -187,19 +175,19 @@ xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy -xf86-video-fbdev +xf86-video-geode xf86-video-glint xf86-video-i128 xf86-video-i740 -xf86-video-i810 xf86-video-intel xf86-video-mach64 xf86-video-mga +xf86-video-modesetting xf86-video-neomagic xf86-video-nouveau -xf86-video-nsc xf86-video-nv xf86-video-openchrome +xf86-video-qxl xf86-video-r128 xf86-video-rendition xf86-video-s3 @@ -208,13 +196,6 @@ xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-sisusb -xf86-video-sunbw2 -xf86-video-suncg14 -xf86-video-suncg3 -xf86-video-suncg6 -xf86-video-sunffb -xf86-video-sunleo -xf86-video-suntcx xf86-video-tdfx xf86-video-tga xf86-video-trident @@ -223,22 +204,17 @@ xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo -xf86-video-wsfb xf86-video-xgi -xf86-video-xgixp xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto -xf86rushproto xf86vidmodeproto xfd -xfindproxy xfontsel xfs xfsinfo -xfwp xgamma xgc xhost @@ -265,27 +241,23 @@ xmore xorg-cf-files xorg-docs xorg-server +xorg-server-xephyr +xorg-server-xnest +xorg-server-xvfb xorg-sgml-doctools -xphelloworld -xplsprinters xpr -xprehashprinterlist xprop xproto -xproxymanagementprotocol xpyb xrandr xrdb xrefresh xscope xset -xsetmode -xsetpointer xsetroot xsm xstdcmap xtrans -xtrap xvidtune xvinfo xwd diff --git a/source/x/x11/noarch b/source/x/x11/noarch index 79eb0e56..480ffc26 100644 --- a/source/x/x11/noarch +++ b/source/x/x11/noarch @@ -56,26 +56,21 @@ randrproto recordproto renderproto resourceproto -scripts scrnsaverproto -trapproto ttf-indic-fonts util-macros videoproto x11-skel -xcb-proto xcmiscproto xcursor-themes xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto -xf86rushproto xf86vidmodeproto xineramaproto xkeyboard-config xorg-cf-files xorg-docs xproto -xproxymanagementprotocol xtrans diff --git a/source/x/x11/patch/xf86-video-chips.patch b/source/x/x11/patch/xf86-video-chips.patch new file mode 100644 index 00000000..a5a54ac0 --- /dev/null +++ b/source/x/x11/patch/xf86-video-chips.patch @@ -0,0 +1,4 @@ +for patchfile in $CWD/patch/xf86-video-chips/*.patch ; do + cat $patchfile | patch -p1 --verbose \ + || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } ; +done diff --git a/source/x/x11/patch/xf86-video-chips/0001-chips-gut-the-overlay-8-16-support-from-driver.patch b/source/x/x11/patch/xf86-video-chips/0001-chips-gut-the-overlay-8-16-support-from-driver.patch new file mode 100644 index 00000000..a52e4103 --- /dev/null +++ b/source/x/x11/patch/xf86-video-chips/0001-chips-gut-the-overlay-8-16-support-from-driver.patch @@ -0,0 +1,588 @@ +From e4bd864898fd276a62dac05cdfff394e98434f02 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Tue, 29 Mar 2011 13:53:31 +1000 +Subject: [PATCH 1/9] chips: gut the overlay 8/16 support from driver. + +This driver is for chips that were bought by Intel in 1997, +this feature means maintaining a lot of code in the X server +for little gain. + +Drop it like its hot. + +Signed-off-by: Dave Airlie +Reviewed-by: Adam Jackson +--- + man/chips.man | 3 - + src/ct_accel.c | 46 ++--------- + src/ct_driver.c | 234 ++++++------------------------------------------------- + src/ct_driver.h | 1 - + src/ct_video.c | 3 +- + 5 files changed, 28 insertions(+), 259 deletions(-) + +diff --git a/man/chips.man b/man/chips.man +index 740af38..0c022ee 100644 +--- a/man/chips.man ++++ b/man/chips.man +@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off + Force driver to leave centering and stretching registers alone. This + can fix some laptop suspend/resume problems. Default: off + .TP +-.BI "Option \*qOverlay\*q" +-Enable 8+24 overlay mode. Only appropriate for depth 24. Default: off. +-.TP + .BI "Option \*qColorKey\*q \*q" integer \*q + Set the colormap index used for the transparency key for the depth 8 plane + when operating in 8+16 overlay mode. The value must be in the range +diff --git a/src/ct_accel.c b/src/ct_accel.c +index 3920b0a..4b5776a 100644 +--- a/src/ct_accel.c ++++ b/src/ct_accel.c +@@ -428,19 +428,7 @@ chips_imagewrite: + infoPtr->ImageWriteFlags |= NO_PLANEMASK; + #endif + +- +-#ifdef CHIPS_HIQV +- if (XAAInit(pScreen, infoPtr)) { +- if (cPtr->Flags & ChipsOverlay8plus16) +- return(XAAInitDualFramebufferOverlay(pScreen, +- CTNAME(DepthChange))); +- else +- return TRUE; +- } else +- return FALSE; +-#else + return(XAAInit(pScreen, infoPtr)); +-#endif + } + + #ifdef CHIPS_HIQV +@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn, + #endif + w *= cAcl->BytesPerPixel; + ctBLTWAIT; +-#ifdef CHIPS_HIQV +- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) && +- (pScrn->depth == 8)) +- ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes); +-#endif + ctSETSRCADDR(srcaddr); + ctSETDSTADDR(destaddr); + #ifdef CHIPS_HIQV +@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty, + patternaddr = (paty * pScrn->displayWidth + + (patx & ~0x3F)) * cAcl->BytesPerPixel; + cAcl->patternyrot = (patx & 0x3F) >> 3; +-#ifdef CHIPS_HIQV +- if (cPtr->Flags & ChipsOverlay8plus16) +- patternaddr += cPtr->FbOffset16; +-#endif + + ctBLTWAIT; + ctSETPATSRCADDR(patternaddr); +@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty, + + #ifdef CHIPS_HIQV + patternaddr = paty * pScrn->displayWidth + patx; +- if (cPtr->Flags & ChipsOverlay8plus16) +- patternaddr = patternaddr * 2 + cPtr->FbOffset16; +- else +- patternaddr *= cAcl->BytesPerPixel; ++ patternaddr *= cAcl->BytesPerPixel; + #else + patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel; + #endif +@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, + dwords = (((skipleft + bytesPerLine + 0x7) & ~0x7)) >> 2; + destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); + destpitch = pScrn->displayWidth * (bpp >> 3); +- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) +- destaddr += cPtr->FbOffset16; +- else +- destaddr += cAcl->FbOffset; ++ destaddr += cAcl->FbOffset; + + ctBLTWAIT; + +@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, + y++; + + destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); +- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) +- destaddr += cPtr->FbOffset16; +- else +- destaddr += cAcl->FbOffset; ++ destaddr += cAcl->FbOffset; + + ctBLTWAIT; + ctSETDSTADDR(destaddr); +@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, + dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2; + srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); + srcpitch = pScrn->displayWidth * (bpp >> 3); +- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) +- srcaddr += cPtr->FbOffset16; +- else +- srcaddr += cAcl->FbOffset; ++ srcaddr += cAcl->FbOffset; + + ctBLTWAIT; + ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM | +@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, + dst += dstwidth; + y++; + srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); +- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) +- srcaddr += cPtr->FbOffset16; +- else +- srcaddr += cAcl->FbOffset; ++ srcaddr += cAcl->FbOffset; + ctBLTWAIT; + ctSETSRCADDR(srcaddr); + ctSETHEIGHTWIDTHGO(h, bytesPerLine); +diff --git a/src/ct_driver.c b/src/ct_driver.c +index 6624b79..08df050 100644 +--- a/src/ct_driver.c ++++ b/src/ct_driver.c +@@ -1639,55 +1639,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) + } + } + +- if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) { +- if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) { +- if (pScrn->bitsPerPixel == 16) { +- if (cPtr->Flags & ChipsLinearSupport) { +- cPtr->Flags |= ChipsOverlay8plus16; +- if(!xf86GetOptValInteger( +- cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey))) +- pScrn->colorKey = TRANSPARENCY_KEY; +- pScrn->overlayFlags = OVERLAY_8_16_DUALFB; +- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, +- "PseudoColor overlay enabled.\n"); +- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH)) +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- " - Forcing option \"Stretch\" \"ON\".\n"); +- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER)) +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- " - Forcing option \"LcdCenter\" \"OFF\".\n"); +- if (cPtr->Flags & ChipsShadowFB) { +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- " - Disabling \"Shadow Framebuffer\".\n"); +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- " Not support with option \"8Plus16\".\n"); +- cPtr->Flags &= ~ChipsShadowFB; +- cPtr->Rotate = 0; +- } +- } else { +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n"); +- } +- } else { +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- "Option \"Overlay\" is not supported in this configuration\n"); +- } +- } else { +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- "\"%s\" is not a valid value for Option \"Overlay\"\n", s); +- } +- } +- +- if (!(cPtr->Flags & ChipsOverlay8plus16)) { +- if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY, +- &(cPtr->videoKey))) { +- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n", ++ if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY, ++ &(cPtr->videoKey))) { ++ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n", + cPtr->videoKey); +- } else { +- cPtr->videoKey = (1 << pScrn->offset.red) | ++ } else { ++ cPtr->videoKey = (1 << pScrn->offset.red) | + (1 << pScrn->offset.green) | + (((pScrn->mask.blue >> pScrn->offset.blue) - 1) + << pScrn->offset.blue); +- } + } + + if (cPtr->Flags & ChipsShadowFB) { +@@ -2335,28 +2295,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) + /* and 32bits on the others. Thus multiply by a suitable factor */ + if (cPtr->Flags & Chips64BitMemory) { + if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD)) +- if (cPtr->Flags & ChipsOverlay8plus16 ) +- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4); +- else + cPtr->MaxClock = min(cPtr->MaxClock, + MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1)); + else +- if (cPtr->Flags & ChipsOverlay8plus16) +- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3); +- else + cPtr->MaxClock = min(cPtr->MaxClock, + MemClk->Clk * 8 * 0.7 / bytesPerPixel); + } else { + if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD)) +- if (cPtr->Flags & ChipsOverlay8plus16 ) +- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4); +- else + cPtr->MaxClock = min(cPtr->MaxClock, + MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1)); + else +- if (cPtr->Flags & ChipsOverlay8plus16) +- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3); +- else + cPtr->MaxClock = min(cPtr->MaxClock, + MemClk->Clk * 4 * 0.7 / bytesPerPixel); + } +@@ -3736,8 +3684,7 @@ CHIPSEnterVT(int scrnIndex, int flags) + /* Should we re-save the text mode on each VT enter? */ + if(!chipsModeInit(pScrn, pScrn->currentMode)) + return FALSE; +- if ((!(cPtr->Flags & ChipsOverlay8plus16)) +- && (cPtr->Flags & ChipsVideoSupport) ++ if ((cPtr->Flags & ChipsVideoSupport) + && (cPtr->Flags & ChipsLinearSupport)) + CHIPSResetVideo(pScrn); + +@@ -3788,8 +3735,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, + int i, index, shift ; + CHIPSEntPtr cPtrEnt; + +- shift = ((pScrn->depth == 15) && +- (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0; ++ shift = (pScrn->depth == 15) ? 3 : 0; + + if (cPtr->UseDualChannel) { + cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0], +@@ -3895,18 +3841,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices, + hwp->disablePalette(hwp); + } + +-static Bool +-cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8, +- int xsize, int ysize, int dpix, int dpiy, +- int width16, int width8) +-{ +- return +- (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize, +- dpix, dpiy, width16, width8, 16, 8) && +- fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize, +- dpix, dpiy, width16, width8, 16, 8, 16, 8)); +-} +- + /* Mandatory */ + static Bool + CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -3947,22 +3881,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + if (!chipsMapMem(pScrn)) + return FALSE; + +- /* Setup a pointer to the overlay if needed */ +- if (cPtr->Flags & ChipsOverlay8plus16) { +- cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY; +- cPtr->FbSize16 = (pScrn->displayWidth << 1) * pScrn->virtualY; +- if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) { +- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, +- "Too little memory for overlay. Disabling.\n"); +- cPtr->Flags &= ~ChipsOverlay8plus16; +- } +- if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) { +- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, +- "Max overlay Width/Height 1024 pixels. Disabling.\n"); +- cPtr->Flags &= ~ChipsOverlay8plus16; +- } +- } +- + /* Setup the MMIO register access functions if need */ + if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) { + CHIPSSetMmioExtFuncs(cPtr); +@@ -4035,18 +3953,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + miClearVisualTypes(); + + /* Setup the visuals we support. */ +- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){ +- if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask, +- pScrn->rgbBits, PseudoColor)) +- return FALSE; +- if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor)) +- return FALSE; +- } else { +- if (!miSetVisualTypes(pScrn->depth, ++ if (!miSetVisualTypes(pScrn->depth, + miGetDefaultVisualMask(pScrn->depth), + pScrn->rgbBits, pScrn->defaultVisual)) +- return FALSE; +- } ++ return FALSE; + miSetPixmapDepths (); + + /* +@@ -4090,13 +4000,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + break; + #endif + case 16: +- if (cPtr->Flags & ChipsOverlay8plus16) { +- ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + +- cPtr->FbOffset16, FBStart, width, +- height, pScrn->xDpi, pScrn->yDpi, +- displayWidth, displayWidth); +- break; +- } + default: + ret = fbScreenInit(pScreen, FBStart, + width,height, +@@ -4244,9 +4147,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + if (pScrn->bitsPerPixel < 8) + freespace = allocatebase - pScrn->displayWidth * + pScrn->virtualY / 2; +- else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) +- freespace = allocatebase - pScrn->displayWidth * +- pScrn->virtualY - cPtr->FbSize16; + else + freespace = allocatebase - pScrn->displayWidth * + pScrn->virtualY * (pScrn->bitsPerPixel >> 3); +@@ -4369,9 +4269,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + AvailFBArea.y2 = cAcl->CacheEnd / + (pScrn->displayWidth * (pScrn->bitsPerPixel >> 3)); + +- if (!(cPtr->Flags & ChipsOverlay8plus16)) { +- xf86InitFBManager(pScreen, &AvailFBArea); +- } ++ xf86InitFBManager(pScreen, &AvailFBArea); + } + if (cPtr->Flags & ChipsAccelSupport) { + if (IS_HiQV(cPtr)) { +@@ -4425,16 +4323,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + if (!miCreateDefColormap(pScreen)) + return FALSE; + +- if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) { +- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette, +- NULL, CMAP_RELOAD_ON_MODE_SWITCH)) +- return FALSE; +- } else { +- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, ++ if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, + (pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette), + NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR)) +- return FALSE; +- } ++ return FALSE; + + #ifndef XSERVER_LIBPCIACCESS + racflag = RAC_COLORMAP; +@@ -4448,8 +4340,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + xf86SetSilkenMouse(pScreen); + #endif + +- if ((!(cPtr->Flags & ChipsOverlay8plus16)) +- && (cPtr->Flags & ChipsVideoSupport) ++ if ((cPtr->Flags & ChipsVideoSupport) + && (cPtr->Flags & ChipsLinearSupport)) { + CHIPSInitVideo(pScreen); + } +@@ -4522,10 +4413,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags) + Base >>= 3; + break; + case 16: +- if (!(cPtr->Flags & ChipsOverlay8plus16)) +- Base >>= 1; +- else +- Base >>= 2; ++ Base >>= 1; + break; + case 24: + if (!IS_HiQV(cPtr)) +@@ -4581,14 +4469,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags) + cPtr->writeMSS(cPtr, hwp, MSS); + } + +- if (cPtr->Flags & ChipsOverlay8plus16) { +- Base = (Base << 3) & ~(unsigned long)0xF; +- +- cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8); +- cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF); +- cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF); +- } +- + } + + /* Mandatory */ +@@ -4652,13 +4532,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) + ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + CHIPSPtr cPtr = CHIPSPTR(pScrn); + +- if (flags & MODECHECK_FINAL) { +- /* Don't subtract FrambufferSize here as it should be subtracted already */ +- if ((cPtr->Flags & ChipsOverlay8plus16) +- && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY +- < 0)) +- return MODE_MEM; +- } + /* The tests here need to be expanded */ + if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD)) + return MODE_NO_INTERLACE; +@@ -5544,12 +5417,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + } else { + ChipsStd->Attribute[0x10] = 0x01; /* mode */ + } +- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) { +- /* Make sure that the overlay isn't visible in the overscan region */ +- if (ChipsStd->Attribute[0x11] == pScrn->colorKey) +- ChipsStd->Attribute[0x11] = pScrn->colorKey - 1; +- } else +- ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */ ++ ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */ + ChipsStd->Attribute[0x12] = 0x0F; /* enable all color planes */ + ChipsStd->Attribute[0x13] = 0x00; /* horiz pixel panning 0 */ + +@@ -5558,8 +5426,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + /* set virtual screen width */ + tmp = pScrn->displayWidth >> 3; + if (pScrn->bitsPerPixel == 16) { +- if (!(cPtr->Flags & ChipsOverlay8plus16)) +- tmp <<= 1; /* double the width of the buffer */ ++ tmp <<= 1; /* double the width of the buffer */ + } else if (pScrn->bitsPerPixel == 24) { + tmp += tmp << 1; + } else if (pScrn->bitsPerPixel == 32) { +@@ -5688,8 +5555,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + + /* centering/stretching */ + if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) { +- if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) || +- (cPtr->Flags & ChipsOverlay8plus16)) { ++ if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) { + ChipsNew->FR[0x40] &= 0xDF; /* Disable Horizontal stretching */ + ChipsNew->FR[0x48] &= 0xFB; /* Disable vertical stretching */ + ChipsNew->XR[0xA0] = 0x10; /* Disable cursor stretching */ +@@ -5709,8 +5575,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + } + } + +- if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) +- || (cPtr->Flags & ChipsOverlay8plus16)) { ++ if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) { + ChipsNew->FR[0x40] |= 0x3; /* Enable Horizontal centering */ + ChipsNew->FR[0x48] |= 0x3; /* Enable Vertical centering */ + } else { +@@ -5723,8 +5588,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + ChipsNew->XR[0x82] |=0x02; + + /* software mode flag */ +- ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ? +- 8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ? ++ ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ? + min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) : + mode->CrtcHDisplay, mode->CrtcVDisplay); + #ifdef DEBUG +@@ -5762,7 +5626,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + } + } + /* bpp depend */ +- if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) { ++ if (pScrn->bitsPerPixel == 16) { + ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4; + if (cPtr->Flags & ChipsGammaSupport) + ChipsNew->XR[0x82] |= 0x0C; +@@ -5915,60 +5779,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + /* Turn off multimedia by default as it degrades performance */ + ChipsNew->XR[0xD0] &= 0x0f; + +- /* Setup the video/overlay */ +- if (cPtr->Flags & ChipsOverlay8plus16) { +- ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */ +-#ifdef SAR04 +- ChipsNew->XR[0x4F] = 0x2A; /* SAR04 >352 pixel overlay width */ +-#endif +- ChipsNew->MR[0x1E] &= 0xE0; /* Set Zoom and Direction */ +- if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE)) +- ChipsNew->MR[0x1E] |= 0x10; /* Interlace */ +- ChipsNew->MR[0x1F] &= 0x14; /* Mask reserved bits */ +- ChipsNew->MR[0x1F] |= 0x08; /* RGB 16bpp */ +- if (pScrn->weight.green == 5) +- ChipsNew->MR[0x1F] |= 0x01; /* RGB 15bpp */ +- +- ChipsNew->MR[0x20] &= 0x03; /* Mask reserved bits */ +- ChipsNew->MR[0x20] |= 0x80; /* Auto Centre, Use mem ptr1 */ +- ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 1 */ +- ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF; +- ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF; +- ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 2 */ +- ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF; +- ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF; +- ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ +- ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1; +- +- /* Left Edge of Overlay */ +- ChipsNew->MR[0x2A] = cPtr->OverlaySkewX; +- ChipsNew->MR[0x2B] &= 0xF8; /* Mask reserved bits */ +- ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7); +- /* Right Edge of Overlay */ +- ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - +- 1) & 0xFF; +- ChipsNew->MR[0x2D] &= 0xF8; /* Mask reserved bits */ +- ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth - +- 1) >> 8) & 0x07; +- /* Top Edge of Overlay */ +- ChipsNew->MR[0x2E] = cPtr->OverlaySkewY; +- ChipsNew->MR[0x2F] &= 0xF8; +- ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7); +- /* Bottom Edge of Overlay*/ +- ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF; +- ChipsNew->MR[0x31] &= 0xF8; /* Mask reserved bits */ +- ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY - +- 1 ) >> 8) & 0x07; +- +- ChipsNew->MR[0x3C] &= 0x18; /* Mask reserved bits */ +- ChipsNew->MR[0x3C] |= 0x07; /* Enable keyed overlay window */ +- ChipsNew->MR[0x3D] = 0x00; +- ChipsNew->MR[0x3E] = 0x00; +- ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */ +- ChipsNew->MR[0x40] = 0xFF; +- ChipsNew->MR[0x41] = 0xFF; +- ChipsNew->MR[0x42] = 0x00; +- } else if (cPtr->Flags & ChipsVideoSupport) { ++ if (cPtr->Flags & ChipsVideoSupport) { + #if 0 /* if we do this even though video isn't playing we kill performance */ + ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */ + #endif +@@ -6877,8 +6688,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs) + } + + /* Set SAR04 multimedia register correctly */ +- if ((cPtr->Flags & ChipsOverlay8plus16) +- || (cPtr->Flags & ChipsVideoSupport)) { ++ if ((cPtr->Flags & ChipsVideoSupport)) { + #ifdef SAR04 + cPtr->writeXR(cPtr, 0x4E, 0x04); + if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F]) +diff --git a/src/ct_driver.h b/src/ct_driver.h +index d8ce228..10a24d4 100644 +--- a/src/ct_driver.h ++++ b/src/ct_driver.h +@@ -114,7 +114,6 @@ typedef struct { + /* Options flags for the C&T chipsets */ + #define ChipsHWCursor 0x00001000 + #define ChipsShadowFB 0x00002000 +-#define ChipsOverlay8plus16 0x00004000 + #define ChipsUseNewFB 0x00008000 + + /* Architecture type flags */ +diff --git a/src/ct_video.c b/src/ct_video.c +index a68acb9..c9e5bb4 100644 +--- a/src/ct_video.c ++++ b/src/ct_video.c +@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen) + CHIPSPtr cPtr = CHIPSPTR(pScrn); + int num_adaptors; + +- if (!(cPtr->Flags & ChipsOverlay8plus16) && +- (cPtr->Flags & ChipsVideoSupport)) { ++ if ((cPtr->Flags & ChipsVideoSupport)) { + newAdaptor = CHIPSSetupImageVideo(pScreen); + CHIPSInitOffscreenImages(pScreen); + } +-- +1.7.9.4 + diff --git a/source/x/x11/patch/xf86-video-chips/0002-PciTag-is-unused-when-using-libpciaccess.patch b/source/x/x11/patch/xf86-video-chips/0002-PciTag-is-unused-when-using-libpciaccess.patch new file mode 100644 index 00000000..6caaa210 --- /dev/null +++ b/source/x/x11/patch/xf86-video-chips/0002-PciTag-is-unused-when-using-libpciaccess.patch @@ -0,0 +1,29 @@ +From 5f8a7320123255408b393eab9ecfae783920622a Mon Sep 17 00:00:00 2001 +From: Mark Kettenis +Date: Mon, 26 Sep 2011 21:26:26 +0200 +Subject: [PATCH 2/9] PciTag is unused when using libpciaccess + +Signed-off-by: Mark Kettenis +Reviewed-by: Jeremy Huddleston +Reviewed-by: Julien Cristau +--- + src/ct_driver.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/ct_driver.h b/src/ct_driver.h +index 10a24d4..39eeb6e 100644 +--- a/src/ct_driver.h ++++ b/src/ct_driver.h +@@ -271,7 +271,9 @@ typedef struct { + + typedef struct _CHIPSRec { + pciVideoPtr PciInfo; ++#ifndef XSERVER_LIBPCIACCESS + PCITAG PciTag; ++#endif + int Chipset; + EntityInfoPtr pEnt; + IOADDRESS PIOBase; +-- +1.7.9.4 + diff --git a/source/x/x11/patch/xf86-video-chips/0003-Use-malloc-calloc-realloc-free-directly.patch b/source/x/x11/patch/xf86-video-chips/0003-Use-malloc-calloc-realloc-free-directly.patch new file mode 100644 index 00000000..de379e4d --- /dev/null +++ b/source/x/x11/patch/xf86-video-chips/0003-Use-malloc-calloc-realloc-free-directly.patch @@ -0,0 +1,50 @@ +From 7ca1840f39d0216e44fe1ca938cfc3ced048da1d Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston +Date: Tue, 18 Oct 2011 22:24:54 -0700 +Subject: [PATCH 3/9] Use malloc/calloc/realloc/free directly + +Signed-off-by: Jeremy Huddleston +--- + src/ct_driver.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/ct_driver.c b/src/ct_driver.c +index 08df050..e6538c6 100644 +--- a/src/ct_driver.c ++++ b/src/ct_driver.c +@@ -949,7 +949,7 @@ CHIPSProbe(DriverPtr drv, int flags) + } + + } +- xfree(usedChips); ++ free(usedChips); + } + } + +@@ -981,12 +981,12 @@ CHIPSProbe(DriverPtr drv, int flags) + pScrn->ValidMode = CHIPSValidMode; + foundScreen = TRUE; + } +- xfree(usedChips); ++ free(usedChips); + } + } + #endif + +- xfree(devSections); ++ free(devSections); + return foundScreen; + } + #endif +@@ -4126,7 +4126,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + } + if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY, + pScrn->displayWidth, pBankInfo)) { +- xfree(pBankInfo); ++ free(pBankInfo); + pBankInfo = NULL; + return FALSE; + } +-- +1.7.9.4 + diff --git a/source/x/x11/patch/xf86-video-chips/0004-configure.ac-Remove-AM_PROG_CC_C_O.patch b/source/x/x11/patch/xf86-video-chips/0004-configure.ac-Remove-AM_PROG_CC_C_O.patch new file mode 100644 index 00000000..bcf6355a --- /dev/null +++ b/source/x/x11/patch/xf86-video-chips/0004-configure.ac-Remove-AM_PROG_CC_C_O.patch @@ -0,0 +1,27 @@ +From f5191838b70d67e991bef3491d2a60915988079c Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston +Date: Tue, 18 Oct 2011 22:37:00 -0700 +Subject: [PATCH 4/9] configure.ac: Remove AM_PROG_CC_C_O + +Signed-off-by: Jeremy Huddleston +--- + configure.ac | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 225e516..c0ed508 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -44,9 +44,6 @@ XORG_DEFAULT_OPTIONS + AC_DISABLE_STATIC + AC_PROG_LIBTOOL + +-# Checks for programs. +-AM_PROG_CC_C_O +- + AH_TOP([#include "xorg-server.h"]) + + # Define a configure option for an alternate module directory +-- +1.7.9.4 + diff --git a/source/x/x11/patch/xf86-video-chips/0005-util-Consolidate-common-macros.patch b/source/x/x11/patch/xf86-video-chips/0005-util-Consolidate-common-macros.patch new file mode 100644 index 00000000..77d0d5bc --- /dev/null +++ b/source/x/x11/patch/xf86-video-chips/0005-util-Consolidate-common-macros.patch @@ -0,0 +1,283 @@ +From 94a8b34528b42a4fe6f81c8b8bd1ddb6bebaeea9 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston +Date: Tue, 18 Oct 2011 23:04:32 -0700 +Subject: [PATCH 5/9] util: Consolidate common macros + +Signed-off-by: Jeremy Huddleston +--- + util/dRegs.c | 57 +------------------------------------------------------ + util/iopl.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + util/mRegs.c | 57 +------------------------------------------------------ + util/modClock.c | 53 ++------------------------------------------------- + 4 files changed, 58 insertions(+), 163 deletions(-) + create mode 100644 util/iopl.h + +diff --git a/util/dRegs.c b/util/dRegs.c +index b7edc8f..0d2f0cb 100644 +--- a/util/dRegs.c ++++ b/util/dRegs.c +@@ -1,63 +1,8 @@ +- +- +- +- +- +- +-#ifdef __NetBSD__ +-# include +-# include +-# include +-#else +-# if defined(SVR4) && defined(i386) +-# include +-# ifdef NCR +- /* broken NCR */ +-# define __STDC +-# include +-# undef __STDC +-# else +-# include +-# endif +-# ifdef SVR4 +-# if !defined(sun) +-# include +-# endif +-# endif +-# include +-# if defined(sun) +-# include +-# endif +-# endif +-# include "AsmMacros.h" +-#endif /* NetBSD */ +- + #include + #include + #include + +-#ifdef __NetBSD__ +-# define SET_IOPL() i386_iopl(3) +-# define RESET_IOPL() i386_iopl(0) +-#else +-# if defined(SVR4) && defined(i386) +-# ifndef SI86IOPL +-# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) +-# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) +-# else +-# define SET_IOPL() sysi86(SI86IOPL,3) +-# define RESET_IOPL() sysi86(SI86IOPL,0) +-# endif +-# else +-# ifdef linux +-# define SET_IOPL() iopl(3) +-# define RESET_IOPL() iopl(0) +-# else +-# define SET_IOPL() (void)0 +-# define RESET_IOPL() (void)0 +-# endif +-# endif +-#endif ++#include "iopl.h" + + int main(void) + { +diff --git a/util/iopl.h b/util/iopl.h +new file mode 100644 +index 0000000..d7890b3 +--- /dev/null ++++ b/util/iopl.h +@@ -0,0 +1,54 @@ ++#ifdef __NetBSD__ ++# include ++# include ++# include ++#else ++# if defined(SVR4) && defined(i386) ++# include ++# ifdef NCR ++ /* broken NCR */ ++# define __STDC ++# include ++# undef __STDC ++# else ++# include ++# endif ++# ifdef SVR4 ++# if !defined(sun) ++# include ++# endif ++# endif ++# include ++# if defined(sun) ++# include ++# endif ++# endif ++# include "AsmMacros.h" ++#endif /* NetBSD */ ++ ++#include ++#include ++#include ++ ++#ifdef __NetBSD__ ++# define SET_IOPL() i386_iopl(3) ++# define RESET_IOPL() i386_iopl(0) ++#else ++# if defined(SVR4) && defined(i386) ++# ifndef SI86IOPL ++# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) ++# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) ++# else ++# define SET_IOPL() sysi86(SI86IOPL,3) ++# define RESET_IOPL() sysi86(SI86IOPL,0) ++# endif ++# else ++# ifdef linux ++# define SET_IOPL() iopl(3) ++# define RESET_IOPL() iopl(0) ++# else ++# define SET_IOPL() (void)0 ++# define RESET_IOPL() (void)0 ++# endif ++# endif ++#endif +diff --git a/util/mRegs.c b/util/mRegs.c +index f359738..843d01d 100644 +--- a/util/mRegs.c ++++ b/util/mRegs.c +@@ -1,63 +1,8 @@ +- +- +- +- +- +- +-#ifdef __NetBSD__ +-# include +-# include +-# include +-#else +-# if defined(SVR4) && defined(i386) +-# include +-# ifdef NCR +- /* broken NCR */ +-# define __STDC +-# include +-# undef __STDC +-# else +-# include +-# endif +-# ifdef SVR4 +-# if !defined(sun) +-# include +-# endif +-# endif +-# include +-# if defined(sun) +-# include +-# endif +-# endif +-# include "AsmMacros.h" +-#endif /* NetBSD */ +- + #include + #include + #include + +-#ifdef __NetBSD__ +-# define SET_IOPL() i386_iopl(3) +-# define RESET_IOPL() i386_iopl(0) +-#else +-# if defined(SVR4) && defined(i386) +-# ifndef SI86IOPL +-# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) +-# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) +-# else +-# define SET_IOPL() sysi86(SI86IOPL,3) +-# define RESET_IOPL() sysi86(SI86IOPL,0) +-# endif +-# else +-# ifdef linux +-# define SET_IOPL() iopl(3) +-# define RESET_IOPL() iopl(0) +-# else +-# define SET_IOPL() (void)0 +-# define RESET_IOPL() (void)0 +-# endif +-# endif +-#endif ++#include "iopl.h" + + int hex2int(char* str); + +diff --git a/util/modClock.c b/util/modClock.c +index 89a291a..45af19b 100644 +--- a/util/modClock.c ++++ b/util/modClock.c +@@ -1,61 +1,12 @@ +- +-#ifdef __NetBSD__ +-# include +-# include +-# include +-#else +-# if defined(SVR4) && defined(i386) +-# include +-# ifdef NCR +- /* broken NCR */ +-# define __STDC +-# include +-# undef __STDC +-# else +-# include +-# endif +-# ifdef SVR4 +-# if !defined(sun) +-# include +-# endif +-# endif +-# include +-# if defined(sun) +-# include +-# endif +-# endif +-# include "AsmMacros.h" +-#endif /* NetBSD */ +- + #include + #include + #include ++ + #ifndef Lynx + #include + #endif + +-#ifdef __NetBSD__ +-# define SET_IOPL() i386_iopl(3) +-# define RESET_IOPL() i386_iopl(0) +-#else +-# if defined(SVR4) && defined(i386) +-# ifndef SI86IOPL +-# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) +-# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) +-# else +-# define SET_IOPL() sysi86(SI86IOPL,3) +-# define RESET_IOPL() sysi86(SI86IOPL,0) +-# endif +-# else +-# ifdef linux +-# define SET_IOPL() iopl(3) +-# define RESET_IOPL() iopl(0) +-# else +-# define SET_IOPL() (void)0 +-# define RESET_IOPL() (void)0 +-# endif +-# endif +-#endif ++#include "iopl.h" + + #define tolerance 0.01 /* +/- 1% */ + +-- +1.7.9.4 + diff --git a/source/x/x11/patch/xf86-video-chips/0006-Fix-implicit-declaration-of-iopl.patch b/source/x/x11/patch/xf86-video-chips/0006-Fix-implicit-declaration-of-iopl.patch new file mode 100644 index 00000000..a0b4bb4b --- /dev/null +++ b/source/x/x11/patch/xf86-video-chips/0006-Fix-implicit-declaration-of-iopl.patch @@ -0,0 +1,35 @@ +From c421f2477c99990d0dc712d6aece981fa6c961e5 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston +Date: Tue, 18 Oct 2011 23:09:09 -0700 +Subject: [PATCH 6/9] Fix implicit declaration of iopl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +warning: implicit declaration of function ‘iopl’ [-Wimplicit-function-declaration] + +Signed-off-by: Jeremy Huddleston +--- + util/iopl.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/util/iopl.h b/util/iopl.h +index d7890b3..e08207c 100644 +--- a/util/iopl.h ++++ b/util/iopl.h +@@ -3,6 +3,12 @@ + # include + # include + #else ++# if defined(__linux__) ++/* Can't because provides conflicting inb, outb, etc ++ * # include ++ */ ++int iopl(int level); ++# endif + # if defined(SVR4) && defined(i386) + # include + # ifdef NCR +-- +1.7.9.4 + diff --git a/source/x/x11/patch/xf86-video-chips/0007-Build-fix-for-ABI-Version-12.patch b/source/x/x11/patch/xf86-video-chips/0007-Build-fix-for-ABI-Version-12.patch new file mode 100644 index 00000000..12dc5131 --- /dev/null +++ b/source/x/x11/patch/xf86-video-chips/0007-Build-fix-for-ABI-Version-12.patch @@ -0,0 +1,51 @@ +From 8a5ea07f30cc71ecc413fad0713facff72f77472 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston +Date: Tue, 18 Oct 2011 23:21:33 -0700 +Subject: [PATCH 7/9] Build fix for ABI Version 12 + +ABI Version 12 removes support for multiple PCI domains. If you need to +use this driver on a system with more than one PCI domain, you should +either port this driver to using libpciaccess directly or stick with an +older server. + +Signed-off-by: Jeremy Huddleston +--- + src/ct_driver.c | 5 +++++ + src/ct_driver.h | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/ct_driver.c b/src/ct_driver.c +index e6538c6..a2e5c94 100644 +--- a/src/ct_driver.c ++++ b/src/ct_driver.c +@@ -1446,7 +1446,12 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) + + hwp = VGAHWPTR(pScrn); + vgaHWGetIOBase(hwp); ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 + cPtr->PIOBase = hwp->PIOOffset; ++#else ++ cPtr->PIOBase = 0; ++#endif ++ + /* + * Must allow ensure that storage for the 2nd set of vga registers is + * allocated for dual channel cards +diff --git a/src/ct_driver.h b/src/ct_driver.h +index 39eeb6e..9033867 100644 +--- a/src/ct_driver.h ++++ b/src/ct_driver.h +@@ -276,8 +276,8 @@ typedef struct _CHIPSRec { + #endif + int Chipset; + EntityInfoPtr pEnt; +- IOADDRESS PIOBase; +- CARD32 IOAddress; ++ unsigned long PIOBase; ++ unsigned long IOAddress; + unsigned long FbAddress; + unsigned int IOBase; + unsigned char * FbBase; +-- +1.7.9.4 + diff --git a/source/x/x11/patch/xf86-video-chips/0008-Fall-back-to-shadowfb-if-XAA-is-unavailable.patch b/source/x/x11/patch/xf86-video-chips/0008-Fall-back-to-shadowfb-if-XAA-is-unavailable.patch new file mode 100644 index 00000000..3478fa34 --- /dev/null +++ b/source/x/x11/patch/xf86-video-chips/0008-Fall-back-to-shadowfb-if-XAA-is-unavailable.patch @@ -0,0 +1,31 @@ +From 5d5753551609f1483801e5edd8d42b11713c981e Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 19 Dec 2011 16:18:34 -0500 +Subject: [PATCH 8/9] Fall back to shadowfb if XAA is unavailable + +Signed-off-by: Adam Jackson +--- + src/ct_driver.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/ct_driver.c b/src/ct_driver.c +index a2e5c94..95092a2 100644 +--- a/src/ct_driver.c ++++ b/src/ct_driver.c +@@ -1345,10 +1345,9 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags) + + if (cPtr->Flags & ChipsAccelSupport) { + if (!xf86LoadSubModule(pScrn, "xaa")) { +- vbeFree(cPtr->pVbe); +- cPtr->pVbe = NULL; +- CHIPSFreeRec(pScrn); +- return FALSE; ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n"); ++ cPtr->Flags &= ~(ChipsAccelSupport); ++ cPtr->Flags |= ChipsShadowFB; + } + } + +-- +1.7.9.4 + diff --git a/source/x/x11/patch/xf86-video-chips/0009-Fix-for-new-vgaHW-ABI.patch b/source/x/x11/patch/xf86-video-chips/0009-Fix-for-new-vgaHW-ABI.patch new file mode 100644 index 00000000..74ec3722 --- /dev/null +++ b/source/x/x11/patch/xf86-video-chips/0009-Fix-for-new-vgaHW-ABI.patch @@ -0,0 +1,25 @@ +From 989cf4f1fb2ac57f38d363734b71a5cf749db146 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 19 Dec 2011 17:45:41 -0500 +Subject: [PATCH 9/9] Fix for new vgaHW ABI + +Signed-off-by: Adam Jackson +--- + src/ct_driver.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ct_driver.c b/src/ct_driver.c +index 95092a2..08ccd72 100644 +--- a/src/ct_driver.c ++++ b/src/ct_driver.c +@@ -1444,6 +1444,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) + return FALSE; + + hwp = VGAHWPTR(pScrn); ++ vgaHWSetStdFuncs(hwp); + vgaHWGetIOBase(hwp); + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 + cPtr->PIOBase = hwp->PIOOffset; +-- +1.7.9.4 + diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch index e3218a03..01be43a3 100644 --- a/source/x/x11/patch/xorg-server.patch +++ b/source/x/x11/patch/xorg-server.patch @@ -1,3 +1 @@ zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -zcat $CWD/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -zcat $CWD/patch/xorg-server/xorg-server.try_nouveau.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff b/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff index bfa9c305..8c0e3b54 100644 --- a/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff +++ b/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff @@ -1,13 +1,14 @@ ---- ./dix/window.c.orig 2007-01-22 23:39:15.000000000 -0600 -+++ ./dix/window.c 2007-02-14 03:21:03.000000000 -0600 -@@ -140,8 +140,8 @@ - * - ******/ +diff -Nur xorg-server-1.12.1.orig/dix/window.c xorg-server-1.12.1/dix/window.c +--- xorg-server-1.12.1.orig/dix/window.c 2012-03-29 21:57:25.000000000 -0500 ++++ xorg-server-1.12.1/dix/window.c 2012-04-13 22:01:24.456073603 -0500 +@@ -145,8 +145,8 @@ --static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11}; --static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88}; -+static unsigned char _back_lsb[4] = {0x00, 0x00, 0x00, 0x00}; -+static unsigned char _back_msb[4] = {0x00, 0x00, 0x00, 0x00}; + Bool bgNoneRoot = FALSE; - _X_EXPORT int screenIsSaved = SCREEN_SAVER_OFF; +-static unsigned char _back_lsb[4] = { 0x88, 0x22, 0x44, 0x11 }; +-static unsigned char _back_msb[4] = { 0x11, 0x44, 0x22, 0x88 }; ++static unsigned char _back_lsb[4] = { 0x00, 0x00, 0x00, 0x00 }; ++static unsigned char _back_msb[4] = { 0x00, 0x00, 0x00, 0x00 }; + static Bool WindowParentHasDeviceCursor(WindowPtr pWin, + DeviceIntPtr pDev, CursorPtr pCurs); diff --git a/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff b/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff deleted file mode 100644 index f8abdccb..00000000 --- a/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./fb/fbpict.c.orig 2010-03-11 22:38:21.000000000 -0600 -+++ ./fb/fbpict.c 2010-04-29 14:14:52.000000000 -0500 -@@ -37,7 +37,7 @@ - #include "mipict.h" - #include "fbpict.h" - --#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b)) -+#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-(a)) % (b)) - - void - fbWalkCompositeRegion (CARD8 op, diff --git a/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff b/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff deleted file mode 100644 index 74f799a1..00000000 --- a/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./hw/xfree86/common/xf86pciBus.c.orig 2010-07-01 12:17:35.000000000 -0500 -+++ ./hw/xfree86/common/xf86pciBus.c 2010-11-18 16:56:57.633003654 -0600 -@@ -1118,7 +1118,7 @@ - break; - case 0x102b: driverList[0] = "mga"; break; - case 0x10c8: driverList[0] = "neomagic"; break; -- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; -+ case 0x10de: case 0x12d2: driverList[0] = "nouveau" ; driverList[1] = "nv"; break; - case 0x1106: driverList[0] = "openchrome"; break; - case 0x1b36: driverList[0] = "qxl"; break; - case 0x1163: driverList[0] = "rendition"; break; diff --git a/source/x/x11/post-install/lbxproxy.post-install b/source/x/x11/post-install/lbxproxy.post-install deleted file mode 100644 index 9bb11032..00000000 --- a/source/x/x11/post-install/lbxproxy.post-install +++ /dev/null @@ -1,5 +0,0 @@ -mkdir -p $PKG/etc/X11 -( cd $PKG/usr/lib/X11 - mv lbxproxy $PKG/etc/X11 - ln -sf ../../../etc/X11/lbxproxy . -) diff --git a/source/x/x11/post-install/libXaw3d.post-install b/source/x/x11/post-install/libXaw3d.post-install new file mode 100644 index 00000000..5b2d5bf2 --- /dev/null +++ b/source/x/x11/post-install/libXaw3d.post-install @@ -0,0 +1,29 @@ + +# Copyright 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +# Create some compat symlinks for older versions: + +( cd $PKG/usr/lib + ln -sf libXaw3d.so.8 libXaw3d.so.6 + ln -sf libXaw3d.so.8 libXaw3d.so.7 +) + diff --git a/source/x/x11/post-install/proxymngr.post-install b/source/x/x11/post-install/proxymngr.post-install deleted file mode 100644 index 29c647c3..00000000 --- a/source/x/x11/post-install/proxymngr.post-install +++ /dev/null @@ -1,5 +0,0 @@ -mkdir -p $PKG/etc/X11 -( cd $PKG/usr/lib/X11 - mv proxymngr $PKG/etc/X11 - ln -sf ../../../etc/X11/proxymngr . -) diff --git a/source/x/x11/post-install/rstart.post-install b/source/x/x11/post-install/rstart.post-install deleted file mode 100644 index d51ad34d..00000000 --- a/source/x/x11/post-install/rstart.post-install +++ /dev/null @@ -1,5 +0,0 @@ -mkdir -p $PKG/etc/X11 -( cd $PKG/usr/lib/X11 - mv rstart $PKG/etc/X11 - ln -sf ../../../etc/X11/rstart . -) diff --git a/source/x/x11/post-install/util-macros.post-install b/source/x/x11/post-install/util-macros.post-install deleted file mode 100644 index b25fb344..00000000 --- a/source/x/x11/post-install/util-macros.post-install +++ /dev/null @@ -1,2 +0,0 @@ -mkdir -p $PKG/usr/lib -mv $PKG/usr/share/pkgconfig $PKG/usr/lib diff --git a/source/x/x11/post-install/xcb-util.post-install b/source/x/x11/post-install/xcb-util.post-install new file mode 100644 index 00000000..ac269177 --- /dev/null +++ b/source/x/x11/post-install/xcb-util.post-install @@ -0,0 +1,8 @@ +# The libraries libxcb-{atom,aux,event} have been merged into the +# libxcb-util library. To maintain compatibility with existing +# binaries, add some runtime-only compat symlinks: +( cd $PKG/usr/lib + ln -sf libxcb-util.so.?.?.? libxcb-atom.so.1 + ln -sf libxcb-util.so.?.?.? libxcb-aux.so.0 + ln -sf libxcb-util.so.?.?.? libxcb-event.so.1 +) diff --git a/source/x/x11/post-install/xdm.post-install b/source/x/x11/post-install/xdm.post-install index 83dcf788..73611b47 100644 --- a/source/x/x11/post-install/xdm.post-install +++ b/source/x/x11/post-install/xdm.post-install @@ -1,19 +1,30 @@ mkdir -p $PKG/etc/X11 -( cd $PKG/usr/lib/X11 - mv xdm $PKG/etc/X11 - ln -sf ../../../etc/X11/xdm . -) -mv $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsession.orig -mv $PKG/etc/X11/xdm/Xsetup_0 $PKG/etc/X11/xdm/Xsetup_0.orig +mv $PKG/usr/lib/X11/xdm $PKG/etc/X11 +ln -sf ../../../etc/X11/xdm $PKG/usr/lib/X11/xdm + +#( cd $PKG/usr/lib/X11 +# mv xdm $PKG/etc/X11 +# ln -sf ../../../etc/X11/xdm . +#) + +mkdir -p $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION +mv $PKG/etc/X11/xdm/Xsession $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION/Xsession.orig +mv $PKG/etc/X11/xdm/Xsetup_0 $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION/Xsetup_0.orig + cp -a $CWD/post-install/xdm/Xsession $PKG/etc/X11/xdm/Xsession cp -a $CWD/post-install/xdm/Xsetup_0 $PKG/etc/X11/xdm/Xsetup_0 + chown root:root $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0 -chmod 755 $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0 -( cd $PKG/etc/X11/xdm - mv xdm-config xdm-config.new - mv Xservers Xservers.new - mv Xsession Xsession.new -) +chmod 0755 $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0 + +for conffile in \ + Xaccess Xreset Xresources Xservers Xsession Xsetup_0 Xstartup Xwilling \ + GiveConsole TakeConsole chooser xdm-config ../app-defaults/Chooser ; +do + mv $PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new ; +done + mkdir -p $PKG/var/lib/xdm chown root:root $PKG/var/lib/xdm chmod 755 $PKG/var/lib/xdm + diff --git a/source/x/x11/post-install/xf86-input-wacom.post-install b/source/x/x11/post-install/xf86-input-wacom.post-install new file mode 100644 index 00000000..d2b17ecc --- /dev/null +++ b/source/x/x11/post-install/xf86-input-wacom.post-install @@ -0,0 +1,5 @@ +# I'm not sure we need this any more, so let's wait for a bug report +# https://wiki.archlinux.org/index.php/Wacom_Tablet +mkdir -p $PKG/lib/udev/rules.d +cat $CWD/post-install/xf86-input-wacom/60-wacom.rules > \ + $PKG/lib/udev/rules.d/60-wacom.rules diff --git a/source/x/x11/post-install/xf86-input-wacom/60-wacom.rules b/source/x/x11/post-install/xf86-input-wacom/60-wacom.rules new file mode 100644 index 00000000..59224786 --- /dev/null +++ b/source/x/x11/post-install/xf86-input-wacom/60-wacom.rules @@ -0,0 +1,6 @@ +# From https://wiki.archlinux.org/index.php/Wacom_Tablet +ACTION!="add|change", GOTO="wacom_end" + # Match all wacom tablets with a serial ID starting with WACf or FUJ* + ATTRS{id}=="WACf*" ENV{NAME}="Serial Wacom Tablet", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1" + ATTRS{id}=="FUJ*" ENV{NAME}="Serial Wacom Tablet", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1" +LABEL="wacom_end" diff --git a/source/x/x11/slack-desc/applewmproto b/source/x/x11/slack-desc/applewmproto deleted file mode 100644 index 4a81b79b..00000000 --- a/source/x/x11/slack-desc/applewmproto +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -applewmproto: applewmproto -applewmproto: -applewmproto: applewmproto is part of X11. -applewmproto: -applewmproto: For more information about the X.Org Foundation (the providers of the -applewmproto: X.Org implementation of the X Window System), see their website: -applewmproto: -applewmproto: http://www.x.org -applewmproto: -applewmproto: -applewmproto: diff --git a/source/x/x11/slack-desc/appres b/source/x/x11/slack-desc/appres index e397c8cd..001a3f34 100644 --- a/source/x/x11/slack-desc/appres +++ b/source/x/x11/slack-desc/appres @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -appres: appres +appres: appres (X resource inspection utility) appres: -appres: appres is part of X11. +appres: The appres program prints the resources seen by an application +appres: (or subhierarchy of an application) with the specified class and +appres: instance names. It can be used to determine which resources a +appres: particular program will load. appres: -appres: For more information about the X.Org Foundation (the providers of the -appres: X.Org implementation of the X Window System), see their website: appres: -appres: http://www.x.org appres: appres: appres: diff --git a/source/x/x11/slack-desc/bdftopcf b/source/x/x11/slack-desc/bdftopcf index cb2a80a1..c9514c16 100644 --- a/source/x/x11/slack-desc/bdftopcf +++ b/source/x/x11/slack-desc/bdftopcf @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -bdftopcf: bdftopcf +bdftopcf: bdftopcf (font compiler for the X server and font server) bdftopcf: -bdftopcf: bdftopcf is part of X11. +bdftopcf: Fonts in Portable Compiled Format can be read by any architecture, +bdftopcf: although the file is structured to allow one particular architecture +bdftopcf: to read them directly without reformatting. This allows fast reading +bdftopcf: on the appropriate machine, but the files are still portable (but +bdftopcf: read more slowly) on other machines. bdftopcf: -bdftopcf: For more information about the X.Org Foundation (the providers of the -bdftopcf: X.Org implementation of the X Window System), see their website: -bdftopcf: -bdftopcf: http://www.x.org bdftopcf: bdftopcf: bdftopcf: diff --git a/source/x/x11/slack-desc/beforelight b/source/x/x11/slack-desc/beforelight index 20549ac4..a2a5f48e 100644 --- a/source/x/x11/slack-desc/beforelight +++ b/source/x/x11/slack-desc/beforelight @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -beforelight: beforelight +beforelight: beforelight (X11 screensaver) beforelight: -beforelight: beforelight is part of X11. +beforelight: The beforelight program is a sample implementation of a screen saver +beforelight: for X servers supporting the MIT-SCREEN-SAVER extension. It is only +beforelight: recommended for use as a code sample, as it does not include features +beforelight: such as screen locking or configurability, and relies on the legacy +beforelight: Xaw toolkit. beforelight: -beforelight: For more information about the X.Org Foundation (the providers of the -beforelight: X.Org implementation of the X Window System), see their website: -beforelight: -beforelight: http://www.x.org beforelight: beforelight: beforelight: diff --git a/source/x/x11/slack-desc/bigreqsproto b/source/x/x11/slack-desc/bigreqsproto index 55c66bbc..8b35e52f 100644 --- a/source/x/x11/slack-desc/bigreqsproto +++ b/source/x/x11/slack-desc/bigreqsproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -bigreqsproto: bigreqsproto +bigreqsproto: bigreqsproto (C prototypes for X11 Big Requests Extension) bigreqsproto: bigreqsproto: bigreqsproto is part of X11. bigreqsproto: diff --git a/source/x/x11/slack-desc/bitmap b/source/x/x11/slack-desc/bitmap index 72423e76..60ed7c74 100644 --- a/source/x/x11/slack-desc/bitmap +++ b/source/x/x11/slack-desc/bitmap @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -bitmap: bitmap +bitmap: bitmap (X bitmap (XBM) editor and converter utilities) +bitmap: +bitmap: The bitmap package includes the bitmap, bmtoa, and atobm programs. +bitmap: +bitmap: bitmap: -bitmap: bitmap is part of X11. bitmap: -bitmap: For more information about the X.Org Foundation (the providers of the -bitmap: X.Org implementation of the X Window System), see their website: bitmap: -bitmap: http://www.x.org bitmap: bitmap: bitmap: diff --git a/source/x/x11/slack-desc/compiz b/source/x/x11/slack-desc/compiz index e1399119..c81aae0e 100644 --- a/source/x/x11/slack-desc/compiz +++ b/source/x/x11/slack-desc/compiz @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -compiz: compiz +compiz: compiz (OpenGL window and compositing manager) compiz: -compiz: compiz is part of X11. +compiz: Compiz is an OpenGL compositing manager that use +compiz: GLX_EXT_texture_from_pixmap for binding redirected top-level windows +compiz: to texture objects. It has a flexible plug-in system and it is designed +compiz: to run well on most graphics hardware. compiz: -compiz: For more information about the X.Org Foundation (the providers of the -compiz: X.Org implementation of the X Window System), see their website: compiz: -compiz: http://www.x.org compiz: compiz: compiz: diff --git a/source/x/x11/slack-desc/compositeproto b/source/x/x11/slack-desc/compositeproto index 63e26c77..197ece99 100644 --- a/source/x/x11/slack-desc/compositeproto +++ b/source/x/x11/slack-desc/compositeproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -compositeproto: compositeproto +compositeproto: compositeproto (C prototypes for X11 Composite Extension) compositeproto: compositeproto: compositeproto is part of X11. compositeproto: diff --git a/source/x/x11/slack-desc/constype b/source/x/x11/slack-desc/constype deleted file mode 100644 index ddcf95df..00000000 --- a/source/x/x11/slack-desc/constype +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -constype: constype -constype: -constype: constype is part of X11. -constype: -constype: For more information about the X.Org Foundation (the providers of the -constype: X.Org implementation of the X Window System), see their website: -constype: -constype: http://www.x.org -constype: -constype: -constype: diff --git a/source/x/x11/slack-desc/damageproto b/source/x/x11/slack-desc/damageproto index 98c085fe..5998b60a 100644 --- a/source/x/x11/slack-desc/damageproto +++ b/source/x/x11/slack-desc/damageproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -damageproto: damageproto +damageproto: damageproto (C prototypes for X11 Damage Extension) damageproto: damageproto: damageproto is part of X11. damageproto: diff --git a/source/x/x11/slack-desc/dmxproto b/source/x/x11/slack-desc/dmxproto index a9598f9a..7df2c84f 100644 --- a/source/x/x11/slack-desc/dmxproto +++ b/source/x/x11/slack-desc/dmxproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -dmxproto: dmxproto +dmxproto: dmxproto (C prototypes for X11 Distributed Multihead X Extension) dmxproto: dmxproto: dmxproto is part of X11. dmxproto: diff --git a/source/x/x11/slack-desc/dri2proto b/source/x/x11/slack-desc/dri2proto index c416449a..06ac495d 100644 --- a/source/x/x11/slack-desc/dri2proto +++ b/source/x/x11/slack-desc/dri2proto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -dri2proto: dri2proto +dri2proto: dri2proto (C prototypes for X11 Direct Rendering Infrastructure 2) dri2proto: dri2proto: dri2proto is part of X11. dri2proto: diff --git a/source/x/x11/slack-desc/editres b/source/x/x11/slack-desc/editres index efdc8d75..01fe56c8 100644 --- a/source/x/x11/slack-desc/editres +++ b/source/x/x11/slack-desc/editres @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -editres: editres +editres: editres (X11 resource editor) editres: editres: editres is part of X11. editres: diff --git a/source/x/x11/slack-desc/encodings b/source/x/x11/slack-desc/encodings index a6de3517..9d35da9f 100644 --- a/source/x/x11/slack-desc/encodings +++ b/source/x/x11/slack-desc/encodings @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -encodings: encodings +encodings: encodings (X11 font encodings) encodings: encodings: encodings is part of X11. encodings: diff --git a/source/x/x11/slack-desc/evieext b/source/x/x11/slack-desc/evieext index 36a135e6..cff1b67d 100644 --- a/source/x/x11/slack-desc/evieext +++ b/source/x/x11/slack-desc/evieext @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -evieext: evieext +evieext: evieext (C prototypes for X11 Extended Visual Information Extension) evieext: evieext: evieext is part of X11. evieext: diff --git a/source/x/x11/slack-desc/fixesproto b/source/x/x11/slack-desc/fixesproto index 7e1a1eab..83cfded0 100644 --- a/source/x/x11/slack-desc/fixesproto +++ b/source/x/x11/slack-desc/fixesproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -fixesproto: fixesproto +fixesproto: fixesproto (C prototypes for X11 X Fixes Extension) fixesproto: fixesproto: fixesproto is part of X11. fixesproto: diff --git a/source/x/x11/slack-desc/font-adobe-100dpi b/source/x/x11/slack-desc/font-adobe-100dpi index 50996b1b..ea59df87 100644 --- a/source/x/x11/slack-desc/font-adobe-100dpi +++ b/source/x/x11/slack-desc/font-adobe-100dpi @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-adobe-100dpi: font-adobe-100dpi +font-adobe-100dpi: font-adobe-100dpi (bitmap fonts for X11) font-adobe-100dpi: font-adobe-100dpi: font-adobe-100dpi is part of X11. font-adobe-100dpi: diff --git a/source/x/x11/slack-desc/font-adobe-75dpi b/source/x/x11/slack-desc/font-adobe-75dpi index ca91ae5e..fac2cc42 100644 --- a/source/x/x11/slack-desc/font-adobe-75dpi +++ b/source/x/x11/slack-desc/font-adobe-75dpi @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-adobe-75dpi: font-adobe-75dpi +font-adobe-75dpi: font-adobe-75dpi (bitmap fonts for X11) font-adobe-75dpi: font-adobe-75dpi: font-adobe-75dpi is part of X11. font-adobe-75dpi: diff --git a/source/x/x11/slack-desc/font-adobe-utopia-100dpi b/source/x/x11/slack-desc/font-adobe-utopia-100dpi index 956f6d53..29cebe23 100644 --- a/source/x/x11/slack-desc/font-adobe-utopia-100dpi +++ b/source/x/x11/slack-desc/font-adobe-utopia-100dpi @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-adobe-utopia-100dpi: font-adobe-utopia-100dpi +font-adobe-utopia-100dpi: font-adobe-utopia-100dpi (bitmap fonts for X11) font-adobe-utopia-100dpi: font-adobe-utopia-100dpi: font-adobe-utopia-100dpi is part of X11. font-adobe-utopia-100dpi: diff --git a/source/x/x11/slack-desc/font-adobe-utopia-75dpi b/source/x/x11/slack-desc/font-adobe-utopia-75dpi index 73571791..1c941b8a 100644 --- a/source/x/x11/slack-desc/font-adobe-utopia-75dpi +++ b/source/x/x11/slack-desc/font-adobe-utopia-75dpi @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-adobe-utopia-75dpi: font-adobe-utopia-75dpi +font-adobe-utopia-75dpi: font-adobe-utopia-75dpi (bitmap fonts for X11) font-adobe-utopia-75dpi: font-adobe-utopia-75dpi: font-adobe-utopia-75dpi is part of X11. font-adobe-utopia-75dpi: diff --git a/source/x/x11/slack-desc/font-adobe-utopia-type1 b/source/x/x11/slack-desc/font-adobe-utopia-type1 index 5f6d7d1b..7c6141c4 100644 --- a/source/x/x11/slack-desc/font-adobe-utopia-type1 +++ b/source/x/x11/slack-desc/font-adobe-utopia-type1 @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-adobe-utopia-type1: font-adobe-utopia-type1 +font-adobe-utopia-type1: font-adobe-utopia-type1 (scalable fonts for X11) font-adobe-utopia-type1: font-adobe-utopia-type1: font-adobe-utopia-type1 is part of X11. font-adobe-utopia-type1: diff --git a/source/x/x11/slack-desc/font-alias b/source/x/x11/slack-desc/font-alias index d5e513d5..8f34e389 100644 --- a/source/x/x11/slack-desc/font-alias +++ b/source/x/x11/slack-desc/font-alias @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-alias: font-alias +font-alias: font-alias (X11 font aliases) font-alias: font-alias: font-alias is part of X11. font-alias: diff --git a/source/x/x11/slack-desc/font-arabic-misc b/source/x/x11/slack-desc/font-arabic-misc index bf9d34e2..8f2d661b 100644 --- a/source/x/x11/slack-desc/font-arabic-misc +++ b/source/x/x11/slack-desc/font-arabic-misc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-arabic-misc: font-arabic-misc +font-arabic-misc: font-arabic-misc (bitmap fonts for X11) font-arabic-misc: font-arabic-misc: font-arabic-misc is part of X11. font-arabic-misc: diff --git a/source/x/x11/slack-desc/font-bh-100dpi b/source/x/x11/slack-desc/font-bh-100dpi index 3db086b4..2ec64078 100644 --- a/source/x/x11/slack-desc/font-bh-100dpi +++ b/source/x/x11/slack-desc/font-bh-100dpi @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-bh-100dpi: font-bh-100dpi +font-bh-100dpi: font-bh-100dpi (bitmap fonts for X11) font-bh-100dpi: font-bh-100dpi: font-bh-100dpi is part of X11. font-bh-100dpi: diff --git a/source/x/x11/slack-desc/font-bh-75dpi b/source/x/x11/slack-desc/font-bh-75dpi index ab93f8a9..36f1efd3 100644 --- a/source/x/x11/slack-desc/font-bh-75dpi +++ b/source/x/x11/slack-desc/font-bh-75dpi @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-bh-75dpi: font-bh-75dpi +font-bh-75dpi: font-bh-75dpi (bitmap fonts for X11) font-bh-75dpi: font-bh-75dpi: font-bh-75dpi is part of X11. font-bh-75dpi: diff --git a/source/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi b/source/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi index d289f9a2..30805c87 100644 --- a/source/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi +++ b/source/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-bh-lucidatypewriter-100dpi: font-bh-lucidatypewriter-100dpi +font-bh-lucidatypewriter-100dpi: font-bh-lucidatypewriter-100dpi (bitmap fonts for X11) font-bh-lucidatypewriter-100dpi: font-bh-lucidatypewriter-100dpi: font-bh-lucidatypewriter-100dpi is part of X11. font-bh-lucidatypewriter-100dpi: diff --git a/source/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi b/source/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi index a9ae87e3..23c5b8e4 100644 --- a/source/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi +++ b/source/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-bh-lucidatypewriter-75dpi: font-bh-lucidatypewriter-75dpi +font-bh-lucidatypewriter-75dpi: font-bh-lucidatypewriter-75dpi (bitmap fonts for X11) font-bh-lucidatypewriter-75dpi: font-bh-lucidatypewriter-75dpi: font-bh-lucidatypewriter-75dpi is part of X11. font-bh-lucidatypewriter-75dpi: diff --git a/source/x/x11/slack-desc/font-bh-ttf b/source/x/x11/slack-desc/font-bh-ttf index 5965002d..2d695562 100644 --- a/source/x/x11/slack-desc/font-bh-ttf +++ b/source/x/x11/slack-desc/font-bh-ttf @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-bh-ttf: font-bh-ttf +font-bh-ttf: font-bh-ttf (scalable fonts for X11) font-bh-ttf: font-bh-ttf: font-bh-ttf is part of X11. font-bh-ttf: diff --git a/source/x/x11/slack-desc/font-bh-type1 b/source/x/x11/slack-desc/font-bh-type1 index eb61ed80..7d988cd3 100644 --- a/source/x/x11/slack-desc/font-bh-type1 +++ b/source/x/x11/slack-desc/font-bh-type1 @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-bh-type1: font-bh-type1 +font-bh-type1: font-bh-type1 (scalable fonts for X11) font-bh-type1: font-bh-type1: font-bh-type1 is part of X11. font-bh-type1: diff --git a/source/x/x11/slack-desc/font-bitstream-100dpi b/source/x/x11/slack-desc/font-bitstream-100dpi index 3ebccefc..d2461bb0 100644 --- a/source/x/x11/slack-desc/font-bitstream-100dpi +++ b/source/x/x11/slack-desc/font-bitstream-100dpi @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-bitstream-100dpi: font-bitstream-100dpi +font-bitstream-100dpi: font-bitstream-100dpi (bitmap fonts for X11) font-bitstream-100dpi: font-bitstream-100dpi: font-bitstream-100dpi is part of X11. font-bitstream-100dpi: diff --git a/source/x/x11/slack-desc/font-bitstream-75dpi b/source/x/x11/slack-desc/font-bitstream-75dpi index 49b1f262..8604be9f 100644 --- a/source/x/x11/slack-desc/font-bitstream-75dpi +++ b/source/x/x11/slack-desc/font-bitstream-75dpi @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-bitstream-75dpi: font-bitstream-75dpi +font-bitstream-75dpi: font-bitstream-75dpi (bitmap fonts for X11) font-bitstream-75dpi: font-bitstream-75dpi: font-bitstream-75dpi is part of X11. font-bitstream-75dpi: diff --git a/source/x/x11/slack-desc/font-bitstream-speedo b/source/x/x11/slack-desc/font-bitstream-speedo index f5db39e8..51236f96 100644 --- a/source/x/x11/slack-desc/font-bitstream-speedo +++ b/source/x/x11/slack-desc/font-bitstream-speedo @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-bitstream-speedo: font-bitstream-speedo +font-bitstream-speedo: font-bitstream-speedo (scalable fonts for X11) font-bitstream-speedo: font-bitstream-speedo: font-bitstream-speedo is part of X11. font-bitstream-speedo: diff --git a/source/x/x11/slack-desc/font-bitstream-type1 b/source/x/x11/slack-desc/font-bitstream-type1 index c2c8c89c..ce26f50a 100644 --- a/source/x/x11/slack-desc/font-bitstream-type1 +++ b/source/x/x11/slack-desc/font-bitstream-type1 @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-bitstream-type1: font-bitstream-type1 +font-bitstream-type1: font-bitstream-type1 (scalable fonts for X11) font-bitstream-type1: font-bitstream-type1: font-bitstream-type1 is part of X11. font-bitstream-type1: diff --git a/source/x/x11/slack-desc/font-cronyx-cyrillic b/source/x/x11/slack-desc/font-cronyx-cyrillic index 1d8aa0cd..5e5dd4f8 100644 --- a/source/x/x11/slack-desc/font-cronyx-cyrillic +++ b/source/x/x11/slack-desc/font-cronyx-cyrillic @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-cronyx-cyrillic: font-cronyx-cyrillic +font-cronyx-cyrillic: font-cronyx-cyrillic (bitmap fonts for X11) font-cronyx-cyrillic: font-cronyx-cyrillic: font-cronyx-cyrillic is part of X11. font-cronyx-cyrillic: diff --git a/source/x/x11/slack-desc/font-cursor-misc b/source/x/x11/slack-desc/font-cursor-misc index 846a7ee5..99b22e06 100644 --- a/source/x/x11/slack-desc/font-cursor-misc +++ b/source/x/x11/slack-desc/font-cursor-misc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-cursor-misc: font-cursor-misc +font-cursor-misc: font-cursor-misc (bitmap fonts for X11) font-cursor-misc: font-cursor-misc: font-cursor-misc is part of X11. font-cursor-misc: diff --git a/source/x/x11/slack-desc/font-daewoo-misc b/source/x/x11/slack-desc/font-daewoo-misc index ea2a14fe..82cedda0 100644 --- a/source/x/x11/slack-desc/font-daewoo-misc +++ b/source/x/x11/slack-desc/font-daewoo-misc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-daewoo-misc: font-daewoo-misc +font-daewoo-misc: font-daewoo-misc (bitmap fonts for X11) font-daewoo-misc: font-daewoo-misc: font-daewoo-misc is part of X11. font-daewoo-misc: diff --git a/source/x/x11/slack-desc/font-dec-misc b/source/x/x11/slack-desc/font-dec-misc index 9f1f8457..be0b1bea 100644 --- a/source/x/x11/slack-desc/font-dec-misc +++ b/source/x/x11/slack-desc/font-dec-misc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-dec-misc: font-dec-misc +font-dec-misc: font-dec-misc (bitmap fonts for X11) font-dec-misc: font-dec-misc: font-dec-misc is part of X11. font-dec-misc: diff --git a/source/x/x11/slack-desc/font-ibm-type1 b/source/x/x11/slack-desc/font-ibm-type1 index 773d7c57..44388e4e 100644 --- a/source/x/x11/slack-desc/font-ibm-type1 +++ b/source/x/x11/slack-desc/font-ibm-type1 @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-ibm-type1: font-ibm-type1 +font-ibm-type1: font-ibm-type1 (scalable fonts for X11) font-ibm-type1: font-ibm-type1: font-ibm-type1 is part of X11. font-ibm-type1: diff --git a/source/x/x11/slack-desc/font-isas-misc b/source/x/x11/slack-desc/font-isas-misc index 2be2ce73..437bb423 100644 --- a/source/x/x11/slack-desc/font-isas-misc +++ b/source/x/x11/slack-desc/font-isas-misc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-isas-misc: font-isas-misc +font-isas-misc: font-isas-misc (bitmap fonts for X11) font-isas-misc: font-isas-misc: font-isas-misc is part of X11. font-isas-misc: diff --git a/source/x/x11/slack-desc/font-jis-misc b/source/x/x11/slack-desc/font-jis-misc index bbdf362e..6541bbcd 100644 --- a/source/x/x11/slack-desc/font-jis-misc +++ b/source/x/x11/slack-desc/font-jis-misc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-jis-misc: font-jis-misc +font-jis-misc: font-jis-misc (bitmap fonts for X11) font-jis-misc: font-jis-misc: font-jis-misc is part of X11. font-jis-misc: diff --git a/source/x/x11/slack-desc/font-micro-misc b/source/x/x11/slack-desc/font-micro-misc index f26eae31..aa2a3895 100644 --- a/source/x/x11/slack-desc/font-micro-misc +++ b/source/x/x11/slack-desc/font-micro-misc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-micro-misc: font-micro-misc +font-micro-misc: font-micro-misc (bitmap fonts for X11) font-micro-misc: font-micro-misc: font-micro-misc is part of X11. font-micro-misc: diff --git a/source/x/x11/slack-desc/font-misc-cyrillic b/source/x/x11/slack-desc/font-misc-cyrillic index 4e443cba..8317cb63 100644 --- a/source/x/x11/slack-desc/font-misc-cyrillic +++ b/source/x/x11/slack-desc/font-misc-cyrillic @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-misc-cyrillic: font-misc-cyrillic +font-misc-cyrillic: font-misc-cyrillic (bitmap fonts for X11) font-misc-cyrillic: font-misc-cyrillic: font-misc-cyrillic is part of X11. font-misc-cyrillic: diff --git a/source/x/x11/slack-desc/font-misc-ethiopic b/source/x/x11/slack-desc/font-misc-ethiopic index edaa2278..16f735a2 100644 --- a/source/x/x11/slack-desc/font-misc-ethiopic +++ b/source/x/x11/slack-desc/font-misc-ethiopic @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-misc-ethiopic: font-misc-ethiopic +font-misc-ethiopic: font-misc-ethiopic (bitmap fonts for X11) font-misc-ethiopic: font-misc-ethiopic: font-misc-ethiopic is part of X11. font-misc-ethiopic: diff --git a/source/x/x11/slack-desc/font-misc-meltho b/source/x/x11/slack-desc/font-misc-meltho index a30da3d0..7af6d1ba 100644 --- a/source/x/x11/slack-desc/font-misc-meltho +++ b/source/x/x11/slack-desc/font-misc-meltho @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-misc-meltho: font-misc-meltho +font-misc-meltho: font-misc-meltho (bitmap fonts for X11) font-misc-meltho: font-misc-meltho: font-misc-meltho is part of X11. font-misc-meltho: diff --git a/source/x/x11/slack-desc/font-misc-misc b/source/x/x11/slack-desc/font-misc-misc index 99c7d8ae..bdf59a80 100644 --- a/source/x/x11/slack-desc/font-misc-misc +++ b/source/x/x11/slack-desc/font-misc-misc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-misc-misc: font-misc-misc +font-misc-misc: font-misc-misc (bitmap fonts for X11) font-misc-misc: font-misc-misc: font-misc-misc is part of X11. font-misc-misc: diff --git a/source/x/x11/slack-desc/font-mutt-misc b/source/x/x11/slack-desc/font-mutt-misc index f1f7a248..c273a72b 100644 --- a/source/x/x11/slack-desc/font-mutt-misc +++ b/source/x/x11/slack-desc/font-mutt-misc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-mutt-misc: font-mutt-misc +font-mutt-misc: font-mutt-misc (bitmap fonts for X11) font-mutt-misc: font-mutt-misc: font-mutt-misc is part of X11. font-mutt-misc: diff --git a/source/x/x11/slack-desc/font-schumacher-misc b/source/x/x11/slack-desc/font-schumacher-misc index 4d7c58b0..55546ea4 100644 --- a/source/x/x11/slack-desc/font-schumacher-misc +++ b/source/x/x11/slack-desc/font-schumacher-misc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-schumacher-misc: font-schumacher-misc +font-schumacher-misc: font-schumacher-misc (bitmap fonts for X11) font-schumacher-misc: font-schumacher-misc: font-schumacher-misc is part of X11. font-schumacher-misc: diff --git a/source/x/x11/slack-desc/font-screen-cyrillic b/source/x/x11/slack-desc/font-screen-cyrillic index 9d65d38d..b60e6da4 100644 --- a/source/x/x11/slack-desc/font-screen-cyrillic +++ b/source/x/x11/slack-desc/font-screen-cyrillic @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-screen-cyrillic: font-screen-cyrillic +font-screen-cyrillic: font-screen-cyrillic (bitmap fonts for X11) font-screen-cyrillic: font-screen-cyrillic: font-screen-cyrillic is part of X11. font-screen-cyrillic: diff --git a/source/x/x11/slack-desc/font-sony-misc b/source/x/x11/slack-desc/font-sony-misc index 8fc8b85e..8a539888 100644 --- a/source/x/x11/slack-desc/font-sony-misc +++ b/source/x/x11/slack-desc/font-sony-misc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-sony-misc: font-sony-misc +font-sony-misc: font-sony-misc (bitmap fonts for X11) font-sony-misc: font-sony-misc: font-sony-misc is part of X11. font-sony-misc: diff --git a/source/x/x11/slack-desc/font-sun-misc b/source/x/x11/slack-desc/font-sun-misc index d2fd1a33..d941087d 100644 --- a/source/x/x11/slack-desc/font-sun-misc +++ b/source/x/x11/slack-desc/font-sun-misc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-sun-misc: font-sun-misc +font-sun-misc: font-sun-misc (bitmap fonts for X11) font-sun-misc: font-sun-misc: font-sun-misc is part of X11. font-sun-misc: diff --git a/source/x/x11/slack-desc/font-util b/source/x/x11/slack-desc/font-util index 4c6a2b2a..05e2f054 100644 --- a/source/x/x11/slack-desc/font-util +++ b/source/x/x11/slack-desc/font-util @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-util: font-util +font-util: font-util (X.Org font package creation/installation utilities) font-util: font-util: font-util is part of X11. font-util: diff --git a/source/x/x11/slack-desc/font-winitzki-cyrillic b/source/x/x11/slack-desc/font-winitzki-cyrillic index c278dfff..573c09fd 100644 --- a/source/x/x11/slack-desc/font-winitzki-cyrillic +++ b/source/x/x11/slack-desc/font-winitzki-cyrillic @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-winitzki-cyrillic: font-winitzki-cyrillic +font-winitzki-cyrillic: font-winitzki-cyrillic (bitmap fonts for X11) font-winitzki-cyrillic: font-winitzki-cyrillic: font-winitzki-cyrillic is part of X11. font-winitzki-cyrillic: diff --git a/source/x/x11/slack-desc/font-xfree86-type1 b/source/x/x11/slack-desc/font-xfree86-type1 index 57ab76c6..1e70a7d4 100644 --- a/source/x/x11/slack-desc/font-xfree86-type1 +++ b/source/x/x11/slack-desc/font-xfree86-type1 @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -font-xfree86-type1: font-xfree86-type1 +font-xfree86-type1: font-xfree86-type1 (scalable fonts for X11) font-xfree86-type1: font-xfree86-type1: font-xfree86-type1 is part of X11. font-xfree86-type1: diff --git a/source/x/x11/slack-desc/fontcacheproto b/source/x/x11/slack-desc/fontcacheproto index 8388f4c3..eaec530c 100644 --- a/source/x/x11/slack-desc/fontcacheproto +++ b/source/x/x11/slack-desc/fontcacheproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -fontcacheproto: fontcacheproto +fontcacheproto: fontcacheproto (C prototypes for X11 Font Cache Extension) fontcacheproto: fontcacheproto: fontcacheproto is part of X11. fontcacheproto: diff --git a/source/x/x11/slack-desc/fontsproto b/source/x/x11/slack-desc/fontsproto index 7f5c20a2..a46da298 100644 --- a/source/x/x11/slack-desc/fontsproto +++ b/source/x/x11/slack-desc/fontsproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -fontsproto: fontsproto +fontsproto: fontsproto (C prototypes for X11 X Fonts Extension) fontsproto: fontsproto: fontsproto is part of X11. fontsproto: diff --git a/source/x/x11/slack-desc/fonttosfnt b/source/x/x11/slack-desc/fonttosfnt index 158fe2e3..1f809734 100644 --- a/source/x/x11/slack-desc/fonttosfnt +++ b/source/x/x11/slack-desc/fonttosfnt @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -fonttosfnt: fonttosfnt +fonttosfnt: fonttosfnt (utility to wrap a bitmap font in a sfnt wrapper) fonttosfnt: fonttosfnt: fonttosfnt is part of X11. fonttosfnt: diff --git a/source/x/x11/slack-desc/fslsfonts b/source/x/x11/slack-desc/fslsfonts index ca4c416f..53957d1a 100644 --- a/source/x/x11/slack-desc/fslsfonts +++ b/source/x/x11/slack-desc/fslsfonts @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -fslsfonts: fslsfonts +fslsfonts: fslsfonts (produces a list of fonts served by an X font server) fslsfonts: fslsfonts: fslsfonts is part of X11. fslsfonts: diff --git a/source/x/x11/slack-desc/fstobdf b/source/x/x11/slack-desc/fstobdf index ada9e2ac..4a28eb7b 100644 --- a/source/x/x11/slack-desc/fstobdf +++ b/source/x/x11/slack-desc/fstobdf @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -fstobdf: fstobdf +fstobdf: fstobdf (copy fonts from an X11 font server) fstobdf: -fstobdf: fstobdf is part of X11. +fstobdf: The fstobdf program reads a font from a font server and prints a BDF +fstobdf: file on the standard output that may be used to recreate the font. +fstobdf: This is useful in testing servers, debugging font metrics, and +fstobdf: reproducing lost BDF files. fstobdf: -fstobdf: For more information about the X.Org Foundation (the providers of the -fstobdf: X.Org implementation of the X Window System), see their website: fstobdf: -fstobdf: http://www.x.org fstobdf: fstobdf: fstobdf: diff --git a/source/x/x11/slack-desc/gccmakedep b/source/x/x11/slack-desc/gccmakedep index 1220112e..21db55cd 100644 --- a/source/x/x11/slack-desc/gccmakedep +++ b/source/x/x11/slack-desc/gccmakedep @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -gccmakedep: gccmakedep +gccmakedep: gccmakedep (create dependencies in makefiles) gccmakedep: gccmakedep: gccmakedep is part of X11. gccmakedep: diff --git a/source/x/x11/slack-desc/glproto b/source/x/x11/slack-desc/glproto index 2c2ddb6f..6d0b506a 100644 --- a/source/x/x11/slack-desc/glproto +++ b/source/x/x11/slack-desc/glproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -glproto: glproto +glproto: glproto (C prototypes for X11 OpenGL Extension) glproto: glproto: glproto is part of X11. glproto: diff --git a/source/x/x11/slack-desc/iceauth b/source/x/x11/slack-desc/iceauth index 17b0197f..54f525d6 100644 --- a/source/x/x11/slack-desc/iceauth +++ b/source/x/x11/slack-desc/iceauth @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -iceauth: iceauth +iceauth: iceauth (display/edit ICE authorization information) +iceauth: +iceauth: The iceauth program is used to edit and display the authorization +iceauth: information used in connecting with ICE. It operates very much like +iceauth: the xauth program for X11 connection authentication records. iceauth: -iceauth: iceauth is part of X11. iceauth: -iceauth: For more information about the X.Org Foundation (the providers of the -iceauth: X.Org implementation of the X Window System), see their website: iceauth: -iceauth: http://www.x.org iceauth: iceauth: iceauth: diff --git a/source/x/x11/slack-desc/ico b/source/x/x11/slack-desc/ico index 025dd68c..b4aeb4a5 100644 --- a/source/x/x11/slack-desc/ico +++ b/source/x/x11/slack-desc/ico @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -ico: ico +ico: ico (X11 test client) ico: -ico: ico is part of X11. +ico: ico is a simple animation program that may be used for testing various +ico: X11 operations and extensions. It displays a wire-frame rotating +ico: polyhedron, with hidden lines removed, or a solid-fill polyhedron +ico: with hidden faces removed. ico: -ico: For more information about the X.Org Foundation (the providers of the -ico: X.Org implementation of the X Window System), see their website: ico: -ico: http://www.x.org ico: ico: ico: diff --git a/source/x/x11/slack-desc/imake b/source/x/x11/slack-desc/imake index 8b1d5631..53599ebf 100644 --- a/source/x/x11/slack-desc/imake +++ b/source/x/x11/slack-desc/imake @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -imake: imake +imake: imake (C preprocessor interface to the make utility) +imake: +imake: The imake package contains the imake utility, plus the following +imake: support programs: ccmakedep, mergelib, revpath, mkdirhier, makeg, +imake: cleanlinks, mkhtmlindex, xmkmf imake: -imake: imake is part of X11. imake: -imake: For more information about the X.Org Foundation (the providers of the -imake: X.Org implementation of the X Window System), see their website: imake: -imake: http://www.x.org imake: imake: imake: diff --git a/source/x/x11/slack-desc/inputproto b/source/x/x11/slack-desc/inputproto index 6b9a3302..d5e58679 100644 --- a/source/x/x11/slack-desc/inputproto +++ b/source/x/x11/slack-desc/inputproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -inputproto: inputproto +inputproto: inputproto (C prototypes for X Input extension) inputproto: inputproto: inputproto is part of X11. inputproto: diff --git a/source/x/x11/slack-desc/intel-gpu-tools b/source/x/x11/slack-desc/intel-gpu-tools index b9cdf7c1..3fcee9a3 100644 --- a/source/x/x11/slack-desc/intel-gpu-tools +++ b/source/x/x11/slack-desc/intel-gpu-tools @@ -7,13 +7,13 @@ |-----handy-ruler------------------------------------------------------| intel-gpu-tools: intel-gpu-tools (Intel DRM Driver Testing Tools) -intel-gpu-tools: -intel-gpu-tools: This is a collection of tools for development and testing of the Intel -intel-gpu-tools: DRM driver. There are many macro-level test suites including xtest, -intel-gpu-tools: rendercheck, piglit, and oglconform. -intel-gpu-tools: -intel-gpu-tools: -intel-gpu-tools: -intel-gpu-tools: -intel-gpu-tools: -intel-gpu-tools: +intel-gpu-tools: +intel-gpu-tools: This is a collection of tools for development and testing of the +intel-gpu-tools: Intel DRM driver. There are many macro-level test suites including +intel-gpu-tools: xtest, rendercheck, piglit, and oglconform. +intel-gpu-tools: +intel-gpu-tools: +intel-gpu-tools: +intel-gpu-tools: +intel-gpu-tools: +intel-gpu-tools: diff --git a/source/x/x11/slack-desc/kbproto b/source/x/x11/slack-desc/kbproto index c9703ab3..822d8cfd 100644 --- a/source/x/x11/slack-desc/kbproto +++ b/source/x/x11/slack-desc/kbproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -kbproto: kbproto +kbproto: kbproto (C prototypes for X11 X Keyboard Extension) kbproto: kbproto: kbproto is part of X11. kbproto: diff --git a/source/x/x11/slack-desc/lbxproxy b/source/x/x11/slack-desc/lbxproxy deleted file mode 100644 index 578f938f..00000000 --- a/source/x/x11/slack-desc/lbxproxy +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -lbxproxy: lbxproxy -lbxproxy: -lbxproxy: lbxproxy is part of X11. -lbxproxy: -lbxproxy: For more information about the X.Org Foundation (the providers of the -lbxproxy: X.Org implementation of the X Window System), see their website: -lbxproxy: -lbxproxy: http://www.x.org -lbxproxy: -lbxproxy: -lbxproxy: diff --git a/source/x/x11/slack-desc/libAppleWM b/source/x/x11/slack-desc/libAppleWM deleted file mode 100644 index d5562510..00000000 --- a/source/x/x11/slack-desc/libAppleWM +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libAppleWM: libAppleWM -libAppleWM: -libAppleWM: libAppleWM is part of X11. -libAppleWM: -libAppleWM: For more information about the X.Org Foundation (the providers of the -libAppleWM: X.Org implementation of the X Window System), see their website: -libAppleWM: -libAppleWM: http://www.x.org -libAppleWM: -libAppleWM: -libAppleWM: diff --git a/source/x/x11/slack-desc/libFS b/source/x/x11/slack-desc/libFS index 6fe37f3e..6554f511 100644 --- a/source/x/x11/slack-desc/libFS +++ b/source/x/x11/slack-desc/libFS @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libFS: libFS +libFS: libFS (X Font Service client library) libFS: libFS: libFS is part of X11. libFS: diff --git a/source/x/x11/slack-desc/libICE b/source/x/x11/slack-desc/libICE index 78a4761c..47b74926 100644 --- a/source/x/x11/slack-desc/libICE +++ b/source/x/x11/slack-desc/libICE @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libICE: libICE +libICE: libICE (X Inter-Client Exchange Library) libICE: libICE: libICE is part of X11. libICE: diff --git a/source/x/x11/slack-desc/libSM b/source/x/x11/slack-desc/libSM index 06803b32..19292900 100644 --- a/source/x/x11/slack-desc/libSM +++ b/source/x/x11/slack-desc/libSM @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libSM: libSM +libSM: libSM (X Session Management Library) libSM: libSM: libSM is part of X11. libSM: diff --git a/source/x/x11/slack-desc/libWindowsWM b/source/x/x11/slack-desc/libWindowsWM deleted file mode 100644 index 162e44be..00000000 --- a/source/x/x11/slack-desc/libWindowsWM +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libWindowsWM: libWindowsWM -libWindowsWM: -libWindowsWM: libWindowsWM is part of X11. -libWindowsWM: -libWindowsWM: For more information about the X.Org Foundation (the providers of the -libWindowsWM: X.Org implementation of the X Window System), see their website: -libWindowsWM: -libWindowsWM: http://www.x.org -libWindowsWM: -libWindowsWM: -libWindowsWM: diff --git a/source/x/x11/slack-desc/libX11 b/source/x/x11/slack-desc/libX11 index e7f01273..2ec4f39a 100644 --- a/source/x/x11/slack-desc/libX11 +++ b/source/x/x11/slack-desc/libX11 @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libX11: libX11 +libX11: libX11 (Core X11 protocol client library) libX11: libX11: libX11 is part of X11. libX11: diff --git a/source/x/x11/slack-desc/libXScrnSaver b/source/x/x11/slack-desc/libXScrnSaver index dea8d864..ae6eea7c 100644 --- a/source/x/x11/slack-desc/libXScrnSaver +++ b/source/x/x11/slack-desc/libXScrnSaver @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXScrnSaver: libXScrnSaver +libXScrnSaver: libXScrnSaver (X11 Screen Saver extension client library) libXScrnSaver: libXScrnSaver: libXScrnSaver is part of X11. libXScrnSaver: diff --git a/source/x/x11/slack-desc/libXTrap b/source/x/x11/slack-desc/libXTrap deleted file mode 100644 index 51443def..00000000 --- a/source/x/x11/slack-desc/libXTrap +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libXTrap: libXTrap -libXTrap: -libXTrap: libXTrap is part of X11. -libXTrap: -libXTrap: For more information about the X.Org Foundation (the providers of the -libXTrap: X.Org implementation of the X Window System), see their website: -libXTrap: -libXTrap: http://www.x.org -libXTrap: -libXTrap: -libXTrap: diff --git a/source/x/x11/slack-desc/libXau b/source/x/x11/slack-desc/libXau index f2b09201..6e565d76 100644 --- a/source/x/x11/slack-desc/libXau +++ b/source/x/x11/slack-desc/libXau @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXau: libXau +libXau: libXau (Sample Authorization Protocol for X) libXau: -libXau: libXau is part of X11. +libXau: This is a very simple mechanism for providing individual access to +libXau: an X Window System display.It uses existing core protocol and library +libXau: hooks for specifying authorization data in the connection setup block +libXau: to restrict use of the display to only those clients that show that +libXau: they know a server-specific key called a "magic cookie." libXau: -libXau: For more information about the X.Org Foundation (the providers of the -libXau: X.Org implementation of the X Window System), see their website: -libXau: -libXau: http://www.x.org libXau: libXau: libXau: diff --git a/source/x/x11/slack-desc/libXaw b/source/x/x11/slack-desc/libXaw index 3174674b..727adeac 100644 --- a/source/x/x11/slack-desc/libXaw +++ b/source/x/x11/slack-desc/libXaw @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXaw: libXaw +libXaw: libXaw (client library for the X Athena Widget Set) +libXaw: +libXaw: Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library. +libXaw: +libXaw: libXaw: -libXaw: libXaw is part of X11. libXaw: -libXaw: For more information about the X.Org Foundation (the providers of the -libXaw: X.Org implementation of the X Window System), see their website: libXaw: -libXaw: http://www.x.org libXaw: libXaw: libXaw: diff --git a/source/x/x11/slack-desc/libXaw3d b/source/x/x11/slack-desc/libXaw3d new file mode 100644 index 00000000..48f7ddc3 --- /dev/null +++ b/source/x/x11/slack-desc/libXaw3d @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +libXaw3d: libXaw3d (3D enhanced version of the MIT Athena widget set) +libXaw3d: +libXaw3d: Xaw3d is an enhanced version of the MIT Athena Widget set for +libXaw3d: the X Window System. Xaw3d adds a three-dimensional look to +libXaw3d: applications with minimal or no source code changes. +libXaw3d: +libXaw3d: You should install Xaw3d if you are using applications which +libXaw3d: incorporate the MIT Athena widget set and you'd like to +libXaw3d: incorporate a 3D look into those applications. +libXaw3d: +libXaw3d: diff --git a/source/x/x11/slack-desc/libXcm b/source/x/x11/slack-desc/libXcm new file mode 100644 index 00000000..0516aaf7 --- /dev/null +++ b/source/x/x11/slack-desc/libXcm @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +libXcm: libXcm (reference implementation of the net-color specification) +libXcm: +libXcm: The libXcm library is a reference implementation of the net-color +libXcm: spec. It allows to attach color regions to X windows to communicate +libXcm: with color servers. +libXcm: +libXcm: +libXcm: +libXcm: +libXcm: +libXcm: diff --git a/source/x/x11/slack-desc/libXcomposite b/source/x/x11/slack-desc/libXcomposite index 2fcbe069..cf43dc4f 100644 --- a/source/x/x11/slack-desc/libXcomposite +++ b/source/x/x11/slack-desc/libXcomposite @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXcomposite: libXcomposite +libXcomposite: libXcomposite (client library for the X Composite extension) libXcomposite: libXcomposite: libXcomposite is part of X11. libXcomposite: diff --git a/source/x/x11/slack-desc/libXcursor b/source/x/x11/slack-desc/libXcursor index 1e911648..2906c6aa 100644 --- a/source/x/x11/slack-desc/libXcursor +++ b/source/x/x11/slack-desc/libXcursor @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXcursor: libXcursor +libXcursor: libXcursor (X Window System Cursor management library) libXcursor: libXcursor: libXcursor is part of X11. libXcursor: diff --git a/source/x/x11/slack-desc/libXdamage b/source/x/x11/slack-desc/libXdamage index 58f917df..05c618bf 100644 --- a/source/x/x11/slack-desc/libXdamage +++ b/source/x/x11/slack-desc/libXdamage @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXdamage: libXdamage +libXdamage: libXdamage (client library for the X Damage Extension) libXdamage: libXdamage: libXdamage is part of X11. libXdamage: diff --git a/source/x/x11/slack-desc/libXdmcp b/source/x/x11/slack-desc/libXdmcp index fc03f5bb..f3dc2396 100644 --- a/source/x/x11/slack-desc/libXdmcp +++ b/source/x/x11/slack-desc/libXdmcp @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXdmcp: libXdmcp +libXdmcp: libXdmcp (X Display Manager Control Protocol library) libXdmcp: libXdmcp: libXdmcp is part of X11. libXdmcp: diff --git a/source/x/x11/slack-desc/libXevie b/source/x/x11/slack-desc/libXevie index c9701592..2af8d875 100644 --- a/source/x/x11/slack-desc/libXevie +++ b/source/x/x11/slack-desc/libXevie @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXevie: libXevie +libXevie: libXevie (X Event Interception Extension (XEvIE) library) libXevie: libXevie: libXevie is part of X11. libXevie: diff --git a/source/x/x11/slack-desc/libXext b/source/x/x11/slack-desc/libXext index cb5b395b..a636363a 100644 --- a/source/x/x11/slack-desc/libXext +++ b/source/x/x11/slack-desc/libXext @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXext: libXext +libXext: libXext (library for common extensions to the X11 protocol) libXext: libXext: libXext is part of X11. libXext: diff --git a/source/x/x11/slack-desc/libXfixes b/source/x/x11/slack-desc/libXfixes index 9b6b9df7..3c44fa46 100644 --- a/source/x/x11/slack-desc/libXfixes +++ b/source/x/x11/slack-desc/libXfixes @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXfixes: libXfixes +libXfixes: libXfixes (client library for the Xfixes extension) libXfixes: libXfixes: libXfixes is part of X11. libXfixes: diff --git a/source/x/x11/slack-desc/libXfont b/source/x/x11/slack-desc/libXfont index 109b391c..d78d6a0e 100644 --- a/source/x/x11/slack-desc/libXfont +++ b/source/x/x11/slack-desc/libXfont @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXfont: libXfont +libXfont: libXfont (library for legacy X11 font system) libXfont: -libXfont: libXfont is part of X11. -libXfont: -libXfont: For more information about the X.Org Foundation (the providers of the -libXfont: X.Org implementation of the X Window System), see their website: -libXfont: -libXfont: http://www.x.org +libXfont: libXfont provides the core of the legacy X11 font system, handling the +libXfont: index files (fonts.dir, fonts.alias, fonts.scale), the various font +libXfont: file formats, and rasterizing them. It is used by the X servers, the +libXfont: X Font Server (xfs), and some font utilities (bdftopcf for instance), +libXfont: but should not be used by normal X11 clients. X11 clients access fonts +libXfont: via either the new API's in libXft, or the legacy API's in libX11. libXfont: libXfont: libXfont: diff --git a/source/x/x11/slack-desc/libXfontcache b/source/x/x11/slack-desc/libXfontcache index 735bdaa7..fdf8ca36 100644 --- a/source/x/x11/slack-desc/libXfontcache +++ b/source/x/x11/slack-desc/libXfontcache @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXfontcache: libXfontcache +libXfontcache: libXfontcache (X-TrueType font cache extension client library) libXfontcache: libXfontcache: libXfontcache is part of X11. libXfontcache: diff --git a/source/x/x11/slack-desc/libXft b/source/x/x11/slack-desc/libXft index a87a87d4..856e2828 100644 --- a/source/x/x11/slack-desc/libXft +++ b/source/x/x11/slack-desc/libXft @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXft: libXft +libXft: libXft (X FreeType library) libXft: libXft: libXft is part of X11. libXft: diff --git a/source/x/x11/slack-desc/libXi b/source/x/x11/slack-desc/libXi index f3f0c633..4585f82e 100644 --- a/source/x/x11/slack-desc/libXi +++ b/source/x/x11/slack-desc/libXi @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXi: libXi +libXi: libXi (library for the X Input Extension) libXi: libXi: libXi is part of X11. libXi: diff --git a/source/x/x11/slack-desc/libXinerama b/source/x/x11/slack-desc/libXinerama index e01ab025..3b16b81f 100644 --- a/source/x/x11/slack-desc/libXinerama +++ b/source/x/x11/slack-desc/libXinerama @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXinerama: libXinerama +libXinerama: libXinerama (library for Xinerama extension to X11 Protocol) libXinerama: libXinerama: libXinerama is part of X11. libXinerama: diff --git a/source/x/x11/slack-desc/libXmu b/source/x/x11/slack-desc/libXmu index dd6aff00..de36044c 100644 --- a/source/x/x11/slack-desc/libXmu +++ b/source/x/x11/slack-desc/libXmu @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXmu: libXmu +libXmu: libXmu (X miscellaneous utility library) libXmu: -libXmu: libXmu is part of X11. +libXmu: This library contains miscellaneous utilities and is not part of the +libXmu: Xlib standard. It contains routines which only use public interfaces +libXmu: so that it may be layered on top of any proprietary implementation +libXmu: of Xlib or Xt. libXmu: -libXmu: For more information about the X.Org Foundation (the providers of the -libXmu: X.Org implementation of the X Window System), see their website: libXmu: -libXmu: http://www.x.org libXmu: libXmu: libXmu: diff --git a/source/x/x11/slack-desc/libXp b/source/x/x11/slack-desc/libXp index 16eb84a1..b68a6664 100644 --- a/source/x/x11/slack-desc/libXp +++ b/source/x/x11/slack-desc/libXp @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXp: libXp +libXp: libXp (X Print Client Library) libXp: libXp: libXp is part of X11. libXp: diff --git a/source/x/x11/slack-desc/libXpm b/source/x/x11/slack-desc/libXpm index 82d04380..77c809a5 100644 --- a/source/x/x11/slack-desc/libXpm +++ b/source/x/x11/slack-desc/libXpm @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXpm: libXpm +libXpm: libXpm (X Pixmap (XPM) image file format library) libXpm: libXpm: libXpm is part of X11. libXpm: diff --git a/source/x/x11/slack-desc/libXprintAppUtil b/source/x/x11/slack-desc/libXprintAppUtil deleted file mode 100644 index 4ef7b3ed..00000000 --- a/source/x/x11/slack-desc/libXprintAppUtil +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libXprintAppUtil: libXprintAppUtil -libXprintAppUtil: -libXprintAppUtil: libXprintAppUtil is part of X11. -libXprintAppUtil: -libXprintAppUtil: For more information about the X.Org Foundation (the providers of the -libXprintAppUtil: X.Org implementation of the X Window System), see their website: -libXprintAppUtil: -libXprintAppUtil: http://www.x.org -libXprintAppUtil: -libXprintAppUtil: -libXprintAppUtil: diff --git a/source/x/x11/slack-desc/libXprintUtil b/source/x/x11/slack-desc/libXprintUtil deleted file mode 100644 index bcad3415..00000000 --- a/source/x/x11/slack-desc/libXprintUtil +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libXprintUtil: libXprintUtil -libXprintUtil: -libXprintUtil: libXprintUtil is part of X11. -libXprintUtil: -libXprintUtil: For more information about the X.Org Foundation (the providers of the -libXprintUtil: X.Org implementation of the X Window System), see their website: -libXprintUtil: -libXprintUtil: http://www.x.org -libXprintUtil: -libXprintUtil: -libXprintUtil: diff --git a/source/x/x11/slack-desc/libXrandr b/source/x/x11/slack-desc/libXrandr index c86d49ab..ad2e243b 100644 --- a/source/x/x11/slack-desc/libXrandr +++ b/source/x/x11/slack-desc/libXrandr @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXrandr: libXrandr +libXrandr: libXrandr (X Resize, Rotate and Reflection extension library) libXrandr: libXrandr: libXrandr is part of X11. libXrandr: diff --git a/source/x/x11/slack-desc/libXrender b/source/x/x11/slack-desc/libXrender index fe9f3b54..c5fe7269 100644 --- a/source/x/x11/slack-desc/libXrender +++ b/source/x/x11/slack-desc/libXrender @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXrender: libXrender +libXrender: libXrender (library for the Render Extension to the X11 protocol) libXrender: libXrender: libXrender is part of X11. libXrender: diff --git a/source/x/x11/slack-desc/libXres b/source/x/x11/slack-desc/libXres index 783719f2..4582cd5f 100644 --- a/source/x/x11/slack-desc/libXres +++ b/source/x/x11/slack-desc/libXres @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXres: libXres +libXres: libXres (X-Resource extension client library) libXres: libXres: libXres is part of X11. libXres: diff --git a/source/x/x11/slack-desc/libXt b/source/x/x11/slack-desc/libXt index 9a03bd98..3b8df4b0 100644 --- a/source/x/x11/slack-desc/libXt +++ b/source/x/x11/slack-desc/libXt @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXt: libXt +libXt: libXt (X Toolkit Intrinsics library) libXt: libXt: libXt is part of X11. libXt: diff --git a/source/x/x11/slack-desc/libXtst b/source/x/x11/slack-desc/libXtst index f71c8475..63b93c01 100644 --- a/source/x/x11/slack-desc/libXtst +++ b/source/x/x11/slack-desc/libXtst @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXtst: libXtst +libXtst: libXtst (client library for the XTEST & RECORD extensions) libXtst: libXtst: libXtst is part of X11. libXtst: diff --git a/source/x/x11/slack-desc/libXv b/source/x/x11/slack-desc/libXv index 3bfe0299..d72865bf 100644 --- a/source/x/x11/slack-desc/libXv +++ b/source/x/x11/slack-desc/libXv @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXv: libXv +libXv: libXv (library for the X Video (Xv) extension to the X Window System) libXv: libXv: libXv is part of X11. libXv: diff --git a/source/x/x11/slack-desc/libXvMC b/source/x/x11/slack-desc/libXvMC index 5557fdb8..aecd7f3a 100644 --- a/source/x/x11/slack-desc/libXvMC +++ b/source/x/x11/slack-desc/libXvMC @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXvMC: libXvMC +libXvMC: libXvMC (X.Org X11 libXvMC runtime library) libXvMC: libXvMC: libXvMC is part of X11. libXvMC: diff --git a/source/x/x11/slack-desc/libXxf86dga b/source/x/x11/slack-desc/libXxf86dga index 99492bc2..88023255 100644 --- a/source/x/x11/slack-desc/libXxf86dga +++ b/source/x/x11/slack-desc/libXxf86dga @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXxf86dga: libXxf86dga +libXxf86dga: libXxf86dga (client library for the XFree86-DGA extension) libXxf86dga: libXxf86dga: libXxf86dga is part of X11. libXxf86dga: diff --git a/source/x/x11/slack-desc/libXxf86misc b/source/x/x11/slack-desc/libXxf86misc index 8c69dedb..ccc2c29b 100644 --- a/source/x/x11/slack-desc/libXxf86misc +++ b/source/x/x11/slack-desc/libXxf86misc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXxf86misc: libXxf86misc +libXxf86misc: libXxf86misc (Extension library for the XFree86-Misc X extension) libXxf86misc: libXxf86misc: libXxf86misc is part of X11. libXxf86misc: diff --git a/source/x/x11/slack-desc/libXxf86vm b/source/x/x11/slack-desc/libXxf86vm index 0c4820a0..872c8926 100644 --- a/source/x/x11/slack-desc/libXxf86vm +++ b/source/x/x11/slack-desc/libXxf86vm @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libXxf86vm: libXxf86vm +libXxf86vm: libXxf86vm (library for the XFree86-VidMode X extension) libXxf86vm: libXxf86vm: libXxf86vm is part of X11. libXxf86vm: diff --git a/source/x/x11/slack-desc/libdmx b/source/x/x11/slack-desc/libdmx index f757df99..893fa670 100644 --- a/source/x/x11/slack-desc/libdmx +++ b/source/x/x11/slack-desc/libdmx @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libdmx: libdmx +libdmx: libdmx (DMX (Distributed Multihead X) extension library) libdmx: libdmx: libdmx is part of X11. libdmx: diff --git a/source/x/x11/slack-desc/libfontenc b/source/x/x11/slack-desc/libfontenc index 78b26b02..0172d1ae 100644 --- a/source/x/x11/slack-desc/libfontenc +++ b/source/x/x11/slack-desc/libfontenc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libfontenc: libfontenc +libfontenc: libfontenc (font encoding library) libfontenc: libfontenc: libfontenc is part of X11. libfontenc: diff --git a/source/x/x11/slack-desc/liblbxutil b/source/x/x11/slack-desc/liblbxutil deleted file mode 100644 index 0a42196e..00000000 --- a/source/x/x11/slack-desc/liblbxutil +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -liblbxutil: liblbxutil -liblbxutil: -liblbxutil: liblbxutil is part of X11. -liblbxutil: -liblbxutil: For more information about the X.Org Foundation (the providers of the -liblbxutil: X.Org implementation of the X Window System), see their website: -liblbxutil: -liblbxutil: http://www.x.org -liblbxutil: -liblbxutil: -liblbxutil: diff --git a/source/x/x11/slack-desc/liboldX b/source/x/x11/slack-desc/liboldX deleted file mode 100644 index d8e65ba4..00000000 --- a/source/x/x11/slack-desc/liboldX +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -liboldX: liboldX -liboldX: -liboldX: liboldX is part of X11. -liboldX: -liboldX: For more information about the X.Org Foundation (the providers of the -liboldX: X.Org implementation of the X Window System), see their website: -liboldX: -liboldX: http://www.x.org -liboldX: -liboldX: -liboldX: diff --git a/source/x/x11/slack-desc/libpciaccess b/source/x/x11/slack-desc/libpciaccess index 0c499f77..c3d6d648 100644 --- a/source/x/x11/slack-desc/libpciaccess +++ b/source/x/x11/slack-desc/libpciaccess @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libpciaccess: libpciaccess +libpciaccess: libpciaccess (Generic PCI access library) libpciaccess: libpciaccess: libpciaccess is part of X11. libpciaccess: diff --git a/source/x/x11/slack-desc/libpthread-stubs b/source/x/x11/slack-desc/libpthread-stubs index 8c0c0e5d..e64f33d3 100644 --- a/source/x/x11/slack-desc/libpthread-stubs +++ b/source/x/x11/slack-desc/libpthread-stubs @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libpthread-stubs: libpthread-stubs +libpthread-stubs: libpthread-stubs (thread support stubs) libpthread-stubs: -libpthread-stubs: libpthread-stubs is part of X11. +libpthread-stubs: This library provides weak aliases for pthread functions not provided +libpthread-stubs: in libc or otherwise available by default. Libraries like libxcb rely +libpthread-stubs: on pthread stubs to use pthreads optionally, becoming thread-safe +libpthread-stubs: when linked to libpthread, while avoiding any performance hit when +libpthread-stubs: running single-threaded. libpthread-stubs: -libpthread-stubs: For more information about the X.Org Foundation (the providers of the -libpthread-stubs: X.Org implementation of the X Window System), see their website: -libpthread-stubs: -libpthread-stubs: http://www.x.org libpthread-stubs: libpthread-stubs: libpthread-stubs: diff --git a/source/x/x11/slack-desc/libxkbfile b/source/x/x11/slack-desc/libxkbfile index ffaa00a4..fe2d59f2 100644 --- a/source/x/x11/slack-desc/libxkbfile +++ b/source/x/x11/slack-desc/libxkbfile @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libxkbfile: libxkbfile +libxkbfile: libxkbfile (X11 keyboard file manipulation library) libxkbfile: libxkbfile: libxkbfile is part of X11. libxkbfile: diff --git a/source/x/x11/slack-desc/libxkbui b/source/x/x11/slack-desc/libxkbui deleted file mode 100644 index 332ad414..00000000 --- a/source/x/x11/slack-desc/libxkbui +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libxkbui: libxkbui -libxkbui: -libxkbui: libxkbui is part of X11. -libxkbui: -libxkbui: For more information about the X.Org Foundation (the providers of the -libxkbui: X.Org implementation of the X Window System), see their website: -libxkbui: -libxkbui: http://www.x.org -libxkbui: -libxkbui: -libxkbui: diff --git a/source/x/x11/slack-desc/listres b/source/x/x11/slack-desc/listres index 16ae55b5..f14aa2ce 100644 --- a/source/x/x11/slack-desc/listres +++ b/source/x/x11/slack-desc/listres @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -listres: listres +listres: listres (X11 resource lister) +listres: +listres: The listres program generates a list of X resources for a widget in +listres: an X client written using a toolkit based on libXt. +listres: listres: -listres: listres is part of X11. listres: -listres: For more information about the X.Org Foundation (the providers of the -listres: X.Org implementation of the X Window System), see their website: listres: -listres: http://www.x.org listres: listres: listres: diff --git a/source/x/x11/slack-desc/lndir b/source/x/x11/slack-desc/lndir index 0a73ae95..c9a27e20 100644 --- a/source/x/x11/slack-desc/lndir +++ b/source/x/x11/slack-desc/lndir @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -lndir: lndir +lndir: lndir (create shadow directory of symbolic links to another directory) lndir: lndir: lndir is part of X11. lndir: diff --git a/source/x/x11/slack-desc/luit b/source/x/x11/slack-desc/luit index ab7f144f..cd9d9664 100644 --- a/source/x/x11/slack-desc/luit +++ b/source/x/x11/slack-desc/luit @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -luit: luit +luit: luit (character encoding convertor for X11 terminals) luit: -luit: luit is part of X11. +luit: Luit is a filter that can be run between an arbitrary application and +luit: a UTF-8 terminal emulator such as xterm. It will convert application +luit: output from the locale's encoding into UTF-8, and convert terminal +luit: input from UTF-8 into the locale's encoding. luit: -luit: For more information about the X.Org Foundation (the providers of the -luit: X.Org implementation of the X Window System), see their website: luit: -luit: http://www.x.org luit: luit: luit: diff --git a/source/x/x11/slack-desc/makedepend b/source/x/x11/slack-desc/makedepend index 444713af..ec831dd4 100644 --- a/source/x/x11/slack-desc/makedepend +++ b/source/x/x11/slack-desc/makedepend @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -makedepend: makedepend +makedepend: makedepend (create dependencies in makefiles) makedepend: makedepend: makedepend is part of X11. makedepend: diff --git a/source/x/x11/slack-desc/mkcomposecache b/source/x/x11/slack-desc/mkcomposecache index c219f99f..ed04a554 100644 --- a/source/x/x11/slack-desc/mkcomposecache +++ b/source/x/x11/slack-desc/mkcomposecache @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -mkcomposecache: mkcomposecache +mkcomposecache: mkcomposecache (creates global (system-wide) Compose cache files) mkcomposecache: mkcomposecache: mkcomposecache is part of X11. mkcomposecache: diff --git a/source/x/x11/slack-desc/mkfontdir b/source/x/x11/slack-desc/mkfontdir index 681db8f2..3f97b7e8 100644 --- a/source/x/x11/slack-desc/mkfontdir +++ b/source/x/x11/slack-desc/mkfontdir @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -mkfontdir: mkfontdir +mkfontdir: mkfontdir (X11 font utility) mkfontdir: -mkfontdir: mkfontdir is part of X11. +mkfontdir: mkfontdir creates the fonts.dir files needed by the legacy X server +mkfontdir: core font system. The current implementation is a simple wrapper +mkfontdir: script around the mkfontscale program, which must be built and +mkfontdir: installed first. mkfontdir: -mkfontdir: For more information about the X.Org Foundation (the providers of the -mkfontdir: X.Org implementation of the X Window System), see their website: mkfontdir: -mkfontdir: http://www.x.org mkfontdir: mkfontdir: mkfontdir: diff --git a/source/x/x11/slack-desc/mkfontscale b/source/x/x11/slack-desc/mkfontscale index 57c6f825..176336f7 100644 --- a/source/x/x11/slack-desc/mkfontscale +++ b/source/x/x11/slack-desc/mkfontscale @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -mkfontscale: mkfontscale +mkfontscale: mkfontscale (X11 font utility) +mkfontscale: +mkfontscale: mkfontscale creates the fonts.scale and fonts.dir index files used +mkfontscale: by the legacy X11 font system. +mkfontscale: mkfontscale: -mkfontscale: mkfontscale is part of X11. mkfontscale: -mkfontscale: For more information about the X.Org Foundation (the providers of the -mkfontscale: X.Org implementation of the X Window System), see their website: mkfontscale: -mkfontscale: http://www.x.org mkfontscale: mkfontscale: mkfontscale: diff --git a/source/x/x11/slack-desc/oclock b/source/x/x11/slack-desc/oclock index 7e4b2acd..1ec87ceb 100644 --- a/source/x/x11/slack-desc/oclock +++ b/source/x/x11/slack-desc/oclock @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -oclock: oclock +oclock: oclock (X11 on-screen clock) +oclock: +oclock: oclock is a simple analog clock using the SHAPE extension to make a +oclock: round (possibly transparent) window. +oclock: oclock: -oclock: oclock is part of X11. oclock: -oclock: For more information about the X.Org Foundation (the providers of the -oclock: X.Org implementation of the X Window System), see their website: oclock: -oclock: http://www.x.org oclock: oclock: oclock: diff --git a/source/x/x11/slack-desc/pixman b/source/x/x11/slack-desc/pixman index 350e53dd..73c93440 100644 --- a/source/x/x11/slack-desc/pixman +++ b/source/x/x11/slack-desc/pixman @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -pixman: pixman +pixman: pixman (pixel manipulation library) pixman: pixman: pixman contains low-level pixel manipulation routines and is used by pixman: both xorg and cairo. diff --git a/source/x/x11/slack-desc/printproto b/source/x/x11/slack-desc/printproto index 3aa4fe07..28fb1a2a 100644 --- a/source/x/x11/slack-desc/printproto +++ b/source/x/x11/slack-desc/printproto @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -printproto: printproto +printproto: printproto (C prototypes for X11 Xprint extension) +printproto: +printproto: Xprint extension to the X11 protocol - a portable, network-transparent +printproto: printing system +printproto: printproto: -printproto: printproto is part of X11. printproto: -printproto: For more information about the X.Org Foundation (the providers of the -printproto: X.Org implementation of the X Window System), see their website: printproto: -printproto: http://www.x.org printproto: printproto: printproto: diff --git a/source/x/x11/slack-desc/proxymngr b/source/x/x11/slack-desc/proxymngr deleted file mode 100644 index 63a90660..00000000 --- a/source/x/x11/slack-desc/proxymngr +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -proxymngr: proxymngr -proxymngr: -proxymngr: proxymngr is part of X11. -proxymngr: -proxymngr: For more information about the X.Org Foundation (the providers of the -proxymngr: X.Org implementation of the X Window System), see their website: -proxymngr: -proxymngr: http://www.x.org -proxymngr: -proxymngr: -proxymngr: diff --git a/source/x/x11/slack-desc/randrproto b/source/x/x11/slack-desc/randrproto index a56827c9..f97ca095 100644 --- a/source/x/x11/slack-desc/randrproto +++ b/source/x/x11/slack-desc/randrproto @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -randrproto: randrproto +randrproto: randrproto (C prototypes for RandR) +randrproto: +randrproto: RandR is the X11 Resize and Rotate Extension +randrproto: +randrproto: randrproto: -randrproto: randrproto is part of X11. randrproto: -randrproto: For more information about the X.Org Foundation (the providers of the -randrproto: X.Org implementation of the X Window System), see their website: randrproto: -randrproto: http://www.x.org randrproto: randrproto: randrproto: diff --git a/source/x/x11/slack-desc/recordproto b/source/x/x11/slack-desc/recordproto index caecfd7e..4fc28e90 100644 --- a/source/x/x11/slack-desc/recordproto +++ b/source/x/x11/slack-desc/recordproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -recordproto: recordproto +recordproto: recordproto (C prototypes for X Record Extension) recordproto: recordproto: recordproto is part of X11. recordproto: diff --git a/source/x/x11/slack-desc/rendercheck b/source/x/x11/slack-desc/rendercheck index 9503468e..e8a502ea 100644 --- a/source/x/x11/slack-desc/rendercheck +++ b/source/x/x11/slack-desc/rendercheck @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -rendercheck: rendercheck +rendercheck: rendercheck (test X11 Render support) +rendercheck: +rendercheck: rendercheck is a program to test a Render extension implementation +rendercheck: against separate calculations of expected output. +rendercheck: rendercheck: -rendercheck: rendercheck is part of X11. rendercheck: -rendercheck: For more information about the X.Org Foundation (the providers of the -rendercheck: X.Org implementation of the X Window System), see their website: rendercheck: -rendercheck: http://www.x.org rendercheck: rendercheck: rendercheck: diff --git a/source/x/x11/slack-desc/renderproto b/source/x/x11/slack-desc/renderproto index cdc21f01..ef667f97 100644 --- a/source/x/x11/slack-desc/renderproto +++ b/source/x/x11/slack-desc/renderproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -renderproto: renderproto +renderproto: renderproto (C prototypes for X Rendering Extension) renderproto: renderproto: renderproto is part of X11. renderproto: diff --git a/source/x/x11/slack-desc/resourceproto b/source/x/x11/slack-desc/resourceproto index 8303f74d..6881a8e5 100644 --- a/source/x/x11/slack-desc/resourceproto +++ b/source/x/x11/slack-desc/resourceproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -resourceproto: resourceproto +resourceproto: resourceproto (C prototypes for X Resource Extension) resourceproto: resourceproto: resourceproto is part of X11. resourceproto: diff --git a/source/x/x11/slack-desc/rgb b/source/x/x11/slack-desc/rgb index 34263a01..f339502e 100644 --- a/source/x/x11/slack-desc/rgb +++ b/source/x/x11/slack-desc/rgb @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -rgb: rgb +rgb: rgb (X color name database) rgb: rgb: rgb is part of X11. rgb: diff --git a/source/x/x11/slack-desc/rstart b/source/x/x11/slack-desc/rstart deleted file mode 100644 index e009e289..00000000 --- a/source/x/x11/slack-desc/rstart +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -rstart: rstart -rstart: -rstart: rstart is part of X11. -rstart: -rstart: For more information about the X.Org Foundation (the providers of the -rstart: X.Org implementation of the X Window System), see their website: -rstart: -rstart: http://www.x.org -rstart: -rstart: -rstart: diff --git a/source/x/x11/slack-desc/scripts b/source/x/x11/slack-desc/scripts deleted file mode 100644 index 549159b2..00000000 --- a/source/x/x11/slack-desc/scripts +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -scripts: scripts -scripts: -scripts: scripts is part of X11. -scripts: -scripts: For more information about the X.Org Foundation (the providers of the -scripts: X.Org implementation of the X Window System), see their website: -scripts: -scripts: http://www.x.org -scripts: -scripts: -scripts: diff --git a/source/x/x11/slack-desc/scrnsaverproto b/source/x/x11/slack-desc/scrnsaverproto index 70142f89..3218b7e7 100644 --- a/source/x/x11/slack-desc/scrnsaverproto +++ b/source/x/x11/slack-desc/scrnsaverproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -scrnsaverproto: scrnsaverproto +scrnsaverproto: scrnsaverproto (C prototypes for X11 MIT Screen Saver Extension) scrnsaverproto: scrnsaverproto: scrnsaverproto is part of X11. scrnsaverproto: diff --git a/source/x/x11/slack-desc/sessreg b/source/x/x11/slack-desc/sessreg index 8a85e326..0da458bb 100644 --- a/source/x/x11/slack-desc/sessreg +++ b/source/x/x11/slack-desc/sessreg @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -sessreg: sessreg +sessreg: sessreg (simple program for managing utmp/wtmp entries for X sessions) +sessreg: +sessreg: sessreg was originally written for use with xdm, but it may also be +sessreg: used with other display managers such as gdm or kdm. +sessreg: sessreg: -sessreg: sessreg is part of X11. sessreg: -sessreg: For more information about the X.Org Foundation (the providers of the -sessreg: X.Org implementation of the X Window System), see their website: sessreg: -sessreg: http://www.x.org sessreg: sessreg: sessreg: diff --git a/source/x/x11/slack-desc/setxkbmap b/source/x/x11/slack-desc/setxkbmap index 99beaa92..a3b1841a 100644 --- a/source/x/x11/slack-desc/setxkbmap +++ b/source/x/x11/slack-desc/setxkbmap @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -setxkbmap: setxkbmap +setxkbmap: setxkbmap (change X11 keyboard layout) setxkbmap: setxkbmap: setxkbmap is part of X11. setxkbmap: diff --git a/source/x/x11/slack-desc/showfont b/source/x/x11/slack-desc/showfont index b53ce29a..24665efe 100644 --- a/source/x/x11/slack-desc/showfont +++ b/source/x/x11/slack-desc/showfont @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -showfont: showfont +showfont: showfont (displays data about a font from an X font server) +showfont: +showfont: The information shown includes font information, font properties, +showfont: character metrics, and character bitmaps. +showfont: showfont: -showfont: showfont is part of X11. showfont: -showfont: For more information about the X.Org Foundation (the providers of the -showfont: X.Org implementation of the X Window System), see their website: showfont: -showfont: http://www.x.org showfont: showfont: showfont: diff --git a/source/x/x11/slack-desc/smproxy b/source/x/x11/slack-desc/smproxy index a8bc5976..c40480a9 100644 --- a/source/x/x11/slack-desc/smproxy +++ b/source/x/x11/slack-desc/smproxy @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -smproxy: smproxy +smproxy: smproxy (X11 session management proxy) +smproxy: +smproxy: smproxy allows X applications that do not support X11R6 session +smproxy: management to participate in an X11R6 session. +smproxy: smproxy: -smproxy: smproxy is part of X11. smproxy: -smproxy: For more information about the X.Org Foundation (the providers of the -smproxy: X.Org implementation of the X Window System), see their website: smproxy: -smproxy: http://www.x.org smproxy: smproxy: smproxy: diff --git a/source/x/x11/slack-desc/transset b/source/x/x11/slack-desc/transset new file mode 100644 index 00000000..1e1128c5 --- /dev/null +++ b/source/x/x11/slack-desc/transset @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +transset: transset (utility for setting opacity property) +transset: +transset: transset is a utility for setting opacity property. +transset: +transset: Some of the features: +transset: * select window by clicking (as transset) +transset: * select actual focused X11 window +transset: * select window by pointing +transset: * select by window name or id +transset: * force toggle +transset: * increase or decrease opacity diff --git a/source/x/x11/slack-desc/trapproto b/source/x/x11/slack-desc/trapproto deleted file mode 100644 index 5b0a2174..00000000 --- a/source/x/x11/slack-desc/trapproto +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -trapproto: trapproto -trapproto: -trapproto: trapproto is part of X11. -trapproto: -trapproto: For more information about the X.Org Foundation (the providers of the -trapproto: X.Org implementation of the X Window System), see their website: -trapproto: -trapproto: http://www.x.org -trapproto: -trapproto: -trapproto: diff --git a/source/x/x11/slack-desc/twm b/source/x/x11/slack-desc/twm index 78c09f21..590eec46 100644 --- a/source/x/x11/slack-desc/twm +++ b/source/x/x11/slack-desc/twm @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -twm: twm +twm: twm (Tab Window Manager for the X Window System) twm: twm: twm is part of X11. twm: diff --git a/source/x/x11/slack-desc/util-macros b/source/x/x11/slack-desc/util-macros index 39426633..f339dfa8 100644 --- a/source/x/x11/slack-desc/util-macros +++ b/source/x/x11/slack-desc/util-macros @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -util-macros: util-macros +util-macros: util-macros (autoconf support for X11) +util-macros: +util-macros: This is a set of autoconf macros used by the configure.ac scripts in +util-macros: other Xorg modular packages, and is needed to generate new versions +util-macros: of their configure scripts with autoconf. util-macros: -util-macros: util-macros is part of X11. util-macros: -util-macros: For more information about the X.Org Foundation (the providers of the -util-macros: X.Org implementation of the X Window System), see their website: util-macros: -util-macros: http://www.x.org util-macros: util-macros: util-macros: diff --git a/source/x/x11/slack-desc/videoproto b/source/x/x11/slack-desc/videoproto index e90690c2..f65573bc 100644 --- a/source/x/x11/slack-desc/videoproto +++ b/source/x/x11/slack-desc/videoproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -videoproto: videoproto +videoproto: videoproto (C prototypes for X Video Extension) videoproto: videoproto: videoproto is part of X11. videoproto: diff --git a/source/x/x11/slack-desc/viewres b/source/x/x11/slack-desc/viewres index e710f02b..05682ea7 100644 --- a/source/x/x11/slack-desc/viewres +++ b/source/x/x11/slack-desc/viewres @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -viewres: viewres +viewres: viewres (view widget class hierarchy of the Athena Widget Set) viewres: viewres: viewres is part of X11. viewres: diff --git a/source/x/x11/slack-desc/windowswmproto b/source/x/x11/slack-desc/windowswmproto deleted file mode 100644 index 38e97728..00000000 --- a/source/x/x11/slack-desc/windowswmproto +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -windowswmproto: windowswmproto -windowswmproto: -windowswmproto: windowswmproto is part of X11. -windowswmproto: -windowswmproto: For more information about the X.Org Foundation (the providers of the -windowswmproto: X.Org implementation of the X Window System), see their website: -windowswmproto: -windowswmproto: http://www.x.org -windowswmproto: -windowswmproto: -windowswmproto: diff --git a/source/x/x11/slack-desc/x11-app b/source/x/x11/slack-desc/x11-app deleted file mode 100644 index 2667d321..00000000 --- a/source/x/x11/slack-desc/x11-app +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -x11-app: x11-app (the traditional collection of basic X apps) -x11-app: -x11-app: These are the basic X programs that come with the X Window System. -x11-app: -x11-app: -x11-app: -x11-app: -x11-app: -x11-app: -x11-app: -x11-app: diff --git a/source/x/x11/slack-desc/x11-data b/source/x/x11/slack-desc/x11-data deleted file mode 100644 index 0b8ef63b..00000000 --- a/source/x/x11/slack-desc/x11-data +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -x11-data: x11-data (data files used by X) -x11-data: -x11-data: -x11-data: -x11-data: -x11-data: -x11-data: -x11-data: -x11-data: -x11-data: -x11-data: diff --git a/source/x/x11/slack-desc/x11-doc b/source/x/x11/slack-desc/x11-doc deleted file mode 100644 index 8ac7b8b9..00000000 --- a/source/x/x11/slack-desc/x11-doc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -x11-doc: x11-doc (documentation for X) -x11-doc: -x11-doc: -x11-doc: -x11-doc: -x11-doc: -x11-doc: -x11-doc: -x11-doc: -x11-doc: -x11-doc: diff --git a/source/x/x11/slack-desc/x11-driver b/source/x/x11/slack-desc/x11-driver deleted file mode 100644 index 3196549e..00000000 --- a/source/x/x11/slack-desc/x11-driver +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -x11-driver: x11-driver (input and output drivers for X) -x11-driver: -x11-driver: -x11-driver: -x11-driver: -x11-driver: -x11-driver: -x11-driver: -x11-driver: -x11-driver: -x11-driver: diff --git a/source/x/x11/slack-desc/x11-font b/source/x/x11/slack-desc/x11-font deleted file mode 100644 index b0bf50f6..00000000 --- a/source/x/x11/slack-desc/x11-font +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -x11-font: x11-font (fonts for X) -x11-font: -x11-font: Fonts for X. -x11-font: -x11-font: -x11-font: -x11-font: -x11-font: -x11-font: -x11-font: -x11-font: diff --git a/source/x/x11/slack-desc/x11-lib b/source/x/x11/slack-desc/x11-lib deleted file mode 100644 index 3090338c..00000000 --- a/source/x/x11/slack-desc/x11-lib +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -x11-lib: x11-lib (X11 libraries and header files) -x11-lib: -x11-lib: -x11-lib: -x11-lib: -x11-lib: -x11-lib: -x11-lib: -x11-lib: -x11-lib: -x11-lib: diff --git a/source/x/x11/slack-desc/x11-proto b/source/x/x11/slack-desc/x11-proto deleted file mode 100644 index 1c1f9766..00000000 --- a/source/x/x11/slack-desc/x11-proto +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -x11-proto: x11-proto (files used for developing X) -x11-proto: -x11-proto: -x11-proto: -x11-proto: -x11-proto: -x11-proto: -x11-proto: -x11-proto: -x11-proto: -x11-proto: diff --git a/source/x/x11/slack-desc/x11-util b/source/x/x11/slack-desc/x11-util deleted file mode 100644 index a5d30280..00000000 --- a/source/x/x11/slack-desc/x11-util +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -x11-util: x11-util (a set of handy utilities for X11) -x11-util: -x11-util: -x11-util: -x11-util: -x11-util: -x11-util: -x11-util: -x11-util: -x11-util: -x11-util: diff --git a/source/x/x11/slack-desc/x11perf b/source/x/x11/slack-desc/x11perf index 8d6996ac..fc51a61e 100644 --- a/source/x/x11/slack-desc/x11perf +++ b/source/x/x11/slack-desc/x11perf @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -x11perf: x11perf +x11perf: x11perf (X11 server performance test program) x11perf: x11perf: x11perf is part of X11. x11perf: diff --git a/source/x/x11/slack-desc/xauth b/source/x/x11/slack-desc/xauth index 71829a5d..837b45bb 100644 --- a/source/x/x11/slack-desc/xauth +++ b/source/x/x11/slack-desc/xauth @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xauth: xauth +xauth: xauth (X11 authorization utility) +xauth: +xauth: The xauth program is used to edit and display the authorization +xauth: information used in connecting to the X server. +xauth: xauth: -xauth: xauth is part of X11. xauth: -xauth: For more information about the X.Org Foundation (the providers of the -xauth: X.Org implementation of the X Window System), see their website: xauth: -xauth: http://www.x.org xauth: xauth: xauth: diff --git a/source/x/x11/slack-desc/xbacklight b/source/x/x11/slack-desc/xbacklight index 914a6a79..45d0a7ab 100644 --- a/source/x/x11/slack-desc/xbacklight +++ b/source/x/x11/slack-desc/xbacklight @@ -5,15 +5,15 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| -xbacklight: xbacklight + |-----handy-ruler------------------------------------------------------| +xbacklight: xbacklight (adjust the backlight brightness where supported) +xbacklight: +xbacklight: It uses the RandR extension to find all outputs on the X server +xbacklight: supporting backlight brightness control and changes them all in the +xbacklight: same way. xbacklight: -xbacklight: xbacklight is part of X11. xbacklight: -xbacklight: For more information about the X.Org Foundation (the providers of the -xbacklight: X.Org implementation of the X Window System), see their website: xbacklight: -xbacklight: http://www.x.org xbacklight: xbacklight: xbacklight: diff --git a/source/x/x11/slack-desc/xbiff b/source/x/x11/slack-desc/xbiff index ef65aff3..289c9738 100644 --- a/source/x/x11/slack-desc/xbiff +++ b/source/x/x11/slack-desc/xbiff @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xbiff: xbiff +xbiff: xbiff (X11 mail notifier) +xbiff: +xbiff: xbiff provides graphical notification of new e-mail. It only handles +xbiff: mail stored in a filesystem accessible file, not via IMAP, POP or +xbiff: other remote access protocols. xbiff: -xbiff: xbiff is part of X11. xbiff: -xbiff: For more information about the X.Org Foundation (the providers of the -xbiff: X.Org implementation of the X Window System), see their website: xbiff: -xbiff: http://www.x.org xbiff: xbiff: xbiff: diff --git a/source/x/x11/slack-desc/xbitmaps b/source/x/x11/slack-desc/xbitmaps index 91b0a4d2..cdcd8149 100644 --- a/source/x/x11/slack-desc/xbitmaps +++ b/source/x/x11/slack-desc/xbitmaps @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xbitmaps: xbitmaps +xbitmaps: xbitmaps (miscellaneous X bitmap files) xbitmaps: xbitmaps: xbitmaps is part of X11. xbitmaps: diff --git a/source/x/x11/slack-desc/xcalc b/source/x/x11/slack-desc/xcalc index d0f6d2e1..4e1101e6 100644 --- a/source/x/x11/slack-desc/xcalc +++ b/source/x/x11/slack-desc/xcalc @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xcalc: xcalc +xcalc: xcalc (X11 calculator) +xcalc: +xcalc: xcalc is a scientific calculator X11 client that can emulate a TI-30 +xcalc: or an HP-10C. +xcalc: xcalc: -xcalc: xcalc is part of X11. xcalc: -xcalc: For more information about the X.Org Foundation (the providers of the -xcalc: X.Org implementation of the X Window System), see their website: xcalc: -xcalc: http://www.x.org xcalc: xcalc: xcalc: diff --git a/source/x/x11/slack-desc/xcb-proto b/source/x/x11/slack-desc/xcb-proto index 72736593..c66b7140 100644 --- a/source/x/x11/slack-desc/xcb-proto +++ b/source/x/x11/slack-desc/xcb-proto @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xcb-proto: xcb-proto +xcb-proto: xcb-proto (X protocol C-language Binding protocol descriptions) xcb-proto: -xcb-proto: xcb-proto is part of X11. +xcb-proto: xcb-proto provides the XML-XCB protocol descriptions that libxcb +xcb-proto: uses to generate the majority of its code and API. We provide them +xcb-proto: separately from libxcb to allow reuse by other projects, such as +xcb-proto: additional language bindings, protocol dissectors, or documentation +xcb-proto: generators. xcb-proto: -xcb-proto: For more information about the X.Org Foundation (the providers of the -xcb-proto: X.Org implementation of the X Window System), see their website: -xcb-proto: -xcb-proto: http://www.x.org xcb-proto: xcb-proto: xcb-proto: diff --git a/source/x/x11/slack-desc/xcb-util b/source/x/x11/slack-desc/xcb-util index 45072298..040881be 100644 --- a/source/x/x11/slack-desc/xcb-util +++ b/source/x/x11/slack-desc/xcb-util @@ -5,8 +5,8 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler-------------------------------------------------------| -xcb-util: xcb-util + |-----handy-ruler------------------------------------------------------| +xcb-util: xcb-util (utility libraries for X protocol C-language Binding) xcb-util: xcb-util: xcb-util is part of X11. xcb-util: diff --git a/source/x/x11/slack-desc/xcb-util-image b/source/x/x11/slack-desc/xcb-util-image new file mode 100644 index 00000000..ffa50aa9 --- /dev/null +++ b/source/x/x11/slack-desc/xcb-util-image @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xcb-util-image: xcb-util-image (port of Xlib's XImage and XShmImage functions) +xcb-util-image: +xcb-util-image: xcb-util-image provides a port of Xlib's XImage and XShmImage +xcb-util-image: functions. +xcb-util-image: +xcb-util-image: +xcb-util-image: +xcb-util-image: +xcb-util-image: +xcb-util-image: +xcb-util-image: diff --git a/source/x/x11/slack-desc/xcb-util-keysyms b/source/x/x11/slack-desc/xcb-util-keysyms new file mode 100644 index 00000000..a629d39e --- /dev/null +++ b/source/x/x11/slack-desc/xcb-util-keysyms @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xcb-util-keysyms: xcb-util-keysyms (keysyms library for XCB) +xcb-util-keysyms: +xcb-util-keysyms: xcb-util-keysyms provides the keysyms library, which handles +xcb-util-keysyms: standard X key constants and conversion to/from keycodes. +xcb-util-keysyms: +xcb-util-keysyms: +xcb-util-keysyms: +xcb-util-keysyms: +xcb-util-keysyms: +xcb-util-keysyms: +xcb-util-keysyms: diff --git a/source/x/x11/slack-desc/xcb-util-renderutil b/source/x/x11/slack-desc/xcb-util-renderutil new file mode 100644 index 00000000..1cec3346 --- /dev/null +++ b/source/x/x11/slack-desc/xcb-util-renderutil @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xcb-util-renderutil: xcb-util-renderutil (XCB renderutil library) +xcb-util-renderutil: +xcb-util-renderutil: xcb-util-renderutil provides the XCB renderutil library, which +xcb-util-renderutil: includes some convenience functions for the Render extension. +xcb-util-renderutil: +xcb-util-renderutil: +xcb-util-renderutil: +xcb-util-renderutil: +xcb-util-renderutil: +xcb-util-renderutil: +xcb-util-renderutil: diff --git a/source/x/x11/slack-desc/xcb-util-wm b/source/x/x11/slack-desc/xcb-util-wm new file mode 100644 index 00000000..8d5103a5 --- /dev/null +++ b/source/x/x11/slack-desc/xcb-util-wm @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xcb-util-wm: xcb-util-wm (XCB libraries for EWMH and ICCCM) +xcb-util-wm: +xcb-util-wm: xcb-util-wm provides the XCB ewmh and iccm libraries, which include +xcb-util-wm: client and window manager helpers for EWMH and ICCCM. +xcb-util-wm: +xcb-util-wm: +xcb-util-wm: +xcb-util-wm: +xcb-util-wm: +xcb-util-wm: +xcb-util-wm: diff --git a/source/x/x11/slack-desc/xclipboard b/source/x/x11/slack-desc/xclipboard index 9f309205..fc0bcb45 100644 --- a/source/x/x11/slack-desc/xclipboard +++ b/source/x/x11/slack-desc/xclipboard @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xclipboard: xclipboard +xclipboard: xclipboard (X11 clipboard utility) xclipboard: -xclipboard: xclipboard is part of X11. +xclipboard: xclipboard is used to collect and display text selections that are +xclipboard: sent to the CLIPBOARD by other clients. It is typically used to +xclipboard: save CLIPBOARD selections for later use. It stores each CLIPBOARD +xclipboard: selection as a separate string, each of which can be selected. xclipboard: -xclipboard: For more information about the X.Org Foundation (the providers of the -xclipboard: X.Org implementation of the X Window System), see their website: xclipboard: -xclipboard: http://www.x.org xclipboard: xclipboard: xclipboard: diff --git a/source/x/x11/slack-desc/xclock b/source/x/x11/slack-desc/xclock index 04781f5e..39cb9ff1 100644 --- a/source/x/x11/slack-desc/xclock +++ b/source/x/x11/slack-desc/xclock @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xclock: xclock +xclock: xclock (X11 on-screen clock) +xclock: +xclock: xclock is the classic X Window System clock utility. It displays the +xclock: time in analog or digital form, continuously updated at a frequency +xclock: which may be specified by the user. xclock: -xclock: xclock is part of X11. xclock: -xclock: For more information about the X.Org Foundation (the providers of the -xclock: X.Org implementation of the X Window System), see their website: xclock: -xclock: http://www.x.org xclock: xclock: xclock: diff --git a/source/x/x11/slack-desc/xcmiscproto b/source/x/x11/slack-desc/xcmiscproto index a8c9dcc4..d7291251 100644 --- a/source/x/x11/slack-desc/xcmiscproto +++ b/source/x/x11/slack-desc/xcmiscproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xcmiscproto: xcmiscproto +xcmiscproto: xcmiscproto (C prototypes for X11 XC-MISC Extension) xcmiscproto: xcmiscproto: xcmiscproto is part of X11. xcmiscproto: diff --git a/source/x/x11/slack-desc/xcmsdb b/source/x/x11/slack-desc/xcmsdb index 9075a18f..058adf03 100644 --- a/source/x/x11/slack-desc/xcmsdb +++ b/source/x/x11/slack-desc/xcmsdb @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xcmsdb: xcmsdb +xcmsdb: xcmsdb (X11 color utility) xcmsdb: -xcmsdb: xcmsdb is part of X11. +xcmsdb: xcmsdb is used to load, query, or remove Device Color Characterization +xcmsdb: data stored in properties on the root window of a screen as specified +xcmsdb: in section 7, Device Color Characterization, of the X11 Inter-Client +xcmsdb: Communication Conventions Manual (ICCCM). xcmsdb: -xcmsdb: For more information about the X.Org Foundation (the providers of the -xcmsdb: X.Org implementation of the X Window System), see their website: xcmsdb: -xcmsdb: http://www.x.org xcmsdb: xcmsdb: xcmsdb: diff --git a/source/x/x11/slack-desc/xcompmgr b/source/x/x11/slack-desc/xcompmgr index 1381b7be..f5527a84 100644 --- a/source/x/x11/slack-desc/xcompmgr +++ b/source/x/x11/slack-desc/xcompmgr @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xcompmgr: xcompmgr +xcompmgr: xcompmgr (X11 compositing manager) +xcompmgr: +xcompmgr: xcompmgr is a sample compositing manager for X servers supporting the +xcompmgr: XFIXES, DAMAGE, RENDER, and COMPOSITE extensions. It enables basic +xcompmgr: eye-candy effects. xcompmgr: -xcompmgr: xcompmgr is part of X11. xcompmgr: -xcompmgr: For more information about the X.Org Foundation (the providers of the -xcompmgr: X.Org implementation of the X Window System), see their website: xcompmgr: -xcompmgr: http://www.x.org xcompmgr: xcompmgr: xcompmgr: diff --git a/source/x/x11/slack-desc/xconsole b/source/x/x11/slack-desc/xconsole index f3a8f2bd..2a543f2e 100644 --- a/source/x/x11/slack-desc/xconsole +++ b/source/x/x11/slack-desc/xconsole @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xconsole: xconsole +xconsole: xconsole (X11 console) +xconsole: +xconsole: xconsole displays in a X11 window the messages which are usually sent +xconsole: to /dev/console +xconsole: xconsole: -xconsole: xconsole is part of X11. xconsole: -xconsole: For more information about the X.Org Foundation (the providers of the -xconsole: X.Org implementation of the X Window System), see their website: xconsole: -xconsole: http://www.x.org xconsole: xconsole: xconsole: diff --git a/source/x/x11/slack-desc/xcursor-themes b/source/x/x11/slack-desc/xcursor-themes index d3ffeeb5..dbe8023e 100644 --- a/source/x/x11/slack-desc/xcursor-themes +++ b/source/x/x11/slack-desc/xcursor-themes @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xcursor-themes: xcursor-themes +xcursor-themes: xcursor-themes (X11 cursor themes) +xcursor-themes: +xcursor-themes: This is a default set of cursor themes for use with libXcursor, +xcursor-themes: originally created for the XFree86 Project, and now shipped as part +xcursor-themes: of the X.Org software distribution. xcursor-themes: -xcursor-themes: xcursor-themes is part of X11. xcursor-themes: -xcursor-themes: For more information about the X.Org Foundation (the providers of the -xcursor-themes: X.Org implementation of the X Window System), see their website: xcursor-themes: -xcursor-themes: http://www.x.org xcursor-themes: xcursor-themes: xcursor-themes: diff --git a/source/x/x11/slack-desc/xcursorgen b/source/x/x11/slack-desc/xcursorgen index bce69340..b084b9d3 100644 --- a/source/x/x11/slack-desc/xcursorgen +++ b/source/x/x11/slack-desc/xcursorgen @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xcursorgen: xcursorgen +xcursorgen: xcursorgen (prepares X11 cursor sets for use with libXcursor) xcursorgen: xcursorgen: xcursorgen is part of X11. xcursorgen: diff --git a/source/x/x11/slack-desc/xdbedizzy b/source/x/x11/slack-desc/xdbedizzy index 03ecda05..122d3cfc 100644 --- a/source/x/x11/slack-desc/xdbedizzy +++ b/source/x/x11/slack-desc/xdbedizzy @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xdbedizzy: xdbedizzy +xdbedizzy: xdbedizzy (X11 test utility) +xdbedizzy: +xdbedizzy: xdbedizzy is a demo of the X11 Double Buffer Extension (DBE) creating +xdbedizzy: a double buffered spinning scene. +xdbedizzy: xdbedizzy: -xdbedizzy: xdbedizzy is part of X11. xdbedizzy: -xdbedizzy: For more information about the X.Org Foundation (the providers of the -xdbedizzy: X.Org implementation of the X Window System), see their website: xdbedizzy: -xdbedizzy: http://www.x.org xdbedizzy: xdbedizzy: xdbedizzy: diff --git a/source/x/x11/slack-desc/xditview b/source/x/x11/slack-desc/xditview index 82b175fb..60eebb74 100644 --- a/source/x/x11/slack-desc/xditview +++ b/source/x/x11/slack-desc/xditview @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xditview: xditview +xditview: xditview (displays ditroff output on an X display) xditview: xditview: xditview is part of X11. xditview: diff --git a/source/x/x11/slack-desc/xdm b/source/x/x11/slack-desc/xdm index 88446a5e..12169808 100644 --- a/source/x/x11/slack-desc/xdm +++ b/source/x/x11/slack-desc/xdm @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xdm: xdm +xdm: xdm (X11 display manager) xdm: xdm: xdm is part of X11. xdm: diff --git a/source/x/x11/slack-desc/xdpyinfo b/source/x/x11/slack-desc/xdpyinfo index 80af8f41..8c6c48ff 100644 --- a/source/x/x11/slack-desc/xdpyinfo +++ b/source/x/x11/slack-desc/xdpyinfo @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xdpyinfo: xdpyinfo +xdpyinfo: xdpyinfo (utility for displaying information about an X server) xdpyinfo: xdpyinfo: xdpyinfo is part of X11. xdpyinfo: diff --git a/source/x/x11/slack-desc/xdriinfo b/source/x/x11/slack-desc/xdriinfo index e5850b3a..bcddebfd 100644 --- a/source/x/x11/slack-desc/xdriinfo +++ b/source/x/x11/slack-desc/xdriinfo @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xdriinfo: xdriinfo +xdriinfo: xdriinfo (query configuration information of X11 DRI drivers) xdriinfo: xdriinfo: xdriinfo is part of X11. xdriinfo: diff --git a/source/x/x11/slack-desc/xedit b/source/x/x11/slack-desc/xedit index 00e969ce..6916c0c7 100644 --- a/source/x/x11/slack-desc/xedit +++ b/source/x/x11/slack-desc/xedit @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xedit: xedit +xedit: xedit (simple text editor for X) xedit: xedit: xedit is part of X11. xedit: diff --git a/source/x/x11/slack-desc/xev b/source/x/x11/slack-desc/xev index 6e95b7f9..4e78a1b6 100644 --- a/source/x/x11/slack-desc/xev +++ b/source/x/x11/slack-desc/xev @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xev: xev -xev: -xev: xev is part of X11. -xev: -xev: For more information about the X.Org Foundation (the providers of the -xev: X.Org implementation of the X Window System), see their website: -xev: -xev: http://www.x.org +xev: xev (X11 event viewer) xev: +xev: xev creates a window and then asks the X server to send it X11 events +xev: whenever anything happens to the window (such as it being moved, +xev: resized, typed in, clicked in, etc.). You can also attach it to an +xev: existing window. It is useful for seeing what causes events to occur +xev: and to display the information that they contain; it is essentially +xev: a debugging and development tool, and should not be needed in normal +xev: usage. xev: xev: diff --git a/source/x/x11/slack-desc/xextproto b/source/x/x11/slack-desc/xextproto index 53df9fed..6ea870d0 100644 --- a/source/x/x11/slack-desc/xextproto +++ b/source/x/x11/slack-desc/xextproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xextproto: xextproto +xextproto: xextproto (C prototypes for X Protocol Extensions) xextproto: xextproto: xextproto is part of X11. xextproto: diff --git a/source/x/x11/slack-desc/xeyes b/source/x/x11/slack-desc/xeyes index ddf82f0d..7e1297ee 100644 --- a/source/x/x11/slack-desc/xeyes +++ b/source/x/x11/slack-desc/xeyes @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xeyes: xeyes +xeyes: xeyes (a follow the mouse X demo, using the X SHAPE extension) xeyes: xeyes: xeyes is part of X11. xeyes: diff --git a/source/x/x11/slack-desc/xf86-input-acecad b/source/x/x11/slack-desc/xf86-input-acecad index 26ca95ce..e3421df5 100644 --- a/source/x/x11/slack-desc/xf86-input-acecad +++ b/source/x/x11/slack-desc/xf86-input-acecad @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-input-acecad: xf86-input-acecad +xf86-input-acecad: xf86-input-acecad (Acecad Flair input driver for the Xorg X server) xf86-input-acecad: xf86-input-acecad: xf86-input-acecad is part of X11. xf86-input-acecad: diff --git a/source/x/x11/slack-desc/xf86-input-aiptek b/source/x/x11/slack-desc/xf86-input-aiptek index f7721e57..1ed24243 100644 --- a/source/x/x11/slack-desc/xf86-input-aiptek +++ b/source/x/x11/slack-desc/xf86-input-aiptek @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-input-aiptek: xf86-input-aiptek +xf86-input-aiptek: xf86-input-aiptek (Aiptek USB Digital Tablet Input Driver for Linux) xf86-input-aiptek: xf86-input-aiptek: xf86-input-aiptek is part of X11. xf86-input-aiptek: diff --git a/source/x/x11/slack-desc/xf86-input-calcomp b/source/x/x11/slack-desc/xf86-input-calcomp deleted file mode 100644 index 76dd2653..00000000 --- a/source/x/x11/slack-desc/xf86-input-calcomp +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-calcomp: xf86-input-calcomp -xf86-input-calcomp: -xf86-input-calcomp: xf86-input-calcomp is part of X11. -xf86-input-calcomp: -xf86-input-calcomp: For more information about the X.Org Foundation (the providers of the -xf86-input-calcomp: X.Org implementation of the X Window System), see their website: -xf86-input-calcomp: -xf86-input-calcomp: http://www.x.org -xf86-input-calcomp: -xf86-input-calcomp: -xf86-input-calcomp: diff --git a/source/x/x11/slack-desc/xf86-input-citron b/source/x/x11/slack-desc/xf86-input-citron deleted file mode 100644 index 5548268a..00000000 --- a/source/x/x11/slack-desc/xf86-input-citron +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-citron: xf86-input-citron -xf86-input-citron: -xf86-input-citron: xf86-input-citron is part of X11. -xf86-input-citron: -xf86-input-citron: For more information about the X.Org Foundation (the providers of the -xf86-input-citron: X.Org implementation of the X Window System), see their website: -xf86-input-citron: -xf86-input-citron: http://www.x.org -xf86-input-citron: -xf86-input-citron: -xf86-input-citron: diff --git a/source/x/x11/slack-desc/xf86-input-digitaledge b/source/x/x11/slack-desc/xf86-input-digitaledge deleted file mode 100644 index a199da40..00000000 --- a/source/x/x11/slack-desc/xf86-input-digitaledge +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-digitaledge: xf86-input-digitaledge -xf86-input-digitaledge: -xf86-input-digitaledge: xf86-input-digitaledge is part of X11. -xf86-input-digitaledge: -xf86-input-digitaledge: For more information about the X.Org Foundation (the providers of the -xf86-input-digitaledge: X.Org implementation of the X Window System), see their website: -xf86-input-digitaledge: -xf86-input-digitaledge: http://www.x.org -xf86-input-digitaledge: -xf86-input-digitaledge: -xf86-input-digitaledge: diff --git a/source/x/x11/slack-desc/xf86-input-dmc b/source/x/x11/slack-desc/xf86-input-dmc deleted file mode 100644 index 890f92e9..00000000 --- a/source/x/x11/slack-desc/xf86-input-dmc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-dmc: xf86-input-dmc -xf86-input-dmc: -xf86-input-dmc: xf86-input-dmc is part of X11. -xf86-input-dmc: -xf86-input-dmc: For more information about the X.Org Foundation (the providers of the -xf86-input-dmc: X.Org implementation of the X Window System), see their website: -xf86-input-dmc: -xf86-input-dmc: http://www.x.org -xf86-input-dmc: -xf86-input-dmc: -xf86-input-dmc: diff --git a/source/x/x11/slack-desc/xf86-input-dynapro b/source/x/x11/slack-desc/xf86-input-dynapro deleted file mode 100644 index 346eefe8..00000000 --- a/source/x/x11/slack-desc/xf86-input-dynapro +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-dynapro: xf86-input-dynapro -xf86-input-dynapro: -xf86-input-dynapro: xf86-input-dynapro is part of X11. -xf86-input-dynapro: -xf86-input-dynapro: For more information about the X.Org Foundation (the providers of the -xf86-input-dynapro: X.Org implementation of the X Window System), see their website: -xf86-input-dynapro: -xf86-input-dynapro: http://www.x.org -xf86-input-dynapro: -xf86-input-dynapro: -xf86-input-dynapro: diff --git a/source/x/x11/slack-desc/xf86-input-elo2300 b/source/x/x11/slack-desc/xf86-input-elo2300 deleted file mode 100644 index 6c0bdd57..00000000 --- a/source/x/x11/slack-desc/xf86-input-elo2300 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-elo2300: xf86-input-elo2300 -xf86-input-elo2300: -xf86-input-elo2300: xf86-input-elo2300 is part of X11. -xf86-input-elo2300: -xf86-input-elo2300: For more information about the X.Org Foundation (the providers of the -xf86-input-elo2300: X.Org implementation of the X Window System), see their website: -xf86-input-elo2300: -xf86-input-elo2300: http://www.x.org -xf86-input-elo2300: -xf86-input-elo2300: -xf86-input-elo2300: diff --git a/source/x/x11/slack-desc/xf86-input-elographics b/source/x/x11/slack-desc/xf86-input-elographics deleted file mode 100644 index 1e256565..00000000 --- a/source/x/x11/slack-desc/xf86-input-elographics +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-elographics: xf86-input-elographics -xf86-input-elographics: -xf86-input-elographics: xf86-input-elographics is part of X11. -xf86-input-elographics: -xf86-input-elographics: For more information about the X.Org Foundation (the providers of the -xf86-input-elographics: X.Org implementation of the X Window System), see their website: -xf86-input-elographics: -xf86-input-elographics: http://www.x.org -xf86-input-elographics: -xf86-input-elographics: -xf86-input-elographics: diff --git a/source/x/x11/slack-desc/xf86-input-evdev b/source/x/x11/slack-desc/xf86-input-evdev index 0adcb026..93aeb3f6 100644 --- a/source/x/x11/slack-desc/xf86-input-evdev +++ b/source/x/x11/slack-desc/xf86-input-evdev @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-input-evdev: xf86-input-evdev +xf86-input-evdev: xf86-input-evdev (Generic Linux input driver for the Xorg X server) xf86-input-evdev: xf86-input-evdev: xf86-input-evdev is part of X11. xf86-input-evdev: diff --git a/source/x/x11/slack-desc/xf86-input-fpit b/source/x/x11/slack-desc/xf86-input-fpit deleted file mode 100644 index 51ee433e..00000000 --- a/source/x/x11/slack-desc/xf86-input-fpit +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-fpit: xf86-input-fpit -xf86-input-fpit: -xf86-input-fpit: xf86-input-fpit is part of X11. -xf86-input-fpit: -xf86-input-fpit: For more information about the X.Org Foundation (the providers of the -xf86-input-fpit: X.Org implementation of the X Window System), see their website: -xf86-input-fpit: -xf86-input-fpit: http://www.x.org -xf86-input-fpit: -xf86-input-fpit: -xf86-input-fpit: diff --git a/source/x/x11/slack-desc/xf86-input-hyperpen b/source/x/x11/slack-desc/xf86-input-hyperpen deleted file mode 100644 index f6d6bda8..00000000 --- a/source/x/x11/slack-desc/xf86-input-hyperpen +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-hyperpen: xf86-input-hyperpen -xf86-input-hyperpen: -xf86-input-hyperpen: xf86-input-hyperpen is part of X11. -xf86-input-hyperpen: -xf86-input-hyperpen: For more information about the X.Org Foundation (the providers of the -xf86-input-hyperpen: X.Org implementation of the X Window System), see their website: -xf86-input-hyperpen: -xf86-input-hyperpen: http://www.x.org -xf86-input-hyperpen: -xf86-input-hyperpen: -xf86-input-hyperpen: diff --git a/source/x/x11/slack-desc/xf86-input-jamstudio b/source/x/x11/slack-desc/xf86-input-jamstudio deleted file mode 100644 index 70426117..00000000 --- a/source/x/x11/slack-desc/xf86-input-jamstudio +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-jamstudio: xf86-input-jamstudio -xf86-input-jamstudio: -xf86-input-jamstudio: xf86-input-jamstudio is part of X11. -xf86-input-jamstudio: -xf86-input-jamstudio: For more information about the X.Org Foundation (the providers of the -xf86-input-jamstudio: X.Org implementation of the X Window System), see their website: -xf86-input-jamstudio: -xf86-input-jamstudio: http://www.x.org -xf86-input-jamstudio: -xf86-input-jamstudio: -xf86-input-jamstudio: diff --git a/source/x/x11/slack-desc/xf86-input-joystick b/source/x/x11/slack-desc/xf86-input-joystick index 3a43a254..46963b88 100644 --- a/source/x/x11/slack-desc/xf86-input-joystick +++ b/source/x/x11/slack-desc/xf86-input-joystick @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-input-joystick: xf86-input-joystick +xf86-input-joystick: xf86-input-joystick (Joystick input driver for the Xorg X server) xf86-input-joystick: xf86-input-joystick: xf86-input-joystick is part of X11. xf86-input-joystick: diff --git a/source/x/x11/slack-desc/xf86-input-keyboard b/source/x/x11/slack-desc/xf86-input-keyboard index 640e2b55..e72beb41 100644 --- a/source/x/x11/slack-desc/xf86-input-keyboard +++ b/source/x/x11/slack-desc/xf86-input-keyboard @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-input-keyboard: xf86-input-keyboard +xf86-input-keyboard: kbd (Keyboard input driver for the Xorg X server) +xf86-input-keyboard: +xf86-input-keyboard: This is the non-evdev keyboard driver for X. Most Linux systems +xf86-input-keyboard: should be using the evdev driver to handle input devices such as +xf86-input-keyboard: keyboards and mice, but this driver may be useful as a fallback. xf86-input-keyboard: -xf86-input-keyboard: xf86-input-keyboard is part of X11. xf86-input-keyboard: -xf86-input-keyboard: For more information about the X.Org Foundation (the providers of the -xf86-input-keyboard: X.Org implementation of the X Window System), see their website: xf86-input-keyboard: -xf86-input-keyboard: http://www.x.org xf86-input-keyboard: xf86-input-keyboard: xf86-input-keyboard: diff --git a/source/x/x11/slack-desc/xf86-input-magellan b/source/x/x11/slack-desc/xf86-input-magellan deleted file mode 100644 index 70ef4382..00000000 --- a/source/x/x11/slack-desc/xf86-input-magellan +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-magellan: xf86-input-magellan -xf86-input-magellan: -xf86-input-magellan: xf86-input-magellan is part of X11. -xf86-input-magellan: -xf86-input-magellan: For more information about the X.Org Foundation (the providers of the -xf86-input-magellan: X.Org implementation of the X Window System), see their website: -xf86-input-magellan: -xf86-input-magellan: http://www.x.org -xf86-input-magellan: -xf86-input-magellan: -xf86-input-magellan: diff --git a/source/x/x11/slack-desc/xf86-input-magictouch b/source/x/x11/slack-desc/xf86-input-magictouch deleted file mode 100644 index 72d02f52..00000000 --- a/source/x/x11/slack-desc/xf86-input-magictouch +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-magictouch: xf86-input-magictouch -xf86-input-magictouch: -xf86-input-magictouch: xf86-input-magictouch is part of X11. -xf86-input-magictouch: -xf86-input-magictouch: For more information about the X.Org Foundation (the providers of the -xf86-input-magictouch: X.Org implementation of the X Window System), see their website: -xf86-input-magictouch: -xf86-input-magictouch: http://www.x.org -xf86-input-magictouch: -xf86-input-magictouch: -xf86-input-magictouch: diff --git a/source/x/x11/slack-desc/xf86-input-microtouch b/source/x/x11/slack-desc/xf86-input-microtouch deleted file mode 100644 index 412cb01a..00000000 --- a/source/x/x11/slack-desc/xf86-input-microtouch +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-microtouch: xf86-input-microtouch -xf86-input-microtouch: -xf86-input-microtouch: xf86-input-microtouch is part of X11. -xf86-input-microtouch: -xf86-input-microtouch: For more information about the X.Org Foundation (the providers of the -xf86-input-microtouch: X.Org implementation of the X Window System), see their website: -xf86-input-microtouch: -xf86-input-microtouch: http://www.x.org -xf86-input-microtouch: -xf86-input-microtouch: -xf86-input-microtouch: diff --git a/source/x/x11/slack-desc/xf86-input-mouse b/source/x/x11/slack-desc/xf86-input-mouse index 5ce1494d..73bd88af 100644 --- a/source/x/x11/slack-desc/xf86-input-mouse +++ b/source/x/x11/slack-desc/xf86-input-mouse @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-input-mouse: xf86-input-mouse +xf86-input-mouse: xf86-input-mouse (Mouse Support for X) +xf86-input-mouse: +xf86-input-mouse: This is the non-evdev mouse driver for X. Most Linux systems should +xf86-input-mouse: be using the evdev driver to handle input devices such as keyboards +xf86-input-mouse: and mice, but this driver may be useful as a fallback. xf86-input-mouse: -xf86-input-mouse: xf86-input-mouse is part of X11. xf86-input-mouse: -xf86-input-mouse: For more information about the X.Org Foundation (the providers of the -xf86-input-mouse: X.Org implementation of the X Window System), see their website: xf86-input-mouse: -xf86-input-mouse: http://www.x.org xf86-input-mouse: xf86-input-mouse: xf86-input-mouse: diff --git a/source/x/x11/slack-desc/xf86-input-mutouch b/source/x/x11/slack-desc/xf86-input-mutouch deleted file mode 100644 index 7c8c7f83..00000000 --- a/source/x/x11/slack-desc/xf86-input-mutouch +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-mutouch: xf86-input-mutouch -xf86-input-mutouch: -xf86-input-mutouch: xf86-input-mutouch is part of X11. -xf86-input-mutouch: -xf86-input-mutouch: For more information about the X.Org Foundation (the providers of the -xf86-input-mutouch: X.Org implementation of the X Window System), see their website: -xf86-input-mutouch: -xf86-input-mutouch: http://www.x.org -xf86-input-mutouch: -xf86-input-mutouch: -xf86-input-mutouch: diff --git a/source/x/x11/slack-desc/xf86-input-palmax b/source/x/x11/slack-desc/xf86-input-palmax deleted file mode 100644 index 73328d76..00000000 --- a/source/x/x11/slack-desc/xf86-input-palmax +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-palmax: xf86-input-palmax -xf86-input-palmax: -xf86-input-palmax: xf86-input-palmax is part of X11. -xf86-input-palmax: -xf86-input-palmax: For more information about the X.Org Foundation (the providers of the -xf86-input-palmax: X.Org implementation of the X Window System), see their website: -xf86-input-palmax: -xf86-input-palmax: http://www.x.org -xf86-input-palmax: -xf86-input-palmax: -xf86-input-palmax: diff --git a/source/x/x11/slack-desc/xf86-input-penmount b/source/x/x11/slack-desc/xf86-input-penmount index ca7e48b8..94218788 100644 --- a/source/x/x11/slack-desc/xf86-input-penmount +++ b/source/x/x11/slack-desc/xf86-input-penmount @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-input-penmount: xf86-input-penmount +xf86-input-penmount: xf86-input-penmount (PenMount input driver for the Xorg X server) xf86-input-penmount: xf86-input-penmount: xf86-input-penmount is part of X11. xf86-input-penmount: diff --git a/source/x/x11/slack-desc/xf86-input-spaceorb b/source/x/x11/slack-desc/xf86-input-spaceorb deleted file mode 100644 index b127b895..00000000 --- a/source/x/x11/slack-desc/xf86-input-spaceorb +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-spaceorb: xf86-input-spaceorb -xf86-input-spaceorb: -xf86-input-spaceorb: xf86-input-spaceorb is part of X11. -xf86-input-spaceorb: -xf86-input-spaceorb: For more information about the X.Org Foundation (the providers of the -xf86-input-spaceorb: X.Org implementation of the X Window System), see their website: -xf86-input-spaceorb: -xf86-input-spaceorb: http://www.x.org -xf86-input-spaceorb: -xf86-input-spaceorb: -xf86-input-spaceorb: diff --git a/source/x/x11/slack-desc/xf86-input-summa b/source/x/x11/slack-desc/xf86-input-summa deleted file mode 100644 index c69177bc..00000000 --- a/source/x/x11/slack-desc/xf86-input-summa +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-summa: xf86-input-summa -xf86-input-summa: -xf86-input-summa: xf86-input-summa is part of X11. -xf86-input-summa: -xf86-input-summa: For more information about the X.Org Foundation (the providers of the -xf86-input-summa: X.Org implementation of the X Window System), see their website: -xf86-input-summa: -xf86-input-summa: http://www.x.org -xf86-input-summa: -xf86-input-summa: -xf86-input-summa: diff --git a/source/x/x11/slack-desc/xf86-input-synaptics b/source/x/x11/slack-desc/xf86-input-synaptics index 20858404..1425e129 100644 --- a/source/x/x11/slack-desc/xf86-input-synaptics +++ b/source/x/x11/slack-desc/xf86-input-synaptics @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-input-synaptics: xf86-input-synaptics +xf86-input-synaptics: xf86-input-synaptics (Synaptics touchpad driver for X.Org) xf86-input-synaptics: xf86-input-synaptics: xf86-input-synaptics is part of X11. xf86-input-synaptics: diff --git a/source/x/x11/slack-desc/xf86-input-tek4957 b/source/x/x11/slack-desc/xf86-input-tek4957 deleted file mode 100644 index 2e0a13ff..00000000 --- a/source/x/x11/slack-desc/xf86-input-tek4957 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-tek4957: xf86-input-tek4957 -xf86-input-tek4957: -xf86-input-tek4957: xf86-input-tek4957 is part of X11. -xf86-input-tek4957: -xf86-input-tek4957: For more information about the X.Org Foundation (the providers of the -xf86-input-tek4957: X.Org implementation of the X Window System), see their website: -xf86-input-tek4957: -xf86-input-tek4957: http://www.x.org -xf86-input-tek4957: -xf86-input-tek4957: -xf86-input-tek4957: diff --git a/source/x/x11/slack-desc/xf86-input-ur98 b/source/x/x11/slack-desc/xf86-input-ur98 deleted file mode 100644 index 66680d8c..00000000 --- a/source/x/x11/slack-desc/xf86-input-ur98 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-input-ur98: xf86-input-ur98 -xf86-input-ur98: -xf86-input-ur98: xf86-input-ur98 is part of X11. -xf86-input-ur98: -xf86-input-ur98: For more information about the X.Org Foundation (the providers of the -xf86-input-ur98: X.Org implementation of the X Window System), see their website: -xf86-input-ur98: -xf86-input-ur98: http://www.x.org -xf86-input-ur98: -xf86-input-ur98: -xf86-input-ur98: diff --git a/source/x/x11/slack-desc/xf86-input-vmmouse b/source/x/x11/slack-desc/xf86-input-vmmouse index 640cc71a..d5638965 100644 --- a/source/x/x11/slack-desc/xf86-input-vmmouse +++ b/source/x/x11/slack-desc/xf86-input-vmmouse @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-input-vmmouse: xf86-input-vmmouse +xf86-input-vmmouse: xf86-input-vmmouse (support for VMWare's VMMouse guest mouse device) xf86-input-vmmouse: xf86-input-vmmouse: xf86-input-vmmouse is part of X11. xf86-input-vmmouse: diff --git a/source/x/x11/slack-desc/xf86-input-void b/source/x/x11/slack-desc/xf86-input-void index 889017af..ef38f7d5 100644 --- a/source/x/x11/slack-desc/xf86-input-void +++ b/source/x/x11/slack-desc/xf86-input-void @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-input-void: xf86-input-void +xf86-input-void: xf86-input-void (null input driver for Xorg server) xf86-input-void: xf86-input-void: xf86-input-void is part of X11. xf86-input-void: diff --git a/source/x/x11/slack-desc/xf86-input-wacom b/source/x/x11/slack-desc/xf86-input-wacom index 88f68c1d..86f4ca62 100644 --- a/source/x/x11/slack-desc/xf86-input-wacom +++ b/source/x/x11/slack-desc/xf86-input-wacom @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-input-wacom: xf86-input-wacom +xf86-input-wacom: xf86-input-wacom (driver for Wacom tablets) xf86-input-wacom: -xf86-input-wacom: xf86-input-wacom is part of X11. +xf86-input-wacom: This package provides the X.Org X11 driver for Wacom and Wacom-like +xf86-input-wacom: tablets. It obsoletes the linuxwacom driver and supports X server +xf86-input-wacom: versions 1.7 and higher. Server versions lower than 1.7 may be +xf86-input-wacom: supported by this driver, but users are encouraged to use the old +xf86-input-wacom: linuxwacom driver instead. xf86-input-wacom: -xf86-input-wacom: For more information about the X.Org Foundation (the providers of the -xf86-input-wacom: X.Org implementation of the X Window System), see their website: -xf86-input-wacom: -xf86-input-wacom: http://www.x.org xf86-input-wacom: xf86-input-wacom: xf86-input-wacom: diff --git a/source/x/x11/slack-desc/xf86-video-apm b/source/x/x11/slack-desc/xf86-video-apm index b433ed1d..2ee130c9 100644 --- a/source/x/x11/slack-desc/xf86-video-apm +++ b/source/x/x11/slack-desc/xf86-video-apm @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-apm: xf86-video-apm +xf86-video-apm: xf86-video-apm (driver for Alliance Promotion graphics chipsets) xf86-video-apm: xf86-video-apm: xf86-video-apm is part of X11. xf86-video-apm: diff --git a/source/x/x11/slack-desc/xf86-video-ark b/source/x/x11/slack-desc/xf86-video-ark index 20abb224..eba356f7 100644 --- a/source/x/x11/slack-desc/xf86-video-ark +++ b/source/x/x11/slack-desc/xf86-video-ark @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-ark: xf86-video-ark +xf86-video-ark: xf86-video-ark (Ark Logic video driver for Xorg X server) xf86-video-ark: xf86-video-ark: xf86-video-ark is part of X11. xf86-video-ark: diff --git a/source/x/x11/slack-desc/xf86-video-ast b/source/x/x11/slack-desc/xf86-video-ast index 8861724b..57efd5df 100644 --- a/source/x/x11/slack-desc/xf86-video-ast +++ b/source/x/x11/slack-desc/xf86-video-ast @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-ast: xf86-video-ast +xf86-video-ast: xf86-video-ast (ASpeed Technologies graphics driver for Xorg X server) xf86-video-ast: xf86-video-ast: xf86-video-ast is part of X11. xf86-video-ast: diff --git a/source/x/x11/slack-desc/xf86-video-ati b/source/x/x11/slack-desc/xf86-video-ati index b6847e1d..7387c43c 100644 --- a/source/x/x11/slack-desc/xf86-video-ati +++ b/source/x/x11/slack-desc/xf86-video-ati @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-ati: xf86-video-ati +xf86-video-ati: xf86-video-ati (ATI Radeon video driver for the Xorg X server) xf86-video-ati: xf86-video-ati: xf86-video-ati is part of X11. xf86-video-ati: diff --git a/source/x/x11/slack-desc/xf86-video-chips b/source/x/x11/slack-desc/xf86-video-chips index 2422bc20..f615b79c 100644 --- a/source/x/x11/slack-desc/xf86-video-chips +++ b/source/x/x11/slack-desc/xf86-video-chips @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-chips: xf86-video-chips +xf86-video-chips: xf86-video-chips (Chips and Technologies video driver for Xorg) xf86-video-chips: xf86-video-chips: xf86-video-chips is part of X11. xf86-video-chips: diff --git a/source/x/x11/slack-desc/xf86-video-cirrus b/source/x/x11/slack-desc/xf86-video-cirrus index f7188813..ef65ecc2 100644 --- a/source/x/x11/slack-desc/xf86-video-cirrus +++ b/source/x/x11/slack-desc/xf86-video-cirrus @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-cirrus: xf86-video-cirrus +xf86-video-cirrus: xf86-video-cirrus (Cirrus Logic video driver for the Xorg X server) xf86-video-cirrus: xf86-video-cirrus: xf86-video-cirrus is part of X11. xf86-video-cirrus: diff --git a/source/x/x11/slack-desc/xf86-video-cyrix b/source/x/x11/slack-desc/xf86-video-cyrix deleted file mode 100644 index aebae006..00000000 --- a/source/x/x11/slack-desc/xf86-video-cyrix +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-cyrix: xf86-video-cyrix -xf86-video-cyrix: -xf86-video-cyrix: xf86-video-cyrix is part of X11. -xf86-video-cyrix: -xf86-video-cyrix: For more information about the X.Org Foundation (the providers of the -xf86-video-cyrix: X.Org implementation of the X Window System), see their website: -xf86-video-cyrix: -xf86-video-cyrix: http://www.x.org -xf86-video-cyrix: -xf86-video-cyrix: -xf86-video-cyrix: diff --git a/source/x/x11/slack-desc/xf86-video-dummy b/source/x/x11/slack-desc/xf86-video-dummy index 389e9e3b..98cac335 100644 --- a/source/x/x11/slack-desc/xf86-video-dummy +++ b/source/x/x11/slack-desc/xf86-video-dummy @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-dummy: xf86-video-dummy +xf86-video-dummy: xf86-video-dummy (virtual frame buffer driver for the Xorg X server) xf86-video-dummy: xf86-video-dummy: xf86-video-dummy is part of X11. xf86-video-dummy: diff --git a/source/x/x11/slack-desc/xf86-video-fbdev b/source/x/x11/slack-desc/xf86-video-fbdev index ba6e4a6b..08a636a1 100644 --- a/source/x/x11/slack-desc/xf86-video-fbdev +++ b/source/x/x11/slack-desc/xf86-video-fbdev @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-fbdev: xf86-video-fbdev +xf86-video-fbdev: xf86-video-fbdev (X.Org generic framebuffer video driver) +xf86-video-fbdev: +xf86-video-fbdev: xf86-video-fbdev is the generic framebuffer video driver for X.Org, +xf86-video-fbdev: designed to draw into a video framebuffer provided by the +xf86-video-fbdev: underlying operating system. xf86-video-fbdev: -xf86-video-fbdev: xf86-video-fbdev is part of X11. xf86-video-fbdev: -xf86-video-fbdev: For more information about the X.Org Foundation (the providers of the -xf86-video-fbdev: X.Org implementation of the X Window System), see their website: xf86-video-fbdev: -xf86-video-fbdev: http://www.x.org xf86-video-fbdev: xf86-video-fbdev: xf86-video-fbdev: diff --git a/source/x/x11/slack-desc/xf86-video-geode b/source/x/x11/slack-desc/xf86-video-geode index f9658047..003286bf 100644 --- a/source/x/x11/slack-desc/xf86-video-geode +++ b/source/x/x11/slack-desc/xf86-video-geode @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-geode: xf86-video-geode (AMD Geode GX and LX video driver) +xf86-video-geode: xf86-video-geode (AMD Geode GX and LX graphics driver for X.org) xf86-video-geode: xf86-video-geode: xf86-video-geode is part of X11. xf86-video-geode: diff --git a/source/x/x11/slack-desc/xf86-video-glint b/source/x/x11/slack-desc/xf86-video-glint index 32fb11c4..7e4eeae0 100644 --- a/source/x/x11/slack-desc/xf86-video-glint +++ b/source/x/x11/slack-desc/xf86-video-glint @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-glint: xf86-video-glint +xf86-video-glint: xf86-video-glint (GLINT/Permedia video driver for the Xorg X server) xf86-video-glint: xf86-video-glint: xf86-video-glint is part of X11. xf86-video-glint: diff --git a/source/x/x11/slack-desc/xf86-video-i128 b/source/x/x11/slack-desc/xf86-video-i128 index bab53780..bbf2aa00 100644 --- a/source/x/x11/slack-desc/xf86-video-i128 +++ b/source/x/x11/slack-desc/xf86-video-i128 @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-i128: xf86-video-i128 +xf86-video-i128: xf86-video-i128 (Number Nine I128 video driver for the Xorg X server) xf86-video-i128: xf86-video-i128: xf86-video-i128 is part of X11. xf86-video-i128: diff --git a/source/x/x11/slack-desc/xf86-video-i740 b/source/x/x11/slack-desc/xf86-video-i740 index e31e5ad4..3b61c6aa 100644 --- a/source/x/x11/slack-desc/xf86-video-i740 +++ b/source/x/x11/slack-desc/xf86-video-i740 @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-i740: xf86-video-i740 +xf86-video-i740: xf86-video-i740 (Intel i740 video driver for the Xorg X server) xf86-video-i740: xf86-video-i740: xf86-video-i740 is part of X11. xf86-video-i740: diff --git a/source/x/x11/slack-desc/xf86-video-i810 b/source/x/x11/slack-desc/xf86-video-i810 deleted file mode 100644 index 99eb5b47..00000000 --- a/source/x/x11/slack-desc/xf86-video-i810 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-i810: xf86-video-i810 -xf86-video-i810: -xf86-video-i810: xf86-video-i810 is part of X11. -xf86-video-i810: -xf86-video-i810: For more information about the X.Org Foundation (the providers of the -xf86-video-i810: X.Org implementation of the X Window System), see their website: -xf86-video-i810: -xf86-video-i810: http://www.x.org -xf86-video-i810: -xf86-video-i810: -xf86-video-i810: diff --git a/source/x/x11/slack-desc/xf86-video-impact b/source/x/x11/slack-desc/xf86-video-impact deleted file mode 100644 index 9990fc3b..00000000 --- a/source/x/x11/slack-desc/xf86-video-impact +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-impact: xf86-video-impact -xf86-video-impact: -xf86-video-impact: xf86-video-impact is part of X11. -xf86-video-impact: -xf86-video-impact: For more information about the X.Org Foundation (the providers of the -xf86-video-impact: X.Org implementation of the X Window System), see their website: -xf86-video-impact: -xf86-video-impact: http://www.x.org -xf86-video-impact: -xf86-video-impact: -xf86-video-impact: diff --git a/source/x/x11/slack-desc/xf86-video-imstt b/source/x/x11/slack-desc/xf86-video-imstt deleted file mode 100644 index 71614b67..00000000 --- a/source/x/x11/slack-desc/xf86-video-imstt +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-imstt: xf86-video-imstt -xf86-video-imstt: -xf86-video-imstt: xf86-video-imstt is part of X11. -xf86-video-imstt: -xf86-video-imstt: For more information about the X.Org Foundation (the providers of the -xf86-video-imstt: X.Org implementation of the X Window System), see their website: -xf86-video-imstt: -xf86-video-imstt: http://www.x.org -xf86-video-imstt: -xf86-video-imstt: -xf86-video-imstt: diff --git a/source/x/x11/slack-desc/xf86-video-intel b/source/x/x11/slack-desc/xf86-video-intel index 55be1e31..c51417a7 100644 --- a/source/x/x11/slack-desc/xf86-video-intel +++ b/source/x/x11/slack-desc/xf86-video-intel @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-intel: xf86-video-intel +xf86-video-intel: xf86-video-intel (X.org graphics driver for Intel graphics) xf86-video-intel: xf86-video-intel: xf86-video-intel is part of X11. xf86-video-intel: diff --git a/source/x/x11/slack-desc/xf86-video-mach64 b/source/x/x11/slack-desc/xf86-video-mach64 index ae70d099..46c7f7f6 100644 --- a/source/x/x11/slack-desc/xf86-video-mach64 +++ b/source/x/x11/slack-desc/xf86-video-mach64 @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-mach64: xf86-video-mach64 +xf86-video-mach64: xf86-video-mach64 (ATI Mach64 driver for the Xorg X server) xf86-video-mach64: xf86-video-mach64: xf86-video-mach64 is part of X11. xf86-video-mach64: diff --git a/source/x/x11/slack-desc/xf86-video-mga b/source/x/x11/slack-desc/xf86-video-mga index e0df509f..34e34e61 100644 --- a/source/x/x11/slack-desc/xf86-video-mga +++ b/source/x/x11/slack-desc/xf86-video-mga @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-mga: xf86-video-mga +xf86-video-mga: xf86-video-mga (Matrox video driver for the Xorg X server) xf86-video-mga: xf86-video-mga: xf86-video-mga is part of X11. xf86-video-mga: diff --git a/source/x/x11/slack-desc/xf86-video-modesetting b/source/x/x11/slack-desc/xf86-video-modesetting new file mode 100644 index 00000000..d6ffe28e --- /dev/null +++ b/source/x/x11/slack-desc/xf86-video-modesetting @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xf86-video-modesetting: xf86-video-modesetting (X.org modesetting fallback driver) +xf86-video-modesetting: +xf86-video-modesetting: xf86-video-modesetting is part of X11. +xf86-video-modesetting: +xf86-video-modesetting: For more information about the X.Org Foundation (the providers of the +xf86-video-modesetting: X.Org implementation of the X Window System), see their website: +xf86-video-modesetting: +xf86-video-modesetting: http://www.x.org +xf86-video-modesetting: +xf86-video-modesetting: +xf86-video-modesetting: diff --git a/source/x/x11/slack-desc/xf86-video-neomagic b/source/x/x11/slack-desc/xf86-video-neomagic index 89676c27..862a4306 100644 --- a/source/x/x11/slack-desc/xf86-video-neomagic +++ b/source/x/x11/slack-desc/xf86-video-neomagic @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-neomagic: xf86-video-neomagic +xf86-video-neomagic: xf86-video-neomagic (NeoMagic video driver for the Xorg X server) xf86-video-neomagic: xf86-video-neomagic: xf86-video-neomagic is part of X11. xf86-video-neomagic: diff --git a/source/x/x11/slack-desc/xf86-video-newport b/source/x/x11/slack-desc/xf86-video-newport deleted file mode 100644 index 18d0daf9..00000000 --- a/source/x/x11/slack-desc/xf86-video-newport +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-newport: xf86-video-newport -xf86-video-newport: -xf86-video-newport: xf86-video-newport is part of X11. -xf86-video-newport: -xf86-video-newport: For more information about the X.Org Foundation (the providers of the -xf86-video-newport: X.Org implementation of the X Window System), see their website: -xf86-video-newport: -xf86-video-newport: http://www.x.org -xf86-video-newport: -xf86-video-newport: -xf86-video-newport: diff --git a/source/x/x11/slack-desc/xf86-video-nouveau b/source/x/x11/slack-desc/xf86-video-nouveau index 8697a60e..ef207622 100644 --- a/source/x/x11/slack-desc/xf86-video-nouveau +++ b/source/x/x11/slack-desc/xf86-video-nouveau @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-nouveau: xf86-video-nouveau +xf86-video-nouveau: xf86-video-nouveau (accelerated open source driver for nVidia cards) xf86-video-nouveau: xf86-video-nouveau: xf86-video-nouveau is part of X11. xf86-video-nouveau: diff --git a/source/x/x11/slack-desc/xf86-video-nsc b/source/x/x11/slack-desc/xf86-video-nsc deleted file mode 100644 index 1081a9f5..00000000 --- a/source/x/x11/slack-desc/xf86-video-nsc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-nsc: xf86-video-nsc -xf86-video-nsc: -xf86-video-nsc: xf86-video-nsc is part of X11. -xf86-video-nsc: -xf86-video-nsc: For more information about the X.Org Foundation (the providers of the -xf86-video-nsc: X.Org implementation of the X Window System), see their website: -xf86-video-nsc: -xf86-video-nsc: http://www.x.org -xf86-video-nsc: -xf86-video-nsc: -xf86-video-nsc: diff --git a/source/x/x11/slack-desc/xf86-video-nv b/source/x/x11/slack-desc/xf86-video-nv index dfed5106..cd866957 100644 --- a/source/x/x11/slack-desc/xf86-video-nv +++ b/source/x/x11/slack-desc/xf86-video-nv @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-nv: xf86-video-nv +xf86-video-nv: xf86-video-nv (old NVIDIA video driver for the Xorg X server) xf86-video-nv: xf86-video-nv: xf86-video-nv is part of X11. xf86-video-nv: diff --git a/source/x/x11/slack-desc/xf86-video-openchrome b/source/x/x11/slack-desc/xf86-video-openchrome index 263de315..32e4c312 100644 --- a/source/x/x11/slack-desc/xf86-video-openchrome +++ b/source/x/x11/slack-desc/xf86-video-openchrome @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-openchrome: xf86-video-openchrome +xf86-video-openchrome: xf86-video-openchrome (VIA video driver for the Xorg X server) xf86-video-openchrome: xf86-video-openchrome: xf86-video-openchrome is part of X11. xf86-video-openchrome: diff --git a/source/x/x11/slack-desc/xf86-video-qxl b/source/x/x11/slack-desc/xf86-video-qxl new file mode 100644 index 00000000..e5eae0ce --- /dev/null +++ b/source/x/x11/slack-desc/xf86-video-qxl @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xf86-video-qxl: xf86-video-qxl (driver for the spice virtual GPU) +xf86-video-qxl: +xf86-video-qxl: QXL is a driver for the spice virtual GPU. +xf86-video-qxl: +xf86-video-qxl: +xf86-video-qxl: +xf86-video-qxl: +xf86-video-qxl: +xf86-video-qxl: +xf86-video-qxl: +xf86-video-qxl: diff --git a/source/x/x11/slack-desc/xf86-video-r128 b/source/x/x11/slack-desc/xf86-video-r128 index 6a5807bc..ae700aa9 100644 --- a/source/x/x11/slack-desc/xf86-video-r128 +++ b/source/x/x11/slack-desc/xf86-video-r128 @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-r128: xf86-video-r128 +xf86-video-r128: xf86-video-r128 (ATI Rage 128 video driver for the Xorg X server) xf86-video-r128: xf86-video-r128: xf86-video-r128 is part of X11. xf86-video-r128: diff --git a/source/x/x11/slack-desc/xf86-video-radeonhd b/source/x/x11/slack-desc/xf86-video-radeonhd deleted file mode 100644 index ce2e7265..00000000 --- a/source/x/x11/slack-desc/xf86-video-radeonhd +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-radeonhd: xf86-video-radeonhd (driver for AMD GPG (ATI) R5xx/R6xx chipsets) -xf86-video-radeonhd: -xf86-video-radeonhd: xf86-video-radeonhd is part of X11. -xf86-video-radeonhd: -xf86-video-radeonhd: For more information about the X.Org Foundation (the providers of the -xf86-video-radeonhd: X.Org implementation of the X Window System), see their website: -xf86-video-radeonhd: -xf86-video-radeonhd: http://www.x.org -xf86-video-radeonhd: -xf86-video-radeonhd: -xf86-video-radeonhd: diff --git a/source/x/x11/slack-desc/xf86-video-rendition b/source/x/x11/slack-desc/xf86-video-rendition index 99561b3a..a4c4dac5 100644 --- a/source/x/x11/slack-desc/xf86-video-rendition +++ b/source/x/x11/slack-desc/xf86-video-rendition @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-rendition: xf86-video-rendition +xf86-video-rendition: xf86-video-rendition (Rendition video driver for the Xorg X server) xf86-video-rendition: xf86-video-rendition: xf86-video-rendition is part of X11. xf86-video-rendition: diff --git a/source/x/x11/slack-desc/xf86-video-s3 b/source/x/x11/slack-desc/xf86-video-s3 index f91fd6e9..960fd1f0 100644 --- a/source/x/x11/slack-desc/xf86-video-s3 +++ b/source/x/x11/slack-desc/xf86-video-s3 @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-s3: xf86-video-s3 +xf86-video-s3: xf86-video-s3 (Xorg driver for S3 chipsets other than ViRGE or Savage) xf86-video-s3: xf86-video-s3: xf86-video-s3 is part of X11. xf86-video-s3: diff --git a/source/x/x11/slack-desc/xf86-video-s3virge b/source/x/x11/slack-desc/xf86-video-s3virge index 52fe0a34..87042f44 100644 --- a/source/x/x11/slack-desc/xf86-video-s3virge +++ b/source/x/x11/slack-desc/xf86-video-s3virge @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-s3virge: xf86-video-s3virge +xf86-video-s3virge: xf86-video-s3virge (S3 ViRGE video driver for the Xorg X server) xf86-video-s3virge: xf86-video-s3virge: xf86-video-s3virge is part of X11. xf86-video-s3virge: diff --git a/source/x/x11/slack-desc/xf86-video-savage b/source/x/x11/slack-desc/xf86-video-savage index f31d670c..b789b634 100644 --- a/source/x/x11/slack-desc/xf86-video-savage +++ b/source/x/x11/slack-desc/xf86-video-savage @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-savage: xf86-video-savage +xf86-video-savage: xf86-video-savage (S3 Savage video driver for the Xorg X server) xf86-video-savage: xf86-video-savage: xf86-video-savage is part of X11. xf86-video-savage: diff --git a/source/x/x11/slack-desc/xf86-video-siliconmotion b/source/x/x11/slack-desc/xf86-video-siliconmotion index 97a28f01..3a50a9a9 100644 --- a/source/x/x11/slack-desc/xf86-video-siliconmotion +++ b/source/x/x11/slack-desc/xf86-video-siliconmotion @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-siliconmotion: xf86-video-siliconmotion +xf86-video-siliconmotion: xf86-video-siliconmotion (Silicon Motion video driver for Xorg) xf86-video-siliconmotion: xf86-video-siliconmotion: xf86-video-siliconmotion is part of X11. xf86-video-siliconmotion: diff --git a/source/x/x11/slack-desc/xf86-video-sis b/source/x/x11/slack-desc/xf86-video-sis index d0261754..f08c5495 100644 --- a/source/x/x11/slack-desc/xf86-video-sis +++ b/source/x/x11/slack-desc/xf86-video-sis @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-sis: xf86-video-sis +xf86-video-sis: xf86-video-sis (SiS and XGI video driver for the Xorg X server) xf86-video-sis: xf86-video-sis: xf86-video-sis is part of X11. xf86-video-sis: diff --git a/source/x/x11/slack-desc/xf86-video-sisusb b/source/x/x11/slack-desc/xf86-video-sisusb index 9ab8bcbb..bda16ac5 100644 --- a/source/x/x11/slack-desc/xf86-video-sisusb +++ b/source/x/x11/slack-desc/xf86-video-sisusb @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-sisusb: xf86-video-sisusb +xf86-video-sisusb: xf86-video-sisusb (SiS Net2280-based USB video driver for Xorg) xf86-video-sisusb: xf86-video-sisusb: xf86-video-sisusb is part of X11. xf86-video-sisusb: diff --git a/source/x/x11/slack-desc/xf86-video-sunbw2 b/source/x/x11/slack-desc/xf86-video-sunbw2 deleted file mode 100644 index f432ae42..00000000 --- a/source/x/x11/slack-desc/xf86-video-sunbw2 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-sunbw2: xf86-video-sunbw2 -xf86-video-sunbw2: -xf86-video-sunbw2: xf86-video-sunbw2 is part of X11. -xf86-video-sunbw2: -xf86-video-sunbw2: For more information about the X.Org Foundation (the providers of the -xf86-video-sunbw2: X.Org implementation of the X Window System), see their website: -xf86-video-sunbw2: -xf86-video-sunbw2: http://www.x.org -xf86-video-sunbw2: -xf86-video-sunbw2: -xf86-video-sunbw2: diff --git a/source/x/x11/slack-desc/xf86-video-suncg14 b/source/x/x11/slack-desc/xf86-video-suncg14 deleted file mode 100644 index de038ed1..00000000 --- a/source/x/x11/slack-desc/xf86-video-suncg14 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-suncg14: xf86-video-suncg14 -xf86-video-suncg14: -xf86-video-suncg14: xf86-video-suncg14 is part of X11. -xf86-video-suncg14: -xf86-video-suncg14: For more information about the X.Org Foundation (the providers of the -xf86-video-suncg14: X.Org implementation of the X Window System), see their website: -xf86-video-suncg14: -xf86-video-suncg14: http://www.x.org -xf86-video-suncg14: -xf86-video-suncg14: -xf86-video-suncg14: diff --git a/source/x/x11/slack-desc/xf86-video-suncg3 b/source/x/x11/slack-desc/xf86-video-suncg3 deleted file mode 100644 index c4b70a91..00000000 --- a/source/x/x11/slack-desc/xf86-video-suncg3 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-suncg3: xf86-video-suncg3 -xf86-video-suncg3: -xf86-video-suncg3: xf86-video-suncg3 is part of X11. -xf86-video-suncg3: -xf86-video-suncg3: For more information about the X.Org Foundation (the providers of the -xf86-video-suncg3: X.Org implementation of the X Window System), see their website: -xf86-video-suncg3: -xf86-video-suncg3: http://www.x.org -xf86-video-suncg3: -xf86-video-suncg3: -xf86-video-suncg3: diff --git a/source/x/x11/slack-desc/xf86-video-suncg6 b/source/x/x11/slack-desc/xf86-video-suncg6 deleted file mode 100644 index e9efb940..00000000 --- a/source/x/x11/slack-desc/xf86-video-suncg6 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-suncg6: xf86-video-suncg6 -xf86-video-suncg6: -xf86-video-suncg6: xf86-video-suncg6 is part of X11. -xf86-video-suncg6: -xf86-video-suncg6: For more information about the X.Org Foundation (the providers of the -xf86-video-suncg6: X.Org implementation of the X Window System), see their website: -xf86-video-suncg6: -xf86-video-suncg6: http://www.x.org -xf86-video-suncg6: -xf86-video-suncg6: -xf86-video-suncg6: diff --git a/source/x/x11/slack-desc/xf86-video-sunffb b/source/x/x11/slack-desc/xf86-video-sunffb deleted file mode 100644 index 17400a0e..00000000 --- a/source/x/x11/slack-desc/xf86-video-sunffb +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-sunffb: xf86-video-sunffb -xf86-video-sunffb: -xf86-video-sunffb: xf86-video-sunffb is part of X11. -xf86-video-sunffb: -xf86-video-sunffb: For more information about the X.Org Foundation (the providers of the -xf86-video-sunffb: X.Org implementation of the X Window System), see their website: -xf86-video-sunffb: -xf86-video-sunffb: http://www.x.org -xf86-video-sunffb: -xf86-video-sunffb: -xf86-video-sunffb: diff --git a/source/x/x11/slack-desc/xf86-video-sunleo b/source/x/x11/slack-desc/xf86-video-sunleo deleted file mode 100644 index 03b0c2ea..00000000 --- a/source/x/x11/slack-desc/xf86-video-sunleo +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-sunleo: xf86-video-sunleo -xf86-video-sunleo: -xf86-video-sunleo: xf86-video-sunleo is part of X11. -xf86-video-sunleo: -xf86-video-sunleo: For more information about the X.Org Foundation (the providers of the -xf86-video-sunleo: X.Org implementation of the X Window System), see their website: -xf86-video-sunleo: -xf86-video-sunleo: http://www.x.org -xf86-video-sunleo: -xf86-video-sunleo: -xf86-video-sunleo: diff --git a/source/x/x11/slack-desc/xf86-video-suntcx b/source/x/x11/slack-desc/xf86-video-suntcx deleted file mode 100644 index 800bade3..00000000 --- a/source/x/x11/slack-desc/xf86-video-suntcx +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-suntcx: xf86-video-suntcx -xf86-video-suntcx: -xf86-video-suntcx: xf86-video-suntcx is part of X11. -xf86-video-suntcx: -xf86-video-suntcx: For more information about the X.Org Foundation (the providers of the -xf86-video-suntcx: X.Org implementation of the X Window System), see their website: -xf86-video-suntcx: -xf86-video-suntcx: http://www.x.org -xf86-video-suntcx: -xf86-video-suntcx: -xf86-video-suntcx: diff --git a/source/x/x11/slack-desc/xf86-video-tdfx b/source/x/x11/slack-desc/xf86-video-tdfx index 8d375baf..dddcaf59 100644 --- a/source/x/x11/slack-desc/xf86-video-tdfx +++ b/source/x/x11/slack-desc/xf86-video-tdfx @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-tdfx: xf86-video-tdfx +xf86-video-tdfx: xf86-video-tdfx (3Dfx video driver for the Xorg X server) xf86-video-tdfx: xf86-video-tdfx: xf86-video-tdfx is part of X11. xf86-video-tdfx: diff --git a/source/x/x11/slack-desc/xf86-video-tga b/source/x/x11/slack-desc/xf86-video-tga index 52a30eb0..fead6cbe 100644 --- a/source/x/x11/slack-desc/xf86-video-tga +++ b/source/x/x11/slack-desc/xf86-video-tga @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-tga: xf86-video-tga +xf86-video-tga: xf86-video-tga (DEC21030/TGA video driver for the Xorg X server) xf86-video-tga: xf86-video-tga: xf86-video-tga is part of X11. xf86-video-tga: diff --git a/source/x/x11/slack-desc/xf86-video-trident b/source/x/x11/slack-desc/xf86-video-trident index f4b6a570..69197278 100644 --- a/source/x/x11/slack-desc/xf86-video-trident +++ b/source/x/x11/slack-desc/xf86-video-trident @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-trident: xf86-video-trident +xf86-video-trident: xf86-video-trident (Trident video driver for the Xorg X server) xf86-video-trident: xf86-video-trident: xf86-video-trident is part of X11. xf86-video-trident: diff --git a/source/x/x11/slack-desc/xf86-video-tseng b/source/x/x11/slack-desc/xf86-video-tseng index 3192fe14..8e0a12b4 100644 --- a/source/x/x11/slack-desc/xf86-video-tseng +++ b/source/x/x11/slack-desc/xf86-video-tseng @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-tseng: xf86-video-tseng +xf86-video-tseng: xf86-video-tseng (Tseng Labs video driver for the Xorg X server) xf86-video-tseng: xf86-video-tseng: xf86-video-tseng is part of X11. xf86-video-tseng: diff --git a/source/x/x11/slack-desc/xf86-video-v4l b/source/x/x11/slack-desc/xf86-video-v4l index 27e7795f..e6e1aab1 100644 --- a/source/x/x11/slack-desc/xf86-video-v4l +++ b/source/x/x11/slack-desc/xf86-video-v4l @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-v4l: xf86-video-v4l +xf86-video-v4l: xf86-video-v4l (Video 4 Linux adaptor driver for X) xf86-video-v4l: xf86-video-v4l: xf86-video-v4l is part of X11. xf86-video-v4l: diff --git a/source/x/x11/slack-desc/xf86-video-vermilion b/source/x/x11/slack-desc/xf86-video-vermilion deleted file mode 100644 index 2ca79f3e..00000000 --- a/source/x/x11/slack-desc/xf86-video-vermilion +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-vermilion: xf86-video-vermilion -xf86-video-vermilion: -xf86-video-vermilion: xf86-video-vermilion supports the Intel Vermilion Range of chipsets. -xf86-video-vermilion: -xf86-video-vermilion: For more information about the X.Org Foundation (the providers of the -xf86-video-vermilion: X.Org implementation of the X Window System), see their website: -xf86-video-vermilion: -xf86-video-vermilion: http://www.x.org -xf86-video-vermilion: -xf86-video-vermilion: -xf86-video-vermilion: diff --git a/source/x/x11/slack-desc/xf86-video-vesa b/source/x/x11/slack-desc/xf86-video-vesa index 5a1edcaf..0c7e742d 100644 --- a/source/x/x11/slack-desc/xf86-video-vesa +++ b/source/x/x11/slack-desc/xf86-video-vesa @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-vesa: xf86-video-vesa +xf86-video-vesa: xf86-video-vesa (Generic VESA video driver for the Xorg X server) xf86-video-vesa: xf86-video-vesa: xf86-video-vesa is part of X11. xf86-video-vesa: diff --git a/source/x/x11/slack-desc/xf86-video-vga b/source/x/x11/slack-desc/xf86-video-vga deleted file mode 100644 index 5a4dde64..00000000 --- a/source/x/x11/slack-desc/xf86-video-vga +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-vga: xf86-video-vga -xf86-video-vga: -xf86-video-vga: xf86-video-vga is part of X11. -xf86-video-vga: -xf86-video-vga: For more information about the X.Org Foundation (the providers of the -xf86-video-vga: X.Org implementation of the X Window System), see their website: -xf86-video-vga: -xf86-video-vga: http://www.x.org -xf86-video-vga: -xf86-video-vga: -xf86-video-vga: diff --git a/source/x/x11/slack-desc/xf86-video-via b/source/x/x11/slack-desc/xf86-video-via deleted file mode 100644 index 90193181..00000000 --- a/source/x/x11/slack-desc/xf86-video-via +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-via: xf86-video-via -xf86-video-via: -xf86-video-via: xf86-video-via is part of X11. -xf86-video-via: -xf86-video-via: For more information about the X.Org Foundation (the providers of the -xf86-video-via: X.Org implementation of the X Window System), see their website: -xf86-video-via: -xf86-video-via: http://www.x.org -xf86-video-via: -xf86-video-via: -xf86-video-via: diff --git a/source/x/x11/slack-desc/xf86-video-vmware b/source/x/x11/slack-desc/xf86-video-vmware index d3d818b2..7ca2802e 100644 --- a/source/x/x11/slack-desc/xf86-video-vmware +++ b/source/x/x11/slack-desc/xf86-video-vmware @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-vmware: xf86-video-vmware +xf86-video-vmware: xf86-video-vmware (VMWare SVGA video driver for the Xorg X server) xf86-video-vmware: xf86-video-vmware: xf86-video-vmware is part of X11. xf86-video-vmware: diff --git a/source/x/x11/slack-desc/xf86-video-voodoo b/source/x/x11/slack-desc/xf86-video-voodoo index 5ba59ab2..357315d4 100644 --- a/source/x/x11/slack-desc/xf86-video-voodoo +++ b/source/x/x11/slack-desc/xf86-video-voodoo @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-voodoo: xf86-video-voodoo +xf86-video-voodoo: xf86-video-voodoo (3DFX Voodoo/Voodoo2 video driver for Xorg) xf86-video-voodoo: xf86-video-voodoo: xf86-video-voodoo is part of X11. xf86-video-voodoo: diff --git a/source/x/x11/slack-desc/xf86-video-wsfb b/source/x/x11/slack-desc/xf86-video-wsfb deleted file mode 100644 index 0253575e..00000000 --- a/source/x/x11/slack-desc/xf86-video-wsfb +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-wsfb: xf86-video-wsfb -xf86-video-wsfb: -xf86-video-wsfb: xf86-video-wsfb is part of X11. -xf86-video-wsfb: -xf86-video-wsfb: For more information about the X.Org Foundation (the providers of the -xf86-video-wsfb: X.Org implementation of the X Window System), see their website: -xf86-video-wsfb: -xf86-video-wsfb: http://www.x.org -xf86-video-wsfb: -xf86-video-wsfb: -xf86-video-wsfb: diff --git a/source/x/x11/slack-desc/xf86-video-xgi b/source/x/x11/slack-desc/xf86-video-xgi index a92ec854..1792db1b 100644 --- a/source/x/x11/slack-desc/xf86-video-xgi +++ b/source/x/x11/slack-desc/xf86-video-xgi @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86-video-xgi: xf86-video-xgi +xf86-video-xgi: xf86-video-xgi (XGI video driver for the Xorg X server) xf86-video-xgi: xf86-video-xgi: xf86-video-xgi is part of X11. xf86-video-xgi: diff --git a/source/x/x11/slack-desc/xf86-video-xgixp b/source/x/x11/slack-desc/xf86-video-xgixp deleted file mode 100644 index 32aea9fd..00000000 --- a/source/x/x11/slack-desc/xf86-video-xgixp +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-xgixp: xf86-video-xgixp -xf86-video-xgixp: -xf86-video-xgixp: xf86-video-xgixp is part of X11. -xf86-video-xgixp: -xf86-video-xgixp: For more information about the X.Org Foundation (the providers of the -xf86-video-xgixp: X.Org implementation of the X Window System), see their website: -xf86-video-xgixp: -xf86-video-xgixp: http://www.x.org -xf86-video-xgixp: -xf86-video-xgixp: -xf86-video-xgixp: diff --git a/source/x/x11/slack-desc/xf86bigfontproto b/source/x/x11/slack-desc/xf86bigfontproto index d42c5419..d9f1cc2e 100644 --- a/source/x/x11/slack-desc/xf86bigfontproto +++ b/source/x/x11/slack-desc/xf86bigfontproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86bigfontproto: xf86bigfontproto +xf86bigfontproto: xf86bigfontproto (X.Org XF86BIGFONT protocol headers) xf86bigfontproto: xf86bigfontproto: xf86bigfontproto is part of X11. xf86bigfontproto: diff --git a/source/x/x11/slack-desc/xf86dga b/source/x/x11/slack-desc/xf86dga index 08c928a9..70d189ea 100644 --- a/source/x/x11/slack-desc/xf86dga +++ b/source/x/x11/slack-desc/xf86dga @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86dga: xf86dga +xf86dga: xf86dga (simple test client for the XFree86-DGA extension) xf86dga: xf86dga: xf86dga is part of X11. xf86dga: diff --git a/source/x/x11/slack-desc/xf86dgaproto b/source/x/x11/slack-desc/xf86dgaproto index c9ca3fc2..cbc21ac6 100644 --- a/source/x/x11/slack-desc/xf86dgaproto +++ b/source/x/x11/slack-desc/xf86dgaproto @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86dgaproto: xf86dgaproto +xf86dgaproto: xf86dgaproto (X.Org XFree86-DGA protocol headers) +xf86dgaproto: +xf86dgaproto: xf86dgaproto provides the wire protocol for the XFree86-DGA extension +xf86dgaproto: in X.Org. It provides direct, framebuffer-like, graphics access. +xf86dgaproto: xf86dgaproto: -xf86dgaproto: xf86dgaproto is part of X11. xf86dgaproto: -xf86dgaproto: For more information about the X.Org Foundation (the providers of the -xf86dgaproto: X.Org implementation of the X Window System), see their website: xf86dgaproto: -xf86dgaproto: http://www.x.org xf86dgaproto: xf86dgaproto: xf86dgaproto: diff --git a/source/x/x11/slack-desc/xf86driproto b/source/x/x11/slack-desc/xf86driproto index c327a43b..e9466bde 100644 --- a/source/x/x11/slack-desc/xf86driproto +++ b/source/x/x11/slack-desc/xf86driproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86driproto: xf86driproto +xf86driproto: xf86driproto (C prototypes for XFree86 DRI) xf86driproto: xf86driproto: xf86driproto is part of X11. xf86driproto: diff --git a/source/x/x11/slack-desc/xf86miscproto b/source/x/x11/slack-desc/xf86miscproto index 883ef9fe..bf1297b1 100644 --- a/source/x/x11/slack-desc/xf86miscproto +++ b/source/x/x11/slack-desc/xf86miscproto @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86miscproto: xf86miscproto +xf86miscproto: xf86miscproto (C prototypes for XFree86-Misc) xf86miscproto: -xf86miscproto: xf86miscproto is part of X11. +xf86miscproto: This package includes the protocol definitions of the "XFree86-Misc" +xf86miscproto: extension to the X11 protocol. The "XFree86-Misc" extension is +xf86miscproto: supported by the XFree86 X server and versions of the Xorg X server +xf86miscproto: prior to Xorg 1.6. xf86miscproto: -xf86miscproto: For more information about the X.Org Foundation (the providers of the -xf86miscproto: X.Org implementation of the X Window System), see their website: xf86miscproto: -xf86miscproto: http://www.x.org xf86miscproto: xf86miscproto: xf86miscproto: diff --git a/source/x/x11/slack-desc/xf86rushproto b/source/x/x11/slack-desc/xf86rushproto deleted file mode 100644 index 0013da93..00000000 --- a/source/x/x11/slack-desc/xf86rushproto +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86rushproto: xf86rushproto -xf86rushproto: -xf86rushproto: xf86rushproto is part of X11. -xf86rushproto: -xf86rushproto: For more information about the X.Org Foundation (the providers of the -xf86rushproto: X.Org implementation of the X Window System), see their website: -xf86rushproto: -xf86rushproto: http://www.x.org -xf86rushproto: -xf86rushproto: -xf86rushproto: diff --git a/source/x/x11/slack-desc/xf86vidmodeproto b/source/x/x11/slack-desc/xf86vidmodeproto index 13acda81..2e6d8ea0 100644 --- a/source/x/x11/slack-desc/xf86vidmodeproto +++ b/source/x/x11/slack-desc/xf86vidmodeproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xf86vidmodeproto: xf86vidmodeproto +xf86vidmodeproto: xf86vidmodeproto (C prototypes for XFree86 Video Mode Extension) xf86vidmodeproto: xf86vidmodeproto: xf86vidmodeproto is part of X11. xf86vidmodeproto: diff --git a/source/x/x11/slack-desc/xfd b/source/x/x11/slack-desc/xfd index 31f646f5..4d47163e 100644 --- a/source/x/x11/slack-desc/xfd +++ b/source/x/x11/slack-desc/xfd @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xfd: xfd +xfd: xfd (X11 font utility) +xfd: +xfd: xfd displays all the characters in a font using either the X11 core +xfd: protocol or libXft2. +xfd: xfd: -xfd: xfd is part of X11. xfd: -xfd: For more information about the X.Org Foundation (the providers of the -xfd: X.Org implementation of the X Window System), see their website: xfd: -xfd: http://www.x.org xfd: xfd: xfd: diff --git a/source/x/x11/slack-desc/xfindproxy b/source/x/x11/slack-desc/xfindproxy deleted file mode 100644 index 64125d2c..00000000 --- a/source/x/x11/slack-desc/xfindproxy +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xfindproxy: xfindproxy -xfindproxy: -xfindproxy: xfindproxy is part of X11. -xfindproxy: -xfindproxy: For more information about the X.Org Foundation (the providers of the -xfindproxy: X.Org implementation of the X Window System), see their website: -xfindproxy: -xfindproxy: http://www.x.org -xfindproxy: -xfindproxy: -xfindproxy: diff --git a/source/x/x11/slack-desc/xfontsel b/source/x/x11/slack-desc/xfontsel index cb4594c2..0638c5e8 100644 --- a/source/x/x11/slack-desc/xfontsel +++ b/source/x/x11/slack-desc/xfontsel @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xfontsel: xfontsel +xfontsel: xfontsel (X11 font selector) +xfontsel: +xfontsel: xfontsel application provides a simple way to display the X11 core +xfontsel: protocol fonts known to your X server, examine samples of each, and +xfontsel: retrieve the X Logical Font Description ("XLFD") full name for a font. xfontsel: -xfontsel: xfontsel is part of X11. xfontsel: -xfontsel: For more information about the X.Org Foundation (the providers of the -xfontsel: X.Org implementation of the X Window System), see their website: xfontsel: -xfontsel: http://www.x.org xfontsel: xfontsel: xfontsel: diff --git a/source/x/x11/slack-desc/xfs b/source/x/x11/slack-desc/xfs index 33ea3687..63d8766e 100644 --- a/source/x/x11/slack-desc/xfs +++ b/source/x/x11/slack-desc/xfs @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xfs: xfs +xfs: xfs (font server for X11) xfs: xfs: xfs is part of X11. xfs: diff --git a/source/x/x11/slack-desc/xfsinfo b/source/x/x11/slack-desc/xfsinfo index 87abf1e4..85e5ef22 100644 --- a/source/x/x11/slack-desc/xfsinfo +++ b/source/x/x11/slack-desc/xfsinfo @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xfsinfo: xfsinfo +xfsinfo: xfsinfo (X11 font server utility) xfsinfo: -xfsinfo: xfsinfo is part of X11. +xfsinfo: xfsinfo is a utility for displaying information about an X font server. +xfsinfo: It is used to examine the capabilities of a server, the predefined +xfsinfo: values for various parameters used in communicating between clients +xfsinfo: and the server, and the font catalogues and alternate servers that +xfsinfo: are available. xfsinfo: -xfsinfo: For more information about the X.Org Foundation (the providers of the -xfsinfo: X.Org implementation of the X Window System), see their website: -xfsinfo: -xfsinfo: http://www.x.org xfsinfo: xfsinfo: xfsinfo: diff --git a/source/x/x11/slack-desc/xfwp b/source/x/x11/slack-desc/xfwp deleted file mode 100644 index 572036c6..00000000 --- a/source/x/x11/slack-desc/xfwp +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xfwp: xfwp -xfwp: -xfwp: xfwp is part of X11. -xfwp: -xfwp: For more information about the X.Org Foundation (the providers of the -xfwp: X.Org implementation of the X Window System), see their website: -xfwp: -xfwp: http://www.x.org -xfwp: -xfwp: -xfwp: diff --git a/source/x/x11/slack-desc/xgamma b/source/x/x11/slack-desc/xgamma index 69df14aa..c7ebcb95 100644 --- a/source/x/x11/slack-desc/xgamma +++ b/source/x/x11/slack-desc/xgamma @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xgamma: xgamma +xgamma: xgamma (X11 gamma utility) +xgamma: +xgamma: xgamma allows X users to query and alter the gamma correction of a +xgamma: monitor via the X video mode extension (XFree86-VidModeExtension). +xgamma: xgamma: -xgamma: xgamma is part of X11. xgamma: -xgamma: For more information about the X.Org Foundation (the providers of the -xgamma: X.Org implementation of the X Window System), see their website: xgamma: -xgamma: http://www.x.org xgamma: xgamma: xgamma: diff --git a/source/x/x11/slack-desc/xgc b/source/x/x11/slack-desc/xgc index 0de84bc0..e07e9bad 100644 --- a/source/x/x11/slack-desc/xgc +++ b/source/x/x11/slack-desc/xgc @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xgc: xgc +xgc: xgc (X11 demo client) +xgc: +xgc: xgc is an X11 graphics demo that shows various features of the X11 +xgc: core protocol graphics primitives. +xgc: xgc: -xgc: xgc is part of X11. xgc: -xgc: For more information about the X.Org Foundation (the providers of the -xgc: X.Org implementation of the X Window System), see their website: xgc: -xgc: http://www.x.org xgc: xgc: xgc: diff --git a/source/x/x11/slack-desc/xhost b/source/x/x11/slack-desc/xhost index 53f9620b..a4b9501d 100644 --- a/source/x/x11/slack-desc/xhost +++ b/source/x/x11/slack-desc/xhost @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xhost: xhost +xhost: xhost (X11 authorization utility) +xhost: +xhost: xhost is used to manage the list of host names or user names allowed +xhost: to make connections to the X server. +xhost: xhost: -xhost: xhost is part of X11. xhost: -xhost: For more information about the X.Org Foundation (the providers of the -xhost: X.Org implementation of the X Window System), see their website: xhost: -xhost: http://www.x.org xhost: xhost: xhost: diff --git a/source/x/x11/slack-desc/xineramaproto b/source/x/x11/slack-desc/xineramaproto index dbdde800..6a39b1a1 100644 --- a/source/x/x11/slack-desc/xineramaproto +++ b/source/x/x11/slack-desc/xineramaproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xineramaproto: xineramaproto +xineramaproto: xineramaproto (C prototypes for X11 Xinerama Extension) xineramaproto: xineramaproto: xineramaproto is part of X11. xineramaproto: diff --git a/source/x/x11/slack-desc/xinit b/source/x/x11/slack-desc/xinit index c1b05318..c64cd86a 100644 --- a/source/x/x11/slack-desc/xinit +++ b/source/x/x11/slack-desc/xinit @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xinit: xinit +xinit: xinit (scripts to start X11 servers) +xinit: +xinit: xinit is not intended for naive users. Instead, site administrators +xinit: should design user-friendly scripts that present the desired interface +xinit: when starting up X. The startx script is one such example. xinit: -xinit: xinit is part of X11. xinit: -xinit: For more information about the X.Org Foundation (the providers of the -xinit: X.Org implementation of the X Window System), see their website: xinit: -xinit: http://www.x.org xinit: xinit: xinit: diff --git a/source/x/x11/slack-desc/xinput b/source/x/x11/slack-desc/xinput index 758a6ba6..6ae25aec 100644 --- a/source/x/x11/slack-desc/xinput +++ b/source/x/x11/slack-desc/xinput @@ -5,15 +5,15 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| -xinput: xinput + |-----handy-ruler------------------------------------------------------| +xinput: xinput (utility to configure and test X11 input devices) xinput: xinput: xinput is a utility to configure and test XInput devices. It wasn't xinput: originally designed to be the primary tool for doing this but it's xinput: still pretty much the only program out there for doing it. :-) xinput: -xinput: xinput is part of X11. -xinput: xinput: For more information about the X.Org Foundation (the providers of the xinput: X.Org implementation of the X Window System), see their website: xinput: http://www.x.org +xinput: +xinput: diff --git a/source/x/x11/slack-desc/xkbcomp b/source/x/x11/slack-desc/xkbcomp index ab3fc9b7..dc0da9b2 100644 --- a/source/x/x11/slack-desc/xkbcomp +++ b/source/x/x11/slack-desc/xkbcomp @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xkbcomp: xkbcomp +xkbcomp: xkbcomp (X Keyboard Extension) xkbcomp: xkbcomp: xkbcomp is part of X11. xkbcomp: diff --git a/source/x/x11/slack-desc/xkbdata b/source/x/x11/slack-desc/xkbdata deleted file mode 100644 index 5fafad26..00000000 --- a/source/x/x11/slack-desc/xkbdata +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xkbdata: xkbdata -xkbdata: -xkbdata: xkbdata is part of X11. -xkbdata: -xkbdata: For more information about the X.Org Foundation (the providers of the -xkbdata: X.Org implementation of the X Window System), see their website: -xkbdata: -xkbdata: http://www.x.org -xkbdata: -xkbdata: -xkbdata: diff --git a/source/x/x11/slack-desc/xkbevd b/source/x/x11/slack-desc/xkbevd index 9909e676..59b3f14e 100644 --- a/source/x/x11/slack-desc/xkbevd +++ b/source/x/x11/slack-desc/xkbevd @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xkbevd: xkbevd +xkbevd: xkbevd (X11 keyboard event daemon) xkbevd: xkbevd: xkbevd is part of X11. xkbevd: diff --git a/source/x/x11/slack-desc/xkbprint b/source/x/x11/slack-desc/xkbprint index efbe7ab9..ab30d051 100644 --- a/source/x/x11/slack-desc/xkbprint +++ b/source/x/x11/slack-desc/xkbprint @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xkbprint: xkbprint +xkbprint: xkbprint (X11 keyboard utility) +xkbprint: +xkbprint: xkbprint generates a printable or encapsulated PostScript description +xkbprint: of an XKB keyboard description. +xkbprint: xkbprint: -xkbprint: xkbprint is part of X11. xkbprint: -xkbprint: For more information about the X.Org Foundation (the providers of the -xkbprint: X.Org implementation of the X Window System), see their website: xkbprint: -xkbprint: http://www.x.org xkbprint: xkbprint: xkbprint: diff --git a/source/x/x11/slack-desc/xkbutils b/source/x/x11/slack-desc/xkbutils index 1e98d49d..80f8ee9e 100644 --- a/source/x/x11/slack-desc/xkbutils +++ b/source/x/x11/slack-desc/xkbutils @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xkbutils: xkbutils +xkbutils: xkbutils (X11 keyboard utilities) +xkbutils: +xkbutils: xkbutils is a collection of small utilities utilizing the XKeyboard +xkbutils: (XKB) extension to the X11 protocol. +xkbutils: xkbutils: -xkbutils: xkbutils is part of X11. xkbutils: -xkbutils: For more information about the X.Org Foundation (the providers of the -xkbutils: X.Org implementation of the X Window System), see their website: xkbutils: -xkbutils: http://www.x.org xkbutils: xkbutils: xkbutils: diff --git a/source/x/x11/slack-desc/xkeyboard-config b/source/x/x11/slack-desc/xkeyboard-config index 3b9b0bb7..01454254 100644 --- a/source/x/x11/slack-desc/xkeyboard-config +++ b/source/x/x11/slack-desc/xkeyboard-config @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xkeyboard-config: xkeyboard-config +xkeyboard-config: xkeyboard-config (X Keyboard Extension config files) xkeyboard-config: -xkeyboard-config: xkeyboard-config is part of X11. -xkeyboard-config: -xkeyboard-config: For more information about the X.Org Foundation (the providers of the -xkeyboard-config: X.Org implementation of the X Window System), see their website: -xkeyboard-config: -xkeyboard-config: http://www.x.org +xkeyboard-config: The X Keyboard Extension essentially replaces the core protocol +xkeyboard-config: definition of keyboard. The extension makes possible to clearly and +xkeyboard-config: explicitly specify most aspects of keyboard behaviour on per-key +xkeyboard-config: basis and to more closely track the logical and physical state of the +xkeyboard-config: keyboard. It also includes a number of keyboard controls designed to +xkeyboard-config: make keyboards more accessible to people with physical impairments. xkeyboard-config: xkeyboard-config: xkeyboard-config: diff --git a/source/x/x11/slack-desc/xkill b/source/x/x11/slack-desc/xkill index 82aedb48..66904b44 100644 --- a/source/x/x11/slack-desc/xkill +++ b/source/x/x11/slack-desc/xkill @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xkill: xkill +xkill: xkill (X11 utility) +xkill: +xkill: xkill is a utility for forcing the X server to close connections to +xkill: clients. This program is very dangerous, but is useful for aborting +xkill: programs that have displayed undesired windows on a user's screen. xkill: -xkill: xkill is part of X11. xkill: -xkill: For more information about the X.Org Foundation (the providers of the -xkill: X.Org implementation of the X Window System), see their website: xkill: -xkill: http://www.x.org xkill: xkill: xkill: diff --git a/source/x/x11/slack-desc/xload b/source/x/x11/slack-desc/xload index b95b6b6c..24adeac7 100644 --- a/source/x/x11/slack-desc/xload +++ b/source/x/x11/slack-desc/xload @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xload: xload +xload: xload (displays a histogram of the system load average) xload: xload: xload is part of X11. xload: diff --git a/source/x/x11/slack-desc/xlogo b/source/x/x11/slack-desc/xlogo index fbd28cc1..e97b3e25 100644 --- a/source/x/x11/slack-desc/xlogo +++ b/source/x/x11/slack-desc/xlogo @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xlogo: xlogo +xlogo: xlogo (displays the X Window System logo) xlogo: xlogo: xlogo is part of X11. xlogo: diff --git a/source/x/x11/slack-desc/xlsatoms b/source/x/x11/slack-desc/xlsatoms index f4e7e79c..c6e958ae 100644 --- a/source/x/x11/slack-desc/xlsatoms +++ b/source/x/x11/slack-desc/xlsatoms @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xlsatoms: xlsatoms +xlsatoms: xlsatoms (lists the interned atoms defined on an X11 server) xlsatoms: xlsatoms: xlsatoms is part of X11. xlsatoms: diff --git a/source/x/x11/slack-desc/xlsclients b/source/x/x11/slack-desc/xlsclients index 2bcf25fb..2cf50b06 100644 --- a/source/x/x11/slack-desc/xlsclients +++ b/source/x/x11/slack-desc/xlsclients @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xlsclients: xlsclients +xlsclients: xlsclients (X11 utility for listing X client info) +xlsclients: +xlsclients: xlsclients is a utility for listing information about the client +xlsclients: applications running on a X11 server. +xlsclients: xlsclients: -xlsclients: xlsclients is part of X11. xlsclients: -xlsclients: For more information about the X.Org Foundation (the providers of the -xlsclients: X.Org implementation of the X Window System), see their website: xlsclients: -xlsclients: http://www.x.org xlsclients: xlsclients: xlsclients: diff --git a/source/x/x11/slack-desc/xlsfonts b/source/x/x11/slack-desc/xlsfonts index 25e25afc..d285ab05 100644 --- a/source/x/x11/slack-desc/xlsfonts +++ b/source/x/x11/slack-desc/xlsfonts @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xlsfonts: xlsfonts +xlsfonts: xlsfonts (X11 font utility to list available fonts) +xlsfonts: +xlsfonts: xlsfonts lists fonts available from an X server via the X11 core +xlsfonts: protocol. +xlsfonts: xlsfonts: -xlsfonts: xlsfonts is part of X11. xlsfonts: -xlsfonts: For more information about the X.Org Foundation (the providers of the -xlsfonts: X.Org implementation of the X Window System), see their website: xlsfonts: -xlsfonts: http://www.x.org xlsfonts: xlsfonts: xlsfonts: diff --git a/source/x/x11/slack-desc/xmag b/source/x/x11/slack-desc/xmag index 38174dd7..50c329f8 100644 --- a/source/x/x11/slack-desc/xmag +++ b/source/x/x11/slack-desc/xmag @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xmag: xmag +xmag: xmag (X11 accessibility utility) +xmag: +xmag: xmag displays a magnified snapshot of a portion of an X11 screen. +xmag: +xmag: xmag: -xmag: xmag is part of X11. xmag: -xmag: For more information about the X.Org Foundation (the providers of the -xmag: X.Org implementation of the X Window System), see their website: xmag: -xmag: http://www.x.org xmag: xmag: xmag: diff --git a/source/x/x11/slack-desc/xman b/source/x/x11/slack-desc/xman index 98ce929c..206da5c8 100644 --- a/source/x/x11/slack-desc/xman +++ b/source/x/x11/slack-desc/xman @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xman: xman +xman: xman (graphical manual page browser using the Xaw toolkit) xman: xman: xman is part of X11. xman: diff --git a/source/x/x11/slack-desc/xmessage b/source/x/x11/slack-desc/xmessage index 12c9c0df..233d4aa2 100644 --- a/source/x/x11/slack-desc/xmessage +++ b/source/x/x11/slack-desc/xmessage @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xmessage: xmessage +xmessage: xmessage (displays a message or query in a window) +xmessage: +xmessage: The user can click on an "okay" button to dismiss it or can select +xmessage: one of several buttons to answer a question. xmessage can also exit +xmessage: after a specified time. xmessage: -xmessage: xmessage is part of X11. xmessage: -xmessage: For more information about the X.Org Foundation (the providers of the -xmessage: X.Org implementation of the X Window System), see their website: xmessage: -xmessage: http://www.x.org xmessage: xmessage: xmessage: diff --git a/source/x/x11/slack-desc/xmh b/source/x/x11/slack-desc/xmh index a1415c8b..8730f1f2 100644 --- a/source/x/x11/slack-desc/xmh +++ b/source/x/x11/slack-desc/xmh @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xmh: xmh +xmh: xmh (X11 mail handler) +xmh: +xmh: The xmh program provides a graphical user interface to the MH Message +xmh: Handling System. To actually do things with your mail, it makes +xmh: calls to the MH package. xmh: -xmh: xmh is part of X11. xmh: -xmh: For more information about the X.Org Foundation (the providers of the -xmh: X.Org implementation of the X Window System), see their website: xmh: -xmh: http://www.x.org xmh: xmh: xmh: diff --git a/source/x/x11/slack-desc/xmodmap b/source/x/x11/slack-desc/xmodmap index aeb77cff..9397f1c3 100644 --- a/source/x/x11/slack-desc/xmodmap +++ b/source/x/x11/slack-desc/xmodmap @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xmodmap: xmodmap +xmodmap: xmodmap (X11 keyboard utility) xmodmap: -xmodmap: xmodmap is part of X11. +xmodmap: The xmodmap program is used to edit and display the keyboard modifier +xmodmap: map and keymap table that are used by client applications to convert +xmodmap: event keycodes into keysyms. It is usually run from a user's session +xmodmap: startup script to configure the keyboard according to personal tastes. xmodmap: -xmodmap: For more information about the X.Org Foundation (the providers of the -xmodmap: X.Org implementation of the X Window System), see their website: xmodmap: -xmodmap: http://www.x.org xmodmap: xmodmap: xmodmap: diff --git a/source/x/x11/slack-desc/xmore b/source/x/x11/slack-desc/xmore index a714db3d..c8696b87 100644 --- a/source/x/x11/slack-desc/xmore +++ b/source/x/x11/slack-desc/xmore @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xmore: xmore +xmore: xmore (plain text display program for the X Window System) xmore: xmore: xmore is part of X11. xmore: diff --git a/source/x/x11/slack-desc/xorg-cf-files b/source/x/x11/slack-desc/xorg-cf-files index a5f15784..343f5037 100644 --- a/source/x/x11/slack-desc/xorg-cf-files +++ b/source/x/x11/slack-desc/xorg-cf-files @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xorg-cf-files: xorg-cf-files +xorg-cf-files: xorg-cf-files (X11 config files for imake) xorg-cf-files: -xorg-cf-files: xorg-cf-files is part of X11. +xorg-cf-files: The xorg-cf-files package contains the data files for the imake +xorg-cf-files: utility, defining the known settings for a wide variety of platforms +xorg-cf-files: (many of which have not been verified or tested in over a decade) and +xorg-cf-files: for many of the libraries formerly delivered in the X.Org monolithic +xorg-cf-files: releases. xorg-cf-files: -xorg-cf-files: For more information about the X.Org Foundation (the providers of the -xorg-cf-files: X.Org implementation of the X Window System), see their website: -xorg-cf-files: -xorg-cf-files: http://www.x.org xorg-cf-files: xorg-cf-files: xorg-cf-files: diff --git a/source/x/x11/slack-desc/xorg-docs b/source/x/x11/slack-desc/xorg-docs index aee2a992..dfe9e249 100644 --- a/source/x/x11/slack-desc/xorg-docs +++ b/source/x/x11/slack-desc/xorg-docs @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xorg-docs: xorg-docs +xorg-docs: xorg-docs (documentation for X11) xorg-docs: -xorg-docs: xorg-docs is part of X11. +xorg-docs: This package provides miscellaneous documentation for the X Window +xorg-docs: System that doesn't better fit into other packages. +xorg-docs: +xorg-docs: The preferred documentation format for these documents is DocBook XML. xorg-docs: -xorg-docs: For more information about the X.Org Foundation (the providers of the -xorg-docs: X.Org implementation of the X Window System), see their website: xorg-docs: -xorg-docs: http://www.x.org xorg-docs: xorg-docs: xorg-docs: diff --git a/source/x/x11/slack-desc/xorg-server-xdmx b/source/x/x11/slack-desc/xorg-server-xdmx deleted file mode 100644 index 0cfe5c8f..00000000 --- a/source/x/x11/slack-desc/xorg-server-xdmx +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xorg-server-xdmx: xorg-server-xdmx (Distributed Multi-head X server) -xorg-server-xdmx: -xorg-server-xdmx: Xdmx is a proxy X server that uses one or more other X servers as its -xorg-server-xdmx: display devices. It provides multi-head X functionality for displays -xorg-server-xdmx: that might be located on different machines. -xorg-server-xdmx: -xorg-server-xdmx: -xorg-server-xdmx: -xorg-server-xdmx: -xorg-server-xdmx: -xorg-server-xdmx: diff --git a/source/x/x11/slack-desc/xorg-sgml-doctools b/source/x/x11/slack-desc/xorg-sgml-doctools index 1467fb82..df867004 100644 --- a/source/x/x11/slack-desc/xorg-sgml-doctools +++ b/source/x/x11/slack-desc/xorg-sgml-doctools @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xorg-sgml-doctools: xorg-sgml-doctools +xorg-sgml-doctools: xorg-sgml-doctools (X.org documentation tools) xorg-sgml-doctools: -xorg-sgml-doctools: xorg-sgml-doctools is part of X11. -xorg-sgml-doctools: -xorg-sgml-doctools: For more information about the X.Org Foundation (the providers of the -xorg-sgml-doctools: X.Org implementation of the X Window System), see their website: -xorg-sgml-doctools: -xorg-sgml-doctools: http://www.x.org +xorg-sgml-doctools: This package provides a common set of SGML entities and XML/CSS style +xorg-sgml-doctools: sheets used in building/formatting the documentation provided in other +xorg-sgml-doctools: X.Org packages. It's typically only needed by people building from +xorg-sgml-doctools: source who want to produce formatted documentation from their builds, +xorg-sgml-doctools: or those who have installed the HTML version of the documentation, +xorg-sgml-doctools: which refers to the included common xorg.css stylesheet. xorg-sgml-doctools: xorg-sgml-doctools: xorg-sgml-doctools: diff --git a/source/x/x11/slack-desc/xphelloworld b/source/x/x11/slack-desc/xphelloworld deleted file mode 100644 index e5ae0f3b..00000000 --- a/source/x/x11/slack-desc/xphelloworld +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xphelloworld: xphelloworld -xphelloworld: -xphelloworld: xphelloworld is part of X11. -xphelloworld: -xphelloworld: For more information about the X.Org Foundation (the providers of the -xphelloworld: X.Org implementation of the X Window System), see their website: -xphelloworld: -xphelloworld: http://www.x.org -xphelloworld: -xphelloworld: -xphelloworld: diff --git a/source/x/x11/slack-desc/xplsprinters b/source/x/x11/slack-desc/xplsprinters deleted file mode 100644 index b4201593..00000000 --- a/source/x/x11/slack-desc/xplsprinters +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xplsprinters: xplsprinters -xplsprinters: -xplsprinters: xplsprinters is part of X11. -xplsprinters: -xplsprinters: For more information about the X.Org Foundation (the providers of the -xplsprinters: X.Org implementation of the X Window System), see their website: -xplsprinters: -xplsprinters: http://www.x.org -xplsprinters: -xplsprinters: -xplsprinters: diff --git a/source/x/x11/slack-desc/xpr b/source/x/x11/slack-desc/xpr index 1e7795ca..45936d40 100644 --- a/source/x/x11/slack-desc/xpr +++ b/source/x/x11/slack-desc/xpr @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xpr: xpr +xpr: xpr (dump an X window directly to a printer) +xpr: +xpr: xpr takes as input a window dump file produced by xwd +xpr: and formats it for output on various types of printers. +xpr: xpr: -xpr: xpr is part of X11. xpr: -xpr: For more information about the X.Org Foundation (the providers of the -xpr: X.Org implementation of the X Window System), see their website: xpr: -xpr: http://www.x.org xpr: xpr: xpr: diff --git a/source/x/x11/slack-desc/xprehashprinterlist b/source/x/x11/slack-desc/xprehashprinterlist deleted file mode 100644 index 3444a5ee..00000000 --- a/source/x/x11/slack-desc/xprehashprinterlist +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xprehashprinterlist: xprehashprinterlist -xprehashprinterlist: -xprehashprinterlist: xprehashprinterlist is part of X11. -xprehashprinterlist: -xprehashprinterlist: For more information about the X.Org Foundation (the providers of the -xprehashprinterlist: X.Org implementation of the X Window System), see their website: -xprehashprinterlist: -xprehashprinterlist: http://www.x.org -xprehashprinterlist: -xprehashprinterlist: -xprehashprinterlist: diff --git a/source/x/x11/slack-desc/xprop b/source/x/x11/slack-desc/xprop index 8996f509..99788723 100644 --- a/source/x/x11/slack-desc/xprop +++ b/source/x/x11/slack-desc/xprop @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xprop: xprop +xprop: xprop (displays window and font properties of an X server) xprop: xprop: xprop is part of X11. xprop: diff --git a/source/x/x11/slack-desc/xproto b/source/x/x11/slack-desc/xproto index e57551ab..1c230b1e 100644 --- a/source/x/x11/slack-desc/xproto +++ b/source/x/x11/slack-desc/xproto @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xproto: xproto +xproto: xproto (C prototypes for X Window System Core Protocol) xproto: xproto: xproto is part of X11. xproto: diff --git a/source/x/x11/slack-desc/xproxymanagementprotocol b/source/x/x11/slack-desc/xproxymanagementprotocol deleted file mode 100644 index a5586dc6..00000000 --- a/source/x/x11/slack-desc/xproxymanagementprotocol +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xproxymanagementprotocol: xproxymanagementprotocol -xproxymanagementprotocol: -xproxymanagementprotocol: xproxymanagementprotocol is part of X11. -xproxymanagementprotocol: -xproxymanagementprotocol: For more information about the X.Org Foundation (the providers of the -xproxymanagementprotocol: X.Org implementation of the X Window System), see their website: -xproxymanagementprotocol: -xproxymanagementprotocol: http://www.x.org -xproxymanagementprotocol: -xproxymanagementprotocol: -xproxymanagementprotocol: diff --git a/source/x/x11/slack-desc/xpyb b/source/x/x11/slack-desc/xpyb index 92baab77..4d96cc27 100644 --- a/source/x/x11/slack-desc/xpyb +++ b/source/x/x11/slack-desc/xpyb @@ -5,15 +5,15 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler-------------------------------------------------------| -xpyb: xpyb + |-----handy-ruler------------------------------------------------------| +xpyb: xpyb (Python bindings for X) +xpyb: +xpyb: xpyb provides a Python binding to the X Window System protocol +xpyb: via libxcb. +xpyb: xpyb: -xpyb: xpyb is part of X11. xpyb: -xpyb: For more information about the X.Org Foundation (the providers of the -xpyb: X.Org implementation of the X Window System), see their website: xpyb: -xpyb: http://www.x.org xpyb: xpyb: xpyb: diff --git a/source/x/x11/slack-desc/xrandr b/source/x/x11/slack-desc/xrandr index 8f158dd0..059fe1b3 100644 --- a/source/x/x11/slack-desc/xrandr +++ b/source/x/x11/slack-desc/xrandr @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xrandr: xrandr +xrandr: xrandr (X11 RandR utility) +xrandr: +xrandr: Primitive command line interface to X11 Resize, Rotate, and Reflect +xrandr: (RandR) extension +xrandr: xrandr: -xrandr: xrandr is part of X11. xrandr: -xrandr: For more information about the X.Org Foundation (the providers of the -xrandr: X.Org implementation of the X Window System), see their website: xrandr: -xrandr: http://www.x.org xrandr: xrandr: xrandr: diff --git a/source/x/x11/slack-desc/xrdb b/source/x/x11/slack-desc/xrdb index 26ea4786..9adef974 100644 --- a/source/x/x11/slack-desc/xrdb +++ b/source/x/x11/slack-desc/xrdb @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xrdb: xrdb +xrdb: xrdb (X server resource database utility) xrdb: xrdb: xrdb is part of X11. xrdb: diff --git a/source/x/x11/slack-desc/xrefresh b/source/x/x11/slack-desc/xrefresh index 65e7140c..f641dcf8 100644 --- a/source/x/x11/slack-desc/xrefresh +++ b/source/x/x11/slack-desc/xrefresh @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xrefresh: xrefresh +xrefresh: xrefresh (refresh all or part of an X screen) xrefresh: xrefresh: xrefresh is part of X11. xrefresh: diff --git a/source/x/x11/slack-desc/xrx b/source/x/x11/slack-desc/xrx deleted file mode 100644 index 3a6e369c..00000000 --- a/source/x/x11/slack-desc/xrx +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xrx: xrx -xrx: -xrx: xrx is part of X11. -xrx: -xrx: For more information about the X.Org Foundation (the providers of the -xrx: X.Org implementation of the X Window System), see their website: -xrx: -xrx: http://www.x.org -xrx: -xrx: -xrx: diff --git a/source/x/x11/slack-desc/xscope b/source/x/x11/slack-desc/xscope index 5008a745..a513cba6 100644 --- a/source/x/x11/slack-desc/xscope +++ b/source/x/x11/slack-desc/xscope @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xscope: xscope +xscope: xscope (program to monitor X11/Client conversations) xscope: xscope: xscope is part of X11. xscope: diff --git a/source/x/x11/slack-desc/xset b/source/x/x11/slack-desc/xset index e434079c..da54a274 100644 --- a/source/x/x11/slack-desc/xset +++ b/source/x/x11/slack-desc/xset @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xset: xset +xset: xset (get and set various preferences and properties) +xset: +xset: xset is a command line utility to get and set various preferences +xset: and properties for the current session. +xset: xset: -xset: xset is part of X11. xset: -xset: For more information about the X.Org Foundation (the providers of the -xset: X.Org implementation of the X Window System), see their website: xset: -xset: http://www.x.org xset: xset: xset: diff --git a/source/x/x11/slack-desc/xsetmode b/source/x/x11/slack-desc/xsetmode deleted file mode 100644 index b727c3e9..00000000 --- a/source/x/x11/slack-desc/xsetmode +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xsetmode: xsetmode -xsetmode: -xsetmode: xsetmode is part of X11. -xsetmode: -xsetmode: For more information about the X.Org Foundation (the providers of the -xsetmode: X.Org implementation of the X Window System), see their website: -xsetmode: -xsetmode: http://www.x.org -xsetmode: -xsetmode: -xsetmode: diff --git a/source/x/x11/slack-desc/xsetpointer b/source/x/x11/slack-desc/xsetpointer deleted file mode 100644 index cbfaa0c2..00000000 --- a/source/x/x11/slack-desc/xsetpointer +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xsetpointer: xsetpointer -xsetpointer: -xsetpointer: xsetpointer is part of X11. -xsetpointer: -xsetpointer: For more information about the X.Org Foundation (the providers of the -xsetpointer: X.Org implementation of the X Window System), see their website: -xsetpointer: -xsetpointer: http://www.x.org -xsetpointer: -xsetpointer: -xsetpointer: diff --git a/source/x/x11/slack-desc/xsetroot b/source/x/x11/slack-desc/xsetroot index 8a9a4be3..569396ae 100644 --- a/source/x/x11/slack-desc/xsetroot +++ b/source/x/x11/slack-desc/xsetroot @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xsetroot: xsetroot +xsetroot: xsetroot (root window parameter setting utility for X) xsetroot: xsetroot: xsetroot is part of X11. xsetroot: diff --git a/source/x/x11/slack-desc/xsm b/source/x/x11/slack-desc/xsm index 8fe6ba3c..0034f323 100644 --- a/source/x/x11/slack-desc/xsm +++ b/source/x/x11/slack-desc/xsm @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xsm: xsm +xsm: xsm (X11 Session Manager) xsm: xsm: xsm is part of X11. xsm: diff --git a/source/x/x11/slack-desc/xstdcmap b/source/x/x11/slack-desc/xstdcmap index b1bd5e6a..f659e758 100644 --- a/source/x/x11/slack-desc/xstdcmap +++ b/source/x/x11/slack-desc/xstdcmap @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xstdcmap: xstdcmap +xstdcmap: xstdcmap (X11 color utility) xstdcmap: -xstdcmap: xstdcmap is part of X11. +xstdcmap: The xstdcmap utility can be used to selectively define standard +xstdcmap: colormap properties. It is intended to be run from a user's X +xstdcmap: startup script to create standard colormap definitions in order to +xstdcmap: facilitate sharing of scarce colormap resources among clients using +xstdcmap: PseudoColor visuals. xstdcmap: -xstdcmap: For more information about the X.Org Foundation (the providers of the -xstdcmap: X.Org implementation of the X Window System), see their website: -xstdcmap: -xstdcmap: http://www.x.org xstdcmap: xstdcmap: xstdcmap: diff --git a/source/x/x11/slack-desc/xtrans b/source/x/x11/slack-desc/xtrans index f7ea71c3..26c4866a 100644 --- a/source/x/x11/slack-desc/xtrans +++ b/source/x/x11/slack-desc/xtrans @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xtrans: xtrans +xtrans: xtrans (X network transport library) xtrans: -xtrans: xtrans is part of X11. +xtrans: xtrans is a library of code that is shared among various X packages +xtrans: to handle network protocol transport in a modular fashion, allowing a +xtrans: single place to add new transport types. It is used by the X server, +xtrans: libX11, libICE, the X font server, and related components. xtrans: -xtrans: For more information about the X.Org Foundation (the providers of the -xtrans: X.Org implementation of the X Window System), see their website: xtrans: -xtrans: http://www.x.org xtrans: xtrans: xtrans: diff --git a/source/x/x11/slack-desc/xtrap b/source/x/x11/slack-desc/xtrap deleted file mode 100644 index bdf77e43..00000000 --- a/source/x/x11/slack-desc/xtrap +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xtrap: xtrap -xtrap: -xtrap: xtrap is part of X11. -xtrap: -xtrap: For more information about the X.Org Foundation (the providers of the -xtrap: X.Org implementation of the X Window System), see their website: -xtrap: -xtrap: http://www.x.org -xtrap: -xtrap: -xtrap: diff --git a/source/x/x11/slack-desc/xvidtune b/source/x/x11/slack-desc/xvidtune index bdadf298..d55fae9f 100644 --- a/source/x/x11/slack-desc/xvidtune +++ b/source/x/x11/slack-desc/xvidtune @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xvidtune: xvidtune +xvidtune: xvidtune (X11 video utility) +xvidtune: +xvidtune: xvidtune is a client interface to the X server video mode extension +xvidtune: (XFree86-VidModeExtension). +xvidtune: xvidtune: -xvidtune: xvidtune is part of X11. xvidtune: -xvidtune: For more information about the X.Org Foundation (the providers of the -xvidtune: X.Org implementation of the X Window System), see their website: xvidtune: -xvidtune: http://www.x.org xvidtune: xvidtune: xvidtune: diff --git a/source/x/x11/slack-desc/xvinfo b/source/x/x11/slack-desc/xvinfo index 54a44c8a..84f50e6f 100644 --- a/source/x/x11/slack-desc/xvinfo +++ b/source/x/x11/slack-desc/xvinfo @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xvinfo: xvinfo +xvinfo: xvinfo (X11 X-Video utility) +xvinfo: +xvinfo: xvinfo prints out the capabilities of any video adaptors associated +xvinfo: with the display that are accessible through the X-Video extension. +xvinfo: xvinfo: -xvinfo: xvinfo is part of X11. xvinfo: -xvinfo: For more information about the X.Org Foundation (the providers of the -xvinfo: X.Org implementation of the X Window System), see their website: xvinfo: -xvinfo: http://www.x.org xvinfo: xvinfo: xvinfo: diff --git a/source/x/x11/slack-desc/xwd b/source/x/x11/slack-desc/xwd index 6b2450a0..8230f336 100644 --- a/source/x/x11/slack-desc/xwd +++ b/source/x/x11/slack-desc/xwd @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xwd: xwd +xwd: xwd (dump an image of an X window) xwd: xwd: xwd is part of X11. xwd: diff --git a/source/x/x11/slack-desc/xwininfo b/source/x/x11/slack-desc/xwininfo index 03e11ddf..9545fbfa 100644 --- a/source/x/x11/slack-desc/xwininfo +++ b/source/x/x11/slack-desc/xwininfo @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xwininfo: xwininfo +xwininfo: xwininfo (prints information about windows on an X server) +xwininfo: +xwininfo: Various information is displayed depending on which options are +xwininfo: selected. +xwininfo: xwininfo: -xwininfo: xwininfo is part of X11. xwininfo: -xwininfo: For more information about the X.Org Foundation (the providers of the -xwininfo: X.Org implementation of the X Window System), see their website: xwininfo: -xwininfo: http://www.x.org xwininfo: xwininfo: xwininfo: diff --git a/source/x/x11/slack-desc/xwud b/source/x/x11/slack-desc/xwud index f0c22d34..6ae90864 100644 --- a/source/x/x11/slack-desc/xwud +++ b/source/x/x11/slack-desc/xwud @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -xwud: xwud +xwud: xwud (X screen dump viewer) +xwud: +xwud: xwud allows X users to display in a window an image saved in a +xwud: specially formatted dump file, such as produced by xwd. +xwud: xwud: -xwud: xwud is part of X11. xwud: -xwud: For more information about the X.Org Foundation (the providers of the -xwud: X.Org implementation of the X Window System), see their website: xwud: -xwud: http://www.x.org xwud: xwud: xwud: diff --git a/source/x/x11/src/get-xf86-video-nouveau.sh b/source/x/x11/src/get-xf86-video-nouveau.sh index 72d3efd3..9a21febd 100755 --- a/source/x/x11/src/get-xf86-video-nouveau.sh +++ b/source/x/x11/src/get-xf86-video-nouveau.sh @@ -1,8 +1,14 @@ # Pull a stable branch + patches BRANCH=master -rm -rf xf86-video-nouveau -git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau/ +#rm -rf xf86-video-nouveau +if [ -d xf86-video-nouveau ]; then + cd xf86-video-nouveau + git pull -f + cd .. +else + git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau/ +fi # use master branch #( cd xf86-video-nouveau diff --git a/source/x/xaw3d/pull-xaw3d.sh b/source/x/xaw3d/pull-xaw3d.sh deleted file mode 100755 index 96141a6d..00000000 --- a/source/x/xaw3d/pull-xaw3d.sh +++ /dev/null @@ -1,7 +0,0 @@ -rm -rf xaw3d -git clone git://gitorious.org/xaw3d/xaw3d.git -( cd xaw3d && rm -rf .git* ) -mv xaw3d xaw3d-$(date +%Y%m%d)git -tar cf xaw3d-$(date +%Y%m%d)git.tar xaw3d-$(date +%Y%m%d)git -xz -9 xaw3d-$(date +%Y%m%d)git.tar - diff --git a/source/x/xaw3d/slack-desc b/source/x/xaw3d/slack-desc deleted file mode 100644 index 75ce0e1d..00000000 --- a/source/x/xaw3d/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xaw3d: xaw3d (3D version of libXaw) -xaw3d: -xaw3d: Xaw3d is a set of 3D widgets by Kaleb S. Keithley based on the Athena -xaw3d: Widget set. The Three-D Athena may be used as a replacement for the -xaw3d: Athena (Xaw) Widget set -- you may relink almost any Athena Widget -xaw3d: based application and obtain a three dimensional appearance on some of -xaw3d: the widgets. You can also replace your shared libXaw with libXaw3d -xaw3d: and obtain the three dimensional appearance without even relinking. -xaw3d: -xaw3d: -xaw3d: diff --git a/source/x/xaw3d/xaw3d.SlackBuild b/source/x/xaw3d/xaw3d.SlackBuild deleted file mode 100755 index 1574d7f3..00000000 --- a/source/x/xaw3d/xaw3d.SlackBuild +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh - -# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=xaw3d -VERSION=${VERSION:-20110415git} -BUILD=${BUILD:-1} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -fi - -NUMJOBS=${NUMJOBS:-" -j7 "} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-xaw3d -rm -rf $PKG -mkdir -p $TMP $PKG - -cd $TMP -rm -rf $TMP/xaw3d-$VERSION -tar xvf $CWD/xaw3d-$VERSION.tar.?z* || exit 1 -cd xaw3d-$VERSION/xc || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -cd lib/Xaw3d -ln -s .. X11 -xmkmf -make CCOPTIONS="$SLKCFLAGS -I." || exit 1 -make install DESTDIR=$PKG - -strip --strip-unneeded $PKG/usr/lib${LIBDIRSUFFIX}/libXaw3d.so.* -# Make compat symlinks. For whatever reason, Xaw3d has had more random -# numbers assigned to it over the years than about anything, so we need -# to make links that work for at least .6 and .8 in addition to .7. -( cd $PKG/usr/lib${LIBDIRSUFFIX} - ln -sf libXaw3d.so.7 libXaw3d.so.8 - ln -sf libXaw3d.so.7 libXaw3d.so.6 -) -mkdir -p $PKG/usr/doc/Xaw3d-$VERSION -cp -a README.XAW3D $PKG/usr/doc/Xaw3d-$VERSION -chmod 644 $PKG/usr/doc/Xaw3d-$VERSION/README.XAW3D - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c y $TMP/xaw3d-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild index d3b96542..0b5b65dc 100755 --- a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild +++ b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=xdg-user-dirs -VERSION=${VERSION:-0.13} +VERSION=${VERSION:-0.14} BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then @@ -89,6 +89,14 @@ cp -a \ AUTHORS COPYING* INSTALL NEWS README* TODO \ $PKG/usr/doc/$PKGNAM-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/x/xterm/doinst.sh b/source/x/xterm/doinst.sh new file mode 100644 index 00000000..1f8ff67d --- /dev/null +++ b/source/x/xterm/doinst.sh @@ -0,0 +1,10 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild index 863ccae4..392d3053 100755 --- a/source/x/xterm/xterm.SlackBuild +++ b/source/x/xterm/xterm.SlackBuild @@ -88,12 +88,19 @@ CFLAGS="$SLKCFLAGS" \ --enable-wide-chars \ --enable-88-color \ --enable-256-color \ + --with-icon-theme=hicolor \ + --with-icondir=/usr/share/icons \ + --with-pixmapdir=/usr/share/pixmaps \ --build=$ARCH-slackware-linux # Build and install: make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Not sure why "make install" doesn't do this: +mkdir -p $PKG/usr/share/applications +cp xterm.desktop uxterm.desktop $PKG/usr/share/applications + # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -129,6 +136,7 @@ cp -a \ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xap/MPlayer/MPlayer.SlackBuild b/source/xap/MPlayer/MPlayer.SlackBuild index 17b8b036..663fe2f8 100755 --- a/source/xap/MPlayer/MPlayer.SlackBuild +++ b/source/xap/MPlayer/MPlayer.SlackBuild @@ -1,7 +1,6 @@ #!/bin/sh - -# Copyright 2006, 2007, 2008, 2009 Eric Hameleers, Eindhoven, NL -# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# $Id: MPlayer.SlackBuild,v 1.27 2012/07/01 13:07:08 root Exp root $ +# Copyright 2006, 2007, 2008, 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -29,31 +28,106 @@ # For: MPlayer # Descr: a movie player for LINUX # URL: http://www.mplayerhq.hu/ +# Needs: +# Changelog: +# 1.0rc1-1: 05/Nov/2006 by Eric Hameleers +# * Initial build. +# 1.0rc1-2: 07/Nov/2006 by Eric Hameleers +# * Removed MPlayer's internal libdvdcss code from the build, so +# that MPlayer no longer plays encrypted DVD's by default (and the +# package is now safe to upload to public repositories). +# If it is allowed in your country, you can either install +# libdvdcss (which is picked up automatically by MPlayer), or +# rebuild MPlayer yourself using this SlackBuild - and set the +# variable REMOVECSS="no" first (see further down). +# Use this commandline if you can't or won't modify the script: +# REMOVECSS="no" ./MPlayer.SlackBuild +# 1.0rc1-3: 08/Nov/2006 by Eric Hameleers +# * Install the mplayer.conf into correct location '/etc/mplayer/' +# 1.0rc1-4: 15/mar/2007 by Eric Hameleers +# * Differentiate between versions of X11 (modular X has another +# install-prefix); update default skin; enable mplayer menu; +# add security fix +# 1.0rc1-5: 07/jun/2007 by Eric Hameleers +# * Add security fix. +# 1.0rc2-1: 09/oct/2007 by Eric Hameleers +# * New version. +# 1.0rc2-2: 01/feb/2008 by Eric Hameleers +# * Apply 4 security fixes. +# 1.0rc2-3: 10/mar/2008 by Eric Hameleers +# * Apply a patch that allows compilation against the ivtv driver +# in the 2.6.24.x kernels. +# r28148-1: 14/dec/2008 by Eric Hameleers +# * Build SVN snapshot - remove support for *all* patented or +# questionable software if "USE_PATENTS" is set to "NO" - think +# of DECSS dvd decryption code, and mp3/aac/amr audio encoders. +# r28929-1: 10/mar/2009 by Eric Hameleers +# * Update. +# r29301-1: 12/may/2009 by Eric Hameleers +# * Update. +# r29301-1: 12/may/2009 by Eric Hameleers +# * Update. +# 20100926-1: 26/sep/2010 by Eric Hameleers +# * Slackware has MPlayer now of course, but it does not hurt +# to have a full-featured binary package available. The 1.0rc3 +# was released recently but I prefer to build a snapshot. +# 20110624-1: 24/jun/2011 by Eric Hameleers +# * Provide an up-to-date snapshot to be used in conjunction +# with UMPlayer (a MPlayer GUI). New MPlayer source requires +# a separate ffmpeg download. +# 20120514-1: 14/may/2012 by volkerdi@slackware.com +# * Update. +# 1.1_20120701-1: 28/jun/2012 by alien@slackware.com +# * Update to the 1.1 branch (essentially this is MPlayer-1.1 but +# I like to check it out of SVN). +# +# Run 'sh MPlayer.SlackBuild' to build a Slackware package. +# The package (.txz) plus descriptive .txt file are created in /tmp . +# Install using 'installpkg'. +# # ----------------------------------------------------------------------------- +# Set initial variables: + PRGNAM=MPlayer -VERSION=${VERSION:-20101218} -BUILD=${BUILD:-1} +VERSION=${VERSION:-20120701} +BRANCH=${BRANCH:-1.1} # leave empty if you want to build MPlayer trunk +FFMPEG=${FFMPEG:-20120514} +BUILD=${BUILD:-2} TAG=${TAG:-} -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac +# Show the branch version in the package name if we build from a branch: +[ -n "$BRANCH" ] && PKGVERSION=${BRANCH}_${VERSION} || PKGVERSION=${VERSION} + +DOCS="AUTHORS Changelog Copyright LICENSE README VERSION DOCS/HTML DOCS/tech" + +# MPlayer repository characteristics: +MPURI="svn://svn.mplayerhq.hu/mplayer/" +if [ -n "$BRANCH" ]; then + MPBRANCH="branches/$BRANCH" +else + MPBRANCH="trunk" fi -DOCS="AUTHORS Changelog Copyright LICENSE README DOCS/HTML DOCS/tech" +FFURI=git://git.videolan.org/ffmpeg.git DEFSKIN=${DEFSKIN:-"Blue"} # Download more skins at the following url: -SKINVER=${SKINVER:-"1.7"} # http://www.mplayerhq.hu/design7/dload.html +SKINVER=${SKINVER:-"1.8"} # http://www.mplayerhq.hu/design7/dload.html -# Available languages: all bg cs de dk el en es fr hu it ja -# ko mk nb nl pl ro ru sk sv tr uk pt_BR zh_CN zh_TW -LANGUAGES="en nl fr de es" # The default is to just add "en" documentation +# Available languages: all cs de en es fr hu it pl ru zh_CN +LANGUAGES="en,de,es,fr" + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" @@ -69,7 +143,8 @@ else EXTRACONFIGUREOPTIONS="" fi -CODECSDIR=/usr/lib${LIBDIRSUFFIX}/codecs # Where the WIN32 codecs are expected for instance +# Where the WIN32 codecs are expectedfor instance +CODECSDIR=/usr/lib${LIBDIRSUFFIX}/codecs # --------------------------------------------------------------------------- # -- PATENT ALERT! -- @@ -79,7 +154,12 @@ CODECSDIR=/usr/lib${LIBDIRSUFFIX}/codecs # Where the WIN32 codecs are expected # (needed for FLV and .3GP videos) but these libraries are 'contaminated' # with patents from Fraunhofer and GGP. # Also, the AAC encoder has patent issues. -# The Slackware package is built with "USE_PATENTS=NO" i.e. without using +# You can build these patended algorithms into ffmpeg, and if you are an +# ordinary end user, no one will bother you for using them. +# For the binaries based on this SlackBuild that I distribute, it is a +# different story. I am not allowed to distribute binary packages that +# incorporate patented code. So here you go. My Slackware package was +# built with "USE_PATENTS=NO" i.e. without using # the lame mp3, faac, AMR and dvdcss libraries. # This also means that this creates a version of MPlayer that is unable # to play encrypted DVD's (which is most DVD's on the market). If it is @@ -87,11 +167,6 @@ CODECSDIR=/usr/lib${LIBDIRSUFFIX}/codecs # Where the WIN32 codecs are expected # Install a libdvdcss package and it will be picked up automatically by # MPlayer's internal libdvdread library, so that MPlayer will again be able # to play encrypted DVD's. -# -# If you have licenses to use the code, and/or the patents do not apply in -# your region, and you take all legal responsibility, you may wish to build -# MPlayer with the option USE_PATENTS=YES which will include potentially -# patent-encumbered code. # --------------------------------------------------------------------------- USE_PATENTS=${USE_PATENTS:-"NO"} @@ -120,6 +195,10 @@ SRCURL[0]="" SOURCE[1]="$SRCDIR/${DEFSKIN}-${SKINVER}.tar.bz2" SRCURL[1]="http://www.mplayerhq.hu/MPlayer/skins/${DEFSKIN}-${SKINVER}.tar.bz2" +# Ffmpeg needs to be checked out separately now: +SOURCE[2]="$SRCDIR/ffmpeg-${FFMPEG}.tar.xz" +SRCURL[2]="" + # Use the src_checkout() function if no downloadable tarball exists. # This function checks out sources from SVN/CVS and creates a tarball of them. src_checkout() { @@ -137,13 +216,13 @@ src_checkout() { case ${1} in 0) # mplayer if [ "$(echo ${VERSION}|cut -c1)" == 'r' ]; then # revision instead of date - REV=$(echo ${VERSION} | cut -c2-) + echo "Only supported VERSION is a date - yyyymmdd - or 'HEAD'" else REV="{${VERSION}}" fi mkdir MPlayer-${VERSION} \ && cd MPlayer-${VERSION} \ - && svn checkout --revision $REV svn://svn.mplayerhq.hu/mplayer/trunk . \ + && svn checkout --revision $REV ${MPURI}/${MPBRANCH} . \ && svn propget svn:externals | sed -e 's/[[:space:]].*$//g' | xargs svn up --revision $REV \ && find . -type d -name '.svn' -depth | xargs rm -rf \ && ([ "$USE_PATENTS" != "YES" ] && rm -rf libdvdcss || true) \ @@ -152,6 +231,28 @@ src_checkout() { && tar -${TARCOMP}cf ${2} MPlayer-${VERSION} rm -rf MPlayer-${VERSION} ;; + 2) # ffmpeg-${FFMPEG} + mkdir ffmpeg_temp_checkout_$$ \ + && cd ffmpeg_temp_checkout_$$ + if [ "$FFMPEG" = "HEAD" ]; then + # Checkout without downloading version history (fast!): + echo "Checking out HEAD from '$FFURI':" + git clone --depth=1 ${FFURI} ffmpeg + else + # Checkout code from a certain branch and/or date; this will take a + # long time because we have to clone the complete git-repository first: + echo "Checking out branch 'master' at date $FFMPEG from '$FFURI':" + git clone ${FFURI} ffmpeg \ + && cd ffmpeg \ + && git checkout master \ + && git checkout $(git rev-list -n 1 --before="`date -d $FFMPEG`" master) \ + && cd .. + fi + chown -R root:root . \ + && tar --exclude .git -${TARCOMP}cf ${2} ffmpeg + cd .. + rm -rf ffmpeg_temp_checkout_$$ + ;; *) # Do nothing ;; esac @@ -221,32 +322,36 @@ echo "++" if [ "$USE_PATENTS" != "YES" ]; then cat <<"EOT" ** -** Removing internal DeCSS library. +** Removing internal DECSS library. ** If you want to play encrypted DVD's you need to install libdvdcss separately. -** You take full legal responsibility for any use of DeCSS. We neither supply -** DeCSS code nor endorse any illegal use of it. ** -** If you are unaffected by patent concerns because you hold the required -** licenses and permission to use the patented code, or reside in a -** location where this is not a concern, and wish to include the patented -** and restricted code (you take all legal responsibility for doing so), -** then edit this SlackBuild script and change the line: +** If you do not want to remove libdvdcss, then +** edit this SlackBuild script and change the line: ** USE_PATENTS=${USE_PATENTS:-"NO"} ** to: ** USE_PATENTS="YES" ** EOT - sleep 5 + sleep 2 fi cd $TMP/tmp-$PRGNAM echo "Extracting the source archive(s) for $PRGNAM..." tar -xvf ${SOURCE[0]} -[ "$USE_PATENTS" != "YES" ] && rm -rf libdvdcss +# Extract the ffmpeg source inside the MPlayer directory: +( cd ${PRGNAM}-${VERSION} && tar -xvf ${SOURCE[2]} ) + chown -R root:root * -chmod -R u+w,go+r-w,a-s * +chmod -R u+w,go+r-w,a+X-s * cd ${PRGNAM}-${VERSION} +# Prevent a compilation error: +# "libm.h:54:74: error: expected identifier or '(' before 'sizeof'" +# See also: +# http://lists.mplayerhq.hu/pipermail/mplayer-users/2012-June/084871.html +cat $SRCDIR/MPlayer_ffmpeg.patch | patch -p0 --verbose \ + 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log + # Determine what X we're running (the modular X returns the prefix # in the next command, while older versions stay silent): XPREF=$(pkg-config --variable=prefix x11) || true @@ -256,7 +361,6 @@ XPREF=$(pkg-config --variable=prefix x11) || true if [ "$USE_PATENTS" != "YES" ]; then DO_PATENTED="--disable-libdvdcss-internal \ --disable-mp3lame --disable-mp3lame-lavc \ - --disable-faac --disable-faac-lavc \ --disable-libopencore_amrnb \ --disable-libopencore_amrwb" else @@ -265,30 +369,37 @@ fi echo Building ... # MPlayer wants to automatically determine compiler flags, -# so we don't provide CFLAGS: -./configure --prefix=/usr \ - --mandir=/usr/man \ - --confdir=/etc/mplayer \ - --enable-gui \ - --enable-menu \ - --enable-largefiles \ - --disable-arts \ - --codecsdir=${CODECSDIR} \ - --language="${LANGUAGES}" \ - ${EXTRACONFIGUREOPTIONS} \ - ${DO_PATENTED} \ - 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log +# so we don't provide CFLAGS. +./configure \ + --prefix=/usr \ + --mandir=/usr/man \ + --confdir=/etc/mplayer \ + --enable-gui \ + --enable-menu \ + --disable-arts \ + --disable-bitmap-font \ + --codecsdir=${CODECSDIR} \ + --language="${LANGUAGES}" \ + ${EXTRACONFIGUREOPTIONS} \ + ${DO_PATENTED} \ + 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log # So that MPlayer does not report "UNKNOWN" as it's version: -echo $VERSION > VERSION +if [ ! -f VERSION ]; then + echo $VERSION > VERSION +fi make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log # Build the html documentation (not all languages are available): -( cd DOCS/xml +if [ "$LANGUAGES" = "all" ]; then + # make html-chunked + make html-single +else for i in $(echo $LANGUAGES | tr , ' ') ; do - [ -d $i ] && make html-single-$i ; + # make html-chunked-$i ; + make html-single-$i ; done -) +fi # Prepare the configfile: mkdir -p $PKG/etc/mplayer @@ -298,12 +409,12 @@ cp etc/example.conf $PKG/etc/mplayer/mplayer.conf.new cd $PKG/usr/share/mplayer/skins tar -xvf ${SOURCE[1]} chown -R root:root * -chmod -R u+w,go+r-w,a-s * +chmod -R u+w,go+r-w,a+X-s * ln -s ${DEFSKIN} default cd - # Add this to the doinst.sh: -! [ -d $PKG/install ] && mkdir -p $PKG/install +mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Handle the incoming configuration files: config() { @@ -338,32 +449,39 @@ fi # Prepare the new configuration file config etc/mplayer/mplayer.conf.new -if [ -x /usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database -q usr/share/applications +# Update the desktop database: +if [ -x usr/bin/update-desktop-database ]; then + chroot . /usr/bin/update-desktop-database usr/share/applications 1> /dev/null 2> /dev/null fi +# Update hicolor theme cache: if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then if [ -x usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + chroot . /usr/bin/gtk-update-icon-cache /usr/share/icons/hicolor >/dev/null 2>&1 fi fi +# Update the mime database: +if [ -x usr/bin/update-mime-database ]; then + chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + EOINS # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true -cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -#mv $PKG/usr/doc/$PRGNAM-$VERSION/HTML-single $PKG/usr/doc/$PRGNAM-$VERSION/html +mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$PKGVERSION || true +cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$PKGVERSION/$PRGNAM.SlackBuild +mv $PKG/usr/doc/$PRGNAM-$PKGVERSION/HTML $PKG/usr/doc/$PRGNAM-$PKGVERSION/html # Save a sample of all configuration files: for i in etc/*.conf ; do - cp $i $PKG/usr/doc/$PRGNAM-$VERSION/$(basename $i)-sample + cp $i $PKG/usr/doc/$PRGNAM-$PKGVERSION/$(basename $i)-sample done # Save a transcript of all configured options for this specific build: if [ -n $OUTPUT/configure-${PRGNAM}.log ]; then cat $OUTPUT/configure-${PRGNAM}.log \ | sed -n "/^Config files successfully generated/,/^'config.h' and 'config.mak' contain your configuration options./p" \ - > $PKG/usr/doc/$PRGNAM-$VERSION/${PRGNAM}.configuration + > $PKG/usr/doc/$PRGNAM-$PKGVERSION/${PRGNAM}.configuration fi find $PKG/usr/doc -type f -exec chmod 644 {} \; @@ -386,11 +504,11 @@ fi # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz.md5 +md5sum ${PRGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txz.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt +cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txt # Warn about libdvdcss requirement (again): if [ "$USE_PATENTS" != "YES" ]; then @@ -398,14 +516,10 @@ if [ "$USE_PATENTS" != "YES" ]; then ** ** Internal DECSS library was not built. ** If you want to play encrypted DVD's you need to install libdvdcss separately. -** You take full legal responsibility for any use of DeCSS. We neither supply -** DeCSS code nor endorse any illegal use of it. ** -** If you are unaffected by patent concerns because you hold the required -** licenses and permission to use the patented code, or reside in a -** location where this is not a concern, and wish to include the patented -** and restricted code (you take all legal responsibility for doing so), -** then edit this SlackBuild script and change the line: +** If you do not care about patent issues, +** and want to keep support for internal libdvdcss, then +** edit this SlackBuild script and change the line: ** USE_PATENTS=${USE_PATENTS:-"NO"} ** to: ** USE_PATENTS="YES" diff --git a/source/xap/MPlayer/slack-desc b/source/xap/MPlayer/slack-desc index a73feb27..71686a3c 100644 --- a/source/xap/MPlayer/slack-desc +++ b/source/xap/MPlayer/slack-desc @@ -6,14 +6,15 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -MPlayer: MPlayer (media player) -MPlayer: -MPlayer: MPlayer is a movie player. It plays most MPEG/VOB, AVI, Ogg/OGM, -MPlayer: VIVO, ASF/WMA/WMV, QT/MOV/MP4, RealMedia, Matroska, NUT, NuppelVideo, -MPlayer: FLI, YUV4MPEG, FILM, RoQ, PVA files, supported by many native, XAnim, -MPlayer: and Win32 DLL codecs. You can watch VideoCD, SVCD, DVD, 3ivx, -MPlayer: DivX 3/4/5, WMV and even H.264 movies. -MPlayer: -MPlayer: Homepage for MPlayer is http://www.mplayerhq.hu/ +MPlayer: MPlayer (MPEG-4 digital video technology) MPlayer: +MPlayer: MPlayer is a movie player for LINUX. It plays most MPEG, VOB, AVI, +MPlayer: Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, +MPlayer: YUV4MPEG, FILM, RoQ, PVA files, supported by many native, XAnim, +MPlayer: and Win32 DLL codecs. You can watch VideoCD, SVCD, DVD, 3ivx, +MPlayer: DivX 3/4/5 and even WMV movies, too (without the avifile library). +MPlayer: MPlayer supports 10 types of subtitles formats: VobSub, +MPlayer: MicroDVD, SubRip, SubViewer, Sami, VPlayer, RT, SSA, AQTitle, MPsub. MPlayer: +MPlayer: Homepage for MPLayer is http://www.mplayerhq.hu/ + diff --git a/source/xap/audacious-plugins/audacious-plugins.SlackBuild b/source/xap/audacious-plugins/audacious-plugins.SlackBuild index 50274f1f..20139dff 100755 --- a/source/xap/audacious-plugins/audacious-plugins.SlackBuild +++ b/source/xap/audacious-plugins/audacious-plugins.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -66,8 +66,6 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 cd ${PKGNAM}-$VERSION || exit 1 -zcat $CWD/audacious-plugins.alsa.noise.is.not.helpful.diff.gz | patch -p1 --verbose || exit 1 - # Make sure ownerships and permissions are sane: chown -R root:root . find . \ @@ -84,9 +82,7 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --mandir=/usr/man \ - --enable-chardet \ --enable-amidiplug \ - --disable-altivec \ --program-prefix= \ --program-suffix= \ ${ARCHOPTS} \ @@ -129,6 +125,14 @@ cp -a \ AUTHORS COPYING INSTALL Mercurial-Access README* \ $PKG/usr/doc/${PKGNAM}-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/xap/audacious-plugins/audacious-plugins.alsa.noise.is.not.helpful.diff b/source/xap/audacious-plugins/audacious-plugins.alsa.noise.is.not.helpful.diff deleted file mode 100644 index e904ab8d..00000000 --- a/source/xap/audacious-plugins/audacious-plugins.alsa.noise.is.not.helpful.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- ./src/alsa/alsa.c.orig 2011-02-22 11:29:46.000000000 -0600 -+++ ./src/alsa/alsa.c 2011-03-11 15:02:53.340999637 -0600 -@@ -207,10 +207,20 @@ - static gboolean warned = FALSE; - if (! warned) - { -- fprintf (stderr, "\n** WARNING **\nAudacious has detected that " -+ /* fprintf (stderr, "\n** WARNING **\nAudacious has detected that " - "your ALSA device has a broken timer. A workaround\nis being " - "used to prevent CPU overload. Please report this problem to " -- "your\nLinux distributor or to the ALSA developers.\n\n"); -+ "your\nLinux distributor or to the ALSA developers.\n\n"); */ -+ /* ^^^ COMMENTED OUT ^^^ */ -+ -+ /* I'm glad there is a workaround for this, and the reports -+ are that it works, so spamming the console about it seems -+ a little bit extreme. It's not an issue to be solved here -+ by Slackware, and I would be surprised if the ALSA -+ developers did not know by now, given this warning. -+ FWIW, this seems a strange method of communicating with the -+ ALSA developers. Did they report the bug to them? */ -+ - warned = TRUE; - } - diff --git a/source/xap/audacious/audacious.SlackBuild b/source/xap/audacious/audacious.SlackBuild index 4a651490..66bb0f90 100755 --- a/source/xap/audacious/audacious.SlackBuild +++ b/source/xap/audacious/audacious.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=audacious VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -87,22 +87,22 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --mandir=/usr/man \ --docdir=/usr/doc/${PKGNAM}-$VERSION \ - --disable-altivec \ --program-prefix= \ --program-suffix= \ ${ARCHOPTS} \ - --build=$ARCH-slackware-linux + --with-buildstamp=$ARCH-slackware-linux \ + --build=$ARCH-slackware-linux || exit 1 # Build and install: make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 # Fix broken symlinks pointing into the build directory -( cd $PKG/usr/bin - rm -f audacious audtool - ln -s audacious2 audacious - ln -s audtool2 audtool -) +#( cd $PKG/usr/bin +# rm -f audacious audtool +# ln -s audacious2 audacious +# ln -s audtool2 audtool +#) # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" \ @@ -137,6 +137,14 @@ cp -a \ AUTHORS COPYING INSTALL Mercurial-Access NEWS README doc/* \ $PKG/usr/doc/${PKGNAM}-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/xap/blackbox/blackbox.SlackBuild b/source/xap/blackbox/blackbox.SlackBuild index af000496..c7051217 100755 --- a/source/xap/blackbox/blackbox.SlackBuild +++ b/source/xap/blackbox/blackbox.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,9 +26,8 @@ PKGNAM=blackbox VERSION=${VERSION:-0.70.1} BBKEYSVER=${BBKEYSVER:-0.9.1} -BUILD=${BUILD:-4} +BUILD=${BUILD:-7} NUMJOBS=${NUMJOBS:-" -j7 "} -PKGEXT=${PKGEXT:-txz} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -85,6 +84,9 @@ find . \ # Build fix for gcc-4: zcat $CWD/blackbox-0.70.1-gcc-4.3.patch.gz | patch --verbose -p1 || exit 1 +# Build fix for libX11-1.5+ +zcat $CWD/textpropertytostring-unconditional.diff.gz | patch --verbose -p1 || exit 1 + # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -112,6 +114,8 @@ make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/etc/X11/xinit zcat $CWD/xinitrc.blackbox.gz > $PKG/etc/X11/xinit/xinitrc.blackbox chmod 755 $PKG/etc/X11/xinit/xinitrc.blackbox +zcat $CWD/startblackbox.gz > $PKG/usr/bin/startblackbox +chmod 755 $PKG/usr/bin/startblackbox # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION @@ -194,4 +198,4 @@ mkdir -p $PKG/install install -vpm644 $CWD/slack-desc $PKG/install/ cd $PKG -/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.$PKGEXT +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xap/blackbox/startblackbox b/source/xap/blackbox/startblackbox new file mode 100644 index 00000000..e72bbd3f --- /dev/null +++ b/source/xap/blackbox/startblackbox @@ -0,0 +1,23 @@ +#!/bin/sh +# startblackbox v1.0 + +######################################################################## +## Start DBUS session bus ## +######################################################################## + + +if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then + eval `dbus-launch --sh-syntax --exit-with-session` +fi + + +######################################################################## +## Start blackbox Window Manager ## +######################################################################## + + +exec /usr/bin/blackbox + + +######################################################################## + diff --git a/source/xap/blackbox/textpropertytostring-unconditional.diff b/source/xap/blackbox/textpropertytostring-unconditional.diff new file mode 100644 index 00000000..ed320388 --- /dev/null +++ b/source/xap/blackbox/textpropertytostring-unconditional.diff @@ -0,0 +1,28 @@ +Description: Declare bt::textPropertyToString unconditionally. +Author: Jakub Wilk +Forwarded: no +Bug-Debian: http://bugs.debian.org/614468 +Last-Update: 2011-03-12 + +--- a/lib/Util.hh ++++ b/lib/Util.hh +@@ -25,6 +25,8 @@ + #ifndef __Util_hh + #define __Util_hh + ++#include ++ + #include + #include + +@@ -94,10 +96,8 @@ + + std::string tolower(const std::string &string); + +-#ifdef _XUTIL_H_ + std::string textPropertyToString(::Display *display, + ::XTextProperty& text_prop); +-#endif + + } // namespace bt + diff --git a/source/xap/blackbox/xinitrc.blackbox b/source/xap/blackbox/xinitrc.blackbox index 58bd9259..d6ddca3e 100644 --- a/source/xap/blackbox/xinitrc.blackbox +++ b/source/xap/blackbox/xinitrc.blackbox @@ -26,7 +26,7 @@ fi # Start the window manager: if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then - exec ck-launch-session /usr/bin/blackbox + exec ck-launch-session /usr/bin/startblackbox else - exec /usr/bin/blackbox + exec /usr/bin/startblackbox fi diff --git a/source/xap/blueman/blueman.SlackBuild b/source/xap/blueman/blueman.SlackBuild index 737dae98..f47aabb6 100755 --- a/source/xap/blueman/blueman.SlackBuild +++ b/source/xap/blueman/blueman.SlackBuild @@ -25,7 +25,7 @@ PKGNAM=blueman VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xap/fluxbox/fluxbox.SlackBuild b/source/xap/fluxbox/fluxbox.SlackBuild index 2be30410..52864abb 100755 --- a/source/xap/fluxbox/fluxbox.SlackBuild +++ b/source/xap/fluxbox/fluxbox.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=fluxbox VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -59,6 +59,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP +rm -rf fluxbox-$VERSION tar xvf $CWD/fluxbox-$VERSION.tar.?z* || exit 1 cd fluxbox-$VERSION || exit 1 chown -R root:root . @@ -68,6 +69,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Make sure that dbus-launch is started for the session: +zcat $CWD/fluxbox.startfluxbox.dbus.diff.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -87,7 +91,20 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -gzip -9 $PKG/usr/man/man?/* +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/etc/X11/xinit zcat $CWD/xinitrc.fluxbox.gz > $PKG/etc/X11/xinit/xinitrc.fluxbox diff --git a/source/xap/fluxbox/fluxbox.startfluxbox.dbus.diff b/source/xap/fluxbox/fluxbox.startfluxbox.dbus.diff new file mode 100644 index 00000000..71bea31d --- /dev/null +++ b/source/xap/fluxbox/fluxbox.startfluxbox.dbus.diff @@ -0,0 +1,14 @@ +--- ./util/startfluxbox.in.orig 2011-10-29 08:46:15.000000000 -0500 ++++ ./util/startfluxbox.in 2012-08-08 23:35:10.841041336 -0500 +@@ -50,6 +50,11 @@ + # wmsmixer -w & + # idesk & + ++# Start DBUS session bus: ++if [ -z "\$DBUS_SESSION_BUS_ADDRESS" ]; then ++ eval \$(dbus-launch --sh-syntax --exit-with-session) ++fi ++ + # And last but not least we start fluxbox. + # Because it is the last app you have to run it with ''exec'' before it. + diff --git a/source/xap/fluxbox/xinitrc.fluxbox b/source/xap/fluxbox/xinitrc.fluxbox index 62e425b3..fd08cbc2 100644 --- a/source/xap/fluxbox/xinitrc.fluxbox +++ b/source/xap/fluxbox/xinitrc.fluxbox @@ -30,3 +30,4 @@ if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then else exec /usr/bin/startfluxbox fi + diff --git a/source/xap/fvwm/doinst.sh b/source/xap/fvwm/doinst.sh index 57a23d6f..087da9e3 100644 --- a/source/xap/fvwm/doinst.sh +++ b/source/xap/fvwm/doinst.sh @@ -10,4 +10,5 @@ config() { fi # Otherwise, we leave the .new copy for the admin to consider... } -config etc/X11/fvwm2/system.fvwm2rc.new +# Might need this later +#config etc/X11/fvwm2/system.fvwm2rc.new diff --git a/source/xap/fvwm/fvwm.SlackBuild b/source/xap/fvwm/fvwm.SlackBuild index 7906a473..b04223c7 100755 --- a/source/xap/fvwm/fvwm.SlackBuild +++ b/source/xap/fvwm/fvwm.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,8 @@ PKGNAM=fvwm -VERSION=${VERSION:-2.4.20} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -37,6 +35,8 @@ if [ -z "$ARCH" ]; then esac fi +NUMJOBS=${NUMJOBS:-" -j7 "} + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -46,20 +46,22 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-${PKGNAM} +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG -cd $TMP -rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 -cd ${PKGNAM}-$VERSION || exit 1 -# Make sure ownerships and permissions are sane: +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -67,36 +69,37 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --sysconfdir=/etc/X11/fvwm2 \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ --mandir=/usr/man \ - --enable-multibyte \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-bidi \ --program-prefix= \ --program-suffix= \ - --enable-extras \ --build=$ARCH-slackware-linux -# Build and install: make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# Add some ancient icons: +# Add some ancient icons. The fvwm95 sample config still uses these. ( cd $PKG ; tar xzf $CWD/ancient-icons.tar.gz ) +# This script is called from the xinitrc: +zcat $CWD/startfvwm2.gz > $PKG/usr/bin/startfvwm2 +chmod 755 $PKG/usr/bin/startfvwm2 + +# This stuff appears to be misplaced junk: +rm -rf $PKG/usr/share/doc + # Add a few more things: mkdir -p $PKG/etc/X11/xinit zcat $CWD/xinitrc.fvwm2.gz > $PKG/etc/X11/xinit/xinitrc.fvwm2 chmod 755 $PKG/etc/X11/xinit/xinitrc.fvwm2 -mkdir -p $PKG/etc/X11/fvwm2 -zcat $CWD/system.fvwm2rc.gz > $PKG/etc/X11/fvwm2/system.fvwm2rc.new -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/X11 -( cd $PKG/usr/lib${LIBDIRSUFFIX}/X11 && rm -rf fvwm2 ) -( cd $PKG/usr/lib${LIBDIRSUFFIX}/X11 && ln -sf ../../../etc/X11/fvwm2 fvwm2 ) +#zcat $CWD/system.fvwm2rc.gz > $PKG/etc/system.fvwm2rc.new -# Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -109,27 +112,30 @@ if [ -d $PKG/usr/man ]; then ln -s $( readlink $eachpage ).gz $eachpage.gz rm $eachpage done - gzip -9 *.* + gzip -9 *.? ) done ) fi -# Add a documentation directory: -mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +# Install some documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING INSTALL INSTALL.fvwm NEWS README \ - $PKG/usr/doc/${PKGNAM}-$VERSION -( cd docs - cp -a \ - ANNOUNCE BUGS DEVELOPERS FAQ TODO color_combos error_codes fvwm.lsm m4_hacks \ - $PKG/usr/doc/${PKGNAM}-$VERSION -) + AUTHORS COPYING* NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xap/fvwm/fvwm.colormap.diff b/source/xap/fvwm/fvwm.colormap.diff deleted file mode 100644 index 2d2eac94..00000000 --- a/source/xap/fvwm/fvwm.colormap.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- ./fvwm/colormaps.c.orig Mon Sep 13 14:10:25 1999 -+++ ./fvwm/colormaps.c Mon Sep 13 14:12:03 1999 -@@ -90,10 +90,13 @@ - /* Reinstall the colormap that we think should be installed, - * UNLESS and unrecognized window has the focus - it might be - * an override-redirect window that has its own colormap. */ -- if((ReInstall)&&(Scr.UnknownWinFocused == None)) -- { -- XInstallColormap(dpy,last_cmap); -- } -+ /* Commented out, since although this behavior is an X standard, it breaks -+ * xlockmore and some other nifty programs, and having it this way doesn't -+ * cause any problems that I'm aware of. */ -+ /* if((ReInstall)&&(Scr.UnknownWinFocused == None)) */ -+ /* { */ -+ /* XInstallColormap(dpy,last_cmap); */ -+ /* } */ - } - - /************************************************************************ diff --git a/source/xap/fvwm/slack-desc b/source/xap/fvwm/slack-desc index 77995d92..2d2a9ef5 100644 --- a/source/xap/fvwm/slack-desc +++ b/source/xap/fvwm/slack-desc @@ -13,7 +13,7 @@ fvwm: X11. It is a derivative of twm, redesigned to minimize memory fvwm: consumption, provide a 3-D look to window frames, and provide a simple fvwm: virtual desktop. fvwm: -fvwm: +fvwm: Homepage: http://www.fvwm.org fvwm: fvwm: fvwm: diff --git a/source/xap/fvwm/startfvwm2 b/source/xap/fvwm/startfvwm2 new file mode 100644 index 00000000..b9d001d1 --- /dev/null +++ b/source/xap/fvwm/startfvwm2 @@ -0,0 +1,23 @@ +#!/bin/sh +# startfvwm2 v1.0 + +######################################################################## +## Start DBUS session bus ## +######################################################################## + + +if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then + eval $(dbus-launch --sh-syntax --exit-with-session) +fi + + +######################################################################## +## Start fvwm2 Window Manager ## +######################################################################## + + +exec /usr/bin/fvwm2 + + +######################################################################## + diff --git a/source/xap/fvwm/system.fvwm2rc b/source/xap/fvwm/system.fvwm2rc deleted file mode 100644 index 863643a4..00000000 --- a/source/xap/fvwm/system.fvwm2rc +++ /dev/null @@ -1,822 +0,0 @@ -# -# Default system.fvwm2rc for Slackware Linux, adapted from the version -# for fvwm95 (i.e. beware of non-functional commented-out options) -# - -#========================================================================# - -# -# Fonts - one for window titles, another for icons, and another for the menus -# -WindowFont -adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-*-* -IconFont fixed -MenuStyle black grey76 grey30 -adobe-helvetica-medium-r-*-*-*-120-*-*-*-*-*-* fvwm - -# -# Set the default window colors. The syntax is: -# DefaultColors winforecolor winbackcolor titleforecolor titlebackcolor -# where: -# winbackcolor is the background (border) color of all windows, -# including the menu windows -# winforecolor is used for the menu text -# titlebackcolor is the background color used for title bars of -# non selected windows -# titleforecolor is the color of the title text of non selected windows -# -#DefaultColors Black #c3c3c3 #c3c3c3 grey51 - -# -# Text and background color for the title bar of the active (selected) window -# -#HilightColors White #000080 - -# -# Text and background color for the title bar of sticky windows -# -#StickyColors grey51 #60c080 - -# You can also use the Style command to set the colors of individual -# title bars of some non-selected windows - -#Style "*" ForeColor #c3c3c3 -#Style "*" BackColor grey51 - -#========================================================================# - -# -# Set up the major operating modes -# - -# Let's comment this out and be more UNIX-like :^) -# Style "*" ClickToFocus -# If we use the FvwmTaskBar we don't need the icons :-) -# Style "..." Icon is also commented below. -Style "*" NoIcon -Style "*" MWMFunctions -Style "*" HintOverride -Style "*" MWMDecor - -OpaqueMoveSize 100 -EdgeScroll 100 100 -EdgeResistance 10000 0 - -# -# RandomPlacement prevents user interaction while placing windows: -# -Style "*" RandomPlacement - -# -# NoPPosition instructs fvwm to ignore the PPosition field in window -# geometry hints. Emacs annoyingly sets PPosition to (0,0)! -# -Style "*" NoPPosition - -#========================================================================# - -# -# Set the desk top size in units of physical screen size -# -DeskTopSize 3x2 - -#========================================================================# - -# Set the decoration styles and window options -# Order is important!!!! -# If compatible styles are set for a single window in multiple Style -# commands, then the styles are ORed together. If conflicting styles -# are set, the last one specified is used. - -# These commands should command before any menus or functions are defined, -# and before the internal pager is started. - -# -# Default border and handle widths -# -Style "*" BorderWidth 5, HandleWidth 5 - -Style "Fvwm*" NoTitle, Sticky, WindowListSkip -Style "Fvwm Pager" StaysOnTop, NoHandles -Style "FvwmBanner" StaysOnTop -Style "FvwmButtons" NoTitle, NoHandles, Sticky, WindowListSkip,BorderWidth 5 -Style "*lock" NoTitle, NoHandles, Sticky, WindowListSkip -Style "xbiff" NoTitle, Sticky, WindowListSkip - -# -# Some mini-icons for the title bar -# -#Style "*" TitleIcon mini-x2.xpm -#Style "*xterm*" TitleIcon mini-term.xpm -#Style "rxvt" TitleIcon mini-term.xpm -#Style "xcalc" TitleIcon mini-calc.xpm -#Style "xsession" TitleIcon mini-bx2.xpm -#Style "xv" TitleIcon mini-xv.xpm -#Style "SeaMonkey" TitleIcon mini-nscape.xpm -#Style "xmag" TitleIcon mini-zoom.xpm -#Style "textedit" TitleIcon mini-edit.xpm -#Style "tkps" TitleIcon mini-run.xpm -#Style "Ghostview" TitleIcon mini-gv.xpm -#Style "Xcolorsel" TitleIcon mini-colors.xpm -#Style "IDL*" TitleIcon mini-zoom.xpm -#Style "xeyes" TitleIcon mini-eyes.xpm -#Style "*fm*" TitleIcon mini-filemgr.xpm -# xman resource names -#Style "topBox" TitleIcon mini-book1.xpm -#Style "help" TitleIcon mini-book2.xpm -#Style "manualBrowser" TitleIcon mini-book2.xpm -# xpaint resource names -#Style "xpaint" TitleIcon mini-paint.xpm -#Style "Canvas" TitleIcon mini-paint.xpm -#Style "fatbits" TitleIcon mini-paint.xpm -#Style "filebrowser" TitleIcon mini-paint.xpm - -#Style "rxvt" Icon term.xpm -#Style "xterm" Icon xterm.xpm -#Style "Appointment" Icon datebook.xpm -#Style "xcalc" Icon rcalc.xpm -#Style "xbiff" Icon mail1.xpm -#Style "xmh" Icon mail1.xpm, StartsOnDesk 2 -#Style "xman" Icon xman.xpm -#Style "xvgr" Icon graphs.xpm -#Style "matlab" Icon math4.xpm -#Style "xmag" Icon mag_glass.xpm -#Style "xgraph" Icon graphs.xpm -#Style "xv" Icon xview.xpm -#Style "FvwmButtons" Icon toolbox.xpm -#Style "xconsole" Icon koala.xpm -#Style "xsession" Icon koala.xpm -#Style "textedit" Icon textedit.xpm -#Style "gv" Icon gv.xpm - -#========================================================================# - -# -# Stuff to do at start-up -# - -AddToFunc "InitFunction" -#+ "I" Module FvwmButtons -+ "I" Module FvwmButtons MiniButtons -+ "I" Module FvwmPager 0 0 - -AddToFunc "RestartFunction" -#+ "I" Module FvwmButtons -+ "I" Module FvwmButtons MiniButtons -+ "I" Module FvwmPager 0 0 - -#========================================================================# - -# Now define some handy complex functions - -# -# This one moves and then raises the window if you drag the mouse, -# only raises the window if you click, or does a full maximize if -# you double click -# -AddToFunc "Move-or-Raise" "M" Move -+ "M" Raise -+ "C" Raise -+ "D" Maximize 100 100 - -# -# This one moves and then lowers the window if you drag the mouse, -# only lowers the window if you click, or does a RaiseLower if you double -# click -# -AddToFunc "Move-or-Lower" "M" Move -+ "M" Lower -+ "C" Lower -+ "D" RaiseLower - -# -# This one moves or (de)iconifies: -# -AddToFunc "Move-or-Iconify" "M" Move -+ "D" Iconify - -# -# This one resizes and then raises the window if you drag the mouse, -# only raises the window if you click, or does a RaiseLower if you double -# click -# -AddToFunc "Resize-or-Raise" "M" Resize -+ "M" Raise -+ "C" Raise -+ "D" RaiseLower - - -#========================================================================# - -# -# Now define the menus - defer bindings until later -# - -# This is for the Start menu of the FvwmTaskBar - -DestroyMenu "StartMenu" -AddToMenu "StartMenu" -+ "Manual Pages %mini-book1.xpm%" Exec xman & -+ "Magnifying Glass %mini-zoom.xpm%" Exec xmag & -+ "" Nop -+ "Accessories%mini-hammer.xpm%" Popup Accessories -+ "Applications %mini-x2.xpm%" Popup Applications -+ "File Managers %mini-filemgr.xpm%" Popup Filemanagers -+ "Games %mini-happy.xpm%" Popup Games -+ "Shells %mini-term.xpm" Popup Shells -+ "" Nop -+ "Lock Screen %mini-lock.xpm%" Popup Screenlock -+ "Screensaver %mini-display.xpm%" Popup Screensaver -+ "" Nop -+ "Refresh Screen %mini-ray.xpm%" Refresh -+ "" Nop -+ "Exit Fvwm2 %mini-stop.xpm%" Popup Quit-Verify - -DestroyMenu "Shells" -AddToMenu "Shells" -+ "Xterm (7x14 font)%mini-term.xpm%" Exec xterm -sb -sl 500 -j -ls -fn 7x14 -fb 7x14bold & -+ "Large Xterm (10x20 font)%mini-term.xpm%" Exec xterm -sb -sl 500 -j -ls -fn 10x20 & -+ "" Nop -+ "Rxvt (7x14 font)%mini-term.xpm%" Exec rxvt -font 7x14 -ls & -+ "Large Rxvt (10x20 font)%mini-term.xpm%" Exec rxvt -font 10x20 -ls & - -DestroyMenu "Screensaver" -AddToMenu "Screensaver" -+ "Blank%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode blank & -+ "Random%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode random & -+ "" Nop -+ "Ant%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode ant & -+ "Ball%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode ball & -+ "Bat%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode bat & -+ "Blot%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode blot & -+ "Bomb%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode bomb & -+ "Bouboule%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode bouboule & -#+ "Bob%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode image -bitmap /usr/include/X11/bitmaps/l-bob.xbm -batchcount 7 & -#+ "Bounce%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode bounce & -+ "\"Bob\"%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode bounce & -+ "Braid%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode braid & -+ "Bug%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode bug & -+ "Bubble%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode bubble & -+ "Clock%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode clock & -+ "Coral%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode coral & -+ "Crystal%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode crystal & -+ "Daisy%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode daisy & -+ "Dclock%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode dclock & -+ "Deco%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode deco & -+ "Demon%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode demon & -+ "Dilemma%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode dilemma & -+ "Drift%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode drift & -+ "More" PopUp ScreenSaver2 - -DestroyMenu "Screensaver2" -AddToMenu "Screensaver2" -+ "Eyes%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode eyes & -+ "Fadeplot%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode fadeplot & -+ "Flag%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode flag & -+ "Flame%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode flame & -+ "Forest%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode forest & -+ "Galaxy%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode galaxy & -+ "Geometry%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode geometry & -+ "Grav%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode grav & -+ "Helix%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode helix & -+ "Hop%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode hop & -+ "Hyper%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode hyper & -+ "Ico%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode ico & -+ "Ifs%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode ifs & -+ "Julia%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode julia & -+ "Kaleid%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode kaleid & -+ "Laser%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode laser & -+ "Life%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode life & -+ "Life1d%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode life1d & -+ "Life3d%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode life3d & -+ "Lightning%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode lightning & -+ "Lisa%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode lisa & -+ "Lissie%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode lissie & -+ "Loop%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode loop & -+ "More" PopUp ScreenSaver3 - -DestroyMenu "Screensaver3" -AddToMenu "Screensaver3" -+ "Mandelbrot%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode mandelbrot & -+ "Marquee%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode marquee & -+ "Maze%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode maze & -+ "Mountain%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode mountain & -+ "Munch%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode munch & -+ "Nose%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode nose & -+ "Pacman%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode pacman & -+ "Penguin%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode image -bitmap /usr/include/X11/bitmaps/l-linux.xbm -batchcount 7 & -+ "Penrose%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode penrose & -+ "Petal%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode petal & -+ "Puzzle%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode puzzle & -+ "Pyro%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode pyro & -+ "Qix%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode qix & -+ "Roll%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode roll & -+ "Rotor%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode rotor & -+ "Shape%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode shape & -+ "Sierpinski%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode sierpinski & -+ "Slip%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode slip & -+ "Sphere%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode sphere & -+ "Spiral%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode spiral & -+ "Spline%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode spline & -+ "Star%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode star & -+ "Strange%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode strange & -+ "More" PopUp ScreenSaver4 - -DestroyMenu "Screensaver4" -AddToMenu "Screensaver4" -+ "Swarm%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode swarm & -+ "Swirl%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode swirl & -+ "Triangle%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode triangle & -+ "Tube%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode tube & -+ "Turtle%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode turtle & -+ "Vines%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode vines & -+ "Voters%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode voters & -+ "Wator%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode wator & -+ "Wire%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode wire & -+ "World%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode world & -+ "Worm%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode worm & - -DestroyMenu "Screenlock" -AddToMenu "Screenlock" -+ "Blank%mini-bball.xpm%" Exec xlock -nice 0 -mode blank & -+ "Random%mini-bball.xpm%" Exec xlock -nice 0 -mode random & -+ "" Nop -+ "Ant%mini-bball.xpm%" Exec xlock -nice 0 -mode ant & -+ "Ball%mini-bball.xpm%" Exec xlock -nice 0 -mode ball & -+ "Bat%mini-bball.xpm%" Exec xlock -nice 0 -mode bat & -+ "Blot%mini-bball.xpm%" Exec xlock -nice 0 -mode blot & -+ "Bomb%mini-bball.xpm%" Exec xlock -nice 0 -mode bomb & -+ "Bouboule%mini-bball.xpm%" Exec xlock -nice 0 -mode bouboule & -#+ "Bob%mini-bball.xpm%" Exec xlock -nice 0 -mode image -bitmap /usr/include/X11/bitmaps/l-bob.xbm -batchcount 7 & -#+ "Bounce%mini-bball.xpm%" Exec xlock -nice 0 -mode bounce & -+ "\"Bob\"%mini-bball.xpm%" Exec xlock -nice 0 -mode bounce & -+ "Braid%mini-bball.xpm%" Exec xlock -nice 0 -mode braid & -+ "Bug%mini-bball.xpm%" Exec xlock -nice 0 -mode bug & -+ "Bubble%mini-bball.xpm%" Exec xlock -nice 0 -mode bubble & -+ "Clock%mini-bball.xpm%" Exec xlock -nice 0 -mode clock & -+ "Coral%mini-bball.xpm%" Exec xlock -nice 0 -mode coral & -+ "Crystal%mini-bball.xpm%" Exec xlock -nice 0 -mode crystal & -+ "Daisy%mini-bball.xpm%" Exec xlock -nice 0 -mode daisy & -+ "Dclock%mini-bball.xpm%" Exec xlock -nice 0 -mode dclock & -+ "Deco%mini-bball.xpm%" Exec xlock -nice 0 -mode deco & -+ "Demon%mini-bball.xpm%" Exec xlock -nice 0 -mode demon & -+ "Dilemma%mini-bball.xpm%" Exec xlock -nice 0 -mode dilemma & -+ "Drift%mini-bball.xpm%" Exec xlock -nice 0 -mode drift & -+ "More" PopUp Screenlock2 - -DestroyMenu "Screenlock2" -AddToMenu "Screenlock2" -+ "Eyes%mini-bball.xpm%" Exec xlock -nice 0 -mode eyes & -+ "Fadeplot%mini-bball.xpm%" Exec xlock -nice 0 -mode fadeplot & -+ "Flag%mini-bball.xpm%" Exec xlock -nice 0 -mode flag & -+ "Flame%mini-bball.xpm%" Exec xlock -nice 0 -mode flame & -+ "Forest%mini-bball.xpm%" Exec xlock -nice 0 -mode forest & -+ "Galaxy%mini-bball.xpm%" Exec xlock -nice 0 -mode galaxy & -+ "Geometry%mini-bball.xpm%" Exec xlock -nice 0 -mode geometry & -+ "Grav%mini-bball.xpm%" Exec xlock -nice 0 -mode grav & -+ "Helix%mini-bball.xpm%" Exec xlock -nice 0 -mode helix & -+ "Hop%mini-bball.xpm%" Exec xlock -nice 0 -mode hop & -+ "Hyper%mini-bball.xpm%" Exec xlock -nice 0 -mode hyper & -+ "Ico%mini-bball.xpm%" Exec xlock -nice 0 -mode ico & -+ "Ifs%mini-bball.xpm%" Exec xlock -nice 0 -mode ifs & -+ "Julia%mini-bball.xpm%" Exec xlock -nice 0 -mode julia & -+ "Kaleid%mini-bball.xpm%" Exec xlock -nice 0 -mode kaleid & -+ "Laser%mini-bball.xpm%" Exec xlock -nice 0 -mode laser & -+ "Life%mini-bball.xpm%" Exec xlock -nice 0 -mode life & -+ "Life1d%mini-bball.xpm%" Exec xlock -nice 0 -mode life1d & -+ "Life3d%mini-bball.xpm%" Exec xlock -nice 0 -mode life3d & -+ "Lightning%mini-bball.xpm%" Exec xlock -nice 0 -mode lightning & -+ "Lisa%mini-bball.xpm%" Exec xlock -nice 0 -mode lisa & -+ "Lissie%mini-bball.xpm%" Exec xlock -nice 0 -mode lissie & -+ "Loop%mini-bball.xpm%" Exec xlock -nice 0 -mode loop & -+ "More" PopUp Screenlock3 - -DestroyMenu "Screenlock3" -AddToMenu "Screenlock3" -+ "Mandelbrot%mini-bball.xpm%" Exec xlock -nice 0 -mode mandelbrot & -+ "Marquee%mini-bball.xpm%" Exec xlock -nice 0 -mode marquee & -+ "Maze%mini-bball.xpm%" Exec xlock -nice 0 -mode maze & -+ "Mountain%mini-bball.xpm%" Exec xlock -nice 0 -mode mountain & -+ "Munch%mini-bball.xpm%" Exec xlock -nice 0 -mode munch & -+ "Nose%mini-bball.xpm%" Exec xlock -nice 0 -mode nose & -+ "Pacman%mini-bball.xpm%" Exec xlock -nice 0 -mode pacman & -+ "Penguin%mini-bball.xpm%" Exec xlock -nice 0 -mode image -bitmap /usr/include/X11/bitmaps/l-linux.xbm -batchcount 7 & -+ "Penrose%mini-bball.xpm%" Exec xlock -nice 0 -mode penrose & -+ "Petal%mini-bball.xpm%" Exec xlock -nice 0 -mode petal & -+ "Puzzle%mini-bball.xpm%" Exec xlock -nice 0 -mode puzzle & -+ "Pyro%mini-bball.xpm%" Exec xlock -nice 0 -mode pyro & -+ "Qix%mini-bball.xpm%" Exec xlock -nice 0 -mode qix & -+ "Roll%mini-bball.xpm%" Exec xlock -nice 0 -mode roll & -+ "Rotor%mini-bball.xpm%" Exec xlock -nice 0 -mode rotor & -+ "Shape%mini-bball.xpm%" Exec xlock -nice 0 -mode shape & -+ "Sierpinski%mini-bball.xpm%" Exec xlock -nice 0 -mode sierpinski & -+ "Slip%mini-bball.xpm%" Exec xlock -nice 0 -mode slip & -+ "Sphere%mini-bball.xpm%" Exec xlock -nice 0 -mode sphere & -+ "Spiral%mini-bball.xpm%" Exec xlock -nice 0 -mode spiral & -+ "Spline%mini-bball.xpm%" Exec xlock -nice 0 -mode spline & -+ "Star%mini-bball.xpm%" Exec xlock -nice 0 -mode star & -+ "Strange%mini-bball.xpm%" Exec xlock -nice 0 -mode strange & -+ "More" PopUp Screenlock4 - -DestroyMenu "Screenlock4" -AddToMenu "Screenlock4" -+ "Swarm%mini-bball.xpm%" Exec xlock -nice 0 -mode swarm & -+ "Swirl%mini-bball.xpm%" Exec xlock -nice 0 -mode swirl & -+ "Triangle%mini-bball.xpm%" Exec xlock -nice 0 -mode triangle & -+ "Tube%mini-bball.xpm%" Exec xlock -nice 0 -mode tube & -+ "Turtle%mini-bball.xpm%" Exec xlock -nice 0 -mode turtle & -+ "Vines%mini-bball.xpm%" Exec xlock -nice 0 -mode vines & -+ "Voters%mini-bball.xpm%" Exec xlock -nice 0 -mode voters & -+ "Wator%mini-bball.xpm%" Exec xlock -nice 0 -mode wator & -+ "Wire%mini-bball.xpm%" Exec xlock -nice 0 -mode wire & -+ "World%mini-bball.xpm%" Exec xlock -nice 0 -mode world & -+ "Worm%mini-bball.xpm%" Exec xlock -nice 0 -mode worm & - -DestroyMenu "Games" -AddToMenu "Games" -+ "Maze%mini-maze.xpm%" Exec maze & -+ "Spider%mini-espada.xpm%" Exec spider & -+ "Chess%mini-slon.xpm%" Exec xboard & -+ "Xlander%mini-xlander.xpm%" Exec xlander & -#+ "Xmahjongg%mini-xmahjongg.xpm%" Exec xmahjongg & -+ "Workman%mini-cdlabel.xpm%" Exec workman & -+ "" Nop -+ "Amusements" Popup Amusements - -DestroyMenu "Amusements" -AddToMenu "Amusements" -#+ "Xcat%mini-cat.xpm%" Exec xcat & -+ "Xeyes%mini-eyes.xpm%" Exec xeyes & -+ "Xlogo%mini-bx2.xpm%" Exec xlogo & -+ "Xroach%mini-roach.xpm%" Exec xroach & -+ "Xsnow%mini-xsnow.xpm%" Exec xsnow & -+ "Stop Xsnow%mini-stop.xpm%" Exec killall xsnow & - -DestroyMenu "Accessories" -AddToMenu "Accessories" -+ "Font viewer (xfontsel)%mini-font.xpm%" Exec xfontsel & -+ "Manual pages%mini-book1.xpm%" Exec xman & -+ "Magnifying glass%mini-zoom.xpm%" Exec xmag & -+ "Oclock%mini-clock.xpm%" Exec oclock & -+ "Running Processes (Top)%mini-run.xpm%" Exec xterm -font 7x14 -T Top -n Top -e top & -+ "System load%mini-perf.xpm%" Exec xload & -+ "Xclipboard%mini-clipboard.xpm%" Exec xclipboard & -+ "Xclock%mini-clock.xpm%" Exec xclock & - -DestroyMenu "Applications" -AddToMenu "Applications" -+ "Emacs%mini-edit.xpm%" Exec emacs & -+ "NcFTP%mini-ftp.xpm%" Exec xterm -name NcFtp -T FTP -ls -fn 7x14 -e ncftp & -+ "GIMP%mini-camera.xpm%" Exec gimp & -+ "Gv%mini-gv.xpm%" Exec gv & -+ "Gnuplot%mini-zoom.xpm%" Exec xterm -T "Gnuplot" -name Gnuplot -fn 7x14 -e gnuplot & -+ "SeaMonkey%mini-nscape.xpm%" Exec seamonkey & -+ "Pine%mini-mail.xpm%" Exec xterm -name Mail -T Mail -ls -fn 7x14 -e pine -i & -+ "Xv%mini-xv.xpm%" Exec xv & -+ "Xedit%mini-edit.xpm%" Exec xedit & -+ "Xfig%mini-xfig.xpm%" Exec xfig & -+ "Xfractint%mini-fractal.xpm%" Exec xterm -font 7x14 -e xfractint & -+ "Xpaint%mini-paint.xpm%" Exec xpaint & -+ "Xpdf%mini-pdf.xpm%" Exec xpdf & -+ "Xxgdb%mini-bug2.xpm%" Exec xxgdb & - -DestroyMenu "Filemanagers" -AddToMenu "Filemanagers" -#+ "TkDesk%mini-desktop.xpm%" Exec tkdesk & -+ "Xfm%mini-filemgr.xpm%" Exec xfm & - -# -# This menu is invoked as a sub-menu - it allows you to quit, -# restart, or switch to another WM. -# -DestroyMenu "Quit-Verify" -AddToMenu "Quit-Verify" -+ "Quit fvwm2%mini-exclam.xpm%" Quit -+ "" Nop -+ "Restart Fvwm2%mini-turn.xpm%" Restart fvwm2 -+ "" Nop -+ "Start fvwm95%mini-exp.xpm%" Restart fvwm95 -+ "Start mwm%mini-mwm.xpm%" Restart mwm -+ "Start olvwm%mini-olwm.xpm%" Restart /usr/openwin/bin/olvwm -+ "Start olwm%mini-olwm.xpm%" Restart /usr/openwin/bin/olwm -+ "Start twm%mini-twm.xpm%" Restart twm - -# -# Provides a list of modules to fire off -# -#DestroyMenu "Module-Popup" -#AddToMenu "Module-Popup" -##+ "Audio" Module FvwmAudio -#+ "Banner%mini.fvwm.xpm%" Module FvwmBanner -#+ "Button Bar%mini-ball.xpm%" Module FvwmButtons -#+ "Button Bar (Mini)%mini-ball.xpm%" Module FvwmButtons MiniButtons -##+ "Clean-Up%mini-pencil.xpm%" Module FvwmClean -##+ "Configure%mini-hammer.xpm%" Module FvwmConfig -#+ "Debug%mini-bug2.xpm%" Module FvwmDebug -##+ "Task bar%mini-exp.xpm%" Module FvwmTaskBar -#+ "Identify%mini-question.xpm%" Module FvwmIdent -#+ "Save Desktop%mini-desktop.xpm%" Module FvwmSaveDesk -#+ "Pager%mini-pager.xpm%" Module FvwmPager 0 0 -#+ "Window List%mini-windows.xpm%" Module FvwmWinList -#+ "Talk%mini-exclam.xpm%" Module FvwmTalk - -AddToMenu Module-Popup "FvwmModules" Title -+ "Identify" Module FvwmIdent -+ "Talk" Module FvwmTalk -+ "" Nop -+ "Button-Bar" Module FvwmButtons -+ "Pager" Module FvwmPager 0 0 -+ "Pager (2 desks)" Module FvwmPager 0 1 -+ "WinList" Module FvwmWinList -+ "" Nop -+ "Banner" Module FvwmBanner -+ "ScrollBar" Module FvwmScroll 50 50 -+ "Background" Module FvwmBacker -+ "AutoRaise" Module FvwmAuto 200 Raise Nop -+ "Stop AutoRaise" KillModule FvwmAuto -+ "" Nop -+ "IconBox" Module FvwmIconBox -+ "IconMan" Module FvwmIconMan -+ "" Nop -+ "Form - Rlogin" Module FvwmForm Rlogin -+ "Form - MyFvwmTalk" Module FvwmForm MyFvwmTalk -+ "Form - QuitVerify" Module FvwmForm QuitVerify - -# -# This menu will fire up some very common utilities -# -DestroyMenu "Utilities" -AddToMenu "Utilities" -+ "" Nop -+ "Xterm%mini-term.xpm%" Exec xterm -sb -sl 500 -j -ls -fn 7x14 -fb 7x14bold & -+ "Running Processes (Top)%mini-run.xpm%" Exec xterm -font 7x14 -T Top -n Top -e top & -+ "Calculator%mini-calc.xpm%" Exec xcalc & -+ "Manual pages%mini-book1.xpm%" Exec xman & -+ "Magnifying glass%mini-zoom.xpm%" Exec xmag & -+ "Oclock%mini-clock.xpm%" Exec oclock & -+ "" Nop -+ "Applications%mini-x2.xpm%" Popup Applications -+ "File Managers%mini-filemgr.xpm%" Popup Filemanagers -+ "Games%mini-happy.xpm%" Popup Games -+ "Shells%mini-term.xpm" Popup Shells -+ "" Nop -+ "Screensaver%mini-display.xpm%" Popup Screensaver -+ "Lock Screen%mini-lock.xpm%" Popup Screenlock -+ "" Nop -+ "Modules%mini-modules.xpm%" Popup Module-Popup -+ "" Nop -+ "Refresh Screen%mini-ray.xpm%" Refresh -+ "" Nop -+ "Exit Fvwm2%mini-stop.xpm%" Popup Quit-Verify - -# -# This defines the most common window operations -# -DestroyMenu "Window Ops" -AddToMenu "Window Ops" Title -+ "&Move%mini-move.xpm%" Function Move-or-Raise -+ "&Resize%mini-resize.xpm%" Function Resize-or-Raise -+ "R&aise%mini-raise.xpm%" Raise -+ "&Lower%mini-lower.xpm%" Lower -+ "(De)Iconify" Iconify -+ "(Un)Stick" Stick -+ "(Un)Maximize%mini-max1.xpm%" Function maximize_func -+ "" Nop -+ "Kill%mini-bomb.xpm%" Destroy -+ "&Close%mini-cross.xpm%" Delete -+ "" Nop -+ "Switch to..." WindowList -+ "Refresh Screen%mini-ray.xpm%" Refresh - -# -# A trimmed down version of "Window Ops", good for binding to decorations -# -AddToMenu "Window-Ops2" "&Restore" Iconify -1 -+ "&Move" Move-or-Raise -+ "&Size" Resize-or-Raise -+ "Mi&nimize" Iconify 1 -+ "Ma&ximize" Maximize 100 100 -+ "" Nop -+ "&Kill" Destroy -+ "&Close Alt+F4" Delete - -#========================================================================# - -# -# One more complex function - couldn't be defined earlier because it used -# pop-up menus -# -# This creates the "system" menu for the title-bar window-ops -# pop-up -# -AddToFunc "window_ops_func" "C" PopUp Window-Ops2 -+ "M" PopUp Window-Ops2 -+ "D" Delete - - -#========================================================================# - -# -# Mouse bindings -# - -# First, for the mouse in the root window -# Button 1 gives the Utilities menu -# Button 2 gives the Window Ops menu -# Button 3 gives the WindowList (like TwmWindows) -# I use the AnyModifier (A) option for the modifier field, so you can hold down -# any shift-control-whatever combination you want! - -# Button Context Modifi Function -Mouse 1 R A Menu "Utilities" Nop -Mouse 2 R A Menu "Window Ops" Nop -Mouse 3 R A WindowList -#Mouse 3 R A Module "winlist" FvwmWinList transient - -# Now the title bar buttons -# Any button in the left title-bar button gives the window ops menu -# Any button in the first right title-bar button Iconifies the window -# Any button in the second title-bar button full-maximizes -# Note the use of "Mouse 0" for AnyButton. - -# Button Context Modif Function -Mouse 0 1 A Function "window_ops_func" -Mouse 0 2 A Maximize 100 100 -Mouse 0 4 A Iconify - -# Now the rest of the frame -# Here I invoke my complex functions for Move-or-lower, Move-or-raise, -# and Resize-or-Raise. -# -# Button 1 in the corner pieces, with any modifiers, gives resize or raise -Mouse 1 F A Function "Resize-or-Raise" -# Button 1 in the title, sides, or icon, w/ any modifiers, gives move or raise -Mouse 1 TS A Function "Move-or-Raise" - -# Button 1 in an icons gives move for a drag, de-iconify for a double-click, -# nothing for a single click -# Button 2 in an icon, w/ any modifiers, gives de-iconify -Mouse 1 I A Function "Move-or-Iconify" -Mouse 2 I A Iconify - -# Button 2 in the corners, sides, or title-bar gives the window ops menu -Mouse 2 FST A Function "window_ops_func" - -# Button 3 anywhere in the decoration (except the title-bar buttons) -# does a raise-lower -Mouse 3 TSIF A RaiseLower - -# Button 3 in the window, with the Modifier-1 key (usually alt or diamond) -# gives Raise-Lower. Used to use control here, but that interferes with xterm -Mouse 3 W M RaiseLower - -#========================================================================# - -# Now some keyboard shortcuts. - -# Arrow Keys -# press arrow + control anywhere, and scroll by 1 page -Key Left A C Scroll -100 0 -Key Right A C Scroll +100 +0 -Key Up A C Scroll +0 -100 -Key Down A C Scroll +0 +100 - -# press arrow + meta key, and scroll by 1/10 of a page -Key Left A M Scroll -10 +0 -Key Right A M Scroll +10 +0 -Key Up A M Scroll +0 -10 -Key Down A M Scroll +0 +10 - -# press shift arrow + control anywhere, and move the pointer by 1% of a page -Key Left A SC CursorMove -1 0 -Key Right A SC CursorMove +1 +0 -Key Up A SC CursorMove +0 -1 -Key Down A SC CursorMove +0 +1 - -# press shift arrow + meta key, and move the pointer by 1/10 of a page -Key Left A SM CursorMove -10 +0 -Key Right A SM CursorMove +10 +0 -Key Up A SM CursorMove +0 -10 -Key Down A SM CursorMove +0 +10 - -# Keyboard accelerators -Key F1 A M Popup "Utilities" -Key F1 A M Popup "Utilities" -Key F2 A M Popup "Window Ops" -Key F3 A M Module "WindowList" FvwmWinList -Key F4 A M Iconify -Key F5 A M Move -Key F6 A M Resize -Key F7 A M CirculateUp -Key F8 A M CirculateDown - -#Page Up/Dapge Down keys are used to scroll by one desktop page -# in any context, press page up/down + control -# in root context, just pressing page up/down is OK -# -# I prefer the non-wrapping scroll. These are for example purposes only -#Key Next A C Scroll 100000 0 -#Key Next R N Scroll 100000 0 -#Key Prior A C Scroll -100000 0 -#Key Prior R N Scroll -100000 0 - -Key Tab A M Prev Focus -Key Tab A MS Next Focus - -Key Escape A C WindowList - -#========================================================================# - -# Definitions used by the modules - -#------------------ Pager -*FvwmPagerBack grey60 -*FvwmPagerFore black -*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-* -*FvwmPagerHilight #c3c3c3 -*FvwmPagerGeometry -3-27 -*FvwmPagerLabel 0 Desktop -*FvwmPagerSmallFont 5x8 - -#------------------ FvwmButtons -*FvwmButtonsFore Black -*FvwmButtonsBack #c3c3c3 -*FvwmButtonsFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-* -# Geometry - really likes to pick its own size, but giving a position is OK -*FvwmButtonsGeometry -5-5 -# Layout: specify rows or columns, not both -*FvwmButtonsRows 1 - -# Define the buttons to use..... -*FvwmButtons xclock clock.xpm Swallow "xclock" Exec xclock -bg \#c3c3c3 -geometry -1500-1500 -padding 0 & -#*GoodStuff xcmap NULL Swallow "xcmap" xcmap -geometry -1500-1500 -*FvwmButtons (2x1) load NULL Swallow "xload" Exec nice -16 xload -nolabel -bg grey60 -update 5 -geometry -1500-1500 -*FvwmButtons SeaMonkey nscape.xpm Exec "SeaMonkey" seamonkey & -*FvwmButtons xterm rterm.xpm Exec "xterm" xterm -ls -sb -fn 7x14 & -*FvwmButtons xfm Xfm.xpm Exec "Xfm" xfm & -#*FvwmButtons textedit textedit.xpm Exec "Textedit" textedit & -*FvwmButtons xcalc rcalc.xpm Exec "Calculator" xcalc & -*FvwmButtons xv xv.xpm Exec "xv" xv & -#*FvwmButtons gv gv.xpm Exec "gv" gv & -#*FvwmButtons seamonkey nscape.xpm Exec "SeaMonkey" seamonkey -geometry 920x650+90+5 -*FvwmButtons kill rbomb.xpm Destroy -#*FvwmButtons (2x1) - whatever SwallowModule Exec "Desktop" FvwmPager 0 0 -*FvwmButtons (2x1, Swallow(UseOld) "Desktop" 'FvwmPager 0 0') - -#------------------ MiniButtons - -Style "MiniButtons" NoTitle,NoHandles,Sticky,StaysOnTop,WindowListSkip,BorderWidth 0 - -*MiniButtonsFore Black -*MiniButtonsBack #c0c0c0 -*MiniButtonsFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-* -*MiniButtonsGeometry -5-5 -*MiniButtonsRows 1 -*MiniButtonsPadding 1 1 - -*MiniButtons - mini-nscape.xpm Exec "SeaMonkey" seamonkey -geometry 790x543+0+0 & -*MiniButtons - mini-term.xpm Exec "XTerm" xterm -ls -sb -fn 7x14 & -*MiniButtons - mini-filemgr.xpm Exec "Xfm" xfm & -*MiniButtons - mini-calc.xpm Exec "Calculator" xcalc & -#*MiniButtons - mini-gv.xpm Exec "gv" gv & -*MiniButtons - mini-xv.xpm Exec "xv" xv & -*MiniButtons - mini-bomb.xpm Destroy - -#------------------ Identify -*FvwmIdentBack #000080 -*FvwmIdentFore Yellow -*FvwmIdentFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-* - -#------------------ FvwmWinList -*FvwmWinListBack #c3c3c3 -*FvwmWinListFore Black -*FvwmWinListFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-* -*FvwmWinListAction Click1 Iconify -1,Focus -*FvwmWinListAction Click2 Iconify -*FvwmWinListAction Click3 Module "FvwmIdent" FvwmIdent -*FvwmWinListUseSkipList -*FvwmWinListGeometry +0-1 - -#------------------ FvwmTaskBar -#Style "FvwmTaskBar" NoTitle,BorderWidth 4,HandleWidth 4,Sticky,StaysOnTop,WindowListSkip,CirculateSkip -# I don't like the taskbar to stay to top, since it covers the bottom -# part of SeaMonkey in full-screen mode: -#Style "FvwmTaskBar" NoTitle,BorderWidth 4,HandleWidth 4,Sticky,WindowListSkip,CirculateSkip - -*FvwmTaskBarGeometry +0-0 -*FvwmTaskBarFore Black -*FvwmTaskBarBack #c3c3c3 -*FvwmTaskBarTipsFore black -*FvwmTaskBarTipsBack bisque -*FvwmTaskBarFont -adobe-helvetica-medium-r-*-*-*-120-*-*-*-*-*-* -*FvwmTaskBarSelFont -adobe-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* -*FvwmTaskBarAction Click1 Iconify -1,Raise,Focus -*FvwmTaskBarAction Click2 Iconify -*FvwmTaskBarAction Click3 Module "FvwmIdent" FvwmIdent -*FvwmTaskBarUseSkipList -*FvwmTaskBarAutoStick -*FvwmTaskBarStartName Start -*FvwmTaskBarStartMenu StartMenu -# Just for fun, let's use the Linux penguin for the Start button: -*FvwmTaskBarStartIcon mini-penguin.xpm -#*FvwmTaskBarStartIcon mini-exp.xpm -*FvwmTaskBarShowTips -*FvwmTaskBarMailProg xterm -e mail diff --git a/source/xap/fvwm/xinitrc.fvwm2 b/source/xap/fvwm/xinitrc.fvwm2 index 788a4e43..c0fb46b0 100644 --- a/source/xap/fvwm/xinitrc.fvwm2 +++ b/source/xap/fvwm/xinitrc.fvwm2 @@ -28,8 +28,8 @@ fi xsetroot -solid SteelBlue if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then - ck-launch-session fvwm2 + ck-launch-session /usr/bin/startfvwm2 else - fvwm2 + dbus-launch --exit-with-session /usr/bin/startfvwm2 fi diff --git a/source/xap/geeqie/geeqie.SlackBuild b/source/xap/geeqie/geeqie.SlackBuild index dbde32bb..2c0851b4 100755 --- a/source/xap/geeqie/geeqie.SlackBuild +++ b/source/xap/geeqie/geeqie.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2010, 2011 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2010, 2011, 2012 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ PKGNAM=geeqie -VERSION=1.0 -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xap/geeqie/slack-desc b/source/xap/geeqie/slack-desc index cadbd774..7371d160 100644 --- a/source/xap/geeqie/slack-desc +++ b/source/xap/geeqie/slack-desc @@ -17,4 +17,3 @@ geeqie: geeqie: geeqie: geeqie: -geeqie: diff --git a/source/xap/gftp/gftp.SlackBuild b/source/xap/gftp/gftp.SlackBuild index ba93205e..9a293b64 100755 --- a/source/xap/gftp/gftp.SlackBuild +++ b/source/xap/gftp/gftp.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,20 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.0.19 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +PKGNAM=gftp +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-3} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi NUMJOBS=${NUMJOBS:-" -j7 "} diff --git a/source/xap/gimp/gimp.SlackBuild b/source/xap/gimp/gimp.SlackBuild index 330ca4f1..45848585 100755 --- a/source/xap/gimp/gimp.SlackBuild +++ b/source/xap/gimp/gimp.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=gimp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -79,8 +79,6 @@ CFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --docdir=/usr/doc/gimp-$VERSION \ --disable-static \ - --enable-gimp-remote \ - --without-gvfs \ --with-libcurl \ --build=$ARCH-slackware-linux @@ -91,10 +89,20 @@ make install DESTDIR=$PKG || exit 1 # Add a manpage symlink for POLA-compliance ( cd $PKG/usr/man/man1 ; ln -sf gimptool-2.?.1 gimptool.1 ) -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/gimp-$VERSION cp -a \ diff --git a/source/xap/gkrellm/gkrellm.SlackBuild b/source/xap/gkrellm/gkrellm.SlackBuild index e156f181..14c07172 100755 --- a/source/xap/gkrellm/gkrellm.SlackBuild +++ b/source/xap/gkrellm/gkrellm.SlackBuild @@ -22,7 +22,7 @@ VERSION=2.3.5 PKGVER=2.3.5 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xap/gnuplot/gnuplot.SlackBuild b/source/xap/gnuplot/gnuplot.SlackBuild index 47cf5eb7..b6203229 100755 --- a/source/xap/gnuplot/gnuplot.SlackBuild +++ b/source/xap/gnuplot/gnuplot.SlackBuild @@ -82,6 +82,11 @@ CFLAGS="$SLKCFLAGS" \ --with-readline=builtin \ --build=${ARCH}-slackware-linux +# +# I think most people would rather not have a Qt dependency here. +# --enable-qt +# + make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/xap/gucharmap/doinst.sh b/source/xap/gucharmap/doinst.sh index 4e8ba707..f6a66768 100644 --- a/source/xap/gucharmap/doinst.sh +++ b/source/xap/gucharmap/doinst.sh @@ -2,3 +2,9 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi +fi + diff --git a/source/xap/gucharmap/gucharmap.SlackBuild b/source/xap/gucharmap/gucharmap.SlackBuild index 13b249a9..4ceef233 100755 --- a/source/xap/gucharmap/gucharmap.SlackBuild +++ b/source/xap/gucharmap/gucharmap.SlackBuild @@ -76,8 +76,6 @@ CFLAGS="$SLKCFLAGS" \ --localstatedir=/var/lib \ --docdir=/usr/doc/gucharmap-$VERSION \ --enable-static=no \ - --disable-gconf \ - --disable-schemas-install \ --disable-scrollkeeper \ --build=$ARCH-slackware-linux diff --git a/source/xap/gv/gv.SlackBuild b/source/xap/gv/gv.SlackBuild index 1f300165..67353af1 100755 --- a/source/xap/gv/gv.SlackBuild +++ b/source/xap/gv/gv.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -58,7 +58,7 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION || exit 1 -zcat $CWD/gv.keysym.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/gv.libXaw3d.diff.gz | patch -p1 --verbose || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . @@ -69,7 +69,7 @@ find . \ -exec chmod 644 {} \; # Configure: -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS $(pkg-config --cflags xaw3d)" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/source/xap/gv/gv.keysym.diff b/source/xap/gv/gv.keysym.diff deleted file mode 100644 index f2e0a7ca..00000000 --- a/source/xap/gv/gv.keysym.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/src/gv_misc_res.dat b/src/gv_misc_res.dat ---- a/src/gv_misc_res.dat 2010-10-15 09:21:36.000000000 +0200 -+++ b/src/gv_misc_res.dat 2010-10-15 09:21:48.000000000 +0200 -@@ -476,7 +476,6 @@ - BackSpace: GV_Page(up,left-bottom,!page-1,bottom-rightedge)\n\ - Insert: GV_Page(page-5) \n\ - Delete: GV_Page(page+5) \n\ -- apLineDel: GV_Page(page+5) \n\ - Home: GV_Page(page=0) \n\ - End: GV_Page(page=99999) \n\ - Prior: GV_Page(page-1) \n\ - diff --git a/source/xap/gv/gv.libXaw3d.diff b/source/xap/gv/gv.libXaw3d.diff new file mode 100644 index 00000000..b64cef00 --- /dev/null +++ b/source/xap/gv/gv.libXaw3d.diff @@ -0,0 +1,11 @@ +--- ./src/Scrollbar.c.orig 2011-08-03 11:14:14.000000000 -0500 ++++ ./src/Scrollbar.c 2012-05-13 11:19:18.140324835 -0500 +@@ -1006,7 +1006,7 @@ + TOPLOC = newtop; + SHOWNLENGTH = newbot-newtop+1; + +- (*swclass->threeD_class.shadowdraw) (w, event, region, FALSE); ++ (*swclass->threeD_class.shadowdraw) (w, event, region, sbw->threeD.relief, FALSE); + + ENDMESSAGE(Redisplay) + } diff --git a/source/xap/imagemagick/imagemagick.SlackBuild b/source/xap/imagemagick/imagemagick.SlackBuild index 565d3a0a..cf17f5f3 100755 --- a/source/xap/imagemagick/imagemagick.SlackBuild +++ b/source/xap/imagemagick/imagemagick.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,14 +29,14 @@ BUILD=${BUILD:-1} # This is a bit messy, so we'll explain it well. :-) # This is the base version number, which is needed to cd into the source tree -BASEVER=6.6.6-10 +BASEVER=6.7.7-10 # This is the version number used in the source tarball filename -FILEVER=6.6.6-10 +FILEVER=6.7.7-10 # This is the version number used in the package, where a version number cannot # contain a '-' -PKGVER=6.6.6_10 +PKGVER=6.7.7_10 # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -100,6 +100,7 @@ CXXFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ + --sysconfdir=/etc \ --program-prefix= \ --with-x \ --with-frozenpaths=no \ @@ -110,12 +111,27 @@ CXXFLAGS="$SLKCFLAGS" \ --with-perl \ --build=$ARCH-slackware-linux || exit 1 +make $NUMJOBS INSTALLDIRS=vendor || make INSTALLDIRS=vendor || exit 1 +# First, spam the running development system, as ImageMagick is unable to +# properly link the utilities against a new shared library major version +# otherwise which has led to several broken packages over the years: +make install INSTALLDIRS=vendor || exit 1 +/sbin/ldconfig + +# Now build again against the new libraries and headers: +make clean make $NUMJOBS INSTALLDIRS=vendor || make INSTALLDIRS=vendor || exit 1 make install INSTALLDIRS=vendor DESTDIR=$PKG || exit 1 -# Lately ImageMagick has been smoking crack: +# This should certainly not be included. +# It stomps on the libtool package. rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libltdl.* +# .la files in /usr/lib${LIBDIRSUFFIX}/ should be removed. +# Other .la files should be left alone, as ImageMagick uses them internally +# to locate modules. +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + ( cd $PKG # Nothing but a perl upgrade should replace this (and maybe not even that) find . -name perllocal.pod | xargs rm -f diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild index 812a7b16..a6f6c65c 100755 --- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,6 +24,24 @@ # distribute this, and for all the great work! :-) VERSION=$(basename $(ls firefox-*.tar.bz2 | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source) +RELEASEVER=$(echo $VERSION | cut -f 1 -d r | cut -f 1 -d b) +BUILD=${BUILD:-1} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-mozilla-firefox + +# Figure out if this is a beta, or a release: +if echo $VERSION | grep -q b ; then # we think it is a beta + if bzgrep -q mozilla-beta/ $CWD/firefox-$VERSION.source.tar.bz2 ; then + MOZVERS=${MOZVERS:-beta} + else # blindly assume it is a release + MOZVERS=${MOZVERS:-release} + fi +else # release, no "b" in the tarball version: + MOZVERS=${MOZVERS:-release} +fi + # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -33,12 +51,6 @@ if [ -z "$ARCH" ]; then *) export ARCH=$( uname -m ) ;; esac fi -BUILD=${BUILD:-2} - -MOZVERS=${MOZVERS:-2.0} -RELEASEVER=$(echo $VERSION | cut -f 1 -d r) - -NUMJOBS=${NUMJOBS:-" -j7 "} # Try to be gentle to the compiler, no optimizations: if [ "$ARCH" = "i486" ]; then @@ -58,9 +70,7 @@ elif [ "$ARCH" = "armel" ]; then LIBDIRSUFFIX="" fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-mozilla-firefox +NUMJOBS=${NUMJOBS:-" -j7 "} rm -rf $PKG mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX} @@ -92,12 +102,27 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +if gcc --version | grep -q "gcc (GCC) 4.7.0" ; then + # Enable compiling with gcc-4.7.0: + sed -i '/fcntl.h/a#include ' \ + ipc/chromium/src/base/{file_util_linux,message_pump_libevent,process_util_posix}.cc && + sed -i '/sys\/time\.h/a#include ' ipc/chromium/src/base/time_posix.cc && + sed -i 's#\"PRIxPTR#\" PRIxPTR#' layout/base/tests/TestPoisonArea.cpp && + sed -i 's# ""##' browser/base/Makefile.in +fi + +# Mozilla devs enforce using an objdir for building +# and launching configure with the absolute path +# https://developer.mozilla.org/en/Configuring_Build_Options#Building_with_an_objdir +mkdir obj +cd obj export MOZILLA_OFFICIAL="1" && export BUILD_OFFICIAL="1" && export MOZ_PHOENIX="1" && export CFLAGS="$SLKCFLAGS" && export CXXFLAGS="$SLKCFLAGS" && -./configure \ +export MOZ_MAKE_FLAGS="$NUMJOBS" && +$TMP/mozilla-$MOZVERS/configure \ --enable-official-branding \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -105,7 +130,6 @@ export CXXFLAGS="$SLKCFLAGS" && --with-system-zlib \ --enable-application=browser \ --enable-default-toolkit=cairo-gtk2 \ - --enable-system-cairo \ --enable-startup-notification \ --enable-crypto \ --enable-svg \ @@ -121,6 +145,7 @@ export CXXFLAGS="$SLKCFLAGS" && --enable-single-profile \ --disable-ldap \ --disable-accessibility \ + --disable-crashreporter \ --disable-debug \ --disable-tests \ --disable-pedantic \ @@ -131,10 +156,17 @@ export CXXFLAGS="$SLKCFLAGS" && # Complains about missing APNG support in Slackware's libpng: #--with-system-png \ +# This option breaks mozilla-12.0: +# --enable-system-cairo \ +# + #make -f client.mk build MOZ_MAKE_FLAGS="$NUMJOBS" || exit 1 -make MOZ_MAKE_FLAGS="$NUMJOBS" || exit 1 +make MOZ_MAKE_FLAGS="$NUMJOBS" $NUMJOBS || exit 1 make install DESTDIR=$PKG || exit 1 +# Exit obj directory: +cd .. + # We don't need these (just symlinks anyway): rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/firefox-devel-$RELEASEVER @@ -146,11 +178,13 @@ rm -rf $PKG/usr/include if [ -d defaults/profile ]; then zcat $CWD/mimeTypes.rdf > defaults/profile/mimeTypes.rdf || exit 1 fi - zcat $CWD/firefox.moz_plugin_path.diff.gz \ - | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \ - | patch -p1 --verbose --backup --suffix=.orig || exit 1 + # OK, this patch is useless on 7.x. We'll float without it and see what happens. + # Perhaps it won't make a difference or should be worked around elsewhere. + #zcat $CWD/firefox.moz_plugin_path.diff.gz \ + # | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \ + # | patch -p1 --verbose --backup --suffix=.orig || exit 1 # Clean up if the above patch was successful: - rm -f firefox.orig + #rm -f firefox.orig ) || exit mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins diff --git a/source/xap/mozilla-thunderbird/mimeTypes.rdf b/source/xap/mozilla-thunderbird/mimeTypes.rdf deleted file mode 100644 index 366df44b..00000000 --- a/source/xap/mozilla-thunderbird/mimeTypes.rdf +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/xap/mozilla-thunderbird/mozilla-firefox.xpcom_arm.patch b/source/xap/mozilla-thunderbird/mozilla-firefox.xpcom_arm.patch new file mode 100644 index 00000000..7309b55a --- /dev/null +++ b/source/xap/mozilla-thunderbird/mozilla-firefox.xpcom_arm.patch @@ -0,0 +1,18 @@ +--- a/xpcom/glue/objs.mk ++++ a/xpcom/glue/objs.mk +@@ -71,13 +71,13 @@ XPCOM_GLUENS_SRC_LCPPSRCS = \ + SSE.cpp \ + unused.cpp \ + nsProxyRelease.cpp \ + nsTextFormatter.cpp \ + GenericFactory.cpp \ + FileUtils.cpp \ + $(NULL) + +-ifeq (arm,$(TARGET_CPU)) ++ifneq (,$(filter arm%,$(TARGET_CPU))) + XPCOM_GLUENS_SRC_LCPPSRCS += arm.cpp + endif + + XPCOM_GLUENS_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/,$(XPCOM_GLUENS_SRC_LCPPSRCS)) + diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index d36fe937..f0e910c4 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,26 +20,43 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2012 by Eric Hameleers for ARM port. + # Thanks to the folks at the Mozilla Foundation for permission to # distribute this, and for all the great work! :-) -VERSION=$(basename $(ls thunderbird-*.tar.bz2 | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source) -BUILD=${BUILD:-2} +TARBALLVER=$(basename $(ls thunderbird-*.tar.bz2 | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source) +# Strip the end from beta versions: +VERSION=$(echo $TARBALLVER | cut -f 1 -d b) +BUILD=${BUILD:-1} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-mozilla-thunderbird + +# Figure out if this is a beta, or a release: +if echo $TARBALLVER | grep -q b ; then # we think it is a beta + if bzgrep -q comm-beta/ $CWD/thunderbird-$TARBALLVER.source.tar.bz2 ; then + MOZVERS=${MOZVERS:-beta} + else # blindly assume it is a release + MOZVERS=${MOZVERS:-release} + fi +else # release, no "b" in the tarball version: + MOZVERS=${MOZVERS:-release} +fi # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -MOZVERS=${MOZVERS:-1.9.2} - -NUMJOBS=${NUMJOBS:-" -j7 "} - # Try to be gentle to the compiler, no optimizations: if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O" @@ -56,18 +73,19 @@ elif [ "$ARCH" = "arm" ]; then elif [ "$ARCH" = "armel" ]; then SLKCFLAGS="-O2 -march=armv4t" LIBDIRSUFFIX="" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-mozilla-thunderbird +NUMJOBS=${NUMJOBS:-" -j7 "} rm -rf $PKG mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX} cd $TMP rm -rf comm-$MOZVERS -tar xvf $CWD/thunderbird-$VERSION.source.tar.bz2 || exit 1 +tar xvf $CWD/thunderbird-$TARBALLVER.source.tar.bz2 || exit 1 cd comm-$MOZVERS || exit 1 # Fix a long standing bug that's prevented staying current on GTK+. @@ -80,6 +98,16 @@ endif EOF +# Arch-dependent patches: +case "$ARCH" in + armv7hl) ARCH_CONFIG="--with-arch=armv7-a --with-float-abi=hard --with-fpu=vfpv3-d16 --disable-elf-hack" + # Make firefox compile on ARM platforms lacking neon support: + zcat $CWD/mozilla-firefox.xpcom_arm.patch.gz | patch -p1 --verbose || exit 1 + ;; + *) ARCH_CONFIG=" " + ;; +esac + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -87,12 +115,38 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +if gcc --version | grep -q "gcc (GCC) 4.7.0" ; then + # Enable compiling with gcc-4.7.0: + sed -i '/fcntl.h/a#include ' \ + mozilla/ipc/chromium/src/base/{file_util_linux,message_pump_libevent,process_util_posix}.cc && + sed -i '/sys\/time\.h/a#include ' mozilla/ipc/chromium/src/base/time_posix.cc && + sed -i 's#\"PRIxPTR#\" PRIxPTR#g' mozilla/layout/base/tests/TestPoisonArea.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/base/search/src/nsMsgSearchAdapter.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/base/src/nsMsgFolderCompactor.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/compose/src/nsSmtpProtocol.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/imap/src/nsImapMailFolder.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/imap/src/nsImapProtocol.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/imap/src/nsImapServerResponseParser.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/local/src/nsPop3Protocol.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/mime/src/mimedrft.cpp && + sed -i 's#\"MSG_LINEBREAK#\" MSG_LINEBREAK#g' mailnews/mime/src/mimemult.cpp && + sed -i 's#\"MSG_LINEBREAK#\" MSG_LINEBREAK#g' mailnews/base/src/nsMsgFolderCompactor.cpp && + sed -i 's# ""##' mozilla/browser/base/Makefile.in +fi + +# Mozilla devs enforce using an objdir for building +# and launching configure with the absolute path +# https://developer.mozilla.org/en/Configuring_Build_Options#Building_with_an_objdir +mkdir obj +cd obj +export MOZILLA_DIR=$TMP/comm-$MOZVERS/mozilla && export MOZILLA_OFFICIAL="1" && export BUILD_OFFICIAL="1" && export MOZ_PHOENIX="1" && export CFLAGS="$SLKCFLAGS" && export CXXFLAGS="$SLKCFLAGS" && -./configure \ +export MOZ_MAKE_FLAGS="$NUMJOBS" && +$TMP/comm-$MOZVERS/configure \ --enable-official-branding \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -102,19 +156,19 @@ export CXXFLAGS="$SLKCFLAGS" && --enable-default-toolkit=cairo-gtk2 \ --enable-startup-notification \ --enable-crypto \ + --enable-ldap \ + --enable-libxul \ --enable-svg \ --enable-canvas \ --enable-xft \ --enable-xinerama \ - --enable-ldap \ --enable-optimize \ --enable-reorder \ - --enable-static \ --enable-strip \ - --enable-system-cairo \ --enable-cpp-rtti \ --enable-single-profile \ --disable-accessibility \ + --disable-crashreporter \ --disable-debug \ --disable-tests \ --disable-logging \ @@ -123,21 +177,28 @@ export CXXFLAGS="$SLKCFLAGS" && --disable-profilesharing # Complains about missing APNG support in Slackware's libpng: #--with-system-png \ + # Broken with 12.0: + #--enable-system-cairo \ #make -f client.mk build MOZ_MAKE_FLAGS="$NUMJOBS" || exit 1 -make MOZ_MAKE_FLAGS="$NUMJOBS" || exit 1 +make $NUMJOBS || exit 1 make install DESTDIR=$PKG || exit 1 +# Exit obj directory: +cd .. + # We don't need these (just symlinks anyway): rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/thunderbird-devel-$VERSION # Nor these: rm -rf $PKG/usr/include -( cd $PKG/usr/lib${LIBDIRSUFFIX}/thunderbird-$VERSION - cp -a defaults/profile/mimeTypes.rdf defaults/profile/mimeTypes.rdf.orig - zcat $CWD/mimeTypes.rdf > defaults/profile/mimeTypes.rdf || exit 1 -) || exit 1 +# Thunderbird 3.x cruft? +# If we still need something like this (and you know what we need :), let me know. +#( cd $PKG/usr/lib${LIBDIRSUFFIX}/thunderbird-$VERSION +# cp -a defaults/profile/mimeTypes.rdf defaults/profile/mimeTypes.rdf.orig +# zcat $CWD/mimeTypes.rdf > defaults/profile/mimeTypes.rdf || exit 1 +#) || exit 1 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins mkdir -p $PKG/usr/share/applications @@ -176,5 +237,5 @@ mkdir $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/mozilla-thunderbird-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/mozilla-thunderbird-$TARBALLVER-$ARCH-$BUILD.txz diff --git a/source/xap/network-manager-applet/doinst.sh b/source/xap/network-manager-applet/doinst.sh new file mode 100644 index 00000000..6da6f0c0 --- /dev/null +++ b/source/xap/network-manager-applet/doinst.sh @@ -0,0 +1,20 @@ +schema_install() { + SCHEMA="$1" + GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \ + chroot . gconftool-2 --makefile-install-rule \ + /etc/gconf/schemas/$SCHEMA \ + 1>/dev/null 2> /dev/null +} + +schema_install nm-applet.schemas + +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications 1>/dev/null 2> /dev/null +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor 1>/dev/null 2> /dev/null + fi +fi + diff --git a/source/xap/network-manager-applet/network-manager-applet.SlackBuild b/source/xap/network-manager-applet/network-manager-applet.SlackBuild new file mode 100755 index 00000000..70221596 --- /dev/null +++ b/source/xap/network-manager-applet/network-manager-applet.SlackBuild @@ -0,0 +1,109 @@ +#!/bin/sh + +# Slackware build script for network-manager-applet + +# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=network-manager-applet +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --with-gtkver=2 \ + --disable-static \ + --disable-schemas-install \ + --enable-more-warnings=no \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS CONTRIBUTING COPYING ChangeLog INSTALL NEWS README \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xap/network-manager-applet/slack-desc b/source/xap/network-manager-applet/slack-desc new file mode 100644 index 00000000..ad8c8f7d --- /dev/null +++ b/source/xap/network-manager-applet/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +network-manager-applet: network-manager-applet (NetworkManager Applet) +network-manager-applet: +network-manager-applet: nm-applet is a gui frontend for NetworkManager. +network-manager-applet: +network-manager-applet: +network-manager-applet: +network-manager-applet: +network-manager-applet: +network-manager-applet: +network-manager-applet: +network-manager-applet: diff --git a/source/xap/pan/pan.SlackBuild b/source/xap/pan/pan.SlackBuild index 0aab423c..b3bbe857 100755 --- a/source/xap/pan/pan.SlackBuild +++ b/source/xap/pan/pan.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -59,6 +59,8 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION || exit 1 +zcat $CWD/pan.gcc47.diff.gz | patch -p1 --verbose || exit 1 + # Make sure ownerships and permissions are sane: chown -R root:root . find . \ @@ -74,6 +76,7 @@ CFLAGS="$SLKCFLAGS" \ --localstatedir=/var/lib \ --sysconfdir=/etc \ --mandir=/usr/man \ + --with-gnutls \ --program-prefix= \ --program-suffix= \ --build=$ARCH-slackware-linux diff --git a/source/xap/pan/pan.gcc47.diff b/source/xap/pan/pan.gcc47.diff new file mode 100644 index 00000000..5c57a381 --- /dev/null +++ b/source/xap/pan/pan.gcc47.diff @@ -0,0 +1,10 @@ +--- ./pan/data/cert-store.cc.orig 2012-06-29 17:24:54.000000000 -0500 ++++ ./pan/data/cert-store.cc 2012-07-10 12:43:12.768183671 -0500 +@@ -20,6 +20,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#include + #include + + //#include diff --git a/source/xap/pan/slack-desc b/source/xap/pan/slack-desc index c4336adb..77372ab9 100644 --- a/source/xap/pan/slack-desc +++ b/source/xap/pan/slack-desc @@ -15,5 +15,5 @@ pan: pan: pan: pan: -pan: +pan: Homepage: http://pan.rebelbase.com pan: diff --git a/source/xap/pidgin/fix-gmain_h-compile-error.diff b/source/xap/pidgin/fix-gmain_h-compile-error.diff new file mode 100644 index 00000000..1e313cde --- /dev/null +++ b/source/xap/pidgin/fix-gmain_h-compile-error.diff @@ -0,0 +1,17 @@ +Since glib-2.32, this is a common error: + In file included from rsa_nss.c:27:0: + /usr/include/glib-2.0/glib/gmain.h:21:2: error: #error "Only can be included directly." +Let's fix it :) + +diff -Nur pidgin-encryption-3.1.orig/rsa_nss.c pidgin-encryption-3.1/rsa_nss.c +--- pidgin-encryption-3.1.orig/rsa_nss.c 2010-04-25 20:53:46.000000000 -0500 ++++ pidgin-encryption-3.1/rsa_nss.c 2012-05-01 22:58:18.033710803 -0500 +@@ -24,7 +24,7 @@ + #include + #include + +-#include "glib/gmain.h" ++#include + + #include + #include diff --git a/source/xap/pidgin/pidgin.SlackBuild b/source/xap/pidgin/pidgin.SlackBuild index bfefef2e..5fa20495 100755 --- a/source/xap/pidgin/pidgin.SlackBuild +++ b/source/xap/pidgin/pidgin.SlackBuild @@ -79,9 +79,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Allow certificates signed with rsa-md5: -zcat $CWD/purple-allow-sign-rsa-md5.patch.gz | patch -p0 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -92,8 +89,12 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-dot=no \ --disable-schemas-install \ --enable-dbus \ - --enable-gnutls=yes \ - --enable-nss=no \ + --enable-gnutls=no \ + --enable-nss=yes \ + --with-nss-includes="$(pkg-config --variable=includedir nss)" \ + --with-nss-libs=/usr/lib${LIBDIRSUFFIX}/ \ + --with-nspr-includes="$(pkg-config --variable=includedir nspr)" \ + --with-nspr-libs=/usr/lib${LIBDIRSUFFIX}/ \ --disable-vv \ --enable-gtkspell \ --enable-cyrus-sasl \ @@ -113,9 +114,9 @@ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 # Fix misplaced items: -eval $(perl '-V:archlib') +eval $(perl '-V:installvendorlib') eval $(perl '-V:privlib') -VENDORPERL="$(echo $archlib | sed -e "s/perl5/perl5\/vendor_perl/")" +VENDORPERL="$(echo $installvendorlib)" mkdir -vpm755 $PKG/$VENDORPERL/ find $PKG -type f -name perllocal.pod -exec mv -fv {} $PKG/$VENDORPERL/Pidgin.pod \; @@ -156,6 +157,7 @@ done rm -rf pidgin-encryption-$PIDGINENC tar xvf $CWD/pidgin-encryption-$PIDGINENC.tar.gz || exit 1 cd pidgin-encryption-$PIDGINENC + zcat $CWD/fix-gmain_h-compile-error.diff.gz | patch -p1 --verbose || exit 1 PIDGIN_CFLAGS="-I${PKG}/usr/include/pidgin" \ PIDGIN_LIBS="-L${PKG}/usr/lib${LIBDIRSUFFIX}" \ PURPLE_CFLAGS="-I${PKG}/usr/include/libpurple" \ @@ -164,10 +166,10 @@ done --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --disable-static \ - --with-nss-includes=/usr/include/seamonkey/nss \ - --with-nspr-includes=/usr/include/seamonkey/nspr \ - --with-nss-libs=/usr/lib${LIBDIRSUFFIX}/seamonkey/ \ - --with-nspr-libs=/usr/lib${LIBDIRSUFFIX}/seamonkey/ \ + --with-nss-includes="$(pkg-config --variable=includedir nss)" \ + --with-nss-libs=/usr/lib${LIBDIRSUFFIX}/ \ + --with-nspr-includes="$(pkg-config --variable=includedir nspr)" \ + --with-nspr-libs=/usr/lib${LIBDIRSUFFIX}/ \ --program-prefix="" \ --program-suffix="" \ --build=$ARCH-slackware-linux$ARCHQUADLET || exit 1 diff --git a/source/xap/pidgin/purple-allow-sign-rsa-md5.patch b/source/xap/pidgin/purple-allow-sign-rsa-md5.patch deleted file mode 100644 index d882a6e8..00000000 --- a/source/xap/pidgin/purple-allow-sign-rsa-md5.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libpurple/plugins/ssl/ssl-gnutls.c.old 2008-10-17 18:58:31.000000000 +0200 -+++ libpurple/plugins/ssl/ssl-gnutls.c 2008-10-17 18:53:03.000000000 +0200 -@@ -693,7 +693,8 @@ - (Verisign and possibly others have - root certificates that predate the - current standard) */ -- GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT, -+ GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT -+ | GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD5, - &verify); - - if (ret != 0) { diff --git a/source/xap/rdesktop/rdesktop.CVE-2011-1595.diff b/source/xap/rdesktop/rdesktop.CVE-2011-1595.diff deleted file mode 100644 index 0db8c3bc..00000000 --- a/source/xap/rdesktop/rdesktop.CVE-2011-1595.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- ./disk.c.orig 2008-02-15 18:13:25.000000000 -0600 -+++ ./disk.c 2011-04-20 20:27:55.978000772 -0500 -@@ -356,6 +356,19 @@ - filename[strlen(filename) - 1] = 0; - sprintf(path, "%s%s", g_rdpdr_device[device_id].local_path, filename); - -+ /* Protect against mailicous servers: -+ somelongpath/.. not allowed -+ somelongpath/../b not allowed -+ somelongpath/..b in principle ok, but currently not allowed -+ somelongpath/b.. ok -+ somelongpath/b..b ok -+ somelongpath/b../c ok -+ */ -+ if (strstr(path, "/..")) -+ { -+ return RD_STATUS_ACCESS_DENIED; -+ } -+ - switch (create_disposition) - { - case CREATE_ALWAYS: diff --git a/source/xap/rdesktop/rdesktop.SlackBuild b/source/xap/rdesktop/rdesktop.SlackBuild index 5e1ae2e2..ba6c6772 100755 --- a/source/xap/rdesktop/rdesktop.SlackBuild +++ b/source/xap/rdesktop/rdesktop.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,8 @@ PKGNAM=rdesktop -VERSION=${VERSION:-1.6.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -56,11 +56,9 @@ mkdir -p $TMP $PKG cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION || exit 1 -zcat $CWD/rdesktop.CVE-2011-1595.diff.gz | patch -p1 --verbose || exit 1 - # Make sure ownerships and permissions are sane: chown -R root:root . find . \ @@ -76,6 +74,7 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --with-sound=alsa \ --enable-smartcard \ + --with-ipv6 \ --mandir=/usr/man \ --build=$ARCH-slackware-linux diff --git a/source/xap/rxvt/rxvt.SlackBuild b/source/xap/rxvt/rxvt.SlackBuild index 81d39485..defc62b5 100755 --- a/source/xap/rxvt/rxvt.SlackBuild +++ b/source/xap/rxvt/rxvt.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,18 +21,39 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.7.10 -ARCH=${ARCH:-x86_64} +PKGNAM=rxvt +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-4} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + NUMJOBS=${NUMJOBS:-" -j7 "} -if [ "$ARCH" = "i486" ]; then +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" +elif [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" +else + SLKCFLAGS="-O2" fi CWD=$(pwd) diff --git a/source/xap/sane/sane-backends-1.0.22-v4l.diff b/source/xap/sane/sane-backends-1.0.22-v4l.diff new file mode 100644 index 00000000..4e240e0c --- /dev/null +++ b/source/xap/sane/sane-backends-1.0.22-v4l.diff @@ -0,0 +1,64 @@ +From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Mon, 14 Mar 2011 13:35:05 +0100 +Subject: [PATCH] patch: v4l + +Squashed commit of the following: + +commit 23381932c76846191b42a48e505b37cd74711265 +Author: Julien BLACHE +Date: Wed Feb 16 19:37:43 2011 +0100 + + Fix v4l build with libv4l 0.8.3+ + + (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953) + + Conflicts: + + ChangeLog + + Signed-off-by: Nils Philippsen +--- + backend/v4l.c | 3 +-- + backend/v4l.h | 3 ++- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/backend/v4l.c b/backend/v4l.c +index 6510ef0..38595ed 100644 +--- a/backend/v4l.c ++++ b/backend/v4l.c +@@ -84,9 +84,8 @@ + #include "../include/sane/sanei_config.h" + #define V4L_CONFIG_FILE "v4l.conf" + +-#include "v4l.h" +- + #include ++#include "v4l.h" + + static const SANE_Device **devlist = NULL; + static int num_devices; +diff --git a/backend/v4l.h b/backend/v4l.h +index 588b96e..6aee586 100644 +--- a/backend/v4l.h ++++ b/backend/v4l.h +@@ -29,6 +29,7 @@ + #ifndef v4l_h + #define v4l_h + ++#ifndef __LINUX_VIDEODEV_H + /* Kernel interface */ + /* Only the stuff we need. For more features, more defines are needed */ + +@@ -165,7 +166,7 @@ struct video_channel + + + /* end of kernel interface */ +- ++#endif /* !__LINUX_VIDEODEV_H */ + + #include <../include/sane/sane.h> + +-- +1.7.4 + diff --git a/source/xap/sane/sane.SlackBuild b/source/xap/sane/sane.SlackBuild index 613393dc..be9dd725 100755 --- a/source/xap/sane/sane.SlackBuild +++ b/source/xap/sane/sane.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ VERSION=1.0.22 BACKVER=1.0.22 FRONTVER=1.0.14 -BUILD=${BUILD:-2} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -69,6 +69,9 @@ chown -R root:root . # everything else catches up with the API change... zcat $CWD/sane-frontends-1.0.14-sane_cap_always_settable.diff.gz | patch -p1 || exit 1 +# Fix building against v4l-utils-0.8.3: +zcat $CWD/sane-backends-1.0.22-v4l.diff.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -87,16 +90,25 @@ make $NUMJOBS || make || exit 1 make install || exit 1 make install DESTDIR=$PKG || exit 1 -# Add the default udev rules +# Add the default udev rules. Use group "lp" rather than "scanner" to avoid +# breaking CUPS access for multifunction printer/scanner devices (possibly +# the most common type of scanner these days) mkdir -p $PKG/lib/udev/rules.d -cat tools/udev/libsane.rules > $PKG/lib/udev/rules.d/80-libsane.rules +cat tools/udev/libsane.rules \ + | sed -e "s/GROUP=\"scanner\"/GROUP=\"lp\"/g" \ + | sed -e "s/MODE=\"0664\"/MODE=\"0660\"/g" \ + > $PKG/lib/udev/rules.d/80-libsane.rules -# Add the hal fdi file +# Add the hal fdi file: mkdir -p $PKG/usr/share/hal/fdi/policy/10osvendor/ cat tools/hal/libsane.fdi \ > $PKG/usr/share/hal/fdi/policy/10osvendor/10-libsane.fdi -# Now let's build the frontends +# Install the pkgconfig file: +install -D -m644 tools/sane-backends.pc \ + $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/sane-backends.pc + +# Now let's build the frontends: cd $TMP rm -rf sane-frontends-$FRONTVER tar xvf $CWD/sane-frontends-$FRONTVER.tar.bz2 || exit 1 diff --git a/source/xap/seamonkey/pkgconfig/seamonkey-libxul.pc b/source/xap/seamonkey/pkgconfig/seamonkey-libxul.pc new file mode 100644 index 00000000..0c990042 --- /dev/null +++ b/source/xap/seamonkey/pkgconfig/seamonkey-libxul.pc @@ -0,0 +1,11 @@ +prefix=/usr +libdir=/usr/@LIB@/seamonkey-@VERSION@ +includedir=/usr/include/seamonkey-@VERSION@ +idldir=/usr/share/idl/seamonkey-@VERSION@ + +Name: libxul +Description: The Mozilla Runtime and Embedding Engine +Version: @VERSION@ +Requires: seamonkey-nspr >= 4.7.1 +Libs: -L${libdir} -lxul -lxpcom +Cflags: -I${includedir} -fshort-wchar diff --git a/source/xap/seamonkey/pkgconfig/seamonkey-nss.pc b/source/xap/seamonkey/pkgconfig/seamonkey-nss.pc index b929f202..f5bf0993 100644 --- a/source/xap/seamonkey/pkgconfig/seamonkey-nss.pc +++ b/source/xap/seamonkey/pkgconfig/seamonkey-nss.pc @@ -7,5 +7,5 @@ Name: NSS Description: Mozilla Network Security Services Version: @VERSION@ Requires: seamonkey-nspr >= 4.7.1 -Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3 +Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3 -lnssutil3 Cflags: -I${includedir}/nss diff --git a/source/xap/seamonkey/pkgconfig/seamonkey-plugin.pc b/source/xap/seamonkey/pkgconfig/seamonkey-plugin.pc index 4550444a..bbdb1f41 100644 --- a/source/xap/seamonkey/pkgconfig/seamonkey-plugin.pc +++ b/source/xap/seamonkey/pkgconfig/seamonkey-plugin.pc @@ -7,4 +7,4 @@ Name: Mozilla Plug-In API Description: Mozilla Plug-In API Version: @VERSION@ Requires: seamonkey-nspr >= 4.7.1 -Cflags: -I${includedir}/java -I${includedir}/plugin +Cflags: -I${includedir}/java -I${includedir}/plugin -DXP_UNIX diff --git a/source/xap/seamonkey/seamonkey.SlackBuild b/source/xap/seamonkey/seamonkey.SlackBuild index 6b4173e2..afc1bc96 100755 --- a/source/xap/seamonkey/seamonkey.SlackBuild +++ b/source/xap/seamonkey/seamonkey.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-$(basename $(ls seamonkey-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)} -COMM=${COMM:-central} -BUILD=${BUILD:-2} +TARBALLVER=${VERSION:-$(basename $(ls seamonkey-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)} +# Strip the end from beta versions: +VERSION=$(echo $TARBALLVER | cut -f 1 -d b) +COMM=${COMM:-release} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -50,7 +52,7 @@ mkdir -p $TMP $PKG/usr cd $TMP rm -rf comm-$COMM -tar xvf $CWD/seamonkey-${VERSION}.source.tar.?z* || exit 1 +tar xvf $CWD/seamonkey-${TARBALLVER}.source.tar.?z* || exit 1 cd comm-$COMM || exit 1 # Make sure the perms/ownerships are sane: @@ -71,15 +73,45 @@ endif EOF +if gcc --version | grep -q "gcc (GCC) 4.7.0" ; then + # Enable compiling with gcc-4.7.0: + sed -i '/fcntl.h/a#include ' \ + mozilla/ipc/chromium/src/base/{file_util_linux,message_pump_libevent,process_util_posix}.cc && + sed -i '/sys\/time\.h/a#include ' mozilla/ipc/chromium/src/base/time_posix.cc && + sed -i 's#\"PRIxPTR#\" PRIxPTR#g' mozilla/layout/base/tests/TestPoisonArea.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/base/search/src/nsMsgSearchAdapter.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/base/src/nsMsgFolderCompactor.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/compose/src/nsSmtpProtocol.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/imap/src/nsImapMailFolder.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/imap/src/nsImapProtocol.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/imap/src/nsImapServerResponseParser.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/local/src/nsPop3Protocol.cpp && + sed -i 's#\"CRLF#\" CRLF#g' mailnews/mime/src/mimedrft.cpp && + sed -i 's#\"MSG_LINEBREAK#\" MSG_LINEBREAK#g' mailnews/mime/src/mimemult.cpp && + sed -i 's#\"MSG_LINEBREAK#\" MSG_LINEBREAK#g' mailnews/base/src/nsMsgFolderCompactor.cpp && + sed -i 's# ""##' mozilla/browser/base/Makefile.in +fi + chown -R root:root . + +# Mozilla devs enforce using an objdir for building +# and launching configure with the absolute path +# https://developer.mozilla.org/en/Configuring_Build_Options#Building_with_an_objdir +mkdir obj +cd obj BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 \ -./configure --prefix=/usr \ +$TMP/comm-$COMM/configure \ + --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --enable-optimize=-O2 \ + --enable-cpp-rtti \ + --enable-default-toolkit=cairo-gtk2 \ + --enable-startup-notification \ --disable-debug \ --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/seamonkey-${VERSION} \ --enable-strip \ --disable-tests \ + --disable-crashreporter \ --enable-svg \ --enable-canvas \ --disable-short-wchar \ @@ -99,6 +131,7 @@ BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 \ --target=$ARCH-slackware-linux \ --build=$ARCH-slackware-linux + # --enable-system-cairo \ # --with-system-png make $NUMJOBS || exit 1 DESTDIR=$PKG make install || exit 1 @@ -113,16 +146,25 @@ cp -aL mozilla/dist/include/*.h $PKG/usr/include/seamonkey-${VERSION} cp -aL mozilla/dist/sdk/include/* $PKG/usr/include/seamonkey-${VERSION} # compat symlinks ( cd $PKG/usr/include/seamonkey-${VERSION} - ln -sf . js + # make install seems to install js headers into a directory now, so don't make a symlink: + #ln -sf . js + # Relocate anything that might be in the nss directory, and replace the directory with a symlink. + # make install was putting an empty directory here, which was breaking other compiles. + if [ -d nss ]; then + mv nss/* . + rmdir nss + fi ln -sf . nss ln -sf . plugin ln -sf . xpcom ) -#( cd $PKG/usr/include/seamonkey-${VERSION}/plugin -# for file in ../j*.h ; do -# ln -sf $file . -# done -#) + +# Exit obj directory: +cd .. + +# We don't need this stuff in the package: +rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/seamonkey-devel-$VERSION + chown -R root:root $PKG/usr/include/seamonkey-${VERSION} find $PKG/usr/include/seamonkey-${VERSION} -name "*.h" -type f -exec chmod 644 {} \; # Create a more generic include files symlink: @@ -144,10 +186,12 @@ done # Add symlinks for the pkgconfig files: ( cd $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig ln -s seamonkey-js.pc js.pc - ln -s seamonkey-nspr.pc nspr.pc - ln -s seamonkey-nss.pc nss.pc + ln -s seamonkey-libxul.pc libxul.pc ln -s seamonkey-plugin.pc plugin.pc ln -s seamonkey-xpcom.pc xpcom.pc + # These are now provided by the mozilla-nss package: + #ln -s seamonkey-nspr.pc nspr.pc + #ln -s seamonkey-nss.pc nss.pc ) # Compress and if needed symlink the man pages: @@ -201,7 +245,7 @@ zcat $CWD/doinst.sh.gz | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \ > $PKG/install/doinst.sh cd $TMP/package-seamonkey -/sbin/makepkg -l y -c n -p $TMP/seamonkey-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n -p $TMP/seamonkey-$TARBALLVER-$ARCH-$BUILD.txz # Create a standalone seamonkey-solibs package for RPM, gxine, etc. rm -r $TMP/package-seamonkey-solibs @@ -231,14 +275,14 @@ seamonkey-solibs: seamonkey-solibs (Shared libraries from Seamonkey) seamonkey-solibs: seamonkey-solibs: This package contains a subset of the shared libraries from Seamonkey seamonkey-solibs: to provide runtime support for programs that require nss, nspr, and -seamonkey-solibs: js. These libraries are used in programs like RPM and gxine, and can -seamonkey-solibs: be used in others. This package is built from the Seamonkey sources -seamonkey-solibs: and is provided as a standalone runtime package for people who do not -seamonkey-solibs: want to install the entire seamonkey package (as for server use). +seamonkey-solibs: js. This package is built from the Seamonkey sources and is provided +seamonkey-solibs: as a standalone runtime package for people who do not want to install +seamonkey-solibs: the entire seamonkey package (as for server use). seamonkey-solibs: seamonkey-solibs: This package is runtime only. The include files and other files for seamonkey-solibs: development can be found in the seamonkey package. +seamonkey-solibs: EOF cd $TMP/package-seamonkey-solibs -/sbin/makepkg -l y -c n -p $TMP/seamonkey-solibs-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n -p $TMP/seamonkey-solibs-$TARBALLVER-$ARCH-$BUILD.txz diff --git a/source/xap/seyon/seyon.SlackBuild b/source/xap/seyon/seyon.SlackBuild index 656d2ff9..f2435b19 100755 --- a/source/xap/seyon/seyon.SlackBuild +++ b/source/xap/seyon/seyon.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2002-2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2002-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,19 +21,45 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +PKGNAM=seyon VERSION=2.20c -ARCH=${ARCH:-x86_64} BUILD=${BUILD:-3} -if [ "$ARCH" = "i486" ]; then +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) diff --git a/source/xap/thunar-volman/slack-desc b/source/xap/thunar-volman/slack-desc deleted file mode 100644 index a5fdf60b..00000000 --- a/source/xap/thunar-volman/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------| -thunar-volman: thunar-volman (Thunar Volume Manager Plugin) -thunar-volman: -thunar-volman: thunar-volman is an extension for the Thunar File Manager, -thunar-volman: which enables automatic management of removable drives and -thunar-volman: media. -thunar-volman: -thunar-volman: It was designed to look and act similar to gnome-volume-manager -thunar-volman: to get consistent removable drive and media management in both -thunar-volman: Xfce and GNOME. -thunar-volman: -thunar-volman: diff --git a/source/xap/thunar-volman/thunar-volman.SlackBuild b/source/xap/thunar-volman/thunar-volman.SlackBuild deleted file mode 100755 index bf14ff9e..00000000 --- a/source/xap/thunar-volman/thunar-volman.SlackBuild +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh - -# Slackware build script for thunar-volman -# http://goodies.xfce.org/releases/thunar-volman/ - -# Copyright 2007-2009 Robby Workman, Northport, Alabama, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PRGNAM=thunar-volman -VERSION=0.3.80 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 -cd $PRGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-debug=no \ - --build=$ARCH-slackware-linux - -make || exit 1 -make install DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \ - $PKG/usr/doc/$PRGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/xap/windowmaker/WindowMaker.noopensusemenu.diff b/source/xap/windowmaker/WindowMaker.noopensusemenu.diff new file mode 100644 index 00000000..e68fa85a --- /dev/null +++ b/source/xap/windowmaker/WindowMaker.noopensusemenu.diff @@ -0,0 +1,14 @@ +--- ./util/wmgenmenu.h.orig 2012-05-24 16:28:16.000000000 -0500 ++++ ./util/wmgenmenu.h 2012-07-29 15:34:37.242208543 -0500 +@@ -458,7 +458,10 @@ + char *OpenSUSE[MAX_NR_APPS][2] = { + { N_("YaST 2"), "yast2" }, + { N_("YaST"), "yast !" }, +- { N_("System Settings"), "systemsettings" }, ++ /* The KDE systemsettings is mistaken for an OpenSUSE tool, and adds */ ++ /* and OpenSUSE menu that starts it. I can't think of any reason */ ++ /* this would be useful under WindowMaker, so I'm commenting it out. */ ++ /* { N_("System Settings"), "systemsettings" }, */ + { N_("UMTSMon"), "umtsmon" }, + { NULL, NULL } + }; diff --git a/source/xap/windowmaker/windowmaker.SlackBuild b/source/xap/windowmaker/windowmaker.SlackBuild index 74462e28..da5ac679 100755 --- a/source/xap/windowmaker/windowmaker.SlackBuild +++ b/source/xap/windowmaker/windowmaker.SlackBuild @@ -21,8 +21,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=20060427cvs -BUILD=${BUILD:-4} +VERSION=${VERSION:-0.95.3} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -59,15 +59,9 @@ mkdir -p $TMP $PKG cd $TMP rm -rf WindowMaker-$VERSION -tar xvf $CWD/WindowMaker-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/WindowMaker-$VERSION.tar.xz || exit 1 cd WindowMaker-$VERSION || exit 1 -zcat $CWD/windowmaker.no-mmx.diff.gz | patch -p1 --verbose -F 3 || exit 1 - -zcat $CWD/windowmaker.png.1.4.0.diff.gz | patch -p1 --verbose || exit 1 - -sh autogen.sh - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -76,7 +70,10 @@ find . \ -exec chmod 644 {} \; # This should be non-interactive where possible. -zcat $CWD/wmaker.inst.diff.gz | patch -p1 --verbose || exit +zcat $CWD/wmaker.inst.diff.gz | patch -p1 --verbose || exit 1 + +# Get rid of OpenSUSE menu: +zcat $CWD/WindowMaker.noopensusemenu.diff.gz | patch -p1 --verbose || exit 1 LINGUAS="$(cd po ; /bin/ls *.po | sed 's/.po//g')" \ GNUSTEP_LOCAL_ROOT=/usr/lib${LIBDIRSUFFIX}/GNUstep \ @@ -87,10 +84,11 @@ NLSDIR=/usr/share/locale \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --sysconfdir=/etc/X11 \ - --enable-gnome \ - --enable-kde \ + --docdir=/usr/doc/WindowMaker-$VERSION \ --enable-usermenu \ - --with-appspath=/usr/lib${LIBDIRSUFFIX}/GNUstep/Applications \ + --enable-xrandr \ + --enable-xinerama \ + --disable-static \ --build=$ARCH-slackware-linux # NLS bugs like -i @@ -100,10 +98,18 @@ make $NUMJOBS || make -i || exit 1 sed -i -e "s#/usr/local/GNUstep/Applications/WPrefs.app/#/usr/lib${LIBDIRSUFFIX}/GNUstep/Applications/WPrefs.app/#" \ $(grep -lr '/usr/local/GNUstep/Applications/WPrefs.app/' *) +# Fix hard coded paths in util/wmgenmenu.c for +# "Configure Window Maker" root menu entry +# Appearance/{Themes, Styles, Icons} entries. + +sed -i -e "s#WMCreatePLString(\"WPrefs\")#WMCreatePLString(\"/usr/lib${LIBDIRSUFFIX}/GNUstep/Applications/WPrefs.app/WPrefs\")#" \ + -e "s#/usr/local/share#/usr/share/#" util/wmgenmenu.c + + make -i install DESTDIR=$PKG mkdir -p $PKG/usr/doc/WindowMaker-$VERSION cp -a \ - AUTHORS BUGFORM BUGS COPYING COPYING.WTFPL FAQ FAQ.I18N FAQ.I18N.cs FAQ.I18N.sk INSTALL INSTALL.cs INSTALL.es INSTALL.fr INSTALL.pt INSTALL.sk MIRRORS NEWS README README.definable-cursor README.pt TODO \ + AUTHORS BUGFORM BUGS COPYING* FAQ* INSTALL* MIRRORS NEWS README* TODO \ $PKG/usr/doc/WindowMaker-$VERSION # If there's a ChangeLog, installing at least part of the recent history @@ -116,7 +122,7 @@ fi cd $TMP rm -rf WindowMaker-extra-0.1 -tar xvf $CWD/WindowMaker-extra-0.1.tar.gz || exit 1 +tar xvf $CWD/WindowMaker-extra-0.1.tar.xz || exit 1 cd WindowMaker-extra-0.1 || exit 1 CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -135,7 +141,20 @@ mkdir -p $PKG/etc/X11/xinit zcat $CWD/xinitrc.wmaker.gz > $PKG/etc/X11/xinit/xinitrc.wmaker chmod 0755 $PKG/etc/X11/xinit/xinitrc.wmaker -gzip -9 $PKG/usr/man/man1/* $PKG/usr/man/sk/man1/* +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/xap/windowmaker/windowmaker.no-mmx.diff b/source/xap/windowmaker/windowmaker.no-mmx.diff deleted file mode 100644 index 277cc79e..00000000 --- a/source/xap/windowmaker/windowmaker.no-mmx.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- ./configure.ac.01 2008-06-02 08:42:30.000000000 +0200 -+++ ./configure.ac 2008-06-02 08:46:49.000000000 +0200 -@@ -190,7 +190,15 @@ - # until we fix it, leave it disabled - asm_support=no - mmx_support=no --if test "$ac_cv_prog_gcc" = yes; then -+ -+check_for_mmx_support=yes -+AC_ARG_ENABLE(mmx, -+ [ --disable-mmx disable compilation of MMX inline assembly ], -+ [if test x$enableval != xyes; then -+ check_for_mmx_support=no -+ fi]) -+ -+if test "$ac_cv_prog_gcc" = yes -a "$check_for_mmx_support" = yes; then - case $host_cpu in - *i?86*) - # gcc-3.3 or newer complains about some of our stuff without this diff --git a/source/xap/windowmaker/windowmaker.png.1.4.0.diff b/source/xap/windowmaker/windowmaker.png.1.4.0.diff deleted file mode 100644 index a6359c4b..00000000 --- a/source/xap/windowmaker/windowmaker.png.1.4.0.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./wrlib/load.c.orig 2008-04-30 15:45:26.000000000 -0500 -+++ ./wrlib/load.c 2010-02-11 15:39:38.000000000 -0600 -@@ -348,7 +348,7 @@ - - #ifdef USE_PNG - /* check for PNG */ -- if (png_check_sig(buffer, 8)) -+ if (!png_sig_cmp(buffer, 0, 8)) - return IM_PNG; - #endif - diff --git a/source/xap/windowmaker/wmaker.inst.diff b/source/xap/windowmaker/wmaker.inst.diff index c80edd34..3fdfe643 100644 --- a/source/xap/windowmaker/wmaker.inst.diff +++ b/source/xap/windowmaker/wmaker.inst.diff @@ -1,10 +1,12 @@ ---- ./util/wmaker.inst.in.orig 2002-05-30 13:13:46.000000000 -0700 -+++ ./util/wmaker.inst.in 2002-05-30 13:16:37.000000000 -0700 -@@ -37,19 +37,7 @@ - make_script() { - ISCRIPT=$1 +diff -Nur WindowMaker-0.95.2.orig/util/wmaker.inst.in WindowMaker-0.95.2/util/wmaker.inst.in +--- WindowMaker-0.95.2.orig/util/wmaker.inst.in 2012-02-14 13:36:01.000000000 -0600 ++++ WindowMaker-0.95.2/util/wmaker.inst.in 2012-02-14 18:25:28.213206250 -0600 +@@ -33,20 +33,7 @@ -- cat << EOF >> $ISCRIPT + make_script() { + ISCRIPT="$1" +- +- cat << EOF >> "$ISCRIPT" -# Window Maker default X session startup script - -PATH="\$PATH:$BINDIR" @@ -12,16 +14,16 @@ -# If you login from xdm, uncomment this to make error messages appear -# in the console window. -# --# tail -f $HOME/.xsession-errors > /dev/console & +-# tail -f "$HOME"/.xsession-errors > /dev/console & - -exec wmaker - -EOF -+ cat /etc/X11/xinit/xinitrc.wmaker >> $ISCRIPT - chmod +rx $ISCRIPT ++ cat /etc/X11/xinit/xinitrc.wmaker >> $ISCRIPT + chmod +rx "$ISCRIPT" } -@@ -329,20 +317,7 @@ +@@ -298,19 +285,7 @@ trap "show_end_message;exit" 2 @@ -38,8 +40,7 @@ - echo "Using .xinitrc as a default value" - file=.xinitrc -fi -- +file=.xinitrc - if [ -f $USERDIR/$file ]; then - mv $USERDIR/$file $USERDIR/$file.old.$DATE - fi + + if [ -f "$USERDIR/$file" ]; then + mv "$USERDIR/$file" "$USERDIR/$file.old.$DATE" diff --git a/source/xap/windowmaker/xinitrc.wmaker b/source/xap/windowmaker/xinitrc.wmaker index 2c43c1eb..386588a4 100644 --- a/source/xap/windowmaker/xinitrc.wmaker +++ b/source/xap/windowmaker/xinitrc.wmaker @@ -36,7 +36,7 @@ fi # Start the window manager: if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then - exec ck-launch-session /usr/bin/wmaker $NOCPP + exec ck-launch-session dbus-launch --exit-with-session /usr/bin/wmaker $NOCPP else - exec /usr/bin/wmaker $NOCPP + exec dbus-launch --exit-with-session /usr/bin/wmaker $NOCPP fi diff --git a/source/xap/x11-ssh-askpass/slack-desc b/source/xap/x11-ssh-askpass/slack-desc index d467253f..49faabba 100644 --- a/source/xap/x11-ssh-askpass/slack-desc +++ b/source/xap/x11-ssh-askpass/slack-desc @@ -5,11 +5,11 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler---------------------------------------------| + |-----handy-ruler------------------------------------------------------| x11-ssh-askpass: x11-ssh-askpass (an X11-based passphrase dialog) x11-ssh-askpass: -x11-ssh-askpass: x11-ssh-askpass is an X11-based passphrase dialog for use -x11-ssh-askpass: with OpenSSH. +x11-ssh-askpass: x11-ssh-askpass is an X11-based passphrase dialog for use with +x11-ssh-askpass: OpenSSH. x11-ssh-askpass: x11-ssh-askpass: x11-ssh-askpass: diff --git a/source/xap/x3270/x3270.SlackBuild b/source/xap/x3270/x3270.SlackBuild index 225142a2..fd2f53fa 100755 --- a/source/xap/x3270/x3270.SlackBuild +++ b/source/xap/x3270/x3270.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,48 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -TARBVER=3.3.7p8 -VERSION=3.3.7p8 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} +PKGNAM=x3270 +VERSION=3.3 +TARBVER=${TARBVER:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=$(echo $TARBVER | cut -f 1,2 -d .) +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi NUMJOBS=${NUMJOBS:-" -j7 "} @@ -35,7 +73,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf x3270-$VERSION -tar xvf $CWD/x3270-$TARBVER.tar.bz2 || exit 1 +tar xvf $CWD/x3270-$TARBVER.tar.?z* || exit 1 cd x3270-3.3 || exit 1 chown -R root:root . find . \ @@ -44,6 +82,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc/X11 \ @@ -54,13 +94,13 @@ make install DESTDIR=$PKG mv $PKG/etc/X11/x3270/ibm_hosts $PKG/etc/X11/x3270/ibm_hosts.new find $PKG -name fonts.dir -exec rm {} \; -if [ -d $PKG/usr/lib/X11/fonts/misc ]; then +if [ -d $PKG/usr/lib$LIBDIRSUFFIX/X11/fonts/misc ]; then mkdir -p $PKG/usr/share/fonts - mv $PKG/usr/lib/X11/fonts/misc $PKG/usr/share/fonts - rmdir $PKG/usr/lib/X11/fonts/misc 2> /dev/null - rmdir $PKG/usr/lib/X11/fonts 2> /dev/null - rmdir $PKG/usr/lib/X11 2> /dev/null - rmdir $PKG/usr/lib 2> /dev/null + mv $PKG/usr/lib$LIBDIRSUFFIX/X11/fonts/misc $PKG/usr/share/fonts + rmdir $PKG/usr/lib$LIBDIRSUFFIX/X11/fonts/misc 2> /dev/null + rmdir $PKG/usr/lib$LIBDIRSUFFIX/X11/fonts 2> /dev/null + rmdir $PKG/usr/lib$LIBDIRSUFFIX/X11 2> /dev/null + rmdir $PKG/usr/lib$LIBDIRSUFFIX 2> /dev/null fi mkdir -p $PKG/etc/X11/app-defaults @@ -75,15 +115,15 @@ for file in x3270-script.man x3270.man x3270if.man ; do done cat ibm_hosts.man | gzip -9c > $PKG/usr/man/man5/ibm_hosts.5.gz -mkdir -p $PKG/usr/doc/x3270-$VERSION +mkdir -p $PKG/usr/doc/x3270-$TARBVER cp -a \ LICENSE README* Examples html \ - $PKG/usr/doc/x3270-$VERSION + $PKG/usr/doc/x3270-$TARBVER mkdir -p $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/x3270-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/x3270-$TARBVER-$ARCH-$BUILD.txz diff --git a/source/xap/xchat/xchat.SlackBuild b/source/xap/xchat/xchat.SlackBuild index cc7b5e1a..c02a71e5 100755 --- a/source/xap/xchat/xchat.SlackBuild +++ b/source/xap/xchat/xchat.SlackBuild @@ -22,7 +22,7 @@ VERSION=2.8.8 -BUILD=${BUILD:-3} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff b/source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff deleted file mode 100644 index 7d92c3e4..00000000 --- a/source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- thunar-vfs/thunar-vfs-io-local.c.old 2008-06-13 12:43:52.000000000 +0200 -+++ thunar-vfs/thunar-vfs-io-local.c 2008-06-13 14:41:46.000000000 +0200 -@@ -301,7 +301,7 @@ - } - - /* check whether we have a hidden file here */ -- if ((s - (const guchar *) name) > 1 && (*name == '.' || *(s - 1) == '~')) -+ if ((s - (const guchar *) name) > 1 && (*name == '.' )) - info->flags = THUNAR_VFS_FILE_FLAGS_HIDDEN; - else - info->flags = THUNAR_VFS_FILE_FLAGS_NONE; -@@ -1029,7 +1029,7 @@ - info->display_name = g_strdup (name); - - /* check if this is a hidden file now */ -- if (strlen (name) > 1 && (name[0] == '.' || name[strlen (name) - 1] == '~')) -+ if (strlen (name) > 1 && (name[0] == '.')) - info->flags |= THUNAR_VFS_FILE_FLAGS_HIDDEN; - else - info->flags &= ~THUNAR_VFS_FILE_FLAGS_HIDDEN; diff --git a/source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff b/source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff deleted file mode 100644 index be64a2da..00000000 --- a/source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff +++ /dev/null @@ -1,24 +0,0 @@ -From b55be8ded0c7e1119eb062a5831b246b618c89e8 Mon Sep 17 00:00:00 2001 -From: Mike Massonnet -Date: Thu, 8 Apr 2010 22:38:50 +0200 -Subject: [PATCH] use right comment character (! and not #) in Xft.xrdb file (bug 6314) - - scripts/Xft.xrdb | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/scripts/Xft.xrdb b/scripts/Xft.xrdb -index af45361..cd26513 100644 ---- a/scripts/Xft.xrdb -+++ b/scripts/Xft.xrdb -@@ -1,7 +1,7 @@ --# Those are fallback settings, use the ui plugin to change it --# or add your overrides to ~/.Xresources --# Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull --# Xft hinting: 1/0 -+! Those are fallback settings, use the ui plugin to change it -+! or add your overrides to ~/.Xresources -+! Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull -+! Xft hinting: 1/0 - - Xft.hinting: 1 - Xft.hintstyle: hintmedium diff --git a/source/xap/xfce/patches/mousepad-fix_find.diff b/source/xap/xfce/patches/mousepad-fix_find.diff deleted file mode 100644 index 6477cd78..00000000 --- a/source/xap/xfce/patches/mousepad-fix_find.diff +++ /dev/null @@ -1,43 +0,0 @@ -commit a6383ccf4e3ba425ffb6489a795785e6a626c048 -Author: Nick Schermer -Date: Tue Jul 6 17:53:54 2010 +0200 - - Also fix find (bug #6544). - -diff --git a/src/search.c b/src/search.c -index 4fb1c5b..91f69cf 100644 ---- a/src/search.c -+++ b/src/search.c -@@ -78,7 +78,7 @@ gboolean document_search_real(StructData *sd, gint direction) - static gint document_replace_real(StructData *sd) - { - GtkTextIter iter, match_start, match_end; -- GtkTextMark *mark_init = NULL; -+ GtkTextMark *mark_init = NULL, *mark_start, *mark_end; - gboolean res; - gint num = 0; - GtkWidget *q_dialog = NULL; -@@ -113,6 +113,11 @@ static gint document_replace_real(StructData *sd) - if (num == 0 && q_dialog == NULL) - q_dialog = create_dialog_message_question( - gtk_widget_get_toplevel(sd->mainwin->textview), _("Replace?")); -+ -+ gtk_text_buffer_get_selection_bounds(textbuffer, &match_start, &match_end); -+ mark_start = gtk_text_buffer_create_mark(textbuffer, NULL, &match_start, FALSE); -+ mark_end = gtk_text_buffer_create_mark(textbuffer, NULL, &match_end, FALSE); -+ - switch (gtk_dialog_run(GTK_DIALOG(q_dialog))) { - case GTK_RESPONSE_CANCEL: - res = 0; -@@ -122,6 +127,11 @@ static gint document_replace_real(StructData *sd) - case GTK_RESPONSE_NO: - continue; - } -+ -+ gtk_text_buffer_get_iter_at_mark(textbuffer, &match_start, mark_start); -+ gtk_text_buffer_get_iter_at_mark(textbuffer, &match_end, mark_end); -+ gtk_text_buffer_move_mark_by_name(textbuffer, "selection_bound", &match_start); -+ gtk_text_buffer_move_mark_by_name(textbuffer, "insert", &match_end); - } - gtk_text_buffer_delete_selection(textbuffer, TRUE, TRUE); - undo_set_sequency(TRUE); diff --git a/source/xap/xfce/patches/mousepad-fix_find_and_replace.diff b/source/xap/xfce/patches/mousepad-fix_find_and_replace.diff deleted file mode 100644 index 5db73b1e..00000000 --- a/source/xap/xfce/patches/mousepad-fix_find_and_replace.diff +++ /dev/null @@ -1,36 +0,0 @@ -commit 80819d447df5661ee6c9e9cd22f501cee612da8b -Author: Lionel Le Folgoc -Date: Mon Jul 5 19:57:53 2010 +0200 - - Fix find and replace (bug #5831). - -diff --git a/src/search.c b/src/search.c -index 07e29c7..4fb1c5b 100644 ---- a/src/search.c -+++ b/src/search.c -@@ -210,8 +210,11 @@ gint run_dialog_find(StructData *sd) - G_CALLBACK(toggle_sensitivity), NULL); - g_signal_connect(G_OBJECT(entry_find), "delete-text", - G_CALLBACK(toggle_sensitivity), NULL); -- if (sd->search.string_find) -+ if (sd->search.string_find) { - gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find); -+ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), -+ GTK_RESPONSE_OK, TRUE); -+ } - - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); - gtk_entry_set_activates_default(GTK_ENTRY(entry_find), TRUE); -@@ -275,8 +278,11 @@ gint run_dialog_replace(StructData *sd) - G_CALLBACK(toggle_sensitivity), NULL); - g_signal_connect(G_OBJECT(entry_find), "delete-text", - G_CALLBACK(toggle_sensitivity), NULL); -- if (sd->search.string_find) -+ if (sd->search.string_find) { - gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find); -+ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), -+ GTK_RESPONSE_OK, TRUE); -+ } - label_replace = gtk_label_new_with_mnemonic(_("Re_place with: ")); - gtk_misc_set_alignment(GTK_MISC(label_replace), 0, 0.5); - gtk_table_attach_defaults(GTK_TABLE(table), label_replace, 0, 1, 1, 2); diff --git a/source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch b/source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch deleted file mode 100644 index 6e5b4a9a..00000000 --- a/source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8ae5177d843802b49e90ecf801d8a4fac00b866a Mon Sep 17 00:00:00 2001 -From: Robby Workman -Date: Tue, 22 Feb 2011 21:48:56 -0600 -Subject: [PATCH] panel/panel.c: Don't make panel insensitive during plugin moves - -This fixes http://bugzilla.xfce.org/show_bug.cgi?id=6818 while -working around https://bugzilla.gnome.org/show_bug.cgi?id=634765 ---- - panel/panel.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/panel/panel.c b/panel/panel.c -index fa0709b..e7a9eac 100644 ---- a/panel/panel.c -+++ b/panel/panel.c -@@ -811,7 +811,6 @@ _item_start_move (GtkWidget *item, - - if (!priv->edit_mode) - { -- panel_set_items_sensitive (p, FALSE); - xfce_itembar_raise_event_window (XFCE_ITEMBAR (priv->itembar)); - panel_block_autohide (p); - } --- -1.7.4.1 - diff --git a/source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff b/source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff deleted file mode 100644 index 7315ecea..00000000 --- a/source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff +++ /dev/null @@ -1,384 +0,0 @@ -diff -Nur Thunar-1.0.2.orig//Makefile.in Thunar-1.0.2/Makefile.in ---- Thunar-1.0.2.orig//Makefile.in 2010-05-21 12:11:02.000000000 -0500 -+++ Thunar-1.0.2/Makefile.in 2010-05-23 17:44:59.068552125 -0500 -@@ -1040,7 +1040,7 @@ - - ThunarHelp: ThunarHelp.in Makefile - rm -f ThunarHelp.gen ThunarHelp -- sed -e "s,\@datadir\@,$(datadir),g" \ -+ sed -e "s,\@htmldir\@,$(htmldir),g" \ - < $(srcdir)/ThunarHelp.in \ - > ThunarHelp.gen - mv ThunarHelp.gen ThunarHelp -diff -Nur Thunar-1.0.2.orig//ThunarHelp.in Thunar-1.0.2/ThunarHelp.in ---- Thunar-1.0.2.orig//ThunarHelp.in 2010-05-21 12:10:52.000000000 -0500 -+++ Thunar-1.0.2/ThunarHelp.in 2010-05-23 17:45:26.207677481 -0500 -@@ -19,7 +19,7 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - # - --HELPDIR="@datadir@/doc/Thunar/html/" -+HELPDIR="@htmldir@/" - - if test -n "$LC_ALL"; then - LC=$LC_ALL -diff -Nur Thunar-1.0.2.orig//docs/Makefile.in Thunar-1.0.2/docs/Makefile.in ---- Thunar-1.0.2.orig//docs/Makefile.in 2010-05-21 12:10:57.000000000 -0500 -+++ Thunar-1.0.2/docs/Makefile.in 2010-05-23 17:46:08.776567272 -0500 -@@ -322,7 +322,7 @@ - builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ --docdir = $(datadir)/doc/Thunar -+docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ -diff -Nur Thunar-1.0.2.orig//docs/manual/C/Makefile.in Thunar-1.0.2/docs/manual/C/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/C/Makefile.in 2010-05-21 12:10:57.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/C/Makefile.in 2010-05-23 17:46:52.539542089 -0500 -@@ -336,7 +336,7 @@ - SUBDIRS = \ - images - --TARGET_DIR = $(datadir)/doc/Thunar/html/C -+TARGET_DIR = $(htmldir)/C - STYLESHEET = ../thunar.xsl - DOCUMENT = Thunar.xml - -diff -Nur Thunar-1.0.2.orig//docs/manual/C/images/Makefile.in Thunar-1.0.2/docs/manual/C/images/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/C/images/Makefile.in 2010-05-21 12:10:57.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/C/images/Makefile.in 2010-05-23 17:47:25.359542363 -0500 -@@ -316,7 +316,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - xfconf_query_found = @xfconf_query_found@ --imagesdir = $(datadir)/doc/Thunar/html/C/images -+imagesdir = $(htmldir)/C/images - images_DATA = \ - bulk-rename.png \ - file-manager-window.png \ -diff -Nur Thunar-1.0.2.orig//docs/manual/Makefile.in Thunar-1.0.2/docs/manual/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/Makefile.in 2010-05-21 12:10:57.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/Makefile.in 2010-05-23 17:48:04.650570173 -0500 -@@ -370,7 +370,7 @@ - tr \ - zh_TW - --cssdir = $(datadir)/doc/Thunar/html -+cssdir = $(htmldir) - css_DATA = \ - thunar.css - -diff -Nur Thunar-1.0.2.orig//docs/manual/am/Makefile.in Thunar-1.0.2/docs/manual/am/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/am/Makefile.in 2010-05-21 12:10:58.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/am/Makefile.in 2010-05-23 17:48:35.304542671 -0500 -@@ -336,7 +336,7 @@ - SUBDIRS = \ - images - --TARGET_DIR = $(datadir)/doc/Thunar/html/am -+TARGET_DIR = $(htmldir)/am - STYLESHEET = ../thunar.xsl - DOCUMENT = Thunar.xml - -diff -Nur Thunar-1.0.2.orig//docs/manual/am/images/Makefile.in Thunar-1.0.2/docs/manual/am/images/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/am/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/am/images/Makefile.in 2010-05-23 17:51:21.111542305 -0500 -@@ -316,7 +316,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - xfconf_query_found = @xfconf_query_found@ --imagesdir = $(datadir)/doc/Thunar/html/am/images -+imagesdir = $(htmldir)/am/images - images_DATA = \ - bulk-rename.png \ - file-manager-window.png \ -diff -Nur Thunar-1.0.2.orig//docs/manual/da/Makefile.in Thunar-1.0.2/docs/manual/da/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/da/Makefile.in 2010-05-21 12:10:58.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/da/Makefile.in 2010-05-23 17:48:52.108550193 -0500 -@@ -334,7 +334,7 @@ - SUBDIRS = \ - images - --TARGET_DIR = $(datadir)/doc/Thunar/html/da -+TARGET_DIR = $(htmldir)/da - STYLESHEET = ../thunar.xsl - DOCUMENT = Thunar.xml - -diff -Nur Thunar-1.0.2.orig//docs/manual/da/images/Makefile.in Thunar-1.0.2/docs/manual/da/images/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/da/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/da/images/Makefile.in 2010-05-23 17:51:27.753542103 -0500 -@@ -314,7 +314,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - xfconf_query_found = @xfconf_query_found@ --imagesdir = $(datadir)/doc/Thunar/html/da/images -+imagesdir = $(htmldir)/da/images - images_DATA = \ - bulk-rename.png \ - file-manager-window.png \ -diff -Nur Thunar-1.0.2.orig//docs/manual/es/Makefile.in Thunar-1.0.2/docs/manual/es/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/es/Makefile.in 2010-05-21 12:10:58.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/es/Makefile.in 2010-05-23 17:48:58.300552519 -0500 -@@ -336,7 +336,7 @@ - SUBDIRS = \ - images - --TARGET_DIR = $(datadir)/doc/Thunar/html/es -+TARGET_DIR = $(htmldir)/es - STYLESHEET = ../thunar.xsl - DOCUMENT = Thunar.xml - -diff -Nur Thunar-1.0.2.orig//docs/manual/es/images/Makefile.in Thunar-1.0.2/docs/manual/es/images/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/es/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/es/images/Makefile.in 2010-05-23 17:51:34.373542961 -0500 -@@ -316,7 +316,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - xfconf_query_found = @xfconf_query_found@ --imagesdir = $(datadir)/doc/Thunar/html/es/images -+imagesdir = $(htmldir)/es/images - images_DATA = \ - bulk-rename.png \ - file-manager-window.png \ -diff -Nur Thunar-1.0.2.orig//docs/manual/eu/Makefile.in Thunar-1.0.2/docs/manual/eu/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/eu/Makefile.in 2010-05-21 12:10:58.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/eu/Makefile.in 2010-05-23 17:49:05.977677434 -0500 -@@ -336,7 +336,7 @@ - SUBDIRS = \ - images - --TARGET_DIR = $(datadir)/doc/Thunar/html/eu -+TARGET_DIR = $(htmldir)/eu - STYLESHEET = ../thunar.xsl - DOCUMENT = Thunar.xml - -diff -Nur Thunar-1.0.2.orig//docs/manual/eu/images/Makefile.in Thunar-1.0.2/docs/manual/eu/images/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/eu/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/eu/images/Makefile.in 2010-05-23 17:51:42.643542360 -0500 -@@ -316,7 +316,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - xfconf_query_found = @xfconf_query_found@ --imagesdir = $(datadir)/doc/Thunar/html/eu/images -+imagesdir = $(htmldir)/eu/images - images_DATA = \ - bulk-rename.png \ - file-manager-window.png \ -diff -Nur Thunar-1.0.2.orig//docs/manual/fr/Makefile.in Thunar-1.0.2/docs/manual/fr/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/fr/Makefile.in 2010-05-21 12:10:58.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/fr/Makefile.in 2010-05-23 17:49:12.495542046 -0500 -@@ -336,7 +336,7 @@ - SUBDIRS = \ - images - --TARGET_DIR = $(datadir)/doc/Thunar/html/fr -+TARGET_DIR = $(htmldir)/fr - STYLESHEET = ../thunar.xsl - DOCUMENT = Thunar.xml - -diff -Nur Thunar-1.0.2.orig//docs/manual/fr/images/Makefile.in Thunar-1.0.2/docs/manual/fr/images/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/fr/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/fr/images/Makefile.in 2010-05-23 17:51:51.116702819 -0500 -@@ -316,7 +316,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - xfconf_query_found = @xfconf_query_found@ --imagesdir = $(datadir)/doc/Thunar/html/fr/images -+imagesdir = $(htmldir)/fr/images - images_DATA = \ - bulk-rename.png \ - file-manager-window.png \ -diff -Nur Thunar-1.0.2.orig//docs/manual/gl/Makefile.in Thunar-1.0.2/docs/manual/gl/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/gl/Makefile.in 2010-05-21 12:10:58.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/gl/Makefile.in 2010-05-23 17:49:19.882542284 -0500 -@@ -336,7 +336,7 @@ - SUBDIRS = \ - images - --TARGET_DIR = $(datadir)/doc/Thunar/html/gl -+TARGET_DIR = $(htmldir)/gl - STYLESHEET = ../thunar.xsl - DOCUMENT = Thunar.xml - -diff -Nur Thunar-1.0.2.orig//docs/manual/gl/images/Makefile.in Thunar-1.0.2/docs/manual/gl/images/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/gl/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/gl/images/Makefile.in 2010-05-23 17:51:57.596588720 -0500 -@@ -316,7 +316,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - xfconf_query_found = @xfconf_query_found@ --imagesdir = $(datadir)/doc/Thunar/html/gl/images -+imagesdir = $(htmldir)/gl/images - images_DATA = \ - bulk-rename.png \ - file-manager-window.png \ -diff -Nur Thunar-1.0.2.orig//docs/manual/it/Makefile.in Thunar-1.0.2/docs/manual/it/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/it/Makefile.in 2010-05-21 12:10:58.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/it/Makefile.in 2010-05-23 17:49:27.597676807 -0500 -@@ -334,7 +334,7 @@ - SUBDIRS = \ - images - --TARGET_DIR = $(datadir)/doc/Thunar/html/it -+TARGET_DIR = $(htmldir)/it - STYLESHEET = ../thunar.xsl - DOCUMENT = Thunar.xml - -diff -Nur Thunar-1.0.2.orig//docs/manual/it/images/Makefile.in Thunar-1.0.2/docs/manual/it/images/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/it/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/it/images/Makefile.in 2010-05-23 17:52:05.152568701 -0500 -@@ -314,7 +314,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - xfconf_query_found = @xfconf_query_found@ --imagesdir = $(datadir)/doc/Thunar/html/it/images -+imagesdir = $(htmldir)/it/images - images_DATA = \ - bulk-rename.png \ - file-manager-window.png \ -diff -Nur Thunar-1.0.2.orig//docs/manual/ja/Makefile.in Thunar-1.0.2/docs/manual/ja/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/ja/Makefile.in 2010-05-21 12:10:59.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/ja/Makefile.in 2010-05-23 17:49:35.728552141 -0500 -@@ -336,7 +336,7 @@ - SUBDIRS = \ - images - --TARGET_DIR = $(datadir)/doc/Thunar/html/ja -+TARGET_DIR = $(htmldir)/ja - STYLESHEET = ../thunar.xsl - DOCUMENT = Thunar.xml - -diff -Nur Thunar-1.0.2.orig//docs/manual/ja/images/Makefile.in Thunar-1.0.2/docs/manual/ja/images/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/ja/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/ja/images/Makefile.in 2010-05-23 17:52:13.534542157 -0500 -@@ -316,7 +316,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - xfconf_query_found = @xfconf_query_found@ --imagesdir = $(datadir)/doc/Thunar/html/ja/images -+imagesdir = $(htmldir)/ja/images - images_DATA = \ - bulk-rename.png \ - file-manager-window.png \ -diff -Nur Thunar-1.0.2.orig//docs/manual/nl/Makefile.in Thunar-1.0.2/docs/manual/nl/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/nl/Makefile.in 2010-05-21 12:10:59.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/nl/Makefile.in 2010-05-23 17:49:42.981677782 -0500 -@@ -336,7 +336,7 @@ - SUBDIRS = \ - images - --TARGET_DIR = $(datadir)/doc/Thunar/html/nl -+TARGET_DIR = $(htmldir)/nl - STYLESHEET = ../thunar.xsl - DOCUMENT = Thunar.xml - -diff -Nur Thunar-1.0.2.orig//docs/manual/nl/images/Makefile.in Thunar-1.0.2/docs/manual/nl/images/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/nl/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/nl/images/Makefile.in 2010-05-23 17:52:19.353553300 -0500 -@@ -316,7 +316,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - xfconf_query_found = @xfconf_query_found@ --imagesdir = $(datadir)/doc/Thunar/html/nl/images -+imagesdir = $(htmldir)/nl/images - images_DATA = \ - bulk-rename.png \ - file-manager-window.png \ -diff -Nur Thunar-1.0.2.orig//docs/manual/pl/Makefile.in Thunar-1.0.2/docs/manual/pl/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/pl/Makefile.in 2010-05-21 12:10:59.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/pl/Makefile.in 2010-05-23 17:49:51.863542378 -0500 -@@ -336,7 +336,7 @@ - SUBDIRS = \ - images - --TARGET_DIR = $(datadir)/doc/Thunar/html/pl -+TARGET_DIR = $(htmldir)/pl - STYLESHEET = ../thunar.xsl - DOCUMENT = Thunar.xml - -diff -Nur Thunar-1.0.2.orig//docs/manual/pl/images/Makefile.in Thunar-1.0.2/docs/manual/pl/images/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/pl/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/pl/images/Makefile.in 2010-05-23 17:52:27.285677594 -0500 -@@ -316,7 +316,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - xfconf_query_found = @xfconf_query_found@ --imagesdir = $(datadir)/doc/Thunar/html/pl/images -+imagesdir = $(htmldir)/pl/images - images_DATA = \ - bulk-rename.png \ - file-manager-window.png \ -diff -Nur Thunar-1.0.2.orig//docs/manual/ru/Makefile.in Thunar-1.0.2/docs/manual/ru/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/ru/Makefile.in 2010-05-21 12:10:59.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/ru/Makefile.in 2010-05-23 17:49:59.951552903 -0500 -@@ -336,7 +336,7 @@ - SUBDIRS = \ - images - --TARGET_DIR = $(datadir)/doc/Thunar/html/ru -+TARGET_DIR = $(htmldir)/ru - STYLESHEET = ../thunar.xsl - DOCUMENT = Thunar.xml - -diff -Nur Thunar-1.0.2.orig//docs/manual/ru/images/Makefile.in Thunar-1.0.2/docs/manual/ru/images/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/ru/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/ru/images/Makefile.in 2010-05-23 17:52:33.673677284 -0500 -@@ -316,7 +316,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - xfconf_query_found = @xfconf_query_found@ --imagesdir = $(datadir)/doc/Thunar/html/ru/images -+imagesdir = $(htmldir)/ru/images - images_DATA = \ - bulk-rename.png \ - file-manager-window.png \ -diff -Nur Thunar-1.0.2.orig//docs/manual/tr/Makefile.in Thunar-1.0.2/docs/manual/tr/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/tr/Makefile.in 2010-05-21 12:10:59.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/tr/Makefile.in 2010-05-23 17:50:08.415553080 -0500 -@@ -334,7 +334,7 @@ - SUBDIRS = \ - images - --TARGET_DIR = $(datadir)/doc/Thunar/html/tr -+TARGET_DIR = $(htmldir)/tr - STYLESHEET = ../thunar.xsl - DOCUMENT = Thunar.xml - -diff -Nur Thunar-1.0.2.orig//docs/manual/tr/images/Makefile.in Thunar-1.0.2/docs/manual/tr/images/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/tr/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/tr/images/Makefile.in 2010-05-23 17:52:40.320542409 -0500 -@@ -314,7 +314,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - xfconf_query_found = @xfconf_query_found@ --imagesdir = $(datadir)/doc/Thunar/html/tr/images -+imagesdir = $(htmldir)/tr/images - images_DATA = \ - bulk-rename.png \ - file-manager-window.png \ -diff -Nur Thunar-1.0.2.orig//docs/manual/zh_TW/Makefile.in Thunar-1.0.2/docs/manual/zh_TW/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/zh_TW/Makefile.in 2010-05-21 12:10:59.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/zh_TW/Makefile.in 2010-05-23 17:50:20.989569041 -0500 -@@ -336,7 +336,7 @@ - SUBDIRS = \ - images - --TARGET_DIR = $(datadir)/doc/Thunar/html/zh_TW -+TARGET_DIR = $(htmldir)/zh_TW - STYLESHEET = ../thunar.xsl - DOCUMENT = Thunar.xml - -diff -Nur Thunar-1.0.2.orig//docs/manual/zh_TW/images/Makefile.in Thunar-1.0.2/docs/manual/zh_TW/images/Makefile.in ---- Thunar-1.0.2.orig//docs/manual/zh_TW/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500 -+++ Thunar-1.0.2/docs/manual/zh_TW/images/Makefile.in 2010-05-23 17:52:47.172552372 -0500 -@@ -316,7 +316,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - xfconf_query_found = @xfconf_query_found@ --imagesdir = $(datadir)/doc/Thunar/html/zh_TW/images -+imagesdir = $(htmldir)/zh_TW/images - images_DATA = \ - bulk-rename.png \ - file-manager-window.png \ diff --git a/source/xap/xfce/patches/xfcalendar.desktop.in.diff b/source/xap/xfce/patches/xfcalendar.desktop.in.diff deleted file mode 100644 index d8826781..00000000 --- a/source/xap/xfce/patches/xfcalendar.desktop.in.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- a/xfcalendar.desktop.in 2009-03-01 10:13:10.349305702 -0600 -+++ b/xfcalendar.desktop.in 2009-03-01 10:13:29.564307721 -0600 -@@ -10,4 +10,5 @@ - Terminal=false - Type=Application - Categories=X-XFCE;Office;Calendar;GTK; -+OnlyShowIn=XFCE; - _GenericName=Calendar - diff --git a/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff b/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff deleted file mode 100644 index fde47a9e..00000000 --- a/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur xfce-utils-4.6.2.orig//scripts/xinitrc.in.in xfce-utils-4.6.2/scripts/xinitrc.in.in ---- xfce-utils-4.6.2.orig//scripts/xinitrc.in.in 2010-05-21 11:56:26.000000000 -0500 -+++ xfce-utils-4.6.2/scripts/xinitrc.in.in 2011-03-09 22:56:18.687297854 -0600 -@@ -97,6 +97,7 @@ - cat /dev/null $XRESOURCES | xrdb -nocpp -merge - - - # load local modmap -+test -r /etc/X11/xinit/.Xmodmap && xmodmap /etc/X11/xinit/.Xmodmap - test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap - - # Launch xscreensaver (if available), but only as non-root user diff --git a/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff b/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff deleted file mode 100644 index 206f6607..00000000 --- a/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- ./scripts/xinitrc.in.in.orig 2009-04-09 18:21:13.000000000 -0500 -+++ ./scripts/xinitrc.in.in 2010-06-18 11:33:37.000000000 -0500 -@@ -131,7 +131,11 @@ - x|xno*) - ;; - *) -- $xfcesm -+ if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then -+ ck-launch-session $xfcesm -+ else -+ $xfcesm -+ fi - - if test $kill_sshagent -eq 1; then - eval `$sshagent -k` diff --git a/source/xap/xfce/patches/xfdesktop-fix_education_icon.diff b/source/xap/xfce/patches/xfdesktop-fix_education_icon.diff deleted file mode 100644 index 56a34060..00000000 --- a/source/xap/xfce/patches/xfdesktop-fix_education_icon.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur xfdesktop-4.6.1.orig/modules/menu/directory-data/xfce-education.directory.in xfdesktop-4.6.1/modules/menu/directory-data/xfce-education.directory.in ---- xfdesktop-4.6.1.orig/modules/menu/directory-data/xfce-education.directory.in 2009-01-12 16:03:19.000000000 -0600 -+++ xfdesktop-4.6.1/modules/menu/directory-data/xfce-education.directory.in 2009-07-31 01:04:29.029467762 -0500 -@@ -2,6 +2,6 @@ - Version=1.0 - Encoding=UTF-8 - Type=Directory --Icon= -+Icon=applications-education - _Name=Education - _Comment=Educational software diff --git a/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff b/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff deleted file mode 100644 index 9c54cf9a..00000000 --- a/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff +++ /dev/null @@ -1,49 +0,0 @@ -From 51ee1e872e8671bf439e5d391b86432904cbc5ef Mon Sep 17 00:00:00 2001 -From: Robby Workman -Date: Sun, 6 Mar 2011 23:55:35 -0600 -Subject: [PATCH] xfsm-compat-kde.c: Start KDE4 services instead of KDE3 - ---- - xfce4-session/xfsm-compat-kde.c | 10 ++++------ - 1 files changed, 4 insertions(+), 6 deletions(-) - -diff --git a/xfce4-session/xfsm-compat-kde.c b/xfce4-session/xfsm-compat-kde.c -index ced6ece..b51387e 100644 ---- a/xfce4-session/xfsm-compat-kde.c -+++ b/xfce4-session/xfsm-compat-kde.c -@@ -123,10 +123,10 @@ xfsm_compat_kde_startup (XfsmSplashScreen *splash) - if (G_LIKELY (splash != NULL)) - xfsm_splash_screen_next (splash, _("Starting KDE services")); - -- run ("kdeinit"); -+ run ("kdeinit4"); - - /* tell klauncher about the session manager */ -- g_snprintf (command, 256, "dcop klauncher klauncher setLaunchEnv " -+ g_snprintf (command, 256, "qdbus org.kde.klauncher /KLauncher setLaunchEnv " - "SESSION_MANAGER \"%s\"", - g_getenv ("SESSION_MANAGER")); - run (command); -@@ -134,7 +134,7 @@ xfsm_compat_kde_startup (XfsmSplashScreen *splash) - /* tell kde if we are running multi-head */ - if (gdk_display_get_n_screens (gdk_display_get_default ()) > 1) - { -- g_snprintf (command, 256, "dcop klauncher klauncher setLaunchEnv " -+ g_snprintf (command, 256, "qdbus org.kde.klauncher /KLauncher setLaunchEnv " - "KDE_MULTIHEAD \"true\""); - run (command); - } -@@ -150,9 +150,7 @@ xfsm_compat_kde_shutdown (void) - return; - - /* shutdown KDE services */ -- run ("kdeinit_shutdown"); -- run ("dcopserver_shutdown"); -- run ("artsshell -q terminate"); -+ run ("kdeinit4_shutdown"); - - kde_compat_started = FALSE; - } --- -1.7.4.1 - diff --git a/source/xap/xfce/profile.d/xfce.csh b/source/xap/xfce/profile.d/xfce.csh deleted file mode 100755 index ccc2b8f1..00000000 --- a/source/xap/xfce/profile.d/xfce.csh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/csh -if ( $?XDG_CONFIG_DIRS ) then - setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/xfce/xdg -else - setenv XDG_CONFIG_DIRS /etc/xdg:/etc/xfce/xdg -endif diff --git a/source/xap/xfce/profile.d/xfce.sh b/source/xap/xfce/profile.d/xfce.sh deleted file mode 100755 index adb187c1..00000000 --- a/source/xap/xfce/profile.d/xfce.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -if [ ! "$XDG_CONFIG_DIRS" = "" ]; then - XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/xfce/xdg -else - XDG_CONFIG_DIRS=/etc/xdg:/etc/xfce/xdg -fi -export XDG_CONFIG_DIRS diff --git a/source/xap/xfce/slack-desc b/source/xap/xfce/slack-desc deleted file mode 100644 index ecedf010..00000000 --- a/source/xap/xfce/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xfce: xfce (a fast and lightweight desktop environment for X) -xfce: -xfce: Xfce is a fast and lightweight desktop environment that is both -xfce: visually appealing and easy to use. -xfce: -xfce: For more information, see: http://www.xfce.org -xfce: -xfce: Xfce was developed by Olivier Fourdan. -xfce: -xfce: -xfce: diff --git a/source/xap/xfce/xfce.SlackBuild b/source/xap/xfce/xfce.SlackBuild deleted file mode 100755 index aaa38f99..00000000 --- a/source/xap/xfce/xfce.SlackBuild +++ /dev/null @@ -1,248 +0,0 @@ -#!/bin/sh - -# Copyright 2003 Slackware Linux, Inc., Concord, CA, USA -# Copyright 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -VERSION=4.6.2 -BUILD=${BUILD:-5} - -# A few tarballs have different versions; handle them here -XDT_VERS=4.8.0 # xfce4-dev-tools version -# We're going to ship xdt from xfce-4.8 since it's not used for building -# release tarballs anyway, but it's handy to have around for building from -# git, and some folks might want to do that later... -EXO_VERS=0.3.107 # exo version -THUNAR_VERS=1.0.2 # thunar version -GXE_VERS=2.6.0 # gtk-xfce-engine version -TERM_VERS=0.4.6 # terminal version -MPAD_VERS=0.2.16 # mousepad version -XFWM_VERS=4.6.2 # xfwm4 version -XFWMTHEME_VERS=4.6.0 # xfwm4-themes version -SETTINGS_VERS=4.6.5 # xfce4-settings version -SESSION_VERS=4.6.2 # xfce4-settings version -PANEL_VERS=4.6.4 # xfce4-panel version -XFCEGUI_VERS=4.6.4 # libxfcegui4 version -XFCEMENU_VERS=4.6.2 # libxfce4menu version -LIBUTIL_VERS=4.6.2 # libxfce4util version -UTILS_VERS=4.6.2 # xfce-utils version -APPFINDER_VERS=4.6.2 # xfce4-appfinder version -XFCONF_VERS=4.6.2 # xfconf version -XFDESKTOP_VERS=4.6.2 # xfdesktop version -MIXER_VERS=4.6.1 # xfce4-mixer version -XFPRINT_VERS=4.6.1 # xfprint version -ORAGE_VERS=4.6.1 # orage version - -NUMJOBS=${NUMJOBS:--j6} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/xfce-build-dir} -PKG=$TMP/package-xfce - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP || exit 1 - -COMPRESSION=xz -COMPRESSUTIL=xz - -for file in \ - xfce4-dev-tools-$XDT_VERS.tar.$COMPRESSION \ - libxfce4util-$LIBUTIL_VERS.tar.$COMPRESSION \ - xfconf-$XFCONF_VERS.tar.$COMPRESSION \ - libxfcegui4-$XFCEGUI_VERS.tar.$COMPRESSION \ - libxfce4menu-$XFCEMENU_VERS.tar.$COMPRESSION \ - exo-$EXO_VERS.tar.$COMPRESSION \ - xfce4-panel-$PANEL_VERS.tar.$COMPRESSION \ - Thunar-$THUNAR_VERS.tar.$COMPRESSION \ - xfce4-settings-$SETTINGS_VERS.tar.$COMPRESSION \ - xfce4-session-$SESSION_VERS.tar.$COMPRESSION \ - xfdesktop-$XFDESKTOP_VERS.tar.$COMPRESSION \ - xfwm4-$XFWM_VERS.tar.$COMPRESSION \ - xfce-utils-$UTILS_VERS.tar.$COMPRESSION \ - xfce4-mixer-$MIXER_VERS.tar.$COMPRESSION \ - xfprint-$XFPRINT_VERS.tar.$COMPRESSION \ - xfce4-appfinder-$APPFINDER_VERS.tar.$COMPRESSION \ - gtk-xfce-engine-$GXE_VERS.tar.$COMPRESSION \ - Terminal-$TERM_VERS.tar.$COMPRESSION \ - xfwm4-themes-$XFWMTHEME_VERS.tar.$COMPRESSION \ - mousepad-$MPAD_VERS.tar.$COMPRESSION \ - orage-$ORAGE_VERS.tar.$COMPRESSION ; -do - $COMPRESSUTIL -dc $CWD/src/$file | tar xvf - || exit 1 - cd $(basename $file .tar.$COMPRESSION) || exit 1 - chown -R root:root . - find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - - # Here's where we patch or set up any other package-specific stuff: - # Patch to only show xfcalendar in XFce (otherwise it shows up in - # KDE's Lost & Found and does not work): - if [ "$file" = "orage-$ORAGE_VERS.tar.$COMPRESSION" ]; then - zcat $CWD/patches/xfcalendar.desktop.in.diff.gz | patch -p1 --verbose || exit 1 - fi - # Make Thunar respect --docdir - if [ "$file" = "Thunar-$THUNAR_VERS.tar.$COMPRESSION" ]; then - zcat $CWD/patches/thunar-1.0.2-fixup_docdir.diff.gz | patch -p1 --verbose || exit 1 - zcat $CWD/patches/Thunar.thunar-vfs-io-local.diff.gz | patch -p0 --verbose || exit 1 - fi - # Fix the missing education icon in the desktop menu - if [ "$file" = "xfdesktop-$XFDESKTOP_VERS.tar.$COMPRESSION" ]; then - zcat $CWD/patches/xfdesktop-fix_education_icon.diff.gz | patch -p1 --verbose || exit 1 - fi - # 1) Launch xfce through consolekit so that ck enabled stuff works in xfce - # 2) Fix comments in /etc/xfce/xdg/xfce4/Xft.xrdb - # http://bugzilla.xfce.org/show_bug.cgi?id=6314 - # 3) Load system-wide .Xmodmap, not just the one in $HOME - if [ "$file" = "xfce-utils-$UTILS_VERS.tar.$COMPRESSION" ]; then - zcat $CWD/patches/xfce-utils.xinitrc.consolekit.diff.gz | patch -p1 --verbose || exit 1 - zcat $CWD/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff.gz | patch -p1 --verbose || exit 1 - zcat $CWD/patches/xfce-utils-load_systemwide_Xmodmap.diff.gz | patch -p1 --verbose || exit 1 - fi - # Fix a couple of bugs from mousepad git - if [ "$file" = "mousepad-$MPAD_VERS.tar.$COMPRESSION" ]; then - zcat $CWD/patches/mousepad-fix_find_and_replace.diff.gz | patch -p1 --verbose || exit 1 - zcat $CWD/patches/mousepad-fix_find.diff.gz | patch -p1 --verbose || exit 1 - fi - # Fix a plugin moving bug in the panel - if [ "$file" = "xfce4-panel-$PANEL_VERS.tar.$COMPRESSION" ]; then - zcat $CWD/patches/no_sensitive_panel_during_plugin_moves.patch.gz | patch -p1 --verbose || exit 1 - fi - # Start kde4 services instead of kde3 - # http://bugzilla.xfce.org/show_bug.cgi?id=7382 - if [ "$file" = "xfce4-session-$SESSION_VERS.tar.$COMPRESSION" ]; then - zcat $CWD/patches/xfsm-compat-kde.c-start-kde4-services.diff.gz | patch -p1 --verbose || exit 1 - fi - # End patches/package-specific stuff - - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/xfce \ - --mandir=/usr/man \ - --docdir=/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION) \ - --htmldir=/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION)/html \ - --disable-static \ - --build=$ARCH-slackware-linux \ - $PACKAGE_SPECIFIC_OPTIONS - - # Unset this now -- we're done with it - unset PACKAGE_SPECIFIC_OPTIONS - - make $NUMJOBS || make || exit 1 - make install || exit 1 - make install DESTDIR=$PKG - - mkdir -p $PKG/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION) - # This will cause errors, but won't miss any docs: - cp -a \ - AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ - NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ - $PKG/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION) \ - 2> /dev/null || true - - # If there's a ChangeLog, installing at least part of the recent history - # is useful, but don't let it get totally out of control: - if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION)) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog - fi - - cd - ; -done - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# The Rodent icon theme isn't xdg compliant, so it spews errors quite often -# and just flat breaks some things here and there, so the Xfce team elected -# not to ship it with 4.6.x. In the meantime, we'll default to gnome. -sed -i s/Rodent/gnome/ \ - $PKG/etc/xfce/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml - -# We're going to borrow the "applications-education" icons (six of them) -# from the kde oxygen icon theme (it's LGPL) -tar xf $CWD/icons.tar.xz -C $PKG/usr/share - -# We don't want any of those icon caches -find $PKG/usr/share/icons -type f -name "index-theme.cache" -exec rm -f {} \; - -# Compress and if needed symlink the man pages: -if [ -d $PKG/usr/man ]; then - ( cd $PKG/usr/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -mkdir -p $PKG/etc/profile.d -cp -a $CWD/profile.d/* $PKG/etc/profile.d -chown root:root $PKG/etc/profile.d/* -chmod 755 $PKG/etc/profile.d/* - -mkdir -p $PKG/etc/X11/xinit -( cd $PKG/etc/X11/xinit - ln -sf ../../xfce/xdg/xfce4/xinitrc xinitrc.xfce - chmod 755 ../../xfce/xdg/xfce4/xinitrc -) - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/xfce-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/xap/xfce4-notifyd/doinst.sh b/source/xap/xfce4-notifyd/doinst.sh deleted file mode 100644 index ec1b3d8a..00000000 --- a/source/xap/xfce4-notifyd/doinst.sh +++ /dev/null @@ -1,10 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications 2>/dev/null -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - diff --git a/source/xap/xfce4-notifyd/slack-desc b/source/xap/xfce4-notifyd/slack-desc deleted file mode 100644 index 1463db0b..00000000 --- a/source/xap/xfce4-notifyd/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xfce4-notifyd: xfce4-notifyd (Xfce Notify Daemon) -xfce4-notifyd: -xfce4-notifyd: Xfce4-notifyd is a simple, visually-appealing notification daemon -xfce4-notifyd: for Xfce. Applications can use xfce4-notifyd to pop up a notification -xfce4-notifyd: bubble by sending messages through D-Bus. -xfce4-notifyd: -xfce4-notifyd: Homepage: http://spuriousinterrupt.org/projects/xfce4-notifyd -xfce4-notifyd: -xfce4-notifyd: -xfce4-notifyd: -xfce4-notifyd: diff --git a/source/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild b/source/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild deleted file mode 100755 index 2f33dbd8..00000000 --- a/source/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh - -# Slackware build script for Xfce4-notifyd - -# Copyright 2008 Frank Caraballo -# Copyright 2010 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=xfce4-notifyd -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/xfce \ - --localstatedir=/var \ - --enable-debug=no \ - --build=$ARCH-slackware-linux - -make || exit 1 -make install-strip DESTDIR=$PKG || exit 1 - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING INSTALL NEWS README TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/xap/xfce4-power-manager/doinst.sh b/source/xap/xfce4-power-manager/doinst.sh deleted file mode 100644 index 1f8ff67d..00000000 --- a/source/xap/xfce4-power-manager/doinst.sh +++ /dev/null @@ -1,10 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - diff --git a/source/xap/xfce4-power-manager/slack-desc b/source/xap/xfce4-power-manager/slack-desc deleted file mode 100644 index d1dd7ec1..00000000 --- a/source/xap/xfce4-power-manager/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------| -xfce4-power-manager: xfce4-power-manager (Power Management Daemon for Xfce) -xfce4-power-manager: -xfce4-power-manager: xfce4-power-manager makes power management functions (such as -xfce4-power-manager: suspend and hibernate) easy inside the Xfce Desktop Environment -xfce4-power-manager: (but it should also work in any other desktop environment). -xfce4-power-manager: -xfce4-power-manager: -xfce4-power-manager: -xfce4-power-manager: -xfce4-power-manager: -xfce4-power-manager: diff --git a/source/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild b/source/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild deleted file mode 100755 index 1aa24bde..00000000 --- a/source/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh - -# Slackware build script for xfce4-power-manager - -# Copyright 2006-2010 Robby Workman Northport, Alabama, USA -# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=xfce4-power-manager -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP || exit 1 -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/xfce \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --enable-shared=yes \ - --enable-static=no \ - --enable-debug=no \ - --disable-network-manager \ - --build=$ARCH-slackware-linux - -make || exit 1 -make install DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -gzip -9 $PKG/usr/man/man?/*.? - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html -cp -a \ - AUTHORS COPYING NEWS README TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION -( cd $PKG/usr/doc/$PKGNAM-$VERSION/html - ln -s /usr/share/xfce4/doc/C/xfce4-power-manager.html index.html - ln -s /usr/share/xfce4/doc/C/images . -) - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/xap/xfractint/xfractint.SlackBuild b/source/xap/xfractint/xfractint.SlackBuild index 1ae5e6fe..e6b8bb4d 100755 --- a/source/xap/xfractint/xfractint.SlackBuild +++ b/source/xap/xfractint/xfractint.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2007, 2008, 2009 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2012 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,16 +22,46 @@ PKGNAM=xfractint -VERSION=${VERSION:-20.04p09} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-20.04p11} BUILD=${BUILD:-1} -if [ "$ARCH" = "i486" ]; then +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -42,7 +72,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/xfractint-${VERSION}.tar.bz2 || exit 1 +tar xvf $CWD/xfractint-${VERSION}.tar.xz || exit 1 cd ${PKGNAM}-${VERSION} || exit 1 rm -f unix/calmanfx.o # contains i386 code diff --git a/source/xap/xine-lib/xine-lib.SlackBuild b/source/xap/xine-lib/xine-lib.SlackBuild index c1127593..97391f39 100755 --- a/source/xap/xine-lib/xine-lib.SlackBuild +++ b/source/xap/xine-lib/xine-lib.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,11 +22,13 @@ # Version on the tarball -VERSION=1.1.19 +VERSION=1.1.21 # Version used in the source directory to cd into -DIRVER=1.1.19 +DIRVER=1.1.21 # Version used for the Slackware package -PKGVER=1.1.19 +PKGVER=1.1.21 + +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -41,7 +43,6 @@ fi # I would use "-march=i486 -mtune=i686" here as usual, but with XINE it's all or nothing. # I'd rather have it work well for the i686/Athlon crowd than suck for everyone. TARGET=${TARGET:-$ARCH-pc-linux-gnu} -BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -64,6 +65,9 @@ cd xine-lib-$DIRVER || exit 1 zcat $CWD/xine-lib.XvMClib.h.diff.gz | patch -p1 --verbose || exit 1 +# Fix for zlib-1.2.6 (or higher): +sed -i 's#gzgetc(#gzgetc_(#' src/xine-engine/osd.c + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/xap/xine-ui/xine-ui.SlackBuild b/source/xap/xine-ui/xine-ui.SlackBuild index 61650223..65a18c18 100755 --- a/source/xap/xine-ui/xine-ui.SlackBuild +++ b/source/xap/xine-ui/xine-ui.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ VERSION=${VERSION:-$(echo xine-ui-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} # I would use "-march=i486 -mcpu=i686" here as usual, but with XINE it's all or nothing. # I'd rather have it work well for the i686/Athlon crowd than suck for everyone. -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -47,11 +47,9 @@ mkdir -p $TMP $PKG/usr cd $TMP rm -rf xine-ui-$VERSION -tar xvf $CWD/xine-ui-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/xine-ui-$VERSION.tar.?z* || exit 1 cd xine-ui-$VERSION || exit 1 -zcat $CWD/xine-ui.png14.diff.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -59,11 +57,15 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +zcat $CWD/xine-ui.no.deprecated.curl.headers.diff.gz | patch -p1 --verbose || exit 1 + XINE_BUILD=$TARGET \ ./configure \ --prefix=/usr \ --with-aalib \ --with-caca \ + --disable-lirc \ + --mandir=/usr/man \ --build=$TARGET make $NUMJOBS || make || exit 1 diff --git a/source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff b/source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff new file mode 100644 index 00000000..63e57717 --- /dev/null +++ b/source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff @@ -0,0 +1,11 @@ +--- ./src/xitk/download.c.orig 2009-12-18 18:34:22.000000000 -0600 ++++ ./src/xitk/download.c 2012-09-09 12:47:15.757552304 -0500 +@@ -28,8 +28,6 @@ + + #ifdef HAVE_CURL + #include +-#include +-#include + #endif + + #include "common.h" diff --git a/source/xap/xine-ui/xine-ui.png14.diff b/source/xap/xine-ui/xine-ui.png14.diff deleted file mode 100644 index 35a06513..00000000 --- a/source/xap/xine-ui/xine-ui.png14.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/xitk/Imlib-light/load.c.orig 2003-07-14 17:44:10.000000000 -0500 -+++ ./src/xitk/Imlib-light/load.c 2010-02-19 13:41:27.000000000 -0600 -@@ -193,7 +193,7 @@ - return 0; - fread(buf, 1, 8, f); - rewind(f); -- return (int)png_check_sig(buf, 8); -+ return (int)(png_sig_cmp(buf, 0, 8) == 0); - } - - ImlibImage * Imlib_load_image(ImlibData * id, char *file) { diff --git a/source/xap/xlockmore/xlockmore.SlackBuild b/source/xap/xlockmore/xlockmore.SlackBuild index 09ce261f..c7ced75b 100755 --- a/source/xap/xlockmore/xlockmore.SlackBuild +++ b/source/xap/xlockmore/xlockmore.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ PKGNAM=xlockmore -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -63,7 +63,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf xlockmore-$VERSION -tar xvf $CWD/xlockmore-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/xlockmore-$VERSION.tar.?z* || exit 1 cd xlockmore-$VERSION || exit 1 chown -R root:root . find . \ diff --git a/source/xap/xpdf/patches/03-float.patch b/source/xap/xpdf/patches/03-float.patch new file mode 100644 index 00000000..208c765a --- /dev/null +++ b/source/xap/xpdf/patches/03-float.patch @@ -0,0 +1,25 @@ +description: fix a floating point quirk that is exposed by gcc 4.4 + (this was leading to slow pdf document scrolling on i386) +author: Michael Gilbert +bug-debian: http://bugs.debian.org/577031 +--- xpdf-3.02.orig/xpdf/PDFCore.h ++++ xpdf-3.02/xpdf/PDFCore.h +@@ -40,6 +40,7 @@ class PDFCore; + #define zoomPage -1 + #define zoomWidth -2 + #define defZoom 125 ++#define EPSILON 1.0e-7 // 32-bit floating point machine precision + + //------------------------------------------------------------------------ + +--- xpdf-3.02.orig/xpdf/PDFCore.cc ++++ xpdf-3.02/xpdf/PDFCore.cc +@@ -445,7 +445,7 @@ void PDFCore::update(int topPageA, int s + // object + if (force || pages->getLength() == 0 || + (!continuousMode && topPageA != topPage) || +- zoomA != zoom || dpiA != dpi || rotateA != rotate) { ++ zoomA != zoom || fabs( dpiA - dpi ) > EPSILON || rotateA != rotate) { + needUpdate = gTrue; + setSelection(0, 0, 0, 0, 0); + while (pages->getLength() > 0) { diff --git a/source/xap/xpdf/xpdf.SlackBuild b/source/xap/xpdf/xpdf.SlackBuild index b19b3aca..6093f21d 100755 --- a/source/xap/xpdf/xpdf.SlackBuild +++ b/source/xap/xpdf/xpdf.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ VERSION=3.02 PATCHLEVEL=pl6 -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -78,6 +78,7 @@ cat $CWD/patches/xpdf-3.02pl4.patch | patch -p1 --verbose || exit 1 cat $CWD/patches/xpdf-3.02pl5.patch | patch -p1 --verbose || exit 1 zcat $CWD/patches/xpdf_3.02-1.3.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/xpdfrc.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/patches/03-float.patch.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -89,7 +90,7 @@ CXXFLAGS="$SLKCFLAGS" \ --with-gzip \ --with-freetype2-includes=/usr/include/freetype2 \ --without-t1-library \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/xap/xsane/xsane.SlackBuild b/source/xap/xsane/xsane.SlackBuild index 1b711715..b301d081 100755 --- a/source/xap/xsane/xsane.SlackBuild +++ b/source/xap/xsane/xsane.SlackBuild @@ -22,7 +22,7 @@ VERSION=0.998 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xap/xscreensaver/xscreensaver-getimage-file-5.14 b/source/xap/xscreensaver/xscreensaver-getimage-file-5.14 new file mode 100644 index 00000000..bc7bcbd9 --- /dev/null +++ b/source/xap/xscreensaver/xscreensaver-getimage-file-5.14 @@ -0,0 +1,555 @@ +#!/usr/bin/perl -w +# Copyright © 2001-2011 Jamie Zawinski . +# +# 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. No representations are made about the suitability of this +# software for any purpose. It is provided "as is" without express or +# implied warranty. +# +# This program chooses a random file from under the given directory, and +# prints its name. The file will be an image file whose dimensions are +# larger than a certain minimum size. +# +# The various xscreensaver hacks that manipulate images ("jigsaw", etc.) get +# the image to manipulate by running the "xscreensaver-getimage" program. +# +# Under X11, the "xscreensaver-getimage" program invokes this script, +# depending on the value of the "chooseRandomImages" and "imageDirectory" +# settings in the ~/.xscreensaver file (or .../app-defaults/XScreenSaver). +# The screen savers invoke "xscreensaver-getimage" via utils/grabclient.c, +# which then invokes this script. +# +# Under Cocoa, this script lives inside the .saver bundle, and is invoked +# directly from utils/grabclient.c. +# +# Created: 12-Apr-01. + +require 5; +#use diagnostics; # Fails on some MacOS 10.5 systems +use strict; + +use POSIX; +use Fcntl; + +use Fcntl ':flock'; # import LOCK_* constants + +use POSIX ':fcntl_h'; # S_ISDIR was here in Perl 5.6 +import Fcntl ':mode' unless defined &S_ISUID; # but it is here in Perl 5.8 + # but in Perl 5.10, both of these load, and cause errors! + # So we have to check for S_ISUID instead of S_ISDIR? WTF? + +use bytes; # Larry can take Unicode and shove it up his ass sideways. + # Perl 5.8.0 causes us to start getting incomprehensible + # errors about UTF-8 all over the place without this. + +my $progname = $0; $progname =~ s@.*/@@g; +my $version = q{ $Revision: 1.29 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/; + +my $verbose = 0; + +# Whether to use MacOS X's Spotlight to generate the list of files. +# When set to -1, uses Spotlight if "mdfind" exists. +# +# (In my experience, this isn't actually any faster, and might not find +# everything if your Spotlight index is out of date, which happens often.) +# +my $use_spotlight_p = 0; + +# Whether to cache the results of the last run. +# +my $cache_p = 1; + +# Regenerate the cache if it is older than this many seconds. +# +my $cache_max_age = 60 * 60 * 3; # 3 hours + + +# This matches files that we are allowed to use as images (case-insensitive.) +# Anything not matching this is ignored. This is so you can point your +# imageDirectory at directory trees that have things other than images in +# them, but it assumes that you gave your images sensible file extensions. +# +my @good_extensions = ('jpg', 'jpeg', 'pjpeg', 'pjpg', 'png', 'gif', + 'tif', 'tiff', 'xbm', 'xpm'); +my $good_file_re = '\.(' . join("|", @good_extensions) . ')$'; + +# This matches file extensions that might occur in an image directory, +# and that are never used in the name of a subdirectory. This is an +# optimization that prevents us from having to stat() those files to +# tell whether they are directories or not. (It speeds things up a +# lot. Don't give your directories stupid names.) +# +my @nondir_extensions = ('ai', 'bmp', 'bz2', 'cr2', 'crw', 'db', + 'dmg', 'eps', 'gz', 'hqx', 'htm', 'html', 'icns', 'ilbm', 'mov', + 'nef', 'pbm', 'pdf', 'pl', 'ppm', 'ps', 'psd', 'sea', 'sh', 'shtml', + 'tar', 'tgz', 'thb', 'txt', 'xcf', 'xmp', 'Z', 'zip' ); +my $nondir_re = '\.(' . join("|", @nondir_extensions) . ')$'; + + +# JPEG, GIF, and PNG files that are are smaller than this are rejected: +# this is so that you can use an image directory that contains both big +# images and thumbnails, and have it only select the big versions. +# +my $min_image_width = 255; +my $min_image_height = 255; + +my @all_files = (); # list of "good" files we've collected +my %seen_inodes; # for breaking recursive symlink loops + +# For diagnostic messages: +# +my $dir_count = 1; # number of directories seen +my $stat_count = 0; # number of files/dirs stat'ed +my $skip_count_unstat = 0; # number of files skipped without stat'ing +my $skip_count_stat = 0; # number of files skipped after stat + +sub find_all_files($); +sub find_all_files($) { + my ($dir) = @_; + + print STDERR "$progname: + reading dir $dir/...\n" if ($verbose > 1); + + my $dd; + if (! opendir ($dd, $dir)) { + print STDERR "$progname: couldn't open $dir: $!\n" if ($verbose); + return; + } + my @files = readdir ($dd); + closedir ($dd); + + my @dirs = (); + + foreach my $file (@files) { + next if ($file =~ m/^\./); # silently ignore dot files/dirs + + if ($file =~ m/[~%\#]$/) { # ignore backup files (and dirs...) + $skip_count_unstat++; + print STDERR "$progname: - skip file $file\n" if ($verbose > 1); + } + + $file = "$dir/$file"; + + if ($file =~ m/$good_file_re/io) { + # + # Assume that files ending in .jpg exist and are not directories. + # + push @all_files, $file; + print STDERR "$progname: - found file $file\n" if ($verbose > 1); + + } elsif ($file =~ m/$nondir_re/io) { + # + # Assume that files ending in .html are not directories. + # + $skip_count_unstat++; + print STDERR "$progname: -- skip file $file\n" if ($verbose > 1); + + } else { + # + # Now we need to stat the file to see if it's a subdirectory. + # + # Note: we could use the trick of checking "nlinks" on the parent + # directory to see if this directory contains any subdirectories, + # but that would exclude any symlinks to directories. + # + my @st = stat($file); + my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, + $atime,$mtime,$ctime,$blksize,$blocks) = @st; + + $stat_count++; + + if ($#st == -1) { + if ($verbose) { + my $ll = readlink $file; + if (defined ($ll)) { + print STDERR "$progname: + dangling symlink: $file -> $ll\n"; + } else { + print STDERR "$progname: + unreadable: $file\n"; + } + } + next; + } + + next if ($seen_inodes{"$dev:$ino"}); # break symlink loops + $seen_inodes{"$dev:$ino"} = 1; + + if (S_ISDIR($mode)) { + push @dirs, $file; + $dir_count++; + print STDERR "$progname: + found dir $file\n" if ($verbose > 1); + + } else { + $skip_count_stat++; + print STDERR "$progname: + skip file $file\n" if ($verbose > 1); + } + } + } + + foreach (@dirs) { + find_all_files ($_); + } +} + + +sub spotlight_all_files($) { + my ($dir) = @_; + + my @terms = (); + # "public.image" matches all (indexed) images, including Photoshop, etc. +# push @terms, "kMDItemContentTypeTree == 'public.image'"; + foreach (@good_extensions) { + + # kMDItemFSName hits the file system every time: much worse than "find". +# push @terms, "kMDItemFSName == '*.$_'"; + + # kMDItemDisplayName matches against the name in the Spotlight index, + # but won't find files that (for whatever reason) didn't get indexed. + push @terms, "kMDItemDisplayName == '*.$_'"; + } + + $dir =~ s@([^-_/a-z\d.,])@\\$1@gsi; # quote for sh + my $cmd = "mdfind -onlyin $dir \"" . join (' || ', @terms) . "\""; + + print STDERR "$progname: executing: $cmd\n" if ($verbose > 1); + @all_files = split (/[\r\n]+/, `$cmd`); +} + + +# If we're using cacheing, read the cache file and return its contents, +# if any. This also holds an exclusive lock on the cache file, which +# has the additional benefit that if two copies of this program are +# running at once, one will wait for the other, instead of both of +# them spanking the same file system at the same time. +# +my $cache_fd = undef; +my $cache_file_name = undef; +my $read_cache_p = 0; + +sub read_cache($) { + my ($dir) = @_; + + return () unless ($cache_p); + + my $dd = "$ENV{HOME}/Library/Caches"; # MacOS location + if (-d $dd) { + $cache_file_name = "$dd/org.jwz.xscreensaver.getimage.cache"; + } elsif (-d "$ENV{HOME}/tmp") { + $cache_file_name = "$ENV{HOME}/tmp/.xscreensaver-getimage.cache"; + } else { + $cache_file_name = "$ENV{HOME}/.xscreensaver-getimage.cache"; + } + + print STDERR "$progname: awaiting lock: $cache_file_name\n" + if ($verbose > 1); + + my $file = $cache_file_name; + open ($cache_fd, '+>>', $file) || error ("unable to write $file: $!"); + flock ($cache_fd, LOCK_EX) || error ("unable to lock $file: $!"); + seek ($cache_fd, 0, 0) || error ("unable to rewind $file: $!"); + + my $mtime = (stat($cache_fd))[9]; + + if ($mtime + $cache_max_age < time) { + print STDERR "$progname: cache is too old\n" if ($verbose); + return (); + } + + my $odir = <$cache_fd>; + $odir =~ s/[\r\n]+$//s if defined ($odir); + if (!defined ($odir) || ($dir ne $odir)) { + print STDERR "$progname: cache is for $odir, not $dir\n" + if ($verbose && $odir); + return (); + } + + my @files = (); + while (<$cache_fd>) { + s/[\r\n]+$//s; + push @files, "$odir/$_"; + } + + print STDERR "$progname: " . ($#files+1) . " files in cache\n" + if ($verbose); + + $read_cache_p = 1; + return @files; +} + + +sub write_cache($) { + my ($dir) = @_; + + return unless ($cache_p); + + # If we read the cache, just close it without rewriting it. + # If we didn't read it, then write it now. + + if (! $read_cache_p) { + + truncate ($cache_fd, 0) || + error ("unable to truncate $cache_file_name: $!"); + seek ($cache_fd, 0, 0) || + error ("unable to rewind $cache_file_name: $!"); + + if ($#all_files >= 0) { + print $cache_fd "$dir\n"; + foreach (@all_files) { + my $f = $_; # stupid Perl. do this to avoid modifying @all_files! + $f =~ s@^\Q$dir\L/@@so || die; # remove $dir from front + print $cache_fd "$f\n"; + } + } + + print STDERR "$progname: cached " . ($#all_files+1) . " files\n" + if ($verbose); + } + + flock ($cache_fd, LOCK_UN) || + error ("unable to unlock $cache_file_name: $!"); + close ($cache_fd); + $cache_fd = undef; +} + + +sub find_random_file($) { + my ($dir) = @_; + + if ($use_spotlight_p == -1) { + $use_spotlight_p = 0; + if (-x '/usr/bin/mdfind') { + $use_spotlight_p = 1; + } + } + + @all_files = read_cache ($dir); + + if ($#all_files >= 0) { + # got it from the cache... + + } elsif ($use_spotlight_p) { + print STDERR "$progname: spotlighting $dir...\n" if ($verbose); + spotlight_all_files ($dir); + print STDERR "$progname: found " . ($#all_files+1) . + " file" . ($#all_files == 0 ? "" : "s") . + " via Spotlight\n" + if ($verbose); + } else { + print STDERR "$progname: recursively reading $dir...\n" if ($verbose); + find_all_files ($dir); + print STDERR "$progname: " . + "f=" . ($#all_files+1) . "; " . + "d=$dir_count; " . + "s=$stat_count; " . + "skip=${skip_count_unstat}+$skip_count_stat=" . + ($skip_count_unstat + $skip_count_stat) . + ".\n" + if ($verbose); + } + + write_cache ($dir); + +# @all_files = sort(@all_files); + + if ($#all_files < 0) { + print STDERR "$progname: no files in $dir\n"; + exit 1; + } + + my $max_tries = 50; + for (my $i = 0; $i < $max_tries; $i++) { + + my $n = int (rand ($#all_files + 1)); + my $file = $all_files[$n]; + if (large_enough_p ($file)) { + $file =~ s@^\Q$dir\L/@@so || die; # remove $dir from front + return $file; + } + } + + print STDERR "$progname: no suitable images in $dir " . + "(after $max_tries tries)\n"; + exit 1; +} + + +sub large_enough_p($) { + my ($file) = @_; + + my ($w, $h) = image_file_size ($file); + + if (!defined ($h)) { + print STDERR "$progname: $file: unable to determine image size\n" + if ($verbose); + # Assume that unknown files are of good sizes: this will happen if + # they matched $good_file_re, but we don't have code to parse them. + # (This will also happen if the file is junk...) + return 1; + } + + if ($w < $min_image_width || $h < $min_image_height) { + print STDERR "$progname: $file: too small ($w x $h)\n" if ($verbose); + return 0; + } + + print STDERR "$progname: $file: $w x $h\n" if ($verbose); + return 1; +} + + + +# Given the raw body of a GIF document, returns the dimensions of the image. +# +sub gif_size($) { + my ($body) = @_; + my $type = substr($body, 0, 6); + my $s; + return () unless ($type =~ /GIF8[7,9]a/); + $s = substr ($body, 6, 10); + my ($a,$b,$c,$d) = unpack ("C"x4, $s); + return (($b<<8|$a), ($d<<8|$c)); +} + +# Given the raw body of a JPEG document, returns the dimensions of the image. +# +sub jpeg_size($) { + my ($body) = @_; + my $i = 0; + my $L = length($body); + + my $c1 = substr($body, $i, 1); $i++; + my $c2 = substr($body, $i, 1); $i++; + return () unless (ord($c1) == 0xFF && ord($c2) == 0xD8); + + my $ch = "0"; + while (ord($ch) != 0xDA && $i < $L) { + # Find next marker, beginning with 0xFF. + while (ord($ch) != 0xFF) { + return () if (length($body) <= $i); + $ch = substr($body, $i, 1); $i++; + } + # markers can be padded with any number of 0xFF. + while (ord($ch) == 0xFF) { + return () if (length($body) <= $i); + $ch = substr($body, $i, 1); $i++; + } + + # $ch contains the value of the marker. + my $marker = ord($ch); + + if (($marker >= 0xC0) && + ($marker <= 0xCF) && + ($marker != 0xC4) && + ($marker != 0xCC)) { # it's a SOFn marker + $i += 3; + return () if (length($body) <= $i); + my $s = substr($body, $i, 4); $i += 4; + my ($a,$b,$c,$d) = unpack("C"x4, $s); + return (($c<<8|$d), ($a<<8|$b)); + + } else { + # We must skip variables, since FFs in variable names aren't + # valid JPEG markers. + return () if (length($body) <= $i); + my $s = substr($body, $i, 2); $i += 2; + my ($c1, $c2) = unpack ("C"x2, $s); + my $length = ($c1 << 8) | $c2; + return () if ($length < 2); + $i += $length-2; + } + } + return (); +} + +# Given the raw body of a PNG document, returns the dimensions of the image. +# +sub png_size($) { + my ($body) = @_; + return () unless ($body =~ m/^\211PNG\r/s); + my ($bits) = ($body =~ m/^.{12}(.{12})/s); + return () unless defined ($bits); + return () unless ($bits =~ /^IHDR/); + my ($ign, $w, $h) = unpack("a4N2", $bits); + return ($w, $h); +} + + +# Given the raw body of a GIF, JPEG, or PNG document, returns the dimensions +# of the image. +# +sub image_size($) { + my ($body) = @_; + return () if (length($body) < 10); + my ($w, $h) = gif_size ($body); + if ($w && $h) { return ($w, $h); } + ($w, $h) = jpeg_size ($body); + if ($w && $h) { return ($w, $h); } + # #### TODO: need image parsers for TIFF, XPM, XBM. + return png_size ($body); +} + +# Returns the dimensions of the image file. +# +sub image_file_size($) { + my ($file) = @_; + my $in; + if (! open ($in, '<', $file)) { + print STDERR "$progname: $file: $!\n" if ($verbose); + return undef; + } + binmode ($in); # Larry can take Unicode and shove it up his ass sideways. + my $body = ''; + sysread ($in, $body, 1024 * 50); # The first 50k should be enough. + close $in; # (It's not for certain huge jpegs... + return image_size ($body); # but we know they're huge!) +} + + +sub error($) { + my ($err) = @_; + print STDERR "$progname: $err\n"; + exit 1; +} + +sub usage() { + print STDERR "usage: $progname [--verbose] directory\n" . + " Prints the name of a randomly-selected image file. The directory\n" . + " is searched recursively. Images smaller than " . + "${min_image_width}x${min_image_height} are excluded.\n"; + exit 1; +} + +sub main() { + my $dir = undef; + + while ($_ = $ARGV[0]) { + shift @ARGV; + if ($_ eq "--verbose") { $verbose++; } + elsif (m/^-v+$/) { $verbose += length($_)-1; } + elsif ($_ eq "--name") { } # ignored, for compatibility + elsif ($_ eq "--spotlight") { $use_spotlight_p = 1; } + elsif ($_ eq "--no-spotlight") { $use_spotlight_p = 0; } + elsif ($_ eq "--cache") { $cache_p = 1; } + elsif ($_ eq "--no-cache") { $cache_p = 0; } + elsif (m/^-./) { usage; } + elsif (!defined($dir)) { $dir = $_; } + else { usage; } + } + + usage unless (defined($dir)); + + $dir =~ s@^~/@$ENV{HOME}/@s; # allow literal "~/" + $dir =~ s@/+$@@s; # omit trailing / + + if (! -d $dir) { + print STDERR "$progname: $dir: not a directory\n"; + usage; + } + + my $file = find_random_file ($dir); + print STDOUT "$file\n"; +} + +main; +exit 0; diff --git a/source/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild index 57943911..830c4dd9 100755 --- a/source/xap/xscreensaver/xscreensaver.SlackBuild +++ b/source/xap/xscreensaver/xscreensaver.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -106,6 +106,12 @@ cp -a \ README* \ $PKG/usr/doc/xscreensaver-$VERSION +# Insert an older version of xscreensaver-getimage-file to avoid depending +# on libwww-perl. Maybe we'll eventually add this, but bundling 14 perl +# modules is a lot of maintainance just to get slidescreen working again. +# This restores the functionality that we had before without all that. +cat $CWD/xscreensaver-getimage-file-5.14 > $PKG/usr/bin/xscreensaver-getimage-file + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/xfce/Terminal/Terminal.SlackBuild b/source/xfce/Terminal/Terminal.SlackBuild new file mode 100755 index 00000000..f5335b2e --- /dev/null +++ b/source/xfce/Terminal/Terminal.SlackBuild @@ -0,0 +1,120 @@ +#!/bin/sh + +# Slackware build script for Xfce Terminal + +# Copyright 2010,2011 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=Terminal +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j6} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc/xfce \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* HACKING INSTALL NEWS README* THANKS TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/Terminal/slack-desc b/source/xfce/Terminal/slack-desc new file mode 100644 index 00000000..23121078 --- /dev/null +++ b/source/xfce/Terminal/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +Terminal: Terminal (Xfce's Terminal Emulator) +Terminal: +Terminal: This is the Terminal emulator application. Terminal is a lightweight +Terminal: and easy to use terminal emulator for the X windowing system, with +Terminal: some new ideas and features that makes it unique among X terminal +Terminal: emulators. +Terminal: +Terminal: +Terminal: +Terminal: +Terminal: diff --git a/source/xfce/Thunar/Thunar.SlackBuild b/source/xfce/Thunar/Thunar.SlackBuild new file mode 100755 index 00000000..54f72b77 --- /dev/null +++ b/source/xfce/Thunar/Thunar.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=Thunar +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/Thunar/slack-desc b/source/xfce/Thunar/slack-desc new file mode 100644 index 00000000..afd93c05 --- /dev/null +++ b/source/xfce/Thunar/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +Thunar: Thunar (file manager) +Thunar: +Thunar: Thunar is a modern file manager for the Xfce Desktop Environment. +Thunar: Thunar has been designed from the ground up to be fast and +Thunar: easy-to-use. Its user interface is clean and intuitive, and does not +Thunar: include any confusing or useless options. Thunar is fast and +Thunar: responsive with a good start up time and directory load time. +Thunar: +Thunar: Homepage: http://thunar.xfce.org +Thunar: +Thunar: diff --git a/source/xfce/exo/exo.SlackBuild b/source/xfce/exo/exo.SlackBuild new file mode 100755 index 00000000..a3189a58 --- /dev/null +++ b/source/xfce/exo/exo.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=exo +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/exo/slack-desc b/source/xfce/exo/slack-desc new file mode 100644 index 00000000..6bd9c826 --- /dev/null +++ b/source/xfce/exo/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +exo: exo (libexo extension library) +exo: +exo: This is libexo, an extension library to Xfce, developed by +exo: os-cillation. While Xfce comes with quite a few libraries that are +exo: targeted at desktop development, libexo is targeted at application +exo: development. It also has some helper applications that are used +exo: throughout the entire desktop. +exo: +exo: +exo: +exo: diff --git a/source/xfce/garcon/garcon.SlackBuild b/source/xfce/garcon/garcon.SlackBuild new file mode 100755 index 00000000..f60c47f9 --- /dev/null +++ b/source/xfce/garcon/garcon.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=garcon +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/garcon/slack-desc b/source/xfce/garcon/slack-desc new file mode 100644 index 00000000..abc2d786 --- /dev/null +++ b/source/xfce/garcon/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +garcon: garcon (menu implementation for Xfce) +garcon: +garcon: This is garcon, a freedesktop.org compliant menu implementation based +garcon: on GLib and GIO. It was started as a rewrite of the former Xfce menu +garcon: library called libxfce4menu. +garcon: +garcon: +garcon: +garcon: +garcon: +garcon: diff --git a/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild b/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild new file mode 100755 index 00000000..8e9454c1 --- /dev/null +++ b/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=gtk-xfce-engine +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/gtk-xfce-engine/slack-desc b/source/xfce/gtk-xfce-engine/slack-desc new file mode 100644 index 00000000..1ccfa128 --- /dev/null +++ b/source/xfce/gtk-xfce-engine/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +gtk-xfce-engine: gtk-xfce-engine (Xfce Gtk+ engines) +gtk-xfce-engine: +gtk-xfce-engine: The GTK-Xfce-Engine package contains several GTK+-2/3 themes and the +gtk-xfce-engine: applications and libraries needed to display them. This is useful for +gtk-xfce-engine: customizing the appearance of your Xfce desktop. +gtk-xfce-engine: +gtk-xfce-engine: +gtk-xfce-engine: +gtk-xfce-engine: +gtk-xfce-engine: +gtk-xfce-engine: diff --git a/source/xfce/libxfce4ui/libxfce4ui.SlackBuild b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild new file mode 100755 index 00000000..3762c747 --- /dev/null +++ b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild @@ -0,0 +1,140 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=libxfce4ui +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --with-vendor-info=Slackware \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Add vendor info in /usr/share/xfce4/Slackware +mkdir -p $PKG/usr/share/xfce4 +echo "http://slackware.com/" > $PKG/usr/share/xfce4/Slackware + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/libxfce4ui/slack-desc b/source/xfce/libxfce4ui/slack-desc new file mode 100644 index 00000000..d774e673 --- /dev/null +++ b/source/xfce/libxfce4ui/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +libxfce4ui: libxfce4ui (Xfce widget library) +libxfce4ui: +libxfce4ui: This is libxfce4ui, the replacement of the old libxfcegui4 library. +libxfce4ui: It is used to share commonly used Xfce widgets among the Xfce +libxfce4ui: applications. +libxfce4ui: +libxfce4ui: +libxfce4ui: +libxfce4ui: +libxfce4ui: +libxfce4ui: diff --git a/source/xfce/libxfce4util/libxfce4util.SlackBuild b/source/xfce/libxfce4util/libxfce4util.SlackBuild new file mode 100755 index 00000000..8d19530d --- /dev/null +++ b/source/xfce/libxfce4util/libxfce4util.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=libxfce4util +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/libxfce4util/slack-desc b/source/xfce/libxfce4util/slack-desc new file mode 100644 index 00000000..b5c92596 --- /dev/null +++ b/source/xfce/libxfce4util/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +libxfce4util: libxfce4util (basic utility library for Xfce) +libxfce4util: +libxfce4util: Basic utility library for Xfce. This provides useful functions not +libxfce4util: relating to the handling of the user interface. +libxfce4util: +libxfce4util: +libxfce4util: +libxfce4util: +libxfce4util: +libxfce4util: +libxfce4util: diff --git a/source/xfce/libxfcegui4/libxfcegui4.SlackBuild b/source/xfce/libxfcegui4/libxfcegui4.SlackBuild new file mode 100755 index 00000000..d4af97ff --- /dev/null +++ b/source/xfce/libxfcegui4/libxfcegui4.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=libxfcegui4 +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/libxfcegui4/slack-desc b/source/xfce/libxfcegui4/slack-desc new file mode 100644 index 00000000..8309460d --- /dev/null +++ b/source/xfce/libxfcegui4/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +libxfcegui4: libxfcegui4 (old Xfce widget library) +libxfcegui4: +libxfcegui4: This is a widget library for Xfce. It has been replaced by the use +libxfcegui4: of the libxfce4ui library, but older programs might still need it. +libxfcegui4: +libxfcegui4: +libxfcegui4: +libxfcegui4: +libxfcegui4: +libxfcegui4: +libxfcegui4: diff --git a/source/xfce/orage/orage.SlackBuild b/source/xfce/orage/orage.SlackBuild new file mode 100755 index 00000000..9342007c --- /dev/null +++ b/source/xfce/orage/orage.SlackBuild @@ -0,0 +1,121 @@ +#!/bin/sh + +# Slackware build script for orage + +# Copyright 2010,2011,2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=orage +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Yes, libical's pkgconfig file is incomplete, it seems +CFLAGS="$SLKCFLAGS -I/usr/include/libical" \ +CXXFLAGS="$SLKCFLAGS -I/usr/include/libical" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/orage/slack-desc b/source/xfce/orage/slack-desc new file mode 100644 index 00000000..665765d0 --- /dev/null +++ b/source/xfce/orage/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +orage: orage (Xfce's calendar) +orage: +orage: Orage is a time-managing application for the Xfce desktop environment. +orage: +orage: +orage: +orage: +orage: +orage: +orage: +orage: diff --git a/source/xfce/thunar-volman/slack-desc b/source/xfce/thunar-volman/slack-desc new file mode 100644 index 00000000..900d22a4 --- /dev/null +++ b/source/xfce/thunar-volman/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------| +thunar-volman: thunar-volman (Thunar Volume Manager Plugin) +thunar-volman: +thunar-volman: thunar-volman is an extension for the Thunar File Manager, +thunar-volman: which enables automatic management of removable drives and +thunar-volman: media. +thunar-volman: +thunar-volman: +thunar-volman: +thunar-volman: +thunar-volman: +thunar-volman: diff --git a/source/xfce/thunar-volman/thunar-volman.SlackBuild b/source/xfce/thunar-volman/thunar-volman.SlackBuild new file mode 100755 index 00000000..89fd5ab8 --- /dev/null +++ b/source/xfce/thunar-volman/thunar-volman.SlackBuild @@ -0,0 +1,103 @@ +#!/bin/sh + +# Slackware build script for thunar-volman + +# Copyright 2007-2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=thunar-volman +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --enable-debug=no \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* THANKS \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/xfce/tumbler/slack-desc b/source/xfce/tumbler/slack-desc new file mode 100644 index 00000000..d40670e4 --- /dev/null +++ b/source/xfce/tumbler/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tumbler: tumbler (thumbnail generator) +tumbler: +tumbler: Tumbler is a D-Bus service for applications to request thumbnails +tumbler: for various URI schemes and MIME types. It is written in an object- +tumbler: oriented fashion using GLib and GObject. It provides plugin +tumbler: interfaces for extending the URI schemes and MIME types for which +tumbler: thumbnails can be generated as well as for replacing the storage +tumbler: backend that is used to store the thumbnails on disk. +tumbler: +tumbler: +tumbler: diff --git a/source/xfce/tumbler/tumbler.SlackBuild b/source/xfce/tumbler/tumbler.SlackBuild new file mode 100755 index 00000000..2b164913 --- /dev/null +++ b/source/xfce/tumbler/tumbler.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=tumbler +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfce-build-all.sh b/source/xfce/xfce-build-all.sh new file mode 100755 index 00000000..0ad32cc7 --- /dev/null +++ b/source/xfce/xfce-build-all.sh @@ -0,0 +1,72 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Set to 1 if you'd like to install/upgrade package as they are built. +# This is recommended. +INST=1 + +TMP=${TMP:-/tmp} + +for package in \ + xfce4-dev-tools \ + libxfce4util \ + xfconf \ + libxfce4ui \ + libxfcegui4 \ + exo \ + garcon \ + tumbler \ + Thunar \ + xfce4-panel \ + xfce4-settings \ + xfce4-session \ + xfdesktop \ + xfwm4 \ + xfce4-appfinder \ + gtk-xfce-engine \ + xfwm4-themes \ + Terminal \ + orage \ + xfce4-mixer \ + thunar-volman \ + xfce4-power-manager \ + xfce4-notifyd \ + xfce4-volumed \ + xfce4-clipman-plugin \ + xfce4-screenshooter \ + xfce4-systemload-plugin \ + xfce4-taskmanager \ + xfce4-weather-plugin \ + ; do + cd $package || exit 1 + ./${package}.SlackBuild || ( touch /tmp/${package}.failed ; exit 1 ) || exit 1 + if [ "$INST" = "1" ]; then + PACKAGE="$(ls -t $TMP/$(ls ${package}*.xz | rev | cut -f2- -d - | rev)-*txz | head -n 1)" + if [ -f $PACKAGE ]; then + upgradepkg --install-new --reinstall $PACKAGE + else + echo "Error: package to upgrade "$PACKAGE" not found in $TMP" + exit 1 + fi + fi + cd .. +done diff --git a/source/xfce/xfce4-appfinder/slack-desc b/source/xfce/xfce4-appfinder/slack-desc new file mode 100644 index 00000000..ef06f705 --- /dev/null +++ b/source/xfce/xfce4-appfinder/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfce4-appfinder: xfce4-appfinder (Application finder) +xfce4-appfinder: +xfce4-appfinder: The Xfce application finder is a tool to find and launch installed +xfce4-appfinder: applications on your system and execute commands. It can also be used +xfce4-appfinder: to quickly add launchers to the Xfce Panel by dragging an item from +xfce4-appfinder: the view and dropping it on the panel. +xfce4-appfinder: +xfce4-appfinder: +xfce4-appfinder: +xfce4-appfinder: +xfce4-appfinder: diff --git a/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild b/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild new file mode 100755 index 00000000..dffff689 --- /dev/null +++ b/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=xfce4-appfinder +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfce4-clipman-plugin/doinst.sh b/source/xfce/xfce4-clipman-plugin/doinst.sh new file mode 100644 index 00000000..1f8ff67d --- /dev/null +++ b/source/xfce/xfce4-clipman-plugin/doinst.sh @@ -0,0 +1,10 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/source/xfce/xfce4-clipman-plugin/slack-desc b/source/xfce/xfce4-clipman-plugin/slack-desc new file mode 100644 index 00000000..def91845 --- /dev/null +++ b/source/xfce/xfce4-clipman-plugin/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfce4-clipman-plugin: xfce4-clipman-plugin (clipman plugin for the Xfce panel) +xfce4-clipman-plugin: +xfce4-clipman-plugin: Clipman allows you to keep several clipboard selections in memory +xfce4-clipman-plugin: which you can then use to toggle. It can pull the clips from both +xfce4-clipman-plugin: the selection and the copy buffer, restore your clipboard on login, +xfce4-clipman-plugin: and prevent an empty clipboard. +xfce4-clipman-plugin: +xfce4-clipman-plugin: +xfce4-clipman-plugin: +xfce4-clipman-plugin: +xfce4-clipman-plugin: diff --git a/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild b/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild new file mode 100755 index 00000000..813c32d9 --- /dev/null +++ b/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild @@ -0,0 +1,108 @@ +#!/bin/sh + +# Slackware build script for xfce4-clipman-plugin + +# Copyright 2006-2012 Robby Workman Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# Redistributions of this script must retain the above copyright +# notice, this list of conditions, and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=xfce4-clipman-plugin +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --enable-shared=yes \ + --enable-static=no \ + --enable-debug=no \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.url b/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.url new file mode 100644 index 00000000..73b59ab1 --- /dev/null +++ b/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.url @@ -0,0 +1 @@ +http://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/ diff --git a/source/xfce/xfce4-dev-tools/slack-desc b/source/xfce/xfce4-dev-tools/slack-desc new file mode 100644 index 00000000..a5d0a4df --- /dev/null +++ b/source/xfce/xfce4-dev-tools/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfce4-dev-tools: xfce4-dev-tools (Xfce development tools) +xfce4-dev-tools: +xfce4-dev-tools: The Xfce development tools are a collection of tools and macros for +xfce4-dev-tools: Xfce developers and people that want to build Xfce from Git. +xfce4-dev-tools: +xfce4-dev-tools: +xfce4-dev-tools: +xfce4-dev-tools: +xfce4-dev-tools: +xfce4-dev-tools: +xfce4-dev-tools: diff --git a/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild b/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild new file mode 100755 index 00000000..0924180e --- /dev/null +++ b/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=xfce4-dev-tools +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfce4-mixer/doinst.sh b/source/xfce/xfce4-mixer/doinst.sh new file mode 100644 index 00000000..9830478e --- /dev/null +++ b/source/xfce/xfce4-mixer/doinst.sh @@ -0,0 +1,14 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/source/xfce/xfce4-mixer/slack-desc b/source/xfce/xfce4-mixer/slack-desc new file mode 100644 index 00000000..72741874 --- /dev/null +++ b/source/xfce/xfce4-mixer/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfce4-mixer: xfce4-mixer (Sound mixer applet for Xfce) +xfce4-mixer: +xfce4-mixer: The xfce4-mixer package contains a volume control application based +xfce4-mixer: on GStreamer written to conceptually fit into the Xfce desktop +xfce4-mixer: environment. It also contains a plugin for the Xfce panel which is +xfce4-mixer: especially designed for use with the mouse wheel. +xfce4-mixer: +xfce4-mixer: +xfce4-mixer: +xfce4-mixer: +xfce4-mixer: diff --git a/source/xfce/xfce4-mixer/xfce4-mixer.SlackBuild b/source/xfce/xfce4-mixer/xfce4-mixer.SlackBuild new file mode 100755 index 00000000..4787144b --- /dev/null +++ b/source/xfce/xfce4-mixer/xfce4-mixer.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/sh + +# Slackware build script for xfce4-mixer + +# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=xfce4-mixer +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc/xfce \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* HACKING INSTALL NEWS README* THANKS TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfce4-notifyd/doinst.sh b/source/xfce/xfce4-notifyd/doinst.sh new file mode 100644 index 00000000..ec1b3d8a --- /dev/null +++ b/source/xfce/xfce4-notifyd/doinst.sh @@ -0,0 +1,10 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications 2>/dev/null +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/source/xfce/xfce4-notifyd/slack-desc b/source/xfce/xfce4-notifyd/slack-desc new file mode 100644 index 00000000..1463db0b --- /dev/null +++ b/source/xfce/xfce4-notifyd/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfce4-notifyd: xfce4-notifyd (Xfce Notify Daemon) +xfce4-notifyd: +xfce4-notifyd: Xfce4-notifyd is a simple, visually-appealing notification daemon +xfce4-notifyd: for Xfce. Applications can use xfce4-notifyd to pop up a notification +xfce4-notifyd: bubble by sending messages through D-Bus. +xfce4-notifyd: +xfce4-notifyd: Homepage: http://spuriousinterrupt.org/projects/xfce4-notifyd +xfce4-notifyd: +xfce4-notifyd: +xfce4-notifyd: +xfce4-notifyd: diff --git a/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild new file mode 100755 index 00000000..1a793217 --- /dev/null +++ b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild @@ -0,0 +1,121 @@ +#!/bin/sh + +# Slackware build script for Xfce4-notifyd + +# Copyright 2008 Frank Caraballo +# Copyright 2010 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=xfce4-notifyd +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc/xfce \ + --localstatedir=/var \ + --mandir=/usr/man \ + --enable-debug=no \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install-strip DESTDIR=$PKG || exit 1 + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/xfce/xfce4-panel/slack-desc b/source/xfce/xfce4-panel/slack-desc new file mode 100644 index 00000000..0711bf8b --- /dev/null +++ b/source/xfce/xfce4-panel/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfce4-panel: xfce4-panel (panel for Xfce) +xfce4-panel: +xfce4-panel: The Xfce panel is part of the Xfce Desktop Environment and features +xfce4-panel: program launchers, panel menus, a clock, a desktop switcher, and more. +xfce4-panel: Many aspects of the panel can be configured through graphical dialogs, +xfce4-panel: but also by GTK+ style properties and Xfconf settings. +xfce4-panel: +xfce4-panel: +xfce4-panel: +xfce4-panel: +xfce4-panel: diff --git a/source/xfce/xfce4-panel/xfce4-panel.SlackBuild b/source/xfce/xfce4-panel/xfce4-panel.SlackBuild new file mode 100755 index 00000000..425cc3d3 --- /dev/null +++ b/source/xfce/xfce4-panel/xfce4-panel.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=xfce4-panel +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfce4-power-manager/doinst.sh b/source/xfce/xfce4-power-manager/doinst.sh new file mode 100644 index 00000000..1f8ff67d --- /dev/null +++ b/source/xfce/xfce4-power-manager/doinst.sh @@ -0,0 +1,10 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/source/xfce/xfce4-power-manager/slack-desc b/source/xfce/xfce4-power-manager/slack-desc new file mode 100644 index 00000000..8c79d3d7 --- /dev/null +++ b/source/xfce/xfce4-power-manager/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------| +xfce4-power-manager: xfce4-power-manager (Power Management Daemon for Xfce) +xfce4-power-manager: +xfce4-power-manager: xfce4-power-manager makes power management functions (such as +xfce4-power-manager: suspend and hibernate) easy inside the Xfce Desktop Environment. +xfce4-power-manager: +xfce4-power-manager: +xfce4-power-manager: +xfce4-power-manager: +xfce4-power-manager: +xfce4-power-manager: +xfce4-power-manager: diff --git a/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild b/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild new file mode 100755 index 00000000..37229cd8 --- /dev/null +++ b/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild @@ -0,0 +1,129 @@ +#!/bin/sh + +# Slackware build script for xfce4-power-manager + +# Copyright 2006-2012 Robby Workman Northport, Alabama, USA +# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=xfce4-power-manager +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + *) export ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --enable-shared=yes \ + --enable-static=no \ + --enable-debug=no \ + --enable-network-manager \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html +cp -a \ + AUTHORS COPYING* NEWS README* TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION +( cd $PKG/usr/doc/$PKGNAM-$VERSION/html + ln -s /usr/share/xfce4/doc/C/xfce4-power-manager.html index.html + ln -s /usr/share/xfce4/doc/C/images . +) + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/xfce/xfce4-screenshooter/doinst.sh b/source/xfce/xfce4-screenshooter/doinst.sh new file mode 100644 index 00000000..1f8ff67d --- /dev/null +++ b/source/xfce/xfce4-screenshooter/doinst.sh @@ -0,0 +1,10 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/source/xfce/xfce4-screenshooter/slack-desc b/source/xfce/xfce4-screenshooter/slack-desc new file mode 100644 index 00000000..83eeaf7b --- /dev/null +++ b/source/xfce/xfce4-screenshooter/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfce4-screenshooter: xfce4-screenshooter (screenshooter plugin for Xfce) +xfce4-screenshooter: +xfce4-screenshooter: The screenshooter plugin adds a panel button that allows you to take +xfce4-screenshooter: screenshots. +xfce4-screenshooter: +xfce4-screenshooter: +xfce4-screenshooter: +xfce4-screenshooter: +xfce4-screenshooter: +xfce4-screenshooter: +xfce4-screenshooter: diff --git a/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild new file mode 100755 index 00000000..791a78f0 --- /dev/null +++ b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild @@ -0,0 +1,130 @@ +#!/bin/sh + +# Slackware build script for xfce4-screenshooter + +# Copyright 2006-2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=xfce4-screenshooter +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc/xfce \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --mandir=/usr/man \ + --enable-shared=yes \ + --enable-static=no \ + --enable-debug=no \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +if [ -d $PKG/usr/share/doc/xfce4-screenshooter ]; then # --docdir was ignored + mv $PKG/usr/share/doc/xfce4-screenshooter/* $PKG/usr/doc/$PKGNAM-$VERSION + ( cd $PKG/usr/share ; rmdir -p doc/xfce4-screenshooter ) +fi + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url new file mode 100644 index 00000000..48b2447e --- /dev/null +++ b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url @@ -0,0 +1 @@ +http://archive.xfce.org/src/apps/xfce4-screenshooter/ diff --git a/source/xfce/xfce4-session/slack-desc b/source/xfce/xfce4-session/slack-desc new file mode 100644 index 00000000..235feb30 --- /dev/null +++ b/source/xfce/xfce4-session/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfce4-session: xfce4-session (Xfce session manager) +xfce4-session: +xfce4-session: Xfce4-session is a session manager for Xfce. Its task is to save the +xfce4-session: state of your desktop (opened applications and their location) and +xfce4-session: restore it during a next startup. You can create several different +xfce4-session: sessions and choose one of them on startup. +xfce4-session: +xfce4-session: +xfce4-session: +xfce4-session: +xfce4-session: diff --git a/source/xfce/xfce4-session/xfce4-session.SlackBuild b/source/xfce/xfce4-session/xfce4-session.SlackBuild new file mode 100755 index 00000000..081a1378 --- /dev/null +++ b/source/xfce/xfce4-session/xfce4-session.SlackBuild @@ -0,0 +1,138 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=xfce4-session +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +zcat $CWD/patches/load_systemwide_Xmodmap_file.diff.gz | patch -p1 || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --enable-libgnome-keyring \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfce4-settings/slack-desc b/source/xfce/xfce4-settings/slack-desc new file mode 100644 index 00000000..590a3b3e --- /dev/null +++ b/source/xfce/xfce4-settings/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfce4-settings: xfce4-settings (Xfce settings manager) +xfce4-settings: +xfce4-settings: xfce4-settings is the Xfce settings manager front-end. It comes with +xfce4-settings: several different components for configuring application-independent +xfce4-settings: settings inside xfconf. +xfce4-settings: +xfce4-settings: +xfce4-settings: +xfce4-settings: +xfce4-settings: +xfce4-settings: diff --git a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild new file mode 100755 index 00000000..6e400455 --- /dev/null +++ b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild @@ -0,0 +1,140 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=xfce4-settings +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +zcat $CWD/xfce4-settings.theme.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/xfce4-settings.xft.defaults.diff.gz | patch -p1 --verbose || exit 1 + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --enable-pluggable-dialogs \ + --enable-sound-settings \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfce4-settings/xfce4-settings.theme.diff b/source/xfce/xfce4-settings/xfce4-settings.theme.diff new file mode 100644 index 00000000..ebdcf88f --- /dev/null +++ b/source/xfce/xfce4-settings/xfce4-settings.theme.diff @@ -0,0 +1,12 @@ +diff -Nur xfce4-settings-4.10.0.orig/xfsettingsd/xsettings.xml xfce4-settings-4.10.0/xfsettingsd/xsettings.xml +--- xfce4-settings-4.10.0.orig/xfsettingsd/xsettings.xml 2012-04-28 15:48:30.000000000 -0500 ++++ xfce4-settings-4.10.0/xfsettingsd/xsettings.xml 2012-05-02 10:16:35.422408879 -0500 +@@ -7,7 +7,7 @@ + + + +- ++ + + + diff --git a/source/xfce/xfce4-settings/xfce4-settings.xft.defaults.diff b/source/xfce/xfce4-settings/xfce4-settings.xft.defaults.diff new file mode 100644 index 00000000..333b615d --- /dev/null +++ b/source/xfce/xfce4-settings/xfce4-settings.xft.defaults.diff @@ -0,0 +1,23 @@ +--- ./xfsettingsd/xsettings.xml.orig 2012-04-28 15:48:30.000000000 -0500 ++++ ./xfsettingsd/xsettings.xml 2012-07-19 14:32:25.554643922 -0500 +@@ -17,14 +17,19 @@ + + + ++ ++ + ++--> + + + diff --git a/source/xfce/xfce4-systemload-plugin/slack-desc b/source/xfce/xfce4-systemload-plugin/slack-desc new file mode 100644 index 00000000..e83e9306 --- /dev/null +++ b/source/xfce/xfce4-systemload-plugin/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfce4-systemload-plugin: xfce4-systemload-plugin (systemload plugin for the Xfce panel) +xfce4-systemload-plugin: +xfce4-systemload-plugin: This plugin displays the current system load on the Xfce panel. +xfce4-systemload-plugin: +xfce4-systemload-plugin: +xfce4-systemload-plugin: +xfce4-systemload-plugin: +xfce4-systemload-plugin: +xfce4-systemload-plugin: +xfce4-systemload-plugin: +xfce4-systemload-plugin: diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild new file mode 100755 index 00000000..dbe0343e --- /dev/null +++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/sh + +# Slackware build script for xfce4-systemload-plugin + +# Copyright 2006-2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Maintained by Ozan Turkyilmaz ozan.turkyilmaz@gmail.com + +PKGNAM=xfce4-systemload-plugin +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc/xfce \ + --enable-shared=yes \ + --enable-static=no \ + --enable-debug=no \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.url b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.url new file mode 100644 index 00000000..17d17c5a --- /dev/null +++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.url @@ -0,0 +1 @@ +http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/ diff --git a/source/xfce/xfce4-taskmanager/doinst.sh b/source/xfce/xfce4-taskmanager/doinst.sh new file mode 100644 index 00000000..4e8ba707 --- /dev/null +++ b/source/xfce/xfce4-taskmanager/doinst.sh @@ -0,0 +1,4 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + diff --git a/source/xfce/xfce4-taskmanager/slack-desc b/source/xfce/xfce4-taskmanager/slack-desc new file mode 100644 index 00000000..f4e05a13 --- /dev/null +++ b/source/xfce/xfce4-taskmanager/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfce4-taskmanager: xfce4-taskmanager (running apps / task manager application) +xfce4-taskmanager: +xfce4-taskmanager: xfce4-taskmanager shows a list of running apps (similar to the +xfce4-taskmanager: task manager included with some other operating systems) :) +xfce4-taskmanager: +xfce4-taskmanager: The taskmanager is started by running the command 'xfce4-taskmanager' +xfce4-taskmanager: +xfce4-taskmanager: +xfce4-taskmanager: +xfce4-taskmanager: +xfce4-taskmanager: diff --git a/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild new file mode 100755 index 00000000..df702f0f --- /dev/null +++ b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild @@ -0,0 +1,105 @@ +#!/bin/sh + +# Slackware build script for xfce4-taskmanager + +# Copyright 2006-2011 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=xfce4-taskmanager +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc/xfce \ + --enable-shared=yes \ + --enable-static=no \ + --enable-debug=no \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfce4-taskmanager/xfce4-taskmanager.url b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.url new file mode 100644 index 00000000..7cefa665 --- /dev/null +++ b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.url @@ -0,0 +1 @@ +http://archive.xfce.org/src/apps/xfce4-taskmanager diff --git a/source/xfce/xfce4-volumed/slack-desc b/source/xfce/xfce4-volumed/slack-desc new file mode 100644 index 00000000..e9266cbc --- /dev/null +++ b/source/xfce/xfce4-volumed/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfce4-volumed: xfce4-volumed (audio volume management daemon) +xfce4-volumed: +xfce4-volumed: This daemon is responsible for making the volume up/down and mute +xfce4-volumed: keys of the keyboard work automatically, and uses the XFCE mixer's +xfce4-volumed: defined card and track for choosing which track to act on. +xfce4-volumed: +xfce4-volumed: It also provides volume change and mute toggle notifications if +xfce4-volumed: a notification daemon is running (using libnotify). +xfce4-volumed: +xfce4-volumed: Homepage: https://launchpad.net/xfce4-volumed +xfce4-volumed: diff --git a/source/xfce/xfce4-volumed/xfce4-volumed.SlackBuild b/source/xfce/xfce4-volumed/xfce4-volumed.SlackBuild new file mode 100755 index 00000000..147716ea --- /dev/null +++ b/source/xfce/xfce4-volumed/xfce4-volumed.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/sh + +# Slackware build script for xfce4-volumed + +# Copyright 2006-2011 Robby Workman Northport, Alabama, USA +# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=xfce4-volumed +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --enable-debug=no \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* THANKS \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfce4-weather-plugin/slack-desc b/source/xfce/xfce4-weather-plugin/slack-desc new file mode 100644 index 00000000..7d9b0675 --- /dev/null +++ b/source/xfce/xfce4-weather-plugin/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfce4-weather-plugin: xfce4-weather-plugin (weather plugin for the Xfce panel) +xfce4-weather-plugin: +xfce4-weather-plugin: The weather plugin displays current weather conditions and forecasts. +xfce4-weather-plugin: +xfce4-weather-plugin: +xfce4-weather-plugin: +xfce4-weather-plugin: +xfce4-weather-plugin: +xfce4-weather-plugin: +xfce4-weather-plugin: +xfce4-weather-plugin: diff --git a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild new file mode 100755 index 00000000..d2d290b5 --- /dev/null +++ b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/sh + +# Slackware build script for xfce4-weather-plugin + +# Copyright 2006-2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=xfce4-weather-plugin +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc/xfce \ + --enable-shared=yes \ + --enable-static=no \ + --enable-debug=no \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url new file mode 100644 index 00000000..9ee0ef01 --- /dev/null +++ b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url @@ -0,0 +1 @@ +http://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/ diff --git a/source/xfce/xfconf/slack-desc b/source/xfce/xfconf/slack-desc new file mode 100644 index 00000000..a48abb4b --- /dev/null +++ b/source/xfce/xfconf/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfconf: xfconf (Xfce configuration storage system) +xfconf: +xfconf: A daemon and query system for managing the storage and retrieval of +xfconf: settings for the Xfce Desktop Environment, both graphically as well as +xfconf: from the command line. +xfconf: +xfconf: +xfconf: +xfconf: +xfconf: +xfconf: diff --git a/source/xfce/xfconf/xfconf.SlackBuild b/source/xfce/xfconf/xfconf.SlackBuild new file mode 100755 index 00000000..af252f62 --- /dev/null +++ b/source/xfce/xfconf/xfconf.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=xfconf +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfdesktop/slack-desc b/source/xfce/xfdesktop/slack-desc new file mode 100644 index 00000000..e98b02b8 --- /dev/null +++ b/source/xfce/xfdesktop/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfdesktop: xfdesktop (Xfce desktop manager) +xfdesktop: +xfdesktop: Xfdesktop is a desktop manager for the Xfce Desktop Environment. +xfdesktop: Desktop in this respect means the root window. The manager handles +xfdesktop: tasks such as the background image and color, the root menu and window +xfdesktop: list, minimized application icons, and file icons on the desktop. +xfdesktop: +xfdesktop: +xfdesktop: +xfdesktop: +xfdesktop: diff --git a/source/xfce/xfdesktop/xfdesktop.SlackBuild b/source/xfce/xfdesktop/xfdesktop.SlackBuild new file mode 100755 index 00000000..15c6e575 --- /dev/null +++ b/source/xfce/xfdesktop/xfdesktop.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=xfdesktop +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfwm4-themes/slack-desc b/source/xfce/xfwm4-themes/slack-desc new file mode 100644 index 00000000..dca6ee94 --- /dev/null +++ b/source/xfce/xfwm4-themes/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfwm4-themes: xfwm4-themes (themes for the Xfce window manager) +xfwm4-themes: +xfwm4-themes: This package contains a wide variety of themes for xfwm4, the window +xfwm4-themes: manager of the Xfce4 project. If the default theme is not to your +xfwm4-themes: liking, you'll probably find the eyecandy you're looking for here. +xfwm4-themes: +xfwm4-themes: +xfwm4-themes: +xfwm4-themes: +xfwm4-themes: +xfwm4-themes: diff --git a/source/xfce/xfwm4-themes/xfwm4-themes.SlackBuild b/source/xfce/xfwm4-themes/xfwm4-themes.SlackBuild new file mode 100755 index 00000000..90748d0e --- /dev/null +++ b/source/xfce/xfwm4-themes/xfwm4-themes.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=xfwm4-themes +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfwm4/slack-desc b/source/xfce/xfwm4/slack-desc new file mode 100644 index 00000000..89db3f57 --- /dev/null +++ b/source/xfce/xfwm4/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfwm4: xfwm4 (Xfce Window Manager) +xfwm4: +xfwm4: This package contains xfwm4 which is the window manager for Xfce4. +xfwm4: It is designed to run with the rest of Xfce, but it also makes a +xfwm4: capable window manager for any X11 environment. +xfwm4: +xfwm4: +xfwm4: +xfwm4: +xfwm4: +xfwm4: diff --git a/source/xfce/xfwm4/xfwm4.SlackBuild b/source/xfce/xfwm4/xfwm4.SlackBuild new file mode 100755 index 00000000..7855b84e --- /dev/null +++ b/source/xfce/xfwm4/xfwm4.SlackBuild @@ -0,0 +1,139 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=xfwm4 +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +mkdir -p $PKG/etc/X11/xinit +cat $CWD/xinitrc.xfce > $PKG/etc/X11/xinit/xinitrc.xfce +chmod 0755 $PKG/etc/X11/xinit/* + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# We don't want icon caches: +find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \; + +# Add a documentation directory. Not all of these files are expected to be +# present, but listing them ensures that documentation that might appear and +# disappear from version to version will not be missed. +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \ + NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xfce/xfwm4/xinitrc.xfce b/source/xfce/xfwm4/xinitrc.xfce new file mode 100644 index 00000000..82c0dd40 --- /dev/null +++ b/source/xfce/xfwm4/xinitrc.xfce @@ -0,0 +1,40 @@ +#!/bin/sh +# xinitrc.xfce - modified to work around xfce4session bug +# https://bugzilla.xfce.org/show_bug.cgi?id=8841 + + +######################################################################## +## Merge in defaults and keymaps ## +######################################################################## + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +if [ -f $sysresources ]; then + /usr/bin/xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + /usr/bin/xmodmap $sysmodmap +fi + +if [ -f $userresources ]; then + /usr/bin/xrdb -merge $userresources +fi + +if [ -f $usermodmap ]; then + /usr/bin/xmodmap $usermodmap +fi + +######################################################################## +## Start xfce Desktop Environment ## +######################################################################## + +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then + exec ck-launch-session dbus-launch --exit-with-session /usr/bin/startxfce4 +else + exec dbus-launch --exit-with-session /usr/bin/startxfce4 +fi + diff --git a/source/y/bsd-games/bsd-games.SlackBuild b/source/y/bsd-games/bsd-games.SlackBuild index 4fb99671..63f4b452 100755 --- a/source/y/bsd-games/bsd-games.SlackBuild +++ b/source/y/bsd-games/bsd-games.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=${VERSION:-2.13} -BUILD=${BUILD:-11} +BUILD=${BUILD:-12} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -56,6 +56,11 @@ zcat $CWD/bsd-games.trek-gcc4.diff.gz | patch -p1 --backup --suffix=.orig || exi zcat $CWD/bsd-games.phantasia_install_fix.diff.gz | patch -p1 --backup --suffix=.orig || exit 1 zcat $CWD/bsd-games.getline.diff.gz | patch -p1 --backup --suffix=.orig || exit 1 +# Fix typos in the quote database: +for typofix in $CWD/fortune-fixes-sorry-no-additions-accepted-here/* ; do + zcat $typofix | patch -p1 --verbose || exit 1 +done + ## Without the old default (with, of course, a command line switch), and an updated ## man page, even though PJV wrote this, it just doesn't make the cut. I hope it's ## still of use to somebody though. It increases the accuracy of pom by two orders diff --git a/source/y/bsd-games/fortune-fixes-sorry-no-additions-accepted-here/20120302.diff b/source/y/bsd-games/fortune-fixes-sorry-no-additions-accepted-here/20120302.diff new file mode 100644 index 00000000..94710bca --- /dev/null +++ b/source/y/bsd-games/fortune-fixes-sorry-no-additions-accepted-here/20120302.diff @@ -0,0 +1,11 @@ +--- ./fortune/datfiles/fortunes2.orig 2001-08-29 10:11:30.000000000 -0500 ++++ ./fortune/datfiles/fortunes2 2012-03-02 10:00:47.753999471 -0600 +@@ -35689,7 +35689,7 @@ + order to get power we would have to become very much like them. (Lenin's + fatal mistake, both in theory and in practice.) + % +-Perhaps the world's second words crime is boredom. The first is ++Perhaps the world's second worst crime is boredom. The first is + being a bore. + -- Cecil Beaton + % -- cgit v1.2.3